zhaoyang 2 жил өмнө
parent
commit
fce20367bd

+ 5 - 5
GameClient/Assets/Game/HotUpdate/Data/RedDotDataManager.cs

@@ -38,10 +38,10 @@ namespace GFGGame
             {
             {
                 return true;
                 return true;
             }
             }
-            if (TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.BattlePass))
-            {
-                return true;
-            }
+            // if (TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.BattlePass))
+            // {
+            //     return true;
+            // }
             //判断是否有通行证奖励可领取
             //判断是否有通行证奖励可领取
             return BattlePassTaskDataManager.Instance.GetHadCanGetReward();
             return BattlePassTaskDataManager.Instance.GetHadCanGetReward();
         }
         }
@@ -829,7 +829,7 @@ namespace GFGGame
 
 
             return false;
             return false;
         }
         }
-        
+
         /// <summary>
         /// <summary>
         /// 常驻礼包是否有需要领取的体力
         /// 常驻礼包是否有需要领取的体力
         /// </summary>
         /// </summary>

+ 13 - 13
GameClient/Assets/Game/HotUpdate/Views/Task/CombTaskView.cs

@@ -153,8 +153,8 @@ namespace GFGGame
             _ui.m_TaskList.numItems = _cfgs.Count;
             _ui.m_TaskList.numItems = _cfgs.Count;
             RedDotController.Instance.SetComRedDot(_ui.m_btnDailyTask,
             RedDotController.Instance.SetComRedDot(_ui.m_btnDailyTask,
                 TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.Daily));
                 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)
         private void TaskItemRender(int index, GObject obj)
@@ -183,7 +183,7 @@ namespace GFGGame
             var reward = TaskDataManager.Instance.GetReward(_cfgs[index]);
             var reward = TaskDataManager.Instance.GetReward(_cfgs[index]);
             item.m_listTaskReward.data = reward;
             item.m_listTaskReward.data = reward;
             item.m_listTaskReward.numItems = reward.Length;
             item.m_listTaskReward.numItems = reward.Length;
-            RedDotController.Instance.SetComRedDot(item.m_GetRewardBt, item.m_c1.selectedIndex == 1);
+            RedDotController.Instance.SetComRedDot(item.m_GetRewardBt, taskType != TaskType.BattlePass && item.m_c1.selectedIndex == 1);
             UI_TaskListItem.ProxyEnd();
             UI_TaskListItem.ProxyEnd();
         }
         }
 
 
@@ -260,17 +260,17 @@ namespace GFGGame
             switch (state)
             switch (state)
             {
             {
                 case ConstBonusStatus.CAN_NOT_GET:
                 case ConstBonusStatus.CAN_NOT_GET:
-                {
-                    var rewards = ItemUtil.CreateItemDataList(cfg.rewardsArr);
-                    ViewManager.Show<RewardPreView>(new object[] { rewards, "活跃度奖励", $"满足{cfg.count}活跃度可领取" });
-                    break;
-                }
+                    {
+                        var rewards = ItemUtil.CreateItemDataList(cfg.rewardsArr);
+                        ViewManager.Show<RewardPreView>(new object[] { rewards, "活跃度奖励", $"满足{cfg.count}活跃度可领取" });
+                        break;
+                    }
                 case ConstBonusStatus.CAN_GET:
                 case ConstBonusStatus.CAN_GET:
-                {
-                    var result = await DailyTaskSProxy.ReqLivenessBox(cfg.id);
-                    if (result) UpdateLivenessProcess();
-                    break;
-                }
+                    {
+                        var result = await DailyTaskSProxy.ReqLivenessBox(cfg.id);
+                        if (result) UpdateLivenessProcess();
+                        break;
+                    }
                 case ConstBonusStatus.GOT:
                 case ConstBonusStatus.GOT:
                     //领取完毕
                     //领取完毕
                     break;
                     break;

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/Task/TaskView.cs

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