diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index 869b0a3c..dbe5058e 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -36,6 +36,29 @@ public class KitchenManager : MonoBehaviour RecipeSelectDialog.ShowDialog(ProductViewType.Default); }); + // 大量注文データ + var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.BulkOrderDataSheet); + var bulkOrderData = bulkOrderList.FirstOrDefault(data => data.id == gameData.OrderIdInProgress); + var achieved = bulkOrderData is null || gameData.DeliveredOrder.Contains(bulkOrderData.id) || gameData.AchievedOrderLevel == bulkOrderData.shopLevel; + var cancelled = gameData.OrderIdInProgress == gameData.CancelOrderId; + + // 大量注文達成通知 + if (bulkOrderData == null) + { + orderIndicatorView.SetBadgeActive(false); + } + else + { + var orderList = new List + { + bulkOrderData.productId1, + bulkOrderData.productId2, + bulkOrderData.productId3, + }; + var completed = gameData.CompletedProductList.Count == orderList.Count(x => x != 0); + orderIndicatorView.SetBadgeActive(completed && !achieved && !cancelled); + } + // tutorial if (!gameData.FinishedFlags.HasFlag(TutorialFlag.FirstPlay)) { @@ -176,38 +199,15 @@ public class KitchenManager : MonoBehaviour } #if UNITY_EDITOR Debug.Log($"remaining: {remaining}"); + Market.StockFlavorLog(); #endif - - // 大量注文 - var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.BulkOrderDataSheet); var result = CheckBulkOrder(); - var bulkOrderData = bulkOrderList.FirstOrDefault(data => data.id == gameData.OrderIdInProgress); - var achieved = bulkOrderData is null || gameData.DeliveredOrder.Contains(bulkOrderData.id) || gameData.AchievedOrderLevel == bulkOrderData.shopLevel; - var cancelled = gameData.OrderIdInProgress == gameData.CancelOrderId; - GameDataManager.SaveGameData(); - - if (bulkOrderData != null) - { - var orderList = new List - { - bulkOrderData.productId1, - bulkOrderData.productId2, - bulkOrderData.productId3, - }; - var completed = gameData.CompletedProductList.Count == orderList.Count(x => x != 0); - orderIndicatorView.SetBadgeActive(completed && !achieved && !cancelled); - } - else - { - orderIndicatorView.SetBadgeActive(false); - } - orderIndicatorView.SetIndicate(result.newOrder, achieved || cancelled); if (LocalCacheManager.Load(Const.ProductViewTypeTag, ProductViewType.Default) == ProductViewType.BulkOrder) { BulkOrderShowDialogWithSetup(); } - + if (!result.newOrder) { if (gameData.OrderIdInProgress != gameData.CancelOrderId) @@ -257,10 +257,6 @@ public class KitchenManager : MonoBehaviour }).AddTo(this); }).AddTo(this); } - -#if UNITY_EDITOR - Market.StockFlavorLog(); -#endif } private void BulkOrderShowDialogWithSetup()