diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs index 3602f66a..062982cb 100644 --- a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs @@ -76,7 +76,7 @@ public class DebugOptionManager : MonoBehaviour resetMaterialButton.OnClickAsObservable().Subscribe(_ => { // 所持素材 - gameData.Material = new List{new MaterialData{Id = 2, Amount = 5}}; + gameData.Material.Clear(); // レシピ gameData.MyRecipes = new[] {Const.DefaultRecipeId}; // フライパン diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index c74ae302..b4533025 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -126,7 +126,20 @@ public class KitchenManager : MonoBehaviour // 休憩リワード var remaining = (int) DateTime.FromBinary(gameData.kitchenRefreshTime).Subtract(DateTime.UtcNow).TotalSeconds; - if (remaining > 0 || gameData.isFirstPlay) + + // 商品在庫計算 + var shopStock = gameData.ShopStock.Count; + var tankStock = gameData.StorageTanks.Sum(x => x.Stock); + var totalStock = shopStock + tankStock; + + Debug.Log($"material:{gameData.Material.Sum(data => data.Amount)} coin:{gameData.Coin} stock:{totalStock}"); + if (gameData.Coin + gameData.Material.Sum(data => data.Amount) + totalStock == 0) + { + // 所持金0救済 + adButton.gameObject.SetActive(true); + kitchenView.SetTiredAnimation(); + } + else if (remaining > 0 || gameData.isFirstPlay) { adButton.gameObject.SetActive(false); kitchenView.SetNormalAnimation();