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

Resultの商品補充処理をデバッグで使用可能にした/ デバッグでの商品補充方法を変更

This commit is contained in:
kimura 2021-10-13 11:18:45 +09:00
parent 0dd54a6c16
commit 2e9235c3a2
3 changed files with 27 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs
View File

@ -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; var gameData = GameDataManager.GameData;
// 店頭の空きに追加 // 店頭の空きに追加

85
popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs
View File

@ -65,73 +65,38 @@ public class DebugOptionManager : MonoBehaviour
refillManyProductButton.OnClickAsObservable().Subscribe(_ => refillManyProductButton.OnClickAsObservable().Subscribe(_ =>
{ {
gameData.ShopStock.Clear(); gameData.StorageTanks.Clear();
gameData.ShopStock.AddRange(Enumerable.Repeat(new ProductStockData() 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 Capacity = 50,
}, 5)); FlavorId = 6,
gameData.ShopStock.AddRange(Enumerable.Repeat(new ProductStockData() Stocks = new List<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<StorageTank>
{
// new StorageTank(){Id = 1, Capacity = 50, FlavorId = 1, Stocks = new List<ProductStockData>{new ProductStockData{Rarity = ProductRarity.Normal, Stock = 0}}},
new StorageTank(){Capacity = 50, FlavorId = 2, Stocks = new List<ProductStockData>
{ {
new ProductStockData{Rarity = ProductRarity.Normal, Stock = 1}, new ProductStockData
new ProductStockData{Rarity = ProductRarity.Yellow, Stock = 20}, {
}}, Rarity = ProductRarity.Gold,
new StorageTank(){Capacity = 50, FlavorId = 1, Stocks = new List<ProductStockData> Stock = 17
{ }
new ProductStockData{Rarity = ProductRarity.Normal, Stock = 1}, }
new ProductStockData{Rarity = ProductRarity.Yellow, Stock = 9}, });
new ProductStockData{Rarity = ProductRarity.Copper, Stock = 5}, CookingResult.AddStock(new ProductData(){volume = 5, id = 1}, ProductRarity.Normal);
new ProductStockData{Rarity = ProductRarity.Silver, Stock = 5}, CookingResult.AddStock(new ProductData(){volume = 5, id = 1}, ProductRarity.Yellow);
new ProductStockData{Rarity = ProductRarity.Gold, Stock = 10}, CookingResult.AddStock(new ProductData(){volume = 5, id = 1}, ProductRarity.Copper);
new ProductStockData{Rarity = ProductRarity.Rainbow, Stock = 20}, CookingResult.AddStock(new ProductData(){volume = 5, id = 1}, ProductRarity.Silver);
}}, CookingResult.AddStock(new ProductData(){volume = 5, id = 1}, ProductRarity.Gold);
new StorageTank(){Capacity = 50, FlavorId = 1, Stocks = new List<ProductStockData>{new ProductStockData{Rarity = ProductRarity.Gold, Stock = 4}}}, 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); }).AddTo(this);
refillLittleProductButton.OnClickAsObservable().Subscribe(_ => refillLittleProductButton.OnClickAsObservable().Subscribe(_ =>
{ {
gameData.StorageTanks.ForEach(x => x.ClearStock()); gameData.StorageTanks.ForEach(x => x.ClearStock());
gameData.ShopStock.Clear(); CookingResult.AddStock(new ProductData(){volume = 5, id = 1}, ProductRarity.Yellow);
gameData.ShopStock.AddRange(Enumerable.Repeat(new ProductStockData() CookingResult.AddStock(new ProductData(){volume = 5, id = 1}, ProductRarity.Gold);
{
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));
}).AddTo(this); }).AddTo(this);
coinCount.text = $"{gameData.Coin}"; coinCount.text = $"{gameData.Coin}";

1
popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs
View File

@ -169,6 +169,7 @@ public sealed class ProductData
} }
} }
public ProductData(){}
public ProductData(ProductData productData, int value) public ProductData(ProductData productData, int value)
{ {
id = productData.id; id = productData.id;