diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs index 0df5870e..fb459ade 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs @@ -160,6 +160,7 @@ public class CornField : MonoBehaviour #if UNITY_EDITOR gameData.fertilizerTime = DateTime.UtcNow.AddSeconds(10 + fertilizerDuration).ToBinary(); #endif + gameData.AddUseFertiliser(); GameDataManager.SaveGameData(); additionView.IsStopDisapper = true; diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookDialog.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookDialog.cs index 2957de5d..f5f97d0c 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookDialog.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookDialog.cs @@ -52,6 +52,7 @@ namespace MyGame.Scenes.Main.Scripts gameData.AutoCookFinishTime = DateTime.UtcNow.AddHours(autoCookData.duration).ToBinary(); // レシピをランダムに並び替えて保存 gameData.AutoCookProducts = gameData.MyRecipes.OrderBy(x => Random.value).ToArray(); + gameData.AddUseAutoCook(); GameDataManager.SaveGameData(); LocalCacheManager.Load(SuccessCallbackTag, null)?.Invoke(); LocalCacheManager.Remove(SuccessCallbackTag); diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs index 7e971f50..034ee491 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs @@ -362,6 +362,12 @@ public class MissionManager : MonoBehaviour return gameData.adCount; case MissionCondition.VipCustomer: return gameData.TotalVipCustomer; + case MissionCondition.UseFertilizer: + return gameData.TotalUseFertiliser; + case MissionCondition.UseAdWalker: + return gameData.TotalUseAdWalker; + case MissionCondition.UseAutoCook: + return gameData.TotalUseAutoCook; default: return 0; } @@ -486,6 +492,12 @@ public class MissionManager : MonoBehaviour return gameData.DailyWatchVideo; case MissionCondition.VipCustomer: return gameData.DailyVipCustomer; + case MissionCondition.UseFertilizer: + return gameData.DailyUseFertiliser; + case MissionCondition.UseAdWalker: + return gameData.DailyUseAdWalker; + case MissionCondition.UseAutoCook: + return gameData.DailyUseAutoCook; default: return 0; } diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs index 53d65bbe..275d8824 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs @@ -145,6 +145,7 @@ public class MarketManager : MonoBehaviour #if UNITY_EDITOR gameData.increaseCustomerTime = DateTime.UtcNow.AddSeconds(10).ToBinary(); #endif + gameData.AddUseAdWalker(); GameDataManager.SaveGameData(); customerRewardTimerUpdateSubject.OnNext(Unit.Default); }); diff --git a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs index c6513f7c..48112e3c 100644 --- a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs +++ b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs @@ -191,6 +191,12 @@ public sealed class GameData { public int BulkOrderDeliveredCount; [DataMember(Name = "Data1007")] public int TotalVipCustomer { get; private set; } + [DataMember(Name = "Data1008")] + public int TotalUseFertiliser { get; private set; } + [DataMember(Name = "Data1009")] + public int TotalUseAdWalker { get; private set; } + [DataMember(Name = "Data1010")] + public int TotalUseAutoCook { get; private set; } public int TotalSales => TotalSalesList.Sum(data => data.Stock); public int RareTotalSales => TotalSalesList.Where(data => data.Rarity != ProductRarity.Normal).Sum(data => data.Stock); @@ -223,6 +229,12 @@ public sealed class GameData { public int DailyVipCustomer { get; private set; } [DataMember(Name = "Data2109")] public int DailyWatchVideo { get; private set; } + [DataMember(Name = "Data2110")] + public int DailyUseFertiliser { get; private set; } + [DataMember(Name = "Data2111")] + public int DailyUseAdWalker { get; private set; } + [DataMember(Name = "Data2112")] + public int DailyUseAutoCook { get; private set; } public int DailyTotalSales => DailyTotalSalesList.Sum(data => data.Stock); public int DailyRareTotalSales => DailyTotalSalesList.Where(data => data.Rarity != ProductRarity.Normal).Sum(data => data.Stock); @@ -312,6 +324,9 @@ public sealed class GameData { BulkOrderDeliveredCount = 0; adCount = 0; TotalVipCustomer = 0; + TotalUseFertiliser = 0; + TotalUseAdWalker = 0; + TotalUseAutoCook = 0; } public void ResetDailyTotalCount() @@ -325,6 +340,9 @@ public sealed class GameData { DailyBulkOrderDeliveredCount = 0; DailyWatchVideo = 0; DailyVipCustomer = 0; + DailyUseFertiliser = 0; + DailyUseAdWalker = 0; + DailyUseAutoCook = 0; } public void AddTastingCustomerCount(int value) @@ -374,6 +392,24 @@ public sealed class GameData { DailyWatchVideo++; } + public void AddUseFertiliser() + { + TotalUseFertiliser++; + DailyUseFertiliser++; + } + + public void AddUseAdWalker() + { + TotalUseAdWalker++; + DailyUseAdWalker++; + } + + public void AddUseAutoCook() + { + TotalUseAutoCook++; + DailyUseAutoCook++; + } + public void InitTank() { StorageTanks.Clear(); diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs index f3b2486b..82f2f712 100644 --- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs +++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs @@ -107,6 +107,9 @@ public enum MissionCondition RareChocolateGreenteaSalesCount = 55, WatchVideo = 56, VipCustomer = 57, + UseFertilizer = 58, + UseAdWalker = 59, + UseAutoCook = 60, } public enum MissionRewardType