From 69ec5e264446d6c47a99bcce6c86c8c0f732091b Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 2 Nov 2022 14:14:25 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AC=E3=82=B7=E3=83=94=E5=BF=85=E8=A6=81?= =?UTF-8?q?=E9=87=8F=E3=81=AE=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E5=87=A6?= =?UTF-8?q?=E7=90=86=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/Main/Scripts/BulkOrderItemView.cs | 23 ++++---------- .../Scenes/recipe/Scripts/RecipeView.cs | 30 +++++++------------ 2 files changed, 15 insertions(+), 38 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderItemView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderItemView.cs index 03ee8bfb..390f2cbc 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderItemView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderItemView.cs @@ -59,24 +59,11 @@ public class BulkOrderItemView : MonoBehaviour public bool CheckAmount(ProductData productData) { - var flag = true; - var gameData = GameDataManager.GameData; - if (gameData.CornSeed < productData.MaterialList[0].amount) - { - flag = false; - cornText.color = redColor; - } - if ((gameData.Material.FirstOrDefault(data => data.Id == productData.MaterialList[1].id)?.Amount ?? 0) < productData.MaterialList[1].amount) - { - flag = false; - material1Text.color = redColor; - } - if (productData.GetMaterialCount() == 3 && (gameData.Material.FirstOrDefault(data => data.Id == productData.MaterialList[2].id)?.Amount ?? 0) < productData.MaterialList[2].amount) - { - flag = false; - material2Text.color = redColor; - } - return flag; + var (corn, flavor1, flavor2) = RecipeView.CheckAmount(productData); + if (!corn) cornText.color = redColor; + if (!flavor1) material1Text.color = redColor; + if (!flavor2) material2Text.color = redColor; + return corn & flavor1 & flavor2; } public void SetButtonActive(bool active) diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs index d33b517f..5c96a899 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs @@ -56,7 +56,10 @@ public class RecipeView : MonoBehaviour { flavor2View.SetActive(false); } - CheckAmount(data); + var (corn, flavor1, flavor2) = CheckAmount(data); + if (!corn) cornAmountText.color = redColor; + if (!flavor1) flavor1AmountText.color = redColor; + if (!flavor2) flavor2AmountText.color = redColor; if (data.shopLevel == Const.SpecialShopLevel) { @@ -68,26 +71,13 @@ public class RecipeView : MonoBehaviour } } - private bool CheckAmount(ProductData productData) + public static (bool corn, bool flavor1, bool flavor2) CheckAmount(ProductData productData) { - var flag = true; - var gameData = GameDataManager.GameData; - if (gameData.CornSeed < productData.MaterialList[0].amount) - { - flag = false; - cornAmountText.color = redColor; - } - if ((gameData.Material.FirstOrDefault(data => data.Id == productData.MaterialList[1].id)?.Amount ?? 0) < productData.MaterialList[1].amount) - { - flag = false; - flavor1AmountText.color = redColor; - } - if (productData.GetMaterialCount() == 3 && (gameData.Material.FirstOrDefault(data => data.Id == productData.MaterialList[2].id)?.Amount ?? 0) < productData.MaterialList[2].amount) - { - flag = false; - flavor2AmountText.color = redColor; - } - return flag; + var cityGameData = GameDataManager.GetCurrentCityGameData(); + var corn = cityGameData.CornSeed >= productData.MaterialList[0].amount; + var flavor1 = (cityGameData.Material.FirstOrDefault(data => data.Id == productData.MaterialList[1].id)?.Amount ?? 0) >= productData.MaterialList[1].amount; + var flavor2 = productData.GetMaterialCount() == 3 && (cityGameData.Material.FirstOrDefault(data => data.Id == productData.MaterialList[2].id)?.Amount ?? 0) >= productData.MaterialList[2].amount; + return (corn, flavor1, flavor2); } public void SetLockPanel(bool hasRecipe)