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(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(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(); // 価格が高い順に破棄対象にする @@ -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(); + 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/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(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(_ => {