yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

コメント追加

This commit is contained in:
kimura 2022-02-03 10:50:24 +09:00
parent 973384ccfd
commit 0477913ee5
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs
View File

@ -45,6 +45,7 @@ public class CookingResult : MonoBehaviour
result.Value = resultData; result.Value = resultData;
SetData(productData, rarityData, viewType); SetData(productData, rarityData, viewType);
// チュートリアル時
if (!GameDataManager.GameData.FinishedFlags.HasFlag(TutorialFlag.FirstPlay)) if (!GameDataManager.GameData.FinishedFlags.HasFlag(TutorialFlag.FirstPlay))
{ {
// ボタン非表示 // ボタン非表示
@ -64,6 +65,8 @@ public class CookingResult : MonoBehaviour
}).AddTo(this); }).AddTo(this);
return; return;
} }
// ボタン表示
successAction?.Invoke(); successAction?.Invoke();
okButton.gameObject.SetActive(true); okButton.gameObject.SetActive(true);
okButton.OnClickAsObservable().Take(1).Subscribe(_ => okButton.OnClickAsObservable().Take(1).Subscribe(_ =>
@ -75,16 +78,17 @@ public class CookingResult : MonoBehaviour
return; return;
} }
result.Subscribe(r => // UI用
result.Subscribe(cornResult =>
{ {
SetUI(r, viewType, CheckMakeOne(r, productData)); SetUI(cornResult, viewType, CheckMakeOne(cornResult, productData));
if (r != CornResult.Failure) if (cornResult != CornResult.Failure)
{ {
successAction?.Invoke(); successAction?.Invoke();
} }
}).AddTo(this); }).AddTo(this);
// 各種ボタン押下後、獲得処理 // 獲得する
if (viewType == ProductViewType.Default) if (viewType == ProductViewType.Default)
{ {
Market.Instance.IsPause.Value = true; Market.Instance.IsPause.Value = true;
@ -113,6 +117,7 @@ public class CookingResult : MonoBehaviour
}).AddTo(this); }).AddTo(this);
} }
// 大成功にする
perfectButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(.3f)).Subscribe(_ => perfectButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(.3f)).Subscribe(_ =>
{ {
// 広告視聴後、結果上書き // 広告視聴後、結果上書き
@ -121,11 +126,15 @@ public class CookingResult : MonoBehaviour
result.Value = CornResult.Perfect; result.Value = CornResult.Perfect;
}); });
}).AddTo(this); }).AddTo(this);
// 破棄する
destructionButton.OnClickAsObservable().Take(1).Subscribe(_ => destructionButton.OnClickAsObservable().Take(1).Subscribe(_ =>
{ {
// 遷移 // 遷移
TransitionManager.Instance.LoadScene(GameScenes.Main); TransitionManager.Instance.LoadScene(GameScenes.Main);
}).AddTo(this); }).AddTo(this);
// もう一度作る
makeOneButton.OnClickAsObservable().Take(1).Subscribe(_ => makeOneButton.OnClickAsObservable().Take(1).Subscribe(_ =>
{ {
// 獲得、遷移 // 獲得、遷移