Browse Source

月卡弹窗修改,每日签到修改

zhangyuqian 1 year ago
parent
commit
2b0439b96c

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySignView.cs

@@ -191,7 +191,7 @@ namespace GFGGame
                 RedDotController.Instance.SetComRedDot(item.target, canGet);
                 UI_ComProBonus.ProxyEnd();
             }
-            if (_month > dateTime.Month || _year > dateTime.Year)
+            if ((_month > dateTime.Month && _year == dateTime.Year) || _year > dateTime.Year)
             {
                 _ui.m_list.numItems = signBonusCfgs.Count > 29 ? signBonusCfgs.Count + 1 : signBonusCfgs.Count;
             }

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -1119,9 +1119,9 @@ namespace GFGGame
                         if (endTime2 < TimeHelper.ServerNow())
                         {
                             ViewManager.Show<MonthlyCardTipsView>();
+                            return;
                         }
-                    }
-                    return;
+                    } 
                 }
             }
             //活动公告弹窗