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

Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop

This commit is contained in:
koya_15 2021-10-21 19:13:29 +09:00
parent 439792217e 862615c9e8
commit 4bbae140d2
1 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
View File

@ -19,13 +19,9 @@ public class KitchenManager : MonoBehaviour
[SerializeField] private KitchenView kitchenView; [SerializeField] private KitchenView kitchenView;
[SerializeField] private BulkOrderIndicatorView orderIndicatorView; [SerializeField] private BulkOrderIndicatorView orderIndicatorView;
private readonly Subject<int> resetRefreshTimer = new Subject<int>();
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
resetRefreshTimer.AddTo(this);
// レシピの表示 // レシピの表示
cookingButton.OnClickAsObservable().Subscribe(_ => cookingButton.OnClickAsObservable().Subscribe(_ =>
{ {
@ -57,33 +53,25 @@ public class KitchenManager : MonoBehaviour
gameData.Coin = CoinManager.Instance.OwnCoin; gameData.Coin = CoinManager.Instance.OwnCoin;
gameData.kitchenRefreshTime = DateTime.UtcNow.AddSeconds(refreshWaitTime).ToBinary(); gameData.kitchenRefreshTime = DateTime.UtcNow.AddSeconds(refreshWaitTime).ToBinary();
GameDataManager.SaveGameData(); GameDataManager.SaveGameData();
resetRefreshTimer.OnNext((int) DateTime.FromBinary(gameData.kitchenRefreshTime).Subtract(DateTime.UtcNow).TotalSeconds);
}); });
}); });
}).AddTo(this); }).AddTo(this);
resetRefreshTimer // 休憩リワード
.Subscribe(time =>
{
#if UNITY_EDITOR
Debug.Log($"remaining: {time}");
#endif
adButton.gameObject.SetActive(false);
kitchenView.SetNormalAnimation();
Observable.Timer(TimeSpan.Zero, TimeSpan.FromSeconds(1f))
.Select(x => time - x)
.TakeWhile(x => x > 0)
.Subscribe(_ => { }, () =>
{
adButton.gameObject.SetActive(true);
kitchenView.SetTiredAnimation();
}).AddTo(this);
}).AddTo(this);
// 動画視聴可能かどうかはシーンロード時に確認
var remaining = (int) DateTime.FromBinary(gameData.kitchenRefreshTime).Subtract(DateTime.UtcNow).TotalSeconds; var remaining = (int) DateTime.FromBinary(gameData.kitchenRefreshTime).Subtract(DateTime.UtcNow).TotalSeconds;
resetRefreshTimer.OnNext(remaining); if (remaining > 0)
{
adButton.gameObject.SetActive(false);
kitchenView.SetNormalAnimation();
}
else
{
adButton.gameObject.SetActive(true);
kitchenView.SetTiredAnimation();
}
#if UNITY_EDITOR
Debug.Log($"remaining: {remaining}");
#endif
// 大量注文 // 大量注文
var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderData>(Const.BulkOrderDataSheet); var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderData>(Const.BulkOrderDataSheet);