diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json
index 70af2ed9c..5da73217d 100644
--- a/bin/json/game_rdtaskcondi.json
+++ b/bin/json/game_rdtaskcondi.json
@@ -2545,7 +2545,7 @@
     "type": 16,
     "inited": [],
     "data1": 1,
-    "data2": 0,
+    "data2": 5,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -2556,7 +2556,7 @@
     "type": 16,
     "inited": [],
     "data1": 2,
-    "data2": 0,
+    "data2": 5,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -2567,7 +2567,7 @@
     "type": 16,
     "inited": [],
     "data1": 3,
-    "data2": 0,
+    "data2": 5,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -2578,7 +2578,7 @@
     "type": 16,
     "inited": [],
     "data1": 5,
-    "data2": 0,
+    "data2": 5,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -2589,7 +2589,7 @@
     "type": 16,
     "inited": [],
     "data1": 10,
-    "data2": 0,
+    "data2": 5,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -2600,7 +2600,7 @@
     "type": 16,
     "inited": [],
     "data1": 15,
-    "data2": 0,
+    "data2": 5,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -2611,7 +2611,7 @@
     "type": 16,
     "inited": [],
     "data1": 20,
-    "data2": 0,
+    "data2": 5,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -2622,7 +2622,7 @@
     "type": 16,
     "inited": [],
     "data1": 30,
-    "data2": 0,
+    "data2": 5,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -2633,7 +2633,7 @@
     "type": 16,
     "inited": [],
     "data1": 50,
-    "data2": 0,
+    "data2": 5,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -2842,7 +2842,7 @@
     "type": 43,
     "inited": [],
     "data1": 1,
-    "data2": 0,
+    "data2": 15,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -2853,7 +2853,7 @@
     "type": 43,
     "inited": [],
     "data1": 2,
-    "data2": 0,
+    "data2": 15,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -2864,7 +2864,7 @@
     "type": 43,
     "inited": [],
     "data1": 4,
-    "data2": 0,
+    "data2": 15,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -2875,7 +2875,7 @@
     "type": 43,
     "inited": [],
     "data1": 6,
-    "data2": 0,
+    "data2": 15,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -2886,7 +2886,7 @@
     "type": 43,
     "inited": [],
     "data1": 12,
-    "data2": 0,
+    "data2": 15,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -2897,7 +2897,7 @@
     "type": 43,
     "inited": [],
     "data1": 18,
-    "data2": 0,
+    "data2": 15,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -2908,7 +2908,7 @@
     "type": 43,
     "inited": [],
     "data1": 24,
-    "data2": 0,
+    "data2": 15,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -2919,7 +2919,7 @@
     "type": 43,
     "inited": [],
     "data1": 30,
-    "data2": 0,
+    "data2": 15,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -2930,7 +2930,7 @@
     "type": 43,
     "inited": [],
     "data1": 60,
-    "data2": 0,
+    "data2": 15,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -2941,7 +2941,7 @@
     "type": 43,
     "inited": [],
     "data1": 120,
-    "data2": 0,
+    "data2": 15,
     "data3": 0,
     "data4": 0,
     "data5": 0
diff --git a/bin/json/game_reddotgroup.json b/bin/json/game_reddotgroup.json
index 4898e5b53..bcd9f67a3 100644
--- a/bin/json/game_reddotgroup.json
+++ b/bin/json/game_reddotgroup.json
@@ -213,6 +213,13 @@
     "id": 10031,
     "type": 1,
     "group": "",
+    "layer": "Root|ViKingExpedition|MainPage|Btn",
+    "header": ""
+  },
+  {
+    "id": 10032,
+    "type": 1,
+    "group": "",
     "layer": "",
     "header": ""
   }
diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index afd3937be..c35e1a8b6 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -14,7 +14,7 @@
     ],
     "getafter_event": [
       2,
-      100001
+      1001
     ],
     "completetask": 0,
     "auto_accept": 0,
@@ -42,7 +42,7 @@
     ],
     "getafter_event": [
       2,
-      100002
+      1002
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -64,7 +64,7 @@
     ],
     "getafter_event": [
       2,
-      100003
+      1003
     ],
     "completetask": 171,
     "auto_accept": 0,
@@ -108,7 +108,7 @@
     ],
     "getafter_event": [
       2,
-      100005
+      1005
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -141,7 +141,7 @@
     ],
     "getafter_event": [
       2,
-      100006
+      1006
     ],
     "completetask": 118,
     "auto_accept": 1,
