7日活动红点

GameClient/Assets/Game/HotUpdate/Data/ActivityDay7DataManager.cs

@@ -1,3 +1,4 @@
+using System;
 using ET;
 
 namespace GFGGame
@@ -11,6 +12,12 @@ namespace GFGGame
             return activityInfo == null ? 0 : TimeUtil.GetDay5(activityInfo.StartTime);
         }
 
+        public int GetActivityDay7MaxPassDay()
+        {
+            return Math.Min(Activity7DaysTaskCfgArray.Instance.dataArray.Length,
+                ActivityDay7DataManager.Instance.GetActivityDay7Day());
+        }
+
         public long GetScore()
         {
             return ItemDataManager.GetItemNum(ConstItemID.ACTIVITY_DAY_7_SCORE);
@@ -45,7 +52,7 @@ namespace GFGGame
         public bool CheckActivityDay7TaskRewrdCanGetByDay(int day)
         {
             //检查天数
-            var currentDay = ActivityDay7DataManager.Instance.GetActivityDay7Day();
+            var currentDay = ActivityDay7DataManager.Instance.GetActivityDay7MaxPassDay();
             if (currentDay < day)
             {
                 return false;

GameClient/Assets/Game/HotUpdate/Data/RedDotDataManager.cs

@@ -50,8 +50,8 @@ namespace GFGGame
         public bool GetActivityDay7Red()
         {
             //任务奖励
-            var currentDay = ActivityDay7DataManager.Instance.GetActivityDay7Day();
-            for (var day = currentDay; day > 0; day--)
+            var maxDay = ActivityDay7DataManager.Instance.GetActivityDay7MaxPassDay();
+            for (var day = maxDay; day > 0; day--)
             {
                 if (ActivityDay7DataManager.Instance.CheckActivityDay7TaskRewrdCanGetByDay(day))
                 {

GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs

@@ -55,9 +55,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            var min = Math.Min(Activity7DaysTaskCfgArray.Instance.dataArray.Length,
-                ActivityDay7DataManager.Instance.GetActivityDay7Day());
-            onClickDayIndex = Math.Max(0, min - 1);
+            var maxDay = ActivityDay7DataManager.Instance.GetActivityDay7MaxPassDay();
+            onClickDayIndex = Math.Max(0, maxDay - 1);
             SetScoreList();
             SetScore();
             SetDayList();
@@ -134,7 +133,7 @@ namespace GFGGame
         {
             if (!(context.sender is GObject typeItem)) return;
             //检查天数
-            var day = ActivityDay7DataManager.Instance.GetActivityDay7Day();
+            var day = ActivityDay7DataManager.Instance.GetActivityDay7MaxPassDay();
             if (day < (int)typeItem.data + 1)
             {
                 PromptController.Instance.ShowFloatTextPrompt("未到开启时间");