diff --git a/shared/resource/jsons/dic_zyz_mainTask.json b/shared/resource/jsons/dic_zyz_mainTask.json
index 71f2e6605..76e0f4ece 100644
--- a/shared/resource/jsons/dic_zyz_mainTask.json
+++ b/shared/resource/jsons/dic_zyz_mainTask.json
@@ -4,7 +4,6 @@
         "mainTaskId": 1,
         "taskType": 3,
         "taskInfo": "主公等级达10级",
-        "group": 1,
         "taskParam": "10&",
         "taskStage": 1,
         "taskReward": "31001&10000",
@@ -16,7 +15,6 @@
         "mainTaskId": 2,
         "taskType": 39,
         "taskInfo": "主线通关第1-12关",
-        "group": 1,
         "taskParam": "1&116",
         "taskStage": 1,
         "taskReward": "31002&50",
@@ -27,9 +25,8 @@
         "id": 3,
         "mainTaskId": 3,
         "taskType": 41,
-        "taskInfo": "事件触发10次",
-        "group": 1,
-        "taskParam": "0&1&",
+        "taskInfo": "事件触发1次",
+        "taskParam": "0&1",
         "taskStage": 1,
         "taskReward": "31002&50",
         "condition": 1,
@@ -40,7 +37,6 @@
         "mainTaskId": 4,
         "taskType": 4,
         "taskInfo": "武将招募10次",
-        "group": 1,
         "taskParam": "10&",
         "taskStage": 1,
         "taskReward": "21019&40",
@@ -52,7 +48,6 @@
         "mainTaskId": 5,
         "taskType": 9,
         "taskInfo": "2名武将升至10级",
-        "group": 1,
         "taskParam": "2&10",
         "taskStage": 1,
         "taskReward": "22001&1",
@@ -63,12 +58,11 @@
         "id": 6,
         "mainTaskId": 6,
         "taskType": 3,
-        "taskInfo": "主公等级达20级",
-        "group": 1,
-        "taskParam": "10&",
+        "taskInfo": "主公等级达15级",
+        "taskParam": "15&",
         "taskStage": 2,
         "taskReward": "31002&100",
