From 146b6ae78c6d4c81493288e9f4844c440693ff19 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Fri, 17 Feb 2023 19:52:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E6=B6=88=E6=81=AF=E5=88=86?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_drawcard.json                 |  36 +-
 bin/json/game_drop.json                     | 964 ++++++++++++++-----
 bin/json/game_global.json                   |   6 +-
 bin/json/game_hero.json                     | 965 +++-----------------
 bin/json/game_msgdistrib.json               |   6 +
 bin/json/game_newsmithy.json                |  75 --
 bin/json/game_smithytool.json               |  50 +-
 sys/configure/structs/Game.NewSmithyData.go |   2 -
 sys/configure/structs/game.DropData.go      |   4 +
 sys/configure/structs/game.globalData.go    |  15 +
 10 files changed, 923 insertions(+), 1200 deletions(-)

diff --git a/bin/json/game_drawcard.json b/bin/json/game_drawcard.json
index b50ced312..a3892dfaa 100644
--- a/bin/json/game_drawcard.json
+++ b/bin/json/game_drawcard.json
@@ -5,7 +5,7 @@
     "card_pool_type": "base_pool1",
     "star": 3,
     "race": 1,
-    "id": "15005",
+    "id": "35006",
     "weight": 1000
   },
   {
@@ -14,7 +14,7 @@
     "card_pool_type": "base_pool1",
     "star": 4,
     "race": 1,
-    "id": "15005",
+    "id": "35006",
     "weight": 1000
   },
   {
@@ -23,7 +23,7 @@
     "card_pool_type": "base_pool1",
     "star": 5,
     "race": 1,
-    "id": "15005",
+    "id": "35006",
     "weight": 1000
   },
   {
@@ -32,7 +32,7 @@
     "card_pool_type": "base_pool2",
     "star": 3,
     "race": 1,
-    "id": "24005",
+    "id": "34007",
     "weight": 1000
   },
   {
@@ -41,7 +41,7 @@
     "card_pool_type": "base_pool2",
     "star": 4,
     "race": 1,
-    "id": "24005",
+    "id": "34007",
     "weight": 1000
   },
   {
@@ -50,7 +50,7 @@
     "card_pool_type": "base_pool2",
     "star": 5,
     "race": 1,
-    "id": "24005",
+    "id": "34007",
     "weight": 1000
   },
   {
@@ -59,7 +59,7 @@
     "card_pool_type": "base_pool3",
     "star": 3,
     "race": 1,
-    "id": "14001",
+    "id": "45003",
     "weight": 1000
   },
   {
@@ -68,7 +68,7 @@
     "card_pool_type": "base_pool3",
     "star": 4,
     "race": 1,
-    "id": "14001",
+    "id": "45003",
     "weight": 1000
   },
   {
@@ -77,7 +77,7 @@
     "card_pool_type": "base_pool3",
     "star": 5,
     "race": 1,
-    "id": "14001",
+    "id": "45003",
     "weight": 1000
   },
   {
@@ -86,7 +86,7 @@
     "card_pool_type": "base_pool4",
     "star": 3,
     "race": 1,
-    "id": "14003",
+    "id": "14007",
     "weight": 1000
   },
   {
@@ -95,7 +95,7 @@
     "card_pool_type": "base_pool4",
     "star": 4,
     "race": 1,
-    "id": "14003",
+    "id": "14007",
     "weight": 1000
   },
   {
@@ -104,7 +104,7 @@
     "card_pool_type": "base_pool4",
     "star": 5,
     "race": 1,
-    "id": "14003",
+    "id": "14007",
     "weight": 1000
   },
   {
@@ -113,7 +113,7 @@
     "card_pool_type": "base_pool5",
     "star": 3,
     "race": 1,
-    "id": "35006",
+    "id": "34006",
     "weight": 1000
   },
   {
@@ -122,7 +122,7 @@
     "card_pool_type": "base_pool5",
     "star": 4,
     "race": 1,
-    "id": "35006",
+    "id": "34006",
     "weight": 1000
   },
   {
@@ -131,7 +131,7 @@
     "card_pool_type": "base_pool5",
     "star": 5,
     "race": 1,
-    "id": "35006",
+    "id": "34006",
     "weight": 1000
   },
   {
@@ -140,7 +140,7 @@
     "card_pool_type": "base_pool6",
     "star": 3,
     "race": 1,
-    "id": "34007",
+    "id": "34002",
     "weight": 1000
   },
   {
@@ -149,7 +149,7 @@
     "card_pool_type": "base_pool6",
     "star": 4,
     "race": 1,
-    "id": "34007",
+    "id": "34002",
     "weight": 1000
   },
   {
@@ -158,7 +158,7 @@
     "card_pool_type": "base_pool6",
     "star": 5,
     "race": 1,
-    "id": "34007",
+    "id": "34002",
     "weight": 1000
   },
   {
diff --git a/bin/json/game_drop.json b/bin/json/game_drop.json
index 16c066695..5e58be268 100644
--- a/bin/json/game_drop.json
+++ b/bin/json/game_drop.json
@@ -10,7 +10,9 @@
       }
     ],
     "star": 1,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 2,
@@ -23,7 +25,9 @@
       }
     ],
     "star": 1,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 3,
@@ -36,7 +40,9 @@
       }
     ],
     "star": 1,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 4,
@@ -49,7 +55,9 @@
       }
     ],
     "star": 1,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 5,
@@ -62,7 +70,9 @@
       }
     ],
     "star": 1,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 6,
@@ -75,7 +85,9 @@
       }
     ],
     "star": 1,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 7,
@@ -88,7 +100,9 @@
       }
     ],
     "star": 1,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 8,
@@ -101,7 +115,9 @@
       }
     ],
     "star": 1,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 9,
@@ -114,7 +130,9 @@
       }
     ],
     "star": 1,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 10,
@@ -127,7 +145,9 @@
       }
     ],
     "star": 1,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 11,
@@ -140,7 +160,9 @@
       }
     ],
     "star": 1,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 12,
@@ -153,7 +175,9 @@
       }
     ],
     "star": 1,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 13,
@@ -166,7 +190,9 @@
       }
     ],
     "star": 1,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 14,
@@ -179,7 +205,9 @@
       }
     ],
     "star": 1,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 15,
@@ -192,7 +220,9 @@
       }
     ],
     "star": 1,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 16,
@@ -205,7 +235,9 @@
       }
     ],
     "star": 2,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 17,
@@ -218,7 +250,9 @@
       }
     ],
     "star": 2,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 18,
@@ -231,7 +265,9 @@
       }
     ],
     "star": 2,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 19,
@@ -244,7 +280,9 @@
       }
     ],
     "star": 2,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 20,
@@ -257,7 +295,9 @@
       }
     ],
     "star": 2,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 21,
@@ -270,7 +310,9 @@
       }
     ],
     "star": 2,
-    "p": 333
+    "p": 333,
+    "enable_type": 1,
+    "condition": 9
   },
   {
     "id": 22,
@@ -283,7 +325,9 @@
       }
     ],
     "star": 3,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 23,
@@ -296,7 +340,9 @@
       }
     ],
     "star": 3,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 24,
@@ -309,7 +355,9 @@
       }
     ],
     "star": 3,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 25,
@@ -322,7 +370,9 @@
       }
     ],
     "star": 3,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 26,
@@ -335,7 +385,9 @@
       }
     ],
     "star": 3,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 27,
@@ -348,7 +400,9 @@
       }
     ],
     "star": 3,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 28,
@@ -361,7 +415,9 @@
       }
     ],
     "star": 4,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 29,
@@ -374,7 +430,9 @@
       }
     ],
     "star": 4,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 30,
@@ -387,7 +445,9 @@
       }
     ],
     "star": 4,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 31,
@@ -400,7 +460,9 @@
       }
     ],
     "star": 4,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 32,
@@ -413,7 +475,9 @@
       }
     ],
     "star": 4,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 33,
@@ -426,7 +490,9 @@
       }
     ],
     "star": 4,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 34,
@@ -439,7 +505,9 @@
       }
     ],
     "star": 5,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 35,
@@ -452,7 +520,9 @@
       }
     ],
     "star": 5,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 36,
@@ -465,7 +535,9 @@
       }
     ],
     "star": 5,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 37,
@@ -478,7 +550,9 @@
       }
     ],
     "star": 5,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 38,
@@ -491,7 +565,9 @@
       }
     ],
     "star": 5,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 39,
@@ -504,7 +580,9 @@
       }
     ],
     "star": 5,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 40,
@@ -517,7 +595,9 @@
       }
     ],
     "star": 6,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 41,
@@ -530,7 +610,9 @@
       }
     ],
     "star": 6,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 42,
@@ -543,7 +625,9 @@
       }
     ],
     "star": 6,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 43,
@@ -556,7 +640,9 @@
       }
     ],
     "star": 6,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 44,
@@ -569,7 +655,9 @@
       }
     ],
     "star": 6,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 45,
@@ -582,7 +670,9 @@
       }
     ],
     "star": 6,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 46,
@@ -595,7 +685,9 @@
       }
     ],
     "star": 1,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 47,
