From 45983e2b703d65e7a5c90b570a4b3a98198583a7 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Fri, 15 Apr 2022 16:03:45 +0900
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8B=95=E8=AA=BF=E7=90=86=E5=8F=97?=
 =?UTF-8?q?=E3=81=91=E5=8F=96=E3=82=8A=E5=BE=8C=E3=81=AEUI=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scenes/Main/Scripts/AutoCookView.cs       |  7 ++++++-
 .../Scenes/Main/Scripts/KitchenManager.cs     | 20 +++++++++++--------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookView.cs
index 801d3cd9..7a664215 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookView.cs
+++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookView.cs
@@ -21,6 +21,11 @@ namespace MyGame.Scenes.Main.Scripts
         private IDisposable timerDisposable;
 
         public void Initialize()
+        {
+            Ready();
+        }
+
+        public void Ready()
         {
             cookAnimator.enabled = false;
             SetProgress(0f);
@@ -71,7 +76,7 @@ namespace MyGame.Scenes.Main.Scripts
                     AutoCookProgressView.ShowDialog();
                     break;
                 case CookState.Complete:
-                    AutoCookCompleteView.ShowDialog();
+                    AutoCookCompleteView.ShowDialog(onClose);
                     break;
                 default:
                     throw new ArgumentOutOfRangeException();
diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
index fa2a836d..7e9f9603 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
+++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
@@ -80,8 +80,7 @@ public class KitchenManager : MonoBehaviour
         {
             CookState state;
             var remainingTime = DateTime.FromBinary(gameData.AutoCookFinishTime).Subtract(DateTime.UtcNow);
-            var isReady = gameData.AutoCookProducts.Length == 0;
-            if (!isReady)
+            if (gameData.AutoCookProducts.Length > 0)
             {
                 autoCookView.ResetTimer((int)remainingTime.TotalSeconds, (int)TimeSpan.FromHours(autoCookData.duration).TotalSeconds);
             }
@@ -104,13 +103,11 @@ public class KitchenManager : MonoBehaviour
                 }
                 
                 remainingTime = DateTime.FromBinary(gameData.AutoCookFinishTime).Subtract(DateTime.UtcNow);
-                isReady = gameData.AutoCookProducts.Length == 0;
-                var isFinished = remainingTime.TotalSeconds <= 0;
-                if (isReady)
+                if (gameData.AutoCookProducts.Length == 0)
                 {
                     state = CookState.Ready;
                 }
-                else if (isFinished)
+                else if (remainingTime.TotalSeconds <= 0)
                 {
                     state = CookState.Complete;
                 }
@@ -121,8 +118,15 @@ public class KitchenManager : MonoBehaviour
 
                 autoCookView.ShowDialog(state, () =>
                 {
-                    remainingTime = DateTime.FromBinary(gameData.AutoCookFinishTime).Subtract(DateTime.UtcNow);
-                    autoCookView.ResetTimer((int)remainingTime.TotalSeconds, (int)TimeSpan.FromHours(autoCookData.duration).TotalSeconds);
+                    if (gameData.AutoCookProducts.Length == 0)
+                    {
+                        autoCookView.Ready();
+                    }
+                    else
+                    {
+                        remainingTime = DateTime.FromBinary(gameData.AutoCookFinishTime).Subtract(DateTime.UtcNow);
+                        autoCookView.ResetTimer((int)remainingTime.TotalSeconds, (int)TimeSpan.FromHours(autoCookData.duration).TotalSeconds);
+                    }
                 });
             }).AddTo(this);
         }