From 67fe6f0867fff7841c60aaac2e910e76beab84f6 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Fri, 2 Dec 2022 20:23:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_rdtaskcondi.json |  38 +++---
 bin/json/game_reddotgroup.json |   7 ++
 bin/json/game_worldtask.json   | 218 ++++++++++++++++-----------------
 3 files changed, 135 insertions(+), 128 deletions(-)

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,

From 3856b46fb170ad525230cf29891c23f88d996ef3 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Fri, 2 Dec 2022 21:57:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_coin.json                       |    4 +-
 bin/json/game_combatlevel.json                |    4 +-
 bin/json/game_drop.json                       |  952 +++++++-
 bin/json/game_gourmet.json                    |   64 +-
 bin/json/game_heromethodcomment.json          |  837 +------
 bin/json/game_horoscope.json                  | 2110 ++++++-----------
 bin/json/game_opencond.json                   |  136 +-
 bin/json/game_smithy.json                     |  858 ++++---
 bin/json/game_taskround.json                  |   20 +-
 sys/configure/structs/Game.BuffType.go        |    8 +
 sys/configure/structs/Game.CombatLevelData.go |    6 +
 .../structs/Game.FightGlobalEvent.go          |   42 +
 .../structs/Game.FightGlobalEventData.go      |   85 +
 sys/configure/structs/Game.Help.go            |   42 +
 sys/configure/structs/Game.HelpData.go        |   39 +
 .../structs/Game.HeroMethodComment.go         |   42 +
 .../structs/Game.HeroMethodCommentData.go     |   37 +
 .../structs/Game.HuntingOpenTimeData.go       |    2 +
 sys/configure/structs/Game.RedDotGroup.go     |   42 +
 sys/configure/structs/Game.RedDotGroupData.go |   43 +
 sys/configure/structs/Game.SkillEffectType.go |    2 +
 sys/configure/structs/Game.TaskCondData.go    |   17 -
 sys/configure/structs/Game.TaskTypeData.go    |    2 -
 sys/configure/structs/Tables.go               | 1989 ++++++++--------
 sys/configure/structs/game.equipData.go       |    2 +
 sys/configure/structs/game.skillAtkData.go    |    2 +
 26 files changed, 3844 insertions(+), 3543 deletions(-)
 create mode 100644 sys/configure/structs/Game.FightGlobalEvent.go
 create mode 100644 sys/configure/structs/Game.FightGlobalEventData.go
 create mode 100644 sys/configure/structs/Game.Help.go
 create mode 100644 sys/configure/structs/Game.HelpData.go
 create mode 100644 sys/configure/structs/Game.HeroMethodComment.go
 create mode 100644 sys/configure/structs/Game.HeroMethodCommentData.go
 create mode 100644 sys/configure/structs/Game.RedDotGroup.go
 create mode 100644 sys/configure/structs/Game.RedDotGroupData.go

diff --git a/bin/json/game_coin.json b/bin/json/game_coin.json
index fc385deb4..48b7cd85d 100644
--- a/bin/json/game_coin.json
+++ b/bin/json/game_coin.json
@@ -46,8 +46,8 @@
     "access": 0,
     "star": 2,
     "race": 0,
-    "img": "hy_icon_jltb",
-    "ico": "hy_icon_jltb",
+    "img": "wp_icon_10014",
+    "ico": "wp_icon_10014",
     "intr": "Currency used to purchase goods",
     "tipstxt": "Insufficient friendship points"
   },
diff --git a/bin/json/game_combatlevel.json b/bin/json/game_combatlevel.json
index eff7cff02..0f95c75c4 100644
--- a/bin/json/game_combatlevel.json
+++ b/bin/json/game_combatlevel.json
@@ -28,7 +28,7 @@
   {
     "id": 10002,
     "scene": "LevelDemo_Fcamer_1_2",
-    "levelname": "Repair Broken Books",
+    "levelname": "Rescue Grug",
     "formatList": [
       101011,
       101021
@@ -55,7 +55,7 @@
   {
     "id": 10003,
     "scene": "LevelDemo_Fcamer_1_3",
-    "levelname": "Rescue Grug",
+    "levelname": "Repair Broken Books",
     "formatList": [],
     "droplist": [
       10101,
diff --git a/bin/json/game_drop.json b/bin/json/game_drop.json
index 4a16005e8..33637bb05 100644
--- a/bin/json/game_drop.json
+++ b/bin/json/game_drop.json
@@ -1179,7 +1179,7 @@
         "n": 1
       }
     ],
-    "star": 0,
+    "star": 1,
     "p": 1000
   },
   {
@@ -1192,7 +1192,7 @@
         "n": 1
       }
     ],
-    "star": 0,
+    "star": 1,
     "p": 1000
   },
   {
@@ -1205,7 +1205,7 @@
         "n": 1
       }
     ],
-    "star": 0,
+    "star": 1,
     "p": 1000
   },
   {
@@ -1218,7 +1218,7 @@
         "n": 1
       }
     ],
-    "star": 0,
+    "star": 1,
     "p": 1000
   },
   {
@@ -1231,7 +1231,7 @@
         "n": 1
       }
     ],
-    "star": 0,
+    "star": 1,
     "p": 1000
   },
   {
@@ -1244,7 +1244,7 @@
         "n": 1
       }
     ],
-    "star": 0,
+    "star": 1,
     "p": 1000
   },
   {
@@ -1257,7 +1257,7 @@
         "n": 1
       }
     ],
-    "star": 0,
+    "star": 1,
     "p": 1000
   },
   {
@@ -1270,7 +1270,943 @@
         "n": 1
       }
     ],
-    "star": 0,
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 99,
+    "dropid": 70001,
+    "prize": [
+      {
+        "a": "item",
+        "t": "50001",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 100,
+    "dropid": 70001,
+    "prize": [
+      {
+        "a": "item",
+        "t": "50005",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 250
+  },
+  {
+    "id": 101,
+    "dropid": 70001,
+    "prize": [
+      {
+        "a": "item",
+        "t": "50009",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 67
+  },
+  {
+    "id": 102,
+    "dropid": 70002,
+    "prize": [
+      {
+        "a": "item",
+        "t": "50002",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 103,
+    "dropid": 70002,
+    "prize": [
+      {
+        "a": "item",
+        "t": "50006",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 250
+  },
+  {
+    "id": 104,
+    "dropid": 70002,
+    "prize": [
+      {
+        "a": "item",
+        "t": "50010",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 67
+  },
+  {
+    "id": 105,
+    "dropid": 70003,
+    "prize": [
+      {
+        "a": "item",
+        "t": "50003",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 106,
+    "dropid": 70003,
+    "prize": [
+      {
+        "a": "item",
+        "t": "50007",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 250
+  },
+  {
+    "id": 107,
+    "dropid": 70003,
+    "prize": [
+      {
+        "a": "item",
+        "t": "50011",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 67
+  },
+  {
+    "id": 108,
+    "dropid": 70004,
+    "prize": [
+      {
+        "a": "item",
+        "t": "50004",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 109,
+    "dropid": 70004,
+    "prize": [
+      {
+        "a": "item",
+        "t": "50008",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 250
+  },
+  {
+    "id": 110,
+    "dropid": 70004,
+    "prize": [
+      {
+        "a": "item",
+        "t": "50012",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 67
+  },
+  {
+    "id": 111,
+    "dropid": 80001,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10001",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 112,
+    "dropid": 80001,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10002",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 113,
+    "dropid": 80001,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10003",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 114,
+    "dropid": 80001,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10004",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 115,
+    "dropid": 80001,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10005",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 116,
+    "dropid": 80001,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10006",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 117,
+    "dropid": 80002,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10004",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 118,
+    "dropid": 80002,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10005",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 119,
+    "dropid": 80002,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10006",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 120,
+    "dropid": 80002,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10011",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 121,
+    "dropid": 80002,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10012",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 122,
+    "dropid": 80002,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10013",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 123,
+    "dropid": 80003,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10011",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 124,
+    "dropid": 80003,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10012",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 125,
+    "dropid": 80003,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10013",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 126,
+    "dropid": 80003,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10014",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 127,
+    "dropid": 80003,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10015",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 128,
+    "dropid": 80003,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10016",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 129,
+    "dropid": 80004,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10014",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 130,
+    "dropid": 80004,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10015",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 131,
+    "dropid": 80004,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10016",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 132,
+    "dropid": 80004,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10021",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 133,
+    "dropid": 80004,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10022",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 134,
+    "dropid": 80004,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10023",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 135,
+    "dropid": 80005,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10021",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 136,
+    "dropid": 80005,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10022",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 137,
+    "dropid": 80005,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10023",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 138,
+    "dropid": 80005,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10024",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 139,
+    "dropid": 80005,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10025",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 140,
+    "dropid": 80005,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10026",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 141,
+    "dropid": 80006,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10024",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 142,
+    "dropid": 80006,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10025",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 143,
+    "dropid": 80006,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10026",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 144,
+    "dropid": 80006,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10031",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 145,
+    "dropid": 80006,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10032",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 146,
+    "dropid": 80006,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10033",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 147,
+    "dropid": 80007,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10031",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 148,
+    "dropid": 80007,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10032",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 149,
+    "dropid": 80007,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10033",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 150,
+    "dropid": 80007,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10034",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 151,
+    "dropid": 80007,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10035",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 152,
+    "dropid": 80007,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10036",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 153,
+    "dropid": 80008,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10034",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 154,
+    "dropid": 80008,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10035",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 155,
+    "dropid": 80008,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10036",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 156,
+    "dropid": 80008,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10041",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 157,
+    "dropid": 80008,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10042",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 158,
+    "dropid": 80008,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10043",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 159,
+    "dropid": 80009,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10041",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 160,
+    "dropid": 80009,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10042",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 161,
+    "dropid": 80009,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10043",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 162,
+    "dropid": 80009,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10044",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 163,
+    "dropid": 80009,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10045",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 164,
+    "dropid": 80009,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10046",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 165,
+    "dropid": 80010,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10051",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 166,
+    "dropid": 80010,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10052",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 167,
+    "dropid": 80010,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10053",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 168,
+    "dropid": 80010,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10054",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 169,
+    "dropid": 80010,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10055",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 170,
+    "dropid": 80010,
+    "prize": [
+      {
+        "a": "equi",
+        "t": "10056",
+        "n": 1
+      }
+    ],
+    "star": 1,
     "p": 1000
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_gourmet.json b/bin/json/game_gourmet.json
index 9f17a005d..6dd598d28 100644
--- a/bin/json/game_gourmet.json
+++ b/bin/json/game_gourmet.json
@@ -62,7 +62,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70001,
     "skill_description": {
       "key": "",
       "text": ""
@@ -131,7 +131,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70001,
     "skill_description": {
       "key": "",
       "text": ""
@@ -200,7 +200,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70001,
     "skill_description": {
       "key": "",
       "text": ""
@@ -269,7 +269,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70001,
     "skill_description": {
       "key": "",
       "text": ""
@@ -338,7 +338,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70001,
     "skill_description": {
       "key": "",
       "text": ""
@@ -407,7 +407,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70001,
     "skill_description": {
       "key": "",
       "text": ""
@@ -476,7 +476,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70001,
     "skill_description": {
       "key": "",
       "text": ""
@@ -545,7 +545,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70001,
     "skill_description": {
       "key": "",
       "text": ""
@@ -614,7 +614,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70002,
     "skill_description": {
       "key": "",
       "text": ""
@@ -683,7 +683,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70002,
     "skill_description": {
       "key": "",
       "text": ""
@@ -752,7 +752,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70002,
     "skill_description": {
       "key": "",
       "text": ""
@@ -821,7 +821,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70002,
     "skill_description": {
       "key": "",
       "text": ""
@@ -890,7 +890,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70002,
     "skill_description": {
       "key": "",
       "text": ""
@@ -959,7 +959,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70002,
     "skill_description": {
       "key": "",
       "text": ""
@@ -1028,7 +1028,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70002,
     "skill_description": {
       "key": "",
       "text": ""
@@ -1097,7 +1097,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70002,
     "skill_description": {
       "key": "",
       "text": ""
@@ -1166,7 +1166,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70003,
     "skill_description": {
       "key": "",
       "text": ""
@@ -1235,7 +1235,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70003,
     "skill_description": {
       "key": "",
       "text": ""
@@ -1304,7 +1304,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70003,
     "skill_description": {
       "key": "",
       "text": ""
@@ -1373,7 +1373,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70003,
     "skill_description": {
       "key": "",
       "text": ""
@@ -1442,7 +1442,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70003,
     "skill_description": {
       "key": "",
       "text": ""
@@ -1511,7 +1511,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70003,
     "skill_description": {
       "key": "",
       "text": ""
@@ -1580,7 +1580,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70003,
     "skill_description": {
       "key": "",
       "text": ""
@@ -1649,7 +1649,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70003,
     "skill_description": {
       "key": "",
       "text": ""
@@ -1718,7 +1718,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70004,
     "skill_description": {
       "key": "",
       "text": ""
@@ -1787,7 +1787,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70004,
     "skill_description": {
       "key": "",
       "text": ""
@@ -1856,7 +1856,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70004,
     "skill_description": {
       "key": "",
       "text": ""
@@ -1925,7 +1925,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70004,
     "skill_description": {
       "key": "",
       "text": ""
@@ -1994,7 +1994,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70004,
     "skill_description": {
       "key": "",
       "text": ""
@@ -2063,7 +2063,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70004,
     "skill_description": {
       "key": "",
       "text": ""
@@ -2132,7 +2132,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70004,
     "skill_description": {
       "key": "",
       "text": ""
@@ -2201,7 +2201,7 @@
       }
     ],
     "using": 1,
-    "propsgroup": 1001,
+    "propsgroup": 70004,
     "skill_description": {
       "key": "",
       "text": ""
diff --git a/bin/json/game_heromethodcomment.json b/bin/json/game_heromethodcomment.json
index 7c2986bf1..87e0e65b3 100644
--- a/bin/json/game_heromethodcomment.json
+++ b/bin/json/game_heromethodcomment.json
@@ -3,882 +3,63 @@
     "id": 101,
     "comment": {
       "key": "surname_10001",
-      "text": "愤怒的"
+      "text": "这英雄速度有什么要求吗？"
     }
   },
   {
     "id": 102,
     "comment": {
       "key": "surname_10002",
-      "text": "快乐的"
+      "text": "我的评价是不如阿宝..."
     }
   },
   {
     "id": 103,
     "comment": {
       "key": "surname_10003",
-      "text": "忧伤的"
+      "text": "这英雄一波流打不了BOSS，竞技场好用~"
     }
   },
   {
     "id": 104,
     "comment": {
       "key": "surname_10004",
-      "text": "吵闹的"
+      "text": "很强，已拉满！"
     }
   },
   {
     "id": 105,
     "comment": {
       "key": "surname_10005",
-      "text": "喜悦的"
+      "text": "新副本用它，可以配合师父打伤害。"
     }
   },
   {
     "id": 106,
     "comment": {
       "key": "surname_10006",
-      "text": "悲伤的"
+      "text": "平民英雄，好养。"
     }
   },
   {
     "id": 107,
     "comment": {
       "key": "surname_10007",
-      "text": "难过的"
+      "text": "很多人说他不强，你装备满了吗？技能满了吗？拉满不强你举报我！"
     }
   },
   {
     "id": 108,
     "comment": {
       "key": "surname_10008",
-      "text": "兴奋的"
+      "text": "点赞好人一生平安~"
     }
   },
   {
     "id": 109,
     "comment": {
       "key": "surname_10009",
-      "text": "潇洒的"
-    }
-  },
-  {
-    "id": 110,
-    "comment": {
-      "key": "surname_10010",
-      "text": "开心的"
-    }
-  },
-  {
-    "id": 111,
-    "comment": {
-      "key": "surname_10011",
-      "text": "幸运的"
-    }
-  },
-  {
-    "id": 112,
-    "comment": {
-      "key": "surname_10012",
-      "text": "欢喜的"
-    }
-  },
-  {
-    "id": 113,
-    "comment": {
-      "key": "surname_10013",
-      "text": "愉快的"
-    }
-  },
-  {
-    "id": 114,
-    "comment": {
-      "key": "surname_10014",
-      "text": "神奇的"
-    }
-  },
-  {
-    "id": 115,
-    "comment": {
-      "key": "surname_10015",
-      "text": "刻苦的"
-    }
-  },
-  {
-    "id": 116,
-    "comment": {
-      "key": "surname_10016",
-      "text": "进步的"
-    }
-  },
-  {
-    "id": 117,
-    "comment": {
-      "key": "surname_10017",
-      "text": "业余的"
-    }
-  },
-  {
-    "id": 118,
-    "comment": {
-      "key": "surname_10018",
-      "text": "友好的"
-    }
-  },
-  {
-    "id": 119,
-    "comment": {
-      "key": "surname_10019",
-      "text": "着急的"
-    }
-  },
-  {
-    "id": 120,
-    "comment": {
-      "key": "surname_10020",
-      "text": "友爱的"
-    }
-  },
-  {
-    "id": 121,
-    "comment": {
-      "key": "surname_10021",
-      "text": "聪明的"
-    }
-  },
-  {
-    "id": 122,
-    "comment": {
-      "key": "surname_10022",
-      "text": "细心的"
-    }
-  },
-  {
-    "id": 123,
-    "comment": {
-      "key": "surname_10023",
-      "text": "冰冷的"
-    }
-  },
-  {
-    "id": 124,
-    "comment": {
-      "key": "surname_10024",
-      "text": "无知的"
-    }
-  },
-  {
-    "id": 125,
-    "comment": {
-      "key": "surname_10025",
-      "text": "秀美的"
-    }
-  },
-  {
-    "id": 126,
-    "comment": {
-      "key": "surname_10026",
-      "text": "活泼的"
-    }
-  },
-  {
-    "id": 127,
-    "comment": {
-      "key": "surname_10027",
-      "text": "害羞的"
-    }
-  },
-  {
-    "id": 128,
-    "comment": {
-      "key": "surname_10028",
-      "text": "热情的"
-    }
-  },
-  {
-    "id": 129,
-    "comment": {
-      "key": "surname_10029",
-      "text": "开朗的"
-    }
-  },
-  {
-    "id": 130,
-    "comment": {
-      "key": "surname_10030",
-      "text": "唠叨的"
-    }
-  },
-  {
-    "id": 131,
-    "comment": {
-      "key": "surname_10031",
-      "text": "糊涂的"
-    }
-  },
-  {
-    "id": 132,
-    "comment": {
-      "key": "surname_10032",
-      "text": "飞驰的"
-    }
-  },
-  {
-    "id": 133,
-    "comment": {
-      "key": "surname_10033",
-      "text": "职业的"
-    }
-  },
-  {
-    "id": 134,
-    "comment": {
-      "key": "surname_10034",
-      "text": "迟缓的"
-    }
-  },
-  {
-    "id": 135,
-    "comment": {
-      "key": "surname_10035",
-      "text": "迷茫的"
-    }
-  },
-  {
-    "id": 136,
-    "comment": {
-      "key": "surname_10036",
-      "text": "优秀的"
-    }
-  },
-  {
-    "id": 137,
-    "comment": {
-      "key": "surname_10037",
-      "text": "火红的"
-    }
-  },
-  {
-    "id": 138,
-    "comment": {
-      "key": "surname_10038",
-      "text": "好动的"
-    }
-  },
-  {
-    "id": 139,
-    "comment": {
-      "key": "surname_10039",
-      "text": "行走的"
-    }
-  },
-  {
-    "id": 140,
-    "comment": {
-      "key": "surname_10040",
-      "text": "欢闹的"
-    }
-  },
-  {
-    "id": 141,
-    "comment": {
-      "key": "surname_10041",
-      "text": "风度的"
-    }
-  },
-  {
-    "id": 142,
-    "comment": {
-      "key": "surname_10042",
-      "text": "柔韧的"
-    }
-  },
-  {
-    "id": 143,
-    "comment": {
-      "key": "surname_10043",
-      "text": "温柔的"
-    }
-  },
-  {
-    "id": 144,
-    "comment": {
-      "key": "surname_10044",
-      "text": "美丽的"
-    }
-  },
-  {
-    "id": 145,
-    "comment": {
-      "key": "surname_10045",
-      "text": "高雅的"
-    }
-  },
-  {
-    "id": 146,
-    "comment": {
-      "key": "surname_10046",
-      "text": "洋气的"
-    }
-  },
-  {
-    "id": 147,
-    "comment": {
-      "key": "surname_10047",
-      "text": "恬静的"
-    }
-  },
-  {
-    "id": 148,
-    "comment": {
-      "key": "surname_10048",
-      "text": "大方的"
-    }
-  },
-  {
-    "id": 149,
-    "comment": {
-      "key": "surname_10049",
-      "text": "端庄的"
-    }
-  },
-  {
-    "id": 150,
-    "comment": {
-      "key": "surname_10050",
-      "text": "秀气的"
-    }
-  },
-  {
-    "id": 151,
-    "comment": {
-      "key": "surname_10051",
-      "text": "清秀的"
-    }
-  },
-  {
-    "id": 152,
-    "comment": {
-      "key": "surname_10052",
-      "text": "妩媚的"
-    }
-  },
-  {
-    "id": 153,
-    "comment": {
-      "key": "surname_10053",
-      "text": "轩昂的"
-    }
-  },
-  {
-    "id": 154,
-    "comment": {
-      "key": "surname_10054",
-      "text": "迷人的"
-    }
-  },
-  {
-    "id": 155,
-    "comment": {
-      "key": "surname_10055",
-      "text": "淡定的"
-    }
-  },
-  {
-    "id": 156,
-    "comment": {
-      "key": "surname_10056",
-      "text": "畅快的"
-    }
-  },
-  {
-    "id": 157,
-    "comment": {
-      "key": "surname_10057",
-      "text": "坚强的"
-    }
-  },
-  {
-    "id": 158,
-    "comment": {
-      "key": "surname_10058",
-      "text": "甜美的"
-    }
-  },
-  {
-    "id": 159,
-    "comment": {
-      "key": "surname_10059",
-      "text": "爽朗的"
-    }
-  },
-  {
-    "id": 160,
-    "comment": {
-      "key": "surname_10060",
-      "text": "安然的"
-    }
-  },
-  {
-    "id": 161,
-    "comment": {
-      "key": "surname_10061",
-      "text": "文雅的"
-    }
-  },
-  {
-    "id": 162,
-    "comment": {
-      "key": "surname_10062",
-      "text": "悠然的"
-    }
-  },
-  {
-    "id": 163,
-    "comment": {
-      "key": "surname_10063",
-      "text": "宁静的"
-    }
-  },
-  {
-    "id": 164,
-    "comment": {
-      "key": "surname_10064",
-      "text": "沮丧的"
-    }
-  },
-  {
-    "id": 165,
-    "comment": {
-      "key": "surname_10065",
-      "text": "从容的"
-    }
-  },
-  {
-    "id": 166,
-    "comment": {
-      "key": "surname_10066",
-      "text": "随和的"
-    }
-  },
-  {
-    "id": 167,
-    "comment": {
-      "key": "surname_10067",
-      "text": "坦荡的"
-    }
-  },
-  {
-    "id": 168,
-    "comment": {
-      "key": "surname_10068",
-      "text": "随性的"
-    }
-  },
-  {
-    "id": 169,
-    "comment": {
-      "key": "surname_10069",
-      "text": "红润的"
-    }
-  },
-  {
-    "id": 170,
-    "comment": {
-      "key": "surname_10070",
-      "text": "傲骨的"
-    }
-  },
-  {
-    "id": 171,
-    "comment": {
-      "key": "surname_10071",
-      "text": "欣喜的"
-    }
-  },
-  {
-    "id": 172,
-    "comment": {
-      "key": "surname_10072",
-      "text": "宽容的"
-    }
-  },
-  {
-    "id": 173,
-    "comment": {
-      "key": "surname_10073",
-      "text": "大气的"
-    }
-  },
-  {
-    "id": 174,
-    "comment": {
-      "key": "surname_10074",
-      "text": "厚道的"
-    }
-  },
-  {
-    "id": 175,
-    "comment": {
-      "key": "surname_10075",
-      "text": "王者的"
-    }
-  },
-  {
-    "id": 176,
-    "comment": {
-      "key": "surname_10076",
-      "text": "羞涩的"
-    }
-  },
-  {
-    "id": 177,
-    "comment": {
-      "key": "surname_10077",
-      "text": "尽情的"
-    }
-  },
-  {
-    "id": 178,
-    "comment": {
-      "key": "surname_10078",
-      "text": "激奋的"
-    }
-  },
-  {
-    "id": 179,
-    "comment": {
-      "key": "surname_10079",
-      "text": "俊美的"
-    }
-  },
-  {
-    "id": 180,
-    "comment": {
-      "key": "surname_10080",
-      "text": "朴素的"
-    }
-  },
-  {
-    "id": 181,
-    "comment": {
-      "key": "surname_10081",
-      "text": "庄重的"
-    }
-  },
-  {
-    "id": 182,
-    "comment": {
-      "key": "surname_10082",
-      "text": "和谐的"
-    }
-  },
-  {
-    "id": 183,
-    "comment": {
-      "key": "surname_10083",
-      "text": "坦然的"
-    }
-  },
-  {
-    "id": 184,
-    "comment": {
-      "key": "surname_10084",
-      "text": "苗条的"
-    }
-  },
-  {
-    "id": 185,
-    "comment": {
-      "key": "surname_10085",
-      "text": "可人的"
-    }
-  },
-  {
-    "id": 186,
-    "comment": {
-      "key": "surname_10086",
-      "text": "青春的"
-    }
-  },
-  {
-    "id": 187,
-    "comment": {
-      "key": "surname_10087",
-      "text": "激昂的"
-    }
-  },
-  {
-    "id": 188,
-    "comment": {
-      "key": "surname_10088",
-      "text": "小巧的"
-    }
-  },
-  {
-    "id": 189,
-    "comment": {
-      "key": "surname_10089",
-      "text": "踊跃的"
-    }
-  },
-  {
-    "id": 190,
-    "comment": {
-      "key": "surname_10090",
-      "text": "可爱的"
-    }
-  },
-  {
-    "id": 191,
-    "comment": {
-      "key": "surname_10091",
-      "text": "帅气的"
-    }
-  },
-  {
-    "id": 192,
-    "comment": {
-      "key": "surname_10092",
-      "text": "不凡的"
-    }
-  },
-  {
-    "id": 193,
-    "comment": {
-      "key": "surname_10093",
-      "text": "激情的"
-    }
-  },
-  {
-    "id": 194,
-    "comment": {
-      "key": "surname_10094",
-      "text": "慈祥的"
-    }
-  },
-  {
-    "id": 195,
-    "comment": {
-      "key": "surname_10095",
-      "text": "整洁的"
-    }
-  },
-  {
-    "id": 196,
-    "comment": {
-      "key": "surname_10096",
-      "text": "认真的"
-    }
-  },
-  {
-    "id": 197,
-    "comment": {
-      "key": "surname_10097",
-      "text": "情调的"
-    }
-  },
-  {
-    "id": 198,
-    "comment": {
-      "key": "surname_10098",
-      "text": "海涵的"
-    }
-  },
-  {
-    "id": 199,
-    "comment": {
-      "key": "surname_10099",
-      "text": "善良的"
-    }
-  },
-  {
-    "id": 200,
-    "comment": {
-      "key": "surname_10100",
-      "text": "娇美的"
-    }
-  },
-  {
-    "id": 201,
-    "comment": {
-      "key": "surname_10101",
-      "text": "妖媚的"
-    }
-  },
-  {
-    "id": 202,
-    "comment": {
-      "key": "surname_10102",
-      "text": "冷魅的"
-    }
-  },
-  {
-    "id": 203,
-    "comment": {
-      "key": "surname_10103",
-      "text": "雍容的"
-    }
-  },
-  {
-    "id": 204,
-    "comment": {
-      "key": "surname_10104",
-      "text": "儒雅的"
-    }
-  },
-  {
-    "id": 205,
-    "comment": {
-      "key": "surname_10105",
-      "text": "敬佩的"
-    }
-  },
-  {
-    "id": 206,
-    "comment": {
-      "key": "surname_10106",
-      "text": "时髦的"
-    }
-  },
-  {
-    "id": 207,
-    "comment": {
-      "key": "surname_10107",
-      "text": "无邪的"
-    }
-  },
-  {
-    "id": 208,
-    "comment": {
-      "key": "surname_10108",
-      "text": "娇媚的"
-    }
-  },
-  {
-    "id": 209,
-    "comment": {
-      "key": "surname_10109",
-      "text": "绝美的"
-    }
-  },
-  {
-    "id": 210,
-    "comment": {
-      "key": "surname_10110",
-      "text": "邪魅的"
-    }
-  },
-  {
-    "id": 211,
-    "comment": {
-      "key": "surname_10111",
-      "text": "佩服的"
-    }
-  },
-  {
-    "id": 212,
-    "comment": {
-      "key": "surname_10112",
-      "text": "白皙的"
-    }
-  },
-  {
-    "id": 213,
-    "comment": {
-      "key": "surname_10113",
-      "text": "摩登的"
-    }
-  },
-  {
-    "id": 214,
-    "comment": {
-      "key": "surname_10114",
-      "text": "结实的"
-    }
-  },
-  {
-    "id": 215,
-    "comment": {
-      "key": "surname_10115",
-      "text": "率性的"
-    }
-  },
-  {
-    "id": 216,
-    "comment": {
-      "key": "surname_10116",
-      "text": "娇艳的"
-    }
-  },
-  {
-    "id": 217,
-    "comment": {
-      "key": "surname_10117",
-      "text": "素雅的"
-    }
-  },
-  {
-    "id": 218,
-    "comment": {
-      "key": "surname_10118",
-      "text": "惆怅的"
-    }
-  },
-  {
-    "id": 219,
-    "comment": {
-      "key": "surname_10119",
-      "text": "欢畅的"
-    }
-  },
-  {
-    "id": 220,
-    "comment": {
-      "key": "surname_10120",
-      "text": "崇拜的"
-    }
-  },
-  {
-    "id": 221,
-    "comment": {
-      "key": "surname_10121",
-      "text": "漂亮的"
-    }
-  },
-  {
-    "id": 222,
-    "comment": {
-      "key": "surname_10122",
-      "text": "艳丽的"
-    }
-  },
-  {
-    "id": 223,
-    "comment": {
-      "key": "surname_10123",
-      "text": "淡雅的"
-    }
-  },
-  {
-    "id": 224,
-    "comment": {
-      "key": "surname_10124",
-      "text": "倾城的"
-    }
-  },
-  {
-    "id": 225,
-    "comment": {
-      "key": "surname_10125",
-      "text": "光滑的"
-    }
-  },
-  {
-    "id": 226,
-    "comment": {
-      "key": "surname_10126",
-      "text": "巧嘴的"
+      "text": "怎么又抽到它了，求求你别来了！"
     }
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_horoscope.json b/bin/json/game_horoscope.json
index 0a6e44603..47608ab12 100644
--- a/bin/json/game_horoscope.json
+++ b/bin/json/game_horoscope.json
@@ -32,10 +32,6 @@
       {
         "a": "atk",
         "n": 0
-      },
-      {
-        "a": "atkpro",
-        "n": 0
       }
     ],
     "position": "11001|1001",
@@ -74,11 +70,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "n": 10
       }
     ],
     "position": "11001|1001",
@@ -117,11 +109,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "n": 20
       }
     ],
     "position": "11001|1001",
@@ -160,11 +148,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "n": 30
       }
     ],
     "position": "11001|1001",
@@ -203,11 +187,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "n": 40
       }
     ],
     "position": "11001|1001",
@@ -246,11 +226,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 70
+        "n": 50
       },
       {
         "a": "atkpro",
-        "n": 700
+        "n": 15
       }
     ],
     "position": "11001|1001",
@@ -289,11 +269,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 80
+        "n": 60
       },
       {
         "a": "atkpro",
-        "n": 800
+        "n": 22
       }
     ],
     "position": "11001|1001",
@@ -332,11 +312,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 90
+        "n": 70
       },
       {
         "a": "atkpro",
-        "n": 900
+        "n": 29
       }
     ],
     "position": "11001|1001",
@@ -375,11 +355,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 100
+        "n": 80
       },
       {
         "a": "atkpro",
-        "n": 1000
+        "n": 36
       }
     ],
     "position": "11001|1001",
@@ -418,11 +398,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 110
+        "n": 90
       },
       {
         "a": "atkpro",
-        "n": 1100
+        "n": 43
       }
     ],
     "position": "11001|1001",
@@ -455,11 +435,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 120
+        "n": 100
       },
       {
         "a": "atkpro",
-        "n": 1200
+        "n": 50
       }
     ],
     "position": "11001|1001",
@@ -497,11 +477,7 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 0
-      },
-      {
-        "a": "atkpro",
+        "a": "def",
         "n": 0
       }
     ],
@@ -540,12 +516,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "a": "def",
+        "n": 10
       }
     ],
     "position": "11001|1002",
@@ -583,12 +555,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "a": "def",
+        "n": 20
       }
     ],
     "position": "11001|1002",
@@ -626,12 +594,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "a": "def",
+        "n": 30
       }
     ],
     "position": "11001|1002",
@@ -669,12 +633,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "a": "def",
+        "n": 40
       }
     ],
     "position": "11001|1002",
@@ -712,12 +672,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 70
+        "a": "def",
+        "n": 50
       },
       {
-        "a": "atkpro",
-        "n": 700
+        "a": "defpro",
+        "n": 15
       }
     ],
     "position": "11001|1002",
@@ -755,12 +715,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 80
+        "a": "def",
+        "n": 60
       },
       {
-        "a": "atkpro",
-        "n": 800
+        "a": "defpro",
+        "n": 22
       }
     ],
     "position": "11001|1002",
@@ -798,12 +758,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 90
+        "a": "def",
+        "n": 70
       },
       {
-        "a": "atkpro",
-        "n": 900
+        "a": "defpro",
+        "n": 29
       }
     ],
     "position": "11001|1002",
@@ -841,12 +801,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 100
+        "a": "def",
+        "n": 80
       },
       {
-        "a": "atkpro",
-        "n": 1000
+        "a": "defpro",
+        "n": 36
       }
     ],
     "position": "11001|1002",
@@ -884,12 +844,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 110
+        "a": "def",
+        "n": 90
       },
       {
-        "a": "atkpro",
-        "n": 1100
+        "a": "defpro",
+        "n": 43
       }
     ],
     "position": "11001|1002",
@@ -921,12 +881,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 120
+        "a": "def",
+        "n": 100
       },
       {
-        "a": "atkpro",
-        "n": 1200
+        "a": "defpro",
+        "n": 50
       }
     ],
     "position": "11001|1002",
@@ -964,11 +924,7 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 0
-      },
-      {
-        "a": "atkpro",
+        "a": "hp",
         "n": 0
       }
     ],
@@ -1007,12 +963,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "a": "hp",
+        "n": 10
       }
     ],
     "position": "11001|1003",
@@ -1050,12 +1002,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "a": "hp",
+        "n": 20
       }
     ],
     "position": "11001|1003",
@@ -1093,12 +1041,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "a": "hp",
+        "n": 30
       }
     ],
     "position": "11001|1003",
@@ -1136,12 +1080,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "a": "hp",
+        "n": 40
       }
     ],
     "position": "11001|1003",
@@ -1179,12 +1119,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 70
+        "a": "hp",
+        "n": 50
       },
       {
-        "a": "atkpro",
-        "n": 700
+        "a": "hppro",
+        "n": 15
       }
     ],
     "position": "11001|1003",
