From 699d9dfc8d9dd2fd16244a1c7e5ad0005586373b Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 24 Sep 2021 17:31:10 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AC=E3=82=B7=E3=83=94UI=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs | 4 ++-- .../Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs index 60aa5cf0..5b93adc4 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs @@ -61,9 +61,9 @@ public class RecipeDetailView : MonoBehaviour var isPassedAmount = CheckAmount(data); var isPassedTank = CheckTank(data); nextButton.interactable = isPassedAmount && isPassedTank; - panSelector.gameObject.SetActive(isPassedTank); + panSelector.gameObject.SetActive(!isPassedAmount || isPassedTank); disabledNextButton.SetActive(!isPassedAmount || !isPassedTank); - tankCaution.SetActive(!isPassedTank); + tankCaution.SetActive(isPassedAmount && !isPassedTank); } public void SetRecipe(ProductData data) diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs index feb87ba1..67d43209 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs @@ -13,6 +13,7 @@ public class RecipeSelectDialog : MonoBehaviour // Start is called before the first frame update void Start() { + var gameData = GameDataManager.GameData; closeButton.OnClickAsObservable().Subscribe(_ => { TransitionManager.Instance.UnloadScene(GameScenes.Recipe); @@ -27,7 +28,7 @@ public class RecipeSelectDialog : MonoBehaviour var view = Instantiate(recipePrefab, content.transform); view.SetRecipe(productData); // 所持レシピ確認 - if (GameDataManager.GameData.MyRecipes.Contains(productData.id)) + if (gameData.MyRecipes.Contains(productData.id) || productData.shopLevel <= HeartMeter.Instance.ShopLevel.Value) { view.SetLockPanel(false); view.RecipeClickObservable.Subscribe(_ =>