From 02a3ef7512a6ae6da8403c5c3971bac0b75a8a8c Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 13 Apr 2022 18:51:45 +0900 Subject: [PATCH] =?UTF-8?q?DebugOption=E3=81=AE=E6=8C=87=E5=AE=9A=E3=81=A7?= =?UTF-8?q?=E3=81=8D=E3=82=8B=E5=A4=A7=E9=87=8F=E6=B3=A8=E6=96=87=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/DebugOption/Scripts/DebugOptionManager.cs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) 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;