diff --git a/Assets/Prefabs/MenuCanvas.prefab b/Assets/Prefabs/MenuCanvas.prefab index cf7938e3..cbba9d40 100644 --- a/Assets/Prefabs/MenuCanvas.prefab +++ b/Assets/Prefabs/MenuCanvas.prefab @@ -362,6 +362,7 @@ GameObject: - component: {fileID: 2750418062797237111} - component: {fileID: 2750418062797237112} - component: {fileID: 2750418062797237113} + - component: {fileID: 1477994944203990988} m_Layer: 5 m_Name: MenuCanvas m_TagString: Untagged @@ -452,3 +453,11 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!81 &1477994944203990988 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2750418062797237114} + m_Enabled: 1 diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index e6f65697..1e0c0453 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -149,7 +149,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5fd42fff9a6a0044d8da1295c8ccb199, type: 3} m_Name: m_EditorClassIdentifier: - maxHealth: 100 + maxHealth: 30 currentHealth: 0 --- !u!50 &3184054842604669707 Rigidbody2D: diff --git a/Assets/Prefabs/Zombie.prefab b/Assets/Prefabs/Zombie.prefab index f500dc47..af2d6f46 100644 --- a/Assets/Prefabs/Zombie.prefab +++ b/Assets/Prefabs/Zombie.prefab @@ -48,7 +48,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5fd42fff9a6a0044d8da1295c8ccb199, type: 3} m_Name: m_EditorClassIdentifier: - maxHealth: 100 + maxHealth: 30 currentHealth: 0 --- !u!114 &8303843776451715842 MonoBehaviour: @@ -67,7 +67,7 @@ MonoBehaviour: k__BackingField: 5 k__BackingField: 11 k__BackingField: 10 - k__BackingField: 1.25 + k__BackingField: 1.3 k__BackingField: 1 --- !u!50 &3184054842604669707 Rigidbody2D: diff --git a/Assets/Prefabs/ZombieSpawner.prefab b/Assets/Prefabs/ZombieSpawner.prefab index 62e3832d..409f1bb8 100644 --- a/Assets/Prefabs/ZombieSpawner.prefab +++ b/Assets/Prefabs/ZombieSpawner.prefab @@ -46,7 +46,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: enemyPrefab: {fileID: 1507955574594264855, guid: 906e9ae527c1e1a4fa792bc6e89757bd, type: 3} - k__BackingField: 3.5 + k__BackingField: 3 k__BackingField: 0 --- !u!212 &1746166374861614841 SpriteRenderer: diff --git a/Assets/Scenes/DeathScene.unity b/Assets/Scenes/DeathScene.unity index 55cfd7ec..1f21bfdc 100644 --- a/Assets/Scenes/DeathScene.unity +++ b/Assets/Scenes/DeathScene.unity @@ -4015,7 +4015,6 @@ GameObject: m_Component: - component: {fileID: 373886647} - component: {fileID: 373886646} - - component: {fileID: 373886645} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -4023,14 +4022,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &373886645 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 373886644} - m_Enabled: 1 --- !u!20 &373886646 Camera: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/LifeScene.unity b/Assets/Scenes/LifeScene.unity index 2b2678c7..0749a09b 100644 --- a/Assets/Scenes/LifeScene.unity +++ b/Assets/Scenes/LifeScene.unity @@ -190,7 +190,6 @@ GameObject: m_Component: - component: {fileID: 373886647} - component: {fileID: 373886646} - - component: {fileID: 373886645} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -198,14 +197,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &373886645 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 373886644} - m_Enabled: 1 --- !u!20 &373886646 Camera: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/StartMenu.unity b/Assets/Scenes/StartMenu.unity index 1e0673bb..cc301cb4 100644 --- a/Assets/Scenes/StartMenu.unity +++ b/Assets/Scenes/StartMenu.unity @@ -133,7 +133,6 @@ GameObject: m_Component: - component: {fileID: 373886647} - component: {fileID: 373886646} - - component: {fileID: 373886645} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -141,14 +140,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &373886645 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 373886644} - m_Enabled: 1 --- !u!20 &373886646 Camera: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Control/EnemyController.cs b/Assets/Scripts/Control/EnemyController.cs index e141d85a..073f9d2d 100644 --- a/Assets/Scripts/Control/EnemyController.cs +++ b/Assets/Scripts/Control/EnemyController.cs @@ -79,7 +79,7 @@ private IEnumerator Idle() state = State.Chase; directlyAlerted = true; } - else if (IsChasingEnemyNearby()) + else if (IsChasingEnemyNearby() && target != null) state = State.Chase; else state = State.Wander; @@ -108,8 +108,9 @@ private IEnumerator Wander() Vector3 targetPosition = transform.position + wanderDirection * wanderRadius; transform.position = Vector3.MoveTowards(transform.position, targetPosition, speed * Time.deltaTime); - if (target != null && Vector3.Distance(target.position, transform.position) < chaseDistance) - state = State.Chase; + if (target != null) + if (Vector3.Distance(target.position, transform.position) < chaseDistance) + state = State.Chase; yield return null; } @@ -123,6 +124,13 @@ private IEnumerator Chase() { transform.position = Vector3.MoveTowards(transform.position, target.position, speed * Time.deltaTime); + if (Vector3.Distance(target.position, transform.position) > chaseDistance) + { + state = State.Wander; + directlyAlerted = false; // Reset the flag when the enemy stops chasing + yield return null; + } + if (Vector3.Distance(target.position, transform.position) <= chaseDistance) { directlyAlerted = true; @@ -135,11 +143,7 @@ private IEnumerator Chase() } } - if (Vector3.Distance(target.position, transform.position) > chaseDistance) - { - state = State.Wander; - directlyAlerted = false; // Reset the flag when the enemy stops chasing - } + } AlertNearbyEnemies(); diff --git a/Assets/Scripts/Stats/Health.cs b/Assets/Scripts/Stats/Health.cs index 7472ce6e..1bfcaa0b 100644 --- a/Assets/Scripts/Stats/Health.cs +++ b/Assets/Scripts/Stats/Health.cs @@ -41,7 +41,8 @@ private void Die() OnDeath?.Invoke(); // Destroy the game object - Destroy(gameObject); + //Destroy(gameObject); + gameObject.SetActive(false); } public float GetCurrentHealth()