diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs index 2bd20864..bdc65a15 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs @@ -257,128 +257,129 @@ public class MissionManager : MonoBehaviour public static int GetProgressValue(MissionData missionData) { var globalGameData = GameDataManager.GameData; + var cityGameData = GameDataManager.GetCurrentCityGameData(); switch (missionData.Condition) { case MissionCondition.CornCount: - return globalGameData.TotalAddCornSeed; + return cityGameData.TotalAddCornSeed; case MissionCondition.CustomerCount: // タップor来客した数 - return globalGameData.TotalCustomerCount; + return cityGameData.TotalCustomerCount; case MissionCondition.SalesCount: // 売った数 - return globalGameData.TotalSales; + return cityGameData.TotalSales; case MissionCondition.RareSalesCount: // レアを売った数 - return globalGameData.RareTotalSales; + return cityGameData.RareTotalSales; case MissionCondition.RecipeCount: // レシピの数 return globalGameData.MyRecipes.Length; case MissionCondition.CoinConsumeCount: // コイン消費数 - return globalGameData.TotalSubCoin; + return cityGameData.TotalSubCoin; case MissionCondition.BulkOrderDeliveredCount: - return globalGameData.BulkOrderDeliveredCount; + return cityGameData.BulkOrderDeliveredCount; case MissionCondition.SaltSalesCount: - return globalGameData.GetTotalSalesByFlavor(1); + return cityGameData.GetTotalSalesByFlavor(1); case MissionCondition.RareSaltSalesCount: - return globalGameData.GetTotalSalesByFlavorWithRare(1); + return cityGameData.GetTotalSalesByFlavorWithRare(1); case MissionCondition.CaramelSalesCount: - return globalGameData.GetTotalSalesByFlavor(2); + return cityGameData.GetTotalSalesByFlavor(2); case MissionCondition.RareCaramelSalesCount: - return globalGameData.GetTotalSalesByFlavorWithRare(2); + return cityGameData.GetTotalSalesByFlavorWithRare(2); case MissionCondition.PepperSalesCount: - return globalGameData.GetTotalSalesByFlavor(3); + return cityGameData.GetTotalSalesByFlavor(3); case MissionCondition.RarePepperSalesCount: - return globalGameData.GetTotalSalesByFlavorWithRare(3); + return cityGameData.GetTotalSalesByFlavorWithRare(3); case MissionCondition.HoneySalesCount: - return globalGameData.GetTotalSalesByFlavor(4); + return cityGameData.GetTotalSalesByFlavor(4); case MissionCondition.RareHoneySalesCount: - return globalGameData.GetTotalSalesByFlavorWithRare(4); + return cityGameData.GetTotalSalesByFlavorWithRare(4); case MissionCondition.CheeseSalesCount: - return globalGameData.GetTotalSalesByFlavor(5); + return cityGameData.GetTotalSalesByFlavor(5); case MissionCondition.RareCheeseSalesCount: - return globalGameData.GetTotalSalesByFlavorWithRare(5); + return cityGameData.GetTotalSalesByFlavorWithRare(5); case MissionCondition.SoysourceSalesCount: - return globalGameData.GetTotalSalesByFlavor(6); + return cityGameData.GetTotalSalesByFlavor(6); case MissionCondition.RareSoysourceSalesCount: - return globalGameData.GetTotalSalesByFlavorWithRare(6); + return cityGameData.GetTotalSalesByFlavorWithRare(6); case MissionCondition.StrawberrySalesCount: - return globalGameData.GetTotalSalesByFlavor(7); + return cityGameData.GetTotalSalesByFlavor(7); case MissionCondition.RareStrawberrySalesCount: - return globalGameData.GetTotalSalesByFlavorWithRare(7); + return cityGameData.GetTotalSalesByFlavorWithRare(7); case MissionCondition.GreenteaSalesCount: - return globalGameData.GetTotalSalesByFlavor(8); + return cityGameData.GetTotalSalesByFlavor(8); case MissionCondition.RareGreenteaSalesCount: - return globalGameData.GetTotalSalesByFlavorWithRare(8); + return cityGameData.GetTotalSalesByFlavorWithRare(8); case MissionCondition.ChocolateSalesCount: - return globalGameData.GetTotalSalesByFlavor(9); + return cityGameData.GetTotalSalesByFlavor(9); case MissionCondition.RareChocolateSalesCount: - return globalGameData.GetTotalSalesByFlavorWithRare(9); + return cityGameData.GetTotalSalesByFlavorWithRare(9); case MissionCondition.NoriSaltSalesCount: - return globalGameData.GetTotalSalesByFlavor(10); + return cityGameData.GetTotalSalesByFlavor(10); case MissionCondition.RareNoriSaltSalesCount: - return globalGameData.GetTotalSalesByFlavorWithRare(10); + return cityGameData.GetTotalSalesByFlavorWithRare(10); case MissionCondition.ButterSoysourceSalesCount: - return globalGameData.GetTotalSalesByFlavor(11); + return cityGameData.GetTotalSalesByFlavor(11); case MissionCondition.RareButterSoysourceSalesCount: - return globalGameData.GetTotalSalesByFlavorWithRare(11); + return cityGameData.GetTotalSalesByFlavorWithRare(11); case MissionCondition.PepperCheeseSalesCount: - return globalGameData.GetTotalSalesByFlavor(12); + return cityGameData.GetTotalSalesByFlavor(12); case MissionCondition.RarePepperCheeseSalesCount: - return globalGameData.GetTotalSalesByFlavorWithRare(12); + return cityGameData.GetTotalSalesByFlavorWithRare(12); case MissionCondition.SaltCaramelSalesCount: - return globalGameData.GetTotalSalesByFlavor(13); + return cityGameData.GetTotalSalesByFlavor(13); case MissionCondition.RareSaltCaramelSalesCount: - return globalGameData.GetTotalSalesByFlavorWithRare(13); + return cityGameData.GetTotalSalesByFlavorWithRare(13); case MissionCondition.NoriButterSalesCount: - return globalGameData.GetTotalSalesByFlavor(14); + return cityGameData.GetTotalSalesByFlavor(14); case MissionCondition.RareNoriButterSalesCount: - return globalGameData.GetTotalSalesByFlavorWithRare(14); + return cityGameData.GetTotalSalesByFlavorWithRare(14); case MissionCondition.MilkChocolateSalesCount: - return globalGameData.GetTotalSalesByFlavor(15); + return cityGameData.GetTotalSalesByFlavor(15); case MissionCondition.RareMilkChocolateSalesCount: - return globalGameData.GetTotalSalesByFlavorWithRare(15); + return cityGameData.GetTotalSalesByFlavorWithRare(15); case MissionCondition.CaramelCheeseSalesCount: - return globalGameData.GetTotalSalesByFlavor(16); + return cityGameData.GetTotalSalesByFlavor(16); case MissionCondition.RareCaramelCheeseSalesCount: - return globalGameData.GetTotalSalesByFlavorWithRare(16); + return cityGameData.GetTotalSalesByFlavorWithRare(16); case MissionCondition.HoneyButterSalesCount: - return globalGameData.GetTotalSalesByFlavor(17); + return cityGameData.GetTotalSalesByFlavor(17); case MissionCondition.RareHoneyButterSalesCount: - return globalGameData.GetTotalSalesByFlavorWithRare(17); + return cityGameData.GetTotalSalesByFlavorWithRare(17); case MissionCondition.GreenteaMilkSalesCount: - return globalGameData.GetTotalSalesByFlavor(18); + return cityGameData.GetTotalSalesByFlavor(18); case MissionCondition.RareGreenteaMilkSalesCount: - return globalGameData.GetTotalSalesByFlavorWithRare(18); + return cityGameData.GetTotalSalesByFlavorWithRare(18); case MissionCondition.StrawberryChocolaSalesCount: - return globalGameData.GetTotalSalesByFlavor(19); + return cityGameData.GetTotalSalesByFlavor(19); case MissionCondition.RareStrawberryChocolateSalesCount: - return globalGameData.GetTotalSalesByFlavorWithRare(19); + return cityGameData.GetTotalSalesByFlavorWithRare(19); case MissionCondition.NoriSoysourceSalesCount: - return globalGameData.GetTotalSalesByFlavor(20); + return cityGameData.GetTotalSalesByFlavor(20); case MissionCondition.RareNoriSoysourceSalesCount: - return globalGameData.GetTotalSalesByFlavorWithRare(20); + return cityGameData.GetTotalSalesByFlavorWithRare(20); case MissionCondition.SaltButterSalesCount: - return globalGameData.GetTotalSalesByFlavor(21); + return cityGameData.GetTotalSalesByFlavor(21); case MissionCondition.RareSaltButterSalesCount: - return globalGameData.GetTotalSalesByFlavorWithRare(21); + return cityGameData.GetTotalSalesByFlavorWithRare(21); case MissionCondition.StrawberryMilkSalesCount: - return globalGameData.GetTotalSalesByFlavor(22); + return cityGameData.GetTotalSalesByFlavor(22); case MissionCondition.RareStrawberryMilkSalesCount: - return globalGameData.GetTotalSalesByFlavorWithRare(22); + return cityGameData.GetTotalSalesByFlavorWithRare(22); case MissionCondition.SaltChocolateSalesCount: - return globalGameData.GetTotalSalesByFlavor(23); + return cityGameData.GetTotalSalesByFlavor(23); case MissionCondition.RareSaltChocolateSalesCount: - return globalGameData.GetTotalSalesByFlavorWithRare(23); + return cityGameData.GetTotalSalesByFlavorWithRare(23); case MissionCondition.ChocolateGreenteaSalesCount: - return globalGameData.GetTotalSalesByFlavor(24); + return cityGameData.GetTotalSalesByFlavor(24); case MissionCondition.RareChocolateGreenteaSalesCount: - return globalGameData.GetTotalSalesByFlavorWithRare(24); + return cityGameData.GetTotalSalesByFlavorWithRare(24); case MissionCondition.WatchVideo: - return globalGameData.adCount; + return cityGameData.adCount; case MissionCondition.VipCustomer: - return globalGameData.TotalVipCustomer; + return cityGameData.TotalVipCustomer; case MissionCondition.UseFertilizer: - return globalGameData.TotalUseFertiliser; + return cityGameData.TotalUseFertiliser; case MissionCondition.UseAdWalker: - return globalGameData.TotalUseAdWalker; + return cityGameData.TotalUseAdWalker; case MissionCondition.UseAutoCook: - return globalGameData.TotalUseAutoCook; + return cityGameData.TotalUseAutoCook; default: return 0; }