From 9ceacd9400acb3e8bf0a20e174912d951d935c8b Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 14 Oct 2022 15:02:01 +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 --- .../MyGame/Scenes/Main/Scripts/AutoCookCaution.cs | 14 +++++++------- .../MyGame/Scenes/Main/Scripts/AutoCookDialog.cs | 15 ++++++++------- .../MyGame/Scenes/Main/Scripts/AutoCookView.cs | 6 +++--- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookCaution.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookCaution.cs index efc10340..fea7f8ed 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookCaution.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookCaution.cs @@ -23,7 +23,7 @@ namespace MyGame.Scenes.Main.Scripts private void Start() { var (earnList, discardList) = LocalCacheManager.Load<(IReadOnlyList, IReadOnlyList)>(AutoCookCompleteProductsTag); - var gameData = GameDataManager.GameData; + var cityGameData = GameDataManager.GetCurrentCityGameData(); var autoCookDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.AutoCookDataSheet); var autoCookData = autoCookDataList.First(data => data.level == gameData.AutoCookLevel); @@ -41,15 +41,15 @@ namespace MyGame.Scenes.Main.Scripts } // 自動調理セーブ - gameData.AutoCookProducts = Array.Empty(); + cityGameData.AutoCookProducts = Array.Empty(); 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/AutoCookDialog.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookDialog.cs index f5f97d0c..a211169d 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookDialog.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookDialog.cs @@ -27,9 +27,10 @@ namespace MyGame.Scenes.Main.Scripts private void Start() { - var gameData = GameDataManager.GameData; + var globalGameData = GameDataManager.GameData; + var cityGameData = GameDataManager.GetCurrentCityGameData(); var autoCookDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.AutoCookDataSheet); - var autoCookData = autoCookDataList.First(data => data.level == gameData.AutoCookLevel); + var autoCookData = autoCookDataList.First(data => data.level == cityGameData.AutoCookLevel); var maxLevel = autoCookDataList.Last().level; var isMaxLevel = autoCookData.level >= maxLevel; @@ -49,20 +50,20 @@ namespace MyGame.Scenes.Main.Scripts GetRewardDialog.ShowRewardVideo(GameScenes.AutomaticCookingMovie, AdManager.AD_PLACEMENT_AUTO, () => { // 自動調理開始 - gameData.AutoCookFinishTime = DateTime.UtcNow.AddHours(autoCookData.duration).ToBinary(); + cityGameData.AutoCookFinishTime = DateTime.UtcNow.AddHours(autoCookData.duration).ToBinary(); // レシピをランダムに並び替えて保存 - gameData.AutoCookProducts = gameData.MyRecipes.OrderBy(x => Random.value).ToArray(); - gameData.AddUseAutoCook(); + cityGameData.AutoCookProducts = globalGameData.MyRecipes.OrderBy(x => Random.value).ToArray(); + globalGameData.AddUseAutoCook(); GameDataManager.SaveGameData(); LocalCacheManager.Load(SuccessCallbackTag, null)?.Invoke(); LocalCacheManager.Remove(SuccessCallbackTag); }); }).AddTo(this); - cookerLevelText.text = isMaxLevel ? "MAX" : $"{gameData.AutoCookLevel}"; + cookerLevelText.text = isMaxLevel ? "MAX" : $"{cityGameData.AutoCookLevel}"; earnCountText.text = $"{autoCookData.earnCount}{ScriptLocalization.Unit.Amount}"; durationText.text = $"{autoCookData.duration}{ScriptLocalization.Unit.Hours}"; - usesCountText.text = isMaxLevel ? "--/--" : $"{gameData.AutoCookUsesCount}/{autoCookData.clearCount}"; + usesCountText.text = isMaxLevel ? "--/--" : $"{cityGameData.AutoCookUsesCount}/{autoCookData.clearCount}"; } public static void ShowDialog(Action onSuccess = null, Action onClose = null){ diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookView.cs index cde7b748..25ab90f7 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookView.cs @@ -58,9 +58,9 @@ namespace MyGame.Scenes.Main.Scripts public static bool CheckComplete() { - var gameData = GameDataManager.GameData; - var remainingTime = DateTime.FromBinary(gameData.AutoCookFinishTime).Subtract(DateTime.UtcNow); - return gameData.AutoCookProducts.Length != 0 && remainingTime.TotalSeconds <= 0; + var cityGameData = GameDataManager.GetCurrentCityGameData(); + var remainingTime = DateTime.FromBinary(cityGameData.AutoCookFinishTime).Subtract(DateTime.UtcNow); + return cityGameData.AutoCookProducts.Length != 0 && remainingTime.TotalSeconds <= 0; } public void SetActive(bool active)