From e82750e7caa69b17dc09dd524d041497008f8faf Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 21 Apr 2022 16:54:26 +0900 Subject: [PATCH] =?UTF-8?q?revert=20=E5=A4=A7=E9=87=8F=E6=B3=A8=E6=96=87ne?= =?UTF-8?q?xtOrder=E5=88=A4=E5=AE=9A=E5=87=A6=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/Main/Scripts/KitchenManager.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) 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); }