任务

FGUIProject/assets/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskUI.xml

@@ -2,7 +2,7 @@
 <component size="1080,1344">
   <displayList>
     <component id="n1_mbf1" name="comBg" src="mbf1tn5" fileName="componentsBg/ComBg001.xml" pkg="eg2y0ldp" xy="0,0" size="1080,1344">
-      <property target="loaTitle" propertyId="1" value="ui://ubfk2kobmbf1b"/>
+      <property target="loaTitle" propertyId="1" value="ui://ubfk2kobmbf1c"/>
     </component>
     <list id="n3_mbf1" name="list" xy="98,173" size="883,1055" overflow="scroll" lineGap="22" defaultItem="ui://ubfk2kobmbf19" align="center" vAlign="middle">
       <item/>

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -254,6 +254,8 @@ namespace GFGGame
             ArenaDataManager.Instance.ReqArenaInfo();
             SkillSProxy.ReqGetSkillList(SkillType.LeagueSkill).Coroutine();
             EnduringGiftBoxSProxy.ReqGetAllGiftBagRebateStatus().Coroutine();
+            ChatSProxy.ReqQueryChatMsg(ChatType.League).Coroutine();
+            ChatSProxy.ReqQueryChatMsg(ChatType.LeagueQuestion).Coroutine();
 
             int storageAutoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY);
             FightDataManager.Instance.autoPlay = storageAutoPlay <= 0 ? false : true;

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

@@ -130,5 +130,30 @@ namespace GFGGame
                 default: return string.Format(activeRewardCfg.desc, taskCfg.count);
             }
         }
+        /// <summary>
+        /// 任务界面跳转
+        /// </summary>
+        /// <param name="jumpId"></param>
+        public void JumpToView(string jumpId, object[] goBackDatas)
+        {
+            switch (jumpId)
+            {
+                case "LeagueAnswerView":
+                    if (LeagueDataManager.Instance.Type == 1)
+                    {
+                        ViewManager.Show<LeagueView>();
+                        ViewManager.Show($"GFGGame.{jumpId}", null, goBackDatas, true, true);
+                    }
+                    else
+                    {
+                        ViewManager.Show<LeagueJoinView>(null, goBackDatas, true, true);
+                    }
+
+                    break;
+                default:
+                    ViewManager.Show($"GFGGame.{jumpId}", null, goBackDatas, true, true);
+                    break;
+            }
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskView.cs

@@ -43,8 +43,7 @@ namespace GFGGame
         {
             base.OnShown();
             _taskCfgs = TaskCfgArray.Instance.GetCfgsBytaskType(TaskType.LuckyBoxActivity);
-
-
+            _ui.m_list.numItems = _taskCfgs.Count;
         }
 
         protected override void OnHide()
@@ -61,7 +60,59 @@ namespace GFGGame
 
         private void RenderListItem(int index, GObject obj)
         {
+            UI_ListItem item = UI_ListItem.Proxy(obj);
+            //领取状态
+            int state = TaskDataManager.Instance.GetTaskStateById(_taskCfgs[index].id);
+            item.m_c1.selectedIndex = state == ConstBonusStatus.CAN_NOT_GET && !string.IsNullOrEmpty(_taskCfgs[index].jumpId) ? 3 : state;
+            item.m_txtTitle.text = string.Format("{0}({1}/{2})", TaskDataManager.Instance.GetTaskDesc(_taskCfgs[index].id), TaskDataManager.Instance.GetTaskProgressById(_taskCfgs[index].id), _taskCfgs[index].count);
+
+            if (item.m_btnGet.data == null)
+            {
+                item.m_btnGet.onClick.Add(OnBtnGetClick);
+            }
+            item.m_btnGet.data = _taskCfgs[index].id;
+
+            if (item.m_btnGo.data == null)
+            {
+                item.m_btnGo.onClick.Add(OnBtnGoClick);
+            }
+            item.m_btnGo.data = _taskCfgs[index].jumpId;
+
+            if (item.m_listRewards.data == null)
+            {
+                item.m_listRewards.itemRenderer = RenderListRewardItem;
+            }
+            item.m_listRewards.data = _taskCfgs[index].rewardsArr;
+            item.m_listRewards.numItems = _taskCfgs[index].rewardsArr.Length;
+            UI_ListItem.ProxyEnd();
+        }
+
+        private void RenderListRewardItem(int index, GObject obj)
+        {
+            int[][] bonus = (int[][])obj.parent.data;
+            ItemData reward = ItemUtil.createItemData(bonus[index]);
+            if (obj.data == null)
+            {
+                obj.data = new ItemView(obj as GComponent);
+            }
+            (obj.data as ItemView).SetData(reward);
+            (obj.data as ItemView).ChangeTxtCountStyle();
+        }
 
+        private async void OnBtnGetClick(EventContext context)
+        {
+            if (!(context.sender is GObject btnGet)) return;
+            var result = await TaskSProxy.GetTaskBonus((int)btnGet.data);
+            if (!result) return;
+            _ui.m_list.numItems = _taskCfgs.Count;
+
+        }
+
+        private void OnBtnGoClick(EventContext context)
+        {
+            // Hide();
+            if (!(context.sender is GObject btnGo)) return;
+            TaskDataManager.Instance.JumpToView(btnGo.data.ToString(), new object[] { typeof(ActivityThemeLuckyBoxView).FullName, true });
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -45,6 +45,11 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            bool showTask = this.viewData == null ? false : (bool)this.viewData;
+            if (showTask)
+            {
+                OnBtnTaskClick();
+            }
             _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.LimitLuckyBox);
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
             _luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(_activityCfg.paramsArr[0]);
@@ -64,7 +69,7 @@ namespace GFGGame
 
         private void OnBtnTaskClick()
         {
-
+            ViewManager.Show<ActivityThemeLuckyBoxTaskView>();
         }
         private void OnBtnLuckyBoxClick()
         {

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

@@ -173,7 +173,7 @@ namespace GFGGame
         {
             Hide();
             if (!(context.sender is GObject btnGo)) return;
-            ViewManager.Show($"GFGGame.{btnGo.data}", null, new[] { typeof(TaskView).FullName, viewData }, true);
+            TaskDataManager.Instance.JumpToView(btnGo.data.ToString(), new object[] { typeof(TaskView).FullName, viewData });
         }
 
         private async void OnBtnGetAllClick()
@@ -194,17 +194,17 @@ namespace GFGGame
             switch (state)
             {
                 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:
-                {
-                    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:
                     //领取完毕
                     break;