diff --git a/bin/json/game_achievetask.json b/bin/json/game_achievetask.json
index 33823ade9..685f6883e 100644
--- a/bin/json/game_achievetask.json
+++ b/bin/json/game_achievetask.json
@@ -89,7 +89,7 @@
         "n": 10000
       }
     ],
-    "jump": 103
+    "jump": 102
   },
   {
     "key": 1023,
@@ -112,7 +112,7 @@
         "n": 20000
       }
     ],
-    "jump": 103
+    "jump": 102
   },
   {
     "key": 1024,
@@ -135,7 +135,7 @@
         "n": 30000
       }
     ],
-    "jump": 103
+    "jump": 102
   },
   {
     "key": 1025,
@@ -158,7 +158,7 @@
         "n": 10000
       }
     ],
-    "jump": 10020
+    "jump": 10022
   },
   {
     "key": 1026,
@@ -204,7 +204,7 @@
         "n": 30000
       }
     ],
-    "jump": 10020
+    "jump": 10021
   },
   {
     "key": 1028,
@@ -296,7 +296,7 @@
         "n": 10000
       }
     ],
-    "jump": 0
+    "jump": 123
   },
   {
     "key": 1032,
@@ -319,7 +319,7 @@
         "n": 20000
       }
     ],
-    "jump": 0
+    "jump": 123
   },
   {
     "key": 1033,
@@ -342,7 +342,7 @@
         "n": 30000
       }
     ],
-    "jump": 0
+    "jump": 123
   },
   {
     "key": 1034,
@@ -365,7 +365,7 @@
         "n": 10000
       }
     ],
-    "jump": 0
+    "jump": 10036
   },
   {
     "key": 1035,
@@ -388,7 +388,7 @@
         "n": 20000
       }
     ],
-    "jump": 0
+    "jump": 10036
   },
   {
     "key": 1036,
@@ -411,6 +411,6 @@
         "n": 30000
       }
     ],
-    "jump": 0
+    "jump": 10036
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json
index 86e096d76..4dafb85dd 100644
--- a/bin/json/game_battleready.json
+++ b/bin/json/game_battleready.json
@@ -1877,7 +1877,7 @@
   },
   {
     "id": 10300001,
-    "PlayType": 0,
+    "PlayType": 1,
     "HeroCount": 5,
     "readyScene": "scenesfight_role_interface_04",
     "battleScenes": [
@@ -1911,7 +1911,7 @@
   },
   {
     "id": 10300002,
-    "PlayType": 0,
+    "PlayType": 1,
     "HeroCount": 5,
     "readyScene": "scenesfight_role_interface_04",
     "battleScenes": [
@@ -1947,7 +1947,7 @@
   },
   {
     "id": 10300003,
-    "PlayType": 0,
+    "PlayType": 1,
     "HeroCount": 5,
     "readyScene": "scenesfight_role_interface_04",
     "battleScenes": [
diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index 15ec216ef..b2fd45de1 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -21667,7 +21667,7 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_738",
-      "text": "击退村民"
+      "text": "前往博客岛"
     },
     "type": 61,
     "valid": 1,
@@ -21722,7 +21722,7 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_740",
-      "text": "寻找龙之花"
+      "text": "在博客岛找到龙之花"
     },
     "type": 61,
     "valid": 1,
@@ -21747,7 +21747,7 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_741",
-      "text": "获得龙遗香"
+      "text": "龙遗香竟然是……"
     },
     "type": 61,
     "valid": 1,
@@ -32152,7 +32152,10 @@
     "Npc_event_type": 1,
     "NPC": 10001001,
     "value": 1,
-    "filter": [],
+    "filter": [
+      1,
+      1
+    ],
     "filter2": []
   },
   {
@@ -32177,7 +32180,10 @@
     "Npc_event_type": 1,
     "NPC": 10002001,
     "value": 1,
-    "filter": [],
+    "filter": [
+      2,
+      1
+    ],
     "filter2": []
   },
   {
@@ -32202,7 +32208,10 @@
     "Npc_event_type": 1,
     "NPC": 10003001,
     "value": 1,
-    "filter": [],
+    "filter": [
+      3,
+      1
+    ],
     "filter2": []
   },
   {
diff --git a/bin/json/game_buriedtype.json b/bin/json/game_buriedtype.json
index 6361a9abf..5ab8bafaf 100644
--- a/bin/json/game_buriedtype.json
+++ b/bin/json/game_buriedtype.json
@@ -383,7 +383,7 @@
     "id": 61,
     "insert": 1,
     "filter": [
-      "gte"
+      "eq"
     ]
   },
   {
diff --git a/bin/json/game_consumebox.json b/bin/json/game_consumebox.json
index df7519319..b5639d5f1 100644
--- a/bin/json/game_consumebox.json
+++ b/bin/json/game_consumebox.json
@@ -28,7 +28,7 @@
     },
     "icon": "item_17010001",
     "group": 13011006,
-    "cd": 5,
+    "cd": 100,
     "weight": 1000
   },
   {
@@ -44,7 +44,7 @@
     },
     "icon": "item_17020001",
     "group": 13011006,
-    "cd": 10,
+    "cd": 200,
     "weight": 1000
   },
   {
@@ -60,7 +60,7 @@
     },
     "icon": "item_17030001",
     "group": 13011006,
-    "cd": 15,
+    "cd": 300,
     "weight": 1000
   },
   {
@@ -76,7 +76,7 @@
     },
     "icon": "item_17050001",
     "group": 13011006,
-    "cd": 20,
+    "cd": 400,
     "weight": 1000
   },
   {
@@ -92,7 +92,7 @@
     },
     "icon": "item_17050002",
     "group": 13011006,
-    "cd": 25,
+    "cd": 500,
     "weight": 1000
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_fightglobalevent.json b/bin/json/game_fightglobalevent.json
index 9872b4df6..1c44fa00b 100644
--- a/bin/json/game_fightglobalevent.json
+++ b/bin/json/game_fightglobalevent.json
@@ -296,7 +296,7 @@
       "1",
       "0",
       "200004001",
-      "effect_global_tre_buff"
+      "effect_zhiliao_huan"
     ]
   },
   {
diff --git a/bin/json/game_gameklotski.json b/bin/json/game_gameklotski.json
index d65f53622..264af0a95 100644
--- a/bin/json/game_gameklotski.json
+++ b/bin/json/game_gameklotski.json
@@ -54,10 +54,6 @@
         "k": 12,
         "v": 1
       },
