diff --git a/bin/json/game_buzkashigrade.json b/bin/json/game_buzkashigrade.json
index b2ab8783a..c8cc0d97b 100644
--- a/bin/json/game_buzkashigrade.json
+++ b/bin/json/game_buzkashigrade.json
@@ -1,22 +1,22 @@
 [
   {
     "num": 1,
-    "distance": 1,
+    "distance": 10,
     "value": 8
   },
   {
     "num": 2,
-    "distance": 2,
+    "distance": 15,
     "value": 6
   },
   {
     "num": 3,
-    "distance": 3,
+    "distance": 20,
     "value": 4
   },
   {
     "num": 4,
-    "distance": 4,
+    "distance": 25,
     "value": 2
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index 2c76435ee..17b6f92fa 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -739,6 +739,7 @@
     "buzkashi_recoverHp": 1,
     "buzkashi_deathspeed": 800,
     "buzkashi_goal": 2000,
-    "buzkashi_goalspeed": 800
+    "buzkashi_goalspeed": 800,
+    "buzkashi_bumpdis": 5
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_herotalent.json b/bin/json/game_herotalent.json
index 21dc27226..577b4b9b0 100644
--- a/bin/json/game_herotalent.json
+++ b/bin/json/game_herotalent.json
@@ -1,26 +1,12 @@
 [
   {
-    "skillid": 40101,
-    "hid": "25001",
-    "skilltyp": 0,
+    "id": 1,
+    "type": 1,
+    "typeline": 1,
+    "talentid": 40101,
     "before": [
       0
     ],
-    "skillname": {
-      "key": "hppower",
-      "text": "生命核心"
-    },
-    "skilltxt": {
-      "key": "Life increased by 1.6%",
-      "text": "这是生命星象的描述tips"
-    },
-    "skillicon": "js_jx_img_icon03",
-    "hp": 16,
-    "atk": -1,
-    "def": -1,
-    "cri": -1,
-    "speed": -1,
-    "skill": 0,
     "thing": [
       {
         "a": "attr",
@@ -36,27 +22,13 @@
     "point": 20
   },
   {
-    "skillid": 40102,
-    "hid": "25001",
-    "skilltyp": 0,
+    "id": 2,
+    "type": 0,
+    "typeline": 1,
+    "talentid": 10101,
     "before": [
-      40101
+      1
     ],
-    "skillname": {
-      "key": "atkpower",
-      "text": "攻击核心"
-    },
-    "skilltxt": {
-      "key": "Attack increased by 1.0%",
-      "text": "这是攻击星象的描述tips"
-    },
-    "skillicon": "js_jx_img_icon01",
-    "hp": -1,
-    "atk": 10,
-    "def": -1,
-    "cri": -1,
-    "speed": -1,
-    "skill": 0,
     "thing": [
       {
         "a": "attr",
@@ -67,27 +39,13 @@
     "point": 10
   },
   {
-    "skillid": 40103,
-    "hid": "25001",
-    "skilltyp": 0,
+    "id": 3,
+    "type": 0,
+    "typeline": 1,
+    "talentid": 10102,
     "before": [
-      40102
+      2
     ],
-    "skillname": {
-      "key": "defpower",
-      "text": "防御核心"
-    },
-    "skilltxt": {
-      "key": "Defence increased by 1.0%",
-      "text": "这是防御星象的描述tips"
-    },
-    "skillicon": "js_jx_img_icon02",
-    "hp": -1,
-    "atk": -1,
-    "def": 10,
-    "cri": -1,
-    "speed": -1,
-    "skill": 0,
     "thing": [
       {
         "a": "attr",
@@ -98,27 +56,13 @@
     "point": 10
   },
   {
-    "skillid": 10101,
-    "hid": "25001",
-    "skilltyp": 1,
+    "id": 4,
+    "type": 0,
+    "typeline": 1,
+    "talentid": 10103,
     "before": [
-      40103
+      3
     ],
-    "skillname": {
-      "key": "hppower",
-      "text": "生命星象"
-    },
-    "skilltxt": {
-      "key": "Life increased by 1.8%",
-      "text": "这是生命星象的描述tips"
-    },
-    "skillicon": "js_jx_img_icon03",
-    "hp": 10,
-    "atk": -1,
-    "def": -1,
-    "cri": -1,
-    "speed": -1,
-    "skill": 0,
     "thing": [
       {
         "a": "attr",
@@ -129,27 +73,13 @@
     "point": 10
   },
   {
-    "skillid": 10102,
-    "hid": "25001",
-    "skilltyp": 1,
+    "id": 5,
+    "type": 0,
+    "typeline": 1,
+    "talentid": 10104,
     "before": [
-      10101
+      4
     ],
-    "skillname": {
-      "key": "hppower",
-      "text": "生命星象"
-    },
-    "skilltxt": {
-      "key": "Life increased by 1.8%",
-      "text": "这是生命星象的描述tips"
-    },
-    "skillicon": "js_jx_img_icon03",
-    "hp": 10,
-    "atk": -1,
-    "def": -1,
-    "cri": -1,
-    "speed": -1,
-    "skill": 0,
     "thing": [
       {
         "a": "attr",
@@ -160,27 +90,13 @@
     "point": 10
   },
   {
-    "skillid": 10103,
-    "hid": "25001",
-    "skilltyp": 1,
+    "id": 6,
+    "type": 0,
+    "typeline": 1,
+    "talentid": 10105,
     "before": [
-      10102
+      5
     ],
-    "skillname": {
-      "key": "hppower",
-      "text": "生命星象"
-    },
-    "skilltxt": {
-      "key": "Life increased by 1.8%",
-      "text": "这是生命星象的描述tips"
-    },
-    "skillicon": "js_jx_img_icon03",
-    "hp": 18,
-    "atk": -1,
-    "def": -1,
-    "cri": -1,
-    "speed": -1,
-    "skill": 0,
     "thing": [
       {
         "a": "attr",
@@ -191,27 +107,13 @@
     "point": 10
   },
   {
-    "skillid": 10104,
-    "hid": "25001",
-    "skilltyp": 1,
+    "id": 7,
+    "type": 0,
+    "typeline": 1,
+    "talentid": 10106,
     "before": [
-      10103
+      6
     ],
-    "skillname": {
-      "key": "hppower",
-      "text": "生命星象"
-    },
-    "skilltxt": {
-      "key": "Life increased by 1.8%",
-      "text": "这是生命星象的描述tips"
-    },
-    "skillicon": "js_jx_img_icon03",
-    "hp": 18,
-    "atk": -1,
-    "def": -1,
-    "cri": -1,
-    "speed": -1,
-    "skill": 0,
     "thing": [
       {
         "a": "attr",
@@ -222,27 +124,13 @@
     "point": 10
   },
   {
-    "skillid": 10105,
-    "hid": "25001",
-    "skilltyp": 1,
+    "id": 8,
+    "type": 1,
+    "typeline": 2,
+    "talentid": 40102,
     "before": [
-      10104
+      0
     ],
-    "skillname": {
-      "key": "hppower",
-      "text": "生命星象"
-    },
-    "skilltxt": {
-      "key": "Life increased by 1.8%",
-      "text": "这是生命星象的描述tips"
-    },
-    "skillicon": "js_jx_img_icon03",
-    "hp": 18,
-    "atk": -1,
-    "def": -1,
-    "cri": -1,
-    "speed": -1,
-    "skill": 0,
     "thing": [
       {
         "a": "attr",
@@ -258,27 +146,13 @@
     "point": 20
   },
   {
-    "skillid": 10106,
-    "hid": "25001",
-    "skilltyp": 1,
+    "id": 9,
+    "type": 0,
+    "typeline": 2,
+    "talentid": 20101,
     "before": [
-      10105
+      8
     ],
-    "skillname": {
-      "key": "hppower",
-      "text": "生命星象"
-    },
-    "skilltxt": {
-      "key": "Life increased by 1.8%",
-      "text": "这是生命星象的描述tips"
-    },
-    "skillicon": "js_jx_img_icon03",
-    "hp": 18,
-    "atk": -1,
-    "def": -1,
-    "cri": -1,
-    "speed": -1,
-    "skill": 0,
     "thing": [
       {
         "a": "attr",
@@ -289,27 +163,13 @@
     "point": 10
   },
   {
-    "skillid": 20101,
-    "hid": "25001",
-    "skilltyp": 1,
+    "id": 10,
+    "type": 0,
+    "typeline": 2,
+    "talentid": 20102,
     "before": [
-      10106
+      9
     ],
-    "skillname": {
-      "key": "atkpower",
-      "text": "攻击星象"
-    },
-    "skilltxt": {
-      "key": "Attack increased by 1.5%",
-      "text": "这是攻击星象的描述tips"
-    },
-    "skillicon": "js_jx_img_icon01",
-    "hp": -1,
-    "atk": -1,
-    "def": 10,
-    "cri": -1,
-    "speed": -1,
-    "skill": 0,
     "thing": [
       {
         "a": "attr",
@@ -320,27 +180,13 @@
     "point": 10
   },
   {
-    "skillid": 20102,
-    "hid": "25001",
-    "skilltyp": 1,
+    "id": 11,
+    "type": 0,
+    "typeline": 2,
+    "talentid": 20103,
     "before": [
-      20101
+      10
     ],
-    "skillname": {
-      "key": "atkpower",
-      "text": "攻击星象"
-    },
-    "skilltxt": {
-      "key": "Attack increased by 1.5%",
-      "text": "这是攻击星象的描述tips"
-    },
-    "skillicon": "js_jx_img_icon01",
-    "hp": -1,
-    "atk": -1,
-    "def": 10,
-    "cri": -1,
-    "speed": -1,
-    "skill": 0,
     "thing": [
       {
         "a": "attr",
@@ -351,27 +197,13 @@
     "point": 10
   },
   {
-    "skillid": 20103,
-    "hid": "25001",
-    "skilltyp": 1,
+    "id": 12,
+    "type": 0,
+    "typeline": 2,
+    "talentid": 20104,
     "before": [
-      20102
+      11
     ],
-    "skillname": {
-      "key": "atkpower",
-      "text": "攻击星象"
-    },
-    "skilltxt": {
-      "key": "Attack increased by 1.5%",
-      "text": "这是攻击星象的描述tips"
-    },
-    "skillicon": "js_jx_img_icon01",
-    "hp": -1,
-    "atk": -1,
-    "def": 15,
-    "cri": -1,
-    "speed": -1,
-    "skill": 0,
     "thing": [
       {
         "a": "attr",
@@ -382,27 +214,13 @@
     "point": 10
   },
   {
-    "skillid": 20104,
-    "hid": "25001",
-    "skilltyp": 1,
+    "id": 13,
+    "type": 0,
+    "typeline": 2,
+    "talentid": 20105,
     "before": [
-      20103
+      12
     ],
-    "skillname": {
-      "key": "atkpower",
-      "text": "攻击星象"
-    },
-    "skilltxt": {
-      "key": "Attack increased by 1.5%",
-      "text": "这是攻击星象的描述tips"
-    },
-    "skillicon": "js_jx_img_icon01",
-    "hp": -1,
-    "atk": -1,
-    "def": 15,
-    "cri": -1,
-    "speed": -1,
-    "skill": 0,
     "thing": [
       {
         "a": "attr",
@@ -413,27 +231,13 @@
     "point": 10
   },
   {
-    "skillid": 20105,
-    "hid": "25001",
-    "skilltyp": 1,
+    "id": 14,
+    "type": 0,
+    "typeline": 2,
+    "talentid": 20106,
     "before": [
-      20104
+      13
     ],
-    "skillname": {
-      "key": "atkpower",
-      "text": "攻击星象"
-    },
-    "skilltxt": {
-      "key": "Attack increased by 1.5%",
-      "text": "这是攻击星象的描述tips"
-    },
-    "skillicon": "js_jx_img_icon01",
-    "hp": -1,
-    "atk": -1,
-    "def": 15,
-    "cri": -1,
-    "speed": -1,
-    "skill": 0,
     "thing": [
       {
         "a": "attr",
@@ -444,27 +248,13 @@
     "point": 10
   },
   {
-    "skillid": 20106,
-    "hid": "25001",
-    "skilltyp": 1,
+    "id": 15,
+    "type": 1,
+    "typeline": 3,
+    "talentid": 40103,
     "before": [
-      20105
+      0
     ],
-    "skillname": {
-      "key": "atkpower",
-      "text": "攻击星象"
-    },
-    "skilltxt": {
-      "key": "Attack increased by 1.5%",
-      "text": "这是攻击星象的描述tips"
-    },
-    "skillicon": "js_jx_img_icon01",
-    "hp": -1,
-    "atk": -1,
-    "def": 15,
-    "cri": -1,
-    "speed": -1,
-    "skill": 0,
     "thing": [
       {
         "a": "attr",
@@ -480,27 +270,13 @@
     "point": 20
   },
   {
-    "skillid": 30101,
-    "hid": "25001",
-    "skilltyp": 1,
+    "id": 16,
+    "type": 0,
+    "typeline": 3,
+    "talentid": 30101,
     "before": [
-      20106
+      15
     ],
-    "skillname": {
-      "key": "defpower",
-      "text": "防御星象"
-    },
-    "skilltxt": {
-      "key": "Defence increased by 1.5%",
-      "text": "这是防御星象的描述tips"
-    },
-    "skillicon": "js_jx_img_icon02",
-    "hp": -1,
-    "atk": 10,
-    "def": -1,
-    "cri": -1,
-    "speed": -1,
-    "skill": 0,
     "thing": [
       {
         "a": "attr",
@@ -511,27 +287,13 @@
     "point": 10
   },
   {
-    "skillid": 30102,
-    "hid": "25001",
-    "skilltyp": 1,
+    "id": 17,
+    "type": 0,
+    "typeline": 3,
+    "talentid": 30102,
     "before": [
-      30101
+      16
     ],
-    "skillname": {
-      "key": "defpower",
-      "text": "防御星象"
-    },
-    "skilltxt": {
-      "key": "Defence increased by 1.5%",
-      "text": "这是防御星象的描述tips"
-    },
-    "skillicon": "js_jx_img_icon02",
-    "hp": -1,
-    "atk": 10,
-    "def": -1,
-    "cri": -1,
-    "speed": -1,
-    "skill": 0,
     "thing": [
       {
         "a": "attr",
@@ -542,27 +304,13 @@
     "point": 10
   },
   {
-    "skillid": 30103,
-    "hid": "25001",
-    "skilltyp": 1,
+    "id": 18,
+    "type": 0,
+    "typeline": 3,
+    "talentid": 30103,
     "before": [
-      30102
+      17
     ],
-    "skillname": {
-      "key": "defpower",
-      "text": "防御星象"
-    },
-    "skilltxt": {
-      "key": "Defence increased by 1.5%",
-      "text": "这是防御星象的描述tips"
-    },
-    "skillicon": "js_jx_img_icon02",
-    "hp": -1,
-    "atk": 15,
-    "def": -1,
-    "cri": -1,
-    "speed": -1,
-    "skill": 0,
     "thing": [
       {
         "a": "attr",
@@ -573,27 +321,13 @@
     "point": 10
   },
   {
-    "skillid": 30104,
-    "hid": "25001",
-    "skilltyp": 1,
+    "id": 19,
+    "type": 0,
+    "typeline": 3,
+    "talentid": 30104,
     "before": [
-      30103
+      18
     ],
-    "skillname": {
-      "key": "defpower",
-      "text": "防御星象"
-    },
-    "skilltxt": {
-      "key": "Defence increased by 1.5%",
-      "text": "这是防御星象的描述tips"
-    },
-    "skillicon": "js_jx_img_icon02",
-    "hp": -1,
-    "atk": 15,
-    "def": -1,
-    "cri": -1,
-    "speed": -1,
-    "skill": 0,
     "thing": [
       {
         "a": "attr",
@@ -604,27 +338,13 @@
     "point": 10
   },
   {
-    "skillid": 30105,
-    "hid": "25001",
-    "skilltyp": 1,
+    "id": 20,
+    "type": 0,
+    "typeline": 3,
+    "talentid": 30105,
     "before": [
-      30104
+      19
     ],
-    "skillname": {
-      "key": "defpower",
-      "text": "防御星象"
-    },
-    "skilltxt": {
-      "key": "Defence increased by 1.5%",
-      "text": "这是防御星象的描述tips"
-    },
-    "skillicon": "js_jx_img_icon02",
-    "hp": -1,
-    "atk": 15,
-    "def": -1,
-    "cri": -1,
-    "speed": -1,
-    "skill": 0,
     "thing": [
       {
         "a": "attr",
@@ -635,120 +355,13 @@
     "point": 10
   },
   {
-    "skillid": 30106,
-    "hid": "25001",
-    "skilltyp": 1,
+    "id": 21,
+    "type": 0,
+    "typeline": 3,
+    "talentid": 30106,
     "before": [
-      30105
+      20
     ],
-    "skillname": {
-      "key": "defpower",
-      "text": "防御星象"
-    },
-    "skilltxt": {
-      "key": "Defence increased by 1.5%",
-      "text": "这是防御星象的描述tips"
-    },
-    "skillicon": "js_jx_img_icon02",
-    "hp": -1,
-    "atk": 15,
-    "def": -1,
-    "cri": -1,
-    "speed": -1,
-    "skill": 0,
-    "thing": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 15000
-      }
-    ],
-    "point": 10
-  },
-  {
-    "skillid": 99101,
-    "hid": "25001",
-    "skilltyp": 2,
-    "before": [
-      30106
-    ],
-    "skillname": {
-      "key": "Attackspeed",
-      "text": "攻速星象"
-    },
-    "skilltxt": {
-      "key": "Attack speed increased by 3%",
-      "text": "这是攻速星象的描述tips"
-    },
-    "skillicon": "js_jx_img_icon04",
-    "hp": -1,
-    "atk": -1,
-    "def": -1,
-    "cri": -1,
-    "speed": 30,
-    "skill": 0,
-    "thing": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 15000
-      }
-    ],
-    "point": 10
-  },
-  {
-    "skillid": 99102,
-    "hid": "25001",
-    "skilltyp": 2,
-    "before": [
-      99101
-    ],
-    "skillname": {
-      "key": "Attackspeed",
-      "text": "攻速星象"
-    },
-    "skilltxt": {
-      "key": "Attack speed increased by 4%",
-      "text": "这是攻速星象的描述tips"
-    },
-    "skillicon": "js_jx_img_icon04",
-    "hp": -1,
-    "atk": -1,
-    "def": -1,
-    "cri": -1,
-    "speed": 30,
-    "skill": 0,
-    "thing": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 15000
-      }
-    ],
-    "point": 10
-  },
-  {
-    "skillid": 99103,
-    "hid": "25001",
-    "skilltyp": 2,
-    "before": [
-      99102
-    ],
-    "skillname": {
-      "key": "Criticalstrike",
-      "text": "暴击星象"
-    },
-    "skilltxt": {
-      "key": "Critical hit increased by 10%",
-      "text": "这是暴击星象的描述tips"
-    },
-    "skillicon": "js_jx_img_icon05",
-    "hp": -1,
-    "atk": -1,
-    "def": -1,
-    "cri": 100,
-    "speed": -1,
-    "skill": 0,
     "thing": [
       {
         "a": "attr",
diff --git a/bin/json/game_huntingboss.json b/bin/json/game_huntingboss.json
index 2d39b7b6c..5f41d5e5a 100644
--- a/bin/json/game_huntingboss.json
+++ b/bin/json/game_huntingboss.json
@@ -27,7 +27,7 @@
         "n": 1
       }
     ],
-    "drop": 1001,
+    "drop": 100101,
     "bossmodel": 53001,
     "boss": [
       401003
@@ -75,7 +75,7 @@
         "n": 1
       }
     ],
-    "drop": 1002,
+    "drop": 100101,
     "bossmodel": 53001,
     "boss": [
       401006
@@ -123,7 +123,7 @@
         "n": 1
       }
     ],
-    "drop": 1003,
+    "drop": 100101,
     "bossmodel": 53001,
     "boss": [
       401009
@@ -171,7 +171,7 @@
         "n": 1
       }
     ],
-    "drop": 1004,
+    "drop": 100101,
     "bossmodel": 53001,
     "boss": [
       401012
@@ -219,7 +219,7 @@
         "n": 1
       }
     ],
-    "drop": 1005,
+    "drop": 100101,
     "bossmodel": 53001,
     "boss": [
       401015
@@ -267,7 +267,7 @@
         "n": 1
       }
     ],
-    "drop": 1006,
+    "drop": 100101,
     "bossmodel": 53001,
     "boss": [
       401018
@@ -315,7 +315,7 @@
         "n": 1
       }
     ],
-    "drop": 1007,
+    "drop": 100101,
     "bossmodel": 53001,
     "boss": [
       401021
@@ -363,7 +363,7 @@
         "n": 1
       }
     ],
-    "drop": 1008,
+    "drop": 100101,
     "bossmodel": 53001,
     "boss": [
       401024
@@ -411,7 +411,7 @@
         "n": 1
       }
     ],
-    "drop": 1009,
+    "drop": 100101,
     "bossmodel": 53001,
     "boss": [
       401027
@@ -459,7 +459,7 @@
         "n": 1
       }
     ],
-    "drop": 1010,
+    "drop": 100101,
     "bossmodel": 53001,
     "boss": [
       401030
@@ -507,7 +507,7 @@
         "n": 1
       }
     ],
-    "drop": 1011,
+    "drop": 200101,
     "bossmodel": 51004,
     "boss": [
       402003
@@ -555,7 +555,7 @@
         "n": 1
       }
     ],
-    "drop": 1012,
+    "drop": 200101,
     "bossmodel": 51004,
     "boss": [
       402006
@@ -603,7 +603,7 @@
         "n": 1
       }
     ],
-    "drop": 1013,
+    "drop": 200101,
     "bossmodel": 51004,
     "boss": [
       402009
@@ -651,7 +651,7 @@
         "n": 1
       }
     ],
-    "drop": 1014,
+    "drop": 200101,
     "bossmodel": 51004,
     "boss": [
       402012
@@ -699,7 +699,7 @@
         "n": 1
       }
     ],
-    "drop": 1015,
+    "drop": 200101,
     "bossmodel": 51004,
     "boss": [
       402015
@@ -747,7 +747,7 @@
         "n": 1
       }
     ],
-    "drop": 1016,
+    "drop": 200101,
     "bossmodel": 51004,
     "boss": [
       402018
@@ -795,7 +795,7 @@
         "n": 1
       }
     ],
-    "drop": 1017,
+    "drop": 200101,
     "bossmodel": 51004,
     "boss": [
       402021
@@ -843,7 +843,7 @@
         "n": 1
       }
     ],
-    "drop": 1018,
+    "drop": 200101,
     "bossmodel": 51004,
     "boss": [
       402024
@@ -891,7 +891,7 @@
         "n": 1
       }
     ],
-    "drop": 1019,
+    "drop": 200101,
     "bossmodel": 51004,
     "boss": [
       402027
@@ -939,7 +939,7 @@
         "n": 1
       }
     ],
-    "drop": 1020,
+    "drop": 300101,
     "bossmodel": 51004,
     "boss": [
       402030
@@ -987,7 +987,7 @@
         "n": 1
       }
     ],
-    "drop": 1021,
+    "drop": 300101,
     "bossmodel": 51005,
     "boss": [
       403003
@@ -1035,7 +1035,7 @@
         "n": 1
       }
     ],
-    "drop": 1022,
+    "drop": 300101,
     "bossmodel": 51005,
     "boss": [
       403006
@@ -1083,7 +1083,7 @@
         "n": 1
       }
     ],
-    "drop": 1023,
+    "drop": 300101,
     "bossmodel": 51005,
     "boss": [
       403009
@@ -1131,7 +1131,7 @@
         "n": 1
       }
     ],
-    "drop": 1024,
+    "drop": 300101,
     "bossmodel": 51005,
     "boss": [
       403012
@@ -1179,7 +1179,7 @@
         "n": 1
       }
     ],
-    "drop": 1025,
+    "drop": 300101,
     "bossmodel": 51005,
     "boss": [
       403015
@@ -1227,7 +1227,7 @@
         "n": 1
       }
     ],
-    "drop": 1026,
+    "drop": 300101,
     "bossmodel": 51005,
     "boss": [
       403018
@@ -1275,7 +1275,7 @@
         "n": 1
       }
     ],
-    "drop": 1027,
+    "drop": 300101,
     "bossmodel": 51005,
     "boss": [
       403021
@@ -1323,7 +1323,7 @@
         "n": 1
       }
     ],
-    "drop": 1028,
+    "drop": 300101,
     "bossmodel": 51005,
     "boss": [
       403024
@@ -1371,7 +1371,7 @@
         "n": 1
       }
     ],
-    "drop": 1029,
+    "drop": 300101,
     "bossmodel": 51005,
     "boss": [
       403027
@@ -1419,7 +1419,7 @@
         "n": 1
       }
     ],
-    "drop": 1030,
+    "drop": 300101,
     "bossmodel": 51005,
     "boss": [
       403030
@@ -1467,7 +1467,7 @@
         "n": 1
       }
     ],
-    "drop": 1021,
+    "drop": 400101,
     "bossmodel": 51002,
     "boss": [
       404003
@@ -1515,7 +1515,7 @@
         "n": 1
       }
     ],
-    "drop": 1022,
+    "drop": 400101,
     "bossmodel": 51002,
     "boss": [
       404006
@@ -1563,7 +1563,7 @@
         "n": 1
       }
     ],
-    "drop": 1023,
+    "drop": 400101,
     "bossmodel": 51002,
     "boss": [
       404009
@@ -1611,7 +1611,7 @@
         "n": 1
       }
     ],
-    "drop": 1024,
+    "drop": 400101,
     "bossmodel": 51002,
     "boss": [
       404012
@@ -1659,7 +1659,7 @@
         "n": 1
       }
     ],
-    "drop": 1025,
+    "drop": 400101,
     "bossmodel": 51002,
     "boss": [
       404015
@@ -1707,7 +1707,7 @@
         "n": 1
       }
     ],
-    "drop": 1026,
+    "drop": 400101,
     "bossmodel": 51002,
     "boss": [
       404018
@@ -1755,7 +1755,7 @@
         "n": 1
       }
     ],
-    "drop": 1027,
+    "drop": 400101,
     "bossmodel": 51002,
     "boss": [
       404021
@@ -1803,7 +1803,7 @@
         "n": 1
       }
     ],
-    "drop": 1028,
+    "drop": 400101,
     "bossmodel": 51002,
     "boss": [
       404024
@@ -1851,7 +1851,7 @@
         "n": 1
       }
     ],