@@ -1222,12 +1162,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 80
+        "a": "hp",
+        "n": 60
       },
       {
-        "a": "atkpro",
-        "n": 800
+        "a": "hppro",
+        "n": 22
       }
     ],
     "position": "11001|1003",
@@ -1265,12 +1205,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 90
+        "a": "hp",
+        "n": 70
       },
       {
-        "a": "atkpro",
-        "n": 900
+        "a": "hppro",
+        "n": 29
       }
     ],
     "position": "11001|1003",
@@ -1308,12 +1248,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 100
+        "a": "hp",
+        "n": 80
       },
       {
-        "a": "atkpro",
-        "n": 1000
+        "a": "hppro",
+        "n": 36
       }
     ],
     "position": "11001|1003",
@@ -1351,12 +1291,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 110
+        "a": "hp",
+        "n": 90
       },
       {
-        "a": "atkpro",
-        "n": 1100
+        "a": "hppro",
+        "n": 43
       }
     ],
     "position": "11001|1003",
@@ -1388,12 +1328,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 120
+        "a": "hp",
+        "n": 100
       },
       {
-        "a": "atkpro",
-        "n": 1200
+        "a": "hppro",
+        "n": 50
       }
     ],
     "position": "11001|1003",
@@ -1433,10 +1373,6 @@
       {
         "a": "atk",
         "n": 0
-      },
-      {
-        "a": "atkpro",
-        "n": 0
       }
     ],
     "position": "11001|1004",
@@ -1475,11 +1411,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "n": 10
       }
     ],
     "position": "11001|1004",
@@ -1518,11 +1450,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "n": 20
       }
     ],
     "position": "11001|1004",
@@ -1561,11 +1489,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "n": 30
       }
     ],
     "position": "11001|1004",
@@ -1604,11 +1528,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "n": 40
       }
     ],
     "position": "11001|1004",
@@ -1641,11 +1561,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 70
-      },
-      {
-        "a": "atkpro",
-        "n": 700
+        "n": 50
       }
     ],
     "position": "11001|1004",
@@ -1683,11 +1599,7 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 0
-      },
-      {
-        "a": "atkpro",
+        "a": "def",
         "n": 0
       }
     ],
@@ -1726,12 +1638,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "a": "def",
+        "n": 10
       }
     ],
     "position": "11001|1005",
@@ -1769,12 +1677,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "a": "def",
+        "n": 20
       }
     ],
     "position": "11001|1005",
@@ -1812,12 +1716,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "a": "def",
+        "n": 30
       }
     ],
     "position": "11001|1005",
@@ -1855,12 +1755,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "a": "def",
+        "n": 40
       }
     ],
     "position": "11001|1005",
@@ -1898,12 +1794,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 70
+        "a": "def",
+        "n": 50
       },
       {
-        "a": "atkpro",
-        "n": 700
+        "a": "defpro",
+        "n": 15
       }
     ],
     "position": "11001|1005",
@@ -1941,12 +1837,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 80
+        "a": "def",
+        "n": 60
       },
       {
-        "a": "atkpro",
-        "n": 800
+        "a": "defpro",
+        "n": 22
       }
     ],
     "position": "11001|1005",
@@ -1984,12 +1880,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 90
+        "a": "def",
+        "n": 70
       },
       {
-        "a": "atkpro",
-        "n": 900
+        "a": "defpro",
+        "n": 29
       }
     ],
     "position": "11001|1005",
@@ -2027,12 +1923,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 100
+        "a": "def",
+        "n": 80
       },
       {
-        "a": "atkpro",
-        "n": 1000
+        "a": "defpro",
+        "n": 36
       }
     ],
     "position": "11001|1005",
@@ -2070,12 +1966,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 110
+        "a": "def",
+        "n": 90
       },
       {
-        "a": "atkpro",
-        "n": 1100
+        "a": "defpro",
+        "n": 43
       }
     ],
     "position": "11001|1005",
@@ -2107,12 +2003,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 120
+        "a": "def",
+        "n": 100
       },
       {
-        "a": "atkpro",
-        "n": 1200
+        "a": "defpro",
+        "n": 50
       }
     ],
     "position": "11001|1005",
@@ -2150,11 +2046,7 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 0
-      },
-      {
-        "a": "atkpro",
+        "a": "hp",
         "n": 0
       }
     ],
@@ -2193,12 +2085,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "a": "hp",
+        "n": 10
       }
     ],
     "position": "11001|1006",
@@ -2236,12 +2124,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "a": "hp",
+        "n": 20
       }
     ],
     "position": "11001|1006",
@@ -2279,12 +2163,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "a": "hp",
+        "n": 30
       }
     ],
     "position": "11001|1006",
@@ -2322,12 +2202,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "a": "hp",
+        "n": 40
       }
     ],
     "position": "11001|1006",
@@ -2365,12 +2241,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 70
+        "a": "hp",
+        "n": 50
       },
       {
-        "a": "atkpro",
-        "n": 700
+        "a": "hppro",
+        "n": 15
       }
     ],
     "position": "11001|1006",
@@ -2408,12 +2284,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 80
+        "a": "hp",
+        "n": 60
       },
       {
-        "a": "atkpro",
-        "n": 800
+        "a": "hppro",
+        "n": 22
       }
     ],
     "position": "11001|1006",
@@ -2451,12 +2327,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 90
+        "a": "hp",
+        "n": 70
       },
       {
-        "a": "atkpro",
-        "n": 900
+        "a": "hppro",
+        "n": 29
       }
     ],
     "position": "11001|1006",
@@ -2494,12 +2370,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 100
+        "a": "hp",
+        "n": 80
       },
       {
-        "a": "atkpro",
-        "n": 1000
+        "a": "hppro",
+        "n": 36
       }
     ],
     "position": "11001|1006",
@@ -2537,12 +2413,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 110
+        "a": "hp",
+        "n": 90
       },
       {
-        "a": "atkpro",
-        "n": 1100
+        "a": "hppro",
+        "n": 43
       }
     ],
     "position": "11001|1006",
@@ -2574,12 +2450,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 120
+        "a": "hp",
+        "n": 100
       },
       {
-        "a": "atkpro",
-        "n": 1200
+        "a": "hppro",
+        "n": 50
       }
     ],
     "position": "11001|1006",
@@ -2619,10 +2495,6 @@
       {
         "a": "atk",
         "n": 0
-      },
-      {
-        "a": "atkpro",
-        "n": 0
       }
     ],
     "position": "11001|1007",
@@ -2661,11 +2533,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "n": 10
       }
     ],
     "position": "11001|1007",
@@ -2704,11 +2572,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "n": 20
       }
     ],
     "position": "11001|1007",
@@ -2747,11 +2611,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "n": 30
       }
     ],
     "position": "11001|1007",
@@ -2790,11 +2650,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "n": 40
       }
     ],
     "position": "11001|1007",
@@ -2827,11 +2683,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 70
-      },
-      {
-        "a": "atkpro",
-        "n": 700
+        "n": 50
       }
     ],
     "position": "11001|1007",
@@ -2869,11 +2721,7 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 0
-      },
-      {
-        "a": "atkpro",
+        "a": "def",
         "n": 0
       }
     ],
@@ -2912,12 +2760,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "a": "def",
+        "n": 10
       }
     ],
     "position": "21001|2001",
@@ -2955,12 +2799,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "a": "def",
+        "n": 20
       }
     ],
     "position": "21001|2001",
@@ -2998,12 +2838,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "a": "def",
+        "n": 30
       }
     ],
     "position": "21001|2001",
@@ -3041,12 +2877,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "a": "def",
+        "n": 40
       }
     ],
     "position": "21001|2001",
@@ -3084,12 +2916,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 70
+        "a": "def",
+        "n": 50
       },
       {
-        "a": "atkpro",
-        "n": 700
+        "a": "defpro",
+        "n": 15
       }
     ],
     "position": "21001|2001",
@@ -3127,12 +2959,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 80
+        "a": "def",
+        "n": 60
       },
       {
-        "a": "atkpro",
-        "n": 800
+        "a": "defpro",
+        "n": 22
       }
     ],
     "position": "21001|2001",
@@ -3170,12 +3002,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 90
+        "a": "def",
+        "n": 70
       },
       {
-        "a": "atkpro",
-        "n": 900
+        "a": "defpro",
+        "n": 29
       }
     ],
     "position": "21001|2001",
@@ -3213,12 +3045,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 100
+        "a": "def",
+        "n": 80
       },
       {
-        "a": "atkpro",
-        "n": 1000
+        "a": "defpro",
+        "n": 36
       }
     ],
     "position": "21001|2001",
@@ -3256,12 +3088,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 110
+        "a": "def",
+        "n": 90
       },
       {
-        "a": "atkpro",
-        "n": 1100
+        "a": "defpro",
+        "n": 43
       }
     ],
     "position": "21001|2001",
@@ -3299,12 +3131,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 120
+        "a": "def",
+        "n": 100
       },
       {
-        "a": "atkpro",
-        "n": 1200
+        "a": "defpro",
+        "n": 50
       }
     ],
     "position": "21001|2001",
@@ -3342,12 +3174,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 130
+        "a": "def",
+        "n": 125
       },
       {
-        "a": "atkpro",
-        "n": 1300
+        "a": "defpro",
+        "n": 60
       }
     ],
     "position": "21001|2001",
@@ -3385,12 +3217,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 140
+        "a": "def",
+        "n": 150
       },
       {
-        "a": "atkpro",
-        "n": 1400
+        "a": "defpro",
+        "n": 70
       }
     ],
     "position": "21001|2001",
@@ -3428,12 +3260,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 150
+        "a": "def",
+        "n": 175
       },
       {
-        "a": "atkpro",
-        "n": 1500
+        "a": "defpro",
+        "n": 80
       }
     ],
     "position": "21001|2001",
@@ -3471,12 +3303,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 160
+        "a": "def",
+        "n": 200
       },
       {
-        "a": "atkpro",
-        "n": 1600
+        "a": "defpro",
+        "n": 90
       }
     ],
     "position": "21001|2001",
