From 0382a678afb3b63924a000b25426a34e57727ecd Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Mon, 7 Aug 2023 19:08:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_mainchapter.json              |   2 +-
 bin/json/game_mainstage.json                |   6 +-
 bin/json/game_shopcenterfund.json           |  74 ++++----
 bin/json/game_skillpassive.json             |   2 +-
 bin/json/game_worldtask.json                | 179 ++++++++++++++++++++
 sys/configure/structs/Game.WorldTaskData.go |   2 +
 6 files changed, 224 insertions(+), 41 deletions(-)

diff --git a/bin/json/game_mainchapter.json b/bin/json/game_mainchapter.json
index 138efe3de..ff259994d 100644
--- a/bin/json/game_mainchapter.json
+++ b/bin/json/game_mainchapter.json
@@ -26,7 +26,7 @@
       "text": "大龙复仇记"
     },
     "chapter_type": 1,
-    "map": "scenes_chapter_01",
+    "map": "scenes_chapter_02",
     "camera": "",
     "title": {
       "key": "mainchapter_main_chapter_title_2",
diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json
index 9d15359c4..91311d3ed 100644
--- a/bin/json/game_mainstage.json
+++ b/bin/json/game_mainstage.json
@@ -7557,7 +7557,9 @@
     "id": 1100208,
     "chapterid": 11003,
     "group_id": 100207,
-    "previous_group_id": [],
+    "previous_group_id": [
+      100206
+    ],
     "previoustage": 1100208,
     "Episodetype": 1,
     "openlevel": 1,
@@ -7574,7 +7576,7 @@
     "animation": [],
     "hide": 0,
     "destroy": 0,
-    "progress": 0,
+    "progress": 1,
     "frontstoryid": 20200,
     "afterstoryid": 20201,
     "maingroupName": {
diff --git a/bin/json/game_shopcenterfund.json b/bin/json/game_shopcenterfund.json
index fe0da900c..d76a50932 100644
--- a/bin/json/game_shopcenterfund.json
+++ b/bin/json/game_shopcenterfund.json
@@ -80,259 +80,259 @@
     "id": 200012,
     "type": 2,
     "unlock": 60,
-    "group": 991,
+    "group": 19100004,
     "position": 12
   },
   {
     "id": 200013,
     "type": 3,
     "unlock": 1,
-    "group": 992,
+    "group": 19100004,
     "position": 1
   },
   {
     "id": 200014,
     "type": 3,
     "unlock": 2,
-    "group": 993,
+    "group": 19100004,
     "position": 2
   },
   {
     "id": 200015,
     "type": 3,
     "unlock": 3,
-    "group": 994,
+    "group": 19100004,
     "position": 3
   },
   {
     "id": 200016,
     "type": 3,
     "unlock": 4,
-    "group": 995,
+    "group": 19100004,
     "position": 4
   },
   {
     "id": 200017,
     "type": 3,
     "unlock": 5,
-    "group": 996,
+    "group": 19100004,
     "position": 5
   },
   {
     "id": 200018,
     "type": 3,
     "unlock": 6,
-    "group": 997,
+    "group": 19100004,
     "position": 6
   },
   {
     "id": 200019,
     "type": 3,
     "unlock": 7,
-    "group": 998,
+    "group": 19100004,
     "position": 7
   },
   {
     "id": 200020,
     "type": 3,
     "unlock": 8,
-    "group": 999,
+    "group": 19100004,
     "position": 8
   },
   {
     "id": 200021,
     "type": 3,
     "unlock": 9,
-    "group": 1000,
+    "group": 19100004,
     "position": 9
   },
   {
     "id": 200022,
     "type": 3,
     "unlock": 10,
-    "group": 1001,
+    "group": 19100004,
     "position": 10
   },
   {
     "id": 200023,
     "type": 3,
     "unlock": 11,
-    "group": 1002,
+    "group": 19100004,
     "position": 11
   },
   {
     "id": 200024,
     "type": 3,
     "unlock": 12,
-    "group": 1003,
+    "group": 19100004,
     "position": 12
   },
   {
     "id": 200025,
     "type": 4,
     "unlock": 1,
-    "group": 1004,
+    "group": 19100004,
     "position": 1
   },
   {
     "id": 200026,
     "type": 4,
     "unlock": 2,
-    "group": 1005,
+    "group": 19100004,
     "position": 2
   },
   {
     "id": 200027,
     "type": 4,
     "unlock": 3,
-    "group": 1006,
+    "group": 19100004,
     "position": 3
   },
   {
     "id": 200028,
     "type": 4,
     "unlock": 4,
-    "group": 1007,
+    "group": 19100004,
     "position": 4
   },
   {
     "id": 200029,
     "type": 4,
     "unlock": 5,
-    "group": 1008,
+    "group": 19100004,
     "position": 5
   },
   {
     "id": 200030,
     "type": 4,
     "unlock": 6,
-    "group": 1009,
+    "group": 19100004,
     "position": 6
   },
   {
     "id": 200031,
     "type": 4,
     "unlock": 7,
-    "group": 1010,
+    "group": 19100004,
     "position": 7
   },
   {
     "id": 200032,
     "type": 4,
     "unlock": 8,
-    "group": 1011,
+    "group": 19100004,
     "position": 8
   },
   {
     "id": 200033,
     "type": 4,
     "unlock": 9,
-    "group": 1012,
+    "group": 19100004,
     "position": 9
   },
   {
     "id": 200034,
     "type": 4,
     "unlock": 10,
-    "group": 1013,
+    "group": 19100004,
     "position": 10
   },
   {
     "id": 200035,
     "type": 4,
     "unlock": 11,
-    "group": 1014,
+    "group": 19100004,
     "position": 11
   },
   {
     "id": 200036,
     "type": 4,
     "unlock": 12,
-    "group": 1015,
+    "group": 19100004,
     "position": 12
   },
   {
     "id": 200037,
     "type": 5,
     "unlock": 1,
-    "group": 1015,
+    "group": 19100004,
     "position": 1
   },
   {
     "id": 200038,
     "type": 5,
     "unlock": 2,
-    "group": 1015,
+    "group": 19100004,
     "position": 2
   },
   {
     "id": 200039,
     "type": 5,
     "unlock": 3,
-    "group": 1015,
+    "group": 19100004,
     "position": 3
   },
   {
     "id": 200040,
     "type": 5,
     "unlock": 4,
-    "group": 1015,
+    "group": 19100004,
     "position": 4
   },
   {
     "id": 200041,
     "type": 5,
     "unlock": 5,
-    "group": 1015,
+    "group": 19100004,
     "position": 5
   },
   {
     "id": 200042,
     "type": 5,
     "unlock": 6,
-    "group": 1015,
+    "group": 19100004,
     "position": 6
   },
   {
     "id": 200043,
     "type": 5,
     "unlock": 7,
-    "group": 1015,
+    "group": 19100004,
     "position": 7
   },
   {
     "id": 200044,
     "type": 5,
     "unlock": 8,
-    "group": 1015,
+    "group": 19100004,
     "position": 8
   },
   {
     "id": 200045,
     "type": 5,
     "unlock": 9,
-    "group": 1015,
+    "group": 19100004,
     "position": 9
   },
   {
     "id": 200046,
     "type": 5,
     "unlock": 10,
-    "group": 1015,
+    "group": 19100004,
     "position": 10
   },
   {
     "id": 200047,
     "type": 5,
     "unlock": 11,
-    "group": 1015,
+    "group": 19100004,
     "position": 11
   },
   {
     "id": 200048,
     "type": 5,
     "unlock": 12,
-    "group": 1015,
+    "group": 19100004,
     "position": 12
   },
   {
diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json
index ef638b98d..41c84c45c 100644
--- a/bin/json/game_skillpassive.json
+++ b/bin/json/game_skillpassive.json
@@ -1887,7 +1887,7 @@
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
-    "MaxEmitTimesInRound": 1,
+    "MaxEmitTimesInRound": 99,
     "Callback": [
       255006312,
       255006314,
diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index a02b883ea..f8a9fd077 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -37,6 +37,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 1,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -77,6 +78,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 1,
     "lock_add": 0,
     "reword": [
       {
@@ -117,6 +119,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -159,6 +162,7 @@
     "deliver_npc": 10028,
     "taskend_removeitem": [],
     "auto_accept": 1,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -201,6 +205,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -241,6 +246,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 1,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -288,6 +294,7 @@
     "deliver_npc": 10058,
     "taskend_removeitem": [],
     "auto_accept": 1,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -335,6 +342,7 @@
     "deliver_npc": 10068,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -377,6 +385,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -421,6 +430,7 @@
     "deliver_npc": 10088,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -461,6 +471,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -508,6 +519,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -575,6 +587,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -617,6 +630,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -659,6 +673,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -701,6 +716,7 @@
     "deliver_npc": 10148,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -768,6 +784,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -810,6 +827,7 @@
     "deliver_npc": 10168,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -852,6 +870,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -897,6 +916,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -944,6 +964,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -986,6 +1007,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -1028,6 +1050,7 @@
     "deliver_npc": 10218,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -1070,6 +1093,7 @@
     "deliver_npc": 10228,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -1112,6 +1136,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -1159,6 +1184,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -1199,6 +1225,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -1266,6 +1293,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -1308,6 +1336,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -1350,6 +1379,7 @@
     "deliver_npc": 10288,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -1399,6 +1429,7 @@
     "deliver_npc": 10298,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -1441,6 +1472,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -1488,6 +1520,7 @@
     "deliver_npc": 10318,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -1530,6 +1563,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -1572,6 +1606,7 @@
     "deliver_npc": 10338,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -1614,6 +1649,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -1667,6 +1703,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -1709,6 +1746,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -1756,6 +1794,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -1803,6 +1842,7 @@
     "deliver_npc": 10388,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -1845,6 +1885,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -1887,6 +1928,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -1929,6 +1971,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -1971,6 +2014,7 @@
     "deliver_npc": 10428,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -2013,6 +2057,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -2060,6 +2105,7 @@
     "deliver_npc": 10448,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -2102,6 +2148,7 @@
     "deliver_npc": 10458,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -2142,6 +2189,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -2184,6 +2232,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 1,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -2226,6 +2275,7 @@
     "deliver_npc": 10488,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -2268,6 +2318,7 @@
     "deliver_npc": 10498,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -2310,6 +2361,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -2355,6 +2407,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -2395,6 +2448,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -2437,6 +2491,7 @@
     "deliver_npc": 10538,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -2484,6 +2539,7 @@
     "deliver_npc": 10548,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -2526,6 +2582,7 @@
     "deliver_npc": 10558,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -2568,6 +2625,7 @@
     "deliver_npc": 10568,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -2610,6 +2668,7 @@
     "deliver_npc": 10578,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -2652,6 +2711,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -2694,6 +2754,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -2736,6 +2797,7 @@
     "deliver_npc": 10608,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -2778,6 +2840,7 @@
     "deliver_npc": 10618,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -2818,6 +2881,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -2860,6 +2924,7 @@
     "deliver_npc": 10638,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -2907,6 +2972,7 @@
     "deliver_npc": 10648,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -2949,6 +3015,7 @@
     "deliver_npc": 10658,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -2991,6 +3058,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -3033,6 +3101,7 @@
     "deliver_npc": 10678,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -3080,6 +3149,7 @@
     "deliver_npc": 10688,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -3127,6 +3197,7 @@
     "deliver_npc": 10698,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -3169,6 +3240,7 @@
     "deliver_npc": 10708,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -3211,6 +3283,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -3253,6 +3326,7 @@
     "deliver_npc": 10728,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -3295,6 +3369,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -3337,6 +3412,7 @@
     "deliver_npc": 10748,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -3379,6 +3455,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -3421,6 +3498,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -3463,6 +3541,7 @@
     "deliver_npc": 10778,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -3510,6 +3589,7 @@
     "deliver_npc": 10788,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -3552,6 +3632,7 @@
     "deliver_npc": 10798,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -3594,6 +3675,7 @@
     "deliver_npc": 10808,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -3636,6 +3718,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -3678,6 +3761,7 @@
     "deliver_npc": 10828,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -3725,6 +3809,7 @@
     "deliver_npc": 10838,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -3767,6 +3852,7 @@
     "deliver_npc": 10848,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -3814,6 +3900,7 @@
     "deliver_npc": 10858,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -3861,6 +3948,7 @@
     "deliver_npc": 10868,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -3903,6 +3991,7 @@
     "deliver_npc": 10878,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -3945,6 +4034,7 @@
     "deliver_npc": 10888,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -3992,6 +4082,7 @@
     "deliver_npc": 10898,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -4034,6 +4125,7 @@
     "deliver_npc": 10908,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -4076,6 +4168,7 @@
     "deliver_npc": 10918,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -4118,6 +4211,7 @@
     "deliver_npc": 10928,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -4160,6 +4254,7 @@
     "deliver_npc": 10938,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -4202,6 +4297,7 @@
     "deliver_npc": 10948,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -4244,6 +4340,7 @@
     "deliver_npc": 10958,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -4291,6 +4388,7 @@
     "deliver_npc": 10968,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -4333,6 +4431,7 @@
     "deliver_npc": 10978,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -4375,6 +4474,7 @@
     "deliver_npc": 10988,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -4417,6 +4517,7 @@
     "deliver_npc": 10998,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -4459,6 +4560,7 @@
     "deliver_npc": 11008,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -4501,6 +4603,7 @@
     "deliver_npc": 11018,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -4543,6 +4646,7 @@
     "deliver_npc": 11028,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -4585,6 +4689,7 @@
     "deliver_npc": 11038,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -4627,6 +4732,7 @@
     "deliver_npc": 11048,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -4669,6 +4775,7 @@
     "deliver_npc": 11058,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -4711,6 +4818,7 @@
     "deliver_npc": 11068,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -4753,6 +4861,7 @@
     "deliver_npc": 11078,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -4795,6 +4904,7 @@
     "deliver_npc": 11088,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -4837,6 +4947,7 @@
     "deliver_npc": 11098,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -4879,6 +4990,7 @@
     "deliver_npc": 11108,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -4921,6 +5033,7 @@
     "deliver_npc": 11118,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -4963,6 +5076,7 @@
     "deliver_npc": 11128,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -5005,6 +5119,7 @@
     "deliver_npc": 11138,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -5047,6 +5162,7 @@
     "deliver_npc": 11148,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -5089,6 +5205,7 @@
     "deliver_npc": 11158,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -5131,6 +5248,7 @@
     "deliver_npc": 11168,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -5173,6 +5291,7 @@
     "deliver_npc": 11178,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -5215,6 +5334,7 @@
     "deliver_npc": 11188,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -5257,6 +5377,7 @@
     "deliver_npc": 11198,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -5299,6 +5420,7 @@
     "deliver_npc": 50018,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 1,
     "reword": [
       {
@@ -5343,6 +5465,7 @@
     "deliver_npc": 50028,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 1,
     "reword": [
       {
@@ -5387,6 +5510,7 @@
     "deliver_npc": 50038,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 1,
     "reword": [
       {
@@ -5431,6 +5555,7 @@
     "deliver_npc": 50048,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 1,
     "reword": [
       {
@@ -5475,6 +5600,7 @@
     "deliver_npc": 50058,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 1,
     "reword": [
       {
@@ -5517,6 +5643,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -5565,6 +5692,7 @@
     "deliver_npc": 300029,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -5607,6 +5735,7 @@
     "deliver_npc": 300039,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -5649,6 +5778,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -5691,6 +5821,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -5731,6 +5862,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -5771,6 +5903,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -5811,6 +5944,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -5851,6 +5985,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -5891,6 +6026,7 @@
     "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -5933,6 +6069,7 @@
     "deliver_npc": 60018,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -5985,6 +6122,7 @@
     "deliver_npc": 60028,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -6037,6 +6175,7 @@
     "deliver_npc": 60038,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -6089,6 +6228,7 @@
     "deliver_npc": 60048,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -6141,6 +6281,7 @@
     "deliver_npc": 60058,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -6193,6 +6334,7 @@
     "deliver_npc": 60068,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -6245,6 +6387,7 @@
     "deliver_npc": 60078,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -6297,6 +6440,7 @@
     "deliver_npc": 60088,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -6349,6 +6493,7 @@
     "deliver_npc": 60098,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -6401,6 +6546,7 @@
     "deliver_npc": 60108,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -6453,6 +6599,7 @@
     "deliver_npc": 60118,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -6505,6 +6652,7 @@
     "deliver_npc": 60128,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -6557,6 +6705,7 @@
     "deliver_npc": 60138,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -6609,6 +6758,7 @@
     "deliver_npc": 60148,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -6661,6 +6811,7 @@
     "deliver_npc": 60158,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -6713,6 +6864,7 @@
     "deliver_npc": 60168,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -6765,6 +6917,7 @@
     "deliver_npc": 60178,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -6817,6 +6970,7 @@
     "deliver_npc": 60188,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -6869,6 +7023,7 @@
     "deliver_npc": 60198,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -6921,6 +7076,7 @@
     "deliver_npc": 60208,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -6973,6 +7129,7 @@
     "deliver_npc": 60218,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -7025,6 +7182,7 @@
     "deliver_npc": 60228,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -7077,6 +7235,7 @@
     "deliver_npc": 60238,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -7129,6 +7288,7 @@
     "deliver_npc": 60248,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -7181,6 +7341,7 @@
     "deliver_npc": 60258,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -7233,6 +7394,7 @@
     "deliver_npc": 60268,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -7285,6 +7447,7 @@
     "deliver_npc": 60278,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -7337,6 +7500,7 @@
     "deliver_npc": 60288,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -7389,6 +7553,7 @@
     "deliver_npc": 60298,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -7441,6 +7606,7 @@
     "deliver_npc": 60308,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -7493,6 +7659,7 @@
     "deliver_npc": 60318,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -7545,6 +7712,7 @@
     "deliver_npc": 60328,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -7597,6 +7765,7 @@
     "deliver_npc": 60338,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -7649,6 +7818,7 @@
     "deliver_npc": 60348,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -7701,6 +7871,7 @@
     "deliver_npc": 60358,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -7753,6 +7924,7 @@
     "deliver_npc": 60368,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -7805,6 +7977,7 @@
     "deliver_npc": 60378,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -7857,6 +8030,7 @@
     "deliver_npc": 60388,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -7909,6 +8083,7 @@
     "deliver_npc": 60398,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -7961,6 +8136,7 @@
     "deliver_npc": 60408,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -8013,6 +8189,7 @@
     "deliver_npc": 60418,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -8065,6 +8242,7 @@
     "deliver_npc": 60428,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
@@ -8117,6 +8295,7 @@
     "deliver_npc": 60438,
     "taskend_removeitem": [],
     "auto_accept": 0,
+    "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
diff --git a/sys/configure/structs/Game.WorldTaskData.go b/sys/configure/structs/Game.WorldTaskData.go
index f8a9710c7..0c919c0fb 100644
--- a/sys/configure/structs/Game.WorldTaskData.go
+++ b/sys/configure/structs/Game.WorldTaskData.go
@@ -31,6 +31,7 @@ type GameWorldTaskData struct {
     DeliverNpc int32
     TaskendRemoveitem []*Gameatn
     AutoAccept int32
+    Tasktips int32
     LockAdd int32
     Reword []*Gameatn
     Module []string
@@ -102,6 +103,7 @@ func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error)
             }
 
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["auto_accept"].(float64); !_ok_ { err = errors.New("auto_accept error"); return }; _v.AutoAccept = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tasktips"].(float64); !_ok_ { err = errors.New("tasktips error"); return }; _v.Tasktips = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lock_add"].(float64); !_ok_ { err = errors.New("lock_add error"); return }; _v.LockAdd = int32(_tempNum_) }
      {
                 var _arr_ []interface{}