diff --git a/Assets/Scenes/Wave.unity b/Assets/Scenes/Wave.unity index 3b964a6daeb368fadbcdd41419031a59e173d347..0231fdb41e0d0ec6791b6b85abc5047969fbbbad 100644 --- a/Assets/Scenes/Wave.unity +++ b/Assets/Scenes/Wave.unity @@ -817,6 +817,11 @@ MonoBehaviour: - {fileID: 7785515} - {fileID: 428024867} - {fileID: 36326048} + - {fileID: 1190881234} + - {fileID: 1803578686} + - {fileID: 1065103271} + - {fileID: 2045825619} + - {fileID: 1610549460} enemyAlive: 5 factory: {fileID: 180263585} --- !u!1 &428024866 @@ -7381,7 +7386,7 @@ GameObject: m_Component: - component: {fileID: 1803578686} m_Layer: 0 - m_Name: 'Recovery GameObject for Transform (ID in file: 1803578686)' + m_Name: DevilSpawnPoint m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Scenes/Zen.unity b/Assets/Scenes/Zen.unity index c71155669b1648e3339b2509256ca6cb1396d64f..33e353fca07d3bd07a3acfb08d3fb5eda1a08047 100644 --- a/Assets/Scenes/Zen.unity +++ b/Assets/Scenes/Zen.unity @@ -909,6 +909,8 @@ MonoBehaviour: - {fileID: 7785515} - {fileID: 428024867} - {fileID: 36326048} + - {fileID: 1803578686} + - {fileID: 1190881234} - {fileID: 1065103271} - {fileID: 2045825619} - {fileID: 1610549460} @@ -7383,7 +7385,7 @@ GameObject: m_Component: - component: {fileID: 1803578686} m_Layer: 0 - m_Name: 'Recovery GameObject for Transform (ID in file: 1803578686)' + m_Name: DevilSpawnPoint m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Scripts/Spawner/EnemySpawnerWave.cs b/Assets/Scripts/Spawner/EnemySpawnerWave.cs index 0a5e33fefbe1f95957d6f7802c5414ea1fefd27b..0c6367dee2b3d2d36f837f24f93f57103035405d 100644 --- a/Assets/Scripts/Spawner/EnemySpawnerWave.cs +++ b/Assets/Scripts/Spawner/EnemySpawnerWave.cs @@ -11,6 +11,9 @@ public class EnemySpawnerWave : MonoBehaviour private int zombunnyCount = 5; private int zombearCount = 0; private int hellephantCount = 0; + private int shooterCount = 0; + private int bomberCount = 0; + private int devilCount = 0; public int enemyAlive = 5; [SerializeField] @@ -32,10 +35,14 @@ public class EnemySpawnerWave : MonoBehaviour void Spawn() { - enemyAlive = zombunnyCount + zombearCount + hellephantCount; + int randomShooterIndex = Random.Range(5, 7); + enemyAlive = zombunnyCount + zombearCount + hellephantCount + shooterCount + bomberCount + devilCount; StartCoroutine(SpawnEnemy(0, 0, zombunnyCount)); StartCoroutine(SpawnEnemy(1, 1, zombearCount)); StartCoroutine(SpawnEnemy(2, 2, hellephantCount)); + StartCoroutine(SpawnEnemy(3, 3, devilCount)); + StartCoroutine(SpawnEnemy(4, 4, bomberCount)); + StartCoroutine(SpawnEnemy(5, randomShooterIndex, shooterCount)); WaveManager.wave = waveCount; } @@ -49,6 +56,12 @@ public class EnemySpawnerWave : MonoBehaviour if (waveCount % 3 == 0) { hellephantCount++; + bomberCount += 2; + } + else if (waveCount % 5 == 0) + { + shooterCount++; + devilCount++; } Spawn(); diff --git a/Assets/Scripts/Spawner/EnemySpawnerZen.cs b/Assets/Scripts/Spawner/EnemySpawnerZen.cs index a366d2622f9dfe7252562ad0c185366ba922a5bf..c423fd543458b18f31f2b2aa33d93fe2082742fa 100644 --- a/Assets/Scripts/Spawner/EnemySpawnerZen.cs +++ b/Assets/Scripts/Spawner/EnemySpawnerZen.cs @@ -19,13 +19,21 @@ public class EnemySpawnerZen : MonoBehaviour void Spawn() { - for (int i = 0; i < 6; i++) + for (int i = 0; i < 8; i++) { if (playerHealth.currentHealth <= 0f) { break; } - Instantiate(Factory.FactoryMethod(i), spawnPoints[i].position, spawnPoints[i].rotation); + + if (i < 5) + { + Instantiate(Factory.FactoryMethod(i), spawnPoints[i].position, spawnPoints[i].rotation); + } + else + { + Instantiate(Factory.FactoryMethod(5), spawnPoints[i].position, spawnPoints[i].rotation); + } } } } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 8ba837e29417056e0d6341fd0f88e91a84945b2d..d0298544476e3001b20e7395cf1d4a694939ce2f 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,21 +6,24 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d + value: 22424703114646680e0b0227036c7c1f1b1a192428182724392c0f3dacf53a31f6fe flags: 0 RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c7315001214157c7968252320092a flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c651518590d24253c3f + value: 22424703114646680e0b0227036c7315001214157c7968252320092a flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c72111f19352f223d68252320092a + value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036c72111f19352f223d68252320092a flags: 0 RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036c651518590d24253c3f + flags: 0 + RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c68110012563f22213229 flags: 0 vcSharedLogLevel: