From af9049e78c70f347138ef758eda843903a8f7fcf Mon Sep 17 00:00:00 2001 From: kimura Date: Mon, 11 Oct 2021 19:26:15 +0900 Subject: [PATCH] =?UTF-8?q?=E7=B4=8D=E5=93=81=E5=BE=8C=E3=81=AEUI=E9=9D=9E?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs | 4 ++++ .../MyGame/Scenes/Main/Scripts/BulkOrderCancelView.cs | 4 ++-- .../Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs | 7 ++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs index 2dea523c..4c6947b2 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs @@ -35,6 +35,10 @@ public class BulkOrderAchievedView : MonoBehaviour { callback.Invoke(); } + if (LocalCacheManager.Load(KitchenManager.ArchivedCallbackTag, null) is Action kitchenCallback) + { + kitchenCallback.Invoke(); + } transform.parent.SetLocalScale(0); backgroundAnimator.SetTrigger(CloseTrigger); this.CallWaitForSeconds(.25f, () => diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderCancelView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderCancelView.cs index 92b300a2..68d8d48b 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderCancelView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderCancelView.cs @@ -36,9 +36,9 @@ public class BulkOrderCancelView : MonoBehaviour { callback.Invoke(); } - if (LocalCacheManager.Load(KitchenManager.CancelCallbackTag, null) is Action callback2) + if (LocalCacheManager.Load(KitchenManager.ArchivedCallbackTag, null) is Action kitchenCallback) { - callback2.Invoke(); + kitchenCallback.Invoke(); } transform.parent.SetLocalScale(0); backgroundAnimator.SetTrigger(CloseTrigger); diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index a02217a8..3ed784c6 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 = "KitchenCancelCallback"; + public static readonly string ArchivedCallbackTag = "KitchenCancelCallback"; [SerializeField] private Button cookingButton; [SerializeField] private Button adButton; [SerializeField] private KitchenView kitchenView; @@ -48,10 +48,11 @@ public class KitchenManager : MonoBehaviour // 大量注文 var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.BulkOrderDataSheet); + var bulkOrderData = bulkOrderList.First(data => data.id == gameData.OrderIdInProgress); var result = CheckBulkOrder(); - var achieved = HeartMeter.Instance.ShopLevel.Value == gameData.AchievedOrderLevel; + var achieved = bulkOrderData.shopLevel == gameData.AchievedOrderLevel; GameDataManager.SaveGameData(); - LocalCacheManager.Save(CancelCallbackTag, new Action(() => + LocalCacheManager.Save(ArchivedCallbackTag, new Action(() => { orderIndicatorView.SetIndicate(false, true); }));