From 71efba8db6a07b74cef548d1655c1b9666845606 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 24 Jun 2022 14:08:15 +0900 Subject: [PATCH] fix ScrollGameWatchVideoDialog --- .../Scripts/ScrollGameWatchVideoDialog.cs | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ScrollGameWatchVideoDialog.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ScrollGameWatchVideoDialog.cs index 3bf65041..abeec096 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ScrollGameWatchVideoDialog.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ScrollGameWatchVideoDialog.cs @@ -29,15 +29,13 @@ namespace MyGame.Scenes.MiniGame.Scripts private void Start() { var gameData = GameDataManager.GameData; - - - var count = Const.ScrollGameDailyPlayMaxCount - gameData.ScrollGameLastPlayTime; + var count = Const.ScrollGameDailyPlayMaxCount - gameData.ScrollGameTodayPlayCount; var canWatch = count > 0; watchMovieObject.SetActive(canWatch); - waitObject.SetActive(canWatch); + waitObject.SetActive(!canWatch); playCountText.text = $"{count}"; - var limitTime = TimeSpan.Zero; + var limitTime = gameData.GetScrollGameLimitTime(); if (limitTime.TotalSeconds > 0) { timeLimitText.text = String.Format(ScriptLocalization.UI.MissionDailyTimeLimit, limitTime.Hours, limitTime.Minutes, limitTime.Seconds); @@ -47,18 +45,7 @@ namespace MyGame.Scenes.MiniGame.Scripts timeLimitText.text = String.Format(ScriptLocalization.UI.MissionDailyTimeLimit, 0, 0, 0); } - closeButton.OnClickAsObservable().Take(1).Subscribe(_ => - { - LocalCacheManager.Load(CloseCallbackTag, null)?.Invoke(); - LocalCacheManager.Remove(CloseCallbackTag); - transform.parent.SetLocalScale(0); - backgroundAnimator.SetTrigger(CloseTrigger); - this.CallWaitForSeconds(.25f, () => - { - TransitionManager.Instance.UnloadScene(GameScenes.WatchMovieMiniGame); - }); - }).AddTo(this); - closeButton2.OnClickAsObservable().Take(1).Subscribe(_ => + closeButton.OnClickAsObservable().Merge(closeButton2.OnClickAsObservable()).Take(1).Subscribe(_ => { LocalCacheManager.Load(CloseCallbackTag, null)?.Invoke(); LocalCacheManager.Remove(CloseCallbackTag);