Merge pull request #6525 from planetarium/feature/fix-thor-schedule-n…

…ull-check fix thor schedule null check
planetarium · Nov 28, 2024 · 5abdae8 · 5abdae8
2 parents bd67aea + 41c76fb
commit 5abdae8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/nekoyume/Assets/_Scripts/Game/LiveAsset/LiveAssetManager.cs b/nekoyume/Assets/_Scripts/Game/LiveAsset/LiveAssetManager.cs
@@ -12,6 +12,7 @@
 using System.Collections;
 using System.Text.Json.Serialization;
 using System.Threading;
+using JetBrains.Annotations;
 using Nekoyume.L10n;
 
 namespace Nekoyume.Game.LiveAsset
@@ -69,14 +70,15 @@ private enum InitializingState
         public IReadOnlyList<NoticeData> NoticeData => _notices.NoticeData;
         public GameConfig GameConfig { get; private set; }
         public CommandLineOptions CommandLineOptions { get; private set; }
+        [CanBeNull]
         public ApiClient.ThorSchedule ThorSchedule { get; private set; }
         public EventRewardPopupData EventRewardPopupData { get; private set; }
         public Sprite StakingLevelSprite { get; private set; }
         public Sprite StakingRewardSprite { get; private set; }
         public int[] StakingArenaBonusValues { get; private set; }
         public bool IsInitialized => _state == InitializingState.Initialized;
 
-        public System.Action<Nekoyume.ApiClient.ThorSchedule> OnChangedThorSchedule;
+        public Action<ApiClient.ThorSchedule> OnChangedThorSchedule;
 
         public void InitializeData()
         {

diff --git a/nekoyume/Assets/_Scripts/UI/Widget/LobbyMenu.cs b/nekoyume/Assets/_Scripts/UI/Widget/LobbyMenu.cs
@@ -755,7 +755,7 @@ public override void Show(bool ignoreShowAnimation = false)
             stakingLevelIcon.sprite =
                 stakeIconData.GetIcon(States.Instance.StakingLevel, IconType.Bubble);
 
-            var thorSchedule = Game.LiveAsset.LiveAssetManager.instance.ThorSchedule;
+            var thorSchedule = LiveAssetManager.instance.ThorSchedule;
             thorSeasonButton.gameObject.SetActive(thorSchedule?.IsOpened == true);
 
             var isInEventDate = LiveAssetManager.instance.EventRewardPopupData.EventRewards.Any();
@@ -780,19 +780,21 @@ private void SubscribeAtShow()
                     value.currentTickets.ToString(CultureInfo.InvariantCulture);
             }).AddTo(_disposablesAtShow);
 
-            var thorSchedule = Game.LiveAsset.LiveAssetManager.instance.ThorSchedule;
-            if (thorSchedule.IsOpened)
+            var thorSchedule = LiveAssetManager.instance.ThorSchedule;
+            if (thorSchedule?.IsOpened != true)
             {
-                Observable.Interval(TimeSpan.FromMinutes(1))
-                    .Subscribe(_ => UpdateThorScheduleText())
-                    .AddTo(_disposablesAtShow);
-                UpdateThorScheduleText();
+                return;
             }
+
+            Observable.Interval(TimeSpan.FromMinutes(1))
+                      .Subscribe(_ => UpdateThorScheduleText())
+                      .AddTo(_disposablesAtShow);
+            UpdateThorScheduleText();
         }
 
         private void UpdateThorScheduleText()
         {
-            var thorSchedule = Game.LiveAsset.LiveAssetManager.instance.ThorSchedule;
+            var thorSchedule = LiveAssetManager.instance.ThorSchedule;
             if (thorSchedule is null || !thorSchedule.IsOpened)
             {
                 return;