diff --git a/bin/json/game_pandamasjs.json b/bin/json/game_pandamasjs.json
index a18446144..71b225dc8 100644
--- a/bin/json/game_pandamasjs.json
+++ b/bin/json/game_pandamasjs.json
@@ -3,24 +3,24 @@
     "id": 1,
     "unlock_condition": 20010,
     "unlock_conditiondes": {
-      "key": "完成任务“这是哪里”",
-      "text": "完成任务“这是哪里”"
+      "key": "完成任务“这是哪里”后解锁",
+      "text": "完成任务“这是哪里”后解锁"
     }
   },
   {
     "id": 2,
-    "unlock_condition": 20011,
+    "unlock_condition": 20010,
     "unlock_conditiondes": {
-      "key": "通关主线1-2后解锁",
-      "text": "通关主线1-2后解锁"
+      "key": "完成任务“初来乍到”后解锁",
+      "text": "完成任务“初来乍到”后解锁"
     }
   },
   {
     "id": 3,
-    "unlock_condition": 20012,
+    "unlock_condition": 20020,
     "unlock_conditiondes": {
-      "key": "通关主线1-3后解锁",
-      "text": "通关主线1-3后解锁"
+      "key": "完成任务“事件开端”后解锁",
+      "text": "完成任务“事件开端”后解锁"
     }
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_pandamastj.json b/bin/json/game_pandamastj.json
index e6c57ecc6..923b0ffe6 100644
--- a/bin/json/game_pandamastj.json
+++ b/bin/json/game_pandamastj.json
@@ -7,11 +7,11 @@
       "text": "Lv1木桩"
     },
     "effect_text": {
-      "key": "wuguan_1",
+      "key": "xiaoguo_1",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_1",
+      "key": "tujian_1",
       "text": "图鉴信息描述"
     },
     "icon": "wg_icon_mz01",
@@ -25,11 +25,11 @@
       "text": "Lv2木桩"
     },
     "effect_text": {
-      "key": "wuguan_1",
+      "key": "xiaoguo_2",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_1",
+      "key": "tujian_2",
       "text": "图鉴信息描述"
     },
     "icon": "wg_icon_mz03",
@@ -43,11 +43,11 @@
       "text": "Lv3木桩"
     },
     "effect_text": {
-      "key": "wuguan_1",
+      "key": "xiaoguo_3",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_1",
+      "key": "tujian_3",
       "text": "图鉴信息描述"
     },
     "icon": "wg_icon_mz02",
@@ -61,11 +61,11 @@
       "text": "Lv4木桩"
     },
     "effect_text": {
-      "key": "wuguan_1",
+      "key": "xiaoguo_4",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_1",
+      "key": "tujian_4",
       "text": "图鉴信息描述"
     },
     "icon": "wg_icon_mz04",
@@ -79,11 +79,11 @@
       "text": "Lv5木桩"
     },
     "effect_text": {
-      "key": "wuguan_1",
+      "key": "xiaoguo_5",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_1",
+      "key": "tujian_5",
       "text": "图鉴信息描述"
     },
     "icon": "wg_icon_mz05",
@@ -97,11 +97,11 @@
       "text": "食人鱼"
     },
     "effect_text": {
-      "key": "wuguan_2",
+      "key": "xiaoguo_6",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_2",
+      "key": "tujian_6",
       "text": "图鉴信息描述"
     },
     "icon": "ytx_js_13002",
@@ -115,11 +115,11 @@
       "text": "闪闪"
     },
     "effect_text": {
-      "key": "wuguan_2",
+      "key": "xiaoguo_7",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_2",
+      "key": "tujian_7",
       "text": "图鉴信息描述"
     },
     "icon": "ytx_js_13001",
@@ -133,11 +133,11 @@
       "text": "蛇先生"
     },
     "effect_text": {
-      "key": "wuguan_2",
+      "key": "xiaoguo_8",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_2",
+      "key": "tujian_8",
       "text": "图鉴信息描述"
     },
     "icon": "ytx_js_44002",
