diff --git a/BlueWater/Assets/02.Scripts/Character/BaseCharacter.cs b/BlueWater/Assets/02.Scripts/Character/BaseCharacter.cs index 5d8761a3e..de783b3e7 100644 --- a/BlueWater/Assets/02.Scripts/Character/BaseCharacter.cs +++ b/BlueWater/Assets/02.Scripts/Character/BaseCharacter.cs @@ -55,6 +55,11 @@ namespace BlueWaterProject protected virtual void OnDisable() { + } + + protected virtual void OnDestroy() + { + } protected virtual void Start() diff --git a/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs b/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs index d722206da..877653804 100644 --- a/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs +++ b/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs @@ -163,11 +163,6 @@ namespace BlueWaterProject } } } - - protected override void OnDisable() - { - hpSlider.gameObject.SetActive(false); - } protected override void Start() { @@ -318,6 +313,7 @@ namespace BlueWaterProject } Agent.enabled = false; + Destroy(hpSlider.gameObject, 2f); Destroy(gameObject, 2f); } diff --git a/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs b/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs index c252cf7c2..bbb3c4b2f 100644 --- a/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs +++ b/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs @@ -243,11 +243,6 @@ namespace BlueWaterProject } } } - - protected override void OnDisable() - { - hpSlider.gameObject.SetActive(false); - } protected override void Start() { @@ -315,6 +310,7 @@ namespace BlueWaterProject Agent.isStopped = true; Agent.enabled = false; + Destroy(hpSlider.gameObject, 2f); Destroy(gameObject, 2f); } diff --git a/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs b/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs index 3091b6a22..a6a94161d 100644 --- a/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs +++ b/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs @@ -213,11 +213,6 @@ namespace BlueWaterProject } SetCurrentHp(MaxHp); } - - protected override void OnDisable() - { - hpSlider.gameObject.SetActive(false); - } protected override void Update() { @@ -356,6 +351,7 @@ namespace BlueWaterProject } Agent.enabled = false; + Destroy(hpSlider.gameObject, 2f); Destroy(gameObject, 2f); }