From 8329f8c19c4436c78461ae9f5ac129575583c0b0 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Fri, 18 Nov 2022 20:28:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_initial.json     |  40 +++++
 bin/json/game_item.json        | 166 +++++++++++++++++-
 bin/json/game_worldbattle.json | 289 +++++++++++++++++++++++++++++++
 bin/json/game_worldtask.json   | 300 ++++++++++++++++-----------------
 4 files changed, 634 insertions(+), 161 deletions(-)

diff --git a/bin/json/game_initial.json b/bin/json/game_initial.json
index ac144bd47..24681fbff 100644
--- a/bin/json/game_initial.json
+++ b/bin/json/game_initial.json
@@ -248,5 +248,45 @@
         "n": 50
       }
     ]
+  },
+  {
+    "index": "124",
+    "var": [
+      {
+        "a": "equi",
+        "t": "10001",
+        "n": 1
+      }
+    ]
+  },
+  {
+    "index": "125",
+    "var": [
+      {
+        "a": "equi",
+        "t": "10002",
+        "n": 1
+      }
+    ]
+  },
+  {
+    "index": "126",
+    "var": [
+      {
+        "a": "equi",
+        "t": "10003",
+        "n": 1
+      }
+    ]
+  },
+  {
+    "index": "127",
+    "var": [
+      {
+        "a": "equi",
+        "t": "10004",
+        "n": 1
+      }
+    ]
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index c64a3a5cc..50065ebe9 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -1541,7 +1541,7 @@
       122
     ],
     "use_skip": 0,
-    "upper_limit": 1,
+    "upper_limit": 99,
     "uselv": 0,
     "isani": 0,
     "star": 0,
@@ -1578,7 +1578,7 @@
       122
     ],
     "use_skip": 0,
-    "upper_limit": 1,
+    "upper_limit": 99,
     "uselv": 0,
     "isani": 0,
     "star": 0,
@@ -1615,7 +1615,7 @@
       122
     ],
     "use_skip": 0,
-    "upper_limit": 1,
+    "upper_limit": 99,
     "uselv": 0,
     "isani": 0,
     "star": 0,
@@ -1649,9 +1649,9 @@
     "box_id": 0,
     "synthetize_num": 0,
     "access": [
-      122
+      103
     ],
-    "use_skip": 109,
+    "use_skip": 103,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -1692,9 +1692,9 @@
     "box_id": 0,
     "synthetize_num": 0,
     "access": [
-      122
+      103
     ],
-    "use_skip": 109,
+    "use_skip": 103,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -1735,9 +1735,9 @@
     "box_id": 0,
     "synthetize_num": 0,
     "access": [
-      122
+      103
     ],
-    "use_skip": 109,
+    "use_skip": 103,
     "upper_limit": 999,
     "uselv": 0,
     "isani": 0,
@@ -2578,5 +2578,153 @@
       "key": "itemtipstxt_40019",
       "text": "庇佑附魔石不足"
     }
