From 6841f23306c23f0a1007518c5e31a7d1d6273d67 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Tue, 10 Aug 2021 17:12:09 +0900
Subject: [PATCH] =?UTF-8?q?UI=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity     | 1 +
 .../MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs       | 3 +++
 popcorn/Assets/MyGame/Scenes/recipe/recipe.unity           | 2 +-
 .../ButtonObjectSwitcher.cs}                               | 7 +++----
 .../ButtonObjectSwitcher.cs.meta}                          | 0
 5 files changed, 8 insertions(+), 5 deletions(-)
 rename popcorn/Assets/MyGame/{Scenes/CornField/Scripts/PromoteGrowthButton.cs => Scripts/ButtonObjectSwitcher.cs} (77%)
 rename popcorn/Assets/MyGame/{Scenes/CornField/Scripts/PromoteGrowthButton.cs.meta => Scripts/ButtonObjectSwitcher.cs.meta} (100%)

diff --git a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity
index 9e779df4..031b13e9 100644
--- a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity
+++ b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity
@@ -1638,6 +1638,7 @@ MonoBehaviour:
   backgroundAnimator: {fileID: 858120093}
   cancelButton: {fileID: 843133640}
   nextButton: {fileID: 1853630204}
+  disabledNextButton: {fileID: 1037294270}
   flavorName: {fileID: 707887860}
   flavorPrice: {fileID: 498799267}
   flavorStock: {fileID: 1109202679}
diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs
index 00a7c609..bc4d3d9e 100644
--- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs
+++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs
@@ -14,6 +14,7 @@ public class RecipeDetailView : MonoBehaviour
     [SerializeField] private Animator backgroundAnimator;
     [SerializeField] private Button cancelButton;
     [SerializeField] private Button nextButton;
+    [SerializeField] private GameObject disabledNextButton;
     [SerializeField] private Text flavorName;
     [SerializeField] private Text flavorPrice;
     [SerializeField] private Text flavorStock;
@@ -41,6 +42,7 @@ public class RecipeDetailView : MonoBehaviour
         SetRecipe(data);
         if (CheckAmount(data))
         {
+            disabledNextButton.SetActive(false);
             nextButton.OnClickAsObservable().Subscribe(_ =>
             {
                 var gameData = GameDataManager.GameData;
@@ -64,6 +66,7 @@ public class RecipeDetailView : MonoBehaviour
         else
         {
             nextButton.interactable = false;
+            disabledNextButton.SetActive(true);
         }
     }
 
diff --git a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity
index 6afc5831..dba8adba 100644
--- a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity
+++ b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity
@@ -2769,7 +2769,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
+  m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/PromoteGrowthButton.cs b/popcorn/Assets/MyGame/Scripts/ButtonObjectSwitcher.cs
similarity index 77%
rename from popcorn/Assets/MyGame/Scenes/CornField/Scripts/PromoteGrowthButton.cs
rename to popcorn/Assets/MyGame/Scripts/ButtonObjectSwitcher.cs
index 16d41928..9c8f3e5f 100644
--- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/PromoteGrowthButton.cs
+++ b/popcorn/Assets/MyGame/Scripts/ButtonObjectSwitcher.cs
@@ -4,7 +4,7 @@ using UniRx.Triggers;
 using UnityEngine;
 using UnityEngine.UI;
 
-public class PromoteGrowthButton : MonoBehaviour
+public class ButtonObjectSwitcher : MonoBehaviour
 {
     [SerializeField] private Button growthButton;
     [SerializeField] private GameObject onObject;
@@ -17,11 +17,10 @@ public class PromoteGrowthButton : MonoBehaviour
         growthButton.OnPointerDownAsObservable()
             .Select(_ => true)
             .Merge(growthButton.OnPointerUpAsObservable().Select(_ => false))
-            .Pairwise()
             .Subscribe(x =>
             {
-                onObject.SetActive(x.Current);
-                offObject.SetActive(!x.Current);
+                onObject.SetActive(x);
+                offObject.SetActive(!x);
             }).AddTo(this);
     }
 }
diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/PromoteGrowthButton.cs.meta b/popcorn/Assets/MyGame/Scripts/ButtonObjectSwitcher.cs.meta
similarity index 100%
rename from popcorn/Assets/MyGame/Scenes/CornField/Scripts/PromoteGrowthButton.cs.meta
rename to popcorn/Assets/MyGame/Scripts/ButtonObjectSwitcher.cs.meta