@@ -608,7 +700,9 @@
       }
     ],
     "star": 1,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 48,
@@ -621,7 +715,9 @@
       }
     ],
     "star": 1,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 49,
@@ -634,7 +730,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 50,
@@ -647,7 +745,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 51,
@@ -660,7 +760,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 52,
@@ -673,7 +775,9 @@
       }
     ],
     "star": 2,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 53,
@@ -686,7 +790,9 @@
       }
     ],
     "star": 2,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 54,
@@ -699,7 +805,9 @@
       }
     ],
     "star": 2,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 55,
@@ -712,7 +820,9 @@
       }
     ],
     "star": 2,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 56,
@@ -725,7 +835,9 @@
       }
     ],
     "star": 2,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 57,
@@ -738,7 +850,9 @@
       }
     ],
     "star": 2,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 58,
@@ -751,7 +865,9 @@
       }
     ],
     "star": 3,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 59,
@@ -764,7 +880,9 @@
       }
     ],
     "star": 3,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 60,
@@ -777,7 +895,9 @@
       }
     ],
     "star": 3,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 61,
@@ -790,7 +910,9 @@
       }
     ],
     "star": 3,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 62,
@@ -803,7 +925,9 @@
       }
     ],
     "star": 3,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 63,
@@ -816,7 +940,9 @@
       }
     ],
     "star": 3,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 64,
@@ -829,7 +955,9 @@
       }
     ],
     "star": 4,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 65,
@@ -842,7 +970,9 @@
       }
     ],
     "star": 4,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 66,
@@ -855,7 +985,9 @@
       }
     ],
     "star": 4,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 67,
@@ -868,7 +1000,9 @@
       }
     ],
     "star": 4,
-    "p": 333
+    "p": 333,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 68,
@@ -881,7 +1015,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 69,
@@ -894,7 +1030,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 70,
@@ -907,7 +1045,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 71,
@@ -920,7 +1060,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 72,
@@ -933,7 +1075,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 73,
@@ -946,7 +1090,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 74,
@@ -959,7 +1105,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 75,
@@ -972,7 +1120,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 76,
@@ -985,7 +1135,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 77,
@@ -998,7 +1150,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 78,
@@ -1011,7 +1165,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 79,
@@ -1024,7 +1180,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 80,
@@ -1037,7 +1195,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 81,
@@ -1050,7 +1210,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 82,
@@ -1063,7 +1225,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 83,
@@ -1076,7 +1240,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 84,
@@ -1089,7 +1255,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 85,
@@ -1102,7 +1270,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 86,
@@ -1115,7 +1285,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 87,
@@ -1128,7 +1300,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 88,
@@ -1141,7 +1315,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 89,
@@ -1154,7 +1330,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 90,
@@ -1167,7 +1345,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 91,
@@ -1180,7 +1360,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 92,
@@ -1193,7 +1375,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 93,
@@ -1206,7 +1390,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 94,
@@ -1219,7 +1405,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 95,
@@ -1232,7 +1420,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 96,
@@ -1245,7 +1435,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 97,
@@ -1258,7 +1450,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 98,
@@ -1271,7 +1465,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 99,
@@ -1284,7 +1480,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 100,
@@ -1297,7 +1495,9 @@
       }
     ],
     "star": 1,
-    "p": 250
+    "p": 250,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 101,
@@ -1310,7 +1510,9 @@
       }
     ],
     "star": 1,
-    "p": 67
+    "p": 67,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 102,
@@ -1323,7 +1525,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 103,
@@ -1336,7 +1540,9 @@
       }
     ],
     "star": 1,
-    "p": 250
+    "p": 250,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 104,
@@ -1349,7 +1555,9 @@
       }
     ],
     "star": 1,
-    "p": 67
+    "p": 67,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 105,
@@ -1362,7 +1570,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 106,
@@ -1375,7 +1585,9 @@
       }
     ],
     "star": 1,
-    "p": 250
+    "p": 250,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 107,
@@ -1388,7 +1600,9 @@
       }
     ],
     "star": 1,
-    "p": 67
+    "p": 67,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 108,
@@ -1401,7 +1615,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 109,
@@ -1414,7 +1630,9 @@
       }
     ],
     "star": 1,
-    "p": 250
+    "p": 250,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 110,
@@ -1427,7 +1645,9 @@
       }
     ],
     "star": 1,
-    "p": 67
+    "p": 67,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 111,
@@ -1440,7 +1660,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 112,
@@ -1453,7 +1675,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 113,
@@ -1466,7 +1690,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 114,
@@ -1479,7 +1705,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 115,
@@ -1492,7 +1720,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 116,
@@ -1505,7 +1735,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 117,
@@ -1518,7 +1750,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 118,
@@ -1531,7 +1765,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 119,
@@ -1544,7 +1780,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 120,
@@ -1557,7 +1795,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 121,
@@ -1570,7 +1810,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 122,
@@ -1583,7 +1825,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 123,
@@ -1596,7 +1840,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 124,
@@ -1609,7 +1855,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 125,
@@ -1622,7 +1870,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 126,
@@ -1635,7 +1885,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 127,
@@ -1648,7 +1900,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 128,
@@ -1661,7 +1915,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 129,
@@ -1674,7 +1930,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 130,
@@ -1687,7 +1945,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 131,
@@ -1700,7 +1960,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 132,
@@ -1713,7 +1975,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 133,
@@ -1726,7 +1990,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 134,
@@ -1739,7 +2005,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 135,
@@ -1752,7 +2020,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 136,
@@ -1765,7 +2035,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 137,
@@ -1778,7 +2050,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 138,
@@ -1791,7 +2065,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 139,
@@ -1804,7 +2080,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 140,
@@ -1817,7 +2095,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 141,
@@ -1830,7 +2110,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 142,
@@ -1843,7 +2125,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 143,
@@ -1856,7 +2140,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 144,
@@ -1869,7 +2155,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 145,
@@ -1882,7 +2170,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 146,
@@ -1895,7 +2185,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 147,
@@ -1908,7 +2200,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 148,
@@ -1921,7 +2215,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 149,
@@ -1934,7 +2230,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 150,
@@ -1947,7 +2245,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 151,
@@ -1960,7 +2260,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 152,
@@ -1973,7 +2275,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 153,
@@ -1986,7 +2290,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 154,
@@ -1999,7 +2305,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 155,
@@ -2012,7 +2320,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 156,
@@ -2025,7 +2335,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 157,
@@ -2038,7 +2350,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 158,
@@ -2051,7 +2365,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 159,
@@ -2064,7 +2380,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 160,
@@ -2077,7 +2395,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 161,
@@ -2090,7 +2410,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 162,
@@ -2103,7 +2425,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 163,
@@ -2116,7 +2440,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 164,
@@ -2129,7 +2455,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 165,
@@ -2142,7 +2470,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 166,
@@ -2155,7 +2485,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 167,
@@ -2168,7 +2500,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 168,
@@ -2181,7 +2515,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 169,
@@ -2194,7 +2530,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 170,
@@ -2207,7 +2545,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 171,
@@ -2220,7 +2560,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 172,
@@ -2233,7 +2575,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 173,
@@ -2246,7 +2590,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 174,
@@ -2259,7 +2605,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 175,
@@ -2272,7 +2620,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 176,
@@ -2285,7 +2635,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 177,
@@ -2298,7 +2650,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 178,
@@ -2311,7 +2665,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 179,
@@ -2324,7 +2680,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 180,
@@ -2337,7 +2695,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 181,
@@ -2350,7 +2710,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 182,
@@ -2363,7 +2725,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 183,
@@ -2376,7 +2740,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 184,
@@ -2389,7 +2755,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 185,
@@ -2402,7 +2770,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 186,
@@ -2415,7 +2785,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 187,
@@ -2428,7 +2800,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 188,
@@ -2441,7 +2815,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 189,
@@ -2454,7 +2830,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 190,
@@ -2467,7 +2845,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 191,
@@ -2480,7 +2860,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 192,
@@ -2493,7 +2875,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 193,
@@ -2506,7 +2890,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 194,
@@ -2519,7 +2905,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 195,
@@ -2532,7 +2920,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 196,
@@ -2545,7 +2935,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 197,
@@ -2558,7 +2950,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 198,
@@ -2571,7 +2965,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 199,
@@ -2584,7 +2980,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 200,
@@ -2597,7 +2995,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 201,
@@ -2610,7 +3010,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 202,
@@ -2623,7 +3025,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 203,
@@ -2636,7 +3040,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 204,
@@ -2649,7 +3055,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 205,
@@ -2662,7 +3070,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 206,
@@ -2675,7 +3085,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 207,
@@ -2688,7 +3100,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 208,
@@ -2701,7 +3115,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 209,
@@ -2714,7 +3130,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 210,
@@ -2727,7 +3145,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 211,
@@ -2740,7 +3160,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 212,
@@ -2753,7 +3175,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 213,
@@ -2766,7 +3190,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 214,
@@ -2779,7 +3205,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 215,
@@ -2792,7 +3220,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 216,
@@ -2805,7 +3235,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 217,
@@ -2818,7 +3250,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 218,
@@ -2831,7 +3265,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 219,
@@ -2844,7 +3280,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 220,
@@ -2857,7 +3295,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 221,
@@ -2870,7 +3310,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 222,
@@ -2883,7 +3325,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 223,
@@ -2896,7 +3340,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 224,
@@ -2909,7 +3355,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 225,
@@ -2922,7 +3370,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 226,
@@ -2935,7 +3385,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 227,
@@ -2948,7 +3400,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 228,
@@ -2961,7 +3415,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 229,
@@ -2974,7 +3430,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 230,
@@ -2987,7 +3445,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 231,
@@ -3000,7 +3460,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 232,
@@ -3013,7 +3475,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 233,
@@ -3026,7 +3490,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 234,
@@ -3039,7 +3505,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 235,
@@ -3052,7 +3520,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 236,
@@ -3065,7 +3535,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 237,
@@ -3078,7 +3550,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 238,
@@ -3091,7 +3565,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 239,
@@ -3104,7 +3580,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 240,
@@ -3117,7 +3595,9 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   },
   {
     "id": 241,
@@ -3130,6 +3610,8 @@
       }
     ],
     "star": 1,