@@ -163,7 +163,7 @@
     ],
     "getafter_event": [
       2,
-      100007
+      1007
     ],
     "completetask": 175,
     "auto_accept": 1,
@@ -185,7 +185,7 @@
     ],
     "getafter_event": [
       2,
-      100008
+      1008
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -207,7 +207,7 @@
     ],
     "getafter_event": [
       2,
-      100009
+      1009
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -229,7 +229,7 @@
     ],
     "getafter_event": [
       2,
-      100010
+      10010
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -245,16 +245,16 @@
     "des": 2,
     "icon": "",
     "npc": [
-      "SmithyScene",
+      "scenes_smithy_01",
       "戈伯铁匠铺组件名",
       "703"
     ],
     "getafter_event": [
       2,
-      100012
+      10012
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": []
   },
@@ -295,9 +295,9 @@
     ],
     "getafter_event": [
       5,
-      10003
+      10001
     ],
-    "completetask": 185,
+    "completetask": 183,
     "auto_accept": 0,
     "overtips": 1,
     "reword": []
@@ -317,7 +317,7 @@
     ],
     "getafter_event": [
       2,
-      100013
+      10013
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -361,7 +361,7 @@
     ],
     "getafter_event": [
       2,
-      100099
+      10099
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -383,10 +383,10 @@
     ],
     "getafter_event": [
       2,
-      100014
+      10014
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": []
   },
@@ -427,9 +427,9 @@
     ],
     "getafter_event": [
       5,
-      10001
+      10003
     ],
-    "completetask": 183,
+    "completetask": 185,
     "auto_accept": 0,
     "overtips": 1,
     "reword": []
@@ -449,7 +449,7 @@
     ],
     "getafter_event": [
       2,
-      100015
+      10015
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -471,7 +471,7 @@
     ],
     "getafter_event": [
       2,
-      100016
+      10016
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -493,7 +493,7 @@
     ],
     "getafter_event": [
       2,
-      100017
+      10017
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -515,7 +515,7 @@
     ],
     "getafter_event": [
       2,
-      100018
+      10018
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -537,7 +537,7 @@
     ],
     "getafter_event": [
       2,
-      100019
+      10019
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -559,7 +559,7 @@
     ],
     "getafter_event": [
       2,
-      100020
+      10020
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -581,7 +581,7 @@
     ],
     "getafter_event": [
       2,
-      100021
+      10021
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -603,7 +603,7 @@
     ],
     "getafter_event": [
       2,
-      100022
+      10022
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -647,7 +647,7 @@
     ],
     "getafter_event": [
       2,
-      100023
+      10023
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -669,7 +669,7 @@
     ],
     "getafter_event": [
       2,
-      100024
+      10024
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -686,15 +686,15 @@
     "icon": "",
     "npc": [
       "scenes_martialarts_01",
-      "武馆瓜哥",
+      "武馆瓜哥2",
       "702"
     ],
     "getafter_event": [
       2,
-      100025
+      10025
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": []
   },
@@ -735,7 +735,7 @@
     ],
     "getafter_event": [
       2,
-      100026
+      10026
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -757,7 +757,7 @@
     ],
     "getafter_event": [
       2,
-      100027
+      10027
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -801,7 +801,7 @@
     ],
     "getafter_event": [
       2,
-      100028
+      10028
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -845,7 +845,7 @@
     ],
     "getafter_event": [
       2,
-      100029
+      10029
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -867,7 +867,7 @@
     ],
     "getafter_event": [
       2,
-      100030
+      10030
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -889,7 +889,7 @@
     ],
     "getafter_event": [
       2,
-      100031
+      10031
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -933,7 +933,7 @@
     ],
     "getafter_event": [
       2,
-      100033
+      10033
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -955,7 +955,7 @@
     ],
     "getafter_event": [
       2,
-      100034
+      10034
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -977,7 +977,7 @@
     ],
     "getafter_event": [
       2,
-      100035
+      10035
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -999,7 +999,7 @@
     ],
     "getafter_event": [
       2,
-      100036
+      10036
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1021,7 +1021,7 @@
     ],
     "getafter_event": [
       2,
-      100037
+      10037
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1043,7 +1043,7 @@
     ],
     "getafter_event": [
       2,
-      100038
+      10038
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1065,7 +1065,7 @@
     ],
     "getafter_event": [
       2,
-      100039
+      10039
     ],
     "completetask": 179,
     "auto_accept": 1,