-    "drop": 1029,
+    "drop": 400101,
     "bossmodel": 51002,
     "boss": [
       404027
@@ -1899,7 +1899,7 @@
         "n": 1
       }
     ],
-    "drop": 1030,
+    "drop": 400101,
     "bossmodel": 51002,
     "boss": [
       404030
diff --git a/bin/json/game_lottery.json b/bin/json/game_lottery.json
index a4592901a..282208692 100644
--- a/bin/json/game_lottery.json
+++ b/bin/json/game_lottery.json
@@ -718,5 +718,293 @@
     "playerlvmin": 0,
     "playerlvmax": 0,
     "notice": 0
+  },
+  {
+    "id": 31,
+    "lotteryid": 100101,
+    "description": "阵营1觉醒材料掉落",
+    "type": 2,
+    "groupwt": 1000,
+    "groupid": 1001,
+    "subtype": 2,
+    "groupnum": 1,
+    "itemid": {
+      "a": "item",
+      "t": "14010111",
+      "n": 1
+    },
+    "itemdes": "热火药剂",
+    "itemwt": 1000,
+    "min": 2,
+    "max": 2,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 32,
+    "lotteryid": 100101,
+    "description": "阵营1觉醒材料掉落",
+    "type": 0,
+    "groupwt": 0,
+    "groupid": 1001,
+    "subtype": 0,
+    "groupnum": 1,
+    "itemid": {
+      "a": "item",
+      "t": "14020111",
+      "n": 1
+    },
+    "itemdes": "烈焰精华",
+    "itemwt": 1000,
+    "min": 2,
+    "max": 2,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 33,
+    "lotteryid": 100101,
+    "description": "阵营1觉醒材料掉落",
+    "type": 0,
+    "groupwt": 0,
+    "groupid": 1001,
+    "subtype": 0,
+    "groupnum": 1,
+    "itemid": {
+      "a": "item",
+      "t": "14030111",
+      "n": 1
+    },
+    "itemdes": "爆炸神水",
+    "itemwt": 1000,
+    "min": 2,
+    "max": 2,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 34,
+    "lotteryid": 200101,
+    "description": "阵营2觉醒材料掉落",
+    "type": 2,
+    "groupwt": 1000,
+    "groupid": 1002,
+    "subtype": 2,
+    "groupnum": 1,
+    "itemid": {
+      "a": "item",
+      "t": "14010212",
+      "n": 1
+    },
+    "itemdes": "冷水药剂",
+    "itemwt": 1000,
+    "min": 2,
+    "max": 2,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 35,
+    "lotteryid": 200101,
+    "description": "阵营2觉醒材料掉落",
+    "type": 0,
+    "groupwt": 0,
+    "groupid": 1002,
+    "subtype": 0,
+    "groupnum": 1,
+    "itemid": {
+      "a": "item",
+      "t": "14020212",
+      "n": 1
+    },
+    "itemdes": "凝露精华",
+    "itemwt": 1000,
+    "min": 2,
+    "max": 2,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 36,
+    "lotteryid": 200101,
+    "description": "阵营2觉醒材料掉落",
+    "type": 0,
+    "groupwt": 0,
+    "groupid": 1002,
+    "subtype": 0,
+    "groupnum": 1,
+    "itemid": {
+      "a": "item",
+      "t": "14030212",
+      "n": 1
+    },
+    "itemdes": "深渊神水",
+    "itemwt": 1000,
+    "min": 2,
+    "max": 2,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 37,
+    "lotteryid": 300101,
+    "description": "阵营3觉醒材料掉落",
+    "type": 2,
+    "groupwt": 1000,
+    "groupid": 1003,
+    "subtype": 2,
+    "groupnum": 1,
+    "itemid": {
+      "a": "item",
+      "t": "14010313",
+      "n": 1
+    },
+    "itemdes": "古木药剂",
+    "itemwt": 1000,
+    "min": 2,
+    "max": 2,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 38,
+    "lotteryid": 300101,
+    "description": "阵营3觉醒材料掉落",
+    "type": 0,
+    "groupwt": 0,
+    "groupid": 1003,
+    "subtype": 0,
+    "groupnum": 1,
+    "itemid": {
+      "a": "item",
+      "t": "14020313",
+      "n": 1
+    },
+    "itemdes": "荆棘精华",
+    "itemwt": 1000,
+    "min": 2,
+    "max": 2,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 39,
+    "lotteryid": 300101,
+    "description": "阵营3觉醒材料掉落",
+    "type": 0,
+    "groupwt": 0,
+    "groupid": 1003,
+    "subtype": 0,
+    "groupnum": 1,
+    "itemid": {
+      "a": "item",
+      "t": "14030313",
+      "n": 1
+    },
+    "itemdes": "魔森神水",
+    "itemwt": 1000,
+    "min": 2,
+    "max": 2,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 40,
+    "lotteryid": 400101,
+    "description": "阵营4觉醒材料掉落",
+    "type": 2,
+    "groupwt": 1000,
+    "groupid": 1004,
+    "subtype": 2,
+    "groupnum": 1,
+    "itemid": {
+      "a": "item",
+      "t": "14010414",
+      "n": 1
+    },
+    "itemdes": "微尘药剂",
+    "itemwt": 1000,
+    "min": 2,
+    "max": 2,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 41,
+    "lotteryid": 400101,
+    "description": "阵营4觉醒材料掉落",
+    "type": 0,
+    "groupwt": 0,
+    "groupid": 1004,
+    "subtype": 0,
+    "groupnum": 1,
+    "itemid": {
+      "a": "item",
+      "t": "14020414",
+      "n": 1
+    },
+    "itemdes": "曙光精华",
+    "itemwt": 1000,
+    "min": 2,
+    "max": 2,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 42,
+    "lotteryid": 400101,
+    "description": "阵营4觉醒材料掉落",
+    "type": 0,
+    "groupwt": 0,
+    "groupid": 1004,
+    "subtype": 0,
+    "groupnum": 1,
+    "itemid": {
+      "a": "item",
+      "t": "14030414",
+      "n": 1
+    },
+    "itemdes": "秘境神水",
+    "itemwt": 1000,
+    "min": 2,
+    "max": 2,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_navigation.json b/bin/json/game_navigation.json
index 150652301..8493490f0 100644
--- a/bin/json/game_navigation.json
+++ b/bin/json/game_navigation.json
@@ -67,23 +67,6 @@
     ],
     "functionicon": "ty_qp_by"
   },