-    "p": 1000
+    "p": 1000,
+    "enable_type": 0,
+    "condition": 0
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index 0e5c07f48..119d6ad13 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -543,6 +543,10 @@
       "a": "item",
       "t": "500000",
       "n": 0
-    }
+    },
+    "smithy_PurchaseType": [
+      50,
+      50
+    ]
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json
index 251619978..3ceadf6b6 100644
--- a/bin/json/game_hero.json
+++ b/bin/json/game_hero.json
@@ -6,7 +6,7 @@
       "text": "闪闪"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 1,
     "job": 2,
     "type": 1,
@@ -85,7 +85,7 @@
       "text": "食人鱼先生"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 1,
     "job": 1,
     "type": 1,
@@ -164,7 +164,7 @@
       "text": "啊啊"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 1,
     "job": 2,
     "type": 1,
@@ -243,7 +243,7 @@
       "text": "法夸德勋爵"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 1,
     "job": 1,
     "type": 1,
@@ -322,7 +322,7 @@
       "text": "大大"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 1,
     "job": 3,
     "type": 1,
@@ -401,7 +401,7 @@
       "text": "史图依克"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 1,
     "job": 2,
     "type": 1,
@@ -480,7 +480,7 @@
       "text": "大龙"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 1,
     "job": 2,
     "type": 1,
@@ -559,7 +559,7 @@
       "text": "亚丝翠"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 1,
     "job": 4,
     "type": 1,
@@ -638,7 +638,7 @@
       "text": "克莱尔·努涅斯"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 1,
     "job": 3,
     "type": 1,
@@ -717,7 +717,7 @@
       "text": "鹤大师"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 1,
     "job": 1,
     "type": 1,
@@ -796,7 +796,7 @@
       "text": "布兰奇"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 1,
     "job": 4,
     "type": 1,
@@ -875,7 +875,7 @@
       "text": "格里斯特王子"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 1,
     "job": 2,
     "type": 1,
@@ -954,7 +954,7 @@
       "text": "吉姆·莱克"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 1,
     "job": 1,
     "type": 1,
@@ -1033,7 +1033,7 @@
       "text": "船长"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 1,
     "job": 1,
     "type": 1,
@@ -1112,7 +1112,7 @@
       "text": "希沙窦斯"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 1,
     "job": 1,
     "type": 1,
@@ -1191,7 +1191,7 @@
       "text": "小欧"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 1,
     "job": 4,
     "type": 1,
@@ -1270,7 +1270,7 @@
       "text": "斯梅克船长"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 2,
     "job": 3,
     "type": 1,
@@ -1349,7 +1349,7 @@
       "text": "警卫队长"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 2,
     "job": 1,
     "type": 1,
@@ -1428,7 +1428,7 @@
       "text": "黛塔黛恩"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 2,
     "job": 3,
     "type": 1,
@@ -1507,7 +1507,7 @@
       "text": "吉姆·普雷斯科特"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 2,
     "job": 4,
     "type": 1,
@@ -1586,7 +1586,7 @@
       "text": "警长"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 2,
     "job": 1,
     "type": 1,
@@ -1665,7 +1665,7 @@
       "text": "牙仙"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 2,
     "job": 1,
     "type": 1,
@@ -1744,7 +1744,7 @@
       "text": "睡神沙人"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 2,
     "job": 4,
     "type": 1,
@@ -1823,7 +1823,7 @@
       "text": "邦尼兔"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 2,
     "job": 1,
     "type": 1,
@@ -1902,7 +1902,7 @@
       "text": "金猴"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 2,
     "job": 3,
     "type": 1,
@@ -1981,7 +1981,7 @@
       "text": "凯尔"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 2,
     "job": 3,
     "type": 1,
@@ -2060,7 +2060,7 @@
       "text": "小钱"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 2,
     "job": 3,
     "type": 1,
@@ -2139,7 +2139,7 @@
       "text": "暴芙那特"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 2,
     "job": 1,
     "type": 1,
@@ -2218,7 +2218,7 @@
       "text": "云朵先生"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 2,
     "job": 4,
     "type": 1,
@@ -2297,7 +2297,7 @@
       "text": "阿宝"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 2,
     "job": 2,
     "type": 1,
@@ -2376,7 +2376,7 @@
       "text": "沃尔夫先生"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 2,
     "job": 3,
     "type": 1,
@@ -2455,7 +2455,7 @@
       "text": "羊仙姑"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 2,
     "job": 4,
     "type": 1,
@@ -2534,7 +2534,7 @@
       "text": "波比"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 2,
     "job": 3,
     "type": 1,
@@ -2613,7 +2613,7 @@
       "text": "巫嘎"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 3,
     "job": 3,
     "type": 1,
@@ -2692,7 +2692,7 @@
       "text": "坦克"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 3,
     "job": 1,
     "type": 1,
@@ -2771,7 +2771,7 @@
       "text": "胡德先生"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 3,
     "job": 1,
     "type": 1,
@@ -2850,7 +2850,7 @@
       "text": "普鲁格兰杰"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 3,
     "job": 1,
     "type": 1,
@@ -2929,7 +2929,7 @@
       "text": "鼻涕粗"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 3,
     "job": 1,
     "type": 1,
@@ -3008,7 +3008,7 @@
       "text": "珍妮丝·邓普顿"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 3,
     "job": 3,
     "type": 1,
@@ -3087,7 +3087,7 @@
       "text": "贫嘴驴"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 3,
     "job": 1,
     "type": 1,
@@ -3166,7 +3166,7 @@
       "text": "蒂姆·邓普顿"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 3,
     "job": 3,
     "type": 1,
@@ -3245,7 +3245,7 @@
       "text": "圣诞老人"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 3,
     "job": 1,
     "type": 1,
@@ -3324,7 +3324,7 @@
       "text": "瓜哥"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 3,
     "job": 3,
     "type": 1,
@@ -3403,7 +3403,7 @@
       "text": "沃尔特·史翠克勒"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 3,
     "job": 4,
     "type": 1,
@@ -3482,7 +3482,7 @@
       "text": "冰霜杰克"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 3,
     "job": 4,
     "type": 1,
@@ -3561,7 +3561,7 @@
       "text": "菲奥娜"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 3,
     "job": 1,
     "type": 1,
@@ -3640,7 +3640,7 @@
       "text": "悍夫那特"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 3,
     "job": 4,
     "type": 1,
@@ -3719,7 +3719,7 @@
       "text": "师父"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 2,
     "job": 2,
     "type": 1,
@@ -3798,7 +3798,7 @@
       "text": "希卡普"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 3,
     "job": 4,
     "type": 1,
@@ -3877,7 +3877,7 @@
       "text": "漆黑"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 3,
     "job": 1,
     "type": 1,
@@ -3956,7 +3956,7 @@
       "text": "黛安·福克斯顿"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 3,
     "job": 1,
     "type": 1,
@@ -4035,7 +4035,7 @@
       "text": "幸运·普雷斯科特"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 3,
     "job": 3,
     "type": 1,
@@ -4114,7 +4114,7 @@
       "text": "平先生"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 3,
     "job": 3,
     "type": 1,
@@ -4193,7 +4193,7 @@
       "text": "阿比盖尔·斯通"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 4,
     "job": 3,
     "type": 1,
@@ -4272,7 +4272,7 @@
       "text": "果酱教授"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 4,
     "job": 4,
     "type": 1,
@@ -4351,7 +4351,7 @@
       "text": "史蒂夫·帕丘克"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 4,
     "job": 3,
     "type": 1,
@@ -4430,7 +4430,7 @@
       "text": "姜饼人"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 4,
     "job": 1,
     "type": 1,
@@ -4509,7 +4509,7 @@
       "text": "瓦希尔指挥官"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 4,
     "job": 1,
     "type": 1,
@@ -4588,7 +4588,7 @@
       "text": "布里奇特"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 4,
     "job": 3,
     "type": 1,
@@ -4667,7 +4667,7 @@
       "text": "戈伯"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 4,
     "job": 1,
     "type": 1,
@@ -4746,7 +4746,7 @@
       "text": "美肚鲨"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 4,
     "job": 3,
     "type": 1,
