diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs index 9d124a18..14654c4c 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs @@ -121,6 +121,16 @@ public class CookingResult : MonoBehaviour successAction?.Invoke(); } }).AddTo(this); + + // 大成功にする + perfectButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(.3f)).Subscribe(_ => + { + // 広告視聴後、結果上書き + GetRewardDialog.ShowPerfectPopcornDialog(() => + { + result.Value = CornResult.Perfect; + }); + }).AddTo(this); // 獲得する if (viewType == ProductViewType.Default) @@ -134,6 +144,18 @@ public class CookingResult : MonoBehaviour Market.Instance.IsPause.Value = false; TransitionManager.Instance.LoadScene(GameScenes.Main); }).AddTo(this); + + // もう一度作る + makeOneButton.OnClickAsObservable().Take(1).Subscribe(_ => + { + // 獲得、遷移 + MoveStock(GameDataManager.GameData.WaitAddStock); + GameDataManager.SaveGameData(); + Market.Instance.IsPause.Value = false; + SoundManager.Instance.ChangeVolumeUniqueBGM(1f); + TransitionManager.Instance.UnloadScene(GameScenes.CookingResults); + LocalCacheManager.Load(PopcornGameManager.RestartCallbackTag, null)?.Invoke(); + }).AddTo(this); } else { @@ -143,35 +165,12 @@ public class CookingResult : MonoBehaviour TransitionManager.Instance.LoadScene(GameScenes.Main); }).AddTo(this); } - - // 大成功にする - perfectButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(.3f)).Subscribe(_ => - { - // 広告視聴後、結果上書き - GetRewardDialog.ShowPerfectPopcornDialog(() => - { - result.Value = CornResult.Perfect; - }); - }).AddTo(this); - + // 破棄する destructionButton.OnClickAsObservable().Take(1).Subscribe(_ => { - // 遷移 TransitionManager.Instance.LoadScene(GameScenes.Main); }).AddTo(this); - - // もう一度作る - makeOneButton.OnClickAsObservable().Take(1).Subscribe(_ => - { - // 獲得、遷移 - MoveStock(GameDataManager.GameData.WaitAddStock); - GameDataManager.SaveGameData(); - Market.Instance.IsPause.Value = false; - SoundManager.Instance.ChangeVolumeUniqueBGM(1f); - TransitionManager.Instance.UnloadScene(GameScenes.CookingResults); - LocalCacheManager.Load(PopcornGameManager.RestartCallbackTag, null)?.Invoke(); - }).AddTo(this); } private void SetData(ProductData recipe, RarityData rarity, ProductViewType viewType)