Merge branch 'master' of http://10.108.64.190:3000/gfg/client

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

@@ -122,7 +122,7 @@ namespace GFGGame
                         rewardBox = _ui.m_LivenessProcess.m_Reward100;
                         break;
                 }
-                if(rewardBox != null)
+                if (rewardBox != null)
                 {
                     rewardBox.m_c1.selectedIndex = state;
                     RedDotController.Instance.SetComRedDot(rewardBox.target, state == 1);
@@ -135,8 +135,10 @@ namespace GFGGame
         {
             _cfgs = TaskDataManager.Instance.GetTaskCfgs(taskType);
             _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_btnDailyTask,
+                TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.Daily));
+            RedDotController.Instance.SetComRedDot(_ui.m_btnBattlePassTask,
+                TaskDataManager.Instance.CheckTaskRewardCanGet(TaskType.BattlePass));
         }
 
         private void TaskItemRender(int index, GObject obj)
@@ -182,6 +184,16 @@ namespace GFGGame
         private async void OnBtnGetClick(EventContext context)
         {
             if (!(context.sender is GObject btnGet)) return;
+            if (taskType == TaskType.BattlePass)
+            {
+                //检查通行证是否开启
+                var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
+                if (!isBuy)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("开启锦罗织造可领取");
+                    return;
+                }
+            }
             var result = await TaskSProxy.GetTaskBonus((int)btnGet.data);
             if (!result) return;
             UpdateLivenessProcess();
@@ -206,6 +218,16 @@ namespace GFGGame
         private async void OnBtnGetAllClick()
         {
             //通用任务一键领奖
+            if (taskType == TaskType.BattlePass)
+            {
+                //检查通行证是否开启
+                var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
+                if (!isBuy)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("开启锦罗织造可领取");
+                    return;
+                }
+            }
             var result = await TaskSProxy.GetAllTaskBonus(taskType);
             if (!result) return;
             UpdateLivenessProcess();