From 0477913ee5bb5b7c99a300eba8583c0b207c56df Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 3 Feb 2022 10:50:24 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/Cooking/Scripts/CookingResult.cs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs index 4a124990..f1c1992d 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs @@ -45,6 +45,7 @@ public class CookingResult : MonoBehaviour result.Value = resultData; SetData(productData, rarityData, viewType); + // チュートリアル時 if (!GameDataManager.GameData.FinishedFlags.HasFlag(TutorialFlag.FirstPlay)) { // ボタン非表示 @@ -64,6 +65,8 @@ public class CookingResult : MonoBehaviour }).AddTo(this); return; } + + // ボタン表示 successAction?.Invoke(); okButton.gameObject.SetActive(true); okButton.OnClickAsObservable().Take(1).Subscribe(_ => @@ -75,16 +78,17 @@ public class CookingResult : MonoBehaviour return; } - result.Subscribe(r => + // UI用 + result.Subscribe(cornResult => { - SetUI(r, viewType, CheckMakeOne(r, productData)); - if (r != CornResult.Failure) + SetUI(cornResult, viewType, CheckMakeOne(cornResult, productData)); + if (cornResult != CornResult.Failure) { successAction?.Invoke(); } }).AddTo(this); - // 各種ボタン押下後、獲得処理 + // 獲得する if (viewType == ProductViewType.Default) { Market.Instance.IsPause.Value = true; @@ -113,6 +117,7 @@ public class CookingResult : MonoBehaviour }).AddTo(this); } + // 大成功にする perfectButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(.3f)).Subscribe(_ => { // 広告視聴後、結果上書き @@ -121,11 +126,15 @@ public class CookingResult : MonoBehaviour result.Value = CornResult.Perfect; }); }).AddTo(this); + + // 破棄する destructionButton.OnClickAsObservable().Take(1).Subscribe(_ => { // 遷移 TransitionManager.Instance.LoadScene(GameScenes.Main); }).AddTo(this); + + // もう一度作る makeOneButton.OnClickAsObservable().Take(1).Subscribe(_ => { // 獲得、遷移