diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs index 427061bb..50b0575f 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs @@ -106,10 +106,13 @@ public class CookingResult : MonoBehaviour gameData.ShopStock.AddRange(Enumerable.Repeat(recipe.RecipeId, stockCount)); remain -= stockCount; + // 空タンク並び替え + gameData.StorageTanks = gameData.StorageTanks.OrderBy(tank => tank.IsEmpty).ToList(); // 空きのタンクを確認 gameData.StorageTanks - .Where(tank => tank.IsEmpty || tank.FlavorId == recipe.RecipeId && !tank.IsFull) - .Select((tank, i) => (i, space: tank.Capacity - tank.Stock)) + .Select((tank, i) => (tank, i)) + .Where(x => x.tank.IsEmpty || x.tank.FlavorId == recipe.RecipeId && !x.tank.IsFull) + .Select(x => (x.i, space: x.tank.Capacity - x.tank.Stock)) .OrderBy(x => x.space) .ToList() .ForEach(x => diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs index c1eedf2e..b5321a5d 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs @@ -29,7 +29,7 @@ public class RecipeData CornAmount = 150, Flavors = new List<(int id, int amount)> { - (1, 1) + (2, 1) } }, new RecipeData @@ -41,7 +41,7 @@ public class RecipeData CornAmount = 150, Flavors = new List<(int id, int amount)> { - (6, 1) + (7, 1) } }, new RecipeData @@ -53,7 +53,7 @@ public class RecipeData CornAmount = 150, Flavors = new List<(int id, int amount)> { - (2, 1) + (3, 1) } }, new RecipeData @@ -65,8 +65,8 @@ public class RecipeData CornAmount = 150, Flavors = new List<(int id, int amount)> { - (1, 1), - (6, 1), + (2, 1), + (7, 1), } }, };