+  },
+  {
+    "id": "100001",
+    "name": {
+      "key": "itemname_100001",
+      "text": "维京远征挑战券"
+    },
+    "usetype": 10,
+    "color": 3,
+    "bagtype": 0,
+    "index": 1,
+    "special_type": 0,
+    "time": 0,
+    "effects": "",
+    "box_id": 0,
+    "synthetize_num": 0,
+    "access": [
+      107
+    ],
+    "use_skip": 107,
+    "upper_limit": 30,
+    "uselv": 0,
+    "isani": 0,
+    "star": 0,
+    "race": 0,
+    "img": "wp_icon_jjcq",
+    "ico": "wp_icon_jjcq",
+    "intr": {
+      "key": "itemdesc_100001",
+      "text": "进入维京远征的凭证"
+    },
+    "sale": [],
+    "synthetize_deplete": [],
+    "tipstxt": {
+      "key": "itemtipstxt_100001",
+      "text": "维京远征挑战券不足"
+    }
+  },
+  {
+    "id": "100002",
+    "name": {
+      "key": "itemname_100002",
+      "text": "狩猎挑战券"
+    },
+    "usetype": 10,
+    "color": 3,
+    "bagtype": 0,
+    "index": 1,
+    "special_type": 0,
+    "time": 0,
+    "effects": "",
+    "box_id": 0,
+    "synthetize_num": 0,
+    "access": [
+      107
+    ],
+    "use_skip": 107,
+    "upper_limit": 30,
+    "uselv": 0,
+    "isani": 0,
+    "star": 0,
+    "race": 0,
+    "img": "wp_icon_jjcq",
+    "ico": "wp_icon_jjcq",
+    "intr": {
+      "key": "itemdesc_100002",
+      "text": "进入狩猎的凭证"
+    },
+    "sale": [],
+    "synthetize_deplete": [],
+    "tipstxt": {
+      "key": "itemtipstxt_100002",
+      "text": "狩猎挑战券不足"
+    }
+  },
+  {
+    "id": "100003",
+    "name": {
+      "key": "itemname_100003",
+      "text": "秘境挑战券"
+    },
+    "usetype": 10,
+    "color": 3,
+    "bagtype": 0,
+    "index": 1,
+    "special_type": 0,
+    "time": 0,
+    "effects": "",
+    "box_id": 0,
+    "synthetize_num": 0,
+    "access": [
+      107
+    ],
+    "use_skip": 107,
+    "upper_limit": 30,
+    "uselv": 0,
+    "isani": 0,
+    "star": 0,
+    "race": 0,
+    "img": "wp_icon_jjcq",
+    "ico": "wp_icon_jjcq",
+    "intr": {
+      "key": "itemdesc_100003",
+      "text": "进入秘境的凭证"
+    },
+    "sale": [],
+    "synthetize_deplete": [],
+    "tipstxt": {
+      "key": "itemtipstxt_100003",
+      "text": "秘境挑战券不足"
+    }
+  },
+  {
+    "id": "100004",
+    "name": {
+      "key": "itemname_100004",
+      "text": "竞技场挑战券"
+    },
+    "usetype": 10,
+    "color": 3,
+    "bagtype": 0,
+    "index": 1,
+    "special_type": 0,
+    "time": 0,
+    "effects": "",
+    "box_id": 0,
+    "synthetize_num": 0,
+    "access": [
+      107
+    ],
+    "use_skip": 107,
+    "upper_limit": 30,
+    "uselv": 0,
+    "isani": 0,
+    "star": 0,
+    "race": 0,
+    "img": "wp_icon_jjcq",
+    "ico": "wp_icon_jjcq",
+    "intr": {
+      "key": "itemdesc_100004",
+      "text": "进入竞技场的凭证"
+    },
+    "sale": [],
+    "synthetize_deplete": [],
+    "tipstxt": {
+      "key": "itemtipstxt_100004",
+      "text": "竞技场挑战券不足"
+    }
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_worldbattle.json b/bin/json/game_worldbattle.json
index 375d82242..41d9ccd4d 100644
--- a/bin/json/game_worldbattle.json
+++ b/bin/json/game_worldbattle.json
@@ -15,5 +15,294 @@
       12,
       14
     ]
