diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs index ee4be163..9acf11d2 100644 --- a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs @@ -211,9 +211,8 @@ public class DebugOptionManager : MonoBehaviour bulkOrderDropdown.ClearOptions(); var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.BulkOrderDataSheet); var nextOrderList = bulkOrderList - .Where(data => data.shopLevel == gameData.AchievedOrderLevel + 1) + .Where(data => data.shopLevel <= gameData.ViewedShopLevel) .ToList(); - var bkpDeliveredOrder = gameData.DeliveredOrder.ToList(); if (nextOrderList.Count > 0) { var len = nextOrderList.Count; @@ -229,12 +228,10 @@ public class DebugOptionManager : MonoBehaviour .DistinctUntilChanged() .Subscribe(x => { + // オーダー達成状況をリセット + gameData.DeliveredOrder.Clear(); + // 1つ前のオーダーを現在のオーダーに設定 var prevOrder = nextOrderList[(len + x - 1) % len]; - var order = nextOrderList[x]; - // 未達成に設定 - gameData.DeliveredOrder = bkpDeliveredOrder; - gameData.DeliveredOrder.Remove(order.id); - // 1つ前のオーダーを設定 gameData.OrderIdInProgress = gameData.CancelOrderId = prevOrder.id; // 即座に通知を発生 gameData.OrderConditionCount = 99999;