From bd8ae721f5835d34823baeb47359101341039516 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Fri, 14 Oct 2022 15:39:19 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=A1=E3=82=A4=E3=83=B3=E3=82=B7=E3=83=BC?=
 =?UTF-8?q?=E3=83=B3=E3=83=AF=E3=83=BC=E3=83=AB=E3=83=89=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MyGame/Scenes/Main/Scripts/KitchenManager.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
index d957d34c..0e42b4ca 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
+++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
@@ -27,16 +27,18 @@ public class KitchenManager : MonoBehaviour
     private readonly Subject<Unit> showAdDialogSubject = new Subject<Unit>();
     private IDisposable timerDisposable = null;
     private IDisposable tapPhoneDisposable;
+    private GameData globalGameData;
+    private GameData cityGameData;
     
     // Start is called before the first frame update
     void Start()
     {
         showAdDialogSubject.AddTo(this);
         SoundManager.Instance.PlayBGM("bgm_Main");
-        var globalGameData = GameDataManager.GameData;
+        globalGameData = GameDataManager.GameData;
+        cityGameData = GameDataManager.GetCurrentCityGameData();
         // globalGameData.CustomizeCoinElapsed = Int32.MaxValue / 2;
         // PartTimerManager.Instance.UpdateList();
-        var cityGameData = GameDataManager.GetCurrentCityGameData();
         
         // レシピの表示
         cookingButton.OnClickAsObservable().Subscribe(_ =>
@@ -369,8 +371,7 @@ public class KitchenManager : MonoBehaviour
             return;
         }
 
-        var gameData = GameDataManager.GameData;
-        var cancelled = gameData.OrderIdInProgress == gameData.CancelOrderId;
+        var cancelled = cityGameData.OrderIdInProgress == cityGameData.CancelOrderId;
         if (cancelled)
         {
             return;
@@ -395,10 +396,9 @@ public class KitchenManager : MonoBehaviour
         tapPhoneDisposable = orderIndicatorView.TappedPhone.Take(1).Subscribe(_ =>
         {
             // タップで更新
-            var gameData = GameDataManager.GameData;
-            gameData.CompletedProductList.Clear();
-            gameData.OrderIdInProgress = nextOrderData.id;
-            gameData.OrderTextId = nextMessageList.FirstOrDefault(data => data.id > gameData.OrderTextId)?.id ?? nextMessageList[0].id;
+            cityGameData.CompletedProductList.Clear();
+            cityGameData.OrderIdInProgress = nextOrderData.id;
+            cityGameData.OrderTextId = nextMessageList.FirstOrDefault(data => data.id > cityGameData.OrderTextId)?.id ?? nextMessageList[0].id;
             GameDataManager.SaveGameData();
             
             SetPhoneTap();