+  },
+  {
+    "id": 102,
+    "FormatList": [
+      700011
+    ],
+    "DefaultHero": 700011,
+    "SelectableHero": [],
+    "LockSlots": [
+      3,
+      4
+    ],
+    "AssistTeam": 710003,
+    "EventList": [
+      12,
+      14
+    ]
+  },
+  {
+    "id": 103,
+    "FormatList": [
+      700011
+    ],
+    "DefaultHero": 700011,
+    "SelectableHero": [],
+    "LockSlots": [
+      3,
+      4
+    ],
+    "AssistTeam": 710003,
+    "EventList": [
+      12,
+      14
+    ]
+  },
+  {
+    "id": 104,
+    "FormatList": [
+      700011
+    ],
+    "DefaultHero": 700011,
+    "SelectableHero": [],
+    "LockSlots": [
+      3,
+      4
+    ],
+    "AssistTeam": 710003,
+    "EventList": [
+      12,
+      14
+    ]
+  },
+  {
+    "id": 105,
+    "FormatList": [
+      700011
+    ],
+    "DefaultHero": 700011,
+    "SelectableHero": [],
+    "LockSlots": [
+      3,
+      4
+    ],
+    "AssistTeam": 710003,
+    "EventList": [
+      12,
+      14
+    ]
+  },
+  {
+    "id": 106,
+    "FormatList": [
+      700011
+    ],
+    "DefaultHero": 700011,
+    "SelectableHero": [],
+    "LockSlots": [
+      3,
+      4
+    ],
+    "AssistTeam": 710003,
+    "EventList": [
+      12,
+      14
+    ]
+  },
+  {
+    "id": 107,
+    "FormatList": [
+      700011
+    ],
+    "DefaultHero": 700011,
+    "SelectableHero": [],
+    "LockSlots": [
+      3,
+      4
+    ],
+    "AssistTeam": 710003,
+    "EventList": [
+      12,
+      14
+    ]
+  },
+  {
+    "id": 108,
+    "FormatList": [
+      700011
+    ],
+    "DefaultHero": 700011,
+    "SelectableHero": [],
+    "LockSlots": [
+      3,
+      4
+    ],
+    "AssistTeam": 710003,
+    "EventList": [
+      12,
+      14
+    ]
+  },
+  {
+    "id": 109,
+    "FormatList": [
+      700011
+    ],
+    "DefaultHero": 700011,
+    "SelectableHero": [],
+    "LockSlots": [
+      3,
+      4
+    ],
+    "AssistTeam": 710003,
+    "EventList": [
+      12,
+      14
+    ]
+  },
+  {
+    "id": 110,
+    "FormatList": [
+      700011
+    ],
+    "DefaultHero": 700011,
+    "SelectableHero": [],
+    "LockSlots": [
+      3,
+      4
+    ],
+    "AssistTeam": 710003,
+    "EventList": [
+      12,
+      14
+    ]
+  },
+  {
+    "id": 111,
+    "FormatList": [
+      700011
+    ],
+    "DefaultHero": 700011,
+    "SelectableHero": [],
+    "LockSlots": [
+      3,
+      4
+    ],
+    "AssistTeam": 710003,
+    "EventList": [
+      12,
+      14
+    ]
+  },
+  {
+    "id": 112,
+    "FormatList": [
+      700011
+    ],
+    "DefaultHero": 700011,
+    "SelectableHero": [],
+    "LockSlots": [
+      3,
+      4
+    ],
+    "AssistTeam": 710003,
+    "EventList": [
+      12,
+      14
+    ]
+  },
+  {
+    "id": 113,
+    "FormatList": [
+      700011
+    ],
+    "DefaultHero": 700011,
+    "SelectableHero": [],
+    "LockSlots": [
+      3,
+      4
+    ],
+    "AssistTeam": 710003,
+    "EventList": [
+      12,
+      14
+    ]
+  },
+  {
+    "id": 114,
+    "FormatList": [
+      700011
+    ],
+    "DefaultHero": 700011,
+    "SelectableHero": [],
+    "LockSlots": [
+      3,
+      4
+    ],
+    "AssistTeam": 710003,
+    "EventList": [
+      12,
+      14
+    ]
+  },
+  {
+    "id": 115,
+    "FormatList": [
+      700011
+    ],
+    "DefaultHero": 700011,
+    "SelectableHero": [],
+    "LockSlots": [
+      3,
+      4
+    ],
+    "AssistTeam": 710003,
+    "EventList": [
+      12,
+      14
+    ]
+  },
+  {
+    "id": 116,
+    "FormatList": [
+      700011
+    ],
+    "DefaultHero": 700011,
+    "SelectableHero": [],
+    "LockSlots": [
+      3,
+      4
+    ],
+    "AssistTeam": 710003,
+    "EventList": [
+      12,
+      14
+    ]
+  },
+  {
+    "id": 117,
+    "FormatList": [
+      700011
+    ],
+    "DefaultHero": 700011,
+    "SelectableHero": [],
+    "LockSlots": [
+      3,
+      4
+    ],
+    "AssistTeam": 710003,
+    "EventList": [
+      12,
+      14
+    ]
+  },
+  {
+    "id": 118,
+    "FormatList": [
+      700011
+    ],
+    "DefaultHero": 700011,
+    "SelectableHero": [],
+    "LockSlots": [
+      3,
+      4
+    ],
+    "AssistTeam": 710003,
+    "EventList": [
+      12,
+      14
+    ]
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index 1ce883390..8e08316ae 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -58,13 +58,7 @@
     "completetask": 0,
     "auto_accept": 1,
     "overtips": 1,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 100
-      }
-    ],
+    "reword": [],
     "day": "",
     "weather": 0
   },
@@ -90,13 +84,7 @@
     "completetask": 171,
     "auto_accept": 1,
     "overtips": 1,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 100
-      }
-    ],
+    "reword": [],
     "day": "",
     "weather": 0
   },
@@ -122,13 +110,7 @@
     "completetask": 0,
     "auto_accept": 1,
     "overtips": 1,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 100
-      }
-    ],
+    "reword": [],
     "day": "",
     "weather": 0
   },
