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

GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs

@@ -176,7 +176,7 @@ namespace GFGGame
             {
                 item.m_ComeBt.onClick.Add(OnBtnGoClick);
             }
-            item.m_ComeBt.data = taskCfg.jumpId;
+            item.m_ComeBt.data = taskCfg;
             if (item.m_listTaskReward.data == null)
             {
                 item.m_listTaskReward.itemRenderer = ListTaskRewardItemRender;
@@ -194,11 +194,17 @@ namespace GFGGame
 
         private void OnBtnGoClick(EventContext context)
         {
+            if (!(context.sender is GObject btnGo)) return;
+            var taskCfg = (TaskCfg)btnGo.data;
+            if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(taskCfg.jumpId)) return;
             Hide();
-            var btnGo = context.sender as GObject;
-            if (btnGo == null) return;
-            ViewManager.Show($"GFGGame.{btnGo.data}", null, new[] { typeof(ActivityDay7View).FullName, viewData },
-                true);
+            var param = new object[taskCfg.jumpParamArr.Length];
+            for (var i = 0; i < taskCfg.jumpParamArr.Length; i++)
+            {
+                param[i] = taskCfg.jumpParamArr[i];
+            }
+            TaskDataManager.Instance.JumpToView(taskCfg.jumpId, param,
+                new[] { typeof(ActivityDay7View).FullName, viewData });
         }
 
         private List<GComponent> components = new List<GComponent>();

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

@@ -181,11 +181,13 @@ namespace GFGGame
 
         private void OnBtnGoClick(EventContext context)
         {
-            Hide();
             if (!(context.sender is GObject btnGo)) return;
-            TaskCfg taskCfg = btnGo.data as TaskCfg;
-            object[] param = new object[taskCfg.jumpParamArr.Length];
-            for (int i = 0; i < taskCfg.jumpParamArr.Length; i++)
+            var taskCfg = btnGo.data as TaskCfg;
+            //功能未开放
+            if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(taskCfg.jumpId)) return;
+            Hide();
+            var param = new object[taskCfg.jumpParamArr.Length];
+            for (var i = 0; i < taskCfg.jumpParamArr.Length; i++)
             {
                 param[i] = taskCfg.jumpParamArr[i];
             }