From 509d782aa236536e610ee34842c281d1bae11913 Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 16 Sep 2021 18:33:56 +0900 Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E3=82=BF=E3=83=B3=E3=82=AF=E3=81=AF?= =?UTF-8?q?=E9=81=B8=E6=8A=9E=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/marketing/Scripts/ProductManagement.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs index 1d23fdbe..728ec06c 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs @@ -160,6 +160,7 @@ public class ProductManagement : MonoBehaviour Observable.Merge(tankList.Select(tankView => tankView.TankClickObservable.Select(_ => tankView))) .Where(tankView => tankView.State.Value != TankState.Lock) .Where(tankView => tankView.State.Value != TankState.Unavailable) + .Where(tankView => gameData.StorageTanks[tankView.TankNumber - 1].Stock > 0) .Subscribe(tankView => { switch (state.Value) @@ -172,10 +173,6 @@ public class ProductManagement : MonoBehaviour case ManagementState.Replacing: break; case ManagementState.Tasting: - if (gameData.StorageTanks[tankView.TankNumber - 1].Stock == 0) - { - return; - } ClearSelectedTank(tankList); tankView.SetState(TankState.Selected); var tankData = gameData.StorageTanks[tankView.TankNumber - 1]; @@ -190,6 +187,7 @@ public class ProductManagement : MonoBehaviour var replacingObservable = Observable.Merge(tankList.Select(x => x.TankClickObservable.Select(_ => x))) .Where(x => x.State.Value != TankState.Lock) .Where(x => x.State.Value != TankState.Unavailable) + .Where(tankView => gameData.StorageTanks[tankView.TankNumber - 1].Stock > 0) .TakeWhile(_ => state.Value != ManagementState.Tasting) .Pairwise(); // タンク入れ替え