@@ -4825,7 +4825,7 @@
       "text": "蛇先生"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 4,
     "job": 3,
     "type": 1,
@@ -4904,7 +4904,7 @@
       "text": "匹诺曹"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 4,
     "job": 1,
     "type": 1,
@@ -4983,7 +4983,7 @@
       "text": "骇客蛛"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 4,
     "job": 3,
     "type": 1,
@@ -5062,7 +5062,7 @@
       "text": "悍娇虎"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 4,
     "job": 1,
     "type": 1,
@@ -5141,7 +5141,7 @@
       "text": "乌龟大师"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 4,
     "job": 1,
     "type": 1,
@@ -5220,7 +5220,7 @@
       "text": "梅林"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 4,
     "job": 3,
     "type": 1,
@@ -5299,7 +5299,7 @@
       "text": "盖"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 4,
     "job": 3,
     "type": 1,
@@ -5378,7 +5378,7 @@
       "text": "穿靴子的猫"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 4,
     "job": 1,
     "type": 1,
@@ -5457,7 +5457,7 @@
       "text": "小伊"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 4,
     "job": 3,
     "type": 1,
@@ -5536,7 +5536,7 @@
       "text": "亚力克斯"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 1,
     "job": 3,
     "type": 1,
@@ -5608,725 +5608,14 @@
     ],
     "expitemnum": 3
   },
-  {
-    "hid": "43901",
-    "name": {
-      "key": "hero_43901",
-      "text": "升星精灵·稀有"
-    },
-    "star": 3,
-    "color": 2,
-    "race": 4,
-    "job": 5,
-    "type": 2,
-    "ip": 1,
-    "sd": 1,
-    "handbook": -1,
-    "prefab": "43901",
-    "rotation": "0|0|0",
-    "icon": "43901",
-    "vocal": "43901",
-    "tujing": [
-      107
-    ],
-    "intr": {
-      "key": "herointr_43901",
-      "text": "可以用来进行3星英雄进阶"
-    },
-    "events": "hero_43901",
-    "cite": "",
-    "effectstay": [],
-    "hpspace": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "skill": 0,
-    "skill1": 0,
-    "skill2": 0,
-    "skill3": 0,
-    "txt": {
-      "key": "atlas_43901",
-      "text": ""
-    },
-    "enteranivalue": -1,
-    "camerainterval": 0,
-    "equiprcom": [
-      "11001",
-      "11002",
-      "11003",
-      "11004",
-      "11005",
-      "11006",
-      "11011",
-      "11012",
-      "11013",
-      "11014",
-      "11015",
-      "11016"
-    ],
-    "angle": 0,
-    "deviation": 0,
-    "show": 1,
-    "herofrag": [
-      {
-        "a": "item",
-        "t": "625001",
-        "n": 1
-      }
-    ],
-    "heroskillup": [
-      "625001"
-    ],
-    "expitem": [
-      {
-        "a": "item",
-        "t": "625001",
-        "n": 1
-      }
-    ],
-    "expitemnum": 3
-  },
-  {
-    "hid": "43902",
-    "name": {
-      "key": "hero_43902",
-      "text": "升星精灵·史诗"
-    },
-    "star": 4,
-    "color": 3,
-    "race": 4,
-    "job": 5,
-    "type": 2,
-    "ip": 1,
-    "sd": 1,
-    "handbook": -1,
-    "prefab": "43901",
-    "rotation": "0|0|0",
-    "icon": "43902",
-    "vocal": "43902",
-    "tujing": [
-      107
-    ],
-    "intr": {
-      "key": "herointr_43902",
-      "text": "可以用来进行4星英雄进阶"
-    },
-    "events": "hero_43902",
-    "cite": "",
-    "effectstay": [],
-    "hpspace": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "skill": 0,
-    "skill1": 0,
-    "skill2": 0,
-    "skill3": 0,
-    "txt": {
-      "key": "atlas_43902",
-      "text": ""
-    },
-    "enteranivalue": -1,
-    "camerainterval": 0,
-    "equiprcom": [
-      "11001",
-      "11002",
-      "11003",
-      "11004",
-      "11005",
-      "11006",
-      "11011",
-      "11012",
-      "11013",
-      "11014",
-      "11015",
-      "11016"
-    ],
-    "angle": 0,
-    "deviation": 0,
-    "show": 1,
-    "herofrag": [
-      {
-        "a": "item",
-        "t": "625001",
-        "n": 1
-      }
-    ],
-    "heroskillup": [
-      "625001"
-    ],
-    "expitem": [
-      {
-        "a": "item",
-        "t": "625001",
-        "n": 1
-      }
-    ],
-    "expitemnum": 3
-  },
-  {
-    "hid": "43903",
-    "name": {
-      "key": "hero_43903",
-      "text": "升星精灵·传说"
-    },
-    "star": 5,
-    "color": 4,
-    "race": 4,
-    "job": 5,
-    "type": 2,
-    "ip": 1,
-    "sd": 1,
-    "handbook": -1,
-    "prefab": "43901",
-    "rotation": "0|0|0",
-    "icon": "43903",
-    "vocal": "43903",
-    "tujing": [
-      107
-    ],
-    "intr": {
-      "key": "herointr_43903",
-      "text": "可以用来进行5星英雄进阶"
-    },
-    "events": "hero_43903",
-    "cite": "",
-    "effectstay": [],
-    "hpspace": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "skill": 0,
-    "skill1": 0,
-    "skill2": 0,
-    "skill3": 0,
-    "txt": {
-      "key": "atlas_43903",
-      "text": ""
-    },
-    "enteranivalue": -1,
-    "camerainterval": 0,
-    "equiprcom": [
-      "11001",
-      "11002",
-      "11003",
-      "11004",
-      "11005",
-      "11006",
-      "11011",
-      "11012",
-      "11013",
-      "11014",
-      "11015",
-      "11016"
-    ],
-    "angle": 0,
-    "deviation": 0,
-    "show": 1,
-    "herofrag": [
-      {
-        "a": "item",
-        "t": "625001",
-        "n": 1
-      }
-    ],
-    "heroskillup": [
-      "625001"
-    ],
-    "expitem": [
-      {
-        "a": "item",
-        "t": "625001",
-        "n": 1
-      }
-    ],
-    "expitemnum": 3
-  },
-  {
-    "hid": "42911",
-    "name": {
-      "key": "hero_42911",
-      "text": "初级经验精灵"
-    },
-    "star": 2,
-    "color": 1,
-    "race": 4,
-    "job": 5,
-    "type": 3,
-    "ip": 1,
-    "sd": 1,
-    "handbook": -1,
-    "prefab": "42911",
-    "rotation": "0|0|0",
-    "icon": "42911",
-    "vocal": "42911",
-    "tujing": [
-      107
-    ],
-    "intr": {
-      "key": "herointr_42911",
-      "text": "可以用来少量英雄经验"
-    },
-    "events": "hero_42911",
-    "cite": "",
-    "effectstay": [],
-    "hpspace": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "skill": 0,
-    "skill1": 0,
-    "skill2": 0,
-    "skill3": 0,
-    "txt": {
-      "key": "atlas_42911",
-      "text": ""
-    },
-    "enteranivalue": -1,
-    "camerainterval": 0,
-    "equiprcom": [
-      "11021",
-      "11022",
-      "11023",
-      "11024",
-      "11025",
-      "11026",
-      "11031",
-      "11032",
-      "11033",
-      "11034",
-      "11035",
-      "11036"
-    ],
-    "angle": 0,
-    "deviation": 0,
-    "show": 1,
-    "herofrag": [
-      {
-        "a": "item",
-        "t": "625001",
-        "n": 1
-      }
-    ],
-    "heroskillup": [
-      "625001"
-    ],
-    "expitem": [
-      {
-        "a": "item",
-        "t": "625001",
-        "n": 1
-      }
-    ],
-    "expitemnum": 3
-  },
-  {
-    "hid": "43911",
-    "name": {
-      "key": "hero_43911",
-      "text": "中级经验精灵"
-    },
-    "star": 3,
-    "color": 2,
-    "race": 4,
-    "job": 5,
-    "type": 3,
-    "ip": 1,
-    "sd": 1,
-    "handbook": -1,
-    "prefab": "43911",
-    "rotation": "0|0|0",
-    "icon": "43911",
-    "vocal": "43911",
-    "tujing": [
-      107
-    ],
-    "intr": {
-      "key": "herointr_43911",
-      "text": "可以用来一些英雄经验"
-    },
-    "events": "hero_43911",
-    "cite": "",
-    "effectstay": [],
-    "hpspace": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "skill": 0,
-    "skill1": 0,
-    "skill2": 0,
-    "skill3": 0,
-    "txt": {
-      "key": "atlas_43911",
-      "text": ""
-    },
-    "enteranivalue": -1,
-    "camerainterval": 0,
-    "equiprcom": [
-      "11041",
-      "11042",
-      "11043",
-      "11044",
-      "11045",
-      "11046",
-      "11051",
-      "11052",
-      "11053",
-      "11054",
-      "11055",
-      "11056"
-    ],
-    "angle": 0,
-    "deviation": 0,
-    "show": 1,
-    "herofrag": [
-      {
-        "a": "item",
-        "t": "625001",
-        "n": 1
-      }
-    ],
-    "heroskillup": [
-      "625001"
-    ],
-    "expitem": [
-      {
-        "a": "item",
-        "t": "625001",
-        "n": 1
-      }
-    ],
-    "expitemnum": 3
-  },
-  {
-    "hid": "44911",
-    "name": {
-      "key": "hero_44911",
-      "text": "高级经验精灵"
-    },
-    "star": 4,
-    "color": 3,
-    "race": 4,
-    "job": 5,
-    "type": 3,
-    "ip": 1,
-    "sd": 1,
-    "handbook": -1,
-    "prefab": "44911",
-    "rotation": "0|0|0",
-    "icon": "44911",
-    "vocal": "44911",
-    "tujing": [
-      107
-    ],
-    "intr": {
-      "key": "herointr_44911",
-      "text": "可以用来大量英雄经验"
-    },
-    "events": "hero_44911",
-    "cite": "",
-    "effectstay": [],
-    "hpspace": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "skill": 0,
-    "skill1": 0,
-    "skill2": 0,
-    "skill3": 0,
-    "txt": {
-      "key": "atlas_44911",
-      "text": ""
-    },
-    "enteranivalue": -1,
-    "camerainterval": 0,
-    "equiprcom": [
-      "10001",
-      "10002",
-      "10003",
-      "10004",
-      "10005",
-      "10006",
-      "10011",
-      "10012",
-      "10013",
-      "10014",
-      "10015",
-      "10016"
-    ],
-    "angle": 0,
-    "deviation": 0,
-    "show": 1,
-    "herofrag": [
-      {
-        "a": "item",
-        "t": "625001",
-        "n": 1
-      }
-    ],
-    "heroskillup": [
-      "625001"
-    ],
-    "expitem": [
-      {
-        "a": "item",
-        "t": "625001",
-        "n": 1
-      }
-    ],
-    "expitemnum": 3
-  },
-  {
-    "hid": "43921",
-    "name": {
-      "key": "hero_43921",
-      "text": "技能精灵·稀有"
-    },
-    "star": 3,
-    "color": 2,
-    "race": 4,
-    "job": 5,
-    "type": 4,
-    "ip": 1,
-    "sd": 1,
-    "handbook": -1,
-    "prefab": "43921",
-    "rotation": "0|0|0",
-    "icon": "43921",
-    "vocal": "43921",
-    "tujing": [
-      107
-    ],
-    "intr": {
-      "key": "herointr_43921",
-      "text": "可以用来升级初始3星英雄的技能"
-    },
-    "events": "hero_43921",
-    "cite": "",
-    "effectstay": [],
-    "hpspace": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "skill": 0,
-    "skill1": 0,
-    "skill2": 0,
-    "skill3": 0,
-    "txt": {
-      "key": "atlas_43921",
-      "text": ""
-    },
-    "enteranivalue": -1,
-    "camerainterval": 0,
-    "equiprcom": [
-      "10021",
-      "10022",
-      "10023",
-      "10024",
-      "10025",
-      "10026",
-      "10031",
-      "10032",
-      "10033",
-      "10034",
-      "10035",
-      "10036"
-    ],
-    "angle": 0,
-    "deviation": 0,
-    "show": 1,
-    "herofrag": [
-      {
-        "a": "item",
-        "t": "625001",
-        "n": 1
-      }
-    ],
-    "heroskillup": [
-      "625001"
-    ],
-    "expitem": [
-      {
-        "a": "item",
-        "t": "625001",
-        "n": 1
-      }
-    ],
-    "expitemnum": 3
-  },
-  {
-    "hid": "44921",
-    "name": {
-      "key": "hero_44921",
-      "text": "技能精灵·史诗"
-    },
-    "star": 4,
-    "color": 3,
-    "race": 4,
-    "job": 5,
-    "type": 4,
-    "ip": 1,
-    "sd": 1,
-    "handbook": -1,
-    "prefab": "44921",
-    "rotation": "0|0|0",
-    "icon": "44921",
-    "vocal": "44921",
-    "tujing": [
-      107
-    ],
-    "intr": {
-      "key": "herointr_44921",
-      "text": "可以用来升级初始4星英雄的技能"
-    },
-    "events": "hero_44921",
-    "cite": "",
-    "effectstay": [],
-    "hpspace": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "skill": 0,
-    "skill1": 0,
-    "skill2": 0,
-    "skill3": 0,
-    "txt": {
-      "key": "atlas_44921",
-      "text": ""
-    },
-    "enteranivalue": -1,
-    "camerainterval": 0,
-    "equiprcom": [
-      "10041",
-      "10042",
-      "10043",
-      "10044",
-      "10045",
-      "10046",
-      "10051",
-      "10052",
-      "10053",
-      "10054",
-      "10055",
-      "10056"
-    ],
-    "angle": 0,
-    "deviation": 0,
-    "show": 1,
-    "herofrag": [
-      {
-        "a": "item",
-        "t": "625001",
-        "n": 1
-      }
-    ],
-    "heroskillup": [
-      "625001"
-    ],
-    "expitem": [
-      {
-        "a": "item",
-        "t": "625001",
-        "n": 1
-      }
-    ],
-    "expitemnum": 3
-  },
-  {
-    "hid": "45921",
-    "name": {
-      "key": "hero_45921",
-      "text": "技能精灵·传说"
-    },
-    "star": 5,
-    "color": 4,
-    "race": 4,
-    "job": 5,
-    "type": 4,
-    "ip": 1,
-    "sd": 1,
-    "handbook": -1,
-    "prefab": "45921",
-    "rotation": "0|0|0",
-    "icon": "45921",
-    "vocal": "45921",
-    "tujing": [
-      107
-    ],
-    "intr": {
-      "key": "herointr_45921",
-      "text": "可以用来升级初始5星英雄的技能"
-    },
-    "events": "hero_45921",
-    "cite": "",
-    "effectstay": [],
-    "hpspace": {
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "skill": 0,
-    "skill1": 0,
-    "skill2": 0,
-    "skill3": 0,
-    "txt": {
-      "key": "atlas_45921",
-      "text": ""
-    },
-    "enteranivalue": -1,
-    "camerainterval": 0,
-    "equiprcom": [
-      "11001",
-      "11002",
-      "11003",
-      "11004",
-      "11005",
-      "11006",
-      "11011",
-      "11012",
-      "11013",
-      "11014",
-      "11015",
-      "11016"
-    ],
-    "angle": 0,
-    "deviation": 0,
-    "show": 1,
-    "herofrag": [
-      {
-        "a": "item",
-        "t": "625001",
-        "n": 1
-      }
-    ],
-    "heroskillup": [
-      "625001"
-    ],
-    "expitem": [
-      {
-        "a": "item",
-        "t": "625001",
-        "n": 1
-      }
-    ],
-    "expitemnum": 3
-  },
   {
     "hid": "51001",
     "name": {
       "key": "hero_51001",
       "text": "啵啵星人"
     },
-    "star": 2,
-    "color": 1,
+    "star": 3,
+    "color": 3,
     "race": 4,
     "job": 3,
     "type": 5,
@@ -6404,8 +5693,8 @@
       "key": "hero_51002",
       "text": "埃雷特手下1号"
     },
-    "star": 2,
-    "color": 1,
+    "star": 3,
+    "color": 3,
     "race": 4,
     "job": 3,
     "type": 5,
@@ -6483,8 +5772,8 @@
       "key": "hero_51003",
       "text": "埃雷特手下2号"
     },
