From 391168cf202afebc5a3e1ab2d8d26643a3f713bb Mon Sep 17 00:00:00 2001 From: kimura Date: Tue, 27 Sep 2022 15:27:53 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/Main/Scripts/BulkOrderIndicatorView.cs | 8 +++++++- .../MyGame/Scenes/Main/Scripts/BulkOrderItemView.cs | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderIndicatorView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderIndicatorView.cs index 36557d14..60b3eab1 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderIndicatorView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderIndicatorView.cs @@ -18,6 +18,12 @@ public class BulkOrderIndicatorView : MonoBehaviour public IObservable TappedPhone => button.OnClickAsObservable().TakeUntilDestroy(this); + /// + /// 電話を鳴らす場合 ReceiveをTrueにする + /// ボタンを非アクティブにする場合 AchievedをTrueにする + /// + /// + /// public void SetIndicate(bool receive, bool achieved) { if (receive) @@ -30,8 +36,8 @@ public class BulkOrderIndicatorView : MonoBehaviour phoneAnimator.SetTrigger(Wait); } button.interactable = receive || !achieved; - titleObject.SetActive(!receive && !achieved); balloonObject.SetActive(receive); + titleObject.SetActive(!receive && !achieved); } public void SetBadgeActive(bool active) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderItemView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderItemView.cs index a1896d06..03ee8bfb 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderItemView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderItemView.cs @@ -81,10 +81,10 @@ public class BulkOrderItemView : MonoBehaviour public void SetButtonActive(bool active) { - cookedObject.SetActive(false); - perfectCookedObject.SetActive(false); cookingButton.gameObject.SetActive(active); disabledObject.SetActive(!active); + cookedObject.SetActive(false); + perfectCookedObject.SetActive(false); } public void SetCooked(ProductRarity rarity)