From ac9711f083d832be394b8044a880b7474027cab8 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Wed, 4 Aug 2021 13:50:05 +0900
Subject: [PATCH] =?UTF-8?q?=E8=B5=A4=E3=82=B2=E3=83=BC=E3=82=B8(Hot)?=
 =?UTF-8?q?=E3=81=A7=E3=82=B3=E3=83=BC=E3=83=B3=E3=81=8C=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E3=81=97=E3=81=9F=E5=A0=B4=E5=90=88=E7=84=A6=E3=81=92=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MyGame/Scenes/Cooking/Scripts/Corn.cs      | 18 ++++++++++++++++--
 .../Scenes/Cooking/Scripts/CornManager.cs      |  2 ++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs
index 62a30567..68db7048 100644
--- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs
+++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs
@@ -36,6 +36,7 @@ public class Corn : MonoBehaviour
     private float cornGrowSpeed;
     private float cornSpillSpeed;
     private float cornPopSpeed;
+    private bool isHot;
     
     public IReadOnlyReactiveProperty<CornCondition> Condition => condition;
     private readonly ReactiveProperty<CornCondition> condition = new ReactiveProperty<CornCondition>(CornCondition.Seed);
@@ -118,14 +119,22 @@ public class Corn : MonoBehaviour
 
     private void Update()
     {
+        if (condition.Value == CornCondition.Burnt) return;
         cornGrowTime += Time.deltaTime * cornGrowSpeed;
         if (cornGrowTime >= cornBurntTime)
         {
             condition.Value = CornCondition.Burnt;
         }
-        else if (cornGrowTime >= cornPopTime)
+        if (cornGrowTime >= cornPopTime && condition.Value == CornCondition.Seed)
         {
-            condition.Value = CornCondition.Simple;
+            if (isHot)
+            {
+                condition.Value = CornCondition.Burnt;
+            }
+            else
+            {
+                condition.Value = CornCondition.Simple;
+            }
         }
     }
 
@@ -157,4 +166,9 @@ public class Corn : MonoBehaviour
     {
         cornGrowSpeed = speed;
     }
+
+    public void ChangeHotStatus(bool status)
+    {
+        isHot = status;
+    }
 }
diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs
index ccba4c90..3bdf4a0e 100644
--- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs
+++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs
@@ -117,6 +117,7 @@ public class CornManager : MonoBehaviour
     public void RespawnCorn()
     {
         cornGrowSpeed.Value = 0f;
+        isHot = false;
         missCount.Value = 0;
         isCompleted = false;
         compositeDisposable.Clear();
@@ -146,6 +147,7 @@ public class CornManager : MonoBehaviour
                     return;
                 }
                 corn.ChangeGrowSpeed(x);
+                corn.ChangeHotStatus(isHot);
             }).AddTo(compositeDisposable);