@@ -3514,12 +3346,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 170
+        "a": "def",
+        "n": 225
       },
       {
-        "a": "atkpro",
-        "n": 1700
+        "a": "defpro",
+        "n": 100
       }
     ],
     "position": "21001|2001",
@@ -3557,12 +3389,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 180
+        "a": "def",
+        "n": 250
       },
       {
-        "a": "atkpro",
-        "n": 1800
+        "a": "defpro",
+        "n": 110
       }
     ],
     "position": "21001|2001",
@@ -3600,12 +3432,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 190
+        "a": "def",
+        "n": 275
       },
       {
-        "a": "atkpro",
-        "n": 1900
+        "a": "defpro",
+        "n": 120
       }
     ],
     "position": "21001|2001",
@@ -3643,12 +3475,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 200
+        "a": "def",
+        "n": 300
       },
       {
-        "a": "atkpro",
-        "n": 2000
+        "a": "defpro",
+        "n": 130
       }
     ],
     "position": "21001|2001",
@@ -3686,12 +3518,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 210
+        "a": "def",
+        "n": 325
       },
       {
-        "a": "atkpro",
-        "n": 2100
+        "a": "defpro",
+        "n": 140
       }
     ],
     "position": "21001|2001",
@@ -3723,12 +3555,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 220
+        "a": "def",
+        "n": 350
       },
       {
-        "a": "atkpro",
-        "n": 2200
+        "a": "defpro",
+        "n": 150
       }
     ],
     "position": "21001|2001",
@@ -3768,10 +3600,6 @@
       {
         "a": "atk",
         "n": 0
-      },
-      {
-        "a": "atkpro",
-        "n": 0
       }
     ],
     "position": "21001|2002",
@@ -3810,11 +3638,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "n": 10
       }
     ],
     "position": "21001|2002",
@@ -3853,11 +3677,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "n": 20
       }
     ],
     "position": "21001|2002",
@@ -3896,11 +3716,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "n": 30
       }
     ],
     "position": "21001|2002",
@@ -3939,11 +3755,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "n": 40
       }
     ],
     "position": "21001|2002",
@@ -3982,11 +3794,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 70
+        "n": 50
       },
       {
         "a": "atkpro",
-        "n": 700
+        "n": 15
       }
     ],
     "position": "21001|2002",
@@ -4025,11 +3837,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 80
+        "n": 60
       },
       {
         "a": "atkpro",
-        "n": 800
+        "n": 22
       }
     ],
     "position": "21001|2002",
@@ -4068,11 +3880,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 90
+        "n": 70
       },
       {
         "a": "atkpro",
-        "n": 900
+        "n": 29
       }
     ],
     "position": "21001|2002",
@@ -4111,11 +3923,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 100
+        "n": 80
       },
       {
         "a": "atkpro",
-        "n": 1000
+        "n": 36
       }
     ],
     "position": "21001|2002",
@@ -4154,11 +3966,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 110
+        "n": 90
       },
       {
         "a": "atkpro",
-        "n": 1100
+        "n": 43
       }
     ],
     "position": "21001|2002",
@@ -4191,11 +4003,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 120
+        "n": 100
       },
       {
         "a": "atkpro",
-        "n": 1200
+        "n": 50
       }
     ],
     "position": "21001|2002",
@@ -4233,11 +4045,7 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 0
-      },
-      {
-        "a": "atkpro",
+        "a": "def",
         "n": 0
       }
     ],
@@ -4276,12 +4084,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "a": "def",
+        "n": 10
       }
     ],
     "position": "21001|2003",
@@ -4319,12 +4123,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "a": "def",
+        "n": 20
       }
     ],
     "position": "21001|2003",
@@ -4362,12 +4162,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "a": "def",
+        "n": 30
       }
     ],
     "position": "21001|2003",
@@ -4405,12 +4201,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "a": "def",
+        "n": 40
       }
     ],
     "position": "21001|2003",
@@ -4448,12 +4240,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 70
+        "a": "def",
+        "n": 50
       },
       {
-        "a": "atkpro",
-        "n": 700
+        "a": "defpro",
+        "n": 15
       }
     ],
     "position": "21001|2003",
@@ -4491,12 +4283,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 80
+        "a": "def",
+        "n": 60
       },
       {
-        "a": "atkpro",
-        "n": 800
+        "a": "defpro",
+        "n": 22
       }
     ],
     "position": "21001|2003",
@@ -4534,12 +4326,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 90
+        "a": "def",
+        "n": 70
       },
       {
-        "a": "atkpro",
-        "n": 900
+        "a": "defpro",
+        "n": 29
       }
     ],
     "position": "21001|2003",
@@ -4577,12 +4369,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 100
+        "a": "def",
+        "n": 80
       },
       {
-        "a": "atkpro",
-        "n": 1000
+        "a": "defpro",
+        "n": 36
       }
     ],
     "position": "21001|2003",
@@ -4620,12 +4412,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 110
+        "a": "def",
+        "n": 90
       },
       {
-        "a": "atkpro",
-        "n": 1100
+        "a": "defpro",
+        "n": 43
       }
     ],
     "position": "21001|2003",
@@ -4657,12 +4449,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 120
+        "a": "def",
+        "n": 100
       },
       {
-        "a": "atkpro",
-        "n": 1200
+        "a": "defpro",
+        "n": 50
       }
     ],
     "position": "21001|2003",
@@ -4700,11 +4492,7 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 0
-      },
-      {
-        "a": "atkpro",
+        "a": "hp",
         "n": 0
       }
     ],
@@ -4743,12 +4531,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "a": "hp",
+        "n": 10
       }
     ],
     "position": "21001|2004",
@@ -4786,12 +4570,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "a": "hp",
+        "n": 20
       }
     ],
     "position": "21001|2004",
@@ -4829,12 +4609,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "a": "hp",
+        "n": 30
       }
     ],
     "position": "21001|2004",
@@ -4872,12 +4648,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "a": "hp",
+        "n": 40
       }
     ],
     "position": "21001|2004",
@@ -4915,12 +4687,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 70
+        "a": "hp",
+        "n": 50
       },
       {
-        "a": "atkpro",
-        "n": 700
+        "a": "hppro",
+        "n": 15
       }
     ],
     "position": "21001|2004",
@@ -4958,12 +4730,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 80
+        "a": "hp",
+        "n": 60
       },
       {
-        "a": "atkpro",
-        "n": 800
+        "a": "hppro",
+        "n": 22
       }
     ],
     "position": "21001|2004",
@@ -5001,12 +4773,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 90
+        "a": "hp",
+        "n": 70
       },
       {
-        "a": "atkpro",
-        "n": 900
+        "a": "hppro",
+        "n": 29
       }
     ],
     "position": "21001|2004",
@@ -5044,12 +4816,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 100
+        "a": "hp",
+        "n": 80
       },
       {
-        "a": "atkpro",
-        "n": 1000
+        "a": "hppro",
+        "n": 36
       }
     ],
     "position": "21001|2004",
@@ -5087,12 +4859,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 110
+        "a": "hp",
+        "n": 90
       },
       {
-        "a": "atkpro",
-        "n": 1100
+        "a": "hppro",
+        "n": 43
       }
     ],
     "position": "21001|2004",
@@ -5124,12 +4896,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 120
+        "a": "hp",
+        "n": 100
       },
       {
-        "a": "atkpro",
-        "n": 1200
+        "a": "hppro",
+        "n": 50
       }
     ],
     "position": "21001|2004",
@@ -5169,10 +4941,6 @@
       {
         "a": "atk",
         "n": 0
-      },
-      {
-        "a": "atkpro",
-        "n": 0
       }
     ],
     "position": "21001|2005",
@@ -5211,11 +4979,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "n": 10
       }
     ],
     "position": "21001|2005",
@@ -5254,11 +5018,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "n": 20
       }
     ],
     "position": "21001|2005",
@@ -5297,11 +5057,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "n": 30
       }
     ],
     "position": "21001|2005",
@@ -5340,11 +5096,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "n": 40
       }
     ],
     "position": "21001|2005",
@@ -5383,11 +5135,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 70
+        "n": 50
       },
       {
         "a": "atkpro",
-        "n": 700
+        "n": 15
       }
     ],
     "position": "21001|2005",
@@ -5426,11 +5178,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 80
+        "n": 60
       },
       {
         "a": "atkpro",
-        "n": 800
+        "n": 22
       }
     ],
     "position": "21001|2005",
@@ -5469,11 +5221,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 90
+        "n": 70
       },
       {
         "a": "atkpro",
-        "n": 900
+        "n": 29
       }
     ],
     "position": "21001|2005",
@@ -5512,11 +5264,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 100
+        "n": 80
       },
       {
         "a": "atkpro",
-        "n": 1000
+        "n": 36
       }
     ],
     "position": "21001|2005",
@@ -5555,11 +5307,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 110
+        "n": 90
       },
       {
         "a": "atkpro",
-        "n": 1100
+        "n": 43
       }
     ],
     "position": "21001|2005",
@@ -5592,11 +5344,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 120
+        "n": 100
       },
       {
         "a": "atkpro",
-        "n": 1200
+        "n": 50
       }
     ],
     "position": "21001|2005",
@@ -5634,11 +5386,7 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 0
-      },
-      {
-        "a": "atkpro",
+        "a": "def",
         "n": 0
       }
     ],
@@ -5677,12 +5425,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "a": "def",
+        "n": 10
       }
     ],
     "position": "21001|2006",
@@ -5720,12 +5464,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "a": "def",
+        "n": 20
       }
     ],
     "position": "21001|2006",
@@ -5763,12 +5503,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "a": "def",
+        "n": 30
       }
     ],
     "position": "21001|2006",
@@ -5806,12 +5542,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "a": "def",
+        "n": 40
       }
     ],
     "position": "21001|2006",
@@ -5849,12 +5581,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 70
+        "a": "def",
+        "n": 50
       },
       {
-        "a": "atkpro",
-        "n": 700
+        "a": "defpro",
+        "n": 15
       }
     ],
     "position": "21001|2006",
@@ -5892,12 +5624,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 80
+        "a": "def",
+        "n": 60
       },
       {
-        "a": "atkpro",
-        "n": 800
+        "a": "defpro",
+        "n": 22
       }
     ],
     "position": "21001|2006",
@@ -5935,12 +5667,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 90
+        "a": "def",
+        "n": 70
       },
       {
-        "a": "atkpro",
-        "n": 900
+        "a": "defpro",
+        "n": 29
       }
     ],
     "position": "21001|2006",
@@ -5978,12 +5710,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 100
+        "a": "def",
+        "n": 80
       },
       {
-        "a": "atkpro",
-        "n": 1000
+        "a": "defpro",
+        "n": 36
       }
     ],
     "position": "21001|2006",
@@ -6021,12 +5753,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 110
+        "a": "def",
+        "n": 90
       },
       {
-        "a": "atkpro",
-        "n": 1100
+        "a": "defpro",
+        "n": 43
       }
     ],
     "position": "21001|2006",
@@ -6058,12 +5790,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 120
+        "a": "def",
+        "n": 100
       },
       {
-        "a": "atkpro",
-        "n": 1200
+        "a": "defpro",
+        "n": 50
       }
     ],
     "position": "21001|2006",
@@ -6101,11 +5833,7 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 0
-      },
-      {
-        "a": "atkpro",
+        "a": "hp",
         "n": 0
       }
     ],
@@ -6144,12 +5872,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "a": "hp",
+        "n": 10
       }
     ],
     "position": "21001|2007",
@@ -6187,12 +5911,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "a": "hp",
+        "n": 20
       }
     ],
     "position": "21001|2007",
@@ -6230,12 +5950,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "a": "hp",
+        "n": 30
       }
     ],
     "position": "21001|2007",
@@ -6273,12 +5989,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "a": "hp",
+        "n": 40
       }
     ],
     "position": "21001|2007",
@@ -6316,12 +6028,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 70
+        "a": "hp",
+        "n": 50
       },
       {
-        "a": "atkpro",
-        "n": 700
+        "a": "hppro",
+        "n": 15
       }
     ],
     "position": "21001|2007",
@@ -6359,12 +6071,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 80
+        "a": "hp",
+        "n": 60
       },
       {
-        "a": "atkpro",
-        "n": 800
+        "a": "hppro",
+        "n": 22
       }
     ],
     "position": "21001|2007",
@@ -6402,12 +6114,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 90
+        "a": "hp",
+        "n": 70
       },
       {
-        "a": "atkpro",
-        "n": 900
+        "a": "hppro",
+        "n": 29
       }
     ],
     "position": "21001|2007",
@@ -6445,12 +6157,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 100
+        "a": "hp",
+        "n": 80
       },
       {
-        "a": "atkpro",
-        "n": 1000
+        "a": "hppro",
+        "n": 36
       }
     ],
     "position": "21001|2007",
@@ -6488,12 +6200,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 110
+        "a": "hp",
+        "n": 90
       },
       {
-        "a": "atkpro",
-        "n": 1100
+        "a": "hppro",
+        "n": 43
       }
     ],
     "position": "21001|2007",
@@ -6525,12 +6237,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 120
+        "a": "hp",
+        "n": 100
       },
       {
-        "a": "atkpro",
-        "n": 1200
+        "a": "hppro",
+        "n": 50
       }
     ],
     "position": "21001|2007",
@@ -6570,10 +6282,6 @@
       {
         "a": "atk",
         "n": 0
-      },
-      {
-        "a": "atkpro",
-        "n": 0
       }
     ],
     "position": "21001|2008",
@@ -6612,11 +6320,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "n": 10
       }
     ],
     "position": "21001|2008",
@@ -6655,11 +6359,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "n": 20
       }
     ],
     "position": "21001|2008",
@@ -6698,11 +6398,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "n": 30
       }
     ],
     "position": "21001|2008",
@@ -6741,11 +6437,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "n": 40
       }
     ],
     "position": "21001|2008",
@@ -6784,11 +6476,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 70
+        "n": 50
       },
       {
         "a": "atkpro",
-        "n": 700
+        "n": 15
       }
     ],
     "position": "21001|2008",
@@ -6827,11 +6519,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 80
+        "n": 60
       },
       {
         "a": "atkpro",
-        "n": 800
+        "n": 22
       }
     ],
     "position": "21001|2008",
@@ -6870,11 +6562,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 90
+        "n": 70
       },
       {
         "a": "atkpro",
-        "n": 900
+        "n": 29
       }
     ],
     "position": "21001|2008",
@@ -6913,11 +6605,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 100
+        "n": 80
       },
       {
         "a": "atkpro",
-        "n": 1000
+        "n": 36
       }
     ],
     "position": "21001|2008",
@@ -6956,11 +6648,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 110
+        "n": 90
       },
       {
         "a": "atkpro",
-        "n": 1100
+        "n": 43
       }
     ],
     "position": "21001|2008",
@@ -6993,11 +6685,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 120
+        "n": 100
       },
       {
         "a": "atkpro",
-        "n": 1200
+        "n": 50
       }
     ],
     "position": "21001|2008",
@@ -7035,11 +6727,7 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 0
-      },
-      {
-        "a": "atkpro",
+        "a": "def",
         "n": 0
       }
     ],
@@ -7078,12 +6766,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "a": "def",
+        "n": 10
       }
     ],
     "position": "21001|2009",
@@ -7121,12 +6805,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "a": "def",
+        "n": 20
       }
     ],
     "position": "21001|2009",
@@ -7164,12 +6844,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "a": "def",
+        "n": 30
       }
     ],
     "position": "21001|2009",
@@ -7207,12 +6883,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "a": "def",
+        "n": 40
       }
     ],
     "position": "21001|2009",
@@ -7250,12 +6922,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 70
+        "a": "def",
+        "n": 50
       },
       {
-        "a": "atkpro",
-        "n": 700
+        "a": "defpro",
+        "n": 15
       }
     ],
     "position": "21001|2009",
@@ -7293,12 +6965,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 80
+        "a": "def",
+        "n": 60
       },
       {
-        "a": "atkpro",
-        "n": 800
+        "a": "defpro",
+        "n": 22
       }
     ],
     "position": "21001|2009",
@@ -7336,12 +7008,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 90
+        "a": "def",
+        "n": 70
       },
       {
-        "a": "atkpro",
-        "n": 900
+        "a": "defpro",
+        "n": 29
       }
     ],
     "position": "21001|2009",
@@ -7379,12 +7051,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 100
+        "a": "def",
+        "n": 80
       },
       {
-        "a": "atkpro",
-        "n": 1000
+        "a": "defpro",
+        "n": 36
       }
     ],
     "position": "21001|2009",
@@ -7422,12 +7094,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 110
+        "a": "def",
+        "n": 90
       },
       {
-        "a": "atkpro",
-        "n": 1100
+        "a": "defpro",
+        "n": 43
       }
     ],
     "position": "21001|2009",
@@ -7459,12 +7131,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 120
+        "a": "def",
+        "n": 100
       },
       {
-        "a": "atkpro",
-        "n": 1200
+        "a": "defpro",
+        "n": 50
       }
     ],
     "position": "21001|2009",
@@ -7502,11 +7174,7 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 0
-      },
-      {
-        "a": "atkpro",
+        "a": "hp",
         "n": 0
       }
     ],
@@ -7545,12 +7213,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "a": "hp",
+        "n": 10
       }
     ],
     "position": "21001|2010",
@@ -7588,12 +7252,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "a": "hp",
+        "n": 20
       }
     ],
     "position": "21001|2010",
@@ -7631,12 +7291,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "a": "hp",
+        "n": 30
       }
     ],
     "position": "21001|2010",
@@ -7674,12 +7330,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "a": "hp",
+        "n": 40
       }
     ],
     "position": "21001|2010",
@@ -7717,12 +7369,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 70
+        "a": "hp",
+        "n": 50
       },
       {
-        "a": "atkpro",
-        "n": 700
+        "a": "hppro",
+        "n": 15
       }
     ],
     "position": "21001|2010",
@@ -7760,12 +7412,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 80
+        "a": "hp",
+        "n": 60
       },
       {
-        "a": "atkpro",
-        "n": 800
+        "a": "hppro",
+        "n": 22
       }
     ],
     "position": "21001|2010",
@@ -7803,12 +7455,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 90
+        "a": "hp",
+        "n": 70
       },
       {
-        "a": "atkpro",
-        "n": 900
+        "a": "hppro",
+        "n": 29
       }
     ],
     "position": "21001|2010",
@@ -7846,12 +7498,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 100
+        "a": "hp",
+        "n": 80
       },
       {
-        "a": "atkpro",
-        "n": 1000
+        "a": "hppro",
+        "n": 36
       }
     ],
     "position": "21001|2010",
@@ -7889,12 +7541,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 110
+        "a": "hp",
+        "n": 90
       },
       {
-        "a": "atkpro",
-        "n": 1100
+        "a": "hppro",
+        "n": 43
       }
     ],
     "position": "21001|2010",
@@ -7926,12 +7578,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 120
+        "a": "hp",
+        "n": 100
       },
       {
-        "a": "atkpro",
-        "n": 1200
+        "a": "hppro",
+        "n": 50
       }
     ],
     "position": "21001|2010",
@@ -7971,10 +7623,6 @@
       {
         "a": "atk",
         "n": 0
-      },
-      {
-        "a": "atkpro",
-        "n": 0
       }
     ],
     "position": "21001|2011",
@@ -8013,11 +7661,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "n": 10
       }
     ],
     "position": "21001|2011",
@@ -8056,11 +7700,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "n": 20
       }
     ],
     "position": "21001|2011",
@@ -8099,11 +7739,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "n": 30
       }
     ],
     "position": "21001|2011",
@@ -8142,11 +7778,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "n": 40
       }
     ],
     "position": "21001|2011",
@@ -8185,11 +7817,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 70
+        "n": 50
       },
       {
         "a": "atkpro",
-        "n": 700
+        "n": 15
       }
     ],
     "position": "21001|2011",
@@ -8228,11 +7860,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 80
+        "n": 60
       },
       {
         "a": "atkpro",
-        "n": 800
+        "n": 22
       }
     ],
     "position": "21001|2011",
@@ -8271,11 +7903,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 90
+        "n": 70
       },
       {
         "a": "atkpro",
-        "n": 900
+        "n": 29
       }
     ],
     "position": "21001|2011",
@@ -8314,11 +7946,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 100
+        "n": 80
       },
       {
         "a": "atkpro",
-        "n": 1000
+        "n": 36
       }
     ],
     "position": "21001|2011",
@@ -8357,11 +7989,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 110
+        "n": 90
       },
       {
         "a": "atkpro",
-        "n": 1100
+        "n": 43
       }
     ],
     "position": "21001|2011",
@@ -8394,11 +8026,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 120
+        "n": 100
       },
       {
         "a": "atkpro",
-        "n": 1200
+        "n": 50
       }
     ],
     "position": "21001|2011",
@@ -8436,11 +8068,7 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 0
-      },
-      {
-        "a": "atkpro",
+        "a": "def",
         "n": 0
       }
     ],
@@ -8479,12 +8107,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "a": "def",
+        "n": 10
       }
     ],
     "position": "21001|2012",
@@ -8522,12 +8146,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "a": "def",
+        "n": 20
       }
     ],
     "position": "21001|2012",
@@ -8565,12 +8185,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "a": "def",
+        "n": 30
       }
     ],
     "position": "21001|2012",
@@ -8608,12 +8224,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "a": "def",
+        "n": 40
       }
     ],
     "position": "21001|2012",
@@ -8651,12 +8263,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 70
+        "a": "def",
+        "n": 50
       },
       {
-        "a": "atkpro",
-        "n": 700
+        "a": "defpro",
+        "n": 15
       }
     ],
     "position": "21001|2012",
@@ -8694,12 +8306,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 80
+        "a": "def",
+        "n": 60
       },
       {
-        "a": "atkpro",
-        "n": 800
+        "a": "defpro",
+        "n": 22
       }
     ],
     "position": "21001|2012",
@@ -8737,12 +8349,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 90
+        "a": "def",
+        "n": 70
       },
       {
-        "a": "atkpro",
-        "n": 900
+        "a": "defpro",
+        "n": 29
       }
     ],
     "position": "21001|2012",
@@ -8780,12 +8392,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 100
+        "a": "def",
+        "n": 80
       },
       {
-        "a": "atkpro",
-        "n": 1000
+        "a": "defpro",
+        "n": 36
       }
     ],
     "position": "21001|2012",
@@ -8823,12 +8435,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 110
+        "a": "def",
+        "n": 90
       },
       {
-        "a": "atkpro",
-        "n": 1100
+        "a": "defpro",
+        "n": 43
       }
     ],
     "position": "21001|2012",
@@ -8860,12 +8472,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 120
+        "a": "def",
+        "n": 100
       },
       {
-        "a": "atkpro",
-        "n": 1200
+        "a": "defpro",
+        "n": 50
       }
     ],
     "position": "21001|2012",
