From 36af17455b2c8ab4452d20339204bb7b82754b26 Mon Sep 17 00:00:00 2001 From: kimura Date: Mon, 11 Oct 2021 16:32:50 +0900 Subject: [PATCH] =?UTF-8?q?=E8=A9=A6=E9=A3=9F=E3=83=9C=E3=82=BF=E3=83=B3?= =?UTF-8?q?=E3=81=AEDisable=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/MyGame/Scenes/marketing/ProductManagement.unity | 6 ++++++ .../MyGame/Scenes/marketing/Scripts/ProductManagement.cs | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity index 2e3e0b31..1f423817 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity @@ -718,6 +718,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} - target: {fileID: 8136363072906095234, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder @@ -1105,6 +1110,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: tastingButton: {fileID: 1280872481} + tastingDisabledObject: {fileID: 1001931507} view: {fileID: 639967259} --- !u!1 &613202084 GameObject: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs index 1cef717f..ea86fcf3 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs @@ -15,6 +15,7 @@ public enum ManagementState public class ProductManagement : MonoBehaviour { [SerializeField] private Button tastingButton; + [SerializeField] private GameObject tastingDisabledObject; [SerializeField] private ProductManagementView view; private readonly ReactiveProperty state = new ReactiveProperty(); private void Start() @@ -213,6 +214,9 @@ public class ProductManagement : MonoBehaviour state.Value = ManagementState.None; }).AddTo(this); + var allTankStock = gameData.StorageTanks.Sum(x => x.Stock); + tastingDisabledObject.SetActive(allTankStock == 0); + tastingButton.interactable = allTankStock != 0; tastingButton.OnClickAsObservable().Subscribe(_ => { state.Value = ManagementState.Tasting;