@@ -163,7 +145,7 @@
       {
         "a": "item",
         "t": "30001",
-        "n": 10
+        "n": 1
       }
     ],
     "day": "",
@@ -337,7 +319,7 @@
     "task_display": "新剧情文本10111",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝右屏组件名",
+      "阿宝铁匠铺出来模型",
       "153"
     ],
     "getafter_event": [
@@ -452,8 +434,8 @@
     "auto_accept": 1,
     "overtips": 1,
     "reword": [],
-    "day": "night",
-    "weather": 2
+    "day": "",
+    "weather": 0
   },
   {
     "key": 10116,
@@ -478,7 +460,7 @@
     "auto_accept": 1,
     "overtips": 1,
     "reword": [],
-    "day": "night",
+    "day": "",
     "weather": 0
   },
   {
@@ -493,7 +475,7 @@
     "task_display": "新剧情文本10117",
     "npc": [
       "scenes_ boundary_02",
-      "瓜哥组件名",
+      "瓜哥主城组件名",
       "150"
     ],
     "getafter_event": [
@@ -504,7 +486,7 @@
     "auto_accept": 1,
     "overtips": 1,
     "reword": [],
-    "day": "day",
+    "day": "",
     "weather": 0
   },
   {
@@ -519,7 +501,7 @@
     "task_display": "新剧情文本10118",
     "npc": [
       "scenes_ boundary_02",
-      "瓜哥组件名",
+      "瓜哥主城组件名",
       "150"
     ],
     "getafter_event": [
@@ -530,7 +512,7 @@
     "auto_accept": 1,
     "overtips": 1,
     "reword": [],
-    "day": "day",
+    "day": "",
     "weather": 0
   },
   {
@@ -556,7 +538,7 @@
     "auto_accept": 1,
     "overtips": 1,
     "reword": [],
-    "day": "day",
+    "day": "",
     "weather": 0
   },
   {
@@ -582,7 +564,7 @@
     "auto_accept": 1,
     "overtips": 1,
     "reword": [],
-    "day": "day",
+    "day": "",
     "weather": 0
   },
   {
@@ -608,7 +590,7 @@
     "auto_accept": 1,
     "overtips": 1,
     "reword": [],
-    "day": "day",
+    "day": "",
     "weather": 0
   },
   {
@@ -634,7 +616,7 @@
     "auto_accept": 1,
     "overtips": 1,
     "reword": [],
-    "day": "day",
+    "day": "",
     "weather": 0
   },
   {
@@ -660,7 +642,7 @@
     "auto_accept": 1,
     "overtips": 1,
     "reword": [],
-    "day": "day",
+    "day": "",
     "weather": 0
   },
   {
@@ -675,7 +657,7 @@
     "task_display": "新剧情文本10124",
     "npc": [
       "WuGuanScene",
-      "武馆阿宝",
+      "武馆瓜哥",
       "137"
     ],
     "getafter_event": [
@@ -701,7 +683,7 @@
     "task_display": "新剧情文本10125",
     "npc": [
       "WuGuanScene",
-      "武馆阿宝",
+      "武馆瓜哥",
       "137"
     ],
     "getafter_event": [
@@ -727,7 +709,7 @@
     "task_display": "新剧情文本10126",
     "npc": [
       "WuGuanScene",
-      "武馆阿宝",
+      "武馆瓜哥",
       "137"
     ],
     "getafter_event": [
@@ -753,7 +735,7 @@
     "task_display": "新剧情文本10127",
     "npc": [
       "WuGuanScene",
-      "武馆阿宝",
+      "武馆瓜哥",
       "137"
     ],
     "getafter_event": [
@@ -779,7 +761,7 @@
     "task_display": "新剧情文本10128",
     "npc": [
       "WuGuanScene",
-      "武馆阿宝",
+      "武馆瓜哥",
       "137"
     ],
     "getafter_event": [
@@ -805,7 +787,7 @@
     "task_display": "新剧情文本10129",
     "npc": [
       "WuGuanScene",
-      "武馆阿宝",
+      "武馆瓜哥",
       "137"
     ],
     "getafter_event": [
@@ -831,7 +813,7 @@
     "task_display": "新剧情文本10130",
     "npc": [
       "WuGuanScene",
-      "武馆阿宝",
+      "武馆瓜哥",
       "137"
     ],
     "getafter_event": [
@@ -884,7 +866,7 @@
     "npc": [
       "scenes_ boundary_02",
       "阿宝组件名",
-      "151"
+      "150"
     ],
     "getafter_event": [
       2,
@@ -910,7 +892,7 @@
     "npc": [
       "scenes_ boundary_02",
       "阿宝组件名",
-      "151"
+      "150"
     ],
     "getafter_event": [
       2,
@@ -936,7 +918,7 @@
     "npc": [
       "scenes_ boundary_02",
       "阿宝组件名",
-      "151"
+      "150"
     ],
     "getafter_event": [
       2,
@@ -962,7 +944,7 @@
     "npc": [
       "scenes_ boundary_02",
       "阿宝组件名",
-      "151"
+      "150"
     ],
     "getafter_event": [
       2,
@@ -987,7 +969,7 @@
     "task_display": "新剧情文本10136",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝组件名",
+      "阿宝现代区",
       "152"
     ],
     "getafter_event": [
@@ -1013,7 +995,7 @@
     "task_display": "新剧情文本10137",
     "npc": [
       "WuGuanScene",
-      "阿宝组件名",
+      "武馆瓜哥",
       "137"
     ],
     "getafter_event": [
@@ -1039,7 +1021,7 @@
     "task_display": "新剧情文本10138",
     "npc": [
       "WuGuanScene",
-      "阿宝组件名",
+      "武馆瓜哥",
       "137"
     ],
     "getafter_event": [
@@ -1065,7 +1047,7 @@
     "task_display": "新剧情文本10139",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝组件名",
+      "阿宝现代区",
       "152"
     ],
     "getafter_event": [
@@ -1091,7 +1073,7 @@
     "task_display": "新剧情文本10140",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝组件名",
+      "阿宝现代区",
       "152"
     ],
     "getafter_event": [
@@ -1117,7 +1099,7 @@
     "task_display": "新剧情文本10141",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝组件名",
+      "阿宝现代区",
       "152"
     ],
     "getafter_event": [
@@ -1143,7 +1125,7 @@
     "task_display": "新剧情文本10142",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝组件名",
+      "阿宝现代区",
       "152"
     ],
     "getafter_event": [
@@ -1169,7 +1151,7 @@
     "task_display": "新剧情文本10143",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝组件名",
+      "阿宝现代区",
       "152"
     ],
     "getafter_event": [
@@ -1195,7 +1177,7 @@
     "task_display": "新剧情文本10144",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝组件名",
+      "阿宝现代区",
       "152"
     ],
     "getafter_event": [
@@ -1221,7 +1203,7 @@
     "task_display": "新剧情文本10145",
     "npc": [
       "scenes_ boundary_02",
-      "阿宝组件名",
+      "阿宝现代区",
       "152"
     ],
     "getafter_event": [
@@ -1325,7 +1307,7 @@
     "task_display": "新剧情文本10149",
     "npc": [
       "scenes_ boundary_02",
-      "波比组件名",
+      "阿宝组件名",
       "150"
     ],
     "getafter_event": [
@@ -1351,7 +1333,7 @@
     "task_display": "新剧情文本10150",
     "npc": [
       "scenes_ boundary_02",
-      "波比组件名",
+      "阿宝组件名",
       "150"
     ],
     "getafter_event": [
@@ -1377,7 +1359,7 @@
     "task_display": "新剧情文本10151",
     "npc": [
       "scenes_ boundary_02",
-      "杰克组件名",
+      "阿宝组件名",
       "150"
     ],
     "getafter_event": [
@@ -1403,7 +1385,8 @@
     "task_display": "新剧情文本10152",
     "npc": [
       "scenes_ boundary_02",
-      "杰克组件名"
+      "阿宝组件名",
+      "150"
     ],
     "getafter_event": [
       2,
@@ -1427,8 +1410,9 @@
     "task_name": "新剧情10153",
     "task_display": "新剧情文本10153",
     "npc": [
-      "scenes_ boundary_02",
-      "冰霜杰克组件名"
+      "scenes_martialarts_01",
+      "武馆熊貓",
+      "137"
     ],
     "getafter_event": [
       2,
@@ -1452,8 +1436,9 @@
     "task_name": "新剧情10154",
     "task_display": "新剧情文本10154",
     "npc": [
-      "scenes_ boundary_02",
-      "原始人岛地图组件名"
+      "scenes_martialarts_01",
+      "武馆熊貓",
+      "137"
     ],
     "getafter_event": [
       2,
@@ -1477,8 +1462,9 @@
     "task_name": "新剧情10155",
     "task_display": "新剧情文本10155",
     "npc": [
-      "scenes_ boundary_02",
-      "原始人岛地图组件名"
+      "scenes_martialarts_01",
+      "武馆熊貓",
+      "137"
     ],
     "getafter_event": [
       2,
@@ -1502,8 +1488,9 @@
     "task_name": "新剧情10156",
     "task_display": "新剧情文本10156",
     "npc": [
-      "scenes_ boundary_02",
-      "杰克地图组件名"
+      "scenes_martialarts_01",
+      "武馆熊貓",
+      "137"
     ],
     "getafter_event": [
       2,
@@ -1527,8 +1514,9 @@
     "task_name": "新剧情10157",
     "task_display": "新剧情文本10157",
     "npc": [
-      "scenes_ boundary_02",
-      "杰克组件名"
+      "scenes_martialarts_01",
+      "武馆熊貓",
+      "137"
     ],
     "getafter_event": [
       2,
@@ -1552,8 +1540,9 @@
     "task_name": "新剧情10158",
     "task_display": "新剧情文本10158",
     "npc": [
-      "scenes_ boundary_02",
-      "原始人岛地图组件名"
+      "scenes_martialarts_01",
+      "武馆熊貓",
+      "137"
     ],
     "getafter_event": [
       2,
@@ -1577,8 +1566,9 @@
     "task_name": "新剧情10159",
     "task_display": "新剧情文本10159",
     "npc": [
-      "scenes_ boundary_02",
-      "瓜哥组件名"
+      "scenes_martialarts_01",
+      "武馆熊貓",
+      "137"
     ],
     "getafter_event": [
       2,
@@ -1602,8 +1592,9 @@
     "task_name": "新剧情10160",
     "task_display": "新剧情文本10160",
     "npc": [
-      "scenes_ boundary_02",
-      "瓜哥组件名"
+      "scenes_martialarts_01",
+      "武馆熊貓",
+      "137"
     ],
     "getafter_event": [
       2,
@@ -1627,8 +1618,9 @@
     "task_name": "新剧情10161",
     "task_display": "新剧情文本10161",
     "npc": [
-      "scenes_ boundary_02",
-      "原始人岛地图组件名"
+      "scenes_martialarts_01",
+      "武馆熊貓",
+      "137"
     ],
     "getafter_event": [
       2,
@@ -1652,8 +1644,9 @@
     "task_name": "新剧情10162",
     "task_display": "新剧情文本10162",
     "npc": [
-      "scenes_ boundary_02",
-      "原始人岛地图组件名"
+      "scenes_martialarts_01",
+      "武馆熊貓",
+      "137"
     ],
     "getafter_event": [
       2,
@@ -1677,8 +1670,9 @@
     "task_name": "新剧情10163",
     "task_display": "新剧情文本10163",
     "npc": [
-      "scenes_ boundary_02",
-      "原始人岛地图组件名"
+      "scenes_martialarts_01",
+      "武馆熊貓",
+      "137"
     ],
     "getafter_event": [
       2,
@@ -1702,8 +1696,9 @@
     "task_name": "新剧情10164",
     "task_display": "新剧情文本10164",
     "npc": [
-      "scenes_ boundary_02",
-      "作战部地图组件名"
+      "scenes_martialarts_01",
+      "武馆熊貓",
+      "137"
     ],
     "getafter_event": [
       2,
@@ -1727,8 +1722,9 @@
     "task_name": "新剧情10165",
     "task_display": "新剧情文本10165",
     "npc": [
-      "scenes_ boundary_02",
-      "布兰奇组件名"
+      "scenes_martialarts_01",
+      "武馆熊貓",
+      "137"
     ],
     "getafter_event": [
       2,
@@ -1781,7 +1777,7 @@
   {
     "key": 20002,
     "lock": 1,
-    "ontxe": 20001,
+    "ontxe": 10166,
     "id_after": 20003,
     "group": 10001,
     "des": 3,
@@ -1798,7 +1794,7 @@
       100002
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -1813,7 +1809,7 @@
   {
     "key": 20003,
     "lock": 1,
-    "ontxe": 20002,
+    "ontxe": 10167,
     "id_after": 20004,
     "group": 10001,
     "des": 3,
@@ -1829,8 +1825,8 @@
       2,
       100003
     ],
-    "completetask": 176,
-    "auto_accept": 1,
+    "completetask": 171,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -1845,7 +1841,7 @@
   {
     "key": 20004,
     "lock": 1,
-    "ontxe": 20003,
+    "ontxe": 10168,
     "id_after": 20005,
     "group": 10001,
     "des": 3,
@@ -1862,7 +1858,7 @@
       100004
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -1877,7 +1873,7 @@
   {
     "key": 20005,
     "lock": 1,
-    "ontxe": 20004,
+    "ontxe": 10169,
     "id_after": 20006,
     "group": 10001,
     "des": 3,
@@ -1894,7 +1890,7 @@
       100005
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -1914,7 +1910,7 @@
   {
     "key": 20006,
     "lock": 1,
-    "ontxe": 20005,
+    "ontxe": 10170,
     "id_after": 20007,
     "group": 10001,
     "des": 3,
@@ -1931,7 +1927,7 @@
       100006
     ],
     "completetask": 118,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -1946,7 +1942,7 @@
   {
     "key": 20007,
     "lock": 1,
-    "ontxe": 20006,
+    "ontxe": 10171,
     "id_after": 20008,
     "group": 10001,
     "des": 3,
@@ -1962,8 +1958,8 @@
       2,
       100007
     ],
-    "completetask": 175,
-    "auto_accept": 1,
+    "completetask": 172,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -1978,7 +1974,7 @@
   {
     "key": 20008,
     "lock": 1,
-    "ontxe": 20007,
+    "ontxe": 10172,
     "id_after": 20009,
     "group": 10001,
     "des": 3,
@@ -1995,7 +1991,7 @@
       100008
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -2010,7 +2006,7 @@
   {
     "key": 20009,
     "lock": 1,
-    "ontxe": 20008,
+    "ontxe": 10173,
     "id_after": 20010,
     "group": 10001,
     "des": 3,
@@ -2027,7 +2023,7 @@
       100009
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -2042,7 +2038,7 @@
   {
     "key": 20010,
     "lock": 1,
-    "ontxe": 20009,
+    "ontxe": 10174,
     "id_after": 20011,
     "group": 10001,
     "des": 3,
@@ -2059,7 +2055,7 @@
       100010
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -2074,7 +2070,7 @@
   {
     "key": 20011,
     "lock": 1,
-    "ontxe": 20010,
+    "ontxe": 10175,
     "id_after": 20012,
     "group": 10002,
     "des": 3,
@@ -2111,7 +2107,7 @@
   {
     "key": 20012,
     "lock": 1,
-    "ontxe": 20011,
+    "ontxe": 10176,
     "id_after": 20013,
     "group": 10002,
     "des": 3,
@@ -2128,7 +2124,7 @@
       100002
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -2143,7 +2139,7 @@
   {
     "key": 20013,
     "lock": 1,
-    "ontxe": 20012,
+    "ontxe": 10177,
     "id_after": 20014,
     "group": 10002,
     "des": 3,
@@ -2159,8 +2155,8 @@
       2,
       100003
     ],
-    "completetask": 171,
-    "auto_accept": 1,
+    "completetask": 173,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -2175,7 +2171,7 @@
   {
     "key": 20014,
     "lock": 1,
-    "ontxe": 20013,
+    "ontxe": 10178,
     "id_after": 20015,
     "group": 10002,
     "des": 3,
@@ -2192,7 +2188,7 @@
       100004
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -2207,7 +2203,7 @@
   {
     "key": 20015,
     "lock": 1,
-    "ontxe": 20014,
+    "ontxe": 10179,
     "id_after": 20016,
     "group": 10002,
     "des": 3,
@@ -2224,7 +2220,7 @@
       100005
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -2244,7 +2240,7 @@
   {
     "key": 20016,
     "lock": 1,
-    "ontxe": 20015,
+    "ontxe": 10180,
     "id_after": 20017,
     "group": 10002,
     "des": 3,
@@ -2260,8 +2256,8 @@
       2,
       100006
     ],
-    "completetask": 172,
-    "auto_accept": 1,
+    "completetask": 0,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -2276,7 +2272,7 @@
   {
     "key": 20017,
     "lock": 1,
-    "ontxe": 20016,
+    "ontxe": 10181,
     "id_after": 20018,
     "group": 10002,
     "des": 3,
@@ -2293,7 +2289,7 @@
       100007
     ],
     "completetask": 174,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -2308,7 +2304,7 @@
   {
     "key": 20018,
     "lock": 1,
-    "ontxe": 20017,
+    "ontxe": 10182,
     "id_after": 20019,
     "group": 10002,
     "des": 3,
@@ -2325,7 +2321,7 @@
       100008
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -2340,7 +2336,7 @@
   {
     "key": 20019,
     "lock": 1,
-    "ontxe": 20018,
+    "ontxe": 10183,
     "id_after": 20020,
     "group": 10002,
     "des": 3,
@@ -2357,7 +2353,7 @@
       100009
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -2372,7 +2368,7 @@
   {
     "key": 20020,
     "lock": 1,
-    "ontxe": 20019,
+    "ontxe": 10184,
     "id_after": 20100,
     "group": 10002,
     "des": 3,
@@ -2389,7 +2385,7 @@
       100010
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -2404,7 +2400,7 @@
   {
     "key": 20100,
     "lock": 1,
-    "ontxe": 20020,
+    "ontxe": 10185,
     "id_after": 20101,
     "group": 1,
     "des": 2,
@@ -2436,7 +2432,7 @@
   {
     "key": 20101,
     "lock": 1,
-    "ontxe": 20100,
+    "ontxe": 10186,
     "id_after": 20102,
     "group": 1,
     "des": 2,
@@ -2453,7 +2449,7 @@
       200002
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -2468,7 +2464,7 @@
   {
     "key": 20102,
     "lock": 1,
-    "ontxe": 20101,
+    "ontxe": 10187,
     "id_after": 20103,
     "group": 1,
     "des": 2,
@@ -2485,7 +2481,7 @@
       200003
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -2500,7 +2496,7 @@
   {
     "key": 20103,
     "lock": 1,
-    "ontxe": 20102,
+    "ontxe": 10188,
     "id_after": 20104,
     "group": 1,
     "des": 2,
@@ -2517,7 +2513,7 @@
       200004
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -2532,7 +2528,7 @@
   {
     "key": 20104,
     "lock": 1,
-    "ontxe": 20103,
+    "ontxe": 10189,
     "id_after": 20105,
     "group": 1,
     "des": 2,
@@ -2549,7 +2545,7 @@
       200005
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -2564,7 +2560,7 @@
   {
     "key": 20105,
     "lock": 1,
-    "ontxe": 20104,
+    "ontxe": 10190,
     "id_after": 20106,
     "group": 1,
     "des": 2,
@@ -2581,7 +2577,7 @@
       200006
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -2596,7 +2592,7 @@
   {
     "key": 20106,
     "lock": 1,
-    "ontxe": 20105,
+    "ontxe": 10191,
     "id_after": 20107,
     "group": 1,
     "des": 2,
@@ -2613,7 +2609,7 @@
       200007
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -2628,7 +2624,7 @@
   {
     "key": 20107,
     "lock": 1,
-    "ontxe": 20106,
+    "ontxe": 10192,
     "id_after": 20108,
     "group": 1,
     "des": 2,
@@ -2645,7 +2641,7 @@
       200008
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -2660,7 +2656,7 @@
   {
     "key": 20108,
     "lock": 1,
-    "ontxe": 20107,
+    "ontxe": 10193,
     "id_after": 20109,
     "group": 1,
     "des": 2,
@@ -2677,7 +2673,7 @@
       200009
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -2692,7 +2688,7 @@
   {
     "key": 20109,
     "lock": 1,
-    "ontxe": 20108,
+    "ontxe": 10194,
     "id_after": 20110,
     "group": 1,
     "des": 2,
@@ -2709,7 +2705,7 @@
       200010
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -2724,7 +2720,7 @@
   {
     "key": 20110,
     "lock": 1,
-    "ontxe": 20109,
+    "ontxe": 10195,
     "id_after": 20111,
     "group": 1,
     "des": 2,
@@ -2741,7 +2737,7 @@
       200011
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -2756,7 +2752,7 @@
   {
     "key": 20111,
     "lock": 1,
-    "ontxe": 20110,
+    "ontxe": 10196,
     "id_after": 20112,
     "group": 1,
     "des": 2,
@@ -2773,7 +2769,7 @@
       200012
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {
@@ -2788,7 +2784,7 @@
   {
     "key": 20112,
     "lock": 1,
-    "ontxe": 20111,
+    "ontxe": 10197,
     "id_after": 0,
     "group": 1,
     "des": 2,
@@ -2805,7 +2801,7 @@
       200013
     ],
     "completetask": 0,
-    "auto_accept": 1,
+    "auto_accept": 0,
     "overtips": 1,
     "reword": [
       {