From ff4e5c4f3b5967ef85b2ba6a677daffe0f8185b8 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Thu, 21 Apr 2022 16:03:12 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MyGame/Scenes/Cooking/Scripts/PopcornGameManager.cs    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameManager.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameManager.cs
index fb38233b..dd39f273 100644
--- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameManager.cs
+++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameManager.cs
@@ -122,18 +122,17 @@ public class PopcornGameManager : MonoBehaviour
         cornManager.SetCornsActive(true);
         compositeDisposable.Clear();
         cornManager.Result.SkipLatestValueOnSubscribe()
-            .FirstOrDefault()
-            .DelayFrame(1) // Disposeタイミング調整
+            .Take(1)
             .Subscribe(result =>
             {
                 state.Value = GameState.Result;
                 // リザルト表示遅延
-                this.CallWaitForSeconds(1.2f, () =>
+                Observable.Timer(TimeSpan.FromSeconds(1.2f)).Subscribe(_ =>
                 {
                     LocalCacheManager.Save(CookingResultDataTag, (rarityData, result, new Action(() => cornManager.SetCornsActive(false))));
                     LocalCacheManager.Save(RestartCallbackTag, new Action(ResetGame));
                     TransitionManager.Instance.LoadSceneAdditive(GameScenes.CookingResults);
-                });
+                }).AddTo(compositeDisposable);
             }).AddTo(compositeDisposable);
         
         // 画面タップでスタート