-      {
-        "k": 13,
-        "v": 2
-      },
       {
         "k": 15,
         "v": 3
diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json
index 1f70bafc2..0c057e30f 100644
--- a/bin/json/game_hero.json
+++ b/bin/json/game_hero.json
@@ -1884,7 +1884,7 @@
     "type": 1,
     "ip": 4,
     "sd": 1,
-    "handbook": 1,
+    "handbook": -1,
     "prefab": "24005",
     "rotation": "0|0|0",
     "revolve": 0,
@@ -3990,7 +3990,7 @@
     "type": 1,
     "ip": 12,
     "sd": 1,
-    "handbook": 1,
+    "handbook": -1,
     "prefab": "35005",
     "rotation": "0|0|0",
     "revolve": 0,
@@ -4146,7 +4146,7 @@
     "type": 1,
     "ip": 12,
     "sd": 1,
-    "handbook": 1,
+    "handbook": -1,
     "prefab": "43001",
     "rotation": "0|0|0",
     "revolve": 0,
@@ -4380,7 +4380,7 @@
     "type": 1,
     "ip": 5,
     "sd": 1,
-    "handbook": 1,
+    "handbook": -1,
     "prefab": "43004",
     "rotation": "0|0|0",
     "revolve": 0,
@@ -4848,7 +4848,7 @@
     "type": 1,
     "ip": 5,
     "sd": 1,
-    "handbook": 1,
+    "handbook": -1,
     "prefab": "44003",
     "rotation": "0|0|0",
     "revolve": 0,
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index 3ee11ced3..061138873 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -20495,9 +20495,150 @@
     "gm": 0
   },
   {
-    "id": "24022012",
+    "id": "24012012",
     "name": {
       "key": "item_item_name_413",
+      "text": "藏宝图碎片1"
+    },
+    "usetype": 1,
+    "color": 2,
+    "bagtype": 0,
+    "index": 1,
+    "special_type": 0,
+    "hold": 0,
+    "time": 0,
+    "reddottype": 0,
+    "effects": "",
+    "modelName": "",
+    "box_id": 0,
+    "synthetize_num": 0,
+    "synthetize_deplete": [],
+    "synthetize_get": [],
+    "decompose_deplete": [],
+    "decompose_get": [],
+    "access": [],
+    "use_skip": 0,
+    "upper_limit": 0,
+    "img": "item_50013001",
+    "intr": {
+      "key": "item_item_intr_415",
+      "text": "隐藏于博客岛藏宝图，只是其中的一个碎片。"
+    },
+    "describe": {
+      "key": "item_item_describe_415",
+      "text": "在这饱经风霜藏宝图上，隐隐约约有着几个字，一只？"
+    },
+    "dialogue": {
+      "key": "item_item_dialogue_413",
+      "text": "【羊羊爱我，我爱羊羊！】"
+    },
+    "sale": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1000
+      }
+    ],
+    "gm": 0
+  },
+  {
+    "id": "24012013",
+    "name": {
+      "key": "item_item_name_414",
+      "text": "藏宝图碎片2"
+    },
+    "usetype": 1,
+    "color": 2,
+    "bagtype": 0,
+    "index": 1,
+    "special_type": 0,
+    "hold": 0,
+    "time": 0,
+    "reddottype": 0,
+    "effects": "",
+    "modelName": "",
+    "box_id": 0,
+    "synthetize_num": 0,
+    "synthetize_deplete": [],
+    "synthetize_get": [],
+    "decompose_deplete": [],
+    "decompose_get": [],
+    "access": [],
+    "use_skip": 0,
+    "upper_limit": 0,
+    "img": "item_50013001",
+    "intr": {
+      "key": "item_item_intr_416",
+      "text": "隐藏于博客岛藏宝图，只是其中的一个碎片。"
+    },
+    "describe": {
+      "key": "item_item_describe_416",
+      "text": "在这饱经风霜藏宝图上，隐隐约约有着几个字，两只？"
+    },
+    "dialogue": {
+      "key": "item_item_dialogue_414",
+      "text": "【羊羊爱我，我爱羊羊！】"
+    },
+    "sale": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1000
+      }
+    ],
+    "gm": 0
+  },
+  {
+    "id": "24012014",
+    "name": {
+      "key": "item_item_name_415",
+      "text": "藏宝图碎片3"
+    },
+    "usetype": 1,
+    "color": 2,
+    "bagtype": 0,
+    "index": 1,
+    "special_type": 0,
+    "hold": 0,
+    "time": 0,
+    "reddottype": 0,
+    "effects": "",
+    "modelName": "",
+    "box_id": 0,
+    "synthetize_num": 0,
+    "synthetize_deplete": [],
+    "synthetize_get": [],
+    "decompose_deplete": [],
+    "decompose_get": [],
+    "access": [],
+    "use_skip": 0,
+    "upper_limit": 0,
+    "img": "item_50013001",
+    "intr": {
+      "key": "item_item_intr_417",
+      "text": "隐藏于博客岛藏宝图，只是其中的一个碎片。"
+    },
+    "describe": {
+      "key": "item_item_describe_417",
+      "text": "在这饱经风霜藏宝图上，隐隐约约有着几个字，三只！"
+    },
+    "dialogue": {
+      "key": "item_item_dialogue_415",
+      "text": "【羊羊爱我，我爱羊羊！】"
+    },
+    "sale": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1000
+      }
+    ],
+    "gm": 0
+  },
+  {
+    "id": "24022012",
+    "name": {
+      "key": "item_item_name_416",
       "text": "龙遗香"
     },
     "usetype": 1,
@@ -20521,15 +20662,15 @@
     "upper_limit": 0,
     "img": "item_24022012",
     "intr": {
-      "key": "item_item_intr_415",
+      "key": "item_item_intr_418",
       "text": ""
     },
     "describe": {
-      "key": "item_item_describe_415",
+      "key": "item_item_describe_418",
       "text": "这，不是普通的香。而是龙之花经由龙腹运转而诞生的结晶。闻一闻，神清气爽。吃一口，脚下生风。"
     },
     "dialogue": {
-      "key": "item_item_dialogue_413",
+      "key": "item_item_dialogue_416",
       "text": "【还冒着热气！赶快！药不能停！】"
     },
     "sale": [
@@ -20544,7 +20685,7 @@
   {
     "id": "25000001",
     "name": {
-      "key": "item_item_name_414",
+      "key": "item_item_name_417",
       "text": "仙女泪水"
     },
     "usetype": 1,
@@ -20568,15 +20709,15 @@
     "upper_limit": 0,
     "img": "item_25000001",
     "intr": {
-      "key": "item_item_intr_416",
+      "key": "item_item_intr_419",
       "text": "据说是某种十分珍贵的材料"
     },
     "describe": {
-      "key": "item_item_describe_416",
+      "key": "item_item_describe_419",
       "text": "菲奥娜珍藏的材料，可以用来制作某些用于解除诅咒的药水。"
     },
     "dialogue": {
-      "key": "item_item_dialogue_414",
+      "key": "item_item_dialogue_417",
       "text": "【真的是仙女流下的眼泪吗？】"
     },
     "sale": [],
@@ -20585,7 +20726,7 @@
   {
     "id": "24013003",
     "name": {
-      "key": "item_item_name_415",
+      "key": "item_item_name_418",
       "text": "扑克对决游玩次数"
     },
     "usetype": 1,
@@ -20609,15 +20750,15 @@
     "upper_limit": 0,
     "img": "wp_icon_jjcq",
     "intr": {
-      "key": "item_item_intr_410",
+      "key": "item_item_intr_420",
       "text": ""
     },
     "describe": {
-      "key": "item_item_describe_410",
+      "key": "item_item_describe_420",
       "text": ""
     },
     "dialogue": {
-      "key": "item_item_dialogue_408",
+      "key": "item_item_dialogue_418",
       "text": ""
     },
     "sale": [
@@ -20632,7 +20773,7 @@
   {
     "id": "26000001",
     "name": {
-      "key": "item_item_name_416",
+      "key": "item_item_name_419",
       "text": "快速拼图脚本"
     },
     "usetype": 2,
@@ -20656,15 +20797,15 @@
     "upper_limit": 0,
     "img": "item_10000006",
     "intr": {
-      "key": "item_item_intr_411",
+      "key": "item_item_intr_421",
       "text": "骇客蛛编写用来快速完成拼图的脚本程序"
     },
     "describe": {
-      "key": "item_item_describe_411",
+      "key": "item_item_describe_421",
       "text": "该脚本绝对没有信息盗取相关的捆绑插件，而且终身免费使用，快来下载吧。"
     },
     "dialogue": {
-      "key": "item_item_dialogue_409",
+      "key": "item_item_dialogue_419",
       "text": "【这是什么？点一下。】"
     },
     "sale": [
@@ -20679,7 +20820,7 @@
   {
     "id": "27000001",
     "name": {
-      "key": "item_item_name_417",
+      "key": "item_item_name_420",
       "text": "豺狼小怪"
     },
     "usetype": 1,
@@ -20703,15 +20844,15 @@
     "upper_limit": 0,
     "img": "tx_js_51004",
     "intr": {
-      "key": "item_item_intr_412",
+      "key": "item_item_intr_422",
       "text": "豺狼小怪的三消英雄卡。"
     },
     "describe": {
-      "key": "item_item_describe_412",
+      "key": "item_item_describe_422",
       "text": "豺狼小怪怎么叫？"
     },
     "dialogue": {
-      "key": "item_item_dialogue_410",
+      "key": "item_item_dialogue_420",
       "text": "【启动！】"
     },
     "sale": [],
@@ -20720,7 +20861,7 @@
   {
     "id": "27000002",
     "name": {
-      "key": "item_item_name_418",
+      "key": "item_item_name_421",
       "text": "小猴子"
     },
     "usetype": 1,
@@ -20744,15 +20885,15 @@
     "upper_limit": 0,
     "img": "tx_js_51012",
     "intr": {
-      "key": "item_item_intr_413",
+      "key": "item_item_intr_423",
       "text": "小猴子的三消英雄卡。"
     },
     "describe": {
-      "key": "item_item_describe_413",
+      "key": "item_item_describe_423",
       "text": "小猴子怎么叫？"
     },
     "dialogue": {
-      "key": "item_item_dialogue_411",
+      "key": "item_item_dialogue_421",
       "text": "【咦，我只动了2下，为什么拿了30分？】"
     },
     "sale": [],
@@ -20761,7 +20902,7 @@
   {
     "id": "27000003",
     "name": {
-      "key": "item_item_name_419",
+      "key": "item_item_name_422",
       "text": "食人鱼"
     },
     "usetype": 1,
@@ -20785,15 +20926,15 @@
     "upper_limit": 0,
     "img": "tx_js_51012",
     "intr": {
-      "key": "item_item_intr_414",
+      "key": "item_item_intr_424",
       "text": "食人鱼的三消英雄卡"
     },
     "describe": {
-      "key": "item_item_describe_414",
+      "key": "item_item_describe_424",
       "text": "食人鱼怎么叫？"
     },
     "dialogue": {
-      "key": "item_item_dialogue_412",
+      "key": "item_item_dialogue_422",
       "text": "【什么味儿？】"
     },
     "sale": [],
@@ -20802,7 +20943,7 @@
   {
     "id": "27000004",
     "name": {
-      "key": "item_item_name_420",
+      "key": "item_item_name_423",
       "text": "胡德先生"
     },
     "usetype": 1,
@@ -20826,15 +20967,15 @@
     "upper_limit": 0,
     "img": "tx_js_51012",
     "intr": {
-      "key": "item_item_intr_415",
+      "key": "item_item_intr_425",
       "text": "胡德先生的三消英雄卡"
     },
     "describe": {
-      "key": "item_item_describe_415",
+      "key": "item_item_describe_425",
       "text": "胡德先生怎么叫？"
     },
     "dialogue": {
-      "key": "item_item_dialogue_413",
+      "key": "item_item_dialogue_423",
       "text": "【中！】"
     },
     "sale": [],
@@ -20843,7 +20984,7 @@
   {
     "id": "27000005",
     "name": {
-      "key": "item_item_name_421",
+      "key": "item_item_name_424",
       "text": "大大"
     },
     "usetype": 1,
@@ -20867,15 +21008,15 @@
     "upper_limit": 0,
     "img": "tx_js_51012",
     "intr": {
-      "key": "item_item_intr_416",
+      "key": "item_item_intr_426",
       "text": "大大的三消英雄卡"
     },
     "describe": {
-      "key": "item_item_describe_416",
+      "key": "item_item_describe_426",
       "text": "大大怎么叫？"
     },
     "dialogue": {
-      "key": "item_item_dialogue_414",
+      "key": "item_item_dialogue_424",
       "text": "【就这样吧。】"
     },
     "sale": [],
@@ -20884,7 +21025,7 @@
   {
     "id": "27000100",
     "name": {
-      "key": "item_item_name_422",
+      "key": "item_item_name_425",
       "text": "低级三消宝箱"
     },
     "usetype": 5,
@@ -20908,15 +21049,15 @@
     "upper_limit": 0,
     "img": "item_17020001",
     "intr": {
-      "key": "item_item_intr_417",
+      "key": "item_item_intr_427",
       "text": "低级三消宝箱,里面的奖励寥寥无几"
     },
     "describe": {
-      "key": "item_item_describe_417",
+      "key": "item_item_describe_427",
       "text": "低级三消宝箱,里面的奖励寥寥无几"
     },
     "dialogue": {
-      "key": "item_item_dialogue_415",
+      "key": "item_item_dialogue_425",
       "text": "【就这？】"
     },
     "sale": [],
@@ -20925,7 +21066,7 @@
   {
     "id": "27000101",
     "name": {
-      "key": "item_item_name_423",
+      "key": "item_item_name_426",
       "text": "中级三消宝箱"
     },
     "usetype": 5,
@@ -20949,15 +21090,15 @@
     "upper_limit": 0,
     "img": "item_17020001",
     "intr": {
-      "key": "item_item_intr_418",
+      "key": "item_item_intr_428",
       "text": "中级三消宝箱,里面的奖励稀松平常"
     },
     "describe": {
-      "key": "item_item_describe_418",
+      "key": "item_item_describe_428",
       "text": "中级三消宝箱,里面的奖励稀松平常"
     },
     "dialogue": {
-      "key": "item_item_dialogue_416",
+      "key": "item_item_dialogue_426",
       "text": "【还行。】"
     },
     "sale": [],
@@ -20966,7 +21107,7 @@
   {
     "id": "27000102",
     "name": {
-      "key": "item_item_name_424",
+      "key": "item_item_name_427",
       "text": "高级三消宝箱"
     },
     "usetype": 5,
@@ -20990,15 +21131,15 @@
     "upper_limit": 0,
     "img": "item_17020001",
     "intr": {
-      "key": "item_item_intr_419",
+      "key": "item_item_intr_429",
       "text": "高级三消宝箱,里面的奖励值得期待"
     },
     "describe": {
-      "key": "item_item_describe_419",
+      "key": "item_item_describe_429",
       "text": "高级三消宝箱,里面的奖励值得期待"
     },
     "dialogue": {
-      "key": "item_item_dialogue_417",
+      "key": "item_item_dialogue_427",
       "text": "【嗯，不错。】"
     },
     "sale": [],
@@ -21007,7 +21148,7 @@
   {
     "id": "27000103",
     "name": {
-      "key": "item_item_name_425",
+      "key": "item_item_name_428",
       "text": "完美三消宝箱"
     },
     "usetype": 5,
@@ -21031,15 +21172,15 @@
     "upper_limit": 0,
     "img": "item_17020001",
     "intr": {
-      "key": "item_item_intr_420",
+      "key": "item_item_intr_430",
       "text": "完美三消宝箱,里面的奖励令人垂延"
     },
     "describe": {
-      "key": "item_item_describe_420",
+      "key": "item_item_describe_430",
       "text": "完美三消宝箱,里面的奖励令人垂延"
     },
     "dialogue": {
-      "key": "item_item_dialogue_418",
+      "key": "item_item_dialogue_428",
       "text": "【好家伙！】"
     },
     "sale": [],
@@ -21048,7 +21189,7 @@
   {
     "id": "27000104",
     "name": {
-      "key": "item_item_name_426",
+      "key": "item_item_name_429",
       "text": "无双三消宝箱"
     },
     "usetype": 5,
@@ -21072,15 +21213,15 @@
     "upper_limit": 0,
     "img": "item_17020001",
     "intr": {
-      "key": "item_item_intr_421",
+      "key": "item_item_intr_431",
       "text": "无双三消宝箱,里面的奖励天下无双"
     },
     "describe": {
-      "key": "item_item_describe_421",
+      "key": "item_item_describe_431",
       "text": "无双三消宝箱,里面的奖励天下无双"
     },
     "dialogue": {
-      "key": "item_item_dialogue_419",
+      "key": "item_item_dialogue_429",
       "text": "【我要的就是这个！】"
     },
     "sale": [],
diff --git a/bin/json/game_mainchapter.json b/bin/json/game_mainchapter.json
index 98e0c2760..18e5aa771 100644
--- a/bin/json/game_mainchapter.json
+++ b/bin/json/game_mainchapter.json
@@ -153,7 +153,7 @@
       25001
     ],
     "bosspng": "zxgq_boss_001",
-    "image": "zx_cjsp_img_44005"
+    "image": "zx_cjsp_img_44001"
   },
   {
     "id": 11004,
diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json
index 2cc6ee8d3..5382b3ba4 100644
--- a/bin/json/game_mainstage.json
+++ b/bin/json/game_mainstage.json
@@ -6703,7 +6703,7 @@
     "chapterid": 11001,
     "group_id": 100142,
     "previous_group_id": [
-      100130
+      100118
     ],
     "previoustage": 0,
     "buried_type": 0,
@@ -8382,7 +8382,7 @@
     "chapterid": 11001,
     "group_id": 1001591,
     "previous_group_id": [
-      100130
+      100117
     ],
     "previoustage": 0,
     "buried_type": 0,
@@ -8721,19 +8721,19 @@
     "challengeward": 0
   },
   {
-    "id": 1102000,
-    "chapterid": 11002,
-    "group_id": 100200,
+    "id": 1101089,
+    "chapterid": 11001,
+    "group_id": 100161,
     "previous_group_id": [
-      100128
+      100101
     ],
     "previoustage": 0,
     "buried_type": 0,
     "buried": 0,
     "grouptype": [],
-    "Episodetype": 0,
+    "Episodetype": 7,
     "stage_param": 0,
-    "inherit": 0,
+    "inherit": 1,
     "battle_fail": 0,
     "venturemodelspeed": 0,
     "venturemodelscale": 0,
@@ -8750,7 +8750,820 @@
     "is_near": 0,
     "openlevel": 1,
     "EditorStage": 0,
-    "herocolor": 0,
+    "herocolor": 2,
+    "heroimg": "zxgq_qp_icon_sq",
+    "bubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "animation": [],
+    "hide": 1,
+    "destroy": 1,
+    "progress": 0,
+    "stroyshow": 0,
+    "frontstoryid": 200700,
+    "afterstoryid": 0,
+    "maingroupName": {
+      "key": "",
+      "text": ""
+    },
+    "mainlineName": {
+      "key": "",
+      "text": ""
+    },
+    "title": {
+      "key": "",
+      "text": ""
+    },
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "exp": 0,
+    "hero_exp": 0,
+    "ps_consume": [],
+    "ps_mg": [],
+    "firstaward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      }
+    ],
+    "lotteryward": 0,
+    "commonaward": [],
+    "BattleReadyID": 0,
+    "FormatList": [],
+    "helphero": [],
+    "banhero": [],
+    "star": [],
+    "star_type": [],
+    "star_value": [],
+    "challengeward": 0
+  },
+  {
+    "id": 1101090,
+    "chapterid": 11001,
+    "group_id": 100162,
+    "previous_group_id": [
+      100101
+    ],
+    "previoustage": 0,
+    "buried_type": 0,
+    "buried": 0,
+    "grouptype": [],
+    "Episodetype": 7,
+    "stage_param": 0,
+    "inherit": 1,
+    "battle_fail": 0,
+    "venturemodelspeed": 0,
+    "venturemodelscale": 0,
+    "move_type": 0,
+    "venturemodel": "",
+    "bubbletalk": {
+      "key": "",
+      "text": ""
+    },
+    "venturetype": 0,
+    "ventureavatar": [],
+    "scene_effect": [],
+    "scene_effectfilter": "",
+    "is_near": 0,
+    "openlevel": 1,
+    "EditorStage": 0,
+    "herocolor": 2,
+    "heroimg": "zxgq_qp_icon_sq",
+    "bubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "animation": [],
+    "hide": 1,
+    "destroy": 1,
+    "progress": 0,
+    "stroyshow": 0,
+    "frontstoryid": 200710,
+    "afterstoryid": 0,
+    "maingroupName": {
+      "key": "",
+      "text": ""
+    },
+    "mainlineName": {
+      "key": "",
+      "text": ""
+    },
+    "title": {
+      "key": "",
+      "text": ""
+    },
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "exp": 0,
+    "hero_exp": 0,
+    "ps_consume": [],
+    "ps_mg": [],
+    "firstaward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      }
+    ],
+    "lotteryward": 0,
+    "commonaward": [],
+    "BattleReadyID": 0,
+    "FormatList": [],
+    "helphero": [],
+    "banhero": [],
+    "star": [],
+    "star_type": [],
+    "star_value": [],
+    "challengeward": 0
+  },
+  {
+    "id": 1101091,
+    "chapterid": 11001,
+    "group_id": 100163,
+    "previous_group_id": [
+      100101
+    ],
+    "previoustage": 0,
+    "buried_type": 0,
+    "buried": 0,
+    "grouptype": [],
+    "Episodetype": 7,
+    "stage_param": 0,
+    "inherit": 1,
+    "battle_fail": 0,
+    "venturemodelspeed": 0,
+    "venturemodelscale": 0,
+    "move_type": 0,
+    "venturemodel": "",
+    "bubbletalk": {
+      "key": "",
+      "text": ""
+    },
+    "venturetype": 0,
+    "ventureavatar": [],
+    "scene_effect": [],
+    "scene_effectfilter": "",
+    "is_near": 0,
+    "openlevel": 1,
+    "EditorStage": 0,
+    "herocolor": 2,
+    "heroimg": "zxgq_qp_icon_sq",
+    "bubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "animation": [],
+    "hide": 1,
+    "destroy": 1,
+    "progress": 0,
+    "stroyshow": 0,
+    "frontstoryid": 200700,
+    "afterstoryid": 0,
+    "maingroupName": {
+      "key": "",
+      "text": ""
+    },
+    "mainlineName": {
+      "key": "",
+      "text": ""
+    },
+    "title": {
+      "key": "",
+      "text": ""
+    },
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "exp": 0,
+    "hero_exp": 0,
+    "ps_consume": [],
+    "ps_mg": [],
+    "firstaward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      }
+    ],
+    "lotteryward": 0,
+    "commonaward": [],
+    "BattleReadyID": 0,
+    "FormatList": [],
+    "helphero": [],
+    "banhero": [],
+    "star": [],
+    "star_type": [],
+    "star_value": [],
+    "challengeward": 0
+  },
+  {
+    "id": 1101092,
+    "chapterid": 11001,
+    "group_id": 100164,
+    "previous_group_id": [
+      100101
+    ],
+    "previoustage": 0,
+    "buried_type": 0,
+    "buried": 0,
+    "grouptype": [],
+    "Episodetype": 7,
+    "stage_param": 0,
+    "inherit": 1,
+    "battle_fail": 0,
+    "venturemodelspeed": 0,
+    "venturemodelscale": 0,
+    "move_type": 0,
+    "venturemodel": "",
+    "bubbletalk": {
+      "key": "",
+      "text": ""
+    },
+    "venturetype": 0,
+    "ventureavatar": [],
+    "scene_effect": [],
+    "scene_effectfilter": "",
+    "is_near": 0,
+    "openlevel": 1,
+    "EditorStage": 0,
+    "herocolor": 2,
+    "heroimg": "zxgq_qp_icon_sq",
+    "bubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "animation": [],
+    "hide": 1,
+    "destroy": 1,
+    "progress": 0,
+    "stroyshow": 0,
+    "frontstoryid": 200710,
+    "afterstoryid": 0,
+    "maingroupName": {
+      "key": "",
+      "text": ""
+    },
+    "mainlineName": {
+      "key": "",
+      "text": ""
+    },
+    "title": {
+      "key": "",
+      "text": ""
+    },
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "exp": 0,
+    "hero_exp": 0,
+    "ps_consume": [],
+    "ps_mg": [],
+    "firstaward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      }
+    ],
+    "lotteryward": 0,
+    "commonaward": [],
+    "BattleReadyID": 0,
+    "FormatList": [],
+    "helphero": [],
+    "banhero": [],
+    "star": [],
+    "star_type": [],
+    "star_value": [],
+    "challengeward": 0
+  },
+  {
+    "id": 1101093,
+    "chapterid": 11001,
+    "group_id": 100165,
+    "previous_group_id": [
+      100101
+    ],
+    "previoustage": 0,
+    "buried_type": 0,
+    "buried": 0,
+    "grouptype": [],
+    "Episodetype": 7,
+    "stage_param": 0,
+    "inherit": 1,
+    "battle_fail": 0,
+    "venturemodelspeed": 0,
+    "venturemodelscale": 0,
+    "move_type": 0,
+    "venturemodel": "",
+    "bubbletalk": {
+      "key": "",
+      "text": ""
+    },
+    "venturetype": 0,
+    "ventureavatar": [],
+    "scene_effect": [],
+    "scene_effectfilter": "",
+    "is_near": 0,
+    "openlevel": 1,
+    "EditorStage": 0,
+    "herocolor": 2,
+    "heroimg": "zxgq_qp_icon_sq",
+    "bubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "animation": [],
+    "hide": 1,
+    "destroy": 1,
+    "progress": 0,
+    "stroyshow": 0,
+    "frontstoryid": 200720,
+    "afterstoryid": 0,
+    "maingroupName": {
+      "key": "",
+      "text": ""
+    },
+    "mainlineName": {
+      "key": "",
+      "text": ""
+    },
+    "title": {
+      "key": "",
+      "text": ""
+    },
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "exp": 0,
+    "hero_exp": 0,
+    "ps_consume": [],
+    "ps_mg": [],
+    "firstaward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24012012",
+        "n": 1
+      }
+    ],
+    "lotteryward": 0,
+    "commonaward": [],
+    "BattleReadyID": 0,
+    "FormatList": [],
+    "helphero": [],
+    "banhero": [],
+    "star": [],
+    "star_type": [],
+    "star_value": [],
+    "challengeward": 0
+  },
+  {
+    "id": 1101094,
+    "chapterid": 11001,
+    "group_id": 100166,
+    "previous_group_id": [
+      100101
+    ],
+    "previoustage": 0,
+    "buried_type": 0,
+    "buried": 0,
+    "grouptype": [],
+    "Episodetype": 7,
+    "stage_param": 0,
+    "inherit": 1,
+    "battle_fail": 0,
+    "venturemodelspeed": 0,
+    "venturemodelscale": 0,
+    "move_type": 0,
+    "venturemodel": "",
+    "bubbletalk": {
+      "key": "",
+      "text": ""
+    },
+    "venturetype": 0,
+    "ventureavatar": [],
+    "scene_effect": [],
+    "scene_effectfilter": "",
+    "is_near": 0,
+    "openlevel": 1,
+    "EditorStage": 0,
+    "herocolor": 2,
+    "heroimg": "zxgq_qp_icon_sq",
+    "bubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "animation": [],
+    "hide": 1,
+    "destroy": 1,
+    "progress": 0,
+    "stroyshow": 0,
+    "frontstoryid": 200730,
+    "afterstoryid": 0,
+    "maingroupName": {
+      "key": "",
+      "text": ""
+    },
+    "mainlineName": {
+      "key": "",
+      "text": ""
+    },
+    "title": {
+      "key": "",
+      "text": ""
+    },
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "exp": 0,
+    "hero_exp": 0,
+    "ps_consume": [],
+    "ps_mg": [],
+    "firstaward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24012013",
+        "n": 1
+      }
+    ],
+    "lotteryward": 0,
+    "commonaward": [],
+    "BattleReadyID": 0,
+    "FormatList": [],
+    "helphero": [],
+    "banhero": [],
+    "star": [],
+    "star_type": [],
+    "star_value": [],
+    "challengeward": 0
+  },
+  {
+    "id": 1101095,
+    "chapterid": 11001,
+    "group_id": 100167,
+    "previous_group_id": [
+      100101
+    ],
+    "previoustage": 0,
+    "buried_type": 0,
+    "buried": 0,
+    "grouptype": [],
+    "Episodetype": 7,
+    "stage_param": 0,
+    "inherit": 1,
+    "battle_fail": 0,
+    "venturemodelspeed": 0,
+    "venturemodelscale": 0,
+    "move_type": 0,
+    "venturemodel": "",
+    "bubbletalk": {
+      "key": "",
+      "text": ""
+    },
+    "venturetype": 0,
+    "ventureavatar": [],
+    "scene_effect": [],
+    "scene_effectfilter": "",
+    "is_near": 0,
+    "openlevel": 1,
+    "EditorStage": 0,
+    "herocolor": 2,
+    "heroimg": "zxgq_qp_icon_sq",
+    "bubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "animation": [],
+    "hide": 1,
+    "destroy": 1,
+    "progress": 0,
+    "stroyshow": 0,
+    "frontstoryid": 200740,
+    "afterstoryid": 0,
+    "maingroupName": {
+      "key": "",
+      "text": ""
+    },
+    "mainlineName": {
+      "key": "",
+      "text": ""
+    },
+    "title": {
+      "key": "",
+      "text": ""
+    },
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "exp": 0,
+    "hero_exp": 0,
+    "ps_consume": [],
+    "ps_mg": [],
+    "firstaward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24012014",
+        "n": 1
+      }
+    ],
+    "lotteryward": 0,
+    "commonaward": [],
+    "BattleReadyID": 0,
+    "FormatList": [],
+    "helphero": [],
+    "banhero": [],
+    "star": [],
+    "star_type": [],
+    "star_value": [],
+    "challengeward": 0
+  },
+  {
+    "id": 1101096,
+    "chapterid": 11001,
+    "group_id": 100168,
+    "previous_group_id": [
+      100101
+    ],
+    "previoustage": 0,
+    "buried_type": 2,
+    "buried": 1,
+    "grouptype": [],
+    "Episodetype": 3,
+    "stage_param": 0,
+    "inherit": 1,
+    "battle_fail": 0,
+    "venturemodelspeed": 0,
+    "venturemodelscale": 0,
+    "move_type": 0,
+    "venturemodel": "",
+    "bubbletalk": {
+      "key": "",
+      "text": ""
+    },
+    "venturetype": 0,
+    "ventureavatar": [],
+    "scene_effect": [],
+    "scene_effectfilter": "",
+    "is_near": 0,
+    "openlevel": 1,
+    "EditorStage": 0,
+    "herocolor": 2,
+    "heroimg": "zxgq_qp_icon_gth",
+    "bubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "animation": [],
+    "hide": 1,
+    "destroy": 1,
+    "progress": 0,
+    "stroyshow": 0,
+    "frontstoryid": 200750,
+    "afterstoryid": 0,
+    "maingroupName": {
+      "key": "",
+      "text": ""
+    },
+    "mainlineName": {
+      "key": "",
+      "text": ""
+    },
+    "title": {
+      "key": "",
+      "text": ""
+    },
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "exp": 0,
+    "hero_exp": 0,
+    "ps_consume": [],
+    "ps_mg": [],
+    "firstaward": [],
+    "lotteryward": 0,
+    "commonaward": [],
+    "BattleReadyID": 0,
+    "FormatList": [],
+    "helphero": [],
+    "banhero": [],
+    "star": [],
+    "star_type": [],
+    "star_value": [],
+    "challengeward": 0
+  },
+  {
+    "id": 1101097,
+    "chapterid": 11001,
+    "group_id": 100169,
+    "previous_group_id": [
+      100168
+    ],
+    "previoustage": 0,
+    "buried_type": 0,
+    "buried": 0,
+    "grouptype": [],
+    "Episodetype": 7,
+    "stage_param": 0,
+    "inherit": 1,
+    "battle_fail": 0,
+    "venturemodelspeed": 0,
+    "venturemodelscale": 0,
+    "move_type": 0,
+    "venturemodel": "",
+    "bubbletalk": {
+      "key": "",
+      "text": ""
+    },
+    "venturetype": 0,
+    "ventureavatar": [],
+    "scene_effect": [],
+    "scene_effectfilter": "",
+    "is_near": 0,
+    "openlevel": 1,
+    "EditorStage": 0,
+    "herocolor": 2,
+    "heroimg": "zxgq_qp_icon_sq",
+    "bubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "animation": [],
+    "hide": 1,
+    "destroy": 1,
+    "progress": 0,
+    "stroyshow": 0,
+    "frontstoryid": 200760,
+    "afterstoryid": 0,
+    "maingroupName": {
+      "key": "",
+      "text": ""
+    },
+    "mainlineName": {
+      "key": "",
+      "text": ""
+    },
+    "title": {
+      "key": "",
+      "text": ""
+    },
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "exp": 0,
+    "hero_exp": 0,
+    "ps_consume": [],
+    "ps_mg": [],
+    "firstaward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 5
+      }
+    ],
+    "lotteryward": 0,
+    "commonaward": [],
+    "BattleReadyID": 0,
+    "FormatList": [],
+    "helphero": [],
+    "banhero": [],
+    "star": [],
+    "star_type": [],
+    "star_value": [],
+    "challengeward": 0
+  },
+  {
+    "id": 1101098,
+    "chapterid": 11001,
+    "group_id": 100170,
+    "previous_group_id": [
+      100169
+    ],
+    "previoustage": 0,
+    "buried_type": 0,
+    "buried": 0,
+    "grouptype": [],
+    "Episodetype": 3,
+    "stage_param": 0,
+    "inherit": 1,
+    "battle_fail": 0,
+    "venturemodelspeed": 0,
+    "venturemodelscale": 0,
+    "move_type": 0,
+    "venturemodel": "",
+    "bubbletalk": {
+      "key": "",
+      "text": ""
+    },
+    "venturetype": 0,
+    "ventureavatar": [],
+    "scene_effect": [],
+    "scene_effectfilter": "",
+    "is_near": 0,
+    "openlevel": 1,
+    "EditorStage": 0,
+    "herocolor": 2,
+    "heroimg": "zxgq_qp_icon_gth",
+    "bubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "animation": [],
+    "hide": 0,
+    "destroy": 1,
+    "progress": 0,
+    "stroyshow": 0,
+    "frontstoryid": 200770,
+    "afterstoryid": 0,
+    "maingroupName": {
+      "key": "",
+      "text": ""
+    },
+    "mainlineName": {
+      "key": "",
+      "text": ""
+    },
+    "title": {
+      "key": "",
+      "text": ""
+    },
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "exp": 0,
+    "hero_exp": 0,
+    "ps_consume": [],
+    "ps_mg": [],
+    "firstaward": [],
+    "lotteryward": 0,
+    "commonaward": [],
+    "BattleReadyID": 0,
+    "FormatList": [],
+    "helphero": [],
+    "banhero": [],
+    "star": [],
+    "star_type": [],
+    "star_value": [],
+    "challengeward": 0
+  },
+  {
+    "id": 1102000,
+    "chapterid": 11002,
+    "group_id": 100200,
+    "previous_group_id": [
+      100128
+    ],
+    "previoustage": 0,
+    "buried_type": 0,
+    "buried": 0,
+    "grouptype": [],
+    "Episodetype": 0,
+    "stage_param": 0,
+    "inherit": 1,
+    "battle_fail": 0,
+    "venturemodelspeed": 0,
+    "venturemodelscale": 0,
+    "move_type": 0,
+    "venturemodel": "",
+    "bubbletalk": {
+      "key": "",
+      "text": ""
+    },
+    "venturetype": 0,
+    "ventureavatar": [],
+    "scene_effect": [],
+    "scene_effectfilter": "",
+    "is_near": 0,
+    "openlevel": 1,
+    "EditorStage": 0,
+    "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
       "key": "",
@@ -18390,11 +19203,11 @@
     },
     "title": {
       "key": "mainchapter_main_stage_title_177",
-      "text": "邦尼兔暴走"
+      "text": "巧遇黑袍人"
     },
     "desc": {
       "key": "mainchapter_main_stage_desc_180",
-      "text": "兔兔似乎失去了冷静……"
+      "text": "再一次遭遇！看来针对梅卡洛特城堡的人有黑暗的力量作祟……"
     },
     "exp": 0,
     "hero_exp": 400,
@@ -18548,7 +19361,7 @@
     ],
     "BattleReadyID": 116,
     "FormatList": [
-      103061
+      103071
     ],
     "helphero": [],
     "banhero": [],
diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json
index 1c4799f61..88b661975 100644
--- a/bin/json/game_monsterformat.json
+++ b/bin/json/game_monsterformat.json
@@ -3507,7 +3507,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "bossHpCnt": 0,
-    "heroid": 51050,
+    "heroid": -1,
     "star": 3,
     "equip": [],
     "newskill": [],
@@ -3518,7 +3518,7 @@
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
-    "speed": 63,
+    "speed": 59,
     "modelsize": 1
   },
   {
diff --git a/bin/json/game_playingmethod.json b/bin/json/game_playingmethod.json
index f86cfc57c..f9b788dfb 100644
--- a/bin/json/game_playingmethod.json
+++ b/bin/json/game_playingmethod.json
@@ -2,7 +2,7 @@
   {
     "key": 1,
     "open": 0,
-    "icon": "",
+    "icon": "sx_fk_dhs",
     "name": {
       "key": "consume_consume_playingmethod_name_01",
       "text": "基础模式"
@@ -18,7 +18,7 @@
   {
     "key": 3,
     "open": 999999,
-    "icon": "",
+    "icon": "sx_zd_dhs",
     "name": {
       "key": "consume_consume_playingmethod_name_03",
       "text": "炸弹模式"
@@ -34,7 +34,7 @@
   {
     "key": 4,
     "open": 999999,
-    "icon": "",
+    "icon": "sx_syh_lvs",
     "name": {
       "key": "consume_consume_playingmethod_name_04",
       "text": "烟火模式"
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index 1265fb699..61caef89d 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -17320,7 +17320,7 @@
     "From": 4,
     "Where": [],
     "Order": "",
-    "Limit": 10,
+    "Limit": 1,
     "ExecuteCnt": 1,
     "Type": 8,
     "Argu": [
@@ -17346,7 +17346,7 @@
     "From": 4,
     "Where": [],
     "Order": "",
-    "Limit": 10,
+    "Limit": 1,
     "ExecuteCnt": 1,
     "Type": 3,
     "Argu": [
@@ -17370,7 +17370,7 @@
     "From": 4,
     "Where": [],
     "Order": "",
-    "Limit": 10,
+    "Limit": 1,
     "ExecuteCnt": 1,
     "Type": 2,
     "Argu": [
@@ -17393,7 +17393,7 @@
     "From": 8,
     "Where": [],
     "Order": "",
-    "Limit": 10,
+    "Limit": 1,
     "ExecuteCnt": 1,
     "Type": 12,
     "Argu": [
@@ -17414,7 +17414,7 @@
     "From": 4,
     "Where": [],
     "Order": "",
-    "Limit": 10,
+    "Limit": 1,
     "ExecuteCnt": 1,
     "Type": 8,
     "Argu": [
@@ -17440,7 +17440,7 @@
     "From": 4,
     "Where": [],
     "Order": "",
-    "Limit": 10,
+    "Limit": 1,
     "ExecuteCnt": 1,
     "Type": 3,
     "Argu": [
@@ -17464,7 +17464,7 @@
     "From": 4,
     "Where": [],
     "Order": "",
-    "Limit": 10,
+    "Limit": 1,
     "ExecuteCnt": 1,
     "Type": 8,
     "Argu": [
@@ -17490,7 +17490,7 @@
     "From": 4,
     "Where": [],
     "Order": "",
-    "Limit": 10,
+    "Limit": 1,
     "ExecuteCnt": 1,
     "Type": 3,
     "Argu": [
@@ -62229,5 +62229,780 @@
     "DpsCondition": "",
     "RevisiCondition": "",
     "RevisiParams": []
+  },
+  {
+    "Id": 223011111,
+    "EmitPR": 1000,
+    "From": 4,
+    "Where": [],
+    "Order": "",
+    "Limit": 1,
+    "ExecuteCnt": 2,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      1300
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [
+      223011112
+    ],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 223011112,
+    "EmitPR": 1000,
+    "From": 4,
+    "Where": [],
+    "Order": "",
+    "Limit": 1,
+    "ExecuteCnt": 1,
+    "Type": 3,
+    "Argu": [
+      390001404,
+      500,
+      1,
+      2
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 223011121,
+    "EmitPR": 1000,
+    "From": 4,
+    "Where": [],
+    "Order": "",
+    "Limit": 1,
+    "ExecuteCnt": 2,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      1400
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [
+      223011112
+    ],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 223011131,
+    "EmitPR": 1000,
+    "From": 4,
+    "Where": [],
+    "Order": "",
+    "Limit": 1,
+    "ExecuteCnt": 2,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      1500
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [
+      223011112
+    ],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 223011141,
+    "EmitPR": 1000,
+    "From": 4,
+    "Where": [],
+    "Order": "",
+    "Limit": 1,
+    "ExecuteCnt": 2,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      1600
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [
+      223011112
+    ],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 223011151,
+    "EmitPR": 1000,
+    "From": 4,
+    "Where": [],
+    "Order": "",
+    "Limit": 1,
+    "ExecuteCnt": 2,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      1700
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [
+      223011112
+    ],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 223011211,
+    "EmitPR": 1000,
+    "From": 3,
+    "Where": [],
+    "Order": "",
+    "Limit": 1,
+    "ExecuteCnt": 1,
+    "Type": 3,
+    "Argu": [
+      391000099,
+      1000,
+      1,
+      2
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 223011311,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 4,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      1200
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [
+      223011312
+    ],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 223011321,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 4,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      1300
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [
+      223011312
+    ],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 223011331,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 4,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      1400
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [
+      223011312
+    ],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 223011341,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 4,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      1500
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [
+      223011312
+    ],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 223011351,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 4,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      1600
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [
+      223011312
+    ],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 223011312,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 3,
+    "Argu": [
+      390001404,
+      1000,
+      1,
+      2
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 223011313,
+    "EmitPR": 1000,
+    "From": 3,
+    "Where": [],
+    "Order": "",
+    "Limit": 1,
+    "ExecuteCnt": 1,
+    "Type": 2,
+    "Argu": [
+      423011311,
+      -1,
+      -1
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 223011314,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 3,
+    "Argu": [
+      390001404,
+      1000,
+      1,
+      2
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 225012111,
+    "EmitPR": 1000,
+    "From": 4,
+    "Where": [],
+    "Order": "",
+    "Limit": 1,
+    "ExecuteCnt": 1,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      2300
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [
+      225012112
+    ],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 225012121,
+    "EmitPR": 1000,
+    "From": 4,
+    "Where": [],
+    "Order": "",
+    "Limit": 1,
+    "ExecuteCnt": 1,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      2400
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [
+      225012112
+    ],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 225012131,
+    "EmitPR": 1000,
+    "From": 4,
+    "Where": [],
+    "Order": "",
+    "Limit": 1,
+    "ExecuteCnt": 1,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      2500
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [
+      225012112
+    ],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 225012141,
+    "EmitPR": 1000,
+    "From": 4,
+    "Where": [],
+    "Order": "",
+    "Limit": 1,
+    "ExecuteCnt": 1,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      2600
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [
+      225012112
+    ],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 225012151,
+    "EmitPR": 1000,
+    "From": 4,
+    "Where": [],
+    "Order": "",
+    "Limit": 1,
+    "ExecuteCnt": 1,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      2700
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [
+      225012112
+    ],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 225012112,
+    "EmitPR": 1000,
+    "From": 4,
+    "Where": [],
+    "Order": "",
+    "Limit": 1,
+    "ExecuteCnt": 1,
+    "Type": 3,
+    "Argu": [
+      390001102,
+      500,
+      1,
+      1
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 225012211,
+    "EmitPR": 1000,
+    "From": 1,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 3,
+    "Argu": [
+      390001001,
+      1000,
+      1,
+      2
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [
+      225012212
+    ],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 225012212,
+    "EmitPR": 1000,
+    "From": 1,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 3,
+    "Argu": [
+      390001457,
+      1000,
+      1,
+      2
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 225012311,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      4000
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [
+      225012312,
+      225012313,
+      225012314
+    ],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 225012321,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      4100
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [
+      225012312,
+      225012313,
+      225012314
+    ],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 225012331,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      4200
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [
+      225012312,
+      225012313,
+      225012314
+    ],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 225012341,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      4300
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [
+      225012312,
+      225012313,
+      225012314
+    ],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 225012351,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      4400
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [
+      225012312,
+      225012313,
+      225012314
+    ],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 225012312,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 3,
+    "Argu": [
+      390001105,
+      1000,
+      1,
+      1
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 225012313,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 3,
+    "Argu": [
+      390001006,
+      700,
+      1,
+      2
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 225012314,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 3,
+    "Argu": [
+      390001007,
+      700,
+      1,
+      2
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json
index 831bcaddf..9a7ab4193 100644
--- a/bin/json/game_skillatk.json
+++ b/bin/json/game_skillatk.json
@@ -47456,7 +47456,7 @@
     "Target": 0,
     "ChildSkill": {
       "Id": [
-        253007212,
+        253007211,
         253007213
       ]
     },
@@ -47531,5 +47531,795 @@
     },
     "buffid": [],
     "map": ""
+  },
+  {
+    "id": 123011111,
+    "level": 1,
+    "MaxLV": 5,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_123011111",
+      "text": ""
+    },
+    "ico": "jn_23011_1",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_1",
+    "Type": 1,
+    "CD": 0,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        223011111
+      ]
+    },
+    "passSkill": [],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_123011111_1",
+      "text": "攻击敌方1个目标，对其造成2次攻击力130%攻击力的伤害，有50%概率附加2回合【流血】。"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 123011111,
+    "level": 2,
+    "MaxLV": 5,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_123011111",
+      "text": ""
+    },
+    "ico": "jn_23011_1",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_1",
+    "Type": 1,
+    "CD": 0,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        223011121
+      ]
+    },
+    "passSkill": [],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_123011111_2",
+      "text": "伤害提升至140%。"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 123011111,
+    "level": 3,
+    "MaxLV": 5,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_123011111",
+      "text": ""
+    },
+    "ico": "jn_23011_1",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_1",
+    "Type": 1,
+    "CD": 0,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        223011131
+      ]
+    },
+    "passSkill": [],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_123011111_3",
+      "text": "伤害提升至150%。"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 123011111,
+    "level": 4,
+    "MaxLV": 5,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_123011111",
+      "text": ""
+    },
+    "ico": "jn_23011_1",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_1",
+    "Type": 1,
+    "CD": 0,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        223011141
+      ]
+    },
+    "passSkill": [],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_123011111_4",
+      "text": "伤害提升至160%。"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 123011111,
+    "level": 5,
+    "MaxLV": 5,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_123011111",
+      "text": ""
+    },
+    "ico": "jn_23011_1",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_1",
+    "Type": 1,
+    "CD": 0,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        223011151
+      ]
+    },
+    "passSkill": [],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_123011111_5",
+      "text": "伤害提升至170%。"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 123011211,
+    "level": 1,
+    "MaxLV": 3,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_123011211",
+      "text": ""
+    },
+    "ico": "jn_23011_2",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_2",
+    "Type": 1,
+    "CD": 5,
+    "Where": [],
+    "Target": 0,
+    "ChildSkill": {
+      "Id": [
+        223011211
+      ]
+    },
+    "passSkill": [],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_123011211_1",
+      "text": "为自身添加2回合【油光水滑】。"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 123011211,
+    "level": 2,
+    "MaxLV": 3,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_123011211",
+      "text": ""
+    },
+    "ico": "jn_23011_2",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_2",
+    "Type": 1,
+    "CD": 4,
+    "Where": [],
+    "Target": 0,
+    "ChildSkill": {
+      "Id": [
+        223011211
+      ]
+    },
+    "passSkill": [],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_123011211_2",
+      "text": "冷却时间减少1回合。"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 123011211,
+    "level": 3,
+    "MaxLV": 3,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_123011211",
+      "text": ""
+    },
+    "ico": "jn_23011_2",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_2",
+    "Type": 1,
+    "CD": 3,
+    "Where": [],
+    "Target": 0,
+    "ChildSkill": {
+      "Id": [
+        223011211
+      ]
+    },
+    "passSkill": [],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_123011211_3",
+      "text": "冷却时间减少1回合。"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 123011311,
+    "level": 1,
+    "MaxLV": 5,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_123011311",
+      "text": ""
+    },
+    "ico": "jn_23011_3",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_3",
+    "Type": 1,
+    "CD": 5,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        223011311
+      ]
+    },
+    "passSkill": [
+      223011313
+    ],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_123011311_1",
+      "text": "攻击敌方全体目标4次，每次对其造成攻击力120%的伤害，100%概率附加2回合【流血】，造成暴击后额外附加2回合【流血】"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 123011311,
+    "level": 2,
+    "MaxLV": 5,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_123011311",
+      "text": ""
+    },
+    "ico": "jn_23011_3",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_3",
+    "Type": 1,
+    "CD": 5,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        223011321
+      ]
+    },
+    "passSkill": [
+      223011313
+    ],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_123011311_2",
+      "text": "伤害提升至130%。"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 123011311,
+    "level": 3,
+    "MaxLV": 5,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_123011311",
+      "text": ""
+    },
+    "ico": "jn_23011_3",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_3",
+    "Type": 1,
+    "CD": 5,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        223011331
+      ]
+    },
+    "passSkill": [
+      223011313
+    ],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_123011311_3",
+      "text": "伤害提升至140%。"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 123011311,
+    "level": 4,
+    "MaxLV": 5,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_123011311",
+      "text": ""
+    },
+    "ico": "jn_23011_3",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_3",
+    "Type": 1,
+    "CD": 5,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        223011341
+      ]
+    },
+    "passSkill": [
+      223011313
+    ],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_123011311_4",
+      "text": "伤害提升至150%。"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 123011311,
+    "level": 5,
+    "MaxLV": 5,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_123011311",
+      "text": ""
+    },
+    "ico": "jn_23011_3",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_3",
+    "Type": 1,
+    "CD": 5,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        223011351
+      ]
+    },
+    "passSkill": [
+      223011313
+    ],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_123011311_5",
+      "text": "伤害提升至160%。"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 125012111,
+    "level": 1,
+    "MaxLV": 5,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_125012111",
+      "text": ""
+    },
+    "ico": "jn_25012_1",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_1",
+    "Type": 1,
+    "CD": 0,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        225012111
+      ]
+    },
+    "passSkill": [],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_125012111_1",
+      "text": "召唤小鸟攻击敌方1个目标，对其造成攻击力230%的伤害。有50%概率附加1回合【失手率提升】"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 125012111,
+    "level": 2,
+    "MaxLV": 5,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_125012111",
+      "text": ""
+    },
+    "ico": "jn_25012_1",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_1",
+    "Type": 1,
+    "CD": 0,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        225012121
+      ]
+    },
+    "passSkill": [],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_125012111_2",
+      "text": "伤害提升至240%。"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 125012111,
+    "level": 3,
+    "MaxLV": 5,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_125012111",
+      "text": ""
+    },
+    "ico": "jn_25012_1",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_1",
+    "Type": 1,
+    "CD": 0,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        225012131
+      ]
+    },
+    "passSkill": [],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_125012111_3",
+      "text": "伤害提升至250%。"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 125012111,
+    "level": 4,
+    "MaxLV": 5,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_125012111",
+      "text": ""
+    },
+    "ico": "jn_25012_1",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_1",
+    "Type": 1,
+    "CD": 0,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        225012141
+      ]
+    },
+    "passSkill": [],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_125012111_4",
+      "text": "伤害提升至260%。"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 125012111,
+    "level": 5,
+    "MaxLV": 5,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_125012111",
+      "text": ""
+    },
+    "ico": "jn_25012_1",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_1",
+    "Type": 1,
+    "CD": 0,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        225012151
+      ]
+    },
+    "passSkill": [],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_125012111_5",
+      "text": "伤害提升至270%。"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 125012211,
+    "level": 1,
+    "MaxLV": 3,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_125012211",
+      "text": ""
+    },
+    "ico": "jn_25012_2",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_2",
+    "Type": 1,
+    "CD": 5,
+    "Where": [],
+    "Target": 0,
+    "ChildSkill": {
+      "Id": [
+        225012211
+      ]
+    },
+    "passSkill": [],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_125012211_1",
+      "text": "用歌声提升友方所有守护者士气，为友方全体附加2回合【攻击提升】、【暴击伤害提升】"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 125012211,
+    "level": 2,
+    "MaxLV": 3,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_125012211",
+      "text": ""
+    },
+    "ico": "jn_25012_2",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_2",
+    "Type": 1,
+    "CD": 4,
+    "Where": [],
+    "Target": 0,
+    "ChildSkill": {
+      "Id": [
+        225012211
+      ]
+    },
+    "passSkill": [],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_125012211_2",
+      "text": "冷却时间减少1回合。"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 125012211,
+    "level": 3,
+    "MaxLV": 3,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_125012211",
+      "text": ""
+    },
+    "ico": "jn_25012_2",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_2",
+    "Type": 1,
+    "CD": 3,
+    "Where": [],
+    "Target": 0,
+    "ChildSkill": {
+      "Id": [
+        225012211
+      ]
+    },
+    "passSkill": [],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_125012211_3",
+      "text": "冷却时间减少1回合。"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 125012311,
+    "level": 1,
+    "MaxLV": 5,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_125012311",
+      "text": ""
+    },
+    "ico": "jn_25012_3",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_3",
+    "Type": 1,
+    "CD": 5,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        225012311
+      ]
+    },
+    "passSkill": [],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_125012311_1",
+      "text": "召唤4只小鹿冲向敌方攻击敌方全体目标，造成攻击力400%伤害。有100%概率眩晕目标1回合，70%概率附加2回合【攻击下降】、【防御下降】"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 125012311,
+    "level": 2,
+    "MaxLV": 5,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_125012311",
+      "text": ""
+    },
+    "ico": "jn_25012_3",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_3",
+    "Type": 1,
+    "CD": 5,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        225012321
+      ]
+    },
+    "passSkill": [],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_125012311_2",
+      "text": "伤害提升至410%。"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 125012311,
+    "level": 3,
+    "MaxLV": 5,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_125012311",
+      "text": ""
+    },
+    "ico": "jn_25012_3",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_3",
+    "Type": 1,
+    "CD": 5,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        225012331
+      ]
+    },
+    "passSkill": [],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_125012311_3",
+      "text": "伤害提升至420%。"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 125012311,
+    "level": 4,
+    "MaxLV": 5,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_125012311",
+      "text": ""
+    },
+    "ico": "jn_25012_3",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_3",
+    "Type": 1,
+    "CD": 5,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        225012341
+      ]
+    },
+    "passSkill": [],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_125012311_4",
+      "text": "伤害提升至430%。"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 125012311,
+    "level": 5,
+    "MaxLV": 5,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_125012311",
+      "text": ""
+    },
+    "ico": "jn_25012_3",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_3",
+    "Type": 1,
+    "CD": 5,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        225012351
+      ]
+    },
+    "passSkill": [],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_125012311_5",
+      "text": "伤害提升至440%。"
+    },
+    "buffid": [],
+    "map": ""
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json
index f51b3a184..8eac9d2d0 100644
--- a/bin/json/game_skillbuff.json
+++ b/bin/json/game_skillbuff.json
@@ -11246,5 +11246,442 @@
     "buffeffect": "",
     "buffpos": "根节点",
     "forbidFloat": 0