-  {
-    "Id": 5,
-    "scene": "GameMain",
-    "scenename": {
-      "key": "navigation_Sheet1_scenename_6",
-      "text": "中轴城"
-    },
-    "sceneicon": "ty_qp_my01",
-    "functionname": {
-      "key": "navigation_Sheet1_functionname_5",
-      "text": "魔药"
-    },
-    "npcName": [
-      "功能入口-魔药"
-    ],
-    "functionicon": "ty_qp_my"
-  },
   {
     "Id": 6,
     "scene": "GameMain",
diff --git a/bin/json/game_smithymodelpool.json b/bin/json/game_smithymodelpool.json
index d83a53a91..8c8a71920 100644
--- a/bin/json/game_smithymodelpool.json
+++ b/bin/json/game_smithymodelpool.json
@@ -2,31 +2,31 @@
   {
     "id": 1,
     "customer_type": 1,
-    "hero_id": 14001
+    "hero_id": 51002
   },
   {
     "id": 2,
     "customer_type": 1,
-    "hero_id": 24008
+    "hero_id": 51003
   },
   {
     "id": 3,
     "customer_type": 2,
-    "hero_id": 14001
+    "hero_id": 51002
   },
   {
     "id": 4,
     "customer_type": 2,
-    "hero_id": 24008
+    "hero_id": 51003
   },
   {
     "id": 5,
     "customer_type": 4,
-    "hero_id": 14001
+    "hero_id": 51002
   },
   {
     "id": 6,
     "customer_type": 4,
-    "hero_id": 24008
+    "hero_id": 51003
   }
 ]
\ No newline at end of file
diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go
index a69c46d3a..3d7ef10d9 100644
--- a/sys/configure/structs/game.globalData.go
+++ b/sys/configure/structs/game.globalData.go
@@ -232,6 +232,7 @@ type GameGlobalData struct {
     BuzkashiDeathspeed int32
     BuzkashiGoal int32
     BuzkashiGoalspeed int32
+    BuzkashiBumpdis float32
 }
 
 const TypeId_GameGlobalData = 477542761
@@ -943,6 +944,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_deathspeed"].(float64); !_ok_ { err = errors.New("buzkashi_deathspeed error"); return }; _v.BuzkashiDeathspeed = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_goal"].(float64); !_ok_ { err = errors.New("buzkashi_goal error"); return }; _v.BuzkashiGoal = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_goalspeed"].(float64); !_ok_ { err = errors.New("buzkashi_goalspeed error"); return }; _v.BuzkashiGoalspeed = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_bumpdis"].(float64); !_ok_ { err = errors.New("buzkashi_bumpdis error"); return }; _v.BuzkashiBumpdis = float32(_tempNum_) }
     return
 }