From 2e9235c3a2f5e81f881163b4b827bfed4070668b Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 13 Oct 2021 11:18:45 +0900 Subject: [PATCH] =?UTF-8?q?Result=E3=81=AE=E5=95=86=E5=93=81=E8=A3=9C?= =?UTF-8?q?=E5=85=85=E5=87=A6=E7=90=86=E3=82=92=E3=83=87=E3=83=90=E3=83=83?= =?UTF-8?q?=E3=82=B0=E3=81=A7=E4=BD=BF=E7=94=A8=E5=8F=AF=E8=83=BD=E3=81=AB?= =?UTF-8?q?=E3=81=97=E3=81=9F/=20=E3=83=87=E3=83=90=E3=83=83=E3=82=B0?= =?UTF-8?q?=E3=81=A7=E3=81=AE=E5=95=86=E5=93=81=E8=A3=9C=E5=85=85=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/Cooking/Scripts/CookingResult.cs | 2 +- .../DebugOption/Scripts/DebugOptionManager.cs | 85 ++++++------------- .../Assets/MyGame/Scripts/SpreadsheetData.cs | 1 + 3 files changed, 27 insertions(+), 61 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs index 0ab56d59..622e4105 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs @@ -146,7 +146,7 @@ public class CookingResult : MonoBehaviour } } - private void AddStock(ProductData productData, ProductRarity rarity = ProductRarity.Normal) + public static void AddStock(ProductData productData, ProductRarity rarity = ProductRarity.Normal) { var gameData = GameDataManager.GameData; // 店頭の空きに追加 diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs index fa28f810..25a9d205 100644 --- a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs @@ -65,73 +65,38 @@ public class DebugOptionManager : MonoBehaviour refillManyProductButton.OnClickAsObservable().Subscribe(_ => { - gameData.ShopStock.Clear(); - gameData.ShopStock.AddRange(Enumerable.Repeat(new ProductStockData() + gameData.StorageTanks.Clear(); + gameData.StorageTanks.Add(new StorageTank(){Capacity = 50}); + gameData.StorageTanks.Add(new StorageTank(){Capacity = 50}); + gameData.StorageTanks.Add(new StorageTank(){Capacity = 50}); + gameData.StorageTanks.Add(new StorageTank() { - FlavorId = 1, Rarity = ProductRarity.Normal - }, 5)); - gameData.ShopStock.AddRange(Enumerable.Repeat(new ProductStockData() - { - FlavorId = 2, Rarity = ProductRarity.Yellow - }, 5)); - gameData.ShopStock.AddRange(Enumerable.Repeat(new ProductStockData() - { - FlavorId = 3, Rarity = ProductRarity.Copper - }, 5)); - gameData.ShopStock.AddRange(Enumerable.Repeat(new ProductStockData() - { - FlavorId = 4, Rarity = ProductRarity.Silver - }, 5)); - // gameData.ShopStock.AddRange(Enumerable.Repeat(new ProductStockData() - // { - // FlavorId = 5, Rarity = ProductRarity.Gold - // }, 5)); - - gameData.StorageTanks = new List - { - // new StorageTank(){Id = 1, Capacity = 50, FlavorId = 1, Stocks = new List{new ProductStockData{Rarity = ProductRarity.Normal, Stock = 0}}}, - new StorageTank(){Capacity = 50, FlavorId = 2, Stocks = new List + Capacity = 50, + FlavorId = 6, + Stocks = new List { - new ProductStockData{Rarity = ProductRarity.Normal, Stock = 1}, - new ProductStockData{Rarity = ProductRarity.Yellow, Stock = 20}, - }}, - new StorageTank(){Capacity = 50, FlavorId = 1, Stocks = new List - { - new ProductStockData{Rarity = ProductRarity.Normal, Stock = 1}, - new ProductStockData{Rarity = ProductRarity.Yellow, Stock = 9}, - new ProductStockData{Rarity = ProductRarity.Copper, Stock = 5}, - new ProductStockData{Rarity = ProductRarity.Silver, Stock = 5}, - new ProductStockData{Rarity = ProductRarity.Gold, Stock = 10}, - new ProductStockData{Rarity = ProductRarity.Rainbow, Stock = 20}, - }}, - new StorageTank(){Capacity = 50, FlavorId = 1, Stocks = new List{new ProductStockData{Rarity = ProductRarity.Gold, Stock = 4}}}, - }; + new ProductStockData + { + Rarity = ProductRarity.Gold, + Stock = 17 + } + } + }); + CookingResult.AddStock(new ProductData(){volume = 5, id = 1}, ProductRarity.Normal); + CookingResult.AddStock(new ProductData(){volume = 5, id = 1}, ProductRarity.Yellow); + CookingResult.AddStock(new ProductData(){volume = 5, id = 1}, ProductRarity.Copper); + CookingResult.AddStock(new ProductData(){volume = 5, id = 1}, ProductRarity.Silver); + CookingResult.AddStock(new ProductData(){volume = 5, id = 1}, ProductRarity.Gold); + CookingResult.AddStock(new ProductData(){volume = 5, id = 1}, ProductRarity.Rainbow); + CookingResult.AddStock(new ProductData(){volume = 20, id = 2}, ProductRarity.Silver); + CookingResult.AddStock(new ProductData(){volume = 30, id = 3}, ProductRarity.Gold); }).AddTo(this); refillLittleProductButton.OnClickAsObservable().Subscribe(_ => { gameData.StorageTanks.ForEach(x => x.ClearStock()); - gameData.ShopStock.Clear(); - gameData.ShopStock.AddRange(Enumerable.Repeat(new ProductStockData() - { - FlavorId = 1, Rarity = ProductRarity.Normal - }, 5)); - gameData.ShopStock.AddRange(Enumerable.Repeat(new ProductStockData() - { - FlavorId = 2, Rarity = ProductRarity.Yellow - }, 5)); - gameData.ShopStock.AddRange(Enumerable.Repeat(new ProductStockData() - { - FlavorId = 3, Rarity = ProductRarity.Copper - }, 5)); - gameData.ShopStock.AddRange(Enumerable.Repeat(new ProductStockData() - { - FlavorId = 4, Rarity = ProductRarity.Silver - }, 5)); - // gameData.ShopStock.AddRange(Enumerable.Repeat(new ProductStockData() - // { - // FlavorId = 5, Rarity = ProductRarity.Gold - // }, 5)); + CookingResult.AddStock(new ProductData(){volume = 5, id = 1}, ProductRarity.Yellow); + CookingResult.AddStock(new ProductData(){volume = 5, id = 1}, ProductRarity.Gold); }).AddTo(this); coinCount.text = $"{gameData.Coin}"; diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs index 41cfb853..ac528859 100644 --- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs +++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs @@ -169,6 +169,7 @@ public sealed class ProductData } } + public ProductData(){} public ProductData(ProductData productData, int value) { id = productData.id;