锦罗织造任务红点

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

@@ -38,10 +38,10 @@ namespace GFGGame
             {
                 return true;
             }
-            // if (TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.BattlePass))
-            // {
-            //     return true;
-            // }
+            if (TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.BattlePass))
+            {
+                return true;
+            }
             //判断是否有通行证奖励可领取
             return BattlePassTaskDataManager.Instance.GetHadCanGetReward();
         }

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

@@ -172,9 +172,9 @@ namespace GFGGame
                     return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0], taskCfg.paramsArr[1]);
                 case ConstTaskType.FinishStory:
                 case ConstTaskType.FinishInstanceZones:
-                {
-                    return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0]);
-                }
+                    {
+                        return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0]);
+                    }
                 default: return string.Format(activeRewardCfg.desc, taskCfg.GetTargetCount());
             }
         }
@@ -184,7 +184,14 @@ namespace GFGGame
             var taskInfos = TaskDataManager.Instance.GetTaskInfos(taskType);
             if (taskInfos.Select(taskInfo => taskInfo.Value).Any(info => info.State == ConstBonusStatus.CAN_GET))
             {
-                return true;
+                if (taskType == TaskType.BattlePass && !BattlePassTaskDataManager.Instance.GetIsBuy())
+                {
+                    return false;
+                }
+                else
+                {
+                    return true;
+                }
             }
             return false;
         }

GameClient/Assets/Game/HotUpdate/Views/Task/CombTaskView.cs

@@ -153,8 +153,8 @@ namespace GFGGame
             _ui.m_TaskList.numItems = _cfgs.Count;
             RedDotController.Instance.SetComRedDot(_ui.m_btnDailyTask,
                 TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.Daily));
-            // RedDotController.Instance.SetComRedDot(_ui.m_btnBattlePassTask,
-            //     TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.BattlePass));
+            RedDotController.Instance.SetComRedDot(_ui.m_btnBattlePassTask,
+                TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.BattlePass));
         }
 
         private void TaskItemRender(int index, GObject obj)
@@ -183,7 +183,8 @@ namespace GFGGame
             var reward = TaskDataManager.Instance.GetReward(_cfgs[index]);
             item.m_listTaskReward.data = reward;
             item.m_listTaskReward.numItems = reward.Length;
-            bool canGet = taskType != TaskType.BattlePass && item.m_c1.selectedIndex == 1;
+            var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
+            bool canGet = item.m_c1.selectedIndex == 1 && (taskType != TaskType.BattlePass || taskType == TaskType.BattlePass && isBuy);
             RedDotController.Instance.SetComRedDot(item.m_GetRewardBt, canGet);
             UI_TaskListItem.ProxyEnd();
         }

GameClient/Assets/Game/HotUpdate/Views/Task/TaskView.cs

@@ -94,7 +94,7 @@ namespace GFGGame
         private void UpdateRedPoint()
         {
             bool showRedPoint = TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.Daily)
-                // || TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.BattlePass)
+                || TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.BattlePass)
                 || DailyTaskDataManager.Instance.GetHadGetRewardNum();
             RedDotController.Instance.SetComRedDot(_ui.m_btnTask, showRedPoint);
             showRedPoint = BattlePassTaskDataManager.Instance.GetHadCanGetReward();