From d0e54175e55de403584840e0ad21deb1cc6ef01d Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Mon, 4 Jul 2022 13:14:46 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=B4=E3=83=BC=E3=83=AB=E6=99=82=E3=82=A2?=
 =?UTF-8?q?=E3=83=8B=E3=83=A1=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E5=AE=9F?=
 =?UTF-8?q?=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scenes/MiniGame/Scripts/GameManager.cs    |  2 +-
 .../MyGame/Scenes/MiniGame/Scripts/Player.cs  | 25 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

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");