diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 2f90cce..aa58d63 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -19229,13 +19229,13 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1703079399} - m_TargetAssemblyTypeName: LobbyUI, Assembly-CSharp - m_MethodName: OnClick_Button - m_Mode: 2 + - m_Target: {fileID: 2007599843} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 m_Arguments: - m_ObjectArgument: {fileID: 893545767} - m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: diff --git a/Assets/Scripts/Game/Game_Mini.cs b/Assets/Scripts/Game/Game_Mini.cs index fb48e28..0da17bf 100644 --- a/Assets/Scripts/Game/Game_Mini.cs +++ b/Assets/Scripts/Game/Game_Mini.cs @@ -52,6 +52,8 @@ public class Game_Mini : MonoBehaviour gameObject.SetActive(true); + list_MiniGameObtacle.ForEach(f=>f.gameObject.SetActive(false)); + for (int i = 0; i < dic_Money.Keys.ToList().Count; i++) { var key = dic_Money.Keys.ToList()[i]; @@ -148,6 +150,13 @@ public class Game_Mini : MonoBehaviour public void Hit(eMiniGameObtacleType type, int val) { if (cohit != null) StopCoroutine(cohit); + + if (m_HP <= 0) + { + cohit = null; + return; + } + cohit = StartCoroutine(Co_Hit(type, val)); } IEnumerator Co_Hit(eMiniGameObtacleType type, int val)