started basic object pooling functionality

Signed-off-by: rodude123 <[email protected]>

Assets/Scripts/Enemy/Enemy.cs

@@ -1,3 +1,5 @@
+using System.Collections;
+using System.Collections.Generic;
 using Enemy.Configurators;
 using Player;
 using UnityEngine;
@@ -18,11 +20,14 @@ public class Enemy : MonoBehaviour
 		private Animator _anim;
 
 		private FPSPlayer _player;
+
+		private EnemyManager _enemyManager;
 		private double _previousAttackTime;
 
 		private void Start()
 		{
-			_player = EnemyManager.Instance.player;
+			_enemyManager = EnemyManager.Instance;
+			_player = _enemyManager.player;
 			_agent = GetComponent<NavMeshAgent>();
 			_anim = GetComponent<Animator>();
 		}
@@ -63,8 +68,23 @@ public void TakeDamage(float damage)
 			}
 			_anim.SetBool(zombieAiConfig.dieParameterName, true);
 			_agent.isStopped = true;
-			Destroy(gameObject, 15f);
+			StartCoroutine(nameof(Disable));
 			Debug.Log("Enemy died");
 		}
+
+		private IEnumerator Disable()
+		{
+			yield return new WaitForSeconds(15f);
+			gameObject.SetActive(false);
+		}
+
+		public void OnEnable()
+		{
+			gameObject.SetActive(true);
+			_agent.isStopped = false;
+			_agent.SetDestination(_player.transform.position);
+			transform.position = _enemyManager.spawnPoints[Random.Range(0, _enemyManager.spawnPoints.Count)].transform.position;
+		}
+
 	}
 }

Assets/Scripts/Enemy/EnemyManager.cs

@@ -49,10 +49,10 @@ public class EnemyManager : MonoBehaviour
 
 		[ConditionalHide(true, false, "spawnMode", "spawnSystem", "enableGUI")]
 		public Color32 textColour;
-		private GameObject counterGb;
-		private int currRound;
+		private GameObject _counterGb;
+		private int _currRound;
 
-		private readonly List<GameObject> enemiesSpawned = new List<GameObject>();
+		private readonly List<GameObject> _enemiesSpawned = new List<GameObject>();
 
 		public static EnemyManager Instance
 		{
@@ -110,21 +110,36 @@ private void Update()
 		{
 			if (enableGUI)
 			{
-				counterGb.GetComponent<TextMeshProUGUI>().text = "Round: " + (currRound + 1);
+				_counterGb.GetComponent<TextMeshProUGUI>().text = "Round: " + (_currRound + 1);
 			}
 		}
 
 		public void SpawnEnemy()
 		{
-			enemiesSpawned.Add(Instantiate(enemiesToSpawn[Random.Range(0, enemiesToSpawn.Count)],
+			if (_enemiesSpawned.Count > 5)
+			{
+				for (var i = 0; i < _enemiesSpawned.Count; i++)
+				{
+					if (_enemiesSpawned[i].activeInHierarchy == false)
+					{
+						_enemiesSpawned[i].SetActive(true);
+						break;
+					}
+				}
+			}
+
+			_enemiesSpawned.Add(Instantiate(enemiesToSpawn[Random.Range(0, enemiesToSpawn.Count)],
 				spawnPoints[Random.Range(0, spawnPoints.Count)].transform.position, Quaternion.identity));
 		}
 
 		private IEnumerator SpawnEnemies()
 		{
 			while (spawnSystem == SpawnSystem.Continuous)
 			{
-				for (var i = 0; i < 10; i++) SpawnEnemy();
+				for (var i = 0; i < 10; i++)
+				{
+					SpawnEnemy();
+				}
 				yield return new WaitForSeconds(timeBetweenSpawnsSeconds);
 			}
 		}
@@ -135,23 +150,34 @@ private IEnumerator RoundBased()
 			{
 				for (var i = 0; i < numberOfRounds; i++)
 				{
-					currRound = i;
-					for (var j = 0; j < enemiesPerRound; j++) SpawnEnemy();
+					_currRound = i;
+					for (var j = 0; j < enemiesPerRound; j++)
+					{
+						SpawnEnemy();
+					}
 
 					if (useTime)
 					{
 						yield return new WaitForSeconds(timeBetweenSpawnsSeconds);
 					}
 				}
+				yield break;
 			}
-			else
+
+			if (numberOfRounds == 0)
 			{
 				while (true)
 				{
-					for (var i = 0; i < enemiesPerRound; i++) SpawnEnemy();
+					for (var i = 0; i < enemiesPerRound; i++)
+					{
+						SpawnEnemy();
+					}
 					yield return new WaitForSeconds(timeBetweenSpawnsSeconds);
 				}
 			}
+
+
+
 		}
 
 		private IEnumerator RoundCounterUI()
@@ -174,10 +200,10 @@ private IEnumerator RoundCounterUI()
 			yield return new WaitForSecondsRealtime(1f);
 			Time.timeScale = 1;
 			Destroy(countInGb);
-			counterGb = new GameObject();
-			var counterTextMesh = CreateTextElement(counterGb,
+			_counterGb = new GameObject();
+			var counterTextMesh = CreateTextElement(_counterGb,
 				new Vector2(Screen.width * 0.125f, Screen.height * 0.875f), 32, "Round: 1");
-			counterGb.transform.SetParent(canvasUI.transform);
+			_counterGb.transform.SetParent(canvasUI.transform);
 		}
 
 		private TextMeshProUGUI CreateTextElement(GameObject gameObj, Vector2 pos, int fontSize, string textStr)