@@ -151,11 +151,11 @@
       "text": "金猴"
     },
     "effect_text": {
-      "key": "wuguan_2",
+      "key": "xiaoguo_9",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_2",
+      "key": "tujian_9",
       "text": "图鉴信息描述"
     },
     "icon": "ytx_js_24005",
@@ -169,11 +169,11 @@
       "text": "鹤大师"
     },
     "effect_text": {
-      "key": "wuguan_2",
+      "key": "xiaoguo_10",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_2",
+      "key": "tujian_10",
       "text": "图鉴信息描述"
     },
     "icon": "ytx_js_14005",
@@ -187,11 +187,11 @@
       "text": "悍娇虎"
     },
     "effect_text": {
-      "key": "wuguan_2",
+      "key": "xiaoguo_11",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_2",
+      "key": "tujian_11",
       "text": "图鉴信息描述"
     },
     "icon": "ytx_js_44006",
@@ -205,11 +205,11 @@
       "text": "盖"
     },
     "effect_text": {
-      "key": "wuguan_2",
+      "key": "xiaoguo_12",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_2",
+      "key": "tujian_12",
       "text": "图鉴信息描述"
     },
     "icon": "ytx_js_43001",
@@ -223,11 +223,11 @@
       "text": "希卡普"
     },
     "effect_text": {
-      "key": "wuguan_2",
+      "key": "xiaoguo_13",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_2",
+      "key": "tujian_13",
       "text": "图鉴信息描述"
     },
     "icon": "ytx_js_35002",
@@ -241,11 +241,11 @@
       "text": "穿靴猫"
     },
     "effect_text": {
-      "key": "wuguan_2",
+      "key": "xiaoguo_14",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_2",
+      "key": "tujian_14",
       "text": "图鉴信息描述"
     },
     "icon": "ytx_js_45004",
@@ -259,11 +259,11 @@
       "text": "师父"
     },
     "effect_text": {
-      "key": "wuguan_2",
+      "key": "xiaoguo_15",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_2",
+      "key": "tujian_15",
       "text": "图鉴信息描述"
     },
     "icon": "ytx_js_35001",
@@ -277,11 +277,11 @@
       "text": "阿宝"
     },
     "effect_text": {
-      "key": "wuguan_2",
+      "key": "xiaoguo_16",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_2",
+      "key": "tujian_16",
       "text": "图鉴信息描述"
     },
     "icon": "ytx_js_25001",
@@ -295,11 +295,11 @@
       "text": "乌龟大师"
     },
     "effect_text": {
-      "key": "wuguan_2",
+      "key": "xiaoguo_17",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_2",
+      "key": "tujian_17",
       "text": "图鉴信息描述"
     },
     "icon": "ytx_js_45001",
@@ -313,11 +313,11 @@
       "text": "石锁"
     },
     "effect_text": {
-      "key": "wuguan_3",
+      "key": "xiaoguo_18",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_3",
+      "key": "tujian_18",
       "text": "图鉴信息描述"
     },
     "icon": "wg_icon_ss",
@@ -331,11 +331,11 @@
       "text": "双头空竹"
     },
     "effect_text": {
-      "key": "wuguan_3",
+      "key": "xiaoguo_19",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_3",
+      "key": "tujian_19",
       "text": "图鉴信息描述"
     },
     "icon": "wg_icon_kz",
@@ -349,11 +349,11 @@
       "text": "木爬架"
     },
     "effect_text": {
-      "key": "wuguan_3",
+      "key": "xiaoguo_20",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_3",
+      "key": "tujian_20",
       "text": "图鉴信息描述"
     },
     "icon": "wg_icon_pj",
@@ -367,11 +367,11 @@
       "text": "不倒翁"
     },
     "effect_text": {
-      "key": "wuguan_3",
+      "key": "xiaoguo_21",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_3",
+      "key": "tujian_21",
       "text": "图鉴信息描述"
     },
     "icon": "wg_icon_bdw",
