From 10847c07318886c6590c784b1b0e13024bca9283 Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 10 Feb 2022 16:16:51 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=AD=E3=83=83=E3=83=81=E3=83=B3=E5=85=84?= =?UTF-8?q?=E5=BC=9F=E3=81=AE=E3=83=AC=E3=83=99=E3=83=AB=E3=82=A2=E3=83=83?= =?UTF-8?q?=E3=83=97=E6=BC=94=E5=87=BA=E6=99=82=E9=9D=9E=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs | 7 ++++++- popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenView.cs | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index 624295f0..1138e832 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -127,7 +127,12 @@ public class KitchenManager : MonoBehaviour .DelaySubscription(TimeSpan.FromSeconds(.4f)) .Subscribe(_ => { - ShopLevelUp.ShowDialog(gameData.ViewedShopLevel + 1, CheckOrderAndSetPhoneTap); + kitchenView.SetActive(false); + ShopLevelUp.ShowDialog(gameData.ViewedShopLevel + 1, () => + { + kitchenView.SetActive(true); + CheckOrderAndSetPhoneTap(); + }); }).AddTo(this); GameDataObserver.Instance.HeartObserver diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenView.cs index 0e37b392..fb898ac6 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenView.cs @@ -115,4 +115,10 @@ public class KitchenView : MonoBehaviour SetPinkMove(); blueBrotherAnimator.SetTrigger(Flame); } + + public void SetActive(bool active) + { + blueBrotherAnimator.transform.SetLocalScale(active ? 1f : 0f); + pinkBrotherAnimator.transform.SetLocalScale(active ? 1f : 0f); + } }