From 1108e17eb6069929072913a8453f1fd1b47b35cb Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 3 Feb 2022 12:09:48 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=BF=E3=82=B9=E3=82=AF=E3=82=AD=E3=83=AB?= =?UTF-8?q?=E5=BE=A9=E5=B8=B0=E7=94=A8=E3=81=AE=E3=83=9D=E3=83=83=E3=83=97?= =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=B3=E5=8A=A0=E7=AE=97=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs | 6 ++++++ popcorn/Assets/MyGame/Scripts/GameDataManager.cs | 7 +++++-- popcorn/Assets/MyGame/Scripts/InitializeUnitySettings.cs | 2 ++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs index f1c1992d..519f2f61 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs @@ -219,6 +219,12 @@ public class CookingResult : MonoBehaviour return hasSpace && hasMaterials; } + public static void MoveStock(ProductStockData productStockData) + { + AddStock(productStockData); + productStockData.Stock = 0; + } + public static void AddStock(ProductData productData, ProductRarity rarity = ProductRarity.Normal) { AddStock(new ProductStockData{FlavorId = productData.id, Stock = productData.volume, Rarity = rarity}); diff --git a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs index c6c44f18..81b65cbe 100644 --- a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs +++ b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs @@ -142,8 +142,10 @@ public sealed class GameData { public int WaitAddCoin; [DataMember(Name = "Data41")] public int WaitAddHeart; - - // mission + [DataMember(Name = "Data42")] + public ProductStockData WaitAddStock; + + // mission [DataMember(Name = "Data1001")] public int TotalAddCoin { get; private set; } [DataMember(Name = "Data1002")] @@ -387,6 +389,7 @@ public sealed class GameData { dailyMissionIdArray = dailyMissionIdArray ?? new int[0]; dailyMissionAchievedIdArray = dailyMissionAchievedIdArray ?? new int[0]; DailyTotalSalesList = DailyTotalSalesList ?? new List(); + WaitAddStock = WaitAddStock ?? new ProductStockData{Rarity = ProductRarity.Normal}; } private Dictionary ArrayToDictionary(KeyValueOfintint[] array){ var dictionary = new Dictionary(); diff --git a/popcorn/Assets/MyGame/Scripts/InitializeUnitySettings.cs b/popcorn/Assets/MyGame/Scripts/InitializeUnitySettings.cs index cd7ed8de..cf3f0ee7 100644 --- a/popcorn/Assets/MyGame/Scripts/InitializeUnitySettings.cs +++ b/popcorn/Assets/MyGame/Scripts/InitializeUnitySettings.cs @@ -30,6 +30,8 @@ public sealed class InitializeUnitySettings : MonoBehaviour { // 遅延させていたパラメータを追加 GameDataManager.GameData.MoveAllWaitValue(); + // 調理後リザルトでの仮獲得データを反映（タスクキル対策） + CookingResult.MoveStock(GameDataManager.GameData.WaitAddStock); GameDataManager.SaveGameData(); } }