Conjure/gather-and-defend
9
0
Fork 0
Code Issues Pull Requests 1 Projects Wiki Activity

Temp reset

Browse Source
This commit is contained in:
Ader Alisma 01 2024-02-04 19:05:01 -05:00
parent 0fd0584a50
commit d0371349db
1 changed files with 45 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
Assets/Scripts/LevelConfig/WaveObserver.cs
View File

@ -81,27 +81,51 @@ public class WaveObserver : Singleton<WaveObserver>
spawnerSubject.ChangeSpawnSpeed(_levelConfig.Interval * _spawnerTiming); spawnerSubject.ChangeSpawnSpeed(_levelConfig.Interval * _spawnerTiming);
if (paramPrefab.Equals(_levelConfig.ConstantSpawn[0].GetEnemyObject())) if (paramPrefab.Equals(_levelConfig.ConstantSpawn[0].GetEnemyObject()))
{ {
//int currentCount = 0;
//for (int i = 0; i < _copyConstantSpawn.Count; i++)
//{
// if (_levelConfig.ConstantSpawn[i].GetEnemyObject() == paramPrefab)
// {
// currentCount = --_copyConstantSpawn[i];
// break;
// Debug.Log("Amout to spawn is now: " + currentCount);
// if (currentCount <= 0)
// {
// //bool hasNextTarget = false;
// //for (int j = i; j < _copyConstantSpawn.Count; j++)
// //{
// // if (_copyConstantSpawn[_copyConstantSpawn.Count - j] > 0)
// // {
// // spawnerSubject.Prefab = _levelConfig.ConstantSpawn[j].GetEnemyObject();
// // hasNextTarget = true;
// // Debug.Log(spawnerSubject.Prefab.name);
// // }
// //}
// //if (!hasNextTarget)
// //{
// foreach (SpawnerTile spawner in _subjects)
// {
// if (spawner.Prefab.Equals(paramPrefab))
// {
// spawner.StopSpawn();
// Debug.Log("----Spawn Stopped----");
// }
// }
// //}
// }
// }
//}
int currentCount = 0; int currentCount = 0;
for (int i = 0; i < _copyConstantSpawn.Count; i++) for (int i = 0; i < _copyConstantSpawn.Count; i++)
{ {
if (_levelConfig.ConstantSpawn[i].GetEnemyObject() == paramPrefab) if (_levelConfig.ConstantSpawn[i].GetEnemyObject() == paramPrefab)
{ {
currentCount = --_copyConstantSpawn[i]; currentCount = --_copyConstantSpawn[i];
//break; break;
}
}
Debug.Log("Amout to spawn is now: " + currentCount); Debug.Log("Amout to spawn is now: " + currentCount);
if (currentCount <= 0) if (currentCount <= 0)
{
bool hasNextTarget = false;
for (int j = i; j < _copyConstantSpawn.Count; j++)
{
if (_copyConstantSpawn[_copyConstantSpawn.Count - j] > 0)
{
spawnerSubject.Prefab = _levelConfig.ConstantSpawn[j].GetEnemyObject();
hasNextTarget = true;
Debug.Log(spawnerSubject.Prefab.name);
}
}
if (!hasNextTarget)
{ {
foreach (SpawnerTile spawner in _subjects) foreach (SpawnerTile spawner in _subjects)
{ {
@ -114,9 +138,6 @@ public class WaveObserver : Singleton<WaveObserver>
} }
} }
} }
}
}
}
/** /**
* Called by enemy when they spawn * Called by enemy when they spawn