diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs index a9beafd0..4d25e749 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs @@ -44,17 +44,11 @@ public class CookingResult : MonoBehaviour var (rarityData, resultData, successAction) = LocalCacheManager.Load<(RarityData, CornResult, Action)>(PopcornGameManager.CookingResultDataTag); result.Value = resultData; SetData(productData, rarityData, viewType); - - // 続けて料理を作ることができるかどうか判定 - var hasSpace = RecipeDetailView.CheckTank(productData); - var checkResult = RecipeDetailView.CheckAmount(productData); - var hasMaterials = checkResult.material1 && checkResult.material2 && checkResult.material3; - var isMakeOne = hasSpace && hasMaterials; if (GameDataManager.GameData.isFirstPlay) { // ボタン非表示 - SetUI(resultData, viewType, isMakeOne, true); + SetUI(resultData, viewType, CheckMakeOne(resultData, productData), true); // 失敗したら再チャレンジ if (resultData == CornResult.Failure) @@ -80,7 +74,7 @@ public class CookingResult : MonoBehaviour result.Subscribe(r => { - SetUI(r, viewType, isMakeOne); + SetUI(r, viewType, CheckMakeOne(r, productData)); if (r != CornResult.Failure) { successAction?.Invoke(); @@ -196,6 +190,22 @@ public class CookingResult : MonoBehaviour } } + // 続けて料理を作ることができるかどうか判定 + private bool CheckMakeOne(CornResult cornResult, ProductData productData) + { + ProductData doubleProductData = productData; + if (cornResult != CornResult.Failure) + { + // まだ在庫追加前なのでレシピvolumeを2倍にしてタンクの空きを確認 + doubleProductData = new ProductData(productData, 1){volume = productData.volume * 2}; + } + var hasSpace = RecipeDetailView.CheckTank(doubleProductData); + //素材確認 + var checkResult = RecipeDetailView.CheckAmount(productData); + var hasMaterials = checkResult.material1 && checkResult.material2 && checkResult.material3; + return hasSpace && hasMaterials; + } + public static void AddStock(ProductData productData, ProductRarity rarity = ProductRarity.Normal) { var gameData = GameDataManager.GameData;