diff --git a/shared/resource/jsons/dic_zyz_achievement.json b/shared/resource/jsons/dic_zyz_achievement.json
index 4d908200b..279db6ccb 100644
--- a/shared/resource/jsons/dic_zyz_achievement.json
+++ b/shared/resource/jsons/dic_zyz_achievement.json
@@ -1,4 +1,148 @@
 [
+    {
+        "id": 8,
+        "achieveTaskId": 8,
+        "tab": 1,
+        "tabName": "足迹",
+        "subTab": 1,
+        "subTabName": "登陆",
+        "taskType": 1,
+        "taskParam": "20&",
+        "group": 1,
+        "achieveTaskName": "情深义重·壹",
+        "taskinfo": "累计登录20天",
+        "condition": 20,
+        "taskReward": 0,
+        "point": 10
+    },
+    {
+        "id": 9,
+        "achieveTaskId": 9,
+        "tab": 1,
+        "tabName": "足迹",
+        "subTab": 1,
+        "subTabName": "登陆",
+        "taskType": 1,
+        "taskParam": "30&",
+        "group": 1,
+        "achieveTaskName": "情深义重·贰",
+        "taskinfo": "累计登录30天",
+        "condition": 30,
+        "taskReward": 0,
+        "point": 20
+    },
+    {
+        "id": 10,
+        "achieveTaskId": 10,
+        "tab": 1,
+        "tabName": "足迹",
+        "subTab": 1,
+        "subTabName": "登陆",
+        "taskType": 1,
+        "taskParam": "50&",
+        "group": 1,
+        "achieveTaskName": "情深义重·叁",
+        "taskinfo": "累计登录50天",
+        "condition": 50,
+        "taskReward": 0,
+        "point": 30
+    },
+    {
+        "id": 11,
+        "achieveTaskId": 11,
+        "tab": 1,
+        "tabName": "足迹",
+        "subTab": 1,
+        "subTabName": "登陆",
+        "taskType": 1,
+        "taskParam": "70&",
+        "group": 1,
+        "achieveTaskName": "情深义重·肆",
+        "taskinfo": "累计登录70天",
+        "condition": 70,
+        "taskReward": 0,
+        "point": 40
+    },
+    {
+        "id": 12,
+        "achieveTaskId": 12,
+        "tab": 1,
+        "tabName": "足迹",
+        "subTab": 1,
+        "subTabName": "登陆",
+        "taskType": 1,
+        "taskParam": "90&",
+        "group": 1,
+        "achieveTaskName": "情深义重·伍",
+        "taskinfo": "累计登录90天",
+        "condition": 90,
+        "taskReward": 0,
+        "point": 50
+    },
+    {
+        "id": 13,
+        "achieveTaskId": 13,
+        "tab": 1,
+        "tabName": "足迹",
+        "subTab": 1,
+        "subTabName": "登陆",
+        "taskType": 1,
+        "taskParam": "100&",
+        "group": 1,
+        "achieveTaskName": "情深义重·陆",
+        "taskinfo": "累计登录100天",
+        "condition": 100,
+        "taskReward": 0,
+        "point": 60
+    },
+    {
+        "id": 14,
+        "achieveTaskId": 14,
+        "tab": 1,
+        "tabName": "足迹",
+        "subTab": 1,
+        "subTabName": "登陆",
+        "taskType": 1,
+        "taskParam": "120&",
+        "group": 1,
+        "achieveTaskName": "情深义重·柒",
+        "taskinfo": "累计登录120天",
+        "condition": 120,
+        "taskReward": 0,
+        "point": 70
+    },
+    {
+        "id": 15,
+        "achieveTaskId": 15,
+        "tab": 1,
+        "tabName": "足迹",
+        "subTab": 1,
+        "subTabName": "登陆",
+        "taskType": 1,
+        "taskParam": "150&",
+        "group": 1,
+        "achieveTaskName": "情深义重·捌",
+        "taskinfo": "累计登录150天",
+        "condition": 150,
+        "taskReward": 0,
+        "point": 80
+    },
+    {
+        "id": 16,
+        "achieveTaskId": 16,
+        "tab": 1,
+        "tabName": "足迹",
+        "subTab": 1,
+        "subTabName": "登陆",
+        "taskType": 1,
+        "taskParam": "200&",
+        "group": 1,
+        "achieveTaskName": "情深义重·玖",
+        "taskinfo": "累计登录200天",
+        "condition": 200,
+        "taskReward": 0,
+        "point": 90
+    },
     {
         "id": 1,
         "achieveTaskId": 1,
@@ -110,149 +254,5 @@
         "condition": 15,
         "taskReward": 0,
         "point": 35
-    },
-    {
-        "id": 8,
-        "achieveTaskId": 8,
-        "tab": 1,
-        "tabName": "足迹",
-        "subTab": 1,
-        "subTabName": "登陆",
-        "taskType": 1,
-        "taskParam": "20&",
-        "group": 2,
-        "achieveTaskName": "情深义重·壹",
-        "taskinfo": "累计登录20天",
-        "condition": 20,
-        "taskReward": 0,
-        "point": 10
-    },
-    {
-        "id": 9,
-        "achieveTaskId": 9,
-        "tab": 1,
-        "tabName": "足迹",
-        "subTab": 1,
-        "subTabName": "登陆",
-        "taskType": 1,
-        "taskParam": "30&",
-        "group": 2,
-        "achieveTaskName": "情深义重·贰",
-        "taskinfo": "累计登录30天",
-        "condition": 30,
-        "taskReward": 0,
-        "point": 20
-    },
-    {
-        "id": 10,
-        "achieveTaskId": 10,
-        "tab": 1,
-        "tabName": "足迹",
-        "subTab": 1,
-        "subTabName": "登陆",
-        "taskType": 1,
-        "taskParam": "50&",
-        "group": 2,
-        "achieveTaskName": "情深义重·叁",
-        "taskinfo": "累计登录50天",
-        "condition": 50,
-        "taskReward": 0,
-        "point": 30
-    },
-    {
-        "id": 11,
-        "achieveTaskId": 11,
-        "tab": 1,
-        "tabName": "足迹",
-        "subTab": 1,
-        "subTabName": "登陆",
-        "taskType": 1,
-        "taskParam": "70&",
-        "group": 2,
-        "achieveTaskName": "情深义重·肆",
-        "taskinfo": "累计登录70天",
-        "condition": 70,
-        "taskReward": 0,
-        "point": 40
-    },
-    {
-        "id": 12,
-        "achieveTaskId": 12,
-        "tab": 1,
-        "tabName": "足迹",
-        "subTab": 1,
-        "subTabName": "登陆",
-        "taskType": 1,
-        "taskParam": "90&",
-        "group": 2,
-        "achieveTaskName": "情深义重·伍",
-        "taskinfo": "累计登录90天",
-        "condition": 90,
-        "taskReward": 0,
-        "point": 50
-    },
-    {
-        "id": 13,
-        "achieveTaskId": 13,
-        "tab": 1,
-        "tabName": "足迹",
-        "subTab": 1,
-        "subTabName": "登陆",
-        "taskType": 1,
-        "taskParam": "100&",
-        "group": 2,
-        "achieveTaskName": "情深义重·陆",
-        "taskinfo": "累计登录100天",
-        "condition": 100,
-        "taskReward": 0,
-        "point": 60
-    },
-    {
-        "id": 14,
-        "achieveTaskId": 14,
-        "tab": 1,
-        "tabName": "足迹",
-        "subTab": 1,
-        "subTabName": "登陆",
-        "taskType": 1,
-        "taskParam": "120&",
-        "group": 2,
-        "achieveTaskName": "情深义重·柒",
-        "taskinfo": "累计登录120天",
-        "condition": 120,
-        "taskReward": 0,
-        "point": 70
-    },
-    {
-        "id": 15,
-        "achieveTaskId": 15,
-        "tab": 1,
-        "tabName": "足迹",
-        "subTab": 1,
-        "subTabName": "登陆",
-        "taskType": 1,
-        "taskParam": "150&",
-        "group": 2,
-        "achieveTaskName": "情深义重·捌",
-        "taskinfo": "累计登录150天",
-        "condition": 150,
-        "taskReward": 0,
-        "point": 80
-    },
-    {
-        "id": 16,
-        "achieveTaskId": 16,
-        "tab": 1,
-        "tabName": "足迹",
-        "subTab": 1,
-        "subTabName": "登陆",
-        "taskType": 1,
-        "taskParam": "200&",
-        "group": 2,
-        "achieveTaskName": "情深义重·玖",
-        "taskinfo": "累计登录200天",
-        "condition": 200,
-        "taskReward": 0,
-        "point": 90
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/jsons/dic_zyz_dailyTask.json b/shared/resource/jsons/dic_zyz_dailyTask.json
index a02b3f00b..d871e1404 100644
--- a/shared/resource/jsons/dic_zyz_dailyTask.json
+++ b/shared/resource/jsons/dic_zyz_dailyTask.json
@@ -7,187 +7,187 @@
         "taskInfo": "每日登录",
         "taskParam": "1&",
         "taskReward": "31002&50",
-        "Point": 30,
+        "point": 30,
         "condition": 1,
         "exp": 0
     },
     {
         "id": 2,
         "dailyTaskId": 2,
-        "group": 2,
+        "group": 1,
         "taskType": 37,
         "taskInfo": "消耗100体力",
         "taskParam": "100&",
         "taskReward": "31001&5000",
-        "Point": 30,
+        "point": 30,
         "condition": 100,
         "exp": 1
     },
     {
         "id": 3,
         "dailyTaskId": 3,
-        "group": 3,
+        "group": 1,
         "taskType": 41,
         "taskInfo": "奇遇1次",
         "taskParam": "0&1",
         "taskReward": "31002&50",
-        "Point": 10,
+        "point": 10,
         "condition": 1,
         "exp": 1
     },
     {
         "id": 4,
         "dailyTaskId": 4,
-        "group": 4,
+        "group": 2,
         "taskType": 43,
         "taskInfo": "每日关卡挑战1次",
         "taskParam": "0&1",
         "taskReward": "31001&5000",
-        "Point": 10,
+        "point": 10,
         "condition": 1,
         "exp": 1
     },
     {
         "id": 5,
         "dailyTaskId": 5,
-        "group": 5,
-        "taskType": 44,
+        "group": 1,
+        "taskType": 47,
         "taskInfo": "挑战镇念塔1次",
         "taskParam": "1&",
         "taskReward": "11003&5",
-        "Point": 10,
+        "point": 10,
         "condition": 1,
         "exp": 1
     },
     {
         "id": 6,
         "dailyTaskId": 6,
-        "group": 6,
+        "group": 1,
         "taskType": 49,
         "taskInfo": "远征1次",
         "taskParam": "1&",
         "taskReward": "40001&100",
-        "Point": 10,
+        "point": 10,
         "condition": 1,
         "exp": 1
     },
     {
         "id": 7,
         "dailyTaskId": 7,
-        "group": 7,
+        "group": 1,
         "taskType": 54,
         "taskInfo": "组队寻宝1次",
         "taskParam": "1&",
         "taskReward": "40002&100",
-        "Point": 10,
+        "point": 10,
         "condition": 1,
         "exp": 1
     },
     {
         "id": 8,
         "dailyTaskId": 8,
-        "group": 8,
+        "group": 1,
         "taskType": 57,
         "taskInfo": "演武3次",
         "taskParam": "3&",
         "taskReward": "40004&50",
-        "Point": 30,
+        "point": 30,
         "condition": 3,
         "exp": 1
     },
     {
         "id": 9,
         "dailyTaskId": 9,
-        "group": 9,
+        "group": 1,
         "taskType": 58,
         "taskInfo": "演武胜利1次",
         "taskParam": "1&",
         "taskReward": "40004&50",
-        "Point": 30,
+        "point": 30,
         "condition": 1,
         "exp": 0
     },
     {
         "id": 10,
         "dailyTaskId": 10,
-        "group": 10,
+        "group": 1,
         "taskType": 40,
         "taskInfo": "主线扫荡10次",
         "taskParam": "10&",
         "taskReward": "31002&50",
-        "Point": 10,
+        "point": 10,
         "condition": 10,
         "exp": 1
     },
     {
         "id": 11,
         "dailyTaskId": 11,
-        "group": 11,
+        "group": 1,
         "taskType": 64,
         "taskInfo": "军团捐献5次",
         "taskParam": "5&",
         "taskReward": "40005&200",
-        "Point": 10,
+        "point": 10,
         "condition": 5,
         "exp": 0
     },
     {
         "id": 12,
         "dailyTaskId": 12,
-        "group": 12,
+        "group": 1,
         "taskType": 59,
         "taskInfo": "挑战演武台1次",
         "taskParam": "1&",
         "taskReward": "40005&500",
-        "Point": 30,
+        "point": 30,
         "condition": 1,
         "exp": 1
     },
     {
         "id": 13,
         "dailyTaskId": 13,
-        "group": 13,
+        "group": 1,
         "taskType": 70,
         "taskInfo": "参与练兵场2次",
         "taskParam": "2&",
         "taskReward": "40005&500",
-        "Point": 30,
+        "point": 30,
         "condition": 2,
         "exp": 1
     },
     {
         "id": 14,
         "dailyTaskId": 14,
-        "group": 14,
+        "group": 1,
         "taskType": 71,
         "taskInfo": "参与军团活动1次",
         "taskParam": "0&1",
         "taskReward": "40005&500",
-        "Point": 30,
+        "point": 30,
         "condition": 1,
         "exp": 0
     },
     {
         "id": 15,
         "dailyTaskId": 15,
-        "group": 15,
+        "group": 1,
         "taskType": 36,
         "taskInfo": "世界频道发言1次",
         "taskParam": "2&1",
         "taskReward": "31002&50",
-        "Point": 30,
+        "point": 30,
         "condition": 1,
         "exp": 0
     },
     {
         "id": 16,
         "dailyTaskId": 16,
-        "group": 16,
+        "group": 1,
         "taskType": 35,
         "taskInfo": "赠送10点友情点",
         "taskParam": "10&",
         "taskReward": "31002&50",
-        "Point": 30,
+        "point": 30,
         "condition": 10,
         "exp": 0
     }
diff --git a/shared/resource/jsons/dic_zyz_mainTask.json b/shared/resource/jsons/dic_zyz_mainTask.json
index edebd5fc7..8874ec420 100644
--- a/shared/resource/jsons/dic_zyz_mainTask.json
+++ b/shared/resource/jsons/dic_zyz_mainTask.json
@@ -15,7 +15,7 @@
         "mainTaskId": 2,
         "taskType": 39,
         " taskInfo": "主线通关第1关",
-        "group": 2,
+        "group": 1,
         "taskParam": "1&104",
         "taskStage": 1,
         "taskRewards": "11002&10|31001&5000",
@@ -24,10 +24,10 @@
     {
         "id": 3,
         "mainTaskId": 3,
-        "taskType": 40,
+        "taskType": 41,
         " taskInfo": "奇遇1次",
-        "group": 3,
-        "taskParam": "1&",
+        "group": 1,
+        "taskParam": "0&1&",
         "taskStage": 1,
         "taskRewards": "11002&5|31001&2000",
         "condition": 1
@@ -37,7 +37,7 @@
         "mainTaskId": 4,
         "taskType": 4,
         " taskInfo": "武将招募1次",
-        "group": 4,
+        "group": 1,
         "taskParam": "1&",
         "taskStage": 1,
         "taskRewards": "31002&500",
@@ -48,7 +48,7 @@
         "mainTaskId": 5,
         "taskType": 9,
         " taskInfo": "2名武将升至5级",
-        "group": 5,
+        "group": 1,
         "taskParam": "2&5",
         "taskStage": 1,
         "taskRewards": "11002&10|31001&5000",
@@ -70,7 +70,7 @@
         "mainTaskId": 7,
         "taskType": 39,
         " taskInfo": "主线通关第1-5关",
-        "group": 6,
+        "group": 2,
         "taskParam": "1&108",
         "taskStage": 2,
         "taskRewards": "11002&10|31001&5000",
@@ -79,10 +79,10 @@
     {
         "id": 8,
         "mainTaskId": 8,
-        "taskType": 40,
+        "taskType": 41,
         " taskInfo": "奇遇5次",
-        "group": 3,
-        "taskParam": "5&",
+        "group": 1,
+        "taskParam": "0&5&",
         "taskStage": 2,
         "taskRewards": "11002&10|31001&2000",
         "condition": 5
@@ -92,7 +92,7 @@
         "mainTaskId": 9,
         "taskType": 4,
         " taskInfo": "武将招募10次",
-        "group": 4,
+        "group": 1,
         "taskParam": "10&",
         "taskStage": 2,
         "taskRewards": "31002&500",
@@ -103,7 +103,7 @@
         "mainTaskId": 10,
         "taskType": 9,
         " taskInfo": "5名武将升至15级",
-        "group": 7,
+        "group": 2,
         "taskParam": "5&15",
         "taskStage": 2,
         "taskRewards": "11002&10|31001&5000",
@@ -114,7 +114,7 @@
         "mainTaskId": 11,
         "taskType": 10,
         " taskInfo": "5名武将各训练1次",
-        "group": 8,
+        "group": 1,
         "taskParam": "5&1",
         "taskStage": 2,
         "taskRewards": "17003&10",
@@ -125,7 +125,7 @@
         "mainTaskId": 12,
         "taskType": 23,
         " taskInfo": "给2名武将各装备1件装备",
-        "group": 9,
+        "group": 1,
         "taskParam": "2&1",
         "taskStage": 2,
         "taskRewards": "33001&1|31001&1000",
@@ -136,7 +136,7 @@
         "mainTaskId": 13,
         "taskType": 42,
         " taskInfo": "每日三星通关护送商人新手模式",
-        "group": 10,
+        "group": 1,
         "taskParam": "3&1&1&3001",
         "taskStage": 2,
         "taskRewards": "31001&5000",
@@ -147,7 +147,7 @@
         "mainTaskId": 14,
         "taskType": 35,
         " taskInfo": "赠送5次友情点",
-        "group": 11,
+        "group": 1,
         "taskParam": "5&",
         "taskStage": 2,
         "taskRewards": "11101&10",
@@ -158,7 +158,7 @@
         "mainTaskId": 15,
         "taskType": 36,
         " taskInfo": "世界聊天频道发言1次",
-        "group": 12,
+        "group": 1,
         "taskParam": "2&1",
         "taskStage": 2,
         "taskRewards": "31002&200",
@@ -169,7 +169,7 @@
         "mainTaskId": 16,
         "taskType": 38,
         " taskInfo": "使用曹操挑战每日关卡5次",
-        "group": 13,
+        "group": 1,
         "taskParam": "1&5&1&3001",
         "taskStage": 2,
         "taskRewards": "21001&60|31002&500",
@@ -191,7 +191,7 @@
         "mainTaskId": 18,
         "taskType": 39,
         " taskInfo": "主线通关第2-5关",
-        "group": 14,
+        "group": 3,
         "taskParam": "1&205",
         "taskStage": 3,
         "taskRewards": "11002&10|31001&5000",
@@ -202,7 +202,7 @@
         "mainTaskId": 19,
         "taskType": 4,
         " taskInfo": "武将招募30次",
-        "group": 4,
+        "group": 1,
         "taskParam": "30&",
         "taskStage": 3,
         "taskRewards": "31002&500",
@@ -213,7 +213,7 @@
         "mainTaskId": 20,
         "taskType": 6,
         " taskInfo": "2名武将升星1次",
-        "group": 15,
+        "group": 1,
         "taskParam": "2&1",
         "taskStage": 3,
         "taskRewards": "21001&60|31002&500",
@@ -224,7 +224,7 @@
         "mainTaskId": 21,
         "taskType": 10,
         " taskInfo": "5名武将各训练5次",
-        "group": 8,
+        "group": 2,
         "taskParam": "5&5",
         "taskStage": 3,
         "taskRewards": "17003&20",
@@ -235,7 +235,7 @@
         "mainTaskId": 22,
         "taskType": 43,
         " taskInfo": "护送商人扫荡30次",
-        "group": 16,
+        "group": 1,
         "taskParam": "4&30",
         "taskStage": 3,
         "taskRewards": "31002&500|31001&5000",
@@ -246,7 +246,7 @@
         "mainTaskId": 23,
         "taskType": 44,
         " taskInfo": "参与秘境1次",
-        "group": 17,
+        "group": 1,
         "taskParam": "1&",
         "taskStage": 3,
         "taskRewards": "50014&5|40007&500",
@@ -257,7 +257,7 @@
         "mainTaskId": 24,
         "taskType": 51,
         " taskInfo": "寻宝招募队友5次",
-        "group": 18,
+        "group": 1,
         "taskParam": "5&",
         "taskStage": 3,
         "taskRewards": "33370&5|31001&5000",
@@ -268,7 +268,7 @@
         "mainTaskId": 25,
         "taskType": 17,
         " taskInfo": "解锁百家学宫5个安置位",
-        "group": 19,
+        "group": 1,
         "taskParam": "5&",
         "taskStage": 3,
         "taskRewards": "31002&1000",
@@ -279,7 +279,7 @@
         "mainTaskId": 26,
         "taskType": 19,
         " taskInfo": "头衔升至公士",
-        "group": 20,
+        "group": 1,
         "taskParam": "1&",
         "taskStage": 3,
         "taskRewards": "17042&1|31001&1000",
@@ -290,7 +290,7 @@
         "mainTaskId": 27,
         "taskType": 22,
         " taskInfo": "装备6件装备",
-        "group": 21,
+        "group": 1,
         "taskParam": "6&",
         "taskStage": 3,
         "taskRewards": "33370&5|31001&5000",
@@ -301,7 +301,7 @@
         "mainTaskId": 28,
         "taskType": 38,
         " taskInfo": "使用夏侯渊挑战每日关卡5次",
-        "group": 22,
+        "group": 2,
         "taskParam": "2&5&1&3001",
         "taskStage": 3,
         "taskRewards": "21002&60|31002&500",
@@ -312,7 +312,7 @@
         "mainTaskId": 29,
         "taskType": 34,
         " taskInfo": "拥有15名好友",
-        "group": 23,
+        "group": 1,
         "taskParam": "15&",
         "taskStage": 3,
         "taskRewards": "11101&10",