-    "star": 2,
-    "color": 1,
+    "star": 3,
+    "color": 3,
     "race": 4,
     "job": 3,
     "type": 5,
@@ -6562,8 +5851,8 @@
       "key": "hero_51004",
       "text": "豺狼小怪"
     },
-    "star": 2,
-    "color": 1,
+    "star": 3,
+    "color": 3,
     "race": 4,
     "job": 3,
     "type": 5,
@@ -6641,8 +5930,8 @@
       "key": "hero_51005",
       "text": "犀牛守卫"
     },
-    "star": 2,
-    "color": 1,
+    "star": 3,
+    "color": 3,
     "race": 4,
     "job": 1,
     "type": 5,
@@ -6720,8 +6009,8 @@
       "key": "hero_51006",
       "text": "羊群"
     },
-    "star": 2,
-    "color": 1,
+    "star": 3,
+    "color": 3,
     "race": 4,
     "job": 3,
     "type": 5,
@@ -6799,8 +6088,8 @@
       "key": "hero_51007",
       "text": "香塔尔杜布瓦队长手下2号"
     },
-    "star": 2,
-    "color": 1,
+    "star": 3,
+    "color": 3,
     "race": 4,
     "job": 3,
     "type": 5,
@@ -6878,8 +6167,8 @@
       "key": "hero_54005",
       "text": "无牙仔"
     },
-    "star": 2,
-    "color": 1,
+    "star": 3,
+    "color": 3,
     "race": 4,
     "job": 1,
     "type": 5,
@@ -6957,8 +6246,8 @@
       "key": "hero_51010",
       "text": "警卫1号"
     },
