diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs index 0f741ff1..a10efad7 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs @@ -318,7 +318,7 @@ namespace MyGame.Scenes.MiniGame.Scripts break; case GameState.Success: SoundManager.Instance.PlaySE("se_minigame_End"); - player.Stay(); + player.Result(); this.CallWaitForSeconds(1f, () => { resultManager.ShowResult(scoreCount.Value, placeList, stageData); diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/Player.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/Player.cs index ba00ec1e..ef33be1f 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/Player.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/Player.cs @@ -20,6 +20,7 @@ namespace MyGame.Scenes.MiniGame.Scripts [SerializeField] private GameObject level3; private Animator animator; private bool isJump; + private bool isResult; private bool isHit; public bool IsHit => isHit; private readonly BoolReactiveProperty isHitStay = new BoolReactiveProperty(); @@ -78,6 +79,10 @@ namespace MyGame.Scenes.MiniGame.Scripts }, () => { isJump = false; + if (isResult) + { + Result(); + } }); } @@ -111,12 +116,30 @@ namespace MyGame.Scenes.MiniGame.Scripts { isHit = false; isHitStay.Value = false; - Stay(); + if (isResult) + { + Result(); + } + else + { + Stay(); + } }); }); }); } + public void Result() + { + if (isJump || isHit) + { + isResult = true; + return; + } + isResult = false; + animator?.Play("Brother_pink_glad"); + } + public void AddCount() { SoundManager.Instance.PlaySE("se_minigame_ItemGet");