diff --git a/bin/json/game_buriedtype.json b/bin/json/game_buriedtype.json
index 92d1893fc..8dabf672f 100644
--- a/bin/json/game_buriedtype.json
+++ b/bin/json/game_buriedtype.json
@@ -445,7 +445,7 @@
     "insert": 0,
     "desc": "获得xx星以上装备xx件（接到任务后，每获得一件星级大于等于配置星级的装备，则进度+1）",
     "data1": "数量",
-    "data2": "指定装备星级",
+    "data2": "星级",
     "data3": "",
     "data4": ""
   },
@@ -821,10 +821,10 @@
   {
     "id": 93,
     "insert": 0,
-    "desc": "拥有一套强化到N级的A套装(记录A套装中每个部位的最高强化等级，并将这些强化等级中最低的数值计入进度，如果达到了任务所需的强化等级则完成任务。)",
-    "data1": "等级",
+    "desc": "穿戴一套强化到N级的A套装(记录A套装中每个部位的最高强化等级，并将这些强化等级中最低的数值计入进度，如果达到了任务所需的强化等级则完成任务。)",
+    "data1": "次数",
     "data2": "套装id",
-    "data3": "",
+    "data3": "强化等级",
     "data4": ""
   },
   {
@@ -1084,7 +1084,7 @@
     "insert": 0,
     "desc": "拥有共鸣多少次的B星英雄N个(打开任务时，检查B星英雄中共鸣等级大于等于A级的记入进度，达到任务条件则完成任务)",
     "data1": "数量",
-    "data2": "等级",
+    "data2": "共鸣次数",
     "data3": "星级",
     "data4": ""
   },