@@ -1087,7 +1087,7 @@
     ],
     "getafter_event": [
       2,
-      100040
+      10040
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1109,7 +1109,7 @@
     ],
     "getafter_event": [
       2,
-      100041
+      10041
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1131,7 +1131,7 @@
     ],
     "getafter_event": [
       2,
-      100042
+      10042
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1153,7 +1153,7 @@
     ],
     "getafter_event": [
       2,
-      100043
+      10043
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1169,7 +1169,7 @@
     "des": 2,
     "icon": "",
     "npc": [
-      "scenes_ boundary_01",
+      "scenes_boundary_01",
       "现代区黑雾门",
       "152"
     ],
@@ -1197,7 +1197,7 @@
     ],
     "getafter_event": [
       2,
-      100044
+      10044
     ],
     "completetask": 181,
     "auto_accept": 1,
@@ -1219,7 +1219,7 @@
     ],
     "getafter_event": [
       2,
-      100045
+      10045
     ],
     "completetask": 182,
     "auto_accept": 1,
@@ -1241,7 +1241,7 @@
     ],
     "getafter_event": [
       2,
-      100046
+      10046
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1263,7 +1263,7 @@
     ],
     "getafter_event": [
       2,
-      100047
+      10047
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1285,7 +1285,7 @@
     ],
     "getafter_event": [
       2,
-      100048
+      10048
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1307,7 +1307,7 @@
     ],
     "getafter_event": [
       2,
-      100049
+      10049
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1329,7 +1329,7 @@
     ],
     "getafter_event": [
       2,
-      100050
+      10050
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1351,7 +1351,7 @@
     ],
     "getafter_event": [
       2,
-      100051
+      10051
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1373,7 +1373,7 @@
     ],
     "getafter_event": [
       2,
-      100052
+      10052
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1395,7 +1395,7 @@
     ],
     "getafter_event": [
       2,
-      100053
+      10053
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1417,7 +1417,7 @@
     ],
     "getafter_event": [
       2,
-      100054
+      10054
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1434,15 +1434,15 @@
     "icon": "",
     "npc": [
       "scenes_martialarts_01",
-      "武馆杰克 ",
+      "原始人岛-武馆杰克",
       "137"
     ],
     "getafter_event": [
       2,
-      100055
+      10055
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": []
   },
@@ -1456,12 +1456,12 @@
     "icon": "",
     "npc": [
       "scenes_martialarts_01",
-      "武馆杰克 ",
+      "原始人岛-武馆杰克",
       "137"
     ],
     "getafter_event": [
       2,
-      100056
+      10056
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1478,12 +1478,12 @@
     "icon": "",
     "npc": [
       "scenes_martialarts_01",
-      "武馆杰克 ",
+      "原始人岛-武馆杰克",
       "137"
     ],
     "getafter_event": [
       2,
-      100057
+      10057
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1500,12 +1500,12 @@
     "icon": "",
     "npc": [
       "scenes_martialarts_01",
-      "武馆杰克 ",
+      "原始人岛-武馆杰克",
       "137"
     ],
     "getafter_event": [
       2,
-      100058
+      10058
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1522,12 +1522,12 @@
     "icon": "",
     "npc": [
       "scenes_martialarts_01",
-      "武馆杰克 ",
+      "原始人岛-武馆杰克",
       "137"
     ],
     "getafter_event": [
       2,
-      100059
+      10059
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1544,12 +1544,12 @@
     "icon": "",
     "npc": [
       "scenes_martialarts_01",
-      "武馆杰克 ",
+      "原始人岛-武馆杰克",
       "137"
     ],
     "getafter_event": [
       2,
-      100060
+      10060
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1566,12 +1566,12 @@
     "icon": "",
     "npc": [
       "scenes_martialarts_01",
-      "武馆杰克 ",
+      "原始人岛-武馆杰克",
       "137"
     ],
     "getafter_event": [
       2,
-      100061
+      10061
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1588,12 +1588,12 @@
     "icon": "",
     "npc": [
       "scenes_martialarts_01",
-      "武馆杰克 ",
+      "原始人岛-武馆杰克",
       "137"
     ],
     "getafter_event": [
       2,
-      100062
+      10062
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1610,12 +1610,12 @@
     "icon": "",
     "npc": [
       "scenes_martialarts_01",
-      "武馆杰克 ",
+      "原始人岛-武馆杰克",
       "137"
     ],
     "getafter_event": [
       2,
-      100063
+      10063
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1632,12 +1632,12 @@
     "icon": "",
     "npc": [
       "scenes_martialarts_01",
-      "武馆杰克 ",
+      "原始人岛-武馆杰克",
       "137"
     ],
     "getafter_event": [
       2,
-      100064
+      10064
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1654,12 +1654,12 @@
     "icon": "",
     "npc": [
       "scenes_martialarts_01",
-      "武馆杰克 ",
+      "原始人岛-武馆杰克",
       "137"
     ],
     "getafter_event": [
       2,
-      100065
+      10065
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1676,12 +1676,12 @@
     "icon": "",
     "npc": [
       "scenes_martialarts_01",
-      "武馆杰克 ",
+      "原始人岛-武馆杰克",
       "137"
     ],
     "getafter_event": [
       2,
-      100066
+      10066
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1698,12 +1698,12 @@
     "icon": "",
     "npc": [
       "scenes_martialarts_01",
-      "武馆杰克 ",
+      "原始人岛-武馆杰克",
       "137"
     ],
     "getafter_event": [
       2,
-      100067
+      10067
     ],
     "completetask": 0,
     "auto_accept": 1,
@@ -1725,7 +1725,7 @@
     ],
     "getafter_event": [
       2,
-      100001
+      1001
     ],
     "completetask": 0,
     "auto_accept": 0,
@@ -1758,7 +1758,7 @@
     ],
     "getafter_event": [
       2,
-      100002
+      1002
     ],
     "completetask": 0,
     "auto_accept": 0,
@@ -1786,7 +1786,7 @@
     ],
     "getafter_event": [
       2,
-      100003
+      1003
     ],
     "completetask": 171,
     "auto_accept": 0,
@@ -1814,7 +1814,7 @@
     ],
     "getafter_event": [
       2,
-      100004
+      1004
     ],
     "completetask": 0,
     "auto_accept": 0,
@@ -1842,7 +1842,7 @@
     ],
     "getafter_event": [
       2,
-      100005
+      1005
     ],
     "completetask": 0,
     "auto_accept": 0,
@@ -1875,7 +1875,7 @@
     ],
     "getafter_event": [
       2,
-      100006
+      1006
     ],
     "completetask": 118,
     "auto_accept": 0,
@@ -1903,7 +1903,7 @@
     ],
     "getafter_event": [
       2,
-      100007
+      1007
     ],
     "completetask": 172,
     "auto_accept": 0,
@@ -1931,7 +1931,7 @@
     ],
     "getafter_event": [
       2,
-      100008
+      1008
     ],
     "completetask": 0,
     "auto_accept": 0,
@@ -1959,7 +1959,7 @@
     ],
     "getafter_event": [
       2,
-      100009
+      1009
     ],
     "completetask": 0,
     "auto_accept": 0,
@@ -1987,7 +1987,7 @@
     ],
     "getafter_event": [
       2,
-      100010
+      10010
     ],
     "completetask": 0,
     "auto_accept": 0,
@@ -2015,7 +2015,7 @@
     ],
     "getafter_event": [
       2,
-      100001
+      1001
     ],
     "completetask": 0,
     "auto_accept": 0,
@@ -2048,7 +2048,7 @@
     ],
     "getafter_event": [
       2,
-      100002
+      1002
     ],
     "completetask": 0,
     "auto_accept": 0,