+  },
+  {
+    "Id": 391000086,
+    "Name": {
+      "key": "skill_skill_buff_Name_391000086",
+      "text": "[color=#e5621b]禁锢[/color]"
+    },
+    "Desc": {
+      "key": "skill_skill_buff_Desc_391000086",
+      "text": "无法行动。"
+    },
+    "BuffType": 24,
+    "EffectArgu": [],
+    "BufParNum": 1,
+    "RelyCheckArgu": [],
+    "CoexistCheckArgu": [],
+    "Effect": [
+      2
+    ],
+    "AddEffect": false,
+    "RemoveType": true,
+    "Priority": 0,
+    "NotOverlay": 0,
+    "OverlayTimes": 1,
+    "SameID": false,
+    "golbalbufficon": "",
+    "buffIcon": "ty_icon_buff_jg",
+    "buffeffect": "effect_buff_jingu",
+    "buffpos": "根节点",
+    "forbidFloat": 0
+  },
+  {
+    "Id": 391000087,
+    "Name": {
+      "key": "skill_skill_buff_Name_391000087",
+      "text": "[color=#e5621b]恐吓[/color]"
+    },
+    "Desc": {
+      "key": "skill_skill_buff_Desc_391000087",
+      "text": "失手率提升40%，受到伤害增加20%。"
+    },
+    "BuffType": 0,
+    "EffectArgu": [],
+    "BufParNum": 1,
+    "RelyCheckArgu": [],
+    "CoexistCheckArgu": [],
+    "Effect": [
+      1
+    ],
+    "AddEffect": false,
+    "RemoveType": true,
+    "Priority": 0,
+    "NotOverlay": 0,
+    "OverlayTimes": 1,
+    "SameID": false,
+    "golbalbufficon": "",
+    "buffIcon": "ty_icon_buff_kh",
+    "buffeffect": "",
+    "buffpos": "根节点",
+    "forbidFloat": 0
+  },
+  {
+    "Id": 391000088,
+    "Name": {
+      "key": "skill_skill_buff_Name_391000088",
+      "text": "受到伤害增加20%"
+    },
+    "Desc": {
+      "key": "skill_skill_buff_Desc_391000088",
+      "text": "受到伤害增加20%"
+    },
+    "BuffType": 20,
+    "EffectArgu": [
+      13,
+      -150
+    ],
+    "BufParNum": 1,
+    "RelyCheckArgu": [],
+    "CoexistCheckArgu": [],
+    "Effect": [
+      1
+    ],
+    "AddEffect": false,
+    "RemoveType": true,
+    "Priority": 0,
+    "NotOverlay": 0,
+    "OverlayTimes": 1,
+    "SameID": false,
+    "golbalbufficon": "",
+    "buffIcon": "",
+    "buffeffect": "",
+    "buffpos": "",
+    "forbidFloat": 0
+  },
+  {
+    "Id": 391000089,
+    "Name": {
+      "key": "skill_skill_buff_Name_391000089",
+      "text": "失手率增加40%"
+    },
+    "Desc": {
+      "key": "skill_skill_buff_Desc_391000089",
+      "text": "失手率增加40%"
+    },
+    "BuffType": 20,
+    "EffectArgu": [
+      11,
+      400
+    ],
+    "BufParNum": 1,
+    "RelyCheckArgu": [],
+    "CoexistCheckArgu": [],
+    "Effect": [
+      1
+    ],
+    "AddEffect": false,
+    "RemoveType": true,
+    "Priority": 0,
+    "NotOverlay": 0,
+    "OverlayTimes": 1,
+    "SameID": false,
+    "golbalbufficon": "",
+    "buffIcon": "",
+    "buffeffect": "",
+    "buffpos": "",
+    "forbidFloat": 0
+  },
+  {
+    "Id": 391000090,
+    "Name": {
+      "key": "skill_skill_buff_Name_391000090",
+      "text": "[color=#e5621b]定身[/color]"
+    },
+    "Desc": {
+      "key": "skill_skill_buff_Desc_391000090",
+      "text": "定身状态下无法行动，回合结束时定身状态下的目标技能不结算CD。"
+    },
+    "BuffType": 27,
+    "EffectArgu": [],
+    "BufParNum": 1,
+    "RelyCheckArgu": [],
+    "CoexistCheckArgu": [],
+    "Effect": [
+      1
+    ],
+    "AddEffect": false,
+    "RemoveType": true,
+    "Priority": 0,
+    "NotOverlay": 0,
+    "OverlayTimes": 1,
+    "SameID": false,
+    "golbalbufficon": "",
+    "buffIcon": "ty_icon_buff_ds",
+    "buffeffect": "",
+    "buffpos": "根节点",
+    "forbidFloat": 0
+  },
+  {
+    "Id": 391000091,
+    "Name": {
+      "key": "skill_skill_buff_Name_391000091",
+      "text": "[color=#e5621b]感电[/color]"
+    },
+    "Desc": {
+      "key": "skill_skill_buff_Desc_391000091",
+      "text": "受到伤害增加20%"
+    },
+    "BuffType": 20,
+    "EffectArgu": [
+      13,
+      -150
+    ],
+    "BufParNum": 1,
+    "RelyCheckArgu": [],
+    "CoexistCheckArgu": [],
+    "Effect": [
+      1
+    ],
+    "AddEffect": false,
+    "RemoveType": true,
+    "Priority": 0,
+    "NotOverlay": 0,
+    "OverlayTimes": 1,
+    "SameID": false,
+    "golbalbufficon": "",
+    "buffIcon": "ty_icon_buff_gd",
+    "buffeffect": "",
+    "buffpos": "根节点",
+    "forbidFloat": 0
+  },
+  {
+    "Id": 391000092,
+    "Name": {
+      "key": "skill_skill_buff_Name_391000092",
+      "text": "[color=#e5621b]电浆[/color]"
+    },
+    "Desc": {
+      "key": "skill_skill_buff_Desc_391000092",
+      "text": "【电浆】层数达到6层后立即引爆，对目标造成30%最大生命的附加伤害"
+    },
+    "BuffType": 0,
+    "EffectArgu": [],
+    "BufParNum": 1,
+    "RelyCheckArgu": [],
+    "CoexistCheckArgu": [],
+    "Effect": [
+      0,
+      1
+    ],
+    "AddEffect": false,
+    "RemoveType": false,
+    "Priority": 0,
+    "NotOverlay": 0,
+    "OverlayTimes": 1,
+    "SameID": false,
+    "golbalbufficon": "",
+    "buffIcon": "ty_icon_buff_dj",
+    "buffeffect": "",
+    "buffpos": "根节点",
+    "forbidFloat": 0
+  },
+  {
+    "Id": 391000093,
+    "Name": {
+      "key": "skill_skill_buff_Name_391000093",
+      "text": "赋予1个本次战斗中适用的所有弱化效果"
+    },
+    "Desc": {
+      "key": "skill_skill_buff_Desc_391000093",
+      "text": "赋予1个本次战斗中适用的所有弱化效果"
+    },
+    "BuffType": 0,
+    "EffectArgu": [],
+    "BufParNum": 1,
+    "RelyCheckArgu": [],
+    "CoexistCheckArgu": [],
+    "Effect": [
+      0
+    ],
+    "AddEffect": false,
+    "RemoveType": false,
+    "Priority": 0,
+    "NotOverlay": 0,
+    "OverlayTimes": 1,
+    "SameID": false,
+    "golbalbufficon": "",
+    "buffIcon": "",
+    "buffeffect": "",
+    "buffpos": "根节点",
+    "forbidFloat": 0
+  },
+  {
+    "Id": 391000094,
+    "Name": {
+      "key": "skill_skill_buff_Name_391000094",
+      "text": "给所有我军，各赋予1个所有强化效果"
+    },
+    "Desc": {
+      "key": "skill_skill_buff_Desc_391000094",
+      "text": "给所有我军，各赋予1个所有强化效果"
+    },
+    "BuffType": 0,
+    "EffectArgu": [],
+    "BufParNum": 1,
+    "RelyCheckArgu": [],
+    "CoexistCheckArgu": [],
+    "Effect": [
+      0
+    ],
+    "AddEffect": false,
+    "RemoveType": false,
+    "Priority": 0,
+    "NotOverlay": 0,
+    "OverlayTimes": 1,
+    "SameID": false,
+    "golbalbufficon": "",
+    "buffIcon": "",
+    "buffeffect": "",
+    "buffpos": "根节点",
+    "forbidFloat": 0
+  },
+  {
+    "Id": 391000095,
+    "Name": {
+      "key": "skill_skill_buff_Name_391000095",
+      "text": "梦魇"
+    },
+    "Desc": {
+      "key": "skill_skill_buff_Desc_391000095",
+      "text": ""
+    },
+    "BuffType": 0,
+    "EffectArgu": [],
+    "BufParNum": 1,
+    "RelyCheckArgu": [],
+    "CoexistCheckArgu": [],
+    "Effect": [
+      0
+    ],
+    "AddEffect": false,
+    "RemoveType": false,
+    "Priority": 0,
+    "NotOverlay": 0,
+    "OverlayTimes": 50,
+    "SameID": false,
+    "golbalbufficon": "",
+    "buffIcon": "ty_icon_buff_myzj",
+    "buffeffect": "",
+    "buffpos": "根节点",
+    "forbidFloat": 0
+  },
+  {
+    "Id": 391000096,
+    "Name": {
+      "key": "skill_skill_buff_Name_391000096",
+      "text": "梦魇"
+    },
+    "Desc": {
+      "key": "skill_skill_buff_Desc_391000096",
+      "text": "每层增加自身1%攻击，1%防御。"
+    },
+    "BuffType": 20,
+    "EffectArgu": [
+      22,
+      10
+    ],
+    "BufParNum": 1,
+    "RelyCheckArgu": [],
+    "CoexistCheckArgu": [],
+    "Effect": [
+      0
+    ],
+    "AddEffect": false,
+    "RemoveType": false,
+    "Priority": 0,
+    "NotOverlay": 0,
+    "OverlayTimes": 0,
+    "SameID": false,
+    "golbalbufficon": "",
+    "buffIcon": "",
+    "buffeffect": "",
+    "buffpos": "根节点",
+    "forbidFloat": 0
+  },
+  {
+    "Id": 391000097,
+    "Name": {
+      "key": "skill_skill_buff_Name_391000097",
+      "text": "梦魇"
+    },
+    "Desc": {
+      "key": "skill_skill_buff_Desc_391000097",
+      "text": "每层增加自身1%攻击，1%防御。"
+    },
+    "BuffType": 20,
+    "EffectArgu": [
+      23,
+      10
+    ],
+    "BufParNum": 1,
+    "RelyCheckArgu": [],
+    "CoexistCheckArgu": [],
+    "Effect": [
+      0
+    ],
+    "AddEffect": false,
+    "RemoveType": false,
+    "Priority": 0,
+    "NotOverlay": 0,
+    "OverlayTimes": 0,
+    "SameID": false,
+    "golbalbufficon": "",
+    "buffIcon": "",
+    "buffeffect": "",
+    "buffpos": "根节点",
+    "forbidFloat": 0
+  },
+  {
+    "Id": 391000098,
+    "Name": {
+      "key": "skill_skill_buff_Name_391000098",
+      "text": "狩猎之心"
+    },
+    "Desc": {
+      "key": "skill_skill_buff_Desc_391000098",
+      "text": "攻击时有30%概率眩晕敌人"
+    },
+    "BuffType": 0,
+    "EffectArgu": [],
+    "BufParNum": 1,
+    "RelyCheckArgu": [],
+    "CoexistCheckArgu": [],
+    "Effect": [
+      3,
+      0
+    ],
+    "AddEffect": false,
+    "RemoveType": true,
+    "Priority": 0,
+    "NotOverlay": 0,
+    "OverlayTimes": 1,
+    "SameID": false,
+    "golbalbufficon": "",
+    "buffIcon": "ty_icon_buff_slzx",
+    "buffeffect": "",
+    "buffpos": "根节点",
+    "forbidFloat": 0
+  },
+  {
+    "Id": 391000099,
+    "Name": {
+      "key": "skill_skill_buff_Name_391000099",
+      "text": "油光水滑"
+    },
+    "Desc": {
+      "key": "skill_skill_buff_Desc_391000099",
+      "text": "减少40%受到的暴击伤害和会心伤害。"
+    },
+    "BuffType": 0,
+    "EffectArgu": [],
+    "BufParNum": 1,
+    "RelyCheckArgu": [],
+    "CoexistCheckArgu": [],
+    "Effect": [
+      3
+    ],
+    "AddEffect": false,
+    "RemoveType": false,
+    "Priority": 0,
+    "NotOverlay": 0,
+    "OverlayTimes": 1,
+    "SameID": false,
+    "golbalbufficon": "",
+    "buffIcon": "ty_icon_buff_ygsh",
+    "buffeffect": "",
+    "buffpos": "根节点",
+    "forbidFloat": 0
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json
index 2960452fa..c1bd1cadf 100644
--- a/bin/json/game_skillpassive.json
+++ b/bin/json/game_skillpassive.json
@@ -9117,5 +9117,166 @@
     "Callback": [
       815004111
     ]
+  },
+  {
+    "Id": 413002212,
+    "When": 28,
+    "FromCheck": "",
+    "TargetCheck": "Target=2",
+    "MainSkillCheck": "",
+    "AfterSkillCheck": "",
+    "BuffCheck": "BuffId=390001401",
+    "DpsCheck": "",
+    "AddCon": [],
+    "PasPr": 1000,
+    "PasCorrection": 0,
+    "Type": "CallSkillPas",
+    "MaxEmitTimesInRoundByRole": 0,
+    "MaxEmitTimes": 0,
+    "MaxEmitTimesInRound": 1,
+    "Callback": [
+      213002214
+    ]
+  },
+  {
+    "Id": 423003311,
+    "When": 20,
+    "FromCheck": "",
+    "TargetCheck": "Target=1",
+    "MainSkillCheck": "SkillPos=3",
+    "AfterSkillCheck": "",
+    "BuffCheck": "BuffId=390001001",
+    "DpsCheck": "",
+    "AddCon": [],
+    "PasPr": 1000,
+    "PasCorrection": 0,
+    "Type": "CallSkillPas",
+    "MaxEmitTimesInRoundByRole": 0,
+    "MaxEmitTimes": 0,
+    "MaxEmitTimesInRound": 1,
+    "Callback": [
+      223003317
+    ]
+  },
+  {
+    "Id": 443002312,
+    "When": 16,
+    "FromCheck": "",
+    "TargetCheck": "Target=2,HasBuff=391000092,OverlayNum=6",
+    "MainSkillCheck": "",
+    "AfterSkillCheck": "",
+    "BuffCheck": "",
+    "DpsCheck": "",
+    "AddCon": [],
+    "PasPr": 1000,
+    "PasCorrection": 0,
+    "Type": "CallSkillPas",
+    "MaxEmitTimesInRoundByRole": 0,
+    "MaxEmitTimes": 0,
+    "MaxEmitTimesInRound": 1,
+    "Callback": [
+      243002314,
+      243002315
+    ]
+  },
+  {
+    "Id": 445001211,
+    "When": 2,
+    "FromCheck": "",
+    "TargetCheck": "Target=3",
+    "MainSkillCheck": "",
+    "AfterSkillCheck": "",
+    "BuffCheck": "",
+    "DpsCheck": "",
+    "AddCon": [],
+    "PasPr": 1000,
+    "PasCorrection": 0,
+    "Type": "CallSkillPas",
+    "MaxEmitTimesInRoundByRole": 0,
+    "MaxEmitTimes": 0,
+    "MaxEmitTimesInRound": 1,
+    "Callback": [
+      245001217
+    ]
+  },
+  {
+    "Id": 445001212,
+    "When": 19,
+    "FromCheck": "",
+    "TargetCheck": "Target=1",
+    "MainSkillCheck": "",
+    "AfterSkillCheck": "",
+    "BuffCheck": "Effect=1,Succ=1",
+    "DpsCheck": "",
+    "AddCon": [],
+    "PasPr": 1000,
+    "PasCorrection": 0,
+    "Type": "CallSkillPas",
+    "MaxEmitTimesInRoundByRole": 0,
+    "MaxEmitTimes": 0,
+    "MaxEmitTimesInRound": 1,
+    "Callback": [
+      245001220
+    ]
+  },
+  {
+    "Id": 434004211,
+    "When": 16,
+    "FromCheck": "Target=3",
+    "TargetCheck": "",
+    "MainSkillCheck": "",
+    "AfterSkillCheck": "",
+    "BuffCheck": "",
+    "DpsCheck": "",
+    "AddCon": [],
+    "PasPr": 1000,
+    "PasCorrection": 0,
+    "Type": "CallSkillPas",
+    "MaxEmitTimesInRoundByRole": 0,
+    "MaxEmitTimes": 0,
+    "MaxEmitTimesInRound": 1,
+    "Callback": [
+      234004212
+    ]
+  },
+  {
+    "Id": 434004212,
+    "When": 16,
+    "FromCheck": "Target=3,HasBuff=391000098",
+    "TargetCheck": "Target=2",
+    "MainSkillCheck": "",
+    "AfterSkillCheck": "",
+    "BuffCheck": "",
+    "DpsCheck": "",
+    "AddCon": [],
+    "PasPr": 1000,
+    "PasCorrection": 0,
+    "Type": "CallSkillPas",
+    "MaxEmitTimesInRoundByRole": 0,
+    "MaxEmitTimes": 0,
+    "MaxEmitTimesInRound": 1,
+    "Callback": [
+      234004214
+    ]
+  },
+  {
+    "Id": 423011311,
+    "When": 10,
+    "FromCheck": "Target=3",
+    "TargetCheck": "",
+    "MainSkillCheck": "SkillPos=3",
+    "AfterSkillCheck": "",
+    "BuffCheck": "",
+    "DpsCheck": "",
+    "AddCon": [],
+    "PasPr": 10000,
+    "PasCorrection": 0,
+    "Type": "CallSkillPas",
+    "MaxEmitTimesInRoundByRole": 0,
+    "MaxEmitTimes": 0,
+    "MaxEmitTimesInRound": 1,
+    "Callback": [
+      223011314
+    ]
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_topuiconfig.json b/bin/json/game_topuiconfig.json
index 809a619a3..00c825805 100644
--- a/bin/json/game_topuiconfig.json
+++ b/bin/json/game_topuiconfig.json
@@ -2750,12 +2750,12 @@
     "currencyField": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "consumeexp",
         "n": 1
       },
       {
         "a": "attr",
-        "t": "diamond",
+        "t": "consumemoney",
         "n": 1
       }
     ]
