diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index 5b0e88c5..770c2abe 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -19,13 +19,9 @@ public class KitchenManager : MonoBehaviour [SerializeField] private KitchenView kitchenView; [SerializeField] private BulkOrderIndicatorView orderIndicatorView; - private readonly Subject resetRefreshTimer = new Subject(); - // Start is called before the first frame update void Start() { - resetRefreshTimer.AddTo(this); - // レシピの表示 cookingButton.OnClickAsObservable().Subscribe(_ => { @@ -57,33 +53,25 @@ public class KitchenManager : MonoBehaviour gameData.Coin = CoinManager.Instance.OwnCoin; gameData.kitchenRefreshTime = DateTime.UtcNow.AddSeconds(refreshWaitTime).ToBinary(); GameDataManager.SaveGameData(); - resetRefreshTimer.OnNext((int) DateTime.FromBinary(gameData.kitchenRefreshTime).Subtract(DateTime.UtcNow).TotalSeconds); }); }); }).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; - 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(Const.BulkOrderDataSheet);