From b1de1c25147a8076e4aaef04ba88ff8c0cee92a4 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 4 Feb 2022 17:07:57 +0900 Subject: [PATCH] =?UTF-8?q?=E5=8B=95=E7=94=BB=E3=83=AA=E3=83=AF=E3=83=BC?= =?UTF-8?q?=E3=83=89=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0=E3=82=92?= =?UTF-8?q?=E9=96=89=E3=81=98=E3=81=9F=E3=81=A8=E3=81=8D=E3=81=AE=E3=82=B3?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=83=90=E3=83=83=E3=82=AF=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/MyGame/Scripts/GetRewardDialog.cs | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs b/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs index 498cc366..f761ae11 100644 --- a/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs +++ b/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs @@ -18,6 +18,7 @@ namespace MyGame.Scripts VipCustomer } private static readonly string OkCallbackTag = "GetRewardDialogOkCallbackTag"; + private static readonly string CloseCallbackTag = "GetRewardDialogCloseCallbackTag"; private static readonly string RewardTypeTag = "GetRewardDialogRewardTypeTag"; private static readonly int OpenTrigger = Animator.StringToHash("OpenTrigger"); @@ -89,6 +90,8 @@ namespace MyGame.Scripts backgroundAnimator.SetTrigger(CloseTrigger); this.CallWaitForSeconds(.25f, () => { + LocalCacheManager.Load(CloseCallbackTag, null)?.Invoke(); + LocalCacheManager.Remove(CloseCallbackTag); TransitionManager.Instance.UnloadScene(GameScenes.WatchMovieCoin); }); }).AddTo(this); @@ -115,36 +118,37 @@ namespace MyGame.Scripts }).AddTo(this); } - private static void ShowDialog(Action okCallback, RewardType rewardType) + private static void ShowDialog(RewardType rewardType, Action okCallback, Action closeCallback) { LocalCacheManager.Save(OkCallbackTag, okCallback); + LocalCacheManager.Save(CloseCallbackTag, closeCallback); LocalCacheManager.Save(RewardTypeTag, rewardType); TransitionManager.Instance.LoadSceneAdditive(GameScenes.WatchMovieCoin); } - public static void ShowCoinDialog(Action okCallback) + public static void ShowCoinDialog(Action okCallback = null, Action closeCallback = null) { - ShowDialog(okCallback, RewardType.Coin); + ShowDialog(RewardType.Coin, okCallback, closeCallback); } - public static void ShowCornFieldDialog(Action okCallback) + public static void ShowCornFieldDialog(Action okCallback = null, Action closeCallback = null) { - ShowDialog(okCallback, RewardType.CornField); + ShowDialog(RewardType.CornField, okCallback, closeCallback); } - public static void ShowIncreaseCustomerDialog(Action okCallback) + public static void ShowIncreaseCustomerDialog(Action okCallback = null, Action closeCallback = null) { - ShowDialog(okCallback, RewardType.IncreaseCustomer); + ShowDialog(RewardType.IncreaseCustomer, okCallback, closeCallback); } - public static void ShowPerfectPopcornDialog(Action okCallback) + public static void ShowPerfectPopcornDialog(Action okCallback = null, Action closeCallback = null) { - ShowDialog(okCallback, RewardType.PerfectPopcorn); + ShowDialog(RewardType.PerfectPopcorn, okCallback, closeCallback); } - public static void ShowVipCustomerDialog(Action okCallback) + public static void ShowVipCustomerDialog(Action okCallback = null, Action closeCallback = null) { - ShowDialog(okCallback, RewardType.VipCustomer); + ShowDialog(RewardType.VipCustomer, okCallback, closeCallback); } } } \ No newline at end of file