From ad0ea265052928483033b49160735ea97eb06137 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Wed, 24 Nov 2021 15:21:28 +0900
Subject: [PATCH] =?UTF-8?q?=E7=B4=A0=E6=9D=90=E6=B6=88=E8=B2=BB=E5=87=A6?=
 =?UTF-8?q?=E7=90=86=E3=82=92public=E5=8C=96/=20=E7=B6=9A=E3=81=91?=
 =?UTF-8?q?=E3=81=A6=E8=AA=BF=E7=90=86=E3=81=99=E3=82=8B=E5=A0=B4=E5=90=88?=
 =?UTF-8?q?=E3=81=AB=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scenes/Cooking/Scripts/CookingResult.cs   |  1 +
 .../Scenes/recipe/Scripts/RecipeDetailView.cs | 26 ++++++++++++-------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs
index 4d25e749..1f566f2f 100644
--- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs
+++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs
@@ -127,6 +127,7 @@ public class CookingResult : MonoBehaviour
         {
             // 獲得、遷移
             AddStock(productData, result.Value == CornResult.Perfect ? rarityData.Rarity : ProductRarity.Normal);
+            RecipeDetailView.ConsumeMaterial(productData);
             Market.Instance.IsPause.Value = false;
             SoundManager.Instance.ChangeVolumeUniqueBGM(1f);
             TransitionManager.Instance.UnloadScene(GameScenes.CookingResults);
diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs
index 04a75498..56226e66 100644
--- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs
+++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs
@@ -80,16 +80,7 @@ public class RecipeDetailView : MonoBehaviour
         {
             LocalCacheManager.Save(PopcornGameManager.PanDataTag, panSelector.SelectedPanData.Value);
             // 消費
-            gameData.CornSeed -= data.MaterialList[0].amount;
-            if (gameData.Material.FirstOrDefault(x => x.Id == data.MaterialList[1].id) is MaterialData material1)
-            {
-                material1.Amount -= data.MaterialList[1].amount;
-            }
-            if (data.GetMaterialCount() == 3 && gameData.Material.FirstOrDefault(x => x.Id == data.MaterialList[2].id) is MaterialData material2)
-            {
-                material2.Amount -= data.MaterialList[2].amount;
-            }
-            GameDataManager.SaveGameData();
+            ConsumeMaterial(data);
             TransitionManager.Instance.LoadScene(GameScenes.Cooking);
         }).AddTo(this);
 
@@ -116,6 +107,21 @@ public class RecipeDetailView : MonoBehaviour
         }
     }
 
+    public static void ConsumeMaterial(ProductData productData)
+    {
+        var gameData = GameDataManager.GameData;
+        gameData.CornSeed -= productData.MaterialList[0].amount;
+        if (gameData.Material.FirstOrDefault(x => x.Id == productData.MaterialList[1].id) is MaterialData material1)
+        {
+            material1.Amount -= productData.MaterialList[1].amount;
+        }
+        if (productData.GetMaterialCount() == 3 && gameData.Material.FirstOrDefault(x => x.Id == productData.MaterialList[2].id) is MaterialData material2)
+        {
+            material2.Amount -= productData.MaterialList[2].amount;
+        }
+        GameDataManager.SaveGameData();
+    }
+
     public void SetRecipe(ProductData data, ProductViewType viewType)
     {
         var gameData = GameDataManager.GameData;