From dc75faf6485fc7cb6727a5118a19ced77799e465 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Tue, 1 Nov 2022 15:16:54 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=9F=E3=83=83=E3=83=88=E6=8A=9C?=
 =?UTF-8?q?=E3=81=91=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       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs
index e676c3b7..c71bed3e 100644
--- a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs
+++ b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs
@@ -150,7 +150,7 @@ public class DebugOptionManager : MonoBehaviour
 
         shopLevelUpResetButton.OnClickAsObservable().Subscribe(_ =>
         {
-            gameData.ViewedShopLevel = 0;
+            globalGameData.ViewedShopLevel = 0;
         }).AddTo(this);
 
         dailyMissionResetButton.OnClickAsObservable().Subscribe(_ =>
@@ -300,8 +300,9 @@ public class DebugOptionManager : MonoBehaviour
                     globalGameData.DeliveredOrder.Clear();
                     globalGameData.AchievedOrderLevel = nextOrderList[x].shopLevel - 1;
                     // 1つ前のオーダーを現在のオーダーに設定
-                    var prevOrder = nextOrderList[(len + x - 1) % len];
-                    gameData.OrderIdInProgress = gameData.CancelOrderId = prevOrder.id;
+                    var prevOrderId = x - 1 < 0 ? 0 : nextOrderList[x - 1].id;
+                    globalGameData.OrderIdInProgress = globalGameData.CancelOrderId = prevOrderId;
+                    if (nextOrderList[x].maxOrder > 1) globalGameData.DeliveredOrder.Add(prevOrderId);
                     // 即座に通知を発生
                     globalGameData.OrderConditionCount = 99999;
                 }).AddTo(this);