izzy/Darklings-FightingGame
0
0
Fork 0
mirror of https://github.com/izzy2lost/Darklings-FightingGame.git synced 2026-03-10 11:35:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

Minor update

Browse Source
This commit is contained in:
unknown
2022-12-15 13:25:22 +02:00
parent 2be214ef66
commit 12a06ba2f2
10 changed files with 134 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/_Project/Scripts/ManagerScripts/GameplayManager.cs
View File

@@ -202,8 +202,6 @@ public class GameplayManager : MonoBehaviour
playerTwoObject.GetComponent<CpuController>().SetOtherPlayer(playerOneObject.transform);
playerOneObject.SetActive(true);
playerTwoObject.SetActive(true);
PlayerOne.transform.position = new Vector2(_spawnPositionsX[0], (float)DemonicsPhysics.GROUND_POINT);
PlayerTwo.transform.position = new Vector2(_spawnPositionsX[1], (float)DemonicsPhysics.GROUND_POINT);
if (SceneSettings.ControllerOne != null && _controllerOneType != ControllerTypeEnum.Cpu)
{
_playerOneController.SetControllerToPlayer();

9
Assets/_Project/Scripts/ManagerScripts/ObjectPoolingManager.cs
View File

@@ -51,7 +51,14 @@ public class ObjectPoolingManager : MonoBehaviour
public GameObject GetObject(string name)
{
return _jumpEffects[0];
for (int i = 0; i < _jumpEffects.Count; i++)
{
if (!_jumpEffects[i].activeSelf)
{
return _jumpEffects[i];
}
}
return null;
}
public DemonicsAnimator GetObjectAnimation(string name)