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); // 画面タップでスタート