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(); } }