From 05cd34e727c0a6d1673c52dc3abbf72fdf669dae Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Fri, 12 Nov 2021 11:07:16 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs     | 7 +++----
 popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs
index 689ec0cc..3ed99bcd 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs
+++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs
@@ -158,7 +158,7 @@ public class BulkOrder : MonoBehaviour
                 LocalCacheManager.Save(Const.ProductViewTypeTag, ProductViewType.BulkOrder);
                 LocalCacheManager.Save(MaterialNumberTag, 1);
                 LocalCacheManager.Save(PopcornGameManager.CookingDataTag, productData);
-                TransitionManager.Instance.LoadSceneAdditive(GameScenes.RecipeChoice);
+                RecipeDetailView.ShowDialog();
             }).AddTo(itemView1);
             itemView1.gameObject.SetActive(true);
         }
@@ -185,7 +185,7 @@ public class BulkOrder : MonoBehaviour
                 LocalCacheManager.Save(Const.ProductViewTypeTag, ProductViewType.BulkOrder);
                 LocalCacheManager.Save(MaterialNumberTag, 2);
                 LocalCacheManager.Save(PopcornGameManager.CookingDataTag, productData);
-                TransitionManager.Instance.LoadSceneAdditive(GameScenes.RecipeChoice);
+                RecipeDetailView.ShowDialog();
             }).AddTo(itemView2);
             itemView2.gameObject.SetActive(true);
         }
@@ -209,10 +209,9 @@ public class BulkOrder : MonoBehaviour
             }
             itemView3.CookingButton.ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ =>
             {
-                LocalCacheManager.Save(Const.ProductViewTypeTag, ProductViewType.BulkOrder);
                 LocalCacheManager.Save(MaterialNumberTag, 3);
                 LocalCacheManager.Save(PopcornGameManager.CookingDataTag, productData);
-                TransitionManager.Instance.LoadSceneAdditive(GameScenes.RecipeChoice);
+                RecipeSelectDialog.ShowDialog(ProductViewType.BulkOrder);
             }).AddTo(itemView3);
             itemView3.gameObject.SetActive(true);
         }
diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs
index fba14a54..95df2208 100644
--- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs
+++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs
@@ -23,8 +23,6 @@ public class PanSelector : MonoBehaviour
         var panList = SpreadsheetDataManager.Instance.GetBaseDataList<PanData>(Const.PanDataSheet);
         var myPanList = panList.Where(data => GameDataManager.GameData.Pans.Contains(data.id)).ToList();
         var panCount = myPanList.Count;
-        Debug.Log(string.Join(",", panList.Select(data => data.id)));
-        Debug.Log(string.Join(",", GameDataManager.GameData.Pans));
         selectedPanData.Value = myPanList[0];
         selectedPanData.Subscribe(data =>
         {