Browse Source

月卡任务跳转

zhaoyang 2 years ago
parent
commit
cc92aa4956

+ 8 - 4
GameClient/Assets/Game/HotUpdate/Data/TaskDataManager.cs

@@ -151,9 +151,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());
             }
         }
@@ -162,7 +162,7 @@ namespace GFGGame
         /// 任务界面跳转
         /// </summary>
         /// <param name="jumpId"></param>
-        public void JumpToView(string jumpId, object[] goBackDatas)
+        public void JumpToView(string jumpId, object[] param, object[] goBackDatas)
         {
             switch (jumpId)
             {
@@ -179,6 +179,10 @@ namespace GFGGame
                     }
 
                     break;
+                case nameof(StoreView):
+                    ViewManager.Show(goBackDatas[0].ToString(), goBackDatas.Length > 1 ? goBackDatas[1] : null);
+                    ViewManager.Show<StoreView>(param, goBackDatas);
+                    break;
                 default:
                     ViewManager.Show($"GFGGame.{jumpId}", null, goBackDatas, true, true);
                     break;

+ 8 - 2
GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskView.cs

@@ -76,7 +76,7 @@ namespace GFGGame
             {
                 item.m_btnGo.onClick.Add(OnBtnGoClick);
             }
-            item.m_btnGo.data = _taskCfgs[index].jumpId;
+            item.m_btnGo.data = _taskCfgs[index];
 
             if (item.m_listRewards.data == null)
             {
@@ -112,7 +112,13 @@ namespace GFGGame
         {
             // Hide();
             if (!(context.sender is GObject btnGo)) return;
-            TaskDataManager.Instance.JumpToView(btnGo.data.ToString(), new object[] { typeof(ActivityThemeLuckyBoxView).FullName, true });
+            TaskCfg taskCfg = btnGo.data as TaskCfg;
+            object[] param = new object[taskCfg.jumpParamArr.Length];
+            for (int i = 0; i < taskCfg.jumpParamArr.Length; i++)
+            {
+                param[i] = taskCfg.jumpParamArr[i];
+            }
+            TaskDataManager.Instance.JumpToView(taskCfg.jumpId, param, new object[] { typeof(ActivityThemeLuckyBoxView).FullName, true });
         }
     }
 }

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

@@ -137,7 +137,7 @@ namespace GFGGame
             {
                 item.m_ComeBt.onClick.Add(OnBtnGoClick);
             }
-            item.m_ComeBt.data = _cfgs[index].jumpId;
+            item.m_ComeBt.data = _cfgs[index];
             if (item.m_listTaskReward.data == null)
             {
                 item.m_listTaskReward.itemRenderer = ListTaskRewardItemRender;
@@ -172,7 +172,13 @@ namespace GFGGame
         {
             Hide();
             if (!(context.sender is GObject btnGo)) return;
-            TaskDataManager.Instance.JumpToView(btnGo.data.ToString(), new[] { typeof(TaskView).FullName, viewData });
+            TaskCfg taskCfg = btnGo.data as TaskCfg;
+            object[] param = new object[taskCfg.jumpParamArr.Length];
+            for (int i = 0; i < taskCfg.jumpParamArr.Length; i++)
+            {
+                param[i] = taskCfg.jumpParamArr[i];
+            }
+            TaskDataManager.Instance.JumpToView(taskCfg.jumpId, param, new[] { typeof(TaskView).FullName, viewData });
         }
 
         private async void OnBtnGetAllClick()
@@ -193,17 +199,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;