From 3d62cbcff88cbc8b825752ecc0ae944474c5f99b Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Fri, 12 Nov 2021 20:15:14 +0900
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=87=8F=E6=B3=A8=E6=96=87=E5=8F=97?=
 =?UTF-8?q?=E6=B3=A8=E7=9B=B4=E5=BE=8C=E3=81=AB=E3=82=AD=E3=83=A3=E3=83=B3?=
 =?UTF-8?q?=E3=82=BB=E3=83=AB=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E3=81=AE?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scenes/Main/Scripts/BulkOrderNotifyView.cs   | 10 +++++++++-
 .../MyGame/Scenes/Main/Scripts/KitchenManager.cs | 16 ++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs
index ff77445f..bb8c649f 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs
+++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs
@@ -7,6 +7,7 @@ using UnityEngine.UI;
 
 public class BulkOrderNotifyView : MonoBehaviour
 {
+    private static readonly string CallbackTag = "BulkOrderNotifyViewCallback";
     private static readonly int OpenTrigger = Animator.StringToHash("OpenTrigger");
     private static readonly int CloseTrigger = Animator.StringToHash("CloseTrigger");
     [SerializeField] private Animator backgroundAnimator;
@@ -66,13 +67,20 @@ public class BulkOrderNotifyView : MonoBehaviour
         }
         closeButton.OnClickAsObservable().Take(1).Subscribe(_ =>
         {
+            LocalCacheManager.Load<Action>(CallbackTag, null)?.Invoke();
+            LocalCacheManager.Remove(CallbackTag);
             transform.parent.SetLocalScale(0);
             backgroundAnimator.SetTrigger(CloseTrigger);
             this.CallWaitForSeconds(.25f, () =>
             {
                 TransitionManager.Instance.UnloadScene(GameScenes.BulkOrderTelephone);
-                TransitionManager.Instance.LoadSceneAdditive(GameScenes.BulkOrder);
             });
         }).AddTo(this);
     }
+
+    public static void ShowDialog(Action onComplete = null)
+    {
+        LocalCacheManager.Save(CallbackTag, onComplete);
+        TransitionManager.Instance.LoadSceneAdditive(GameScenes.BulkOrderTelephone);
+    }
 }
diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
index ac53072c..c74ae302 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
+++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
@@ -189,13 +189,25 @@ public class KitchenManager : MonoBehaviour
                 
                 var orderData = bulkOrderList.First(data => data.id == result.nextOrderId);
                 LocalCacheManager.Save(BulkOrder.DataTag, orderData);
-                TransitionManager.Instance.LoadSceneAdditive(GameScenes.BulkOrderTelephone);
+                BulkOrderNotifyView.ShowDialog(() =>
+                {
+                    BulkOrder.ShowDialog(
+                        onAchieved: () =>
+                        {
+                            orderIndicatorView.SetIndicate(false, true);
+                            orderIndicatorView.SetBadgeActive(false);
+                        },
+                        onCancel: () =>
+                        {
+                            orderIndicatorView.SetIndicate(false, true);
+                            orderIndicatorView.SetBadgeActive(false);
+                        });
+                });
                 
                 // 通知をタップ後タップ動作を切り替える
                 orderIndicatorView.SetIndicate(false, false);
                 orderIndicatorView.TappedPhone
                     .ThrottleFirst(TimeSpan.FromSeconds(1f))
-                    .Take(1)
                     .Subscribe(__ =>
                     {
                         BulkOrder.ShowDialog(