feat 任务修改

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

@@ -73,9 +73,22 @@ namespace GFGGame
             }
         }
 
-        protected override void OnHide()
+        //更新任务列表
+        private void UpdateTask()
         {
-            base.OnHide();
+            var selectedIndex = _ui.m_c1.selectedIndex;
+            switch (selectedIndex)
+            {
+                case 0:
+                    _cfgs = TaskDataManager.Instance.GetTaskCfgs(TaskType.Daily);
+                    break;
+                case 1:
+                    _cfgs = TaskDataManager.Instance.GetTaskCfgs(TaskType.BattlePass);
+                    break;
+            }
+
+            _ui.m_TaskList.itemRenderer = TaskItemIndex;
+            _ui.m_TaskList.numItems = _cfgs.Count;
         }
 
         private void UpdateList()
@@ -83,8 +96,13 @@ namespace GFGGame
             _cfgs = TaskDataManager.Instance.GetTaskCfgs(TaskType.Daily);
         }
 
-        private void UpdateReward()
+
+        private void TaskItemIndex(int index, GObject obj)
         {
+            var item = UI_TaskListItem.Proxy(obj);
+            //领取状态
+            item.m_c1.selectedIndex =TaskDataManager.Instance.GetTaskStateById(_cfgs[index].id);
+            UI_TaskListItem.ProxyEnd();
         }
 
         private void ListItemRender(int index, GObject obj)
@@ -130,8 +148,8 @@ namespace GFGGame
             var btnGet = context.sender as GObject;
             var result = await DailyTaskSProxy.ReqDailyTaskBonus((int)btnGet.data);
             if (!result) return;
-            UpdateList();
-            UpdateReward();
+            UpdateLivenessProcess();
+            UpdateTask();
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_REN_WU, 2);
         }
 
@@ -165,7 +183,7 @@ namespace GFGGame
                 var result = await DailyTaskSProxy.ReqLivenessBox(cfg.id);
                 if (result)
                 {
-                    UpdateReward();
+                    UpdateTask();
                 }
             }
             else
@@ -185,8 +203,8 @@ namespace GFGGame
         {
             var result = await DailyTaskSProxy.ReqAllDailyTaskBonus();
             if (!result) return;
-            UpdateList();
-            UpdateReward();
+            UpdateLivenessProcess();
+            UpdateTask();
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_REN_WU, 2);
         }
     }

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

@@ -7,7 +7,6 @@ namespace GFGGame
         private UI_TaskUI _ui;
         private ValueBarController _valueBarController;
 
-
         public override void Dispose()
         {
             if (_valueBarController != null)
@@ -32,31 +31,27 @@ namespace GFGGame
             _ui = UI_TaskUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
-            bringToFontOnClick = true;
+            bringToFontOnClick = false;
 
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _valueBarController = new ValueBarController(_ui.m_comValueBar);
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_beijing2");
 
             _ui.m_c1.onChanged.Add(OnCtrlChange);
         }
-        
+
         private void OnBtnBackClick()
         {
+            ViewManager.Hide<CombTaskView>();
+            ViewManager.Hide<BattlePassTaskView>();
             ViewManager.GoBackFrom(typeof(TaskView).FullName);
         }
 
-        protected override void AddEventListener()
-        {
-            base.AddEventListener();
-        }
-
         protected override void OnShown()
         {
             base.OnShown();
             _valueBarController.OnShown();
-            _ui.m_c1.selectedIndex = 2;
-            // _ui.m_c1.selectedIndex = viewData == null ? 1 : (int)(viewData as object[])?[0];
+            _ui.m_c1.selectedIndex = viewData == null ? 1 : (int)(viewData as object[])?[0]!;
         }
 
         protected override void OnHide()
@@ -66,24 +61,21 @@ namespace GFGGame
             _ui.m_c1.selectedIndex = 0;
         }
 
-        protected override void RemoveEventListener()
-        {
-            base.RemoveEventListener();
-        }
-
         private void OnCtrlChange()
         {
             switch (_ui.m_c1.selectedIndex)
             {
                 case 1:
                     ViewManager.Show<CombTaskView>();
+                    ViewManager.Hide<BattlePassTaskView>();
                     break;
                 case 2:
                     ViewManager.Show<BattlePassTaskView>();
+                    ViewManager.Hide<CombTaskView>();
                     break;
             }
 
-            this.viewData = null;
+            viewData = null;
         }
     }
 }