yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

空タンクは選択できないように修正

This commit is contained in:
kimura 2021-09-16 18:33:56 +09:00
parent 465bb5d055
commit 509d782aa2
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs
View File

@ -160,6 +160,7 @@ public class ProductManagement : MonoBehaviour
Observable.Merge(tankList.Select(tankView => tankView.TankClickObservable.Select(_ => tankView))) Observable.Merge(tankList.Select(tankView => tankView.TankClickObservable.Select(_ => tankView)))
.Where(tankView => tankView.State.Value != TankState.Lock) .Where(tankView => tankView.State.Value != TankState.Lock)
.Where(tankView => tankView.State.Value != TankState.Unavailable) .Where(tankView => tankView.State.Value != TankState.Unavailable)
.Where(tankView => gameData.StorageTanks[tankView.TankNumber - 1].Stock > 0)
.Subscribe(tankView => .Subscribe(tankView =>
{ {
switch (state.Value) switch (state.Value)
@ -172,10 +173,6 @@ public class ProductManagement : MonoBehaviour
case ManagementState.Replacing: case ManagementState.Replacing:
break; break;
case ManagementState.Tasting: case ManagementState.Tasting:
if (gameData.StorageTanks[tankView.TankNumber - 1].Stock == 0)
{
return;
}
ClearSelectedTank(tankList); ClearSelectedTank(tankList);
tankView.SetState(TankState.Selected); tankView.SetState(TankState.Selected);
var tankData = gameData.StorageTanks[tankView.TankNumber - 1]; 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))) var replacingObservable = Observable.Merge(tankList.Select(x => x.TankClickObservable.Select(_ => x)))
.Where(x => x.State.Value != TankState.Lock) .Where(x => x.State.Value != TankState.Lock)
.Where(x => x.State.Value != TankState.Unavailable) .Where(x => x.State.Value != TankState.Unavailable)
.Where(tankView => gameData.StorageTanks[tankView.TankNumber - 1].Stock > 0)
.TakeWhile(_ => state.Value != ManagementState.Tasting) .TakeWhile(_ => state.Value != ManagementState.Tasting)
.Pairwise(); .Pairwise();
// タンク入れ替え // タンク入れ替え