From a5421655a27d60a4c2b9bd08ef44209f9fd7e345 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 8 Oct 2021 15:04:31 +0900 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E6=96=87=E3=82=AD=E3=83=A3=E3=83=B3?= =?UTF-8?q?=E3=82=BB=E3=83=AB=E6=99=82=E5=87=A6=E7=90=86=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs | 10 ++++++++-- .../MyGame/Scenes/Main/Scripts/KitchenManager.cs | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs index 20c305f7..a3b49bcc 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs @@ -59,8 +59,14 @@ public class BulkOrder : MonoBehaviour gameData.CancelOrderId = gameData.OrderIdInProgress; // カウントリセット gameData.OrderConditionCount = 0; - - TransitionManager.Instance.UnloadScene(GameScenes.BulkOrder); + + // キャンセルと同時に閉じる + transform.parent.SetLocalScale(0); + backgroundAnimator.SetTrigger(CloseTrigger); + this.CallWaitForSeconds(.25f, () => + { + TransitionManager.Instance.UnloadScene(GameScenes.BulkOrder); + }); })); TransitionManager.Instance.LoadSceneAdditive(GameScenes.BulkOrderCancel); }).AddTo(this); diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index 9922be2a..0e04f842 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -9,7 +9,7 @@ using UnityEngine.UI; public class KitchenManager : MonoBehaviour { - public static readonly string CancelCallbackTag = "BulkOrderCancelCallback"; + public static readonly string CancelCallbackTag = "KitchenCancelCallback"; [SerializeField] private Button cookingButton; [SerializeField] private Button adButton; [SerializeField] private KitchenView kitchenView;