@@ -385,11 +385,11 @@
       "text": "棒槌"
     },
     "effect_text": {
-      "key": "wuguan_3",
+      "key": "xiaoguo_22",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_3",
+      "key": "tujian_22",
       "text": "图鉴信息描述"
     },
     "icon": "wg_icon_pc",
@@ -403,11 +403,11 @@
       "text": "铜铃"
     },
     "effect_text": {
-      "key": "wuguan_3",
+      "key": "xiaoguo_23",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_3",
+      "key": "tujian_23",
       "text": "图鉴信息描述"
     },
     "icon": "wg_icon_tl",
@@ -421,11 +421,11 @@
       "text": "尖刺吊环"
     },
     "effect_text": {
-      "key": "wuguan_3",
+      "key": "xiaoguo_24",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_3",
+      "key": "tujian_24",
       "text": "图鉴信息描述"
     },
     "icon": "wg_icon_dh",
@@ -439,11 +439,11 @@
       "text": "陀螺"
     },
     "effect_text": {
-      "key": "wuguan_3",
+      "key": "xiaoguo_25",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_3",
+      "key": "tujian_25",
       "text": "图鉴信息描述"
     },
     "icon": "wg_icon_tj01",
@@ -457,11 +457,11 @@
       "text": "大转轮"
     },
     "effect_text": {
-      "key": "wuguan_3",
+      "key": "xiaoguo_26",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_3",
+      "key": "tujian_26",
       "text": "图鉴信息描述"
     },
     "icon": "wg_icon_zl",
@@ -475,11 +475,11 @@
       "text": "木头牌"
     },
     "effect_text": {
-      "key": "wuguan_3",
+      "key": "xiaoguo_27",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_3",
+      "key": "tujian_27",
       "text": "图鉴信息描述"
     },
     "icon": "wg_icon_mp",
@@ -493,11 +493,11 @@
       "text": "双节棍"
     },
     "effect_text": {
-      "key": "wuguan_3",
+      "key": "xiaoguo_28",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_3",
+      "key": "tujian_28",
       "text": "图鉴信息描述"
     },
     "icon": "wg_icon_sjg",
@@ -511,11 +511,11 @@
       "text": "练功带"
     },
     "effect_text": {
-      "key": "wuguan_3",
+      "key": "xiaoguo_29",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_3",
+      "key": "tujian_29",
       "text": "图鉴信息描述"
     },
     "icon": "wg_icon_yd",
@@ -529,11 +529,11 @@
       "text": "七彩花棍"
     },
     "effect_text": {
-      "key": "wuguan_3",
+      "key": "xiaoguo_30",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_3",
+      "key": "tujian_30",
       "text": "图鉴信息描述"
     },
     "icon": "wg_icon_hl",
@@ -547,11 +547,11 @@
       "text": "流星飞镖"
     },
     "effect_text": {
-      "key": "wuguan_3",
+      "key": "xiaoguo_31",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_3",
+      "key": "tujian_31",
       "text": "图鉴信息描述"
     },
     "icon": "wg_icon_fb",
@@ -565,11 +565,11 @@
       "text": "冥想锣"
     },
     "effect_text": {
-      "key": "wuguan_3",
+      "key": "xiaoguo_32",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_3",
+      "key": "tujian_32",
       "text": "图鉴信息描述"
     },
     "icon": "wg_icon_mxl",
@@ -583,11 +583,11 @@
       "text": "彩条龙"
     },
     "effect_text": {
-      "key": "wuguan_3",
+      "key": "xiaoguo_33",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_3",
+      "key": "tujian_33",
       "text": "图鉴信息描述"
     },
     "icon": "wg_icon_ct",
@@ -601,11 +601,11 @@
       "text": "孔雀毛扇"
     },
     "effect_text": {
-      "key": "wuguan_3",
+      "key": "xiaoguo_34",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_3",
+      "key": "tujian_34",
       "text": "图鉴信息描述"
     },
     "icon": "wg_icon_kqms",
@@ -619,11 +619,11 @@
       "text": "平衡木"
     },
     "effect_text": {
-      "key": "wuguan_3",
+      "key": "xiaoguo_35",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_3",
+      "key": "tujian_35",
       "text": "图鉴信息描述"
     },
     "icon": "wg_icon_ph",
