diff --git a/Assets/Scenes/Level_02.unity b/Assets/Scenes/Level_02.unity index 4a56a40ca0ca97ec13ee5d038410d0be3116a814..28b5675f36cb18b8ac228980a83b9b3b3aa5825e 100644 --- a/Assets/Scenes/Level_02.unity +++ b/Assets/Scenes/Level_02.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.45061505, g: 0.498609, b: 0.56437516, a: 1} + m_IndirectSpecularColor: {r: 0.4506148, g: 0.49860865, b: 0.56437486, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -721,7 +721,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4c5d9298a28a8fd489d5044c170d37fe, type: 3} m_Name: m_EditorClassIdentifier: - warningTextWave: {fileID: 83661862} + warningTextWave: {fileID: 839222784} playerHealthWave: {fileID: 33458251} restartDelayWave: 5 scoreWave: {fileID: 1095512511} @@ -6488,6 +6488,8 @@ MonoBehaviour: timeBetweenBullets: 0.15 range: 100 text: {fileID: 1214467935} + diagonalVersion: 0 + fasterVersion: 0 --- !u!1 &732164003 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Managers/EnemyManagerWave.cs b/Assets/Scripts/Managers/EnemyManagerWave.cs index d683489828322c19dc6a9445c78f587f387a8a7d..ed116a39773e5304aa15117f3a652d8f2235e6a8 100644 --- a/Assets/Scripts/Managers/EnemyManagerWave.cs +++ b/Assets/Scripts/Managers/EnemyManagerWave.cs @@ -59,7 +59,7 @@ public class EnemyManagerWave : MonoBehaviour void Update() { GameObject enemy = GameObject.FindGameObjectWithTag("Enemy"); - if(enemy == null) + if(enemy == null && currentWaves < numOfTotalWaves-1) { currentWaves += 1; waveText.text = "Wave:" + (currentWaves + 1); diff --git a/Assets/Scripts/Player/PlayerHealth.cs b/Assets/Scripts/Player/PlayerHealth.cs index 75a8c2b7246f818500efcbd0faa27c9503c103b4..3578bac720eca26b48e154c024993dde77f1a8c2 100644 --- a/Assets/Scripts/Player/PlayerHealth.cs +++ b/Assets/Scripts/Player/PlayerHealth.cs @@ -56,7 +56,7 @@ public class PlayerHealth : MonoBehaviour { damaged = true; - currentHealth -= amount; + // currentHealth -= amount; healthSlider.value = currentHealth;