diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs index 23c6f422..705a85dd 100644 --- a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs @@ -65,7 +65,7 @@ public class DebugOptionManager : MonoBehaviour gameData.ShopStock = Enumerable.Repeat(1, 10).ToList(); gameData.ShopStock.AddRange(Enumerable.Repeat(2, 10).ToList()); gameData.StorageTanks[0].FlavorId = 2; - gameData.StorageTanks[0].Stock = 50; + gameData.StorageTanks[0].AddStock(ProductRarity.Normal, 50); }).AddTo(this); refillLittleProductButton.OnClickAsObservable().Subscribe(_ => diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index 4b62046a..10eddf6d 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -65,7 +65,6 @@ public class KitchenManager : MonoBehaviour Capacity = 50, FlavorId = -1, Stock = 0, - BonusRate = 0 } }; } diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/StorageTank.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/StorageTank.cs index 76349c4b..a2fa07a6 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/StorageTank.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/StorageTank.cs @@ -1,3 +1,5 @@ +using System.Collections.Generic; +using System.Linq; using UnityEngine.Internal.VR; public class StorageTank @@ -6,6 +8,33 @@ public class StorageTank public int Id; public int Capacity; public int FlavorId; + public int Stock + { + get => Stocks.Sum(x => x.Stock); + set => SetStock(ProductRarity.Normal, value); + } + public List Stocks = new List(); + + public void SetStock(ProductRarity rarity, int stock) + { + + } + + public void AddStock(ProductRarity rarity, int stock) + { + var stockData = Stocks.First(x => x.Rarity == rarity); + if (stockData is null) + { + Stocks.Add(new ProductStockData{FlavorId = FlavorId, Rarity = rarity, Stock = stock}); + return; + } + stockData.Stock += stock; + } +} + +public class ProductStockData +{ + public int FlavorId; + public ProductRarity Rarity; public int Stock; - public int BonusRate; } \ No newline at end of file