From e299e4f3dd2a1922acae7e527d2ecb37921971e6 Mon Sep 17 00:00:00 2001 From: kimura Date: Mon, 14 Nov 2022 17:58:13 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AF=E3=83=BC=E3=83=AB=E3=83=89=E3=83=9E?= =?UTF-8?q?=E3=83=83=E3=83=97=E3=83=90=E3=82=A4=E3=83=88=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/WorldMap/Scripts/WorldMap.cs | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/WorldMap.cs b/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/WorldMap.cs index 4030cb9d..6e0db18f 100644 --- a/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/WorldMap.cs +++ b/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/WorldMap.cs @@ -104,7 +104,7 @@ namespace MyGame.Scenes.WorldMap.Scripts } // バイト強化可能か判定 - if (PartTimerManager.CheckLevelUp(cityIcon.CityId)) + if (!GameDataUtils.CheckLatestCity(cityIcon.CityId) && PartTimerManager.CheckLevelUp(cityIcon.CityId)) { // 強化可能 cityIcon.SetNotify(true); @@ -129,12 +129,9 @@ namespace MyGame.Scenes.WorldMap.Scripts // 指定の都市に遷移 earningView.OnClick.Subscribe(_ => { - globalGameData.CurrentCityId = cityIcon.CityId; - WorldMarketManager.Instance.UpdateCurrentCity(cityIcon.CityId); - GameDataObserver.Instance.ChangeCity(cityIcon.CityId); - GameDataObserver.Instance.CheckMissionProgress(); - TransitionManager.Instance.LoadScene(GameScenes.Main); + ChangeCity(cityIcon.CityId); LocalCacheManager.Save(Const.ChangeCityFlagTag, true); + TransitionManager.Instance.LoadScene(GameScenes.Main); }).AddTo(citySelectDisposable); } fundingView.ResetView(); @@ -223,5 +220,13 @@ namespace MyGame.Scenes.WorldMap.Scripts var coinProgress = (float)partTimerData.sales / 10 * elapsed / partTimerData.maxSales; return (heartProgress, coinProgress); } + + public static void ChangeCity(int cityId) + { + GameDataManager.GameData.CurrentCityId = cityId; + WorldMarketManager.Instance.UpdateCurrentCity(cityId); + GameDataObserver.Instance.ChangeCity(cityId); + GameDataObserver.Instance.CheckMissionProgress(); + } } } \ No newline at end of file