-        "condition": 20,
+        "condition": 15,
         "skip": "115&"
     },
     {
@@ -76,7 +70,6 @@
         "mainTaskId": 7,
         "taskType": 39,
         "taskInfo": "主线通关第1-20关",
-        "group": 2,
         "taskParam": "1&124",
         "taskStage": 2,
         "taskReward": "11002&10|31001&5000",
@@ -88,7 +81,6 @@
         "mainTaskId": 8,
         "taskType": 41,
         "taskInfo": "奇遇5次",
-        "group": 1,
         "taskParam": "0&5&",
         "taskStage": 2,
         "taskReward": "31002&100",
@@ -100,7 +92,6 @@
         "mainTaskId": 9,
         "taskType": 4,
         "taskInfo": "武将招募10次",
-        "group": 1,
         "taskParam": "10&",
         "taskStage": 2,
         "taskReward": "71001&1",
@@ -112,7 +103,6 @@
         "mainTaskId": 10,
         "taskType": 9,
         "taskInfo": "5名武将升至15级",
-        "group": 2,
         "taskParam": "5&15",
         "taskStage": 2,
         "taskReward": "11001&50",
@@ -124,7 +114,6 @@
         "mainTaskId": 11,
         "taskType": 10,
         "taskInfo": "5名武将各训练1次",
-        "group": 1,
         "taskParam": "5&1",
         "taskStage": 2,
         "taskReward": "17042&5",
@@ -136,7 +125,6 @@
         "mainTaskId": 12,
         "taskType": 23,
         "taskInfo": "给2名武将各装备1件装备",
-        "group": 1,
         "taskParam": "2&1",
         "taskStage": 2,
         "taskReward": "17051&1000",
@@ -148,7 +136,6 @@
         "mainTaskId": 13,
         "taskType": 42,
         "taskInfo": "每日三星通关护送商人新手模式",
-        "group": 1,
         "taskParam": "3&1&1&3001",
         "taskStage": 2,
         "taskReward": "31001&10000",
@@ -160,7 +147,6 @@
         "mainTaskId": 14,
         "taskType": 35,
         "taskInfo": "赠送5次友情点",
-        "group": 1,
         "taskParam": "5&",
         "taskStage": 2,
         "taskReward": "11013&1",
@@ -172,7 +158,6 @@
         "mainTaskId": 15,
         "taskType": 36,
         "taskInfo": "世界聊天频道发言1次",
-        "group": 1,
         "taskParam": "2&1",
         "taskStage": 2,
         "taskReward": "31002&20",
@@ -183,9 +168,8 @@
         "id": 16,
         "mainTaskId": 16,
         "taskType": 38,
-        "taskInfo": "使用曹操挑战每日关卡5次",
-        "group": 1,
-        "taskParam": "1&5&1&3001",
+        "taskInfo": "使用曹操挑战每日守护商人5次",
+        "taskParam": "1&5&10&3001&3002&3003&3004&3005&3006&3007&3008&3009&3010",
         "taskStage": 2,
         "taskReward": "21001&60|31002&500",
         "condition": 5,
@@ -196,7 +180,6 @@
         "mainTaskId": 17,
         "taskType": 3,
         "taskInfo": "主公等级达15级",
-        "group": 1,
         "taskParam": "15&",
         "taskStage": 3,
         "taskReward": "31001&20000",
@@ -208,7 +191,6 @@
         "mainTaskId": 18,
         "taskType": 39,
         "taskInfo": "主线通关第2-5关",
-        "group": 3,
         "taskParam": "1&205",
         "taskStage": 3,
         "taskReward": "31002&50",
@@ -220,7 +202,6 @@
         "mainTaskId": 19,
         "taskType": 4,
         "taskInfo": "武将招募30次",
-        "group": 1,
         "taskParam": "30&",
         "taskStage": 3,
         "taskReward": "22001&2",
@@ -232,7 +213,6 @@
         "mainTaskId": 20,
         "taskType": 6,
         "taskInfo": "2名武将升星1次",
-        "group": 1,
         "taskParam": "2&1",
         "taskStage": 3,
         "taskReward": "22001&1",
@@ -244,7 +224,6 @@
         "mainTaskId": 21,
         "taskType": 10,
         "taskInfo": "5名武将各训练5次",
-        "group": 2,
         "taskParam": "5&5",
         "taskStage": 3,
         "taskReward": "17042&1|31001&1000",
@@ -255,9 +234,8 @@
         "id": 22,
         "mainTaskId": 22,
         "taskType": 43,
-        "taskInfo": "护送商人扫荡30次",
-        "group": 1,
-        "taskParam": "4&30",
+        "taskInfo": "护送商人挑战30次",
+        "taskParam": "1&30",
         "taskStage": 3,
         "taskReward": "31001&50000",
         "condition": 30,
@@ -268,7 +246,6 @@
         "mainTaskId": 23,
         "taskType": 44,
         "taskInfo": "参与秘境1次",
-        "group": 1,
         "taskParam": "1&",
         "taskStage": 3,
         "taskReward": "40007&200",
@@ -280,7 +257,6 @@
         "mainTaskId": 24,
         "taskType": 51,
         "taskInfo": "寻宝招募队友5次",
-        "group": 1,
         "taskParam": "5&",
         "taskStage": 3,
         "taskReward": "40002&100",
@@ -292,7 +268,6 @@
         "mainTaskId": 25,
         "taskType": 17,
         "taskInfo": "解锁百家学宫5个安置位",
-        "group": 1,
         "taskParam": "5&",
         "taskStage": 3,
         "taskReward": "71001&1",
@@ -304,8 +279,7 @@
         "mainTaskId": 26,
         "taskType": 19,
         "taskInfo": "头衔升至公士",
-        "group": 1,
-        "taskParam": "1&",
+        "taskParam": "2&",
         "taskStage": 3,
         "taskReward": "31002&300",
         "condition": 1,
@@ -316,7 +290,6 @@
         "mainTaskId": 27,
         "taskType": 22,
         "taskInfo": "装备6件装备",
-        "group": 1,
         "taskParam": "6&",
         "taskStage": 3,
         "taskReward": "17051&2000",
@@ -327,9 +300,8 @@
         "id": 28,
         "mainTaskId": 28,
         "taskType": 38,
-        "taskInfo": "使用夏侯渊挑战每日关卡5次",
-        "group": 2,
-        "taskParam": "2&5&1&3001",
+        "taskInfo": "使用夏侯渊挑战每日守护商人5次",
+        "taskParam": "2&5&10&3001&3002&3003&3004&3005&3006&3007&3008&3009&3010",
         "taskStage": 3,
         "taskReward": "11014&10",
         "condition": 5,
@@ -340,7 +312,6 @@
         "mainTaskId": 29,
         "taskType": 34,
         "taskInfo": "拥有15名好友",
-        "group": 1,
         "taskParam": "15&",
         "taskStage": 3,
         "taskReward": "11014&10",
@@ -352,7 +323,6 @@
         "mainTaskId": 30,
         "taskType": 3,
         "taskInfo": "主公等级达20级",
-        "group": 1,
         "taskParam": "20&",
         "taskStage": 4,
         "taskReward": "31001&30000",
@@ -364,7 +334,6 @@
         "mainTaskId": 31,
         "taskType": 39,
         "taskInfo": "主线通关第3-5关",
-        "group": 4,
         "taskParam": "1&108",
         "taskStage": 4,
         "taskReward": "31002&50",
@@ -376,7 +345,6 @@
         "mainTaskId": 32,
         "taskType": 7,
         "taskInfo": "拥有3名初始传奇品质武将",
-        "group": 1,
         "taskParam": "3&3",
         "taskStage": 4,
         "taskReward": "22001&3",
@@ -388,7 +356,6 @@
         "mainTaskId": 33,
         "taskType": 14,
         "taskInfo": "5名武将各自兵种进阶1次",
-        "group": 1,
         "taskParam": "5&1",
         "taskStage": 4,
         "taskReward": "17042&3",
@@ -400,7 +367,6 @@
         "mainTaskId": 34,
         "taskType": 9,
         "taskInfo": "8名武将升级至20级",
-        "group": 1,
         "taskParam": "8&20",
         "taskStage": 4,
         "taskReward": "11001&100",
@@ -412,7 +378,6 @@
         "mainTaskId": 35,
         "taskType": 25,
         "taskInfo": "30件装备强化至20级",
-        "group": 1,
         "taskParam": "30&20",
         "taskStage": 4,
         "taskReward": "31001&40000",
@@ -424,7 +389,6 @@
         "mainTaskId": 35,
         "taskType": 26,
         "taskInfo": "5件装备镶嵌宝石",
-        "group": 1,
         "taskParam": "5&",
         "taskStage": 4,
         "taskReward": "60003&2",