@@ -1577,7 +1577,7 @@
   {
     "id": 180,
     "insert": 0,
-    "desc": "在X副本内使用好友助战X次（接取任务后开始记录，在对应副本内使用好友助战每有1次，进度便加一）",
+    "desc": "在X维京副本内使用好友助战X次（接取任务后开始记录，在对应副本内使用好友助战每有1次，进度便加一）",
     "data1": "使用助战次数",
     "data2": "副本类型",
     "data3": "",
@@ -1586,7 +1586,7 @@
   {
     "id": 181,
     "insert": 0,
-    "desc": "X副本X难度自动战斗X次（接取任务后开始记录，在对应副本的指定难度内，使用自动战斗每有1次，进度便加一）",
+    "desc": "X维京副本X难度自动战斗X次（接取任务后开始记录，在对应副本的指定难度内，使用自动战斗每有1次，进度便加一）",
     "data1": "自动战斗次数",
     "data2": "副本类型",
     "data3": "副本难度",
diff --git a/bin/json/game_mail.json b/bin/json/game_mail.json
index d242bbf23..84ae95167 100644
--- a/bin/json/game_mail.json
+++ b/bin/json/game_mail.json
@@ -244,7 +244,7 @@
     },
     "recipient": {
       "key": "mail_mail_recipient_12",
-      "text": "亲爱的{0}："
+      "text": "亲爱的的玩家你在跑商中荣获第{0}名：这是您的排名奖励请查收"
     },
     "content": {
       "key": "mail_mail_content_12",
diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json
index 9049fe6fd..8deee9786 100644
--- a/bin/json/game_rdtaskcondi.json
+++ b/bin/json/game_rdtaskcondi.json
@@ -7603,8 +7603,8 @@
     "data": 2,
     "type_sp": 1,
     "tasktxt": {
-      "key": "连续战斗3次",
-      "text": "连续战斗3次"
+      "key": "维京连续战斗3次",
+      "text": "维京连续战斗3次"
     },
     "type": 172,
     "valid": 0,
@@ -7654,8 +7654,8 @@
     "data": 2,
     "type_sp": 1,
     "tasktxt": {
-      "key": "使用星象1次",
-      "text": "使用星象1次"
+      "key": "使用主角星象1次",
+      "text": "使用主角星象1次"
     },
     "type": 173,
     "valid": 0,
diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index e89b16042..b267cf9ff 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -3663,7 +3663,7 @@
   },
   {
     "key": 30010,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 0,
@@ -3707,7 +3707,7 @@
   },
   {
     "key": 30020,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 20030,
     "id_after": 0,
@@ -3751,7 +3751,7 @@
   },
   {
     "key": 30030,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 20090,
     "id_after": 30040,
@@ -3795,7 +3795,7 @@
   },
   {
     "key": 30040,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30030,
     "id_after": 0,
@@ -3839,7 +3839,7 @@
   },
   {
     "key": 30050,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 200600,
     "id_after": 30060,
@@ -3883,7 +3883,7 @@
   },
   {
     "key": 30060,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30050,
     "id_after": 0,
@@ -3927,7 +3927,7 @@
   },
   {
     "key": 30070,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 20100,
     "id_after": 0,
@@ -3971,7 +3971,7 @@
   },
   {
     "key": 30080,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 20120,
     "id_after": 0,
@@ -4015,7 +4015,7 @@
   },
   {
     "key": 30090,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 200600,
     "id_after": 0,
@@ -4059,7 +4059,7 @@
   },
   {
     "key": 30100,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30110,
@@ -4103,7 +4103,7 @@
   },
   {
     "key": 30110,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30100,
     "id_after": 30120,
@@ -4147,7 +4147,7 @@
   },
   {
     "key": 30120,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30110,
     "id_after": 0,
@@ -4191,7 +4191,7 @@
   },
   {
     "key": 30130,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 20020,
     "id_after": 30140,
@@ -4235,7 +4235,7 @@
   },
   {
     "key": 30140,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30130,
     "id_after": 30150,
@@ -4279,7 +4279,7 @@
   },
   {
     "key": 30150,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30140,
     "id_after": 30160,
@@ -4323,7 +4323,7 @@
   },
   {
     "key": 30160,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30150,
     "id_after": 30170,
@@ -4367,7 +4367,7 @@
   },
   {
     "key": 30170,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30160,
     "id_after": 30180,
@@ -4411,7 +4411,7 @@
   },
   {
     "key": 30180,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30170,
     "id_after": 0,
@@ -4455,7 +4455,7 @@
   },
   {
     "key": 30190,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30200,
@@ -4499,7 +4499,7 @@
   },
   {
     "key": 30200,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30190,
     "id_after": 30210,
@@ -4543,7 +4543,7 @@
   },
   {
     "key": 30210,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30200,
     "id_after": 0,
@@ -4587,7 +4587,7 @@
   },
   {
     "key": 30220,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 20030,
     "id_after": 0,
@@ -4631,7 +4631,7 @@
   },
   {
     "key": 30230,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 20040,
     "id_after": 0,
@@ -4675,7 +4675,7 @@
   },
   {
     "key": 30240,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 20050,
     "id_after": 0,
@@ -4719,7 +4719,7 @@
   },
   {
     "key": 30250,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 20060,
     "id_after": 0,
@@ -4763,7 +4763,7 @@
   },
   {
     "key": 30260,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 20020,
     "id_after": 30270,
@@ -4807,7 +4807,7 @@
   },
   {
     "key": 30270,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30260,
     "id_after": 30280,
@@ -4851,7 +4851,7 @@
   },
   {
     "key": 30280,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30270,
     "id_after": 0,
@@ -4895,7 +4895,7 @@
   },
   {
     "key": 30290,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 20030,
     "id_after": 0,
@@ -4939,7 +4939,7 @@
   },
   {
     "key": 30300,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 20030,
     "id_after": 0,
@@ -4983,7 +4983,7 @@
   },
   {
     "key": 30310,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 20100,
     "id_after": 30320,
@@ -5027,7 +5027,7 @@
   },
   {
     "key": 30320,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30310,
     "id_after": 30330,
@@ -5071,7 +5071,7 @@
   },
   {
     "key": 30330,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30320,
     "id_after": 0,
@@ -5115,7 +5115,7 @@
   },
   {
     "key": 30340,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 20110,
     "id_after": 0,
@@ -6699,7 +6699,7 @@
   },
   {
     "key": 30700,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30710,
@@ -6743,7 +6743,7 @@
   },
   {
     "key": 30710,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30700,
     "id_after": 30720,
@@ -6787,7 +6787,7 @@
   },
   {
     "key": 30720,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30710,
     "id_after": 0,
@@ -6831,7 +6831,7 @@
   },
   {
     "key": 30730,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30740,
@@ -6875,7 +6875,7 @@
   },
   {
     "key": 30740,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30730,
     "id_after": 30750,
@@ -6919,7 +6919,7 @@
   },
   {
     "key": 30750,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30740,
     "id_after": 0,
@@ -6963,7 +6963,7 @@
   },
   {
     "key": 30760,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30770,
@@ -7007,7 +7007,7 @@
   },
   {
     "key": 30770,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30760,
     "id_after": 0,
@@ -7051,7 +7051,7 @@
   },
   {
     "key": 30780,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30790,
@@ -7095,7 +7095,7 @@
   },
   {
     "key": 30790,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30780,
     "id_after": 30800,
@@ -7139,7 +7139,7 @@
   },
   {
     "key": 30800,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30790,
     "id_after": 0,
@@ -7183,7 +7183,7 @@
   },
   {
     "key": 30810,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30820,
@@ -7227,7 +7227,7 @@
   },
   {
     "key": 30820,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30810,
     "id_after": 30830,
@@ -7271,7 +7271,7 @@
   },
   {
     "key": 30830,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30820,
     "id_after": 30840,
@@ -7315,7 +7315,7 @@
   },
   {
     "key": 30840,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30830,
     "id_after": 30850,
@@ -7359,7 +7359,7 @@
   },
   {
     "key": 30850,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30840,
     "id_after": 30860,
@@ -7403,7 +7403,7 @@
   },
   {
     "key": 30860,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30850,
     "id_after": 30870,
@@ -7447,7 +7447,7 @@
   },
   {
     "key": 30870,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30860,
     "id_after": 30880,
@@ -7491,7 +7491,7 @@
   },
   {
     "key": 30880,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30870,
     "id_after": 30890,
@@ -7535,7 +7535,7 @@
   },
   {
     "key": 30890,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30880,
     "id_after": 0,
@@ -7579,7 +7579,7 @@
   },
   {
     "key": 30900,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30910,
@@ -7623,7 +7623,7 @@
   },
   {
     "key": 30910,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30900,
     "id_after": 30920,
@@ -7667,7 +7667,7 @@
   },
   {
     "key": 30920,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30910,
     "id_after": 30930,
@@ -7711,7 +7711,7 @@
   },
   {
     "key": 30930,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30920,
     "id_after": 0,
@@ -7755,7 +7755,7 @@
   },
   {
     "key": 30940,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30950,
@@ -7799,7 +7799,7 @@
   },
   {
     "key": 30950,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30940,
     "id_after": 30960,
@@ -7843,7 +7843,7 @@
   },
   {
     "key": 30960,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30950,
     "id_after": 0,