@@ -8903,11 +8515,7 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 0
-      },
-      {
-        "a": "atkpro",
+        "a": "hp",
         "n": 0
       }
     ],
@@ -8946,12 +8554,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "a": "hp",
+        "n": 10
       }
     ],
     "position": "21001|2013",
@@ -8989,12 +8593,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "a": "hp",
+        "n": 20
       }
     ],
     "position": "21001|2013",
@@ -9032,12 +8632,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "a": "hp",
+        "n": 30
       }
     ],
     "position": "21001|2013",
@@ -9075,12 +8671,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "a": "hp",
+        "n": 40
       }
     ],
     "position": "21001|2013",
@@ -9118,12 +8710,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 70
+        "a": "hp",
+        "n": 50
       },
       {
-        "a": "atkpro",
-        "n": 700
+        "a": "hppro",
+        "n": 15
       }
     ],
     "position": "21001|2013",
@@ -9161,12 +8753,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 80
+        "a": "hp",
+        "n": 60
       },
       {
-        "a": "atkpro",
-        "n": 800
+        "a": "hppro",
+        "n": 22
       }
     ],
     "position": "21001|2013",
@@ -9204,12 +8796,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 90
+        "a": "hp",
+        "n": 70
       },
       {
-        "a": "atkpro",
-        "n": 900
+        "a": "hppro",
+        "n": 29
       }
     ],
     "position": "21001|2013",
@@ -9247,12 +8839,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 100
+        "a": "hp",
+        "n": 80
       },
       {
-        "a": "atkpro",
-        "n": 1000
+        "a": "hppro",
+        "n": 36
       }
     ],
     "position": "21001|2013",
@@ -9290,12 +8882,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 110
+        "a": "hp",
+        "n": 90
       },
       {
-        "a": "atkpro",
-        "n": 1100
+        "a": "hppro",
+        "n": 43
       }
     ],
     "position": "21001|2013",
@@ -9327,12 +8919,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 120
+        "a": "hp",
+        "n": 100
       },
       {
-        "a": "atkpro",
-        "n": 1200
+        "a": "hppro",
+        "n": 50
       }
     ],
     "position": "21001|2013",
@@ -9372,10 +8964,6 @@
       {
         "a": "atk",
         "n": 0
-      },
-      {
-        "a": "atkpro",
-        "n": 0
       }
     ],
     "position": "21001|2014",
@@ -9414,11 +9002,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "n": 10
       }
     ],
     "position": "21001|2014",
@@ -9457,11 +9041,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "n": 20
       }
     ],
     "position": "21001|2014",
@@ -9500,11 +9080,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "n": 30
       }
     ],
     "position": "21001|2014",
@@ -9543,11 +9119,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "n": 40
       }
     ],
     "position": "21001|2014",
@@ -9586,11 +9158,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 70
+        "n": 50
       },
       {
         "a": "atkpro",
-        "n": 700
+        "n": 15
       }
     ],
     "position": "21001|2014",
@@ -9629,11 +9201,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 80
+        "n": 60
       },
       {
         "a": "atkpro",
-        "n": 800
+        "n": 22
       }
     ],
     "position": "21001|2014",
@@ -9672,11 +9244,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 90
+        "n": 70
       },
       {
         "a": "atkpro",
-        "n": 900
+        "n": 29
       }
     ],
     "position": "21001|2014",
@@ -9715,11 +9287,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 100
+        "n": 80
       },
       {
         "a": "atkpro",
-        "n": 1000
+        "n": 36
       }
     ],
     "position": "21001|2014",
@@ -9758,11 +9330,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 110
+        "n": 90
       },
       {
         "a": "atkpro",
-        "n": 1100
+        "n": 43
       }
     ],
     "position": "21001|2014",
@@ -9795,11 +9367,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 120
+        "n": 100
       },
       {
         "a": "atkpro",
-        "n": 1200
+        "n": 50
       }
     ],
     "position": "21001|2014",
@@ -9837,11 +9409,7 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 0
-      },
-      {
-        "a": "atkpro",
+        "a": "def",
         "n": 0
       }
     ],
@@ -9880,12 +9448,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "a": "def",
+        "n": 10
       }
     ],
     "position": "21001|2015",
@@ -9923,12 +9487,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "a": "def",
+        "n": 20
       }
     ],
     "position": "21001|2015",
@@ -9966,12 +9526,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "a": "def",
+        "n": 30
       }
     ],
     "position": "21001|2015",
@@ -10009,12 +9565,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "a": "def",
+        "n": 40
       }
     ],
     "position": "21001|2015",
@@ -10052,12 +9604,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 70
+        "a": "def",
+        "n": 50
       },
       {
-        "a": "atkpro",
-        "n": 700
+        "a": "defpro",
+        "n": 15
       }
     ],
     "position": "21001|2015",
@@ -10095,12 +9647,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 80
+        "a": "def",
+        "n": 60
       },
       {
-        "a": "atkpro",
-        "n": 800
+        "a": "defpro",
+        "n": 22
       }
     ],
     "position": "21001|2015",
@@ -10138,12 +9690,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 90
+        "a": "def",
+        "n": 70
       },
       {
-        "a": "atkpro",
-        "n": 900
+        "a": "defpro",
+        "n": 29
       }
     ],
     "position": "21001|2015",
@@ -10181,12 +9733,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 100
+        "a": "def",
+        "n": 80
       },
       {
-        "a": "atkpro",
-        "n": 1000
+        "a": "defpro",
+        "n": 36
       }
     ],
     "position": "21001|2015",
@@ -10224,12 +9776,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 110
+        "a": "def",
+        "n": 90
       },
       {
-        "a": "atkpro",
-        "n": 1100
+        "a": "defpro",
+        "n": 43
       }
     ],
     "position": "21001|2015",
@@ -10261,12 +9813,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 120
+        "a": "def",
+        "n": 100
       },
       {
-        "a": "atkpro",
-        "n": 1200
+        "a": "defpro",
+        "n": 50
       }
     ],
     "position": "21001|2015",
@@ -10304,11 +9856,7 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 0
-      },
-      {
-        "a": "atkpro",
+        "a": "hp",
         "n": 0
       }
     ],
@@ -10347,12 +9895,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "a": "hp",
+        "n": 10
       }
     ],
     "position": "21001|2016",
@@ -10390,12 +9934,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "a": "hp",
+        "n": 20
       }
     ],
     "position": "21001|2016",
@@ -10433,12 +9973,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "a": "hp",
+        "n": 30
       }
     ],
     "position": "21001|2016",
@@ -10476,12 +10012,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "a": "hp",
+        "n": 40
       }
     ],
     "position": "21001|2016",
@@ -10519,12 +10051,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 70
+        "a": "hp",
+        "n": 50
       },
       {
-        "a": "atkpro",
-        "n": 700
+        "a": "hppro",
+        "n": 15
       }
     ],
     "position": "21001|2016",
@@ -10562,12 +10094,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 80
+        "a": "hp",
+        "n": 60
       },
       {
-        "a": "atkpro",
-        "n": 800
+        "a": "hppro",
+        "n": 22
       }
     ],
     "position": "21001|2016",
@@ -10605,12 +10137,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 90
+        "a": "hp",
+        "n": 70
       },
       {
-        "a": "atkpro",
-        "n": 900
+        "a": "hppro",
+        "n": 29
       }
     ],
     "position": "21001|2016",
@@ -10648,12 +10180,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 100
+        "a": "hp",
+        "n": 80
       },
       {
-        "a": "atkpro",
-        "n": 1000
+        "a": "hppro",
+        "n": 36
       }
     ],
     "position": "21001|2016",
@@ -10691,12 +10223,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 110
+        "a": "hp",
+        "n": 90
       },
       {
-        "a": "atkpro",
-        "n": 1100
+        "a": "hppro",
+        "n": 43
       }
     ],
     "position": "21001|2016",
@@ -10728,12 +10260,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 120
+        "a": "hp",
+        "n": 100
       },
       {
-        "a": "atkpro",
-        "n": 1200
+        "a": "hppro",
+        "n": 50
       }
     ],
     "position": "21001|2016",
@@ -10773,10 +10305,6 @@
       {
         "a": "atk",
         "n": 0
-      },
-      {
-        "a": "atkpro",
-        "n": 0
       }
     ],
     "position": "31001|3001",
@@ -10815,11 +10343,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "n": 10
       }
     ],
     "position": "31001|3001",
@@ -10858,11 +10382,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "n": 20
       }
     ],
     "position": "31001|3001",
@@ -10901,11 +10421,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "n": 30
       }
     ],
     "position": "31001|3001",
@@ -10944,11 +10460,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "n": 40
       }
     ],
     "position": "31001|3001",
@@ -10987,11 +10499,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 70
+        "n": 50
       },
       {
         "a": "atkpro",
-        "n": 700
+        "n": 15
       }
     ],
     "position": "31001|3001",
@@ -11030,11 +10542,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 80
+        "n": 60
       },
       {
         "a": "atkpro",
-        "n": 800
+        "n": 22
       }
     ],
     "position": "31001|3001",
@@ -11073,11 +10585,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 90
+        "n": 70
       },
       {
         "a": "atkpro",
-        "n": 900
+        "n": 29
       }
     ],
     "position": "31001|3001",
@@ -11116,11 +10628,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 100
+        "n": 80
       },
       {
         "a": "atkpro",
-        "n": 1000
+        "n": 36
       }
     ],
     "position": "31001|3001",
@@ -11159,11 +10671,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 110
+        "n": 90
       },
       {
         "a": "atkpro",
-        "n": 1100
+        "n": 43
       }
     ],
     "position": "31001|3001",
@@ -11202,11 +10714,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 120
+        "n": 100
       },
       {
         "a": "atkpro",
-        "n": 1200
+        "n": 50
       }
     ],
     "position": "31001|3001",
@@ -11245,11 +10757,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 130
+        "n": 120
       },
       {
         "a": "atkpro",
-        "n": 1300
+        "n": 60
       }
     ],
     "position": "31001|3001",
@@ -11292,7 +10804,7 @@
       },
       {
         "a": "atkpro",
-        "n": 1400
+        "n": 70
       }
     ],
     "position": "31001|3001",
@@ -11331,11 +10843,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 150
+        "n": 160
       },
       {
         "a": "atkpro",
-        "n": 1500
+        "n": 80
       }
     ],
     "position": "31001|3001",
@@ -11374,11 +10886,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 160
+        "n": 180
       },
       {
         "a": "atkpro",
-        "n": 1600
+        "n": 90
       }
     ],
     "position": "31001|3001",
@@ -11417,11 +10929,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 170
+        "n": 200
       },
       {
         "a": "atkpro",
-        "n": 1700
+        "n": 100
       }
     ],
     "position": "31001|3001",
@@ -11460,11 +10972,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 180
+        "n": 220
       },
       {
         "a": "atkpro",
-        "n": 1800
+        "n": 110
       }
     ],
     "position": "31001|3001",
@@ -11503,11 +11015,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 190
+        "n": 240
       },
       {
         "a": "atkpro",
-        "n": 1900
+        "n": 120
       }
     ],
     "position": "31001|3001",
@@ -11546,11 +11058,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 200
+        "n": 260
       },
       {
         "a": "atkpro",
-        "n": 2000
+        "n": 130
       }
     ],
     "position": "31001|3001",
@@ -11589,11 +11101,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 210
+        "n": 280
       },
       {
         "a": "atkpro",
-        "n": 2100
+        "n": 140
       }
     ],
     "position": "31001|3001",
@@ -11626,11 +11138,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 220
+        "n": 300
       },
       {
         "a": "atkpro",
-        "n": 2200
+        "n": 150
       }
     ],
     "position": "31001|3001",
@@ -11668,11 +11180,7 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 0
-      },
-      {
-        "a": "atkpro",
+        "a": "def",
         "n": 0
       }
     ],
@@ -11711,12 +11219,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "a": "def",
+        "n": 10
       }
     ],
     "position": "31001|3002",
@@ -11754,12 +11258,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "a": "def",
+        "n": 20
       }
     ],
     "position": "31001|3002",
@@ -11797,12 +11297,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "a": "def",
+        "n": 30
       }
     ],
     "position": "31001|3002",
@@ -11840,12 +11336,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "a": "def",
+        "n": 40
       }
     ],
     "position": "31001|3002",
@@ -11883,12 +11375,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 70
+        "a": "def",
+        "n": 50
       },
       {
-        "a": "atkpro",
-        "n": 700
+        "a": "defpro",
+        "n": 15
       }
     ],
     "position": "31001|3002",
@@ -11926,12 +11418,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 80
+        "a": "def",
+        "n": 60
       },
       {
-        "a": "atkpro",
-        "n": 800
+        "a": "defpro",
+        "n": 22
       }
     ],
     "position": "31001|3002",
@@ -11969,12 +11461,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 90
+        "a": "def",
+        "n": 70
       },
       {
-        "a": "atkpro",
-        "n": 900
+        "a": "defpro",
+        "n": 29
       }
     ],
     "position": "31001|3002",
@@ -12012,12 +11504,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 100
+        "a": "def",
+        "n": 80
       },
       {
-        "a": "atkpro",
-        "n": 1000
+        "a": "defpro",
+        "n": 36
       }
     ],
     "position": "31001|3002",
@@ -12055,12 +11547,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 110
+        "a": "def",
+        "n": 90
       },
       {
-        "a": "atkpro",
-        "n": 1100
+        "a": "defpro",
+        "n": 43
       }
     ],
     "position": "31001|3002",
@@ -12092,12 +11584,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 120
+        "a": "def",
+        "n": 100
       },
       {
-        "a": "atkpro",
-        "n": 1200
+        "a": "defpro",
+        "n": 50
       }
     ],
     "position": "31001|3002",
@@ -12135,11 +11627,7 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 0
-      },
-      {
-        "a": "atkpro",
+        "a": "hp",
         "n": 0
       }
     ],
@@ -12178,12 +11666,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "a": "hp",
+        "n": 10
       }
     ],
     "position": "31001|3003",
@@ -12221,12 +11705,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "a": "hp",
+        "n": 20
       }
     ],
     "position": "31001|3003",
@@ -12264,12 +11744,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "a": "hp",
+        "n": 30
       }
     ],
     "position": "31001|3003",
@@ -12307,12 +11783,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "a": "hp",
+        "n": 40
       }
     ],
     "position": "31001|3003",
@@ -12350,12 +11822,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 70
-      },
-      {
-        "a": "atkpro",
-        "n": 700
+        "a": "hp",
+        "n": 50
       }
     ],
     "position": "31001|3003",
@@ -12395,10 +11863,6 @@
       {
         "a": "atk",
         "n": 0
-      },
-      {
-        "a": "atkpro",
-        "n": 0
       }
     ],
     "position": "31001|3004",
@@ -12437,11 +11901,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "n": 10
       }
     ],
     "position": "31001|3004",
@@ -12480,11 +11940,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "n": 20
       }
     ],
     "position": "31001|3004",
@@ -12523,11 +11979,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "n": 30
       }
     ],
     "position": "31001|3004",
@@ -12566,11 +12018,7 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "n": 40
       }
     ],
     "position": "31001|3004",
@@ -12609,11 +12057,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 70
+        "n": 50
       },
       {
         "a": "atkpro",
-        "n": 700
+        "n": 15
       }
     ],
     "position": "31001|3004",
@@ -12652,11 +12100,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 80
+        "n": 60
       },
       {
         "a": "atkpro",
-        "n": 800
+        "n": 22
       }
     ],
     "position": "31001|3004",
@@ -12695,11 +12143,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 90
+        "n": 70
       },
       {
         "a": "atkpro",
-        "n": 900
+        "n": 29
       }
     ],
     "position": "31001|3004",
@@ -12738,11 +12186,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 100
+        "n": 80
       },
       {
         "a": "atkpro",
-        "n": 1000
+        "n": 36
       }
     ],
     "position": "31001|3004",
@@ -12781,11 +12229,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 110
+        "n": 90
       },
       {
         "a": "atkpro",
-        "n": 1100
+        "n": 43
       }
     ],
     "position": "31001|3004",
@@ -12818,11 +12266,11 @@
     "upgrade": [
       {
         "a": "atk",
-        "n": 120
+        "n": 100
       },
       {
         "a": "atkpro",
-        "n": 1200
+        "n": 50
       }
     ],
     "position": "31001|3004",
@@ -12860,11 +12308,7 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 0
-      },
-      {
-        "a": "atkpro",
+        "a": "def",
         "n": 0
       }
     ],
@@ -12903,12 +12347,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 30
-      },
-      {
-        "a": "atkpro",
-        "n": 300
+        "a": "def",
+        "n": 10
       }
     ],
     "position": "31001|3005",
@@ -12946,12 +12386,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 40
-      },
-      {
-        "a": "atkpro",
-        "n": 400
+        "a": "def",
+        "n": 20
       }
     ],
     "position": "31001|3005",
@@ -12989,12 +12425,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 50
-      },
-      {
-        "a": "atkpro",
-        "n": 500
+        "a": "def",
+        "n": 30
       }
     ],
     "position": "31001|3005",
@@ -13032,12 +12464,8 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 60
-      },
-      {
-        "a": "atkpro",
-        "n": 600
+        "a": "def",
+        "n": 40
       }
     ],
     "position": "31001|3005",
@@ -13075,12 +12503,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 70
+        "a": "def",
+        "n": 50
       },
       {
-        "a": "atkpro",
-        "n": 700
+        "a": "defpro",
+        "n": 15
       }
     ],
     "position": "31001|3005",
@@ -13118,12 +12546,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 80
+        "a": "def",
+        "n": 60
       },
       {
-        "a": "atkpro",
-        "n": 800
+        "a": "defpro",
+        "n": 22
       }
     ],
     "position": "31001|3005",
@@ -13161,12 +12589,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 90
+        "a": "def",
+        "n": 70
       },
       {
-        "a": "atkpro",
-        "n": 900
+        "a": "defpro",
+        "n": 29
       }
     ],
     "position": "31001|3005",
@@ -13204,12 +12632,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 100
+        "a": "def",
+        "n": 80
       },
       {
-        "a": "atkpro",
-        "n": 1000
+        "a": "defpro",
+        "n": 36
       }
     ],
     "position": "31001|3005",
@@ -13247,12 +12675,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 110
+        "a": "def",
+        "n": 90
       },
       {
-        "a": "atkpro",
-        "n": 1100
+        "a": "defpro",
+        "n": 43
       }
     ],
     "position": "31001|3005",
@@ -13284,12 +12712,12 @@
     },
     "upgrade": [
       {
-        "a": "atk",
-        "n": 120
+        "a": "def",
+        "n": 100
       },
       {
-        "a": "atkpro",
-        "n": 1200
+        "a": "defpro",
+        "n": 50
       }
     ],
     "position": "31001|3005",
diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json
index 79f1191ae..bff2c57dc 100644
--- a/bin/json/game_opencond.json
+++ b/bin/json/game_opencond.json
@@ -22,9 +22,9 @@
       "key": "opencond_name_10006",
       "text": "背包"
     },
-    "main": 1,
+    "main": 3,
     "optional": "",
-    "wkqbx": 0,
+    "wkqbx": 1,
     "kqbx": 0,
     "img": "zc_icon_01",
     "prompt": {
@@ -56,7 +56,7 @@
       "key": "opencond_name_10004",
       "text": "好友"
     },
-    "main": 1,
+    "main": 3,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
@@ -90,9 +90,9 @@
       "key": "opencond_name_10003",
       "text": "随机任务总览"
     },
-    "main": 1,
+    "main": 3,
     "optional": "",
-    "wkqbx": 0,
+    "wkqbx": 2,
     "kqbx": 0,
     "img": "zc_icon_01",
     "prompt": {
@@ -141,9 +141,9 @@
       "key": "opencond_name_10005",
       "text": "任务"
     },
-    "main": 1,
+    "main": 10,
     "optional": "",
-    "wkqbx": 0,
+    "wkqbx": 2,
     "kqbx": 0,
     "img": "zc_icon_01",
     "prompt": {
@@ -158,7 +158,7 @@
       "key": "num_1001",
       "text": "主线入口"
     },
-    "main": 1,
+    "main": 3,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
@@ -260,7 +260,7 @@
       "key": "num_1007",
       "text": "装备副本"
     },
-    "main": 1,
+    "main": 3,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
@@ -277,7 +277,7 @@
       "key": "num_1007",
       "text": "武器副本"
     },
-    "main": 1,
+    "main": 3,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
@@ -294,7 +294,7 @@
       "key": "num_1007",
       "text": "饰品副本"
     },
-    "main": 1,
+    "main": 3,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
@@ -311,7 +311,7 @@
       "key": "num_1008",
       "text": "心魔塔"
     },
-    "main": 1,
+    "main": 3,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
@@ -617,7 +617,7 @@
       "key": "num_2026",
       "text": "公会"
     },
-    "main": 20,
+    "main": 3,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
@@ -634,7 +634,7 @@
       "key": "num_2027",
       "text": "竞技场"
     },
-    "main": 10,
+    "main": 3,
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
@@ -651,7 +651,7 @@
       "key": "num_2028",
       "text": "签到"
     },
-    "main": 5,
+    "main": 10,
     "optional": "",
     "wkqbx": 2,
     "kqbx": 0,
@@ -665,10 +665,10 @@
   {
     "id": "reddot",
     "name": {
-      "key": "num_2028",
+      "key": "num_2029",
       "text": "红点集成"
     },
-    "main": 5,
+    "main": 3,
     "optional": "",
     "wkqbx": 1,
     "kqbx": 0,
@@ -678,5 +678,107 @@
       "text": "功能暂未开启"
     },
     "uiid": 0
