From 9f0571bef9929c56f51548ca794926612b8eaa7d Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Fri, 4 Nov 2022 16:42:10 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=9E=E3=83=BC=E3=82=B1=E3=83=83=E3=83=88?=
 =?UTF-8?q?=E5=88=9D=E6=9C=9F=E5=8C=96=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MyGame/Scenes/marketing/Scripts/Market.cs |  1 -
 .../marketing/Scripts/WorldMarketManager.cs   | 19 ++++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs
index ad4387d2..ab5f2b00 100644
--- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs
+++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs
@@ -88,7 +88,6 @@ public class Market : MonoBehaviour
         IsLatestCity = GameDataUtils.CheckLatestCity(cityId);
         cityGameData = GameDataManager.GetCityGameData(cityId);
         globalGameData = GameDataManager.GameData;
-        UpdateBonus(ShopCustomize.GetBonusList(globalGameData.ShopCustomizeLevel));
         customerFlow.SetCityGameData(cityGameData);
 
         CheckAndFixStock();
diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/WorldMarketManager.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/WorldMarketManager.cs
index d793afef..c61dc219 100644
--- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/WorldMarketManager.cs
+++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/WorldMarketManager.cs
@@ -20,6 +20,7 @@ namespace MyGame.Scenes.marketing.Scripts
         public readonly ReactiveProperty<bool> IsPause = new();
         //cityIdごとにMarket保存
         private readonly Dictionary<int, Market> cityMarketDict = new();
+        private Dictionary<ShopCustomizeBonusCategory, (int bonusLevel, int value)> cacheBonusList = new();
         private void Start()
         {
             /*
@@ -77,16 +78,13 @@ namespace MyGame.Scenes.marketing.Scripts
             // GameDataManager.GameData.BrotherHeart = GameDataManager.GameData.Heart;
             // PartTimerManager.Instance.UpdateList();
 #endif
-            
+            cacheBonusList = ShopCustomize.GetBonusList(GameDataManager.GameData.ShopCustomizeLevel);
             // 各都市マーケット生成
-            var latestCityId = GameDataUtils.GetLatestCityId();
-            CreateMarket(Const.DefaultCityId).CheckPartTimerMode();
+            CreateMarket(Const.DefaultCityId);
             foreach (var (cityId, gameData) in GameDataManager.GameData.CityGameDataDict)
             {
-                if (!gameData.IsFundingCompleted) return;
-                var market = CreateMarket(cityId);
-                market.CheckPartTimerMode();
-                market.SetLatestCity(cityId == latestCityId);
+                if (!gameData.IsFundingCompleted) return; 
+                CreateMarket(cityId);
             }
         }
 
@@ -94,18 +92,20 @@ namespace MyGame.Scenes.marketing.Scripts
         {
             var market = Instantiate(marketPrefab, transform);
             market.Initialize(cityId);
+            market.UpdateBonus(cacheBonusList);
+            market.CheckPartTimerMode();
             cityMarketDict.Add(cityId, market);
             return market;
         }
 
         public Market GetMarket(int cityId)
         {
-            return cityMarketDict[cityId];
+            return cityMarketDict.ContainsKey(cityId) ? cityMarketDict[cityId] : CreateMarket(cityId);
         }
 
         public Market GetCurrentCityMarket()
         {
-            return cityMarketDict[GameDataManager.GameData.CurrentCityId];
+            return GetMarket(GameDataManager.GameData.CurrentCityId);
         }
 
         /// <summary>
@@ -137,6 +137,7 @@ namespace MyGame.Scenes.marketing.Scripts
         /// <param name="bonusList"></param>
         public void UpdateBonus(Dictionary<ShopCustomizeBonusCategory, (int bonusLevel, int value)> bonusList)
         {
+            cacheBonusList = bonusList;
             foreach (var (_, market) in cityMarketDict)
             {
                 market.UpdateBonus(bonusList);