From bac22de7266c4820439b6213300fccda523a9a06 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 8 Apr 2022 15:36:03 +0900 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=87=8F=E6=B3=A8=E6=96=87=E4=BE=8B?= =?UTF-8?q?=E5=A4=96=E5=AF=BE=E7=AD=96/=E3=82=A8=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E3=83=AD=E3=82=B0=E5=87=BA=E5=8A=9B=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/Main/Scripts/KitchenManager.cs | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index feb87ce2..d55bb73d 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -325,9 +325,24 @@ public class KitchenManager : MonoBehaviour else if (achieved || gameData.OrderIdInProgress == gameData.CancelOrderId && gameData.CancelOrderId > 0) { // 達成済みか、キャンセルされた場合次のIDを設定 + // 未達成のオーダー var orderList = nextOrderList.Where(data => !gameData.DeliveredOrder.Contains(data.id)).ToList(); - var nextIndex = orderList.FindIndex(data => data.id > gameData.OrderIdInProgress); - nextOrderId = orderList[Mathf.Max(0, nextIndex)].id; + + if (orderList.Count > 0) + { + var nextIndex = orderList.FindIndex(data => data.id > gameData.OrderIdInProgress); + nextOrderId = orderList[Mathf.Max(0, nextIndex)].id; + } + else + { +#if UNITY_EDITOR + // オーダーリストがすべて達成済みの場合エラー + Debug.LogError($"店舗レベル{nextOrderLevel}に受けられるオーダーがありませんデータを確認してください\n" + + $"maxOrder:{nextOrderList[0].maxOrder}\n" + + $"delivered:{gameData.DeliveredOrder.Aggregate(string.Empty, (s, data) => $"{s}, {data}")}\n" + + $"orderList:{nextOrderList.Aggregate(string.Empty, (s, data) => $"{s}, {data.id}")}"); +#endif + } } if (gameData.OrderIdInProgress == nextOrderId)