+  },
+  {
+    "id": "Monthly_card",
+    "name": {
+      "key": "num_2030",
+      "text": "月卡"
+    },
+    "main": 3,
+    "optional": "",
+    "wkqbx": 2,
+    "kqbx": 0,
+    "img": "zc_icon_01",
+    "prompt": {
+      "key": "opencond_prompt_Monthly_card",
+      "text": "功能暂未开启"
+    },
+    "uiid": 0
+  },
+  {
+    "id": "Gift_Bag",
+    "name": {
+      "key": "num_2031",
+      "text": "日周月礼包"
+    },
+    "main": 3,
+    "optional": "",
+    "wkqbx": 2,
+    "kqbx": 0,
+    "img": "zc_icon_01",
+    "prompt": {
+      "key": "opencond_prompt_Gift_Bag",
+      "text": "功能暂未开启"
+    },
+    "uiid": 0
+  },
+  {
+    "id": "role",
+    "name": {
+      "key": "num_2032",
+      "text": "主角"
+    },
+    "main": 3,
+    "optional": "",
+    "wkqbx": 1,
+    "kqbx": 0,
+    "img": "zc_icon_01",
+    "prompt": {
+      "key": "opencond_prompt_role",
+      "text": "功能暂未开启"
+    },
+    "uiid": 0
+  },
+  {
+    "id": "Mystery",
+    "name": {
+      "key": "num_2033",
+      "text": "月之秘境"
+    },
+    "main": 3,
+    "optional": "",
+    "wkqbx": 2,
+    "kqbx": 0,
+    "img": "zc_icon_01",
+    "prompt": {
+      "key": "opencond_prompt_Mystery",
+      "text": "功能暂未开启"
+    },
+    "uiid": 0
+  },
+  {
+    "id": "Income",
+    "name": {
+      "key": "num_2034",
+      "text": "收益统计"
+    },
+    "main": 3,
+    "optional": "",
+    "wkqbx": 1,
+    "kqbx": 0,
+    "img": "zc_icon_01",
+    "prompt": {
+      "key": "opencond_prompt_Income",
+      "text": "功能暂未开启"
+    },
+    "uiid": 0
+  },
+  {
+    "id": "fuse",
+    "name": {
+      "key": "num_2035",
+      "text": "卡牌融合"
+    },
+    "main": 3,
+    "optional": "",
+    "wkqbx": 1,
+    "kqbx": 0,
+    "img": "zc_icon_01",
+    "prompt": {
+      "key": "opencond_prompt_fuse",
+      "text": "功能暂未开启"
+    },
+    "uiid": 0
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_smithy.json b/bin/json/game_smithy.json
index 423b2ad3d..2b8d357d7 100644
--- a/bin/json/game_smithy.json
+++ b/bin/json/game_smithy.json
@@ -24,28 +24,38 @@
     "floors": 1,
     "dropshow": [
       {
-        "a": "item",
+        "a": "equi",
         "t": "10001",
         "n": 1
       },
       {
-        "a": "item",
+        "a": "equi",
         "t": "10002",
         "n": 1
       },
       {
-        "a": "item",
+        "a": "equi",
         "t": "10003",
         "n": 1
       },
       {
-        "a": "item",
+        "a": "equi",
         "t": "10004",
         "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10005",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10006",
+        "n": 1
       }
     ],
     "using": 1,
-    "drop": 1001,
+    "drop": 80001,
     "orderneed": [
       {
         "a": "item",
@@ -92,28 +102,38 @@
     "floors": 1,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10011",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10012",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10013",
         "n": 1
       },
       {
-        "a": "item",
+        "a": "equi",
         "t": "10004",
         "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10005",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10006",
+        "n": 1
       }
     ],
     "using": 1,
-    "drop": 1002,
+    "drop": 80002,
     "orderneed": [
       {
         "a": "item",
@@ -133,7 +153,7 @@
       "text": "战斗装备"
     },
     "ico": "tjp_zb_03",
-    "color": 2
+    "color": 1
   },
   {
     "id": 1003,
@@ -160,28 +180,38 @@
     "floors": 1,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10011",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10012",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10013",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10004",
+        "a": "equi",
+        "t": "10014",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10015",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10016",
         "n": 1
       }
     ],
     "using": 1,
-    "drop": 1003,
+    "drop": 80003,
     "orderneed": [
       {
         "a": "item",
@@ -201,7 +231,7 @@
       "text": "战斗装备"
     },
     "ico": "tjp_zb_03",
-    "color": 3
+    "color": 2
   },
   {
     "id": 1004,
@@ -228,28 +258,38 @@
     "floors": 2,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10021",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10022",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10023",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10004",
+        "a": "equi",
+        "t": "10014",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10015",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10016",
         "n": 1
       }
     ],
     "using": 1,
-    "drop": 1004,
+    "drop": 80004,
     "orderneed": [
       {
         "a": "item",
@@ -269,7 +309,7 @@
       "text": "战斗装备"
     },
     "ico": "tjp_zb_03",
-    "color": 4
+    "color": 2
   },
   {
     "id": 1005,
@@ -296,28 +336,38 @@
     "floors": 3,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10021",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10022",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10023",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10004",
+        "a": "equi",
+        "t": "10024",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10025",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10026",
         "n": 1
       }
     ],
     "using": 1,
-    "drop": 1005,
+    "drop": 80005,
     "orderneed": [
       {
         "a": "item",
@@ -337,7 +387,7 @@
       "text": "战斗装备"
     },
     "ico": "tjp_zb_03",
-    "color": 5
+    "color": 3
   },
   {
     "id": 1006,
@@ -364,28 +414,38 @@
     "floors": 4,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10031",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10032",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10033",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10004",
+        "a": "equi",
+        "t": "10024",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10025",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10026",
         "n": 1
       }
     ],
     "using": 1,
-    "drop": 1006,
+    "drop": 80006,
     "orderneed": [
       {
         "a": "item",
@@ -405,7 +465,7 @@
       "text": "战斗装备"
     },
     "ico": "tjp_zb_03",
-    "color": 6
+    "color": 3
   },
   {
     "id": 1007,
@@ -432,28 +492,38 @@
     "floors": 5,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10031",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10032",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10033",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10004",
+        "a": "equi",
+        "t": "10034",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10035",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10036",
         "n": 1
       }
     ],
     "using": 1,
-    "drop": 1007,
+    "drop": 80007,
     "orderneed": [
       {
         "a": "item",
@@ -473,7 +543,7 @@
       "text": "战斗装备"
     },
     "ico": "tjp_zb_03",
-    "color": 6
+    "color": 4
   },
   {
     "id": 1008,
@@ -500,28 +570,38 @@
     "floors": 5,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10041",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10042",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10043",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10004",
+        "a": "equi",
+        "t": "10034",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10035",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10036",
         "n": 1
       }
     ],
     "using": 1,
-    "drop": 1008,
+    "drop": 80008,
     "orderneed": [
       {
         "a": "item",
@@ -541,7 +621,7 @@
       "text": "战斗装备"
     },
     "ico": "tjp_zb_03",
-    "color": 6
+    "color": 4
   },
   {
     "id": 1009,
@@ -568,28 +648,38 @@
     "floors": 5,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10041",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10042",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10043",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10004",
+        "a": "equi",
+        "t": "10044",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10045",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10046",
         "n": 1
       }
     ],
     "using": 1,
-    "drop": 1009,
+    "drop": 80009,
     "orderneed": [
       {
         "a": "item",
@@ -609,7 +699,7 @@
       "text": "战斗装备"
     },
     "ico": "tjp_zb_03",
-    "color": 6
+    "color": 5
   },
   {
     "id": 1010,
@@ -625,28 +715,38 @@
     "floors": 5,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10051",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10052",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10053",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10004",
+        "a": "equi",
+        "t": "10054",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10055",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10056",
         "n": 1
       }
     ],
     "using": 1,
-    "drop": 1010,
+    "drop": 80010,
     "orderneed": [
       {
         "a": "item",
@@ -693,28 +793,38 @@
     "floors": 5,
     "dropshow": [
       {
-        "a": "item",
+        "a": "equi",
         "t": "10001",
         "n": 1
       },
       {
-        "a": "item",
+        "a": "equi",
         "t": "10002",
         "n": 1
       },
       {
-        "a": "item",
+        "a": "equi",
         "t": "10003",
         "n": 1
       },
       {
-        "a": "item",
+        "a": "equi",
         "t": "10004",
         "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10005",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10006",
+        "n": 1
       }
     ],
     "using": 1,
-    "drop": 1011,
+    "drop": 80001,
     "orderneed": [
       {
         "a": "item",
@@ -761,28 +871,38 @@
     "floors": 5,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10011",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10012",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10013",
         "n": 1
       },
       {
-        "a": "item",
+        "a": "equi",
         "t": "10004",
         "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10005",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10006",
+        "n": 1
       }
     ],
     "using": 1,
-    "drop": 1012,
+    "drop": 80002,
     "orderneed": [
       {
         "a": "item",
@@ -802,7 +922,7 @@
       "text": "辅助装备"
     },
     "ico": "tjp_zb_01",
-    "color": 2
+    "color": 1
   },
   {
     "id": 2003,
@@ -829,28 +949,38 @@
     "floors": 5,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10011",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10012",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10013",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10004",
+        "a": "equi",
+        "t": "10014",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10015",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10016",
         "n": 1
       }
     ],
     "using": 1,
-    "drop": 1013,
+    "drop": 80003,
     "orderneed": [
       {
         "a": "item",
@@ -870,7 +1000,7 @@
       "text": "辅助装备"
     },
     "ico": "tjp_zb_01",
-    "color": 3
+    "color": 2
   },
   {
     "id": 2004,
@@ -897,28 +1027,38 @@
     "floors": 5,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10021",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10022",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10023",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10004",
+        "a": "equi",
+        "t": "10014",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10015",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10016",
         "n": 1
       }
     ],
     "using": 1,
-    "drop": 1014,
+    "drop": 80004,
     "orderneed": [
       {
         "a": "item",
@@ -938,7 +1078,7 @@
       "text": "辅助装备"
     },
     "ico": "tjp_zb_01",
-    "color": 4
+    "color": 2
   },
   {
     "id": 2005,
@@ -965,28 +1105,38 @@
     "floors": 5,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10021",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10022",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10023",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10004",
+        "a": "equi",
+        "t": "10024",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10025",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10026",
         "n": 1
       }
     ],
     "using": 1,
-    "drop": 1015,
+    "drop": 80005,
     "orderneed": [
       {
         "a": "item",
@@ -1006,7 +1156,7 @@
       "text": "辅助装备"
     },
     "ico": "tjp_zb_01",
-    "color": 5
+    "color": 3
   },
   {
     "id": 2006,
@@ -1033,28 +1183,38 @@
     "floors": 5,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10031",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10032",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10033",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10004",
+        "a": "equi",
+        "t": "10024",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10025",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10026",
         "n": 1
       }
     ],
     "using": 1,
-    "drop": 1016,
+    "drop": 80006,
     "orderneed": [
       {
         "a": "item",
@@ -1074,7 +1234,7 @@
       "text": "辅助装备"
     },
     "ico": "tjp_zb_01",
-    "color": 6
+    "color": 3
   },
   {
     "id": 2007,
@@ -1101,28 +1261,38 @@
     "floors": 5,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10031",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10032",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10033",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10004",
+        "a": "equi",
+        "t": "10034",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10035",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10036",
         "n": 1
       }
     ],
     "using": 1,
-    "drop": 1017,
+    "drop": 80007,
     "orderneed": [
       {
         "a": "item",
@@ -1142,7 +1312,7 @@
       "text": "辅助装备"
     },
     "ico": "tjp_zb_01",
-    "color": 6
+    "color": 4
   },
   {
     "id": 2008,
@@ -1169,28 +1339,38 @@
     "floors": 5,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10041",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10042",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10043",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10004",
+        "a": "equi",
+        "t": "10034",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10035",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10036",
         "n": 1
       }
     ],
     "using": 1,
-    "drop": 1018,
+    "drop": 80008,
     "orderneed": [
       {
         "a": "item",
@@ -1210,7 +1390,7 @@
       "text": "辅助装备"
     },
     "ico": "tjp_zb_01",
-    "color": 6
+    "color": 4
   },
   {
     "id": 2009,
@@ -1237,28 +1417,38 @@
     "floors": 5,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10041",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10042",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10043",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10004",
+        "a": "equi",
+        "t": "10044",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10045",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10046",
         "n": 1
       }
     ],
     "using": 1,
-    "drop": 1019,
+    "drop": 80009,
     "orderneed": [
       {
         "a": "item",
@@ -1278,7 +1468,7 @@
       "text": "辅助装备"
     },
     "ico": "tjp_zb_01",
-    "color": 6
+    "color": 5
   },
   {
     "id": 2010,
@@ -1294,28 +1484,38 @@
     "floors": 5,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10051",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10052",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10053",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10004",
+        "a": "equi",
+        "t": "10054",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10055",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10056",
         "n": 1
       }
     ],
     "using": 1,
-    "drop": 1020,
+    "drop": 80010,
     "orderneed": [
       {
         "a": "item",
@@ -1362,28 +1562,38 @@
     "floors": 5,
     "dropshow": [
       {
-        "a": "item",
+        "a": "equi",
         "t": "10001",
         "n": 1
       },
       {
-        "a": "item",
+        "a": "equi",
         "t": "10002",
         "n": 1
       },
       {
-        "a": "item",
+        "a": "equi",
         "t": "10003",
         "n": 1
       },
       {
-        "a": "item",
+        "a": "equi",
         "t": "10004",
         "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10005",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10006",
+        "n": 1
       }
     ],
     "using": 1,
-    "drop": 1021,
+    "drop": 80001,
     "orderneed": [
       {
         "a": "item",
@@ -1430,28 +1640,38 @@
     "floors": 5,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10011",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10012",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10013",
         "n": 1
       },
       {
-        "a": "item",
+        "a": "equi",
         "t": "10004",
         "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10005",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10006",
+        "n": 1
       }
     ],
     "using": 1,
-    "drop": 1022,
+    "drop": 80002,
     "orderneed": [
       {
         "a": "item",
@@ -1471,7 +1691,7 @@
       "text": "特殊装备"
     },
     "ico": "tjp_zb_02",
-    "color": 2
+    "color": 1
   },
   {
     "id": 3003,
@@ -1498,28 +1718,38 @@
     "floors": 5,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10011",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10012",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10013",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10004",
+        "a": "equi",
+        "t": "10014",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10015",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10016",
         "n": 1
       }
     ],
     "using": 1,
-    "drop": 1023,
+    "drop": 80003,
     "orderneed": [
       {
         "a": "item",
@@ -1539,7 +1769,7 @@
       "text": "特殊装备"
     },
     "ico": "tjp_zb_02",
-    "color": 3
+    "color": 2
   },
   {
     "id": 3004,
@@ -1566,28 +1796,38 @@
     "floors": 5,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10021",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10022",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10023",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10004",
+        "a": "equi",
+        "t": "10014",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10015",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10016",
         "n": 1
       }
     ],
     "using": 1,
-    "drop": 1024,
+    "drop": 80004,
     "orderneed": [
       {
         "a": "item",
@@ -1607,7 +1847,7 @@
       "text": "特殊装备"
     },
     "ico": "tjp_zb_02",
-    "color": 4
+    "color": 2
   },
   {
     "id": 3005,
@@ -1634,28 +1874,38 @@
     "floors": 5,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10021",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10022",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10023",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10004",
+        "a": "equi",
+        "t": "10024",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10025",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10026",
         "n": 1
       }
     ],
     "using": 1,
-    "drop": 1025,
+    "drop": 80005,
     "orderneed": [
       {
         "a": "item",
@@ -1675,7 +1925,7 @@
       "text": "特殊装备"
     },
     "ico": "tjp_zb_02",
-    "color": 5
+    "color": 3
   },
   {
     "id": 3006,
@@ -1702,28 +1952,38 @@
     "floors": 5,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10031",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10032",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10033",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10004",
+        "a": "equi",
+        "t": "10024",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10025",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10026",
         "n": 1
       }
     ],
     "using": 1,
-    "drop": 1026,
+    "drop": 80006,
     "orderneed": [
       {
         "a": "item",
@@ -1743,7 +2003,7 @@
       "text": "特殊装备"
     },
     "ico": "tjp_zb_02",
-    "color": 6
+    "color": 3
   },
   {
     "id": 3007,
@@ -1770,28 +2030,38 @@
     "floors": 5,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10031",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10032",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10033",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10004",
+        "a": "equi",
+        "t": "10034",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10035",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10036",
         "n": 1
       }
     ],
     "using": 1,
-    "drop": 1027,
+    "drop": 80007,
     "orderneed": [
       {
         "a": "item",
@@ -1811,7 +2081,7 @@
       "text": "特殊装备"
     },
     "ico": "tjp_zb_02",
-    "color": 6
+    "color": 4
   },
   {
     "id": 3008,
@@ -1838,28 +2108,38 @@
     "floors": 5,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10041",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10042",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10043",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10004",
+        "a": "equi",
+        "t": "10034",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10035",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10036",
         "n": 1
       }
     ],
     "using": 1,
-    "drop": 1028,
+    "drop": 80008,
     "orderneed": [
       {
         "a": "item",
@@ -1879,7 +2159,7 @@
       "text": "特殊装备"
     },
     "ico": "tjp_zb_02",
-    "color": 6
+    "color": 4
   },
   {
     "id": 3009,
@@ -1906,28 +2186,38 @@
     "floors": 5,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10041",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10042",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10043",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10004",
+        "a": "equi",
+        "t": "10044",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10045",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10046",
         "n": 1
       }
     ],
     "using": 1,
-    "drop": 1029,
+    "drop": 80009,
     "orderneed": [
       {
         "a": "item",
@@ -1947,7 +2237,7 @@
       "text": "特殊装备"
     },
     "ico": "tjp_zb_02",
-    "color": 6
+    "color": 5
   },
   {
     "id": 3010,
@@ -1963,28 +2253,38 @@
     "floors": 5,
     "dropshow": [
       {
-        "a": "item",
-        "t": "10001",
+        "a": "equi",
+        "t": "10051",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10002",
+        "a": "equi",
+        "t": "10052",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10003",
+        "a": "equi",
+        "t": "10053",
         "n": 1
       },
       {
-        "a": "item",
-        "t": "10004",
+        "a": "equi",
+        "t": "10054",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10055",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10056",
         "n": 1
       }
     ],
     "using": 1,
-    "drop": 1030,
+    "drop": 80010,
     "orderneed": [
       {
         "a": "item",
diff --git a/bin/json/game_taskround.json b/bin/json/game_taskround.json
index a5025ed54..edeb0cd42 100644
--- a/bin/json/game_taskround.json
+++ b/bin/json/game_taskround.json
@@ -7,7 +7,7 @@
       "key": "task_10001",
       "text": "进行1次普通招募"
     },
-    "type_id": 2008001,
+    "type_id": 2018001,
     "active": 20,
     "id_after": 0,
     "jump_interface": 107,
@@ -22,7 +22,7 @@
       "key": "task_10002",
       "text": "为任意英雄提升1次等级"
     },
-    "type_id": 2012001,
+    "type_id": 2024001,
     "active": 20,
     "id_after": 0,
     "jump_interface": 103,
@@ -37,7 +37,7 @@
       "key": "task_10004",
       "text": "强化任意装备成功1次"
     },
-    "type_id": 2024001,
+    "type_id": 2047001,
     "active": 20,
     "id_after": 0,
     "jump_interface": 102,
@@ -52,7 +52,7 @@
       "key": "task_10006",
       "text": "在商店购买任意1件商品"
     },
-    "type_id": 2062001,
+    "type_id": 2064001,
     "active": 20,
     "id_after": 0,
     "jump_interface": 122,
@@ -67,7 +67,7 @@
       "key": "task_10007",
       "text": "使用好友助战英雄战斗1次"
     },
-    "type_id": 2064001,
+    "type_id": 2012001,
     "active": 20,
     "id_after": 0,
     "jump_interface": 113,
@@ -97,7 +97,7 @@
       "key": "task_20002",
       "text": "进行10次普通招募"
     },
-    "type_id": 3008001,
+    "type_id": 3018001,
     "active": 20,
     "id_after": 0,
     "jump_interface": 107,
@@ -112,7 +112,7 @@
       "key": "task_20003",
       "text": "为任意英雄提升10次等级"
     },
-    "type_id": 3012001,
+    "type_id": 3024001,
     "active": 20,
     "id_after": 0,
     "jump_interface": 103,
@@ -127,7 +127,7 @@
       "key": "task_20005",
       "text": "强化任意装备成功6次"
     },
-    "type_id": 3024001,
+    "type_id": 3047001,
     "active": 20,
     "id_after": 0,
     "jump_interface": 102,
@@ -142,7 +142,7 @@
       "key": "task_20007",
       "text": "在商店购买任意7件商品"
     },
-    "type_id": 3061001,
+    "type_id": 3064001,
     "active": 30,
     "id_after": 0,
     "jump_interface": 122,
@@ -157,7 +157,7 @@
       "key": "task_20008",
       "text": "使用好友助战英雄战斗7次"
     },
-    "type_id": 3064001,
+    "type_id": 3012001,
     "active": 30,
     "id_after": 0,
     "jump_interface": 113,
diff --git a/sys/configure/structs/Game.BuffType.go b/sys/configure/structs/Game.BuffType.go
index 0efd42b4f..3539c2494 100644
--- a/sys/configure/structs/Game.BuffType.go
+++ b/sys/configure/structs/Game.BuffType.go
@@ -102,4 +102,12 @@ const (
     GameBuffType_IMMUNEACTVALUEDOWN = 90
     GameBuffType_LOSEHPADDCAUSEDAM_UP = 91
     GameBuffType_TARGETLOSTHPCAUSEDAM_UP = 92
+    GameBuffType_LOSTPERHPADDTRE = 93
+    GameBuffType_CHAIN = 94
+    GameBuffType_DISASTER_ICE_FIELD = 95
+    GameBuffType_HORUS_EYE = 96
+    GameBuffType_LIFE_DEATH_BOOK = 97
+    GameBuffType_BUFF_COUNT_ADD_DMG = 98
+    GameBuffType_CRIT_ADD_THIS_TIME_DMG = 99
+    GameBuffType_POISON_ADD_THIS_TIME_DMG = 100
 )
diff --git a/sys/configure/structs/Game.CombatLevelData.go b/sys/configure/structs/Game.CombatLevelData.go
index 944fa2a35..a69c3e9e0 100644
--- a/sys/configure/structs/Game.CombatLevelData.go
+++ b/sys/configure/structs/Game.CombatLevelData.go
@@ -13,11 +13,14 @@ import "errors"
 type GameCombatLevelData struct {
     Id int32
     Scene string
+    Levelname string
     FormatList []int32
     Droplist []int32
     PassformatList []int32
     Passdroplist []int32
     Award []*Gameatn
+    Scenemusic string
+    Atmosphere string
 }
 
 const TypeId_GameCombatLevelData = 1556955838
