diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs index dc03ec74..ab38c09f 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs @@ -608,10 +608,13 @@ public class Market : SingletonMonoBehaviour public static void StockFlavorLog() { var shopStockString = ""; - foreach (var data in RecipeData.GetAllRecipe()) + shopStockString += $@"tank count:{GameDataManager.GameData.StorageTanks.Count} +tank {GameDataManager.GameData.StorageTanks.Aggregate("", (s, tank) => $"{s}, flavor:{tank.FlavorId}({tank.Stock})")} +"; + foreach (var data in SpreadsheetDataManager.Instance.GetBaseDataList(Const.ProductDataSheet)) { - var shopStockCount = GameDataManager.GameData.ShopStock.FindAll(x => x.FlavorId == data.RecipeId).Count; - var tank = GameDataManager.GameData.StorageTanks.FindAll(x => x.FlavorId == data.RecipeId).Sum(x => x.Stock); + var shopStockCount = GameDataManager.GameData.ShopStock.FindAll(x => x.FlavorId == data.id).Count; + var tank = GameDataManager.GameData.StorageTanks.FindAll(x => x.FlavorId == data.id).Sum(x => x.Stock); if (shopStockCount + tank == 0) { continue; diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs deleted file mode 100644 index e4694c56..00000000 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Collections.Generic; -using System.Linq; - -public class RecipeData -{ - public int RecipeId; - public string Name; - public int Price; - // public string IconSprite; - public int Volume; - public int CornAmount; - public List<(int id, int amount)> Flavors; - - public static RecipeData GetRecipe(int flavorId) - { - return GetAllRecipe().FirstOrDefault(x => x.RecipeId == flavorId); - } - - public static List GetAllRecipe() - { - return SpreadsheetDataManager.Instance.GetBaseDataList(Const.ProductDataSheet).Select(data => new RecipeData - { - RecipeId = data.id, - Name = data.Name, - Price = data.price, - Volume = data.volume, - CornAmount = data.MaterialList[0].amount, - Flavors = data.MaterialList - }).ToList(); - } -} diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs.meta b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs.meta deleted file mode 100644 index f3e6eb2f..00000000 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 5193219b46d047b595b22809e43804a1 -timeCreated: 1628058980 \ No newline at end of file