diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity index 550987c2b5e28e51c427552497b9b501906dafa5..c0209c711f2eb54af893e40f6c56777dc57c9710 100644 --- a/Assets/Scenes/Level_01.unity +++ b/Assets/Scenes/Level_01.unity @@ -1127,6 +1127,7 @@ MonoBehaviour: m_EditorClassIdentifier: playerHealth: {fileID: 1509913240} warningText: {fileID: 1086032144} + gameOverText: {fileID: 1888692063} restartDelay: 5 canvasAnimator: {fileID: 360206200} --- !u!4 &688119341 diff --git a/Assets/Scripts/Managers/EnemyManager.cs b/Assets/Scripts/Managers/EnemyManager.cs index b276c26db1705e14cffa161311e129a33d8d9329..578de03c16299e2987f025851d129dc0c5557f3f 100644 --- a/Assets/Scripts/Managers/EnemyManager.cs +++ b/Assets/Scripts/Managers/EnemyManager.cs @@ -8,7 +8,7 @@ public class EnemyManager : MonoBehaviour public int totalWeight; public static int remainingEnemies = 0; public static int remainingWeight; - public static int waveLevel; + public static int waveLevel = 1; public bool isZenMode = true; [SerializeField] @@ -24,7 +24,6 @@ public class EnemyManager : MonoBehaviour } else { - waveLevel = 1; SpawnWave(); waveLevel++; } @@ -37,10 +36,16 @@ public class EnemyManager : MonoBehaviour if (!isZenMode) { - if (remainingEnemies <= 0 ) - { - SpawnWave(); - waveLevel++; + if (IsWinning()) { + waveLevel--; + GameOverManager.isWinning = true; + } else { + if (remainingEnemies <= 0 ) + { + Debug.Log("CURRENT WAVE LEVEL IS : " + waveLevel); + SpawnWave(); + waveLevel++; + } } } } @@ -52,7 +57,6 @@ public class EnemyManager : MonoBehaviour { return; } - int spawnEnemy = Random.Range(0, 5); Factory.FactoryMethod(spawnEnemy); @@ -74,4 +78,9 @@ public class EnemyManager : MonoBehaviour totalWeight -= totalWeight - remainingWeight; } } + + bool IsWinning() { + Debug.Log("CURRENT WAVE LEVEL IS : " + waveLevel); + return (waveLevel-1 > 12); + } } diff --git a/Assets/Scripts/Managers/GameOverManager.cs b/Assets/Scripts/Managers/GameOverManager.cs index d5248cc5189a02f5aee94b4a2e54c29aac6c5d17..50958a4c4a19632316eb2e6e000e27d6e951921c 100644 --- a/Assets/Scripts/Managers/GameOverManager.cs +++ b/Assets/Scripts/Managers/GameOverManager.cs @@ -6,6 +6,7 @@ public class GameOverManager : MonoBehaviour { public PlayerHealth playerHealth; public Text warningText; + public Text gameOverText; public float restartDelay = 5f; @@ -14,10 +15,17 @@ public class GameOverManager : MonoBehaviour bool isGameOver = false; bool isSaved = false; + public static bool isWinning = false; void Update() { - if (playerHealth.isDead) + if (isWinning) { + gameOverText.text = "You Win !"; + gameOverText.color = Color.green; + Debug.Log("YOU WINNNNNNNNNNNNNNNNNN"); + } + // Debug.Log(isWinning); + if (playerHealth.isDead || isWinning) { canvasAnimator.SetBool("GameOver", true); isGameOver = true; diff --git a/Assets/Scripts/Managers/ScoreManager.cs b/Assets/Scripts/Managers/ScoreManager.cs index e18286bdda9d1352f6f455dc289bb964d87618d8..15317b78dde0f3057693f8cb92f285bfb01ecfc6 100644 --- a/Assets/Scripts/Managers/ScoreManager.cs +++ b/Assets/Scripts/Managers/ScoreManager.cs @@ -36,7 +36,7 @@ public class ScoreManager : MonoBehaviour level.text = ""; } else { score.text = "Score: " + waveScore; - level.text = "Level: " + EnemyManager.waveLevel; + level.text = "Level: " + (EnemyManager.waveLevel-1); } } diff --git a/Assets/Scripts/Managers/ShowGameOver.cs b/Assets/Scripts/Managers/ShowGameOver.cs index 816086c8c553e2e5334d9fab72d6e89ced97bd47..e362c7be4c3a7b2b55077a072fb4c15953d1d730 100644 --- a/Assets/Scripts/Managers/ShowGameOver.cs +++ b/Assets/Scripts/Managers/ShowGameOver.cs @@ -33,7 +33,7 @@ public class ShowGameOver : MonoBehaviour scoreText.text = "Score: " + score.ToString(); levelText.enabled = true; - levelText.text = "Level: " + waveLevel.ToString(); + levelText.text = "Level: " + (waveLevel-1).ToString(); } public void GoToReplay()