@@ -2076,7 +2076,7 @@
     ],
     "getafter_event": [
       2,
-      100003
+      1003
     ],
     "completetask": 173,
     "auto_accept": 0,
@@ -2104,7 +2104,7 @@
     ],
     "getafter_event": [
       2,
-      100004
+      1004
     ],
     "completetask": 0,
     "auto_accept": 0,
@@ -2132,7 +2132,7 @@
     ],
     "getafter_event": [
       2,
-      100005
+      1005
     ],
     "completetask": 0,
     "auto_accept": 0,
@@ -2165,7 +2165,7 @@
     ],
     "getafter_event": [
       2,
-      100006
+      1006
     ],
     "completetask": 0,
     "auto_accept": 0,
@@ -2193,7 +2193,7 @@
     ],
     "getafter_event": [
       2,
-      100007
+      1007
     ],
     "completetask": 174,
     "auto_accept": 0,
@@ -2221,7 +2221,7 @@
     ],
     "getafter_event": [
       2,
-      100008
+      1008
     ],
     "completetask": 0,
     "auto_accept": 0,
@@ -2249,7 +2249,7 @@
     ],
     "getafter_event": [
       2,
-      100009
+      1009
     ],
     "completetask": 0,
     "auto_accept": 0,
@@ -2277,7 +2277,7 @@
     ],
     "getafter_event": [
       2,
-      100010
+      10010
     ],
     "completetask": 0,
     "auto_accept": 0,