-    "star": 2,
-    "color": 1,
+    "star": 3,
+    "color": 3,
     "race": 4,
     "job": 1,
     "type": 5,
@@ -7036,8 +6325,8 @@
       "key": "hero_51011",
       "text": "警卫2号"
     },
-    "star": 2,
-    "color": 1,
+    "star": 3,
+    "color": 3,
     "race": 4,
     "job": 3,
     "type": 5,
@@ -7115,8 +6404,8 @@
       "key": "hero_51012",
       "text": "小猴子"
     },
-    "star": 2,
-    "color": 1,
+    "star": 3,
+    "color": 3,
     "race": 4,
     "job": 3,
     "type": 5,
@@ -7194,8 +6483,8 @@
       "key": "hero_51013",
       "text": "巨怪啰啰"
     },
-    "star": 2,
-    "color": 1,
+    "star": 3,
+    "color": 3,
     "race": 4,
     "job": 1,
     "type": 5,
@@ -7273,8 +6562,8 @@
       "key": "hero_51014",
       "text": "博啃族宫廷守卫"
     },
-    "star": 2,
-    "color": 1,
+    "star": 3,
+    "color": 3,
     "race": 4,
     "job": 1,
     "type": 5,
@@ -7353,7 +6642,7 @@
       "text": "致命纳得"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 4,
     "job": 1,
     "type": 5,
@@ -7432,7 +6721,7 @@
       "text": "埃雷特"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 4,
     "job": 3,
     "type": 5,
@@ -7511,7 +6800,7 @@
       "text": "豺狼头领"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 4,
     "job": 1,
     "type": 5,
@@ -7590,7 +6879,7 @@
       "text": "豪猪大师（翡翠僵尸）"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 4,
     "job": 1,
     "type": 5,
@@ -7669,7 +6958,7 @@
       "text": "丝塔西"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 4,
     "job": 1,
     "type": 5,
@@ -7748,7 +7037,7 @@
       "text": "小猴子首领"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 4,
     "job": 1,
     "type": 5,
@@ -7827,7 +7116,7 @@
       "text": "巨怪首领"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 4,
     "job": 3,
     "type": 5,
@@ -7906,7 +7195,7 @@
       "text": "火龙"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 4,
     "job": 2,
     "type": 5,
@@ -7985,7 +7274,7 @@
       "text": "巨型猩猩怪兽"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 4,
     "job": 2,
     "type": 5,
@@ -8064,7 +7353,7 @@
       "text": "格尔族"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 4,
     "job": 2,
     "type": 5,
@@ -8143,7 +7432,7 @@
       "text": "大厨"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 4,
     "job": 2,
     "type": 5,
@@ -8222,7 +7511,7 @@
       "text": "火焰泰坦"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 4,
     "job": 2,
     "type": 5,
@@ -8301,7 +7590,7 @@
       "text": "森林泰坦"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 4,
     "job": 2,
     "type": 5,
@@ -8380,7 +7669,7 @@
       "text": "冰霜泰坦"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 4,
     "job": 2,
     "type": 5,
@@ -8459,7 +7748,7 @@
       "text": "莫甘娜巨怪"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 2,
     "job": 2,
     "type": 5,
@@ -8538,7 +7827,7 @@
       "text": "黑化波比"
     },
     "star": 5,
-    "color": 4,
+    "color": 5,
     "race": 2,
     "job": 2,
     "type": 5,
@@ -8619,7 +7908,7 @@
       "text": "黑化食人鱼先生"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 1,
     "job": 1,
     "type": 5,
@@ -8698,7 +7987,7 @@
       "text": "黑化啊啊"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 1,
     "job": 2,
     "type": 5,
@@ -8777,7 +8066,7 @@
       "text": "黑化法夸德勋爵"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 1,
     "job": 1,
     "type": 5,
@@ -8856,7 +8145,7 @@
       "text": "黑化亚丝翠"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 1,
     "job": 4,
     "type": 5,
@@ -8935,7 +8224,7 @@
       "text": "黑化牙仙"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 2,
     "job": 1,
     "type": 5,
@@ -9014,7 +8303,7 @@
       "text": "黑化睡神沙人"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 2,
     "job": 4,
     "type": 5,
@@ -9093,7 +8382,7 @@
       "text": "黑化邦尼兔"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 2,
     "job": 1,
     "type": 5,
@@ -9172,7 +8461,7 @@
       "text": "黑化坦克"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 3,
     "job": 1,
     "type": 5,
@@ -9251,7 +8540,7 @@
       "text": "黑化珍妮丝·邓普顿"
     },
     "star": 3,
-    "color": 2,
+    "color": 3,
     "race": 3,
     "job": 3,
     "type": 5,
@@ -9330,7 +8619,7 @@
       "text": "黑化蒂姆·邓普顿"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 3,
     "job": 3,
     "type": 5,
@@ -9409,7 +8698,7 @@
       "text": "黑化蛇先生"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 4,
     "job": 3,
     "type": 5,
@@ -9488,7 +8777,7 @@
       "text": "黑化小伊"
     },
     "star": 4,
-    "color": 3,
+    "color": 4,
     "race": 4,
     "job": 3,
     "type": 5,
@@ -9566,8 +8855,8 @@
       "key": "hero_51004",
       "text": "玉化豺狼小怪"
     },
-    "star": 2,
-    "color": 1,
+    "star": 3,
+    "color": 3,
     "race": 4,
     "job": 3,
     "type": 5,
diff --git a/bin/json/game_msgdistrib.json b/bin/json/game_msgdistrib.json
index 8f4a883ee..43d9bf13c 100644
--- a/bin/json/game_msgdistrib.json
+++ b/bin/json/game_msgdistrib.json
@@ -100,5 +100,11 @@
     "open": true,
     "routrules": "~/worker",
     "describe": "附魔副本排行榜数据"
