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

リファクタ

This commit is contained in:
kimura 2022-02-03 12:16:35 +09:00
parent 8032d16175
commit e7f8dd8cc2
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,28 +122,6 @@ public class CookingResult : MonoBehaviour
} }
}).AddTo(this); }).AddTo(this);
// 獲得する
if (viewType == ProductViewType.Default)
{
Market.Instance.IsPause.Value = true;
okButton.OnClickAsObservable().Take(1).Subscribe(_ =>
{
// 獲得、遷移
MoveStock(GameDataManager.GameData.WaitAddStock);
GameDataManager.SaveGameData();
Market.Instance.IsPause.Value = false;
TransitionManager.Instance.LoadScene(GameScenes.Main);
}).AddTo(this);
}
else
{
// 大量注文時処理
okButton.OnClickAsObservable().Take(1).Subscribe(_ =>
{
TransitionManager.Instance.LoadScene(GameScenes.Main);
}).AddTo(this);
}
// 大成功にする // 大成功にする
perfectButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(.3f)).Subscribe(_ => perfectButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(.3f)).Subscribe(_ =>
{ {
@ -154,10 +132,16 @@ public class CookingResult : MonoBehaviour
}); });
}).AddTo(this); }).AddTo(this);
// 破棄する // 獲得する
destructionButton.OnClickAsObservable().Take(1).Subscribe(_ => if (viewType == ProductViewType.Default)
{ {
// 遷移 Market.Instance.IsPause.Value = true;
okButton.OnClickAsObservable().Take(1).Subscribe(_ =>
{
// 獲得、遷移
MoveStock(GameDataManager.GameData.WaitAddStock);
GameDataManager.SaveGameData();
Market.Instance.IsPause.Value = false;
TransitionManager.Instance.LoadScene(GameScenes.Main); TransitionManager.Instance.LoadScene(GameScenes.Main);
}).AddTo(this); }).AddTo(this);
@ -173,6 +157,21 @@ public class CookingResult : MonoBehaviour
LocalCacheManager.Load<Action>(PopcornGameManager.RestartCallbackTag, null)?.Invoke(); LocalCacheManager.Load<Action>(PopcornGameManager.RestartCallbackTag, null)?.Invoke();
}).AddTo(this); }).AddTo(this);
} }
else
{
// 大量注文時処理
okButton.OnClickAsObservable().Take(1).Subscribe(_ =>
{
TransitionManager.Instance.LoadScene(GameScenes.Main);
}).AddTo(this);
}
// 破棄する
destructionButton.OnClickAsObservable().Take(1).Subscribe(_ =>
{
TransitionManager.Instance.LoadScene(GameScenes.Main);
}).AddTo(this);
}
private void SetData(ProductData recipe, RarityData rarity, ProductViewType viewType) private void SetData(ProductData recipe, RarityData rarity, ProductViewType viewType)
{ {