From 3bf5ec938166228fc85566543431c06ed552cd85 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Mon, 15 Nov 2021 17:05:49 +0900
Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=8C=81=E9=87=910=E6=99=82=E3=81=AB?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E5=BA=83=E5=91=8A=E8=A6=96=E8=81=B4=E3=83=9D?=
 =?UTF-8?q?=E3=83=83=E3=83=97=E3=82=A2=E3=83=83=E3=83=97=E3=82=92=E5=87=BA?=
 =?UTF-8?q?=E3=81=99=E5=87=A6=E7=90=86=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scenes/Main/Scripts/KitchenManager.cs     | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
index 3e6c12a3..92e1b4f4 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
+++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
@@ -18,9 +18,12 @@ public class KitchenManager : MonoBehaviour
     [SerializeField] private KitchenView kitchenView;
     [SerializeField] private BulkOrderIndicatorView orderIndicatorView;
     
+    private readonly Subject<Unit> showAdDialogSubject = new Subject<Unit>();
+    
     // Start is called before the first frame update
     void Start()
     {
+        showAdDialogSubject.AddTo(this);
         SoundManager.Instance.PlayBGM("bgm_Main");
         var gameData = GameDataManager.GameData;
         
@@ -106,23 +109,25 @@ public class KitchenManager : MonoBehaviour
             }).AddTo(this);
 
         kitchenView.Initialize();
-        adButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(.3f)).Subscribe(_ =>
-        {
-            // 動画視聴POP
-            GetRewardDialog.ShowCoinDialog(() =>
+        adButton.OnClickAsObservable()
+            .Merge(showAdDialogSubject)
+            .ThrottleFirst(TimeSpan.FromSeconds(.3f)).Subscribe(_ =>
             {
-                CoinGetDialog.ShowDialog(refreshRewardCoin, () =>
+                // 動画視聴POP
+                GetRewardDialog.ShowCoinDialog(() =>
                 {
-                    adButton.gameObject.SetActive(false);
-                    kitchenView.SetNormalAnimation();
-                    
-                    CoinManager.Instance.AddCoinWithEffect(refreshRewardCoin);
-                    gameData.Coin = CoinManager.Instance.OwnCoin;
-                    gameData.kitchenRefreshTime = DateTime.UtcNow.AddSeconds(refreshWaitTime).ToBinary();
-                    GameDataManager.SaveGameData();
+                    CoinGetDialog.ShowDialog(refreshRewardCoin, () =>
+                    {
+                        adButton.gameObject.SetActive(false);
+                        kitchenView.SetNormalAnimation();
+                        
+                        CoinManager.Instance.AddCoinWithEffect(refreshRewardCoin);
+                        gameData.Coin = CoinManager.Instance.OwnCoin;
+                        gameData.kitchenRefreshTime = DateTime.UtcNow.AddSeconds(refreshWaitTime).ToBinary();
+                        GameDataManager.SaveGameData();
+                    });
                 });
-            });
-        }).AddTo(this);
+            }).AddTo(this);
         
         // 休憩リワード
         var remaining = (int) DateTime.FromBinary(gameData.kitchenRefreshTime).Subtract(DateTime.UtcNow).TotalSeconds;
@@ -137,6 +142,7 @@ public class KitchenManager : MonoBehaviour
             // 所持金0救済
             adButton.gameObject.SetActive(true);
             kitchenView.SetTiredAnimation();
+            showAdDialogSubject.OnNext(Unit.Default);
         }
         else if (remaining > 0 || gameData.isFirstPlay)
         {