From 1f7f6f437c9bd629e5395c94e0f71b3ece7ed280 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Tue, 28 Sep 2021 18:02:33 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=AD=E3=83=83=E3=83=81=E3=83=B3=E3=82=A2?=
 =?UTF-8?q?=E3=83=8B=E3=83=A1=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AB?=
 =?UTF-8?q?=E7=A2=BA=E8=AA=8D=E7=94=A8=E5=87=A6=E7=90=86=E3=82=92=E5=85=A5?=
 =?UTF-8?q?=E3=82=8C=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scenes/Main/Scripts/KitchenManager.cs       | 17 +++++++++++++++++
 .../MyGame/Scenes/Main/Scripts/KitchenView.cs   |  8 ++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
index d6a0864a..63665ab7 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
+++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
@@ -24,6 +24,23 @@ public class KitchenManager : MonoBehaviour
         CoinManager.Instance.ChangeCoin(gameData.coin);
         HeartMeter.Instance.Initialize();
         HeartMeter.Instance.SetHeart(gameData.Heart);
+
+        kitchenView.Initialize();
+        adButton.gameObject.SetActive(false);
+        kitchenView.SetNormalAnimation();
+#if UNITY_EDITOR || DEVELOPMENT_BUILD
+        Observable.Timer(TimeSpan.FromSeconds(3f)).Subscribe(_ =>
+        {
+            adButton.gameObject.SetActive(true);
+            kitchenView.SetTiredAnimation();
+        }).AddTo(this);
+        adButton.OnClickAsObservable().Subscribe(_ =>
+        {
+            // 動画視聴POP
+            adButton.gameObject.SetActive(false);
+            kitchenView.SetNormalAnimation();
+        }).AddTo(this);
+#endif
         
         SetData();
 
diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenView.cs
index 2176f06f..739210f0 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenView.cs
+++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenView.cs
@@ -35,8 +35,6 @@ public class KitchenView : MonoBehaviour
     private bool isTired;
     private void Start()
     {
-        moveIndex = 0;
-        SetPinkMove();
         this.UpdateAsObservable().Subscribe(_ =>
         {
             if (isTired)
@@ -64,6 +62,11 @@ public class KitchenView : MonoBehaviour
         }).AddTo(this);
     }
 
+    public void Initialize()
+    {
+        moveIndex = 0;
+    }
+
     private void SetPinkMove()
     {
         var move = pinkMoves[moveIndex];
@@ -86,6 +89,7 @@ public class KitchenView : MonoBehaviour
     public void SetNormalAnimation()
     {
         isTired = false;
+        SetPinkMove();
         blueBrotherAnimator.SetTrigger(Normal);
     }