@@ -29,6 +32,7 @@ func (*GameCombatLevelData) GetTypeId() int32 {
 func (_v *GameCombatLevelData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
     { var _ok_ bool; if _v.Scene, _ok_ = _buf["scene"].(string); !_ok_ { err = errors.New("scene error"); return } }
+    { var _ok_ bool; if _v.Levelname, _ok_ = _buf["levelname"].(string); !_ok_ { err = errors.New("levelname error"); return } }
      {
                 var _arr_ []interface{}
                 var _ok_ bool
@@ -99,6 +103,8 @@ func (_v *GameCombatLevelData)Deserialize(_buf map[string]interface{}) (err erro
                 }
             }
 
+    { var _ok_ bool; if _v.Scenemusic, _ok_ = _buf["scenemusic"].(string); !_ok_ { err = errors.New("scenemusic error"); return } }
+    { var _ok_ bool; if _v.Atmosphere, _ok_ = _buf["atmosphere"].(string); !_ok_ { err = errors.New("atmosphere error"); return } }
     return
 }
 
diff --git a/sys/configure/structs/Game.FightGlobalEvent.go b/sys/configure/structs/Game.FightGlobalEvent.go
new file mode 100644
index 000000000..fec913481
--- /dev/null
+++ b/sys/configure/structs/Game.FightGlobalEvent.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameFightGlobalEvent struct {
+    _dataMap map[int32]*GameFightGlobalEventData
+    _dataList []*GameFightGlobalEventData
+}
+
+func NewGameFightGlobalEvent(_buf []map[string]interface{}) (*GameFightGlobalEvent, error) {
+	_dataList := make([]*GameFightGlobalEventData, 0, len(_buf))
+	dataMap := make(map[int32]*GameFightGlobalEventData)
+	for _, _ele_ := range _buf {
+		if _v, err2 := DeserializeGameFightGlobalEventData(_ele_); err2 != nil {
+			return nil, err2
+		} else {
+			_dataList = append(_dataList, _v)
+			dataMap[_v.Id] = _v
+		}
+	}
+	return &GameFightGlobalEvent{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameFightGlobalEvent) GetDataMap() map[int32]*GameFightGlobalEventData {
+    return table._dataMap
+}
+
+func (table *GameFightGlobalEvent) GetDataList() []*GameFightGlobalEventData {
+    return table._dataList
+}
+
+func (table *GameFightGlobalEvent) Get(key int32) *GameFightGlobalEventData {
+    return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.FightGlobalEventData.go b/sys/configure/structs/Game.FightGlobalEventData.go
new file mode 100644
index 000000000..49f248fdf
--- /dev/null
+++ b/sys/configure/structs/Game.FightGlobalEventData.go
@@ -0,0 +1,85 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameFightGlobalEventData struct {
+    Id int32
+    Count int32
+    Desc string
+    When int32
+    FromCheck string
+    TargetCheck string
+    MainSkillCheck string
+    AfterSkillCheck string
+    BuffCheck string
+    FightEndCheck string
+    AddCon []string
+    Execution int32
+    Args []int32
+}
+
+const TypeId_GameFightGlobalEventData = 1534270285
+
+func (*GameFightGlobalEventData) GetTypeId() int32 {
+    return 1534270285
+}
+
+func (_v *GameFightGlobalEventData)Deserialize(_buf map[string]interface{}) (err error) {
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Id"].(float64); !_ok_ { err = errors.New("Id error"); return }; _v.Id = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Count"].(float64); !_ok_ { err = errors.New("Count error"); return }; _v.Count = int32(_tempNum_) }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["desc"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["When"].(float64); !_ok_ { err = errors.New("When error"); return }; _v.When = int32(_tempNum_) }
+    { var _ok_ bool; if _v.FromCheck, _ok_ = _buf["FromCheck"].(string); !_ok_ { err = errors.New("FromCheck error"); return } }
+    { var _ok_ bool; if _v.TargetCheck, _ok_ = _buf["TargetCheck"].(string); !_ok_ { err = errors.New("TargetCheck error"); return } }
+    { var _ok_ bool; if _v.MainSkillCheck, _ok_ = _buf["MainSkillCheck"].(string); !_ok_ { err = errors.New("MainSkillCheck error"); return } }
+    { var _ok_ bool; if _v.AfterSkillCheck, _ok_ = _buf["AfterSkillCheck"].(string); !_ok_ { err = errors.New("AfterSkillCheck error"); return } }
+    { var _ok_ bool; if _v.BuffCheck, _ok_ = _buf["BuffCheck"].(string); !_ok_ { err = errors.New("BuffCheck error"); return } }
+    { var _ok_ bool; if _v.FightEndCheck, _ok_ = _buf["FightEndCheck"].(string); !_ok_ { err = errors.New("FightEndCheck error"); return } }
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["AddCon"].([]interface{}); !_ok_ { err = errors.New("AddCon error"); return }
+
+                _v.AddCon = make([]string, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ string
+                    {  if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
+                    _v.AddCon = append(_v.AddCon, _list_v_)
+                }
+            }
+
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Execution"].(float64); !_ok_ { err = errors.New("Execution error"); return }; _v.Execution = int32(_tempNum_) }
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["Args"].([]interface{}); !_ok_ { err = errors.New("Args error"); return }
+
+                _v.Args = make([]int32, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ int32
+                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+                    _v.Args = append(_v.Args, _list_v_)
+                }
+            }
+
+    return
+}
+
+func DeserializeGameFightGlobalEventData(_buf map[string]interface{}) (*GameFightGlobalEventData, error) {
+    v := &GameFightGlobalEventData{}
+    if err := v.Deserialize(_buf); err == nil {
+        return v, nil
+    } else {
+        return nil, err
+    }
+}
diff --git a/sys/configure/structs/Game.Help.go b/sys/configure/structs/Game.Help.go
new file mode 100644
index 000000000..457fe8c5d
--- /dev/null
+++ b/sys/configure/structs/Game.Help.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameHelp struct {
+    _dataMap map[string]*GameHelpData
+    _dataList []*GameHelpData
+}
+
+func NewGameHelp(_buf []map[string]interface{}) (*GameHelp, error) {
+	_dataList := make([]*GameHelpData, 0, len(_buf))
+	dataMap := make(map[string]*GameHelpData)
+	for _, _ele_ := range _buf {
+		if _v, err2 := DeserializeGameHelpData(_ele_); err2 != nil {
+			return nil, err2
+		} else {
+			_dataList = append(_dataList, _v)
+			dataMap[_v.Key] = _v
+		}
+	}
+	return &GameHelp{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameHelp) GetDataMap() map[string]*GameHelpData {
+    return table._dataMap
+}
+
+func (table *GameHelp) GetDataList() []*GameHelpData {
+    return table._dataList
+}
+
+func (table *GameHelp) Get(key string) *GameHelpData {
+    return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.HelpData.go b/sys/configure/structs/Game.HelpData.go
new file mode 100644
index 000000000..040193f6a
--- /dev/null
+++ b/sys/configure/structs/Game.HelpData.go
@@ -0,0 +1,39 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameHelpData struct {
+    Key string
+    Title string
+    Text string
+}
+
+const TypeId_GameHelpData = 1342977287
+
+func (*GameHelpData) GetTypeId() int32 {
+    return 1342977287
+}
+
+func (_v *GameHelpData)Deserialize(_buf map[string]interface{}) (err error) {
+    { var _ok_ bool; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["title"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Title error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Title, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Text error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Text, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    return
+}
+
+func DeserializeGameHelpData(_buf map[string]interface{}) (*GameHelpData, error) {
+    v := &GameHelpData{}
+    if err := v.Deserialize(_buf); err == nil {
+        return v, nil
+    } else {
+        return nil, err
+    }
+}
diff --git a/sys/configure/structs/Game.HeroMethodComment.go b/sys/configure/structs/Game.HeroMethodComment.go
new file mode 100644
index 000000000..978468d11
--- /dev/null
+++ b/sys/configure/structs/Game.HeroMethodComment.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameHeroMethodComment struct {
+    _dataMap map[int32]*GameHeroMethodCommentData
+    _dataList []*GameHeroMethodCommentData
+}
+
+func NewGameHeroMethodComment(_buf []map[string]interface{}) (*GameHeroMethodComment, error) {
+	_dataList := make([]*GameHeroMethodCommentData, 0, len(_buf))
+	dataMap := make(map[int32]*GameHeroMethodCommentData)
+	for _, _ele_ := range _buf {
+		if _v, err2 := DeserializeGameHeroMethodCommentData(_ele_); err2 != nil {
+			return nil, err2
+		} else {
+			_dataList = append(_dataList, _v)
+			dataMap[_v.Id] = _v
+		}
+	}
+	return &GameHeroMethodComment{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameHeroMethodComment) GetDataMap() map[int32]*GameHeroMethodCommentData {
+    return table._dataMap
+}
+
+func (table *GameHeroMethodComment) GetDataList() []*GameHeroMethodCommentData {
+    return table._dataList
+}
+
+func (table *GameHeroMethodComment) Get(key int32) *GameHeroMethodCommentData {
+    return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.HeroMethodCommentData.go b/sys/configure/structs/Game.HeroMethodCommentData.go
new file mode 100644
index 000000000..b72b4427a
--- /dev/null
+++ b/sys/configure/structs/Game.HeroMethodCommentData.go
@@ -0,0 +1,37 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameHeroMethodCommentData struct {
+    Id int32
+    Comment string
+}
+
+const TypeId_GameHeroMethodCommentData = 519552306
+
+func (*GameHeroMethodCommentData) GetTypeId() int32 {
+    return 519552306
+}
+
+func (_v *GameHeroMethodCommentData)Deserialize(_buf map[string]interface{}) (err error) {
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["comment"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Comment error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Comment, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    return
+}
+
+func DeserializeGameHeroMethodCommentData(_buf map[string]interface{}) (*GameHeroMethodCommentData, error) {
+    v := &GameHeroMethodCommentData{}
+    if err := v.Deserialize(_buf); err == nil {
+        return v, nil
+    } else {
+        return nil, err
+    }
+}
diff --git a/sys/configure/structs/Game.HuntingOpenTimeData.go b/sys/configure/structs/Game.HuntingOpenTimeData.go
index ca2a59260..40fb7efbb 100644
--- a/sys/configure/structs/Game.HuntingOpenTimeData.go
+++ b/sys/configure/structs/Game.HuntingOpenTimeData.go
@@ -16,6 +16,7 @@ type GameHuntingOpenTimeData struct {
     Name string
     Introduce string
     Opentimetext string
+    Bg string
 }
 
 const TypeId_GameHuntingOpenTimeData = 1854578068
@@ -43,6 +44,7 @@ func (_v *GameHuntingOpenTimeData)Deserialize(_buf map[string]interface{}) (err
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["introduce"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Introduce error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Introduce, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["opentimetext"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Opentimetext error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Opentimetext, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    { var _ok_ bool; if _v.Bg, _ok_ = _buf["bg"].(string); !_ok_ { err = errors.New("bg error"); return } }
     return
 }
 
diff --git a/sys/configure/structs/Game.RedDotGroup.go b/sys/configure/structs/Game.RedDotGroup.go
new file mode 100644
index 000000000..2f71a5a73
--- /dev/null
+++ b/sys/configure/structs/Game.RedDotGroup.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameRedDotGroup struct {
+    _dataMap map[int32]*GameRedDotGroupData
+    _dataList []*GameRedDotGroupData
+}
+
+func NewGameRedDotGroup(_buf []map[string]interface{}) (*GameRedDotGroup, error) {
+	_dataList := make([]*GameRedDotGroupData, 0, len(_buf))
+	dataMap := make(map[int32]*GameRedDotGroupData)
+	for _, _ele_ := range _buf {
+		if _v, err2 := DeserializeGameRedDotGroupData(_ele_); err2 != nil {
+			return nil, err2
+		} else {
+			_dataList = append(_dataList, _v)
+			dataMap[_v.Id] = _v
+		}
+	}
+	return &GameRedDotGroup{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameRedDotGroup) GetDataMap() map[int32]*GameRedDotGroupData {
+    return table._dataMap
+}
+
+func (table *GameRedDotGroup) GetDataList() []*GameRedDotGroupData {
+    return table._dataList
+}
+
+func (table *GameRedDotGroup) Get(key int32) *GameRedDotGroupData {
+    return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.RedDotGroupData.go b/sys/configure/structs/Game.RedDotGroupData.go
new file mode 100644
index 000000000..54c3fdeff
--- /dev/null
+++ b/sys/configure/structs/Game.RedDotGroupData.go
@@ -0,0 +1,43 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameRedDotGroupData struct {
+    Id int32
+    Type int32
+    Group string
+    Layer string
+    Header string
+}
+
+const TypeId_GameRedDotGroupData = -1285083979
+
+func (*GameRedDotGroupData) GetTypeId() int32 {
+    return -1285083979
+}
+
+func (_v *GameRedDotGroupData)Deserialize(_buf map[string]interface{}) (err error) {
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
+    { var _ok_ bool; if _v.Group, _ok_ = _buf["group"].(string); !_ok_ { err = errors.New("group error"); return } }
+    { var _ok_ bool; if _v.Layer, _ok_ = _buf["layer"].(string); !_ok_ { err = errors.New("layer error"); return } }
+    { var _ok_ bool; if _v.Header, _ok_ = _buf["header"].(string); !_ok_ { err = errors.New("header error"); return } }
+    return
+}
+
+func DeserializeGameRedDotGroupData(_buf map[string]interface{}) (*GameRedDotGroupData, error) {
+    v := &GameRedDotGroupData{}
+    if err := v.Deserialize(_buf); err == nil {
+        return v, nil
+    } else {
+        return nil, err
+    }
+}
diff --git a/sys/configure/structs/Game.SkillEffectType.go b/sys/configure/structs/Game.SkillEffectType.go
index 8aa48fb33..8ef270700 100644
--- a/sys/configure/structs/Game.SkillEffectType.go
+++ b/sys/configure/structs/Game.SkillEffectType.go
@@ -39,4 +39,6 @@ const (
     GameSkillEffectType_StealBuff = 28
     GameSkillEffectType_BuffDmg = 29
     GameSkillEffectType_ShiftOurAllBuff = 30
+    GameSkillEffectType_DrawActValueToTeam = 31
+    GameSkillEffectType_SpecialTre = 32
 )
diff --git a/sys/configure/structs/Game.TaskCondData.go b/sys/configure/structs/Game.TaskCondData.go
index ef4f3231f..fcea43388 100644
--- a/sys/configure/structs/Game.TaskCondData.go
+++ b/sys/configure/structs/Game.TaskCondData.go
@@ -12,9 +12,7 @@ import "errors"
 
 type GameTaskCondData struct {
     Id int32
-    Datatype int32
     Type int32
-    Inited []int32
     Data1 int32
     Data2 int32
     Data3 int32
@@ -30,22 +28,7 @@ func (*GameTaskCondData) GetTypeId() int32 {
 
 func (_v *GameTaskCondData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["datatype"].(float64); !_ok_ { err = errors.New("datatype error"); return }; _v.Datatype = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
-     {
-                var _arr_ []interface{}
-                var _ok_ bool
-                if _arr_, _ok_ = _buf["inited"].([]interface{}); !_ok_ { err = errors.New("inited error"); return }
-
-                _v.Inited = make([]int32, 0, len(_arr_))
-                
-                for _, _e_ := range _arr_ {
-                    var _list_v_ int32
-                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
-                    _v.Inited = append(_v.Inited, _list_v_)
-                }
-            }
-
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data1"].(float64); !_ok_ { err = errors.New("data1 error"); return }; _v.Data1 = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data2"].(float64); !_ok_ { err = errors.New("data2 error"); return }; _v.Data2 = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data3"].(float64); !_ok_ { err = errors.New("data3 error"); return }; _v.Data3 = int32(_tempNum_) }
diff --git a/sys/configure/structs/Game.TaskTypeData.go b/sys/configure/structs/Game.TaskTypeData.go
index 404cfa990..9294b950d 100644
--- a/sys/configure/structs/Game.TaskTypeData.go
+++ b/sys/configure/structs/Game.TaskTypeData.go
@@ -18,7 +18,6 @@ type GameTaskTypeData struct {
     Data2 string
     Data3 string
     Data4 string
-    Data5 string
 }
 
 const TypeId_GameTaskTypeData = -1813579995
@@ -35,7 +34,6 @@ func (_v *GameTaskTypeData)Deserialize(_buf map[string]interface{}) (err error)
     { var _ok_ bool; if _v.Data2, _ok_ = _buf["data2"].(string); !_ok_ { err = errors.New("data2 error"); return } }
     { var _ok_ bool; if _v.Data3, _ok_ = _buf["data3"].(string); !_ok_ { err = errors.New("data3 error"); return } }
     { var _ok_ bool; if _v.Data4, _ok_ = _buf["data4"].(string); !_ok_ { err = errors.New("data4 error"); return } }
-    { var _ok_ bool; if _v.Data5, _ok_ = _buf["data5"].(string); !_ok_ { err = errors.New("data5 error"); return } }
     return
 }
 
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index 979ba3054..91958249d 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -11,1013 +11,992 @@ package cfg
 type JsonLoader func(string) ([]map[string]interface{}, error)
 
 type Tables struct {
-	Global             *GameGlobal
-	Extservers         *GameExtservers
-	SkillAtk           *GameSkillAtk
-	SkillAfteratk      *GameSkillAfteratk
-	SkillBuff          *GameSkillBuff
-	SkillPassive       *GameSkillPassive
-	Hero               *GameHero
-	HeroStargrow       *GameHeroStargrow
-	HeroLevelgrow      *GameHeroLevelgrow
-	HeroStarup         *GameHeroStarup
-	HeroExp            *GameHeroExp
-	HeroLevelup        *GameHeroLevelup
-	Equip              *GameEquip
-	EquipAttrlibrary   *GameEquipAttrlibrary
-	EquipSuit          *GameEquipSuit
-	EquipColor         *GameEquipColor
-	EquipIntensify     *GameEquipIntensify
-	EquipSCompose      *GameEquipSCompose
-	EquipAttribute     *GameEquipAttribute
-	EquipEnchanting    *GameEquipEnchanting
-	Item               *GameItem
-	HeroSkillLevel     *GameHeroSkillLevel
-	HeroResonance      *GameHeroResonance
-	HeroAwaken         *GameHeroAwaken
-	HeroMethod         *GameHeroMethod
-	Shop               *GameShop
-	Shopitem           *GameShopitem
-	ActiveReward       *GameActiveReward
-	Model              *GameModel
-	MainlineChapter    *GameMainlineChapter
-	Mainline           *GameMainline
-	DrawCard           *GameDrawCard
-	ChatChannel        *GameChatChannel
-	ChatSystem         *GameChatSystem
-	ChatServerGroup    *GameChatServerGroup
-	ChatChannelCom     *GameChatChannelCom
-	ChatExpression     *GameChatExpression
-	TaskRound          *GameTaskRound
-	TaskActiveReward   *GameTaskActiveReward
-	Coin               *GameCoin
-	Initial            *GameInitial
-	Monster            *GameMonster
-	EquipPos           *GameEquipPos
-	Playerlv           *GamePlayerlv
-	Facemod            *GameFacemod
-	Msgdistrib         *GameMsgdistrib
-	Opencond           *GameOpencond
-	Stroy              *GameStroy
-	Pagoda             *GamePagoda
-	PagodaTaskReward   *GamePagodaTaskReward
-	SeasonLoop         *GameSeasonLoop
-	PagodaSeasonReward *GamePagodaSeasonReward
-	Rdtask             *GameRdtask
-	RdtaskCondi        *GameRdtaskCondi
-	RdtaskChoose       *GameRdtaskChoose
-	RdtaskSide         *GameRdtaskSide
-	RdtaskBattle       *GameRdtaskBattle
-	KungfuUnlock       *GameKungfuUnlock
-	KungfuMasterworker *GameKungfuMasterworker
-	Gourmet            *GameGourmet
-	Drop               *GameDrop
-	Smithy             *GameSmithy
-	SmithyStove        *GameSmithyStove
-	SmithyText         *GameSmithyText
-	VikingBoss         *GameVikingBoss
-	VikingChallenge    *GameVikingChallenge
-	VikingLineup       *GameVikingLineup
-	VikingEntrance     *GameVikingEntrance
-	DreamlandBoos      *GameDreamlandBoos
-	DreamlandChallenge *GameDreamlandChallenge
-	DreamlandTrigger   *GameDreamlandTrigger
-	HuntingBoss        *GameHuntingBoss
-	HuntingChallenge   *GameHuntingChallenge
-	HuntingOpenTime    *GameHuntingOpenTime
-	HuntingLineup      *GameHuntingLineup
-	MonsterFormat      *GameMonsterFormat
-	Link               *GameLink
-	GetResource        *GameGetResource
-	Affix              *GameAffix
-	VikingBossSkill    *GameVikingBossSkill
-	LibraryFetter      *GameLibraryFetter
-	LibraryStory       *GameLibraryStory
-	LibraryHero        *GameLibraryHero
-	LibraryHistory     *GameLibraryHistory
-	LibraryFavor       *GameLibraryFavor
-	LibraryFavorlv     *GameLibraryFavorlv
-	LibraryBubble      *GameLibraryBubble
-	LibraryPlayBack    *GameLibraryPlayBack
-	Robot              *GameRobot
-	Ip                 *GameIp
-	GameColor          *GameGameColor
-	NameLibrary        *GameNameLibrary
-	HeroConvertdata    *GameHeroConvertdata
-	LinestoryTimeLine  *GameLinestoryTimeLine
-	LinestoryMainTask  *GameLinestoryMainTask
-	Captaintext        *GameCaptaintext
-	Herofusion         *GameHerofusion
-	PlayerInfor        *GamePlayerInfor
-	HeroTalent         *GameHeroTalent
-	TalentSkill        *GameTalentSkill
-	ArenaBuyChallenge  *GameArenaBuyChallenge
-	ArenaActiveReward  *GameArenaActiveReward
-	ArenaRobot         *GameArenaRobot
-	ArenaRankReward    *GameArenaRankReward
-	ArenaChallengeNpc  *GameArenaChallengeNpc
-	ItemBox            *GameItemBox
-	Show               *GameShow
-	GuildLv            *GameGuildLv
-	GuildPng           *GameGuildPng
-	GuildActivity      *GameGuildActivity
-	GuildSign          *GameGuildSign
-	GuildTask          *GameGuildTask
-	TrollRule          *GameTrollRule
-	TrollGoods         *GameTrollGoods
-	TrollTrain         *GameTrollTrain
-	TrollLv            *GameTrollLv
-	TrollCoefficient   *GameTrollCoefficient
-	ProBoss            *GameProBoss
-	ProChallenge       *GameProChallenge
-	ProLineup          *GameProLineup
-	ProBossskill       *GameProBossskill
-	Horoscope          *GameHoroscope
-	Sign               *GameSign
-	SignReset          *GameSignReset
-	GrowTask           *GameGrowTask
-	GrowReward         *GameGrowReward
-	Recharge           *GameRecharge
-	PrivilegeCard      *GamePrivilegeCard
-	Privilege          *GamePrivilege
-	WorldTask          *GameWorldTask
-	TaskCond           *GameTaskCond
-	TaskType           *GameTaskType
-	Teaching           *GameTeaching
-	HeroStrategy       *GameHeroStrategy
-	TeachTask          *GameTeachTask
-	PayPackage         *GamePayPackage
-	WorldBattle        *GameWorldBattle
-	RedDot             *GameRedDot
-	RedDotTalkid       *GameRedDotTalkid
-	PassCheck          *GamePassCheck
-	Mail               *GameMail
-	CombatLevel        *GameCombatLevel
-	CombatManster      *GameCombatManster
+    Global *GameGlobal
+    Extservers *GameExtservers
+    SkillAtk *GameSkillAtk
+    SkillAfteratk *GameSkillAfteratk
+    SkillBuff *GameSkillBuff
+    SkillPassive *GameSkillPassive
+    Hero *GameHero
+    HeroStargrow *GameHeroStargrow
+    HeroLevelgrow *GameHeroLevelgrow
+    HeroStarup *GameHeroStarup
+    HeroExp *GameHeroExp
+    HeroLevelup *GameHeroLevelup
+    Equip *GameEquip
+    EquipAttrlibrary *GameEquipAttrlibrary
+    EquipSuit *GameEquipSuit
+    EquipColor *GameEquipColor
+    EquipIntensify *GameEquipIntensify
+    EquipSCompose *GameEquipSCompose
+    EquipAttribute *GameEquipAttribute
+    EquipEnchanting *GameEquipEnchanting
+    Item *GameItem
+    HeroSkillLevel *GameHeroSkillLevel
+    HeroResonance *GameHeroResonance
+    HeroAwaken *GameHeroAwaken
+    HeroMethod *GameHeroMethod
+    HeroMethodComment *GameHeroMethodComment
+    Shop *GameShop
+    Shopitem *GameShopitem
+    ActiveReward *GameActiveReward
+    Model *GameModel
+    MainlineChapter *GameMainlineChapter
+    Mainline *GameMainline
+    DrawCard *GameDrawCard
+    ChatChannel *GameChatChannel
+    ChatSystem *GameChatSystem
+    ChatServerGroup *GameChatServerGroup
+    ChatChannelCom *GameChatChannelCom
+    ChatExpression *GameChatExpression
+    TaskRound *GameTaskRound
+    TaskActiveReward *GameTaskActiveReward
+    Coin *GameCoin
+    Initial *GameInitial
+    Monster *GameMonster
+    EquipPos *GameEquipPos
+    Playerlv *GamePlayerlv
+    Facemod *GameFacemod
+    Msgdistrib *GameMsgdistrib
+    Opencond *GameOpencond
+    Stroy *GameStroy
+    Pagoda *GamePagoda
+    PagodaTaskReward *GamePagodaTaskReward
+    SeasonLoop *GameSeasonLoop
+    PagodaSeasonReward *GamePagodaSeasonReward
+    Rdtask *GameRdtask
+    RdtaskCondi *GameRdtaskCondi
+    RdtaskChoose *GameRdtaskChoose
+    RdtaskSide *GameRdtaskSide
+    RdtaskBattle *GameRdtaskBattle
+    KungfuUnlock *GameKungfuUnlock
+    KungfuMasterworker *GameKungfuMasterworker
+    Gourmet *GameGourmet
+    Drop *GameDrop
+    Smithy *GameSmithy
+    SmithyStove *GameSmithyStove
+    SmithyText *GameSmithyText
+    VikingBoss *GameVikingBoss
+    VikingChallenge *GameVikingChallenge
+    VikingLineup *GameVikingLineup
+    VikingEntrance *GameVikingEntrance
+    DreamlandBoos *GameDreamlandBoos
+    DreamlandChallenge *GameDreamlandChallenge
+    DreamlandTrigger *GameDreamlandTrigger
+    HuntingBoss *GameHuntingBoss
+    HuntingChallenge *GameHuntingChallenge
+    HuntingOpenTime *GameHuntingOpenTime
+    HuntingLineup *GameHuntingLineup
+    MonsterFormat *GameMonsterFormat
+    Link *GameLink
+    GetResource *GameGetResource
+    VikingBossSkill *GameVikingBossSkill
+    LibraryFetter *GameLibraryFetter
+    LibraryStory *GameLibraryStory
+    LibraryHero *GameLibraryHero
+    LibraryHistory *GameLibraryHistory
+    LibraryFavor *GameLibraryFavor
+    LibraryFavorlv *GameLibraryFavorlv
+    LibraryBubble *GameLibraryBubble
+    LibraryPlayBack *GameLibraryPlayBack
+    Robot *GameRobot
+    Ip *GameIp
+    NameLibrary *GameNameLibrary
+    HeroConvertdata *GameHeroConvertdata
+    LinestoryTimeLine *GameLinestoryTimeLine
+    LinestoryMainTask *GameLinestoryMainTask
+    Herofusion *GameHerofusion
+    PlayerInfor *GamePlayerInfor
+    HeroTalent *GameHeroTalent
+    TalentSkill *GameTalentSkill
+    ArenaBuyChallenge *GameArenaBuyChallenge
+    ArenaActiveReward *GameArenaActiveReward
+    ArenaRobot *GameArenaRobot
+    ArenaRankReward *GameArenaRankReward
+    ArenaChallengeNpc *GameArenaChallengeNpc
+    ItemBox *GameItemBox
+    Show *GameShow
+    GuildLv *GameGuildLv
+    GuildPng *GameGuildPng
+    GuildActivity *GameGuildActivity
+    GuildSign *GameGuildSign
+    GuildTask *GameGuildTask
+    TrollRule *GameTrollRule
+    TrollGoods *GameTrollGoods
+    TrollTrain *GameTrollTrain
+    TrollLv *GameTrollLv
+    TrollCoefficient *GameTrollCoefficient
+    Horoscope *GameHoroscope
+    Sign *GameSign
+    SignReset *GameSignReset
+    GrowTask *GameGrowTask
+    GrowReward *GameGrowReward
+    Recharge *GameRecharge
+    PrivilegeCard *GamePrivilegeCard
+    Privilege *GamePrivilege
+    WorldTask *GameWorldTask
+    TaskCond *GameTaskCond
+    TaskType *GameTaskType
+    Teaching *GameTeaching
+    HeroStrategy *GameHeroStrategy
+    FightGlobalEvent *GameFightGlobalEvent
+    PayPackage *GamePayPackage
+    WorldBattle *GameWorldBattle
+    RedDot *GameRedDot
+    RedDotTalkid *GameRedDotTalkid
+    RedDotGroup *GameRedDotGroup
+    PassCheck *GamePassCheck
+    Mail *GameMail
+    CombatLevel *GameCombatLevel
+    CombatManster *GameCombatManster
+    CombatBox *GameCombatBox
+    Help *GameHelp
 }
 
 func NewTables(loader JsonLoader) (*Tables, error) {
-	var err error
-	var buf []map[string]interface{}
+    var err error
+    var buf []map[string]interface{}
 
-	tables := &Tables{}
-	if buf, err = loader("game_global"); err != nil {
-		return nil, err
-	}
-	if tables.Global, err = NewGameGlobal(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_extservers"); err != nil {
-		return nil, err
-	}
-	if tables.Extservers, err = NewGameExtservers(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_skillatk"); err != nil {
-		return nil, err
-	}
-	if tables.SkillAtk, err = NewGameSkillAtk(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_skillafteratk"); err != nil {
-		return nil, err
-	}
-	if tables.SkillAfteratk, err = NewGameSkillAfteratk(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_skillbuff"); err != nil {
-		return nil, err
-	}
-	if tables.SkillBuff, err = NewGameSkillBuff(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_skillpassive"); err != nil {
-		return nil, err
-	}
-	if tables.SkillPassive, err = NewGameSkillPassive(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_hero"); err != nil {
-		return nil, err
-	}
-	if tables.Hero, err = NewGameHero(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_herostargrow"); err != nil {
-		return nil, err
-	}
-	if tables.HeroStargrow, err = NewGameHeroStargrow(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_herolevelgrow"); err != nil {
-		return nil, err
-	}
-	if tables.HeroLevelgrow, err = NewGameHeroLevelgrow(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_herostarup"); err != nil {
-		return nil, err
-	}
-	if tables.HeroStarup, err = NewGameHeroStarup(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_heroexp"); err != nil {
-		return nil, err
-	}
-	if tables.HeroExp, err = NewGameHeroExp(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_herolevelup"); err != nil {
-		return nil, err
-	}
-	if tables.HeroLevelup, err = NewGameHeroLevelup(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_equip"); err != nil {
-		return nil, err
-	}
-	if tables.Equip, err = NewGameEquip(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_equipattrlibrary"); err != nil {
-		return nil, err
-	}
-	if tables.EquipAttrlibrary, err = NewGameEquipAttrlibrary(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_equipsuit"); err != nil {
-		return nil, err
-	}
-	if tables.EquipSuit, err = NewGameEquipSuit(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_equipcolor"); err != nil {
-		return nil, err
-	}
-	if tables.EquipColor, err = NewGameEquipColor(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_equipintensify"); err != nil {
-		return nil, err
-	}
-	if tables.EquipIntensify, err = NewGameEquipIntensify(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_equipscompose"); err != nil {
-		return nil, err
-	}
-	if tables.EquipSCompose, err = NewGameEquipSCompose(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_equipattribute"); err != nil {
-		return nil, err
-	}
-	if tables.EquipAttribute, err = NewGameEquipAttribute(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_equipenchanting"); err != nil {
-		return nil, err
-	}
-	if tables.EquipEnchanting, err = NewGameEquipEnchanting(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_item"); err != nil {
-		return nil, err
-	}
-	if tables.Item, err = NewGameItem(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_heroskilllevel"); err != nil {
-		return nil, err
-	}
-	if tables.HeroSkillLevel, err = NewGameHeroSkillLevel(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_heroresonance"); err != nil {
-		return nil, err
-	}
-	if tables.HeroResonance, err = NewGameHeroResonance(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_heroawaken"); err != nil {
-		return nil, err
-	}
-	if tables.HeroAwaken, err = NewGameHeroAwaken(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_heromethod"); err != nil {
-		return nil, err
-	}
-	if tables.HeroMethod, err = NewGameHeroMethod(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_shop"); err != nil {
-		return nil, err
-	}
-	if tables.Shop, err = NewGameShop(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_shopitem"); err != nil {
-		return nil, err
-	}
-	if tables.Shopitem, err = NewGameShopitem(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_activereward"); err != nil {
-		return nil, err
-	}
-	if tables.ActiveReward, err = NewGameActiveReward(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_model"); err != nil {
-		return nil, err
-	}
-	if tables.Model, err = NewGameModel(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_mainlinechapter"); err != nil {
-		return nil, err
-	}
-	if tables.MainlineChapter, err = NewGameMainlineChapter(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_mainline"); err != nil {
-		return nil, err
-	}
-	if tables.Mainline, err = NewGameMainline(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_drawcard"); err != nil {
-		return nil, err
-	}
-	if tables.DrawCard, err = NewGameDrawCard(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_chatchannel"); err != nil {
-		return nil, err
-	}
-	if tables.ChatChannel, err = NewGameChatChannel(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_chatsystem"); err != nil {
-		return nil, err
-	}
-	if tables.ChatSystem, err = NewGameChatSystem(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_chatservergroup"); err != nil {
-		return nil, err
-	}
-	if tables.ChatServerGroup, err = NewGameChatServerGroup(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_chatchannelcom"); err != nil {
-		return nil, err
-	}
-	if tables.ChatChannelCom, err = NewGameChatChannelCom(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_chatexpression"); err != nil {
-		return nil, err
-	}
-	if tables.ChatExpression, err = NewGameChatExpression(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_taskround"); err != nil {
-		return nil, err
-	}
-	if tables.TaskRound, err = NewGameTaskRound(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_taskactivereward"); err != nil {
-		return nil, err
-	}
-	if tables.TaskActiveReward, err = NewGameTaskActiveReward(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_coin"); err != nil {
-		return nil, err
-	}
-	if tables.Coin, err = NewGameCoin(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_initial"); err != nil {
-		return nil, err
-	}
-	if tables.Initial, err = NewGameInitial(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_monster"); err != nil {
-		return nil, err
-	}
-	if tables.Monster, err = NewGameMonster(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_equippos"); err != nil {
-		return nil, err
-	}
-	if tables.EquipPos, err = NewGameEquipPos(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_playerlv"); err != nil {
-		return nil, err
-	}
-	if tables.Playerlv, err = NewGamePlayerlv(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_facemod"); err != nil {
-		return nil, err
-	}
-	if tables.Facemod, err = NewGameFacemod(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_msgdistrib"); err != nil {
-		return nil, err
-	}
-	if tables.Msgdistrib, err = NewGameMsgdistrib(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_opencond"); err != nil {
-		return nil, err
-	}
-	if tables.Opencond, err = NewGameOpencond(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_stroy"); err != nil {
-		return nil, err
-	}
-	if tables.Stroy, err = NewGameStroy(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_pagoda"); err != nil {
-		return nil, err
-	}
-	if tables.Pagoda, err = NewGamePagoda(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_pagodataskreward"); err != nil {
-		return nil, err
-	}
-	if tables.PagodaTaskReward, err = NewGamePagodaTaskReward(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_seasonloop"); err != nil {
-		return nil, err
-	}
-	if tables.SeasonLoop, err = NewGameSeasonLoop(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_pagodaseasonreward"); err != nil {
-		return nil, err
-	}
-	if tables.PagodaSeasonReward, err = NewGamePagodaSeasonReward(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_rdtask"); err != nil {
-		return nil, err
-	}
-	if tables.Rdtask, err = NewGameRdtask(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_rdtaskcondi"); err != nil {
-		return nil, err
-	}
-	if tables.RdtaskCondi, err = NewGameRdtaskCondi(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_rdtaskchoose"); err != nil {
-		return nil, err
-	}
-	if tables.RdtaskChoose, err = NewGameRdtaskChoose(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_rdtaskside"); err != nil {
-		return nil, err
-	}
-	if tables.RdtaskSide, err = NewGameRdtaskSide(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_rdtaskbattle"); err != nil {
-		return nil, err
-	}
-	if tables.RdtaskBattle, err = NewGameRdtaskBattle(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_kungfuunlock"); err != nil {
-		return nil, err
-	}
-	if tables.KungfuUnlock, err = NewGameKungfuUnlock(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_kungfumasterworker"); err != nil {
-		return nil, err
-	}
-	if tables.KungfuMasterworker, err = NewGameKungfuMasterworker(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_gourmet"); err != nil {
-		return nil, err
-	}
-	if tables.Gourmet, err = NewGameGourmet(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_drop"); err != nil {
-		return nil, err
-	}
-	if tables.Drop, err = NewGameDrop(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_smithy"); err != nil {
-		return nil, err
-	}
-	if tables.Smithy, err = NewGameSmithy(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_smithystove"); err != nil {
-		return nil, err
-	}
-	if tables.SmithyStove, err = NewGameSmithyStove(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_smithytext"); err != nil {
-		return nil, err
-	}
-	if tables.SmithyText, err = NewGameSmithyText(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_vikingboss"); err != nil {
-		return nil, err
-	}
-	if tables.VikingBoss, err = NewGameVikingBoss(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_vikingchallenge"); err != nil {
-		return nil, err
-	}
-	if tables.VikingChallenge, err = NewGameVikingChallenge(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_vikinglineup"); err != nil {
-		return nil, err
-	}
-	if tables.VikingLineup, err = NewGameVikingLineup(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_vikingentrance"); err != nil {
-		return nil, err
-	}
-	if tables.VikingEntrance, err = NewGameVikingEntrance(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_dreamlandboos"); err != nil {
-		return nil, err
-	}
-	if tables.DreamlandBoos, err = NewGameDreamlandBoos(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_dreamlandchallenge"); err != nil {
-		return nil, err
-	}
-	if tables.DreamlandChallenge, err = NewGameDreamlandChallenge(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_dreamlandtrigger"); err != nil {
-		return nil, err
-	}
-	if tables.DreamlandTrigger, err = NewGameDreamlandTrigger(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_huntingboss"); err != nil {
-		return nil, err
-	}
-	if tables.HuntingBoss, err = NewGameHuntingBoss(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_huntingchallenge"); err != nil {
-		return nil, err
-	}
-	if tables.HuntingChallenge, err = NewGameHuntingChallenge(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_huntingopentime"); err != nil {
-		return nil, err
-	}
-	if tables.HuntingOpenTime, err = NewGameHuntingOpenTime(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_huntinglineup"); err != nil {
-		return nil, err
-	}
-	if tables.HuntingLineup, err = NewGameHuntingLineup(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_monsterformat"); err != nil {
-		return nil, err
-	}
-	if tables.MonsterFormat, err = NewGameMonsterFormat(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_link"); err != nil {
-		return nil, err
-	}
-	if tables.Link, err = NewGameLink(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_getresource"); err != nil {
-		return nil, err
-	}
-	if tables.GetResource, err = NewGameGetResource(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_affix"); err != nil {
-		return nil, err
-	}
-	if tables.Affix, err = NewGameAffix(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_vikingbossskill"); err != nil {
-		return nil, err
-	}
-	if tables.VikingBossSkill, err = NewGameVikingBossSkill(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_libraryfetter"); err != nil {
-		return nil, err
-	}
-	if tables.LibraryFetter, err = NewGameLibraryFetter(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_librarystory"); err != nil {
-		return nil, err
-	}
-	if tables.LibraryStory, err = NewGameLibraryStory(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_libraryhero"); err != nil {
-		return nil, err
-	}
-	if tables.LibraryHero, err = NewGameLibraryHero(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_libraryhistory"); err != nil {
-		return nil, err
-	}
-	if tables.LibraryHistory, err = NewGameLibraryHistory(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_libraryfavor"); err != nil {
-		return nil, err
-	}
-	if tables.LibraryFavor, err = NewGameLibraryFavor(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_libraryfavorlv"); err != nil {
-		return nil, err
-	}
-	if tables.LibraryFavorlv, err = NewGameLibraryFavorlv(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_librarybubble"); err != nil {
-		return nil, err
-	}
-	if tables.LibraryBubble, err = NewGameLibraryBubble(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_libraryplayback"); err != nil {
-		return nil, err
-	}
-	if tables.LibraryPlayBack, err = NewGameLibraryPlayBack(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_robot"); err != nil {
-		return nil, err
-	}
-	if tables.Robot, err = NewGameRobot(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_ip"); err != nil {
-		return nil, err
-	}
-	if tables.Ip, err = NewGameIp(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_gamecolor"); err != nil {
-		return nil, err
-	}
-	if tables.GameColor, err = NewGameGameColor(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_namelibrary"); err != nil {
-		return nil, err
-	}
-	if tables.NameLibrary, err = NewGameNameLibrary(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_heroconvertdata"); err != nil {
-		return nil, err
-	}
-	if tables.HeroConvertdata, err = NewGameHeroConvertdata(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_linestorytimeline"); err != nil {
-		return nil, err
-	}
-	if tables.LinestoryTimeLine, err = NewGameLinestoryTimeLine(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_linestorymaintask"); err != nil {
-		return nil, err
-	}
-	if tables.LinestoryMainTask, err = NewGameLinestoryMainTask(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_captaintext"); err != nil {
-		return nil, err
-	}
-	if tables.Captaintext, err = NewGameCaptaintext(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_herofusion"); err != nil {
-		return nil, err
-	}
-	if tables.Herofusion, err = NewGameHerofusion(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_playerinfor"); err != nil {
-		return nil, err
-	}
-	if tables.PlayerInfor, err = NewGamePlayerInfor(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_herotalent"); err != nil {
-		return nil, err
-	}
-	if tables.HeroTalent, err = NewGameHeroTalent(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_talentskill"); err != nil {
-		return nil, err
-	}
-	if tables.TalentSkill, err = NewGameTalentSkill(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_arenabuychallenge"); err != nil {
-		return nil, err
-	}
-	if tables.ArenaBuyChallenge, err = NewGameArenaBuyChallenge(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_arenaactivereward"); err != nil {
-		return nil, err
-	}
-	if tables.ArenaActiveReward, err = NewGameArenaActiveReward(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_arenarobot"); err != nil {
-		return nil, err
-	}
-	if tables.ArenaRobot, err = NewGameArenaRobot(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_arenarankreward"); err != nil {
-		return nil, err
-	}
-	if tables.ArenaRankReward, err = NewGameArenaRankReward(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_arenachallengenpc"); err != nil {
-		return nil, err
-	}
-	if tables.ArenaChallengeNpc, err = NewGameArenaChallengeNpc(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_itembox"); err != nil {
-		return nil, err
-	}
-	if tables.ItemBox, err = NewGameItemBox(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_show"); err != nil {
-		return nil, err
-	}
-	if tables.Show, err = NewGameShow(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_guildlv"); err != nil {
-		return nil, err
-	}
-	if tables.GuildLv, err = NewGameGuildLv(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_guildpng"); err != nil {
-		return nil, err
-	}
-	if tables.GuildPng, err = NewGameGuildPng(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_guildactivity"); err != nil {
-		return nil, err
-	}
-	if tables.GuildActivity, err = NewGameGuildActivity(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_guildsign"); err != nil {
-		return nil, err
-	}
-	if tables.GuildSign, err = NewGameGuildSign(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_guildtask"); err != nil {
-		return nil, err
-	}
-	if tables.GuildTask, err = NewGameGuildTask(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_trollrule"); err != nil {
-		return nil, err
-	}
-	if tables.TrollRule, err = NewGameTrollRule(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_trollgoods"); err != nil {
-		return nil, err
-	}
-	if tables.TrollGoods, err = NewGameTrollGoods(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_trolltrain"); err != nil {
-		return nil, err
-	}
-	if tables.TrollTrain, err = NewGameTrollTrain(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_trolllv"); err != nil {
-		return nil, err
-	}
-	if tables.TrollLv, err = NewGameTrollLv(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_trollcoefficient"); err != nil {
-		return nil, err
-	}
-	if tables.TrollCoefficient, err = NewGameTrollCoefficient(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_proboss"); err != nil {
-		return nil, err
-	}
-	if tables.ProBoss, err = NewGameProBoss(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_prochallenge"); err != nil {
-		return nil, err
-	}
-	if tables.ProChallenge, err = NewGameProChallenge(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_prolineup"); err != nil {
-		return nil, err
-	}
-	if tables.ProLineup, err = NewGameProLineup(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_probossskill"); err != nil {
-		return nil, err
-	}
-	if tables.ProBossskill, err = NewGameProBossskill(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_horoscope"); err != nil {
-		return nil, err
-	}
-	if tables.Horoscope, err = NewGameHoroscope(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_sign"); err != nil {
-		return nil, err
-	}
-	if tables.Sign, err = NewGameSign(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_signreset"); err != nil {
-		return nil, err
-	}
-	if tables.SignReset, err = NewGameSignReset(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_growtask"); err != nil {
-		return nil, err
-	}
-	if tables.GrowTask, err = NewGameGrowTask(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_growreward"); err != nil {
-		return nil, err
-	}
-	if tables.GrowReward, err = NewGameGrowReward(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_recharge"); err != nil {
-		return nil, err
-	}
-	if tables.Recharge, err = NewGameRecharge(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_privilegecard"); err != nil {
-		return nil, err
-	}
-	if tables.PrivilegeCard, err = NewGamePrivilegeCard(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_privilege"); err != nil {
-		return nil, err
-	}
-	if tables.Privilege, err = NewGamePrivilege(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_worldtask"); err != nil {
-		return nil, err
-	}
-	if tables.WorldTask, err = NewGameWorldTask(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_taskcond"); err != nil {
-		return nil, err
-	}
-	if tables.TaskCond, err = NewGameTaskCond(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_tasktype"); err != nil {
-		return nil, err
-	}
-	if tables.TaskType, err = NewGameTaskType(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_teaching"); err != nil {
-		return nil, err
-	}
-	if tables.Teaching, err = NewGameTeaching(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_herostrategy"); err != nil {
-		return nil, err
-	}
-	if tables.HeroStrategy, err = NewGameHeroStrategy(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_teachtask"); err != nil {
-		return nil, err
-	}
-	if tables.TeachTask, err = NewGameTeachTask(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_paypackage"); err != nil {
-		return nil, err
-	}
-	if tables.PayPackage, err = NewGamePayPackage(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_worldbattle"); err != nil {
-		return nil, err
-	}
-	if tables.WorldBattle, err = NewGameWorldBattle(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_reddot"); err != nil {
-		return nil, err
-	}
-	if tables.RedDot, err = NewGameRedDot(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_reddottalkid"); err != nil {
-		return nil, err
-	}
-	if tables.RedDotTalkid, err = NewGameRedDotTalkid(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_passcheck"); err != nil {
-		return nil, err
-	}
-	if tables.PassCheck, err = NewGamePassCheck(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_mail"); err != nil {
-		return nil, err
-	}
-	if tables.Mail, err = NewGameMail(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_combatlevel"); err != nil {
-		return nil, err
-	}
-	if tables.CombatLevel, err = NewGameCombatLevel(buf); err != nil {
-		return nil, err
-	}
-	if buf, err = loader("game_combatmanster"); err != nil {
-		return nil, err
-	}
-	if tables.CombatManster, err = NewGameCombatManster(buf); err != nil {
-		return nil, err
-	}
-	return tables, nil
+    tables := &Tables{}
+    if buf, err = loader("game_global") ; err != nil {
+        return nil, err
+    }
+    if tables.Global, err = NewGameGlobal(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_extservers") ; err != nil {
+        return nil, err
+    }
+    if tables.Extservers, err = NewGameExtservers(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_skillatk") ; err != nil {
+        return nil, err
+    }
+    if tables.SkillAtk, err = NewGameSkillAtk(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_skillafteratk") ; err != nil {
+        return nil, err
+    }
+    if tables.SkillAfteratk, err = NewGameSkillAfteratk(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_skillbuff") ; err != nil {
+        return nil, err
+    }
+    if tables.SkillBuff, err = NewGameSkillBuff(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_skillpassive") ; err != nil {
+        return nil, err
+    }
+    if tables.SkillPassive, err = NewGameSkillPassive(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_hero") ; err != nil {
+        return nil, err
+    }
+    if tables.Hero, err = NewGameHero(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_herostargrow") ; err != nil {
+        return nil, err
+    }
+    if tables.HeroStargrow, err = NewGameHeroStargrow(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_herolevelgrow") ; err != nil {
+        return nil, err
+    }
+    if tables.HeroLevelgrow, err = NewGameHeroLevelgrow(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_herostarup") ; err != nil {
+        return nil, err
+    }
+    if tables.HeroStarup, err = NewGameHeroStarup(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_heroexp") ; err != nil {
+        return nil, err
+    }
+    if tables.HeroExp, err = NewGameHeroExp(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_herolevelup") ; err != nil {
+        return nil, err
+    }
+    if tables.HeroLevelup, err = NewGameHeroLevelup(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_equip") ; err != nil {
+        return nil, err
+    }
+    if tables.Equip, err = NewGameEquip(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_equipattrlibrary") ; err != nil {
+        return nil, err
+    }
+    if tables.EquipAttrlibrary, err = NewGameEquipAttrlibrary(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_equipsuit") ; err != nil {
+        return nil, err
+    }
+    if tables.EquipSuit, err = NewGameEquipSuit(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_equipcolor") ; err != nil {
+        return nil, err
+    }
+    if tables.EquipColor, err = NewGameEquipColor(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_equipintensify") ; err != nil {
+        return nil, err
+    }
+    if tables.EquipIntensify, err = NewGameEquipIntensify(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_equipscompose") ; err != nil {
+        return nil, err
+    }
+    if tables.EquipSCompose, err = NewGameEquipSCompose(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_equipattribute") ; err != nil {
+        return nil, err
+    }
+    if tables.EquipAttribute, err = NewGameEquipAttribute(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_equipenchanting") ; err != nil {
+        return nil, err
+    }
+    if tables.EquipEnchanting, err = NewGameEquipEnchanting(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_item") ; err != nil {
+        return nil, err
+    }
+    if tables.Item, err = NewGameItem(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_heroskilllevel") ; err != nil {
+        return nil, err
+    }
+    if tables.HeroSkillLevel, err = NewGameHeroSkillLevel(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_heroresonance") ; err != nil {
+        return nil, err
+    }
+    if tables.HeroResonance, err = NewGameHeroResonance(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_heroawaken") ; err != nil {
+        return nil, err
+    }
+    if tables.HeroAwaken, err = NewGameHeroAwaken(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_heromethod") ; err != nil {
+        return nil, err
+    }
+    if tables.HeroMethod, err = NewGameHeroMethod(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_heromethodcomment") ; err != nil {
+        return nil, err
+    }
+    if tables.HeroMethodComment, err = NewGameHeroMethodComment(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_shop") ; err != nil {
+        return nil, err
+    }
+    if tables.Shop, err = NewGameShop(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_shopitem") ; err != nil {
+        return nil, err
+    }
+    if tables.Shopitem, err = NewGameShopitem(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_activereward") ; err != nil {
+        return nil, err
+    }
+    if tables.ActiveReward, err = NewGameActiveReward(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_model") ; err != nil {
+        return nil, err
+    }
+    if tables.Model, err = NewGameModel(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_mainlinechapter") ; err != nil {
+        return nil, err
+    }
+    if tables.MainlineChapter, err = NewGameMainlineChapter(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_mainline") ; err != nil {
+        return nil, err
+    }
+    if tables.Mainline, err = NewGameMainline(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_drawcard") ; err != nil {
+        return nil, err
+    }
+    if tables.DrawCard, err = NewGameDrawCard(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_chatchannel") ; err != nil {
+        return nil, err
+    }
+    if tables.ChatChannel, err = NewGameChatChannel(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_chatsystem") ; err != nil {
+        return nil, err
+    }
+    if tables.ChatSystem, err = NewGameChatSystem(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_chatservergroup") ; err != nil {
+        return nil, err
+    }
+    if tables.ChatServerGroup, err = NewGameChatServerGroup(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_chatchannelcom") ; err != nil {
+        return nil, err
+    }
+    if tables.ChatChannelCom, err = NewGameChatChannelCom(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_chatexpression") ; err != nil {
+        return nil, err
+    }
+    if tables.ChatExpression, err = NewGameChatExpression(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_taskround") ; err != nil {
+        return nil, err
+    }
+    if tables.TaskRound, err = NewGameTaskRound(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_taskactivereward") ; err != nil {
+        return nil, err
+    }
+    if tables.TaskActiveReward, err = NewGameTaskActiveReward(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_coin") ; err != nil {
+        return nil, err
+    }
+    if tables.Coin, err = NewGameCoin(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_initial") ; err != nil {
+        return nil, err
+    }
+    if tables.Initial, err = NewGameInitial(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_monster") ; err != nil {
+        return nil, err
+    }
+    if tables.Monster, err = NewGameMonster(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_equippos") ; err != nil {
+        return nil, err
+    }
+    if tables.EquipPos, err = NewGameEquipPos(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_playerlv") ; err != nil {
+        return nil, err
+    }
+    if tables.Playerlv, err = NewGamePlayerlv(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_facemod") ; err != nil {
+        return nil, err
+    }
+    if tables.Facemod, err = NewGameFacemod(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_msgdistrib") ; err != nil {
+        return nil, err
+    }
+    if tables.Msgdistrib, err = NewGameMsgdistrib(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_opencond") ; err != nil {
+        return nil, err
+    }
+    if tables.Opencond, err = NewGameOpencond(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_stroy") ; err != nil {
+        return nil, err
+    }
+    if tables.Stroy, err = NewGameStroy(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_pagoda") ; err != nil {
+        return nil, err
+    }
+    if tables.Pagoda, err = NewGamePagoda(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_pagodataskreward") ; err != nil {
+        return nil, err
+    }
+    if tables.PagodaTaskReward, err = NewGamePagodaTaskReward(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_seasonloop") ; err != nil {
+        return nil, err
+    }
+    if tables.SeasonLoop, err = NewGameSeasonLoop(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_pagodaseasonreward") ; err != nil {
+        return nil, err
+    }
+    if tables.PagodaSeasonReward, err = NewGamePagodaSeasonReward(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_rdtask") ; err != nil {
+        return nil, err
+    }
+    if tables.Rdtask, err = NewGameRdtask(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_rdtaskcondi") ; err != nil {
+        return nil, err
+    }
+    if tables.RdtaskCondi, err = NewGameRdtaskCondi(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_rdtaskchoose") ; err != nil {
+        return nil, err
+    }
+    if tables.RdtaskChoose, err = NewGameRdtaskChoose(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_rdtaskside") ; err != nil {
+        return nil, err
+    }
+    if tables.RdtaskSide, err = NewGameRdtaskSide(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_rdtaskbattle") ; err != nil {
+        return nil, err
+    }
+    if tables.RdtaskBattle, err = NewGameRdtaskBattle(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_kungfuunlock") ; err != nil {
+        return nil, err
+    }
+    if tables.KungfuUnlock, err = NewGameKungfuUnlock(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_kungfumasterworker") ; err != nil {
+        return nil, err
+    }
+    if tables.KungfuMasterworker, err = NewGameKungfuMasterworker(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_gourmet") ; err != nil {
+        return nil, err
+    }
+    if tables.Gourmet, err = NewGameGourmet(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_drop") ; err != nil {
+        return nil, err
+    }
+    if tables.Drop, err = NewGameDrop(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_smithy") ; err != nil {
+        return nil, err
+    }
+    if tables.Smithy, err = NewGameSmithy(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_smithystove") ; err != nil {
+        return nil, err
+    }
+    if tables.SmithyStove, err = NewGameSmithyStove(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_smithytext") ; err != nil {
+        return nil, err
+    }
+    if tables.SmithyText, err = NewGameSmithyText(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_vikingboss") ; err != nil {
+        return nil, err
+    }
+    if tables.VikingBoss, err = NewGameVikingBoss(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_vikingchallenge") ; err != nil {
+        return nil, err
+    }
+    if tables.VikingChallenge, err = NewGameVikingChallenge(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_vikinglineup") ; err != nil {
+        return nil, err
+    }
+    if tables.VikingLineup, err = NewGameVikingLineup(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_vikingentrance") ; err != nil {
+        return nil, err
+    }
+    if tables.VikingEntrance, err = NewGameVikingEntrance(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_dreamlandboos") ; err != nil {
+        return nil, err
+    }
+    if tables.DreamlandBoos, err = NewGameDreamlandBoos(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_dreamlandchallenge") ; err != nil {
+        return nil, err
+    }
+    if tables.DreamlandChallenge, err = NewGameDreamlandChallenge(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_dreamlandtrigger") ; err != nil {
+        return nil, err
+    }
+    if tables.DreamlandTrigger, err = NewGameDreamlandTrigger(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_huntingboss") ; err != nil {
+        return nil, err
+    }
+    if tables.HuntingBoss, err = NewGameHuntingBoss(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_huntingchallenge") ; err != nil {
+        return nil, err
+    }
+    if tables.HuntingChallenge, err = NewGameHuntingChallenge(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_huntingopentime") ; err != nil {
+        return nil, err
+    }
+    if tables.HuntingOpenTime, err = NewGameHuntingOpenTime(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_huntinglineup") ; err != nil {
+        return nil, err
+    }
+    if tables.HuntingLineup, err = NewGameHuntingLineup(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_monsterformat") ; err != nil {
+        return nil, err
+    }
+    if tables.MonsterFormat, err = NewGameMonsterFormat(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_link") ; err != nil {
+        return nil, err
+    }
+    if tables.Link, err = NewGameLink(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_getresource") ; err != nil {
+        return nil, err
+    }
+    if tables.GetResource, err = NewGameGetResource(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_vikingbossskill") ; err != nil {
+        return nil, err
+    }
+    if tables.VikingBossSkill, err = NewGameVikingBossSkill(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_libraryfetter") ; err != nil {
+        return nil, err
+    }
+    if tables.LibraryFetter, err = NewGameLibraryFetter(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_librarystory") ; err != nil {
+        return nil, err
+    }
+    if tables.LibraryStory, err = NewGameLibraryStory(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_libraryhero") ; err != nil {
+        return nil, err
+    }
+    if tables.LibraryHero, err = NewGameLibraryHero(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_libraryhistory") ; err != nil {
+        return nil, err
+    }
+    if tables.LibraryHistory, err = NewGameLibraryHistory(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_libraryfavor") ; err != nil {
+        return nil, err
+    }
+    if tables.LibraryFavor, err = NewGameLibraryFavor(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_libraryfavorlv") ; err != nil {
+        return nil, err
+    }
+    if tables.LibraryFavorlv, err = NewGameLibraryFavorlv(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_librarybubble") ; err != nil {
+        return nil, err
+    }
+    if tables.LibraryBubble, err = NewGameLibraryBubble(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_libraryplayback") ; err != nil {
+        return nil, err
+    }
+    if tables.LibraryPlayBack, err = NewGameLibraryPlayBack(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_robot") ; err != nil {
+        return nil, err
+    }
+    if tables.Robot, err = NewGameRobot(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_ip") ; err != nil {
+        return nil, err
+    }
+    if tables.Ip, err = NewGameIp(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_namelibrary") ; err != nil {
+        return nil, err
+    }
+    if tables.NameLibrary, err = NewGameNameLibrary(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_heroconvertdata") ; err != nil {
+        return nil, err
+    }
+    if tables.HeroConvertdata, err = NewGameHeroConvertdata(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_linestorytimeline") ; err != nil {
+        return nil, err
+    }
+    if tables.LinestoryTimeLine, err = NewGameLinestoryTimeLine(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_linestorymaintask") ; err != nil {
+        return nil, err
+    }
+    if tables.LinestoryMainTask, err = NewGameLinestoryMainTask(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_herofusion") ; err != nil {
+        return nil, err
+    }
+    if tables.Herofusion, err = NewGameHerofusion(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_playerinfor") ; err != nil {
+        return nil, err
+    }
+    if tables.PlayerInfor, err = NewGamePlayerInfor(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_herotalent") ; err != nil {
+        return nil, err
+    }
+    if tables.HeroTalent, err = NewGameHeroTalent(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_talentskill") ; err != nil {
+        return nil, err
+    }
+    if tables.TalentSkill, err = NewGameTalentSkill(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_arenabuychallenge") ; err != nil {
+        return nil, err
+    }
+    if tables.ArenaBuyChallenge, err = NewGameArenaBuyChallenge(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_arenaactivereward") ; err != nil {
+        return nil, err
+    }
+    if tables.ArenaActiveReward, err = NewGameArenaActiveReward(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_arenarobot") ; err != nil {
+        return nil, err
+    }
+    if tables.ArenaRobot, err = NewGameArenaRobot(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_arenarankreward") ; err != nil {
+        return nil, err
+    }
+    if tables.ArenaRankReward, err = NewGameArenaRankReward(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_arenachallengenpc") ; err != nil {
+        return nil, err
+    }
+    if tables.ArenaChallengeNpc, err = NewGameArenaChallengeNpc(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_itembox") ; err != nil {
+        return nil, err
+    }
+    if tables.ItemBox, err = NewGameItemBox(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_show") ; err != nil {
+        return nil, err
+    }
+    if tables.Show, err = NewGameShow(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_guildlv") ; err != nil {
+        return nil, err
+    }
+    if tables.GuildLv, err = NewGameGuildLv(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_guildpng") ; err != nil {
+        return nil, err
+    }
+    if tables.GuildPng, err = NewGameGuildPng(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_guildactivity") ; err != nil {
+        return nil, err
+    }
+    if tables.GuildActivity, err = NewGameGuildActivity(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_guildsign") ; err != nil {
+        return nil, err
+    }
+    if tables.GuildSign, err = NewGameGuildSign(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_guildtask") ; err != nil {
+        return nil, err
+    }
+    if tables.GuildTask, err = NewGameGuildTask(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_trollrule") ; err != nil {
+        return nil, err
+    }
+    if tables.TrollRule, err = NewGameTrollRule(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_trollgoods") ; err != nil {
+        return nil, err
+    }
+    if tables.TrollGoods, err = NewGameTrollGoods(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_trolltrain") ; err != nil {
+        return nil, err
+    }
+    if tables.TrollTrain, err = NewGameTrollTrain(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_trolllv") ; err != nil {
+        return nil, err
+    }
+    if tables.TrollLv, err = NewGameTrollLv(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_trollcoefficient") ; err != nil {
+        return nil, err
+    }
+    if tables.TrollCoefficient, err = NewGameTrollCoefficient(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_horoscope") ; err != nil {
+        return nil, err
+    }
+    if tables.Horoscope, err = NewGameHoroscope(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_sign") ; err != nil {
+        return nil, err
+    }
+    if tables.Sign, err = NewGameSign(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_signreset") ; err != nil {
+        return nil, err
+    }
+    if tables.SignReset, err = NewGameSignReset(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_growtask") ; err != nil {
+        return nil, err
+    }
+    if tables.GrowTask, err = NewGameGrowTask(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_growreward") ; err != nil {
+        return nil, err
+    }
+    if tables.GrowReward, err = NewGameGrowReward(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_recharge") ; err != nil {
+        return nil, err
+    }
+    if tables.Recharge, err = NewGameRecharge(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_privilegecard") ; err != nil {
+        return nil, err
+    }
+    if tables.PrivilegeCard, err = NewGamePrivilegeCard(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_privilege") ; err != nil {
+        return nil, err
+    }
+    if tables.Privilege, err = NewGamePrivilege(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_worldtask") ; err != nil {
+        return nil, err
+    }
+    if tables.WorldTask, err = NewGameWorldTask(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_taskcond") ; err != nil {
+        return nil, err
+    }
+    if tables.TaskCond, err = NewGameTaskCond(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_tasktype") ; err != nil {
+        return nil, err
+    }
+    if tables.TaskType, err = NewGameTaskType(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_teaching") ; err != nil {
+        return nil, err
+    }
+    if tables.Teaching, err = NewGameTeaching(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_herostrategy") ; err != nil {
+        return nil, err
+    }
+    if tables.HeroStrategy, err = NewGameHeroStrategy(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_fightglobalevent") ; err != nil {
+        return nil, err
+    }
+    if tables.FightGlobalEvent, err = NewGameFightGlobalEvent(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_paypackage") ; err != nil {
+        return nil, err
+    }
+    if tables.PayPackage, err = NewGamePayPackage(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_worldbattle") ; err != nil {
+        return nil, err
+    }
+    if tables.WorldBattle, err = NewGameWorldBattle(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_reddot") ; err != nil {
+        return nil, err
+    }
+    if tables.RedDot, err = NewGameRedDot(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_reddottalkid") ; err != nil {
+        return nil, err
+    }
+    if tables.RedDotTalkid, err = NewGameRedDotTalkid(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_reddotgroup") ; err != nil {
+        return nil, err
+    }
+    if tables.RedDotGroup, err = NewGameRedDotGroup(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_passcheck") ; err != nil {
+        return nil, err
+    }
+    if tables.PassCheck, err = NewGamePassCheck(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_mail") ; err != nil {
+        return nil, err
+    }
+    if tables.Mail, err = NewGameMail(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_combatlevel") ; err != nil {
+        return nil, err
+    }
+    if tables.CombatLevel, err = NewGameCombatLevel(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_combatmanster") ; err != nil {
+        return nil, err
+    }
+    if tables.CombatManster, err = NewGameCombatManster(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_combatbox") ; err != nil {
+        return nil, err
+    }
+    if tables.CombatBox, err = NewGameCombatBox(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_help") ; err != nil {
+        return nil, err
+    }
+    if tables.Help, err = NewGameHelp(buf) ; err != nil {
+        return nil, err
+    }
+    return tables, nil
 }
diff --git a/sys/configure/structs/game.equipData.go b/sys/configure/structs/game.equipData.go
index f48d7658c..afcdac474 100644
--- a/sys/configure/structs/game.equipData.go
+++ b/sys/configure/structs/game.equipData.go
@@ -19,6 +19,7 @@ type GameEquipData struct {
     Pos int32
     Star int32
     Color int32
+    Effects string
     Leadlibrary int32
     Addattrnum []int32
     Addattrnump []int32
@@ -44,6 +45,7 @@ func (_v *GameEquipData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pos"].(float64); !_ok_ { err = errors.New("pos error"); return }; _v.Pos = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["color"].(float64); !_ok_ { err = errors.New("color error"); return }; _v.Color = int32(_tempNum_) }
+    { var _ok_ bool; if _v.Effects, _ok_ = _buf["Effects"].(string); !_ok_ { err = errors.New("Effects error"); return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["leadlibrary"].(float64); !_ok_ { err = errors.New("leadlibrary error"); return }; _v.Leadlibrary = int32(_tempNum_) }
      {
                 var _arr_ []interface{}
diff --git a/sys/configure/structs/game.skillAtkData.go b/sys/configure/structs/game.skillAtkData.go
index 789bb5ae2..e8b7b783a 100644
--- a/sys/configure/structs/game.skillAtkData.go
+++ b/sys/configure/structs/game.skillAtkData.go
@@ -18,6 +18,7 @@ type GameSkillAtkData struct {
     Name string
     Ico string
     CorrectPos int32
+    IsMelee int32
     Act string
     Type int32
     CD int32
@@ -55,6 +56,7 @@ func (_v *GameSkillAtkData)Deserialize(_buf map[string]interface{}) (err error)
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     { var _ok_ bool; if _v.Ico, _ok_ = _buf["ico"].(string); !_ok_ { err = errors.New("ico error"); return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["CorrectPos"].(float64); !_ok_ { err = errors.New("CorrectPos error"); return }; _v.CorrectPos = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["IsMelee"].(float64); !_ok_ { err = errors.New("IsMelee error"); return }; _v.IsMelee = int32(_tempNum_) }
     { var _ok_ bool; if _v.Act, _ok_ = _buf["act"].(string); !_ok_ { err = errors.New("act error"); return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Type"].(float64); !_ok_ { err = errors.New("Type error"); return }; _v.Type = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["CD"].(float64); !_ok_ { err = errors.New("CD error"); return }; _v.CD = int32(_tempNum_) }