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

試食ボタン無効時の表示修正

This commit is contained in:
kimura 2021-12-07 15:46:16 +09:00
parent 7b9b3d429f
commit d98755bdaa
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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