@@ -2766,12 +2766,12 @@
     "currencyField": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "consumeexp",
         "n": 1
       },
       {
         "a": "attr",
-        "t": "diamond",
+        "t": "consumemoney",
         "n": 1
       }
     ]
@@ -2782,12 +2782,28 @@
     "currencyField": [
       {
         "a": "attr",
-        "t": "gold",
+        "t": "consumeexp",
         "n": 1
       },
       {
         "a": "attr",
-        "t": "diamond",
+        "t": "consumemoney",
+        "n": 1
+      }
+    ]
+  },
+  {
+    "id": "eliminationplay",
+    "subId": "",
+    "currencyField": [
+      {
+        "a": "attr",
+        "t": "consumeexp",
+        "n": 1
+      },
+      {
+        "a": "attr",
+        "t": "consumemoney",
         "n": 1
       }
     ]
diff --git a/bin/json/game_treasuremap.json b/bin/json/game_treasuremap.json
index ca90bdfbf..6c745c8d3 100644
--- a/bin/json/game_treasuremap.json
+++ b/bin/json/game_treasuremap.json
@@ -5,31 +5,31 @@
     "unlock": [
       {
         "a": "item",
-        "t": "24010001",
+        "t": "24012012",
         "n": 1
       },
       {
         "a": "item",
-        "t": "24010002",
+        "t": "24012013",
         "n": 1
       },
       {
         "a": "item",
-        "t": "24010003",
+        "t": "24012014",
         "n": 1
       }
     ],
     "name": {
       "key": "treasuremap_map_name_1",
-      "text": "原始人藏宝图"
+      "text": "博客岛的藏宝图"
     },
     "explain": {
       "key": "treasuremap_map_explain_1",
-      "text": "原始人藏宝图"
+      "text": "在博克岛到处搜索找到的藏宝图，如今终于拼成了一个，上面标记着只在博客岛的宝藏，跟随着藏宝图好好寻找吧！"
     },
     "describe": {
       "key": "treasuremap_map_desribe_1",
-      "text": "原始人藏宝图"
+      "text": "扭扭曲曲的字大概描写着：一只？两只?三只！"
     }
   },
   {
diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index 657299990..1d11d7ff1 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -207,7 +207,7 @@
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_5",
-      "text": "新的伙伴"
+      "text": "去迎接新伙伴吧！"
     },
     "get_item": [
       {
@@ -1049,7 +1049,7 @@
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_25",
-      "text": "终于知道了月光原石的所在，可却遭到了食人鱼先生的袭击，得尽快找到他，解除误会"
+      "text": "终于知道了月光原石的所在，可不曾想竟被食人鱼先生误认成了敌人，得尽快找到他，解除误会。"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_25",
@@ -1160,7 +1160,7 @@
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_28",
-      "text": "瓜哥一家不知道为何突然发狂……的感觉唤醒他们！"
+      "text": "瓜哥一家不知道为何突然发狂……得赶紧唤醒他们！"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_28",
@@ -1387,7 +1387,7 @@
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_33",
-      "text": "邦尼兔因紧急情况离开，接应坏蛋联盟的众人只能一人完成了……"
+      "text": "邦尼兔因紧急情况离开，接应坏蛋联盟的重任只能一人完成了……"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_33",
diff --git a/comm/const.go b/comm/const.go
index b577da1cd..231b991d8 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -415,6 +415,9 @@ const (
 	TableIsLandHero = "islandhero"
 	//彩蛋
 	TableEgghunt = "egghunt"
+
+	//用户日志
+	TableUserLog = "userlog"
 )
 
 // RPC服务接口定义处
diff --git a/modules/modeluserlog.go b/modules/modeluserlog.go
new file mode 100644
index 000000000..1ddc1ba38
--- /dev/null
+++ b/modules/modeluserlog.go
@@ -0,0 +1,58 @@
+package modules
+
+import (
+	"encoding/json"
+	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/core"
+	"go_dreamfactory/lego/sys/log"
+	"go_dreamfactory/pb"
+	"time"
+
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/bson/primitive"
+	"go.mongodb.org/mongo-driver/mongo"
+	mgooptions "go.mongodb.org/mongo-driver/mongo/options"
+	"go.mongodb.org/mongo-driver/x/bsonx"
+)
+
+type modelUserLog struct {
+	MCompModel
+	module core.IModule
+}
+
+func (this *modelUserLog) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
+	err = this.MCompModel.Init(service, module, comp, options)
+	this.TableName = comm.TableUserLog
+	this.module = module
+	// uid 创建索引
+	this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
+		Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}},
+	})
+	indexModel := mongo.IndexModel{
+		Keys:    bson.M{"expireAt": 1},                       // 设置TTL索引列"expire_date"
+		Options: mgooptions.Index().SetExpireAfterSeconds(0), // 设置过期时间（单位：秒）
+	}
+	_, err = this.DB.CreateIndex(core.SqlTable(this.TableName), indexModel) //设置 验证码过期时间索引
+	return
+}
+
+func (this *modelUserLog) AddUserLog(uid string, tag string, data interface{}) {
+	var (
+		jsonStr []byte
+		err     error
+	)
+	if jsonStr, err = json.Marshal(data); err != nil {
+		log.Errorln(err)
+		return
+	}
+	if _, err = this.DBModel.DB.InsertOne(core.SqlTable(this.TableName), &pb.DBUserLog{
+		Id:       primitive.NewObjectID().Hex(),
+		Uid:      uid,
+		ExpireAt: time.Now().Add(time.Hour * 24 * 8).Unix(),
+		Tag:      tag,
+		Data:     string(jsonStr),
+	}); err != nil {
+		log.Errorln(err)
+		return
+	}
+}
diff --git a/modules/modulebase.go b/modules/modulebase.go
index 3c4b7d913..c02facf43 100644
--- a/modules/modulebase.go
+++ b/modules/modulebase.go
@@ -27,6 +27,7 @@ type ModuleBase struct {
 	service base.IRPCXService
 	options IOptions
 	scomp   comm.ISC_GateRouteComp //网关服务组件
+	userlog *modelUserLog          //用户日志
 	//常用的一些通用模块 在底层注册好
 	ModuleSys       comm.ISys           //系统
 	ModuleUser      comm.IUser          //用户模块
@@ -63,6 +64,10 @@ func (this *ModuleBase) Init(service core.IService, module core.IModule, options
 	}
 	return
 }