@@ -637,11 +637,11 @@
       "text": "铁环"
     },
     "effect_text": {
-      "key": "wuguan_3",
+      "key": "xiaoguo_36",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_3",
+      "key": "tujian_36",
       "text": "图鉴信息描述"
     },
     "icon": "wg_icon_th",
@@ -655,11 +655,11 @@
       "text": "太极球"
     },
     "effect_text": {
-      "key": "wuguan_3",
+      "key": "xiaoguo_37",
       "text": "道具效果描述"
     },
     "content_text": {
-      "key": "wuguan_3",
+      "key": "tujian_37",
       "text": "图鉴信息描述"
     },
     "icon": "wg_icon_tj",
diff --git a/bin/json/game_worldbattle.json b/bin/json/game_worldbattle.json
index 3f87b44c3..517192d14 100644
--- a/bin/json/game_worldbattle.json
+++ b/bin/json/game_worldbattle.json
@@ -15,7 +15,7 @@
   {
     "id": 102,
     "FormatList": [
-      700012
+      700011
     ],
     "BattleReadyID": 100,
     "EventList": [],
diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index 9ef3f3813..4d976582e 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -12,8 +12,8 @@
       "text": "1"
     },
     "task_name": {
-      "key": "story_80",
-      "text": "1"
+      "key": "Mainline_Tasks_1",
+      "text": "初来乍到"
     },
     "task_display": {
       "key": "story_80",
@@ -32,7 +32,9 @@
         "n": 100
       }
     ],
-    "module": []
+    "module": [
+      "practice"
+    ]
   },
   {
     "key": 20020,
@@ -47,8 +49,8 @@
       "text": "1"
     },
     "task_name": {
-      "key": "story_80",
-      "text": "1"
+      "key": "Mainline_Tasks_2",
+      "text": "不测风云"
     },
     "task_display": {
       "key": "story_80",
@@ -67,7 +69,9 @@
         "n": 101
       }
     ],
-    "module": []
+    "module": [
+      "practice"
+    ]
   },
   {
     "key": 20030,
@@ -82,8 +86,8 @@
       "text": "1"
     },
     "task_name": {
-      "key": "story_80",
-      "text": "1"
+      "key": "Mainline_Tasks_3",
+      "text": "雨过天晴"
     },
     "task_display": {
       "key": "story_80",
@@ -318,7 +322,7 @@
     "key": 20100,
     "lock": 1,
     "ontxe": 20090,
-    "id_after": 0,
+    "id_after": 30010,
     "group": 2,
     "des": 2,
     "icon": "",
@@ -348,5 +352,275 @@
       }
     ],
     "module": []
