Merge branch 'feature/update_ver1.2.0' of bitbucket.org:usaya/popcorn into feature/update_ver1.2.0

popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs

@@ -32,6 +32,7 @@ public class DebugOptionManager : MonoBehaviour
     [SerializeField] private Toggle vipRewardToggle;
     [SerializeField] private InputField coinCount;
     [SerializeField] private InputField heartCount;
+    [SerializeField] private Dropdown bulkOrderDropdown;
 #if UNITY_EDITOR || DEVELOPMENT_BUILD
     // Start is called before the first frame update
     void Start()
@@ -173,6 +174,40 @@ public class DebugOptionManager : MonoBehaviour
             gameData.Heart = Int32.Parse(x);
         }).AddTo(this);
         
+        bulkOrderDropdown.ClearOptions();
+        var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderData>(Const.BulkOrderDataSheet);
+        var nextOrderList = bulkOrderList
+            .Where(data => data.shopLevel == gameData.AchievedOrderLevel + 1)
+            .ToList();
+        var bkpDeliveredOrder = gameData.DeliveredOrder.ToList();
+        if (nextOrderList.Count > 0)
+        {
+            var len = nextOrderList.Count;
+            var index = nextOrderList.FindIndex(data => data.id == gameData.OrderIdInProgress);
+            bulkOrderDropdown.AddOptions(nextOrderList.Select(data => $"id:{data.id}").ToList());
+            // 現在のIDをデフォで設定
+            if (index != -1)
+            {
+                bulkOrderDropdown.value = index;
+            }
+            bulkOrderDropdown.OnValueChangedAsObservable()
+                .Skip(1)
+                .DistinctUntilChanged()
+                .Subscribe(x =>
+                {
+                    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;
+                }).AddTo(this);
+        }
+
+
         // debugfielddata
         // gameData.PlantLines = new List<PlantLineData>
         // {

popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingConfirmation.unity

@@ -269,6 +269,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 021717b65b165374faa3fcffaafedfc2, type: 3}
+--- !u!20 &98094814 stripped
+Camera:
+  m_CorrespondingSourceObject: {fileID: 9117079084301130544, guid: 021717b65b165374faa3fcffaafedfc2,
+    type: 3}
+  m_PrefabInstance: {fileID: 98094813}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &288409567
 GameObject:
   m_ObjectHideFlags: 0
@@ -472,9 +478,9 @@ Canvas:
   m_GameObject: {fileID: 451409092}
   m_Enabled: 1
   serializedVersion: 3
-  m_RenderMode: 0
+  m_RenderMode: 1
-  m_Camera: {fileID: 0}
+  m_Camera: {fileID: 98094814}
-  m_PlaneDistance: 100
+  m_PlaneDistance: 0
   m_PixelPerfect: 0
   m_ReceivesEvents: 1
   m_OverrideSorting: 0
@@ -1154,10 +1160,10 @@ RectTransform:
   m_Father: {fileID: 451409096}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0.00004196167}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 2048, y: 2732}
+  m_SizeDelta: {x: 0, y: 300}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1105771975
 GameObject:

popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs

@@ -337,7 +337,7 @@ public class KitchenManager : MonoBehaviour
             {
 #if UNITY_EDITOR
                 // オーダーリストがすべて達成済みの場合エラー
-                Debug.LogError($"店舗レベル{nextOrderLevel}に受けられるオーダーがありませんデータを確認してください\n" +
+                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}")}");