+func (this *ModuleBase) OnInstallComp() {
+	this.ModuleBase.OnInstallComp()
+	this.userlog = this.RegisterComp(new(modelUserLog)).(*modelUserLog)
+}
 
 // 模块启动接口
 func (this *ModuleBase) Start() (err error) {
@@ -946,3 +951,8 @@ func (this *ModuleBase) AsynHandleSession(session comm.IUserSession, handle func
 	session.Push()
 	this.PutUserSession(session)
 }
+
+//写用户日志
+func (this *ModuleBase) WriteUserLog(uid string, tag string, data interface{}) {
+	this.userlog.AddUserLog(uid, tag, data)
+}
diff --git a/modules/parkour/api_Info.go b/modules/parkour/api_Info.go
index 15abb0d91..11bca3d71 100644
--- a/modules/parkour/api_Info.go
+++ b/modules/parkour/api_Info.go
@@ -44,7 +44,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ParkourInfoReq) (er
 		return
 	}
 	if info.Defmts == "" { //没有默认坐骑
-		if dragons, err = this.module.dragon.GetDragonList(session.GetUserId()); err != nil {
+		if dragons, err = this.module.dragon.QueryBigDragonList(session.GetUserId()); err != nil {
 			errdata = &pb.ErrorData{
 				Code:    pb.ErrorCode_DBError,
 				Title:   pb.ErrorCode_DBError.ToString(),
@@ -81,7 +81,6 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ParkourInfoReq) (er
 		update["property"] = info.Property
 		update["mount"] = info.Mount
 		update["mlv"] = info.Mlv
-
 	}
 
 	if !utils.IsSameWeek(info.Weektime) {
diff --git a/modules/parkour/api_racematch.go b/modules/parkour/api_racematch.go
index 1a89386d0..c6260f241 100644
--- a/modules/parkour/api_racematch.go
+++ b/modules/parkour/api_racematch.go
@@ -28,6 +28,16 @@ func (this *apiComp) RaceMatch(session comm.IUserSession, req *pb.ParkourRaceMat
 		}
 		return
 	}
+
+	if info.Defmts == "" { //没有默认坐骑
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_ReqParameterError,
+			Title:   pb.ErrorCode_ReqParameterError.ToString(),
+			Message: "no Defmts!",
+		}
+		return
+	}
+
 	info.State = pb.RaceTeamState_teaming
 	if req.Rtype == pb.RaceType_ordinary {
 		if err = this.module.matchTrain.MatchReq(&pb.DBMatchPlayer{
diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go
index 5eec73809..c49704574 100644
--- a/modules/viking/api_challengeover.go
+++ b/modules/viking/api_challengeover.go
@@ -237,7 +237,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
 	}
 
 	if req.Auto > 0 {
-		tasks = append(tasks, comm.GetBuriedParam(comm.Rtype75, req.BossId, req.Difficulty))
+		tasks = append(tasks, comm.GetBuriedParam(comm.Rtype75, 1, req.BossId, req.Difficulty))
 		tasks = append(tasks, comm.GetBuriedParam(comm.Rtype172, 1))
 		tasks = append(tasks, comm.GetBuriedParam(comm.Rtype181, 1, req.BossId, req.Difficulty))
 	}
diff --git a/pb/userexpand.pb.go b/pb/userexpand.pb.go
index c900fc42d..df88d3a3e 100644
--- a/pb/userexpand.pb.go
+++ b/pb/userexpand.pb.go
@@ -354,8 +354,12 @@ type DBUserLog struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id  string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`   //唯一ID
-	Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //玩家ID
+	Id       string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //唯一ID
+	Uid      string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"`
+	ExpireAt int64  `protobuf:"varint,3,opt,name=expireAt,proto3" json:"expireAt"`
+	Logtype  string `protobuf:"bytes,4,opt,name=logtype,proto3" json:"logtype"`
+	Tag      string `protobuf:"bytes,5,opt,name=tag,proto3" json:"tag"`
+	Data     string `protobuf:"bytes,6,opt,name=data,proto3" json:"data"`
 }
 
 func (x *DBUserLog) Reset() {
@@ -404,6 +408,34 @@ func (x *DBUserLog) GetUid() string {
 	return ""
 }
 
+func (x *DBUserLog) GetExpireAt() int64 {
+	if x != nil {
+		return x.ExpireAt
+	}
+	return 0
+}
+
+func (x *DBUserLog) GetLogtype() string {
+	if x != nil {
+		return x.Logtype
+	}
+	return ""
+}
+
+func (x *DBUserLog) GetTag() string {
+	if x != nil {
+		return x.Tag
+	}
+	return ""
+}
+
+func (x *DBUserLog) GetData() string {
+	if x != nil {
+		return x.Data
+	}
+	return ""
+}
+
 var File_userexpand_proto protoreflect.FileDescriptor
 
 var file_userexpand_proto_rawDesc = []byte{
@@ -508,11 +540,17 @@ var file_userexpand_proto_rawDesc = []byte{
 	0x66, 0x72, 0x61, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
 	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x2d, 0x0a, 0x09, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x4c,
-	0x6f, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
-	0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x75, 0x69, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x89, 0x01, 0x0a, 0x09, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72,
+	0x4c, 0x6f, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x41,
+	0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x41,
+	0x74, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x6f, 0x67, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x07, 0x6c, 0x6f, 0x67, 0x74, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74,
+	0x61, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x74, 0x61, 0x67, 0x12, 0x12, 0x0a,
+	0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74,
+	0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (