diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index 90a5fb4d..1022ece6 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -368,17 +368,16 @@ public class KitchenManager : MonoBehaviour private (bool newOrder, int nextOrderId, int nextOrderLevel) CheckBulkOrder() { var gameData = GameDataManager.GameData; - var nextOrderLevel = gameData.AchievedOrderLevel + 1; + var nextOrderLevel = 0; var nextOrderId = gameData.OrderIdInProgress; var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.BulkOrderDataSheet); - - // 店舗レベルより大量注文レベルが大きい場合オーダーなし - if (gameData.ViewedShopLevel < nextOrderLevel) + if (!(bulkOrderList.FirstOrDefault(data => data.shopLevel >= gameData.AchievedOrderLevel + 1) is BulkOrderData bulkOrderData)) { return (false, nextOrderId, nextOrderLevel); } - // 大量注文レベルが上限の場合オーダーなし - if (bulkOrderList.FirstOrDefault(data => data.shopLevel >= gameData.AchievedOrderLevel + 1) is null) + + nextOrderLevel = bulkOrderData.shopLevel; + if (gameData.ViewedShopLevel < nextOrderLevel) { return (false, nextOrderId, nextOrderLevel); }