diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs index 53e05834..7d363ce8 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs @@ -183,6 +183,7 @@ public class ProductManagement : MonoBehaviour { Tasting(selectedTank.Value.num); tankList[selectedTank.Value.num - 1].SetData(gameData.StorageTanks[selectedTank.Value.num - 1]); + SetActiveTastingButton(gameData.StorageTanks.Any(tank => !tank.IsEmpty)); }; LocalCacheManager.Save(TastingView.TastingDataTag, (selectedTank.AsObservable(), new Action(() => state.Value = ManagementState.None), tastingAction)); TransitionManager.Instance.LoadSceneAdditive(GameScenes.Tasting); @@ -245,14 +246,14 @@ 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; + // 試食ボタン + SetActiveTastingButton(gameData.StorageTanks.Any(tank => !tank.IsEmpty)); tastingButton.OnClickAsObservable().Subscribe(_ => { state.Value = ManagementState.Tasting; }).AddTo(this); + // 商品補充タイプ切替 view.RefillType.Subscribe(mode => { if (state.Value != ManagementState.Tasting) @@ -265,6 +266,13 @@ public class ProductManagement : MonoBehaviour }).AddTo(this); } + private void SetActiveTastingButton(bool active) + { + tastingDisabledObject.SetActive(!active); + tastingButton.gameObject.SetActive(active); + tastingButton.interactable = active; + } + private void ClearSelectedTank(List tankList) { foreach (var tankView in tankList)