diff --git a/Assets/Animation/PlayerAC.controller b/Assets/Animation/PlayerAC.controller index fd1675e1f5451b8be0d536e083f7aff30a1f50ae..66b182b747ebd58d11586fed1c7522e163c8e3a6 100644 --- a/Assets/Animation/PlayerAC.controller +++ b/Assets/Animation/PlayerAC.controller @@ -215,6 +215,6 @@ AnimatorStateMachine: m_StateMachineBehaviours: [] m_AnyStatePosition: {x: 276, y: 96, z: 0} m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} + m_ExitPosition: {x: 510, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 1102589369875474630} diff --git a/Assets/Prefabs/Bomber.prefab b/Assets/Prefabs/Bomber.prefab index 816355ea22c5bf1bd9c5cb0b7462d4ea39657b58..d3b0bda9676b5a6c9f61ca3027343f93a8c8e22d 100644 --- a/Assets/Prefabs/Bomber.prefab +++ b/Assets/Prefabs/Bomber.prefab @@ -330,7 +330,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: timeBetweenAttacks: 0.5 - attackDamage: 80 + attackDamage: 30 --- !u!114 &3079155484348339423 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Devil.prefab b/Assets/Prefabs/Devil.prefab index 51855bde694533c4e6bb2df21c303f131d006021..570ac6a2cf5735891cbecb899c79a0a027e1e68a 100644 --- a/Assets/Prefabs/Devil.prefab +++ b/Assets/Prefabs/Devil.prefab @@ -416,7 +416,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: timeBetweenAttacks: 0.5 - attackDamage: 10 + attackDamage: 60 --- !u!114 &2950657676947281860 MonoBehaviour: m_ObjectHideFlags: 0 @@ -429,7 +429,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a9b9d14572410594cb85d40eedfb150c, type: 3} m_Name: m_EditorClassIdentifier: - startingHealth: 100 + startingHealth: 200 currentHealth: 0 sinkSpeed: 2.5 scoreValue: 10 diff --git a/Assets/Prefabs/Shooter.prefab b/Assets/Prefabs/Shooter.prefab index 10b2497c675cfd84b8169625e30aecd68d426bf8..eaee769bc1ac4747858d27edac97b4da7ddfb181 100644 --- a/Assets/Prefabs/Shooter.prefab +++ b/Assets/Prefabs/Shooter.prefab @@ -5578,7 +5578,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: timeBetweenAttacks: 0.5 - attackDamage: 5 + attackDamage: 15 range: 100 --- !u!1 &6289126872513703861 GameObject: diff --git a/Assets/Scenes/Wave.unity b/Assets/Scenes/Wave.unity index f662fd0b4a6bdee9325d3ea198bb8851a7db0225..852e9e771da9066900d131575e9b095dbdfe951e 100644 --- a/Assets/Scenes/Wave.unity +++ b/Assets/Scenes/Wave.unity @@ -590,6 +590,7 @@ GameObject: - component: {fileID: 38786125} - component: {fileID: 38786129} - component: {fileID: 38786130} + - component: {fileID: 38786131} m_Layer: 5 m_Name: HUDCanvas m_TagString: Untagged @@ -725,6 +726,20 @@ MonoBehaviour: warningText: {fileID: 839222784} playerHealth: {fileID: 33458251} restartDelay: 5 +--- !u!114 &38786131 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 38786124} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5aae897c7720a954ebb33405b668a61e, type: 3} + m_Name: + m_EditorClassIdentifier: + restartDelay: 5 + spawner: {fileID: 240257952} --- !u!1 &180263584 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Managers/WeaponManagerZen.cs b/Assets/Scripts/Managers/WeaponManagerZen.cs index 3ee0a477f75f73899c00eb7a4eb26998ea868df7..b08736d569071e2b33fe406e9abc64b12e1ca504 100644 --- a/Assets/Scripts/Managers/WeaponManagerZen.cs +++ b/Assets/Scripts/Managers/WeaponManagerZen.cs @@ -51,7 +51,7 @@ public class WeaponManagerZen : MonoBehaviour void CheckUpgrade() { - if ((int)(TimerController.elapsedTime / 60) == 1) + if (((int)TimerController.elapsedTime % 15) == 0 && (int)TimerController.elapsedTime != 0) { enabledUpgrade = true; } diff --git a/Assets/Scripts/Managers/WinningManager.cs b/Assets/Scripts/Managers/WinningManager.cs new file mode 100644 index 0000000000000000000000000000000000000000..bccc8a403081b453846cac1ba883725d6384a334 --- /dev/null +++ b/Assets/Scripts/Managers/WinningManager.cs @@ -0,0 +1,40 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +using UnityEngine.SceneManagement; + +public class WinningManager : MonoBehaviour +{ + public float restartDelay = 5f; + + Animator anim; + float restartTimer; + + public EnemySpawnerWave spawner; + + void Awake() + { + anim = GetComponent<Animator>(); + } + + + void Update() + { + if (spawner.waveCount > spawner.maxWave) + { + anim.SetTrigger("Winning"); + + restartTimer += Time.deltaTime; + + if (restartTimer >= restartDelay) + { + if (SceneManager.GetActiveScene().buildIndex == 2) + { + ScoreManagerLBWave.scoreManagerLBWave.AddScoreWave(new ScoreWave(PlayerPrefs.GetString("player_name"), WaveManager.wave, ScoreManager.score)); + } + SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex - SceneManager.GetActiveScene().buildIndex); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Managers/WinningManager.cs.meta b/Assets/Scripts/Managers/WinningManager.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..34653f7c347fdfb3ca5d34c01dc6afc9f51bd40e --- /dev/null +++ b/Assets/Scripts/Managers/WinningManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5aae897c7720a954ebb33405b668a61e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Spawner/EnemySpawnerWave.cs b/Assets/Scripts/Spawner/EnemySpawnerWave.cs index 52f042519f01421d1be314f476981b4df2d94021..1807be7bc3b796652cbc5152d92107dc58f8c121 100644 --- a/Assets/Scripts/Spawner/EnemySpawnerWave.cs +++ b/Assets/Scripts/Spawner/EnemySpawnerWave.cs @@ -19,7 +19,7 @@ public class EnemySpawnerWave : MonoBehaviour private int devilCount = 0; public int enemyAlive = 5; - Animator anim; + //Animator anim; [SerializeField] public MonoBehaviour factory; IFactory Factory { get { return factory as IFactory; } } @@ -35,11 +35,11 @@ public class EnemySpawnerWave : MonoBehaviour { NextWave(); } - else if( waveCount == maxWave) - { - anim.SetTrigger("Winning"); - SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex - SceneManager.GetActiveScene().buildIndex); - } + //else if( waveCount == maxWave) + //{ + // anim.SetTrigger("Winning"); + // SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex - SceneManager.GetActiveScene().buildIndex); + //} } void Spawn() @@ -58,6 +58,10 @@ public class EnemySpawnerWave : MonoBehaviour void NextWave() { waveCount++; + if (waveCount > maxWave) + { + return; + } zombunnyCount += 4; zombearCount += 2;