+  },
+  {
+    "key": 30010,
+    "lock": 1,
+    "ontxe": 20010,
+    "id_after": 0,
+    "group": 3,
+    "des": 3,
+    "icon": "",
+    "task_Tname": {
+      "key": "story_80",
+      "text": "1"
+    },
+    "task_name": {
+      "key": "story_80",
+      "text": "1"
+    },
+    "task_display": {
+      "key": "story_80",
+      "text": "1"
+    },
+    "npc": 70010,
+    "completetask": [
+      0
+    ],
+    "deliver_npc": 0,
+    "auto_accept": 0,
+    "reword": [
+      {
+        "a": "item",
+        "t": "110001",
+        "n": 110
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 40010,
+    "lock": 1,
+    "ontxe": 20020,
+    "id_after": 0,
+    "group": 4,
+    "des": 3,
+    "icon": "",
+    "task_Tname": {
+      "key": "story_80",
+      "text": "1"
+    },
+    "task_name": {
+      "key": "story_80",
+      "text": "1"
+    },
+    "task_display": {
+      "key": "story_80",
+      "text": "1"
+    },
+    "npc": 0,
+    "completetask": [],
+    "deliver_npc": 0,
+    "auto_accept": 0,
+    "reword": [
+      {
+        "a": "item",
+        "t": "110001",
+        "n": 111
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 50010,
+    "lock": 1,
+    "ontxe": 20030,
+    "id_after": 0,
+    "group": 5,
+    "des": 3,
+    "icon": "",
+    "task_Tname": {
+      "key": "story_80",
+      "text": "1"
+    },
+    "task_name": {
+      "key": "story_80",
+      "text": "1"
+    },
+    "task_display": {
+      "key": "story_80",
+      "text": "1"
+    },
+    "npc": 0,
+    "completetask": [],
+    "deliver_npc": 0,
+    "auto_accept": 0,
+    "reword": [
+      {
+        "a": "item",
+        "t": "110001",
+        "n": 112
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 60010,
+    "lock": 1,
+    "ontxe": 20040,
+    "id_after": 0,
+    "group": 6,
+    "des": 3,
+    "icon": "",
+    "task_Tname": {
+      "key": "story_80",
+      "text": "1"
+    },
+    "task_name": {
+      "key": "story_80",
+      "text": "1"
+    },
+    "task_display": {
+      "key": "story_80",
+      "text": "1"
+    },
+    "npc": 0,
+    "completetask": [],
+    "deliver_npc": 0,
+    "auto_accept": 0,
+    "reword": [
+      {
+        "a": "item",
+        "t": "110001",
+        "n": 113
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 70010,
+    "lock": 1,
+    "ontxe": 20050,
+    "id_after": 0,
+    "group": 7,
+    "des": 3,
+    "icon": "",
+    "task_Tname": {
+      "key": "story_80",
+      "text": "1"
+    },
+    "task_name": {
+      "key": "story_80",
+      "text": "1"
+    },
+    "task_display": {
+      "key": "story_80",
+      "text": "1"
+    },
+    "npc": 0,
+    "completetask": [],
+    "deliver_npc": 0,
+    "auto_accept": 0,
+    "reword": [
+      {
+        "a": "item",
+        "t": "110001",
+        "n": 114
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 80010,
+    "lock": 1,
+    "ontxe": 20060,
+    "id_after": 0,
+    "group": 8,
+    "des": 3,
+    "icon": "",
+    "task_Tname": {
+      "key": "story_80",
+      "text": "1"
+    },
+    "task_name": {
+      "key": "story_80",
+      "text": "1"
+    },
+    "task_display": {
+      "key": "story_80",
+      "text": "1"
+    },
+    "npc": 0,
+    "completetask": [],
+    "deliver_npc": 0,
+    "auto_accept": 0,
+    "reword": [
+      {
+        "a": "item",
+        "t": "110001",
+        "n": 115
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 400010,
+    "lock": 1,
+    "ontxe": 20050,
+    "id_after": 0,
+    "group": 100,
+    "des": 1,
+    "icon": "",
+    "task_Tname": {
+      "key": "story_80",
+      "text": "1"
+    },
+    "task_name": {
+      "key": "story_80",
+      "text": "1"
+    },
+    "task_display": {
+      "key": "story_80",
+      "text": "1"
+    },
+    "npc": 0,
+    "completetask": [
+      114
+    ],
+    "deliver_npc": 0,
+    "auto_accept": 1,
+    "reword": [
+      {
+        "a": "item",
+        "t": "110001",
+        "n": 999
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 500010,
+    "lock": 1,
+    "ontxe": 20050,
+    "id_after": 0,
+    "group": 200,
+    "des": 4,
+    "icon": "",
+    "task_Tname": {
+      "key": "story_80",
+      "text": "1"
+    },
+    "task_name": {
+      "key": "story_80",
+      "text": "1"
+    },
+    "task_display": {
+      "key": "story_80",
+      "text": "1"
+    },
+    "npc": 0,
+    "completetask": [
+      306
+    ],
+    "deliver_npc": 0,
+    "auto_accept": 1,
+    "reword": [
+      {
+        "a": "item",
+        "t": "110001",
+        "n": 888
+      }
+    ],
+    "module": []
   }
 ]
\ No newline at end of file