From faa0f8c56e0cc6ef6e7f1056944e1a4e4eac8e96 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Fri, 14 Oct 2022 15:22:55 +0900
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8B=95=E8=AA=BF=E7=90=86=E3=83=AF?=
 =?UTF-8?q?=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

---
 .../Main/Scripts/AutoCookCompleteView.cs      | 22 +++++++++----------
 .../Main/Scripts/AutoCookProgressView.cs      |  6 ++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookCompleteView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookCompleteView.cs
index ded61967..bc0f0a04 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookCompleteView.cs
+++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookCompleteView.cs
@@ -20,14 +20,14 @@ namespace MyGame.Scenes.Main.Scripts
         [SerializeField] private AutoCookPopcornView[] popcorns;
         private void Start()
         {
-            var gameData = GameDataManager.GameData;
+            var cityGameData = GameDataManager.GetCurrentCityGameData();
             var autoCookDataList = SpreadsheetDataManager.Instance.GetBaseDataList<AutoCookData>(Const.AutoCookDataSheet);
-            var autoCookData = autoCookDataList.First(data => data.level == gameData.AutoCookLevel);
+            var autoCookData = autoCookDataList.First(data => data.level == cityGameData.AutoCookLevel);
             
             // アイテムのリスト生成
             var productList = SpreadsheetDataManager.Instance.GetBaseDataList<ProductData>(Const.ProductDataSheet);
             var productCount = Mathf.CeilToInt((float)autoCookData.earnCount / Const.TankCapacity);
-            var earnIds = gameData.AutoCookProducts.Take(productCount).ToArray();
+            var earnIds = cityGameData.AutoCookProducts.Take(productCount).ToArray();
             var earnProductArray = productList
                 .Where(data => earnIds.Contains(data.id))
                 .Select(data => new ProductData(data, 1){volume = Const.TankCapacity})
@@ -41,7 +41,7 @@ namespace MyGame.Scenes.Main.Scripts
             earnProductArray.Last().volume = lastProductAmount;
             
             // タンクの空き確認
-            var emptyTankCount = gameData.StorageTanks.Count(tank => tank.IsEmpty);
+            var emptyTankCount = cityGameData.StorageTanks.Count(tank => tank.IsEmpty);
             var discardProductList = new List<ProductData>();
             
             // 価格が高い順に破棄対象にする
@@ -59,7 +59,7 @@ namespace MyGame.Scenes.Main.Scripts
                 else
                 {
                     // 空以外の補充可能な空きがあるタンクを優先して判定する
-                    if (gameData.StorageTanks.Exists(data => !data.IsEmpty && data.FlavorId == productData.id && data.Capacity - data.Stock >= productData.volume))
+                    if (cityGameData.StorageTanks.Exists(data => !data.IsEmpty && data.FlavorId == productData.id && data.Capacity - data.Stock >= productData.volume))
                     {
                         continue;
                     }
@@ -107,15 +107,15 @@ namespace MyGame.Scenes.Main.Scripts
                     }
                     
                     // 自動調理セーブ
-                    gameData.AutoCookProducts = Array.Empty<int>();
+                    cityGameData.AutoCookProducts = Array.Empty<int>();
                     var maxLevel = autoCookDataList.Last().level;
-                    if (gameData.AutoCookLevel < maxLevel)
+                    if (cityGameData.AutoCookLevel < maxLevel)
                     {
-                        gameData.AutoCookUsesCount++;
-                        if (gameData.AutoCookUsesCount >= autoCookData.clearCount)
+                        cityGameData.AutoCookUsesCount++;
+                        if (cityGameData.AutoCookUsesCount >= autoCookData.clearCount)
                         {
-                            gameData.AutoCookUsesCount = 0;
-                            gameData.AutoCookLevel++;
+                            cityGameData.AutoCookUsesCount = 0;
+                            cityGameData.AutoCookLevel++;
                         }
                     }
                     GameDataManager.SaveGameData();
diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookProgressView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookProgressView.cs
index 93e3ea97..f8718984 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookProgressView.cs
+++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookProgressView.cs
@@ -26,10 +26,10 @@ namespace MyGame.Scenes.Main.Scripts
 
         private void Start()
         {
-            var gameData = GameDataManager.GameData;
+            var cityGameData = GameDataManager.GetCurrentCityGameData();
             var autoCookDataList = SpreadsheetDataManager.Instance.GetBaseDataList<AutoCookData>(Const.AutoCookDataSheet);
-            var autoCookData = autoCookDataList.First(data => data.level == gameData.AutoCookLevel);
-            var remainingTime = DateTime.FromBinary(gameData.AutoCookFinishTime).Subtract(DateTime.UtcNow);
+            var autoCookData = autoCookDataList.First(data => data.level == cityGameData.AutoCookLevel);
+            var remainingTime = DateTime.FromBinary(cityGameData.AutoCookFinishTime).Subtract(DateTime.UtcNow);
 
             closeButton.OnClickAsObservable().Take(1).Subscribe(_ =>
             {