Update show patrol popup at room entering

planetarium · Oct 17, 2023 · 6156fe7 · 6156fe7
1 parent c980c5d
commit 6156fe7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/nekoyume/Assets/_Scripts/Game/Entrance/RoomEntering.cs b/nekoyume/Assets/_Scripts/Game/Entrance/RoomEntering.cs
@@ -11,6 +11,7 @@ namespace Nekoyume.Game.Entrance
     public class RoomEntering : MonoBehaviour
     {
         private const int EventReleaseNotePopupLimitClearedStageId = 20;
+        private const int PatrolRewardPopupLimitClearedStageId = 20;
 
         private void Start()
         {
@@ -93,6 +94,13 @@ private IEnumerator Act()
             {
                 var clearedStageId = worldInfo.TryGetLastClearedStageId(out var id) ? id : 1;
 
+                var patrolRewardPopup = Widget.Find<PatrolRewardPopup>();
+                if (patrolRewardPopup.CanClaim &&
+                    clearedStageId > PatrolRewardPopupLimitClearedStageId)
+                {
+                    patrolRewardPopup.Show();
+                }
+
                 var eventReleaseNotePopup = Widget.Find<EventReleaseNotePopup>();
                 if (eventReleaseNotePopup.HasUnread &&
                     clearedStageId > EventReleaseNotePopupLimitClearedStageId)

diff --git a/nekoyume/Assets/_Scripts/UI/MainCanvas.cs b/nekoyume/Assets/_Scripts/UI/MainCanvas.cs
@@ -264,6 +264,8 @@ public IEnumerator CreateSecondWidgets()
             yield return null;
             _secondWidgets.Add(Widget.Create<ArenaBoard>());
             yield return null;
+            _secondWidgets.Add(Widget.Create<PatrolRewardPopup>());
+            yield return null;
             _secondWidgets.Add(Widget.Create<EventReleaseNotePopup>());
             yield return null;
 
@@ -379,8 +381,6 @@ public IEnumerator CreateSecondWidgets()
             yield return null;
             _secondWidgets.Add(Widget.Create<ShopListPopup>());
             yield return null;
-            _secondWidgets.Add(Widget.Create<PatrolRewardPopup>());
-            yield return null;
 
             // tooltip
             _secondWidgets.Add(Widget.Create<EquipmentTooltip>());

diff --git a/nekoyume/Assets/_Scripts/UI/Widget/Popup/PatrolRewardPopup.cs b/nekoyume/Assets/_Scripts/UI/Widget/Popup/PatrolRewardPopup.cs
@@ -50,6 +50,9 @@ private class RewardData
         private Address _currentAvatarAddress;
         private bool _initialized;
 
+        public bool CanClaim =>
+            PatrolReward.PatrolTime.Value >= PatrolReward.Interval && !Claiming.Value;
+
         protected override void Awake()
         {
             base.Awake();