+  },
+  {
+    "msgid": "pvp",
+    "open": true,
+    "routrules": "~/worker",
+    "describe": "pvp"
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_newsmithy.json b/bin/json/game_newsmithy.json
index 2a2394147..f247b2f39 100644
--- a/bin/json/game_newsmithy.json
+++ b/bin/json/game_newsmithy.json
@@ -1,7 +1,6 @@
 [
   {
     "id": 1,
-    "item_id": 0,
     "type": 1,
     "drawing_name": {
       "key": "1",
@@ -56,7 +55,6 @@
   },
   {
     "id": 2,
-    "item_id": 0,
     "type": 1,
     "drawing_name": {
       "key": "2",
@@ -89,7 +87,6 @@
   },
   {
     "id": 3,
-    "item_id": 0,
     "type": 1,
     "drawing_name": {
       "key": "3",
@@ -122,7 +119,6 @@
   },
   {
     "id": 4,
-    "item_id": 0,
     "type": 1,
     "drawing_name": {
       "key": "4",
@@ -155,7 +151,6 @@
   },
   {
     "id": 5,
-    "item_id": 0,
     "type": 1,
     "drawing_name": {
       "key": "5",
@@ -188,7 +183,6 @@
   },
   {
     "id": 6,
-    "item_id": 0,
     "type": 1,
     "drawing_name": {
       "key": "6",
@@ -221,7 +215,6 @@
   },
   {
     "id": 7,
-    "item_id": 0,
     "type": 1,
     "drawing_name": {
       "key": "7",
@@ -254,7 +247,6 @@
   },
   {
     "id": 8,
-    "item_id": 0,
     "type": 1,
     "drawing_name": {
       "key": "8",
@@ -287,7 +279,6 @@
   },
   {
     "id": 9,
-    "item_id": 0,
     "type": 1,
     "drawing_name": {
       "key": "9",
@@ -320,7 +311,6 @@
   },
   {
     "id": 10,
-    "item_id": 0,
     "type": 1,
     "drawing_name": {
       "key": "10",
@@ -353,7 +343,6 @@
   },
   {
     "id": 11,
-    "item_id": 0,
     "type": 1,
     "drawing_name": {
       "key": "11",
@@ -386,7 +375,6 @@
   },
   {
     "id": 12,
-    "item_id": 0,
     "type": 1,
     "drawing_name": {
       "key": "12",
@@ -419,7 +407,6 @@
   },
   {
     "id": 13,
-    "item_id": 0,
     "type": 1,
     "drawing_name": {
       "key": "13",
@@ -452,7 +439,6 @@
   },
   {
     "id": 14,
-    "item_id": 0,
     "type": 1,
     "drawing_name": {
       "key": "14",
@@ -485,7 +471,6 @@
   },
   {
     "id": 15,
-    "item_id": 0,
     "type": 1,
     "drawing_name": {
       "key": "15",
@@ -518,7 +503,6 @@
   },
   {
     "id": 16,
-    "item_id": 0,
     "type": 1,
     "drawing_name": {
       "key": "16",
@@ -551,7 +535,6 @@
   },
   {
     "id": 17,
-    "item_id": 0,
     "type": 1,
     "drawing_name": {
       "key": "17",
@@ -584,7 +567,6 @@
   },
   {
     "id": 18,
-    "item_id": 0,
     "type": 1,
     "drawing_name": {
       "key": "18",
@@ -617,7 +599,6 @@
   },
   {
     "id": 19,
-    "item_id": 0,
     "type": 1,
     "drawing_name": {
       "key": "19",
@@ -650,7 +631,6 @@
   },
   {
     "id": 20,
-    "item_id": 0,
     "type": 1,
     "drawing_name": {
       "key": "20",
@@ -683,7 +663,6 @@
   },
   {
     "id": 21,
-    "item_id": 0,
     "type": 1,
     "drawing_name": {
       "key": "21",
@@ -716,7 +695,6 @@
   },
   {
     "id": 22,
-    "item_id": 0,
     "type": 1,
     "drawing_name": {
       "key": "22",
@@ -749,7 +727,6 @@
   },
   {
     "id": 23,
-    "item_id": 0,
     "type": 1,
     "drawing_name": {
       "key": "23",
@@ -782,7 +759,6 @@
   },
   {
     "id": 24,
-    "item_id": 0,
     "type": 1,
     "drawing_name": {
       "key": "24",
@@ -815,7 +791,6 @@
   },
   {
     "id": 25,
-    "item_id": 0,
     "type": 1,
     "drawing_name": {
       "key": "25",
@@ -848,7 +823,6 @@
   },
   {
     "id": 26,
-    "item_id": 0,
     "type": 2,
     "drawing_name": {
       "key": "26",
@@ -881,7 +855,6 @@
   },
   {
     "id": 27,
-    "item_id": 0,
     "type": 2,
     "drawing_name": {
       "key": "27",
@@ -914,7 +887,6 @@
   },
   {
     "id": 28,
-    "item_id": 0,
     "type": 2,
     "drawing_name": {
       "key": "28",
@@ -947,7 +919,6 @@
   },
   {
     "id": 29,
-    "item_id": 0,
     "type": 2,
     "drawing_name": {
       "key": "29",
@@ -980,7 +951,6 @@
   },
   {
     "id": 30,
-    "item_id": 0,
     "type": 2,
     "drawing_name": {
       "key": "30",
@@ -1013,7 +983,6 @@
   },
   {
     "id": 31,
-    "item_id": 0,
     "type": 2,
     "drawing_name": {
       "key": "31",
@@ -1046,7 +1015,6 @@
   },
   {
     "id": 32,
-    "item_id": 0,
     "type": 2,
     "drawing_name": {
       "key": "32",
@@ -1079,7 +1047,6 @@
   },
   {
     "id": 33,
-    "item_id": 0,
     "type": 2,
     "drawing_name": {
       "key": "33",
@@ -1112,7 +1079,6 @@
   },
   {
     "id": 34,
-    "item_id": 0,
     "type": 2,
     "drawing_name": {
       "key": "34",
@@ -1145,7 +1111,6 @@
   },
   {
     "id": 35,
-    "item_id": 0,
     "type": 2,
     "drawing_name": {
       "key": "35",
@@ -1178,7 +1143,6 @@
   },
   {
     "id": 36,
-    "item_id": 0,
     "type": 2,
     "drawing_name": {
       "key": "36",
@@ -1211,7 +1175,6 @@
   },
   {
     "id": 37,
-    "item_id": 0,
     "type": 2,
     "drawing_name": {
       "key": "37",
@@ -1244,7 +1207,6 @@
   },
   {
     "id": 38,
-    "item_id": 0,
     "type": 2,
     "drawing_name": {
       "key": "38",
@@ -1277,7 +1239,6 @@
   },
   {
     "id": 39,
-    "item_id": 0,
     "type": 2,
     "drawing_name": {
       "key": "39",
@@ -1310,7 +1271,6 @@
   },
   {
     "id": 40,
-    "item_id": 0,
     "type": 2,
     "drawing_name": {
       "key": "40",
@@ -1343,7 +1303,6 @@
   },
   {
     "id": 41,
-    "item_id": 0,
     "type": 2,
     "drawing_name": {
       "key": "41",
@@ -1376,7 +1335,6 @@
   },
   {
     "id": 42,
-    "item_id": 0,
     "type": 2,
     "drawing_name": {
       "key": "42",
@@ -1409,7 +1367,6 @@
   },
   {
     "id": 43,
-    "item_id": 0,
     "type": 2,
     "drawing_name": {
       "key": "43",
@@ -1442,7 +1399,6 @@
   },
   {
     "id": 44,
-    "item_id": 0,
     "type": 2,
     "drawing_name": {
       "key": "44",
@@ -1475,7 +1431,6 @@
   },
   {
     "id": 45,
-    "item_id": 0,
     "type": 2,
     "drawing_name": {
       "key": "45",
@@ -1508,7 +1463,6 @@
   },
   {
     "id": 46,
-    "item_id": 0,
     "type": 2,
     "drawing_name": {
       "key": "46",
@@ -1541,7 +1495,6 @@
   },
   {
     "id": 47,
-    "item_id": 0,
     "type": 2,
     "drawing_name": {
       "key": "47",
@@ -1574,7 +1527,6 @@
   },
   {
     "id": 48,
-    "item_id": 0,
     "type": 2,
     "drawing_name": {
       "key": "48",
@@ -1607,7 +1559,6 @@
   },
   {
     "id": 49,
-    "item_id": 0,
     "type": 2,
     "drawing_name": {
       "key": "49",
@@ -1640,7 +1591,6 @@
   },
   {
     "id": 50,
-    "item_id": 0,
     "type": 2,
     "drawing_name": {
       "key": "50",
@@ -1673,7 +1623,6 @@
   },
   {
     "id": 51,
-    "item_id": 0,
     "type": 3,
     "drawing_name": {
       "key": "51",
@@ -1706,7 +1655,6 @@
   },
   {
     "id": 52,
-    "item_id": 0,
     "type": 3,
     "drawing_name": {
       "key": "52",
@@ -1739,7 +1687,6 @@
   },
   {
     "id": 53,
-    "item_id": 0,
     "type": 3,
     "drawing_name": {
       "key": "53",
@@ -1772,7 +1719,6 @@
   },
   {
     "id": 54,
-    "item_id": 0,
     "type": 3,
     "drawing_name": {
       "key": "54",
@@ -1805,7 +1751,6 @@
   },
   {
     "id": 55,
-    "item_id": 0,
     "type": 3,
     "drawing_name": {
       "key": "55",
@@ -1838,7 +1783,6 @@
   },
   {
     "id": 56,
-    "item_id": 0,
     "type": 3,
     "drawing_name": {
       "key": "56",
@@ -1871,7 +1815,6 @@
   },
   {
     "id": 57,
-    "item_id": 0,
     "type": 3,
     "drawing_name": {
       "key": "57",
@@ -1904,7 +1847,6 @@
   },
   {
     "id": 58,
-    "item_id": 0,
     "type": 3,
     "drawing_name": {
       "key": "58",
@@ -1937,7 +1879,6 @@
   },
   {
     "id": 59,
-    "item_id": 0,
     "type": 3,
     "drawing_name": {
       "key": "59",
@@ -1970,7 +1911,6 @@
   },
   {
     "id": 60,
-    "item_id": 0,
     "type": 3,
     "drawing_name": {
       "key": "60",
@@ -2003,7 +1943,6 @@
   },
   {
     "id": 61,
-    "item_id": 0,
     "type": 3,
     "drawing_name": {
       "key": "61",
@@ -2036,7 +1975,6 @@
   },
   {
     "id": 62,
-    "item_id": 0,
     "type": 3,
     "drawing_name": {
       "key": "62",
@@ -2069,7 +2007,6 @@
   },
   {
     "id": 63,
-    "item_id": 0,
     "type": 3,
     "drawing_name": {
       "key": "63",
@@ -2102,7 +2039,6 @@
   },
   {
     "id": 64,
-    "item_id": 0,
     "type": 3,
     "drawing_name": {
       "key": "64",
@@ -2135,7 +2071,6 @@
   },
   {
     "id": 65,
-    "item_id": 0,
     "type": 3,
     "drawing_name": {
       "key": "65",
@@ -2168,7 +2103,6 @@
   },
   {
     "id": 66,
-    "item_id": 0,
     "type": 3,
     "drawing_name": {
       "key": "66",
@@ -2201,7 +2135,6 @@
   },
   {
     "id": 67,
-    "item_id": 0,
     "type": 3,
     "drawing_name": {
       "key": "67",
@@ -2234,7 +2167,6 @@
   },
   {
     "id": 68,
-    "item_id": 0,
     "type": 3,
     "drawing_name": {
       "key": "68",
@@ -2267,7 +2199,6 @@
   },
   {
     "id": 69,
-    "item_id": 0,
     "type": 3,
     "drawing_name": {
       "key": "69",
@@ -2300,7 +2231,6 @@
   },
   {
     "id": 70,
-    "item_id": 0,
     "type": 3,
     "drawing_name": {
       "key": "70",
@@ -2333,7 +2263,6 @@
   },
   {
     "id": 71,
-    "item_id": 0,
     "type": 3,
     "drawing_name": {
       "key": "71",
@@ -2366,7 +2295,6 @@
   },
   {
     "id": 72,
-    "item_id": 0,
     "type": 3,
     "drawing_name": {
       "key": "72",
@@ -2399,7 +2327,6 @@
   },
   {
     "id": 73,
-    "item_id": 0,
     "type": 3,
     "drawing_name": {
       "key": "73",
@@ -2432,7 +2359,6 @@
   },
   {
     "id": 74,
-    "item_id": 0,
     "type": 3,
     "drawing_name": {
       "key": "74",
@@ -2465,7 +2391,6 @@
   },
   {
     "id": 75,
-    "item_id": 0,
     "type": 3,
     "drawing_name": {
       "key": "75",
diff --git a/bin/json/game_smithytool.json b/bin/json/game_smithytool.json
index 74dda8969..50bea78d3 100644
--- a/bin/json/game_smithytool.json
+++ b/bin/json/game_smithytool.json
@@ -323,7 +323,7 @@
     "id": 11,
     "skill_type": 2,
     "skill_lv": 1,
-    "preconditions": 15,
+    "preconditions": 10,
     "up_material": [],
     "name_text": {
       "key": "",
@@ -339,7 +339,7 @@
     "id": 12,
     "skill_type": 2,
     "skill_lv": 2,
-    "preconditions": 15,
+    "preconditions": 10,
     "up_material": [],
     "name_text": {
       "key": "",
@@ -355,7 +355,7 @@
     "id": 13,
     "skill_type": 2,
     "skill_lv": 3,
-    "preconditions": 15,
+    "preconditions": 10,
     "up_material": [],
     "name_text": {
       "key": "",
@@ -371,7 +371,7 @@
     "id": 14,
     "skill_type": 2,
     "skill_lv": 4,
-    "preconditions": 15,
+    "preconditions": 10,
     "up_material": [],
     "name_text": {
       "key": "",
@@ -387,7 +387,7 @@
     "id": 15,
     "skill_type": 2,
     "skill_lv": 5,
-    "preconditions": 15,
+    "preconditions": 10,
     "up_material": [],
     "name_text": {
       "key": "",
@@ -403,7 +403,7 @@
     "id": 16,
     "skill_type": 2,
     "skill_lv": 6,
-    "preconditions": 15,
+    "preconditions": 10,
     "up_material": [],
     "name_text": {
       "key": "",
@@ -419,7 +419,7 @@
     "id": 17,
     "skill_type": 2,
     "skill_lv": 7,
-    "preconditions": 15,
+    "preconditions": 10,
     "up_material": [],
     "name_text": {
       "key": "",
@@ -435,7 +435,7 @@
     "id": 18,
     "skill_type": 2,
     "skill_lv": 8,
-    "preconditions": 15,
+    "preconditions": 10,
     "up_material": [],
     "name_text": {
       "key": "",
@@ -451,7 +451,7 @@
     "id": 19,
     "skill_type": 2,
     "skill_lv": 9,
-    "preconditions": 15,
+    "preconditions": 10,
     "up_material": [],
     "name_text": {
       "key": "",
@@ -467,7 +467,7 @@
     "id": 20,
     "skill_type": 2,
     "skill_lv": 10,
-    "preconditions": 15,
+    "preconditions": 10,
     "up_material": [],
     "name_text": {
       "key": "",
@@ -483,7 +483,7 @@
     "id": 21,
     "skill_type": 3,
     "skill_lv": 1,
-    "preconditions": 25,
+    "preconditions": 20,
     "up_material": [],
     "name_text": {
       "key": "",
@@ -499,7 +499,7 @@
     "id": 22,
     "skill_type": 3,
     "skill_lv": 2,
-    "preconditions": 25,
+    "preconditions": 21,
     "up_material": [],
     "name_text": {
       "key": "",
@@ -515,7 +515,7 @@
     "id": 23,
     "skill_type": 3,
     "skill_lv": 3,
-    "preconditions": 25,
+    "preconditions": 22,
     "up_material": [],
     "name_text": {
       "key": "",
@@ -531,7 +531,7 @@
     "id": 24,
     "skill_type": 3,
     "skill_lv": 4,
-    "preconditions": 25,
+    "preconditions": 23,
     "up_material": [],
     "name_text": {
       "key": "",
@@ -547,7 +547,7 @@
     "id": 25,
     "skill_type": 3,
     "skill_lv": 5,
-    "preconditions": 25,
+    "preconditions": 24,
     "up_material": [],
     "name_text": {
       "key": "",
@@ -813,7 +813,7 @@
       "key": "41",
       "text": "顾客购买装备数量上限提高至{0}件"
     },
-    "value": 0
+    "value": 6
   },
   {
     "id": 42,
@@ -829,7 +829,7 @@
       "key": "42",
       "text": "顾客购买装备数量上限提高至{0}件"
     },
-    "value": 0
+    "value": 7
   },
   {
     "id": 43,
@@ -845,7 +845,7 @@
       "key": "43",
       "text": "顾客购买装备数量上限提高至{0}件"
     },
-    "value": 0
+    "value": 8
   },
   {
     "id": 44,
@@ -861,7 +861,7 @@
       "key": "44",
       "text": "顾客购买装备数量上限提高至{0}件"
     },
-    "value": 0
+    "value": 9
   },
   {
     "id": 45,
@@ -877,7 +877,7 @@
       "key": "45",
       "text": "顾客购买装备数量上限提高至{0}件"
     },
-    "value": 0
+    "value": 10
   },
   {
     "id": 46,
@@ -893,7 +893,7 @@
       "key": "46",
       "text": "顾客购买装备数量上限提高至{0}件"
     },
-    "value": 0
+    "value": 11
   },
   {
     "id": 47,
@@ -909,7 +909,7 @@
       "key": "47",
       "text": "顾客购买装备数量上限提高至{0}件"
     },
-    "value": 0
+    "value": 12
   },
   {
     "id": 48,
@@ -925,7 +925,7 @@
       "key": "48",
       "text": "顾客购买装备数量上限提高至{0}件"
     },
-    "value": 0
+    "value": 13
   },
   {
     "id": 49,
@@ -941,7 +941,7 @@
       "key": "49",
       "text": "顾客购买装备数量上限提高至{0}件"
     },
-    "value": 0
+    "value": 14
   },
   {
     "id": 50,
@@ -957,6 +957,6 @@
       "key": "50",
       "text": "顾客购买装备数量上限提高至{0}件"
     },
-    "value": 0
+    "value": 15
   }
 ]
\ No newline at end of file
diff --git a/sys/configure/structs/Game.NewSmithyData.go b/sys/configure/structs/Game.NewSmithyData.go
index 08f8a9db7..9ee79fb40 100644
--- a/sys/configure/structs/Game.NewSmithyData.go
+++ b/sys/configure/structs/Game.NewSmithyData.go
@@ -12,7 +12,6 @@ import "errors"
 
 type GameNewSmithyData struct {
     Id int32
-    ItemId int32
     Type int32
     DrawingName string
     QualityText string
@@ -34,7 +33,6 @@ func (*GameNewSmithyData) GetTypeId() int32 {
 
 func (_v *GameNewSmithyData)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["item_id"].(float64); !_ok_ { err = errors.New("item_id error"); return }; _v.ItemId = 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; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["drawing_name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.DrawingName error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.DrawingName, _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["quality_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.QualityText error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.QualityText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
diff --git a/sys/configure/structs/game.DropData.go b/sys/configure/structs/game.DropData.go
index f27a0510c..21ef8d0c5 100644
--- a/sys/configure/structs/game.DropData.go
+++ b/sys/configure/structs/game.DropData.go
@@ -16,6 +16,8 @@ type GameDropData struct {
     Prize []*Gameatn
     Star int32
     P int32
+    EnableType int32
+    Condition int32
 }
 
 const TypeId_GameDropData = 1700203957
@@ -43,6 +45,8 @@ func (_v *GameDropData)Deserialize(_buf map[string]interface{}) (err error) {
 
     { 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["p"].(float64); !_ok_ { err = errors.New("p error"); return }; _v.P = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["enable_type"].(float64); !_ok_ { err = errors.New("enable_type error"); return }; _v.EnableType = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["condition"].(float64); !_ok_ { err = errors.New("condition error"); return }; _v.Condition = int32(_tempNum_) }
     return
 }
 
diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go
index 7cc786d52..5eb796c8d 100644
--- a/sys/configure/structs/game.globalData.go
+++ b/sys/configure/structs/game.globalData.go
@@ -175,6 +175,7 @@ type GameGlobalData struct {
     RotateDizzyTime float32
     Moonshopmoney []int32
     Generaltp *Gameatn
+    SmithyPurchaseType []int32
 }
 
 const TypeId_GameGlobalData = 477542761
@@ -738,6 +739,20 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
             }
 
     { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["generaltp"].(map[string]interface{}); !_ok_ { err = errors.New("generaltp error"); return }; if _v.Generaltp, err = DeserializeGameatn(_x_); err != nil { return } }
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["smithy_PurchaseType"].([]interface{}); !_ok_ { err = errors.New("smithy_PurchaseType error"); return }
+
+                _v.SmithyPurchaseType = 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.SmithyPurchaseType = append(_v.SmithyPurchaseType, _list_v_)
+                }
+            }
+
     return
 }