From 3a5b126171ef41eefad3fe718b333d9b1f8a3f34 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Tue, 13 Jul 2021 09:13:01 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=B0=E3=83=91?=
 =?UTF-8?q?=E3=83=A9=E3=83=A1=E3=83=BC=E3=82=BF=E4=B8=80=E9=83=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity       | 9 +++++++--
 .../Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs  | 6 +++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity
index 8e334df5..0f4eb685 100644
--- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity
+++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity
@@ -1376,6 +1376,11 @@ PrefabInstance:
       propertyPath: m_AnchorMax.y
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 1927981503880492078, guid: b0a57f0d9e5524e579cad0309e9d44d1,
+        type: 3}
+      propertyPath: m_Name
+      value: FailedCount
+      objectReference: {fileID: 0}
     - target: {fileID: 1943039892745546559, guid: b0a57f0d9e5524e579cad0309e9d44d1,
         type: 3}
       propertyPath: m_AnchorMax.y
@@ -9359,8 +9364,8 @@ MonoBehaviour:
   cornPopSpeed: 30
   cornCountSlider: {fileID: 657773260}
   faildCountSlider: {fileID: 657773259}
-  growSpeedSlider: {fileID: 657773258}
-  hotGrowSpeedSlider: {fileID: 657773257}
+  hotGrowSpeedSlider: {fileID: 657773258}
+  popTimeSlider: {fileID: 657773257}
   burntDurationSlider: {fileID: 657773256}
   spilledSpeedSlider: {fileID: 657773255}
   popSpeedSlider: {fileID: 657773247}
diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs
index 930deb95..e8ff36f5 100644
--- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs
+++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs
@@ -38,8 +38,8 @@ public class CornManager : MonoBehaviour
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
     [SerializeField] private Slider cornCountSlider;
     [SerializeField] private Slider faildCountSlider;
-    [SerializeField] private Slider growSpeedSlider;
     [SerializeField] private Slider hotGrowSpeedSlider;
+    [SerializeField] private Slider popTimeSlider;
     [SerializeField] private Slider burntDurationSlider;
     [SerializeField] private Slider spilledSpeedSlider;
     [SerializeField] private Slider popSpeedSlider;
@@ -60,16 +60,16 @@ public class CornManager : MonoBehaviour
         cornCountSlider.value = cornSpawnCount;
         faildCountSlider.wholeNumbers = true;
         faildCountSlider.value = maxFailedCornCount;
-        growSpeedSlider.value = baseGrowSpeed;
         hotGrowSpeedSlider.value = hotGrowSpeed;
+        popTimeSlider.value = baseCornPopTime;
         burntDurationSlider.value = cornBurntDuration;
         spilledSpeedSlider.value = cornSpillSpeed;
         popSpeedSlider.value = cornPopSpeed;
         
         cornCountSlider.OnValueChangedAsObservable().Subscribe(x => cornSpawnCount = (int)x).AddTo(this);
         faildCountSlider.OnValueChangedAsObservable().Subscribe(x => maxFailedCornCount = (int)x).AddTo(this);
-        growSpeedSlider.OnValueChangedAsObservable().Subscribe(x => baseGrowSpeed = x).AddTo(this);
         hotGrowSpeedSlider.OnValueChangedAsObservable().Subscribe(x => hotGrowSpeed = x).AddTo(this);
+        popTimeSlider.OnValueChangedAsObservable().Subscribe(x => baseCornPopTime = x).AddTo(this);
         burntDurationSlider.OnValueChangedAsObservable().Subscribe(x => cornBurntDuration = x).AddTo(this);
         spilledSpeedSlider.OnValueChangedAsObservable().Subscribe(x => cornSpillSpeed = x).AddTo(this);
         popSpeedSlider.OnValueChangedAsObservable().Subscribe(x => cornPopSpeed = x).AddTo(this);