diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs index baff2073..b2a39252 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs @@ -358,6 +358,10 @@ public class MissionManager : MonoBehaviour return gameData.GetTotalSalesByFlavor(24); case MissionCondition.RareChocolateGreenteaSalesCount: return gameData.GetTotalSalesByFlavorWithRare(24); + case MissionCondition.WatchVideo: + return gameData.adCount; + case MissionCondition.VipCustomer: + return gameData.TotalVipCustomer; default: return 0; } @@ -478,6 +482,10 @@ public class MissionManager : MonoBehaviour return gameData.GetDailyTotalSalesByFlavor(24); case MissionCondition.RareChocolateGreenteaSalesCount: return gameData.GetDailyTotalSalesByFlavorWithRare(24); + case MissionCondition.WatchVideo: + return gameData.DailyWatchVideo; + case MissionCondition.VipCustomer: + return gameData.DailyVipCustomer; default: return 0; } diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/CustomerController.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/CustomerController.cs index acdcc491..4db5bcca 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/CustomerController.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/CustomerController.cs @@ -37,6 +37,7 @@ public enum CustomerState public class CustomerController : MonoBehaviour { public int OrderCount; + public CustomerType CustomerType; public CustomerAnimator CustomerPrefab; public bool IsPause; diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs index 2ac78b1f..8c13b304 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs @@ -207,6 +207,7 @@ public class Market : SingletonMonoBehaviour // 獲得処理(遅延追加用変数に加算) gameData.WaitAddCoin += coin; gameData.WaitAddHeart += customers.Count; + gameData.AddVipCustomerCount(customers.Count(data => data.CustomerType == CustomerType.Vip)); GameDataManager.SaveGameData(); // 商品補充 @@ -322,6 +323,7 @@ public class Market : SingletonMonoBehaviour // 複数パターンある場合ChooseRandom customerController.CustomerPrefab = isSpecial ? customerData.ChooseSpecialPrefab() : customerData.ChooseNormalPrefab(); customerController.OrderCount = orderCount; + customerController.CustomerType = customerType; customerControllerList.Add(customerController); customerController.TappedObservable diff --git a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs index 863294c2..c6513f7c 100644 --- a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs +++ b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs @@ -189,6 +189,8 @@ public sealed class GameData { public List TotalSalesList { get; private set; } [DataMember(Name = "Data1006")] public int BulkOrderDeliveredCount; + [DataMember(Name = "Data1007")] + public int TotalVipCustomer { 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); @@ -217,6 +219,10 @@ public sealed class GameData { public int DailyRecipeGetCount; [DataMember(Name = "Data2107")] public int DailyBulkOrderDeliveredCount; + [DataMember(Name = "Data2108")] + public int DailyVipCustomer { get; private set; } + [DataMember(Name = "Data2109")] + public int DailyWatchVideo { 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); @@ -252,6 +258,12 @@ public sealed class GameData { DailyTotalCustomerCount += value; } + public void AddVipCustomerCount(int value) + { + TotalVipCustomer += value; + DailyVipCustomer += value; + } + public void AddSalesCount(int id, int stock, ProductRarity rarity) { OrderConditionCount += stock; @@ -298,6 +310,8 @@ public sealed class GameData { TotalCustomerCount = 0; TotalSalesList.Clear(); BulkOrderDeliveredCount = 0; + adCount = 0; + TotalVipCustomer = 0; } public void ResetDailyTotalCount() @@ -309,6 +323,8 @@ public sealed class GameData { DailyTotalSalesList.Clear(); DailyRecipeGetCount = 0; DailyBulkOrderDeliveredCount = 0; + DailyWatchVideo = 0; + DailyVipCustomer = 0; } public void AddTastingCustomerCount(int value) @@ -354,7 +370,8 @@ public sealed class GameData { } public void AddAdCount(){ - ++adCount; + adCount++; + DailyWatchVideo++; } public void InitTank() diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs index 198e5981..5b5b55d9 100644 --- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs +++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs @@ -105,6 +105,8 @@ public enum MissionCondition RareSaltChocolateSalesCount = 53, ChocolateGreenteaSalesCount = 54, RareChocolateGreenteaSalesCount = 55, + WatchVideo = 56, + VipCustomer = 57, } public enum MissionRewardType