From f6931d0f6d5af8446638f4dba7e5b710b699583c Mon Sep 17 00:00:00 2001
From: zhaocy <sh_zcy@qq.com>
Date: Tue, 9 Aug 2022 17:58:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/LocalizeConfig_CN.json               |  170 ++-
 bin/json/LocalizeConfig_EN.json               |  198 ++-
 bin/json/LocalizeConfig_TW.json               |  154 ++-
 bin/json/game_coin.json                       |   12 +
 bin/json/game_com.json                        |   50 +-
 bin/json/game_comatn.json                     |   10 +
 bin/json/game_extservers.json                 |   28 +-
 bin/json/game_global.json                     |   50 +-
 bin/json/game_hero.json                       |  306 ++---
 bin/json/game_language.json                   |  202 ++-
 bin/json/game_mainlineeasy.json               |  928 +++++++++++--
 bin/json/game_opencond.json                   |    8 +-
 bin/json/game_skill.json                      |  499 +++++--
 bin/json/game_skillafteratk.json              | 1183 ++++++++++++-----
 bin/json/game_skillatk.json                   |  499 +++++--
 bin/json/game_skillbuff.json                  |  267 ++--
 bin/json/game_skillpassive.json               |   26 +-
 bin/json/game_ui.json                         |   38 +-
 .../structs/game.mainlineEasyData.go          |   30 +
 .../structs/game.skillAfteratkData.go         |    4 +-
 sys/configure/structs/game.skillAtkData.go    |    8 +-
 sys/configure/structs/game.skillData.go       |    8 +-
 22 files changed, 3445 insertions(+), 1233 deletions(-)

diff --git a/bin/json/LocalizeConfig_CN.json b/bin/json/LocalizeConfig_CN.json
index e49843d63..192de6430 100644
--- a/bin/json/LocalizeConfig_CN.json
+++ b/bin/json/LocalizeConfig_CN.json
@@ -3352,55 +3352,79 @@
     "text_cn": "基础效果抵抗"
   },
   {
-    "key": "hero_star_1",
+    "key": "star_2",
     "text_cn": "优秀"
   },
   {
-    "key": "hero_star_2",
+    "key": "star_3",
     "text_cn": "稀有"
   },
   {
-    "key": "hero_star_3",
+    "key": "star_4",
     "text_cn": "史诗"
   },
   {
-    "key": "hero_star_4",
+    "key": "star_5",
     "text_cn": "传说"
   },
   {
-    "key": "hero_color_1",
+    "key": "color_1",
     "text_cn": "优秀"
   },
   {
-    "key": "hero_color_2",
+    "key": "color_2",
     "text_cn": "稀有"
   },
   {
-    "key": "hero_color_3",
+    "key": "color_3",
     "text_cn": "史诗"
   },
   {
-    "key": "hero_color_4",
+    "key": "color_4",
     "text_cn": "传说"
   },
   {
-    "key": "hero_job_10017",
+    "key": "color_5",
+    "text_cn": "不朽"
+  },
+  {
+    "key": "color_6",
+    "text_cn": "超凡"
+  },
+  {
+    "key": "race_1",
+    "text_cn": "灼热"
+  },
+  {
+    "key": "race_2",
+    "text_cn": "涌动"
+  },
+  {
+    "key": "race_3",
+    "text_cn": "呼啸"
+  },
+  {
+    "key": "race_4",
+    "text_cn": "闪耀"
+  },
+  {
+    "key": "job_1",
     "text_cn": "输出"
   },
   {
-    "key": "hero_job_10018",
+    "key": "job_2",
     "text_cn": "防御"
   },
   {
-    "key": "hero_job_10019",
+    "key": "job_3",
     "text_cn": "辅助"
   },
   {
-    "key": "hero_job_10020",
+    "key": "job_4",
     "text_cn": "控制"
   },
   {
-    "key": "hero_job_10021",
+    "key": "job_5",
     "text_cn": "材料"
   },
   {
@@ -3536,8 +3560,20 @@
     "text_cn": "本地测试服"
   },
   {
-    "key": "server_10002",
-    "text_cn": "外网测试服"
+    "key": "server_10006",
+    "text_cn": "乌鸦岭"
+  },
+  {
+    "key": "server_10003",
+    "text_cn": "和平谷"
+  },
+  {
+    "key": "server_10004",
+    "text_cn": "凤凰城"
+  },
+  {
+    "key": "server_10005",
+    "text_cn": "翡翠宫"
   },
   {
     "key": "skillname_190011000",
@@ -3579,6 +3615,14 @@
     "key": "tips_1002",
     "text_cn": "暂未开放"
   },
+  {
+    "key": "tips_1003",
+    "text_cn": "当前星球容量超载，请更换星球开启冒险"
+  },
+  {
+    "key": "tips_1004",
+    "text_cn": "当前世界正在建设中，请稍后进入"
+  },
   {
     "key": "nonactivated",
     "text_cn": "未激活"
@@ -3587,26 +3631,6 @@
     "key": "activated",
     "text_cn": "已激活"
   },
-  {
-    "key": "opencond_name_10001",
-    "text_cn": "探险"
-  },
-  {
-    "key": "opencond_name_10002",
-    "text_cn": "英雄"
-  },
-  {
-    "key": "opencond_name_10003",
-    "text_cn": "商店"
-  },
-  {
-    "key": "opencond_name_10004",
-    "text_cn": "好友"
-  },
-  {
-    "key": "opencond_name_10005",
-    "text_cn": "任务"
-  },
   {
     "key": "opencond_prompt_10001",
     "text_cn": "通关2-26开启"
@@ -3621,7 +3645,7 @@
   },
   {
     "key": "num_1001",
-    "text_cn": "迷雾岛屿"
+    "text_cn": "美食馆"
   },
   {
     "key": "num_1002",
@@ -3633,7 +3657,7 @@
   },
   {
     "key": "num_1004",
-    "text_cn": "地下角斗场"
+    "text_cn": "黑暗料理大赛"
   },
   {
     "key": "num_1005",
@@ -3645,7 +3669,7 @@
   },
   {
     "key": "num_1007",
-    "text_cn": "维京远征"
+    "text_cn": "篝火舞会"
   },
   {
     "key": "num_1008",
@@ -3657,7 +3681,7 @@
   },
   {
     "key": "num_1010",
-    "text_cn": "黑暗料理大赛"
+    "text_cn": "地下角斗场"
   },
   {
     "key": "num_1011",
@@ -3665,11 +3689,11 @@
   },
   {
     "key": "num_1012",
-    "text_cn": "疯狂竞技赛"
+    "text_cn": "五侠擂台"
   },
   {
     "key": "num_1013",
-    "text_cn": "五侠擂台"
+    "text_cn": "疯狂竞技赛"
   },
   {
     "key": "num_1014",
@@ -3677,7 +3701,7 @@
   },
   {
     "key": "num_1015",
-    "text_cn": "篝火舞会"
+    "text_cn": "维京远征"
   },
   {
     "key": "num_1016",
@@ -3692,15 +3716,71 @@
     "text_cn": "戈伯铁匠铺"
   },
   {
-    "key": "num_1019",
+    "key": "opencond_name_10001",
     "text_cn": "背包"
   },
   {
-    "key": "num_1020",
+    "key": "opencond_name_10002",
+    "text_cn": "购物"
+  },
+  {
+    "key": "opencond_name_10003",
     "text_cn": "联盟"
   },
   {
-    "key": "num_1021",
+    "key": "opencond_name_10004",
     "text_cn": "邮件"
+  },
+  {
+    "key": "opencond_name_10005",
+    "text_cn": "好友"
+  },
+  {
+    "key": "opencond_name_10006",
+    "text_cn": "卡牌"
+  },
+  {
+    "key": "opencond_name_10007",
+    "text_cn": "寝室"
+  },
+  {
+    "key": "opencond_name_10008",
+    "text_cn": "商城"
+  },
+  {
+    "key": "opencond_name_10009",
+    "text_cn": "活动"
+  },
+  {
+    "key": "opencond_name_10010",
+    "text_cn": "任务"
+  },
+  {
+    "key": "hero_help_10001",
+    "text_cn": "养成说明"
+  },
+  {
+    "key": "hero_help_10002",
+    "text_cn": "英雄升级"
+  },
+  {
+    "key": "hero_help_10003",
+    "text_cn": "英雄可通过出战或吸收经验精灵提升等级"
+  },
+  {
+    "key": "hero_help_10004",
+    "text_cn": "英雄升星"
+  },
+  {
+    "key": "hero_help_10005",
+    "text_cn": "不同星级的英雄有不同的等级上限，3星为30级，4星为40级,5星为50级，6星为60级。\u003Cbr/\u003E英雄达到等级上限后，需要通过升星进一步提升等级。\u003Cbr/\u003E升星后英雄的属性将得到提升。\u003Cbr/\u003E升星精灵是英雄升星的优质素材"
+  },
+  {
+    "key": "hero_help_10006",
+    "text_cn": "技能升级"
+  },
+  {
+    "key": "hero_help_10007",
+    "text_cn": "使用稀有/史诗/传说品质的技能精灵可以提升对应品质英雄的技能等级，技能升级时将随机选择还可以继续升级的技能。\u003Cbr/\u003E如果英雄的所有技能等级满级，将不能再使用技能精灵提升等级"
   }
 ]
\ No newline at end of file
diff --git a/bin/json/LocalizeConfig_EN.json b/bin/json/LocalizeConfig_EN.json
index 61e782a1a..6991b586c 100644
--- a/bin/json/LocalizeConfig_EN.json
+++ b/bin/json/LocalizeConfig_EN.json
@@ -289,7 +289,7 @@
   },
   {
     "key": "hero_35001",
-    "text_en": "master"
+    "text_en": "Master Shifu"
   },
   {
     "key": "hero_35002",
@@ -357,11 +357,11 @@
   },
   {
     "key": "hero_44005",
-    "text_en": "Xiaoyi"
+    "text_en": "EEP"
   },
   {
     "key": "hero_44006",
-    "text_en": "Tiger Tiger"
+    "text_en": "Tigress"
   },
   {
     "key": "hero_45001",
@@ -3352,55 +3352,79 @@
     "text_en": "base effect resistance"
   },
   {
-    "key": "hero_star_1",
+    "key": "star_2",
     "text_en": "Excellent"
   },
   {
-    "key": "hero_star_2",
+    "key": "star_3",
     "text_en": "Rare"
   },
   {
-    "key": "hero_star_3",
+    "key": "star_4",
     "text_en": "Epic"
   },
   {
-    "key": "hero_star_4",
+    "key": "star_5",
     "text_en": "Legend"
   },
   {
-    "key": "hero_color_1",
+    "key": "color_1",
     "text_en": "Excellent"
   },
   {
-    "key": "hero_color_2",
+    "key": "color_2",
     "text_en": "Rare"
   },
   {
-    "key": "hero_color_3",
+    "key": "color_3",
     "text_en": "Epic"
   },
   {
-    "key": "hero_color_4",
+    "key": "color_4",
     "text_en": "Legend"
   },
   {
-    "key": "hero_job_10017",
+    "key": "color_5",
+    "text_en": "Eternity"
+  },
+  {
+    "key": "color_6",
+    "text_en": "Uncommon"
+  },
+  {
+    "key": "race_1",
+    "text_en": "Hot"
+  },
+  {
+    "key": "race_2",
+    "text_en": "Surge"
+  },
+  {
+    "key": "race_3",
+    "text_en": "Whistling"
+  },
+  {
+    "key": "race_4",
+    "text_en": "Shine"
+  },
+  {
+    "key": "job_1",
     "text_en": "Output"
   },
   {
-    "key": "hero_job_10018",
+    "key": "job_2",
     "text_en": "Defense"
   },
   {
-    "key": "hero_job_10019",
+    "key": "job_3",
     "text_en": "Auxiliary"
   },
   {
-    "key": "hero_job_10020",
+    "key": "job_4",
     "text_en": "Control"
   },
   {
-    "key": "hero_job_10021",
+    "key": "job_5",
     "text_en": "Material"
   },
   {
@@ -3536,8 +3560,20 @@
     "text_en": "Local test server"
   },
   {
-    "key": "server_10002",
-    "text_en": "Extranet test server"
+    "key": "server_10006",
+    "text_en": "Raven Point"
+  },
+  {
+    "key": "server_10003",
+    "text_en": "The Valley of Peace"
+  },
+  {
+    "key": "server_10004",
+    "text_en": "Gongmen"
+  },
+  {
+    "key": "server_10005",
+    "text_en": "Jade Palace"
   },
   {
     "key": "skillname_190011000",
@@ -3577,7 +3613,15 @@
   },
   {
     "key": "tips_1002",
-    "text_en": "Not yet open"
+    "text_en": "Not open yet"
+  },
+  {
+    "key": "tips_1003",
+    "text_en": "The current planet capacity is overloaded, please change the planet and start the adventure"
+  },
+  {
+    "key": "tips_1004",
+    "text_en": "At present, the world is under construction. Please enter later"
   },
   {
     "key": "nonactivated",
@@ -3587,26 +3631,6 @@
     "key": "activated",
     "text_en": "Activated"
   },
-  {
-    "key": "opencond_name_10001",
-    "text_en": ""
-  },
-  {
-    "key": "opencond_name_10002",
-    "text_en": "CARD"
-  },
-  {
-    "key": "opencond_name_10003",
-    "text_en": "SHOPS"
-  },
-  {
-    "key": "opencond_name_10004",
-    "text_en": "FRIENDS"
-  },
-  {
-    "key": "opencond_name_10005",
-    "text_en": ""
-  },
   {
     "key": "opencond_prompt_10001",
     "text_en": ""
@@ -3621,11 +3645,11 @@
   },
   {
     "key": "num_1001",
-    "text_en": "Misty Island"
+    "text_en": "GOURMET RESTAURANT"
   },
   {
     "key": "num_1002",
-    "text_en": "MOON"
+    "text_en": "SUMMON"
   },
   {
     "key": "num_1003",
@@ -3633,19 +3657,19 @@
   },
   {
     "key": "num_1004",
-    "text_en": "Underground Arena"
+    "text_en": "Dark Cuisine"
   },
   {
     "key": "num_1005",
-    "text_en": "Caravan"
+    "text_en": "CARAVAN"
   },
   {
     "key": "num_1006",
-    "text_en": "Library"
+    "text_en": "LIBRARY"
   },
   {
     "key": "num_1007",
-    "text_en": "EXPEDITION"
+    "text_en": "BONEFIRE DANCE"
   },
   {
     "key": "num_1008",
@@ -3653,11 +3677,11 @@
   },
   {
     "key": "num_1009",
-    "text_en": "BATTLE！"
+    "text_en": "Catch It！"
   },
   {
     "key": "num_1010",
-    "text_en": "DARK CUISINE"
+    "text_en": "ARENA"
   },
   {
     "key": "num_1011",
@@ -3665,42 +3689,98 @@
   },
   {
     "key": "num_1012",
-    "text_en": "CRAZED"
-  },
-  {
-    "key": "num_1013",
     "text_en": "TRAIN"
   },
+  {
+    "key": "num_1013",
+    "text_en": "CRAZY"
+  },
   {
     "key": "num_1014",
-    "text_en": "TRIALS"
+    "text_en": "ADVENTURE"
   },
   {
     "key": "num_1015",
-    "text_en": "Bonfire Dance"
+    "text_en": "EXPEDITION"
   },
   {
     "key": "num_1016",
-    "text_en": "MIRROR"
+    "text_en": "FESTIVAL"
   },
   {
     "key": "num_1017",
-    "text_en": "Gourmet restaurant"
+    "text_en": "GOURMET RESTAURANT"
   },
   {
     "key": "num_1018",
-    "text_en": "Gober blacksmith shop"
+    "text_en": "GOBER BACKSMITH SHOP"
   },
   {
-    "key": "num_1019",
+    "key": "opencond_name_10001",
     "text_en": "INVENTORY"
   },
   {
-    "key": "num_1020",
+    "key": "opencond_name_10002",
+    "text_en": "SHOP"
+  },
+  {
+    "key": "opencond_name_10003",
     "text_en": "UNION"
   },
   {
-    "key": "num_1021",
+    "key": "opencond_name_10004",
     "text_en": "MAIL"
+  },
+  {
+    "key": "opencond_name_10005",
+    "text_en": "SOCIAL"
+  },
+  {
+    "key": "opencond_name_10006",
+    "text_en": "CARDS"
+  },
+  {
+    "key": "opencond_name_10007",
+    "text_en": "DORM"
+  },
+  {
+    "key": "opencond_name_10008",
+    "text_en": "CHARGE"
+  },
+  {
+    "key": "opencond_name_10009",
+    "text_en": "EVENT"
+  },
+  {
+    "key": "opencond_name_10010",
+    "text_en": "MISSIONS"
+  },
+  {
+    "key": "hero_help_10001",
+    "text_en": "养成说明"
+  },
+  {
+    "key": "hero_help_10002",
+    "text_en": "英雄升级"
+  },
+  {
+    "key": "hero_help_10003",
+    "text_en": "英雄可通过出战或吸收经验精灵提升等级"
+  },
+  {
+    "key": "hero_help_10004",
+    "text_en": "英雄升星"
+  },
+  {
+    "key": "hero_help_10005",
+    "text_en": "不同星级的英雄有不同的等级上限，3星为30级，4星为40级,5星为50级，6星为60级。\u003Cbr/\u003E英雄达到等级上限后，需要通过升星进一步提升等级。\u003Cbr/\u003E升星后英雄的属性将得到提升。\u003Cbr/\u003E升星精灵是英雄升星的优质素材"
+  },
+  {
+    "key": "hero_help_10006",
+    "text_en": "技能升级"
+  },
+  {
+    "key": "hero_help_10007",
+    "text_en": "使用稀有/史诗/传说品质的技能精灵可以提升对应品质英雄的技能等级，技能升级时将随机选择还可以继续升级的技能。\u003Cbr/\u003E如果英雄的所有技能等级满级，将不能再使用技能精灵提升等级"
   }
 ]
\ No newline at end of file
diff --git a/bin/json/LocalizeConfig_TW.json b/bin/json/LocalizeConfig_TW.json
index ec1cc11a1..33830fd7a 100644
--- a/bin/json/LocalizeConfig_TW.json
+++ b/bin/json/LocalizeConfig_TW.json
@@ -3352,55 +3352,79 @@
     "text_tw": ""
   },
   {
-    "key": "hero_star_1",
+    "key": "star_2",
     "text_tw": ""
   },
   {
-    "key": "hero_star_2",
+    "key": "star_3",
     "text_tw": ""
   },
   {
-    "key": "hero_star_3",
+    "key": "star_4",
     "text_tw": ""
   },
   {
-    "key": "hero_star_4",
+    "key": "star_5",
     "text_tw": ""
   },
   {
-    "key": "hero_color_1",
+    "key": "color_1",
     "text_tw": ""
   },
   {
-    "key": "hero_color_2",
+    "key": "color_2",
     "text_tw": ""
   },
   {
-    "key": "hero_color_3",
+    "key": "color_3",
     "text_tw": ""
   },
   {
-    "key": "hero_color_4",
+    "key": "color_4",
     "text_tw": ""
   },
   {
-    "key": "hero_job_10017",
+    "key": "color_5",
     "text_tw": ""
   },
   {
-    "key": "hero_job_10018",
+    "key": "color_6",
     "text_tw": ""
   },
   {
-    "key": "hero_job_10019",
+    "key": "race_1",
     "text_tw": ""
   },
   {
-    "key": "hero_job_10020",
+    "key": "race_2",
     "text_tw": ""
   },
   {
-    "key": "hero_job_10021",
+    "key": "race_3",
+    "text_tw": ""
+  },
+  {
+    "key": "race_4",
+    "text_tw": ""
+  },
+  {
+    "key": "job_1",
+    "text_tw": ""
+  },
+  {
+    "key": "job_2",
+    "text_tw": ""
+  },
+  {
+    "key": "job_3",
+    "text_tw": ""
+  },
+  {
+    "key": "job_4",
+    "text_tw": ""
+  },
+  {
+    "key": "job_5",
     "text_tw": ""
   },
   {
@@ -3536,7 +3560,19 @@
     "text_tw": ""
   },
   {
-    "key": "server_10002",
+    "key": "server_10006",
+    "text_tw": ""
+  },
+  {
+    "key": "server_10003",
+    "text_tw": ""
+  },
+  {
+    "key": "server_10004",
+    "text_tw": ""
+  },
+  {
+    "key": "server_10005",
     "text_tw": ""
   },
   {
@@ -3579,6 +3615,14 @@
     "key": "tips_1002",
     "text_tw": ""
   },
+  {
+    "key": "tips_1003",
+    "text_tw": ""
+  },
+  {
+    "key": "tips_1004",
+    "text_tw": ""
+  },
   {
     "key": "nonactivated",
     "text_tw": ""
@@ -3587,26 +3631,6 @@
     "key": "activated",
     "text_tw": ""
   },
-  {
-    "key": "opencond_name_10001",
-    "text_tw": ""
-  },
-  {
-    "key": "opencond_name_10002",
-    "text_tw": ""
-  },
-  {
-    "key": "opencond_name_10003",
-    "text_tw": ""
-  },
-  {
-    "key": "opencond_name_10004",
-    "text_tw": ""
-  },
-  {
-    "key": "opencond_name_10005",
-    "text_tw": ""
-  },
   {
     "key": "opencond_prompt_10001",
     "text_tw": ""
@@ -3692,15 +3716,71 @@
     "text_tw": ""
   },
   {
-    "key": "num_1019",
+    "key": "opencond_name_10001",
     "text_tw": ""
   },
   {
-    "key": "num_1020",
+    "key": "opencond_name_10002",
     "text_tw": ""
   },
   {
-    "key": "num_1021",
+    "key": "opencond_name_10003",
+    "text_tw": ""
+  },
+  {
+    "key": "opencond_name_10004",
+    "text_tw": ""
+  },
+  {
+    "key": "opencond_name_10005",
+    "text_tw": ""
+  },
+  {
+    "key": "opencond_name_10006",
+    "text_tw": ""
+  },
+  {
+    "key": "opencond_name_10007",
+    "text_tw": ""
+  },
+  {
+    "key": "opencond_name_10008",
+    "text_tw": ""
+  },
+  {
+    "key": "opencond_name_10009",
+    "text_tw": ""
+  },
+  {
+    "key": "opencond_name_10010",
+    "text_tw": ""
+  },
+  {
+    "key": "hero_help_10001",
+    "text_tw": ""
+  },
+  {
+    "key": "hero_help_10002",
+    "text_tw": ""
+  },
+  {
+    "key": "hero_help_10003",
+    "text_tw": ""
+  },
+  {
+    "key": "hero_help_10004",
+    "text_tw": ""
+  },
+  {
+    "key": "hero_help_10005",
+    "text_tw": ""
+  },
+  {
+    "key": "hero_help_10006",
+    "text_tw": ""
+  },
+  {
+    "key": "hero_help_10007",
     "text_tw": ""
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_coin.json b/bin/json/game_coin.json
index 62735ce9c..e70916295 100644
--- a/bin/json/game_coin.json
+++ b/bin/json/game_coin.json
@@ -34,5 +34,17 @@
     "img": "wp_icon_0002",
     "ico": "wp_icon_0002",
     "intr": "主角经验"
+  },
+  {
+    "key": "friend",
+    "name": "友情点",
+    "color": 1,
+    "effects": "",
+    "access": 0,
+    "star": 2,
+    "race": 0,
+    "img": "",
+    "ico": "",
+    "intr": "友情点用于友情商店"
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_com.json b/bin/json/game_com.json
index d41a7f90e..24ad6a0d8 100644
--- a/bin/json/game_com.json
+++ b/bin/json/game_com.json
@@ -1,29 +1,14 @@
 [
-  {
-    "index": "max_hy",
-    "var": "30",
-    "intr": "最大好友数"
-  },
   {
     "index": "max_getreward",
     "var": "10002,99",
     "intr": "领取/赠送奖励"
   },
-  {
-    "index": "max_get",
-    "var": "30",
-    "intr": "每日领取/赠送次数"
-  },
   {
     "index": "max_char",
     "var": "100",
     "intr": "聊天最大输入字符数量"
   },
-  {
-    "index": "max_hmd",
-    "var": "30",
-    "intr": "最大黑名单数"
-  },
   {
     "index": "task_reset",
     "var": "8",
@@ -58,5 +43,40 @@
     "index": "equipsuitsum",
     "var": "4,4,4,4,2,2",
     "intr": "装备位置对应数量"
+  },
+  {
+    "index": "friend_maxnum",
+    "var": "50",
+    "intr": "最大好友数量"
+  },
+  {
+    "index": "friend_minnum",
+    "var": "0",
+    "intr": "最少好友数量"
+  },
+  {
+    "index": "friend_maxgetnum",
+    "var": "20",
+    "intr": "每日最大获赠的友情点数量"
+  },
+  {
+    "index": "friend_maxsendnum",
+    "var": "50",
+    "intr": "每日最大可送出的友情点数量"
+  },
+  {
+    "index": "friend_date",
+    "var": "7",
+    "intr": "申请记录保留时间/天"
+  },
+  {
+    "index": "friend_recordtime",
+    "var": "7",
+    "intr": "助战记录保留时间/天"
+  },
+  {
+    "index": "friend_black",
+    "var": "50",
+    "intr": "最大黑名单数"
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_comatn.json b/bin/json/game_comatn.json
index df55e2fdc..c53631a71 100644
--- a/bin/json/game_comatn.json
+++ b/bin/json/game_comatn.json
@@ -18,5 +18,15 @@
         "n": 20
       }
     ]
+  },
+  {
+    "index": "friend_peize",
+    "var": [
+      {
+        "a": "attr",
+        "t": "friend",
+        "n": 100
+      }
+    ]
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_extservers.json b/bin/json/game_extservers.json
index f628045f5..8ea900167 100644
--- a/bin/json/game_extservers.json
+++ b/bin/json/game_extservers.json
@@ -9,8 +9,8 @@
   },
   {
     "name": {
-      "key": "server_10002",
-      "text": "外网测试服"
+      "key": "server_10003",
+      "text": "和平谷"
     },
     "ips": "119.3.89.14:7891",
     "debug": false
@@ -30,5 +30,29 @@
     },
     "ips": "10.0.0.85:7891",
     "debug": true
+  },
+  {
+    "name": {
+      "key": "server_10004",
+      "text": "凤凰城"
+    },
+    "ips": "119.3.89.14:7891",
+    "debug": false
+  },
+  {
+    "name": {
+      "key": "server_10005",
+      "text": "翡翠宫"
+    },
+    "ips": "119.3.89.14:7891",
+    "debug": false
+  },
+  {
+    "name": {
+      "key": "server_10006",
+      "text": "乌鸦岭"
+    },
+    "ips": "119.3.89.14:7891",
+    "debug": false
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index d41a7f90e..24ad6a0d8 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -1,29 +1,14 @@
 [
-  {
-    "index": "max_hy",
-    "var": "30",
-    "intr": "最大好友数"
-  },
   {
     "index": "max_getreward",
     "var": "10002,99",
     "intr": "领取/赠送奖励"
   },
-  {
-    "index": "max_get",
-    "var": "30",
-    "intr": "每日领取/赠送次数"
-  },
   {
     "index": "max_char",
     "var": "100",
     "intr": "聊天最大输入字符数量"
   },
-  {
-    "index": "max_hmd",
-    "var": "30",
-    "intr": "最大黑名单数"
-  },
   {
     "index": "task_reset",
     "var": "8",
@@ -58,5 +43,40 @@
     "index": "equipsuitsum",
     "var": "4,4,4,4,2,2",
     "intr": "装备位置对应数量"
+  },
+  {
+    "index": "friend_maxnum",
+    "var": "50",
+    "intr": "最大好友数量"
+  },
+  {
+    "index": "friend_minnum",
+    "var": "0",
+    "intr": "最少好友数量"
+  },
+  {
+    "index": "friend_maxgetnum",
+    "var": "20",
+    "intr": "每日最大获赠的友情点数量"
+  },
+  {
+    "index": "friend_maxsendnum",
+    "var": "50",
+    "intr": "每日最大可送出的友情点数量"
+  },
+  {
+    "index": "friend_date",
+    "var": "7",
+    "intr": "申请记录保留时间/天"
+  },
+  {
+    "index": "friend_recordtime",
+    "var": "7",
+    "intr": "助战记录保留时间/天"
+  },
+  {
+    "index": "friend_black",
+    "var": "50",
+    "intr": "最大黑名单数"
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json
index 57492b70e..b7e42125b 100644
--- a/bin/json/game_hero.json
+++ b/bin/json/game_hero.json
@@ -12,7 +12,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 13001,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 13001,
     "vocal": "13001",
     "tujing": [
@@ -54,7 +54,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 13002,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 13002,
     "vocal": "13002",
     "tujing": [
@@ -96,7 +96,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 13003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 13003,
     "vocal": "13003",
     "tujing": [
@@ -138,7 +138,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 13004,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 13004,
     "vocal": "13004",
     "tujing": [
@@ -180,7 +180,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 13005,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 13005,
     "vocal": "13005",
     "tujing": [
@@ -222,7 +222,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 14001,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 14001,
     "vocal": "14001",
     "tujing": [
@@ -264,7 +264,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 14002,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 14002,
     "vocal": "14002",
     "tujing": [
@@ -306,7 +306,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 14003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 14003,
     "vocal": "14003",
     "tujing": [
@@ -348,7 +348,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 14004,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 14004,
     "vocal": "14004",
     "tujing": [
@@ -390,7 +390,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 14005,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 14005,
     "vocal": "14005",
     "tujing": [
@@ -432,7 +432,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 14006,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 14006,
     "vocal": "14006",
     "tujing": [
@@ -474,7 +474,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 14007,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 14007,
     "vocal": "14007",
     "tujing": [
@@ -516,7 +516,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 15001,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 15001,
     "vocal": "15001",
     "tujing": [
@@ -558,7 +558,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 15002,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 15002,
     "vocal": "15002",
     "tujing": [
@@ -600,7 +600,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 15003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 15003,
     "vocal": "15003",
     "tujing": [
@@ -642,7 +642,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 15004,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 15004,
     "vocal": "15004",
     "tujing": [
@@ -684,7 +684,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 23001,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 23001,
     "vocal": "23001",
     "tujing": [
@@ -726,7 +726,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 23002,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 23002,
     "vocal": "23002",
     "tujing": [
@@ -768,7 +768,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 23003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 23003,
     "vocal": "23003",
     "tujing": [
@@ -810,7 +810,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 23004,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 23004,
     "vocal": "23004",
     "tujing": [
@@ -852,7 +852,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 24001,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 24001,
     "vocal": "24001",
     "tujing": [
@@ -894,7 +894,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 24002,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 24002,
     "vocal": "24002",
     "tujing": [
@@ -936,7 +936,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 24003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 24003,
     "vocal": "24003",
     "tujing": [
@@ -978,7 +978,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 24004,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 24004,
     "vocal": "24004",
     "tujing": [
@@ -1020,7 +1020,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 24005,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 24005,
     "vocal": "24005",
     "tujing": [
@@ -1062,7 +1062,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 24006,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 24006,
     "vocal": "24006",
     "tujing": [
@@ -1104,7 +1104,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 24007,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 24007,
     "vocal": "24007",
     "tujing": [
@@ -1146,7 +1146,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 24008,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 24008,
     "vocal": "24008",
     "tujing": [
@@ -1188,7 +1188,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 24009,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 24009,
     "vocal": "24009",
     "tujing": [
@@ -1230,7 +1230,7 @@
     "type": 1,
     "handbook": 1,
     "prefab": 25001,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 25001,
     "vocal": "25001",
     "tujing": [
@@ -1272,7 +1272,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 25002,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 25002,
     "vocal": "25002",
     "tujing": [
@@ -1314,7 +1314,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 25003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 25003,
     "vocal": "25003",
     "tujing": [
@@ -1356,7 +1356,7 @@
     "type": 1,
     "handbook": 1,
     "prefab": 25004,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 25004,
     "vocal": "25004",
     "tujing": [
@@ -1398,7 +1398,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 33001,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 33001,
     "vocal": "33001",
     "tujing": [
@@ -1440,7 +1440,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 33002,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 33002,
     "vocal": "33002",
     "tujing": [
@@ -1482,7 +1482,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 33003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 33003,
     "vocal": "33003",
     "tujing": [
@@ -1524,7 +1524,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 33004,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 33004,
     "vocal": "33004",
     "tujing": [
@@ -1566,7 +1566,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 33005,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 33005,
     "vocal": "33005",
     "tujing": [
@@ -1608,7 +1608,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 33006,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 33006,
     "vocal": "33006",
     "tujing": [
@@ -1650,7 +1650,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 34001,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 34001,
     "vocal": "34001",
     "tujing": [
@@ -1692,7 +1692,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 34002,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 34002,
     "vocal": "34002",
     "tujing": [
@@ -1734,7 +1734,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 34003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 34003,
     "vocal": "34003",
     "tujing": [
@@ -1776,7 +1776,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 34004,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 34004,
     "vocal": "34004",
     "tujing": [
@@ -1818,7 +1818,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 34005,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 34005,
     "vocal": "34005",
     "tujing": [
@@ -1860,7 +1860,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 34006,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 34006,
     "vocal": "34006",
     "tujing": [
@@ -1902,7 +1902,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 34007,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 34007,
     "vocal": "34007",
     "tujing": [
@@ -1944,7 +1944,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 34008,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 34008,
     "vocal": "34008",
     "tujing": [
@@ -1986,7 +1986,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 35002,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 35002,
     "vocal": "35002",
     "tujing": [
@@ -2028,7 +2028,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 35003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 35003,
     "vocal": "35003",
     "tujing": [
@@ -2070,7 +2070,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 35004,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 35004,
     "vocal": "35004",
     "tujing": [
@@ -2112,7 +2112,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 35005,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 35005,
     "vocal": "35005",
     "tujing": [
@@ -2154,7 +2154,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 35006,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 35006,
     "vocal": "35006",
     "tujing": [
@@ -2196,7 +2196,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 43001,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 43001,
     "vocal": "43001",
     "tujing": [
@@ -2238,7 +2238,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 43002,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 43002,
     "vocal": "43002",
     "tujing": [
@@ -2280,7 +2280,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 43003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 43003,
     "vocal": "43003",
     "tujing": [
@@ -2322,7 +2322,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 43004,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 43004,
     "vocal": "43004",
     "tujing": [
@@ -2364,7 +2364,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 43005,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 43005,
     "vocal": "43005",
     "tujing": [
@@ -2406,7 +2406,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 43006,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 43006,
     "vocal": "43006",
     "tujing": [
@@ -2448,7 +2448,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 43007,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 43007,
     "vocal": "43007",
     "tujing": [
@@ -2490,7 +2490,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 44001,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 44001,
     "vocal": "44001",
     "tujing": [
@@ -2532,7 +2532,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 44002,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 44002,
     "vocal": "44002",
     "tujing": [
@@ -2574,7 +2574,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 44003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 44003,
     "vocal": "44003",
     "tujing": [
@@ -2616,7 +2616,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 44004,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 44004,
     "vocal": "44004",
     "tujing": [
@@ -2658,7 +2658,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 44006,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 44006,
     "vocal": "44006",
     "tujing": [
@@ -2700,7 +2700,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 45001,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 45001,
     "vocal": "45001",
     "tujing": [
@@ -2742,7 +2742,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 45002,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 45002,
     "vocal": "45002",
     "tujing": [
@@ -2784,7 +2784,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 45003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 45003,
     "vocal": "45003",
     "tujing": [
@@ -2826,7 +2826,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 45004,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 45004,
     "vocal": "45004",
     "tujing": [
@@ -2868,7 +2868,7 @@
     "type": 2,
     "handbook": -1,
     "prefab": 43901,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 43901,
     "vocal": "43901",
     "tujing": [
@@ -2910,7 +2910,7 @@
     "type": 3,
     "handbook": -1,
     "prefab": 42911,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 42911,
     "vocal": "42911",
     "tujing": [
@@ -2952,7 +2952,7 @@
     "type": 3,
     "handbook": -1,
     "prefab": 43911,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 43911,
     "vocal": "43911",
     "tujing": [
@@ -2994,7 +2994,7 @@
     "type": 3,
     "handbook": -1,
     "prefab": 44911,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 44911,
     "vocal": "44911",
     "tujing": [
@@ -3036,7 +3036,7 @@
     "type": 4,
     "handbook": -1,
     "prefab": 43921,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 43921,
     "vocal": "43921",
     "tujing": [
@@ -3078,7 +3078,7 @@
     "type": 4,
     "handbook": -1,
     "prefab": 44921,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 44921,
     "vocal": "44921",
     "tujing": [
@@ -3120,7 +3120,7 @@
     "type": 4,
     "handbook": -1,
     "prefab": 45921,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 45921,
     "vocal": "45921",
     "tujing": [
@@ -3162,7 +3162,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 51001,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 51001,
     "vocal": "51001",
     "tujing": [
@@ -3204,7 +3204,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 51002,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 51002,
     "vocal": "51002",
     "tujing": [
@@ -3246,7 +3246,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 51003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 51003,
     "vocal": "51003",
     "tujing": [
@@ -3288,7 +3288,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 51004,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 51004,
     "vocal": "51004",
     "tujing": [
@@ -3330,7 +3330,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 51005,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 51005,
     "vocal": "51005",
     "tujing": [
@@ -3372,7 +3372,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 51006,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 51006,
     "vocal": "51006",
     "tujing": [
@@ -3414,7 +3414,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 51007,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 51007,
     "vocal": "51007",
     "tujing": [
@@ -3456,7 +3456,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 51008,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 51008,
     "vocal": "51008",
     "tujing": [
@@ -3498,7 +3498,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 51009,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 51009,
     "vocal": "51009",
     "tujing": [
@@ -3540,7 +3540,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 51010,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 51010,
     "vocal": "51010",
     "tujing": [
@@ -3582,7 +3582,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 51011,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 51011,
     "vocal": "51011",
     "tujing": [
@@ -3624,7 +3624,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 51012,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 51012,
     "vocal": "51012",
     "tujing": [
@@ -3666,7 +3666,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 51013,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 51013,
     "vocal": "51013",
     "tujing": [
@@ -3708,7 +3708,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 51014,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 51014,
     "vocal": "51014",
     "tujing": [
@@ -3750,7 +3750,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 53001,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 53001,
     "vocal": "53001",
     "tujing": [
@@ -3792,7 +3792,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 53002,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 53002,
     "vocal": "53002",
     "tujing": [
@@ -3834,7 +3834,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 53003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 53003,
     "vocal": "53003",
     "tujing": [
@@ -3876,7 +3876,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 53004,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 53004,
     "vocal": "53004",
     "tujing": [
@@ -3918,7 +3918,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 53005,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 53005,
     "vocal": "53005",
     "tujing": [
@@ -3960,7 +3960,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 53006,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 53006,
     "vocal": "53006",
     "tujing": [
@@ -4002,7 +4002,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 55001,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 55001,
     "vocal": "55001",
     "tujing": [
@@ -4044,7 +4044,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 55002,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 55002,
     "vocal": "55002",
     "tujing": [
@@ -4086,7 +4086,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 55003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 55003,
     "vocal": "55003",
     "tujing": [
@@ -4128,7 +4128,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 55004,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 55004,
     "vocal": "55004",
     "tujing": [
@@ -4170,7 +4170,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 55005,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 55005,
     "vocal": "55005",
     "tujing": [
@@ -4212,7 +4212,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 55006,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 55006,
     "vocal": "55006",
     "tujing": [
@@ -4254,7 +4254,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 55007,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 55007,
     "vocal": "55007",
     "tujing": [
@@ -4296,7 +4296,7 @@
     "type": 5,
     "handbook": -1,
     "prefab": 55008,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 55008,
     "vocal": "55008",
     "tujing": [
@@ -4328,7 +4328,7 @@
   {
     "hid": "11001",
     "name": {
-      "key": "11001",
+      "key": "hero_25001",
       "text": "阿宝"
     },
     "star": 4,
@@ -4338,7 +4338,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 25001,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 11001,
     "vocal": "121323",
     "tujing": [
@@ -4370,7 +4370,7 @@
   {
     "hid": "11002",
     "name": {
-      "key": "11002",
+      "key": "hero_34004",
       "text": "瓜哥"
     },
     "star": 5,
@@ -4380,7 +4380,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 34004,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 11002,
     "vocal": "11002",
     "tujing": [
@@ -4412,7 +4412,7 @@
   {
     "hid": "11003",
     "name": {
-      "key": "11003",
+      "key": "hero_25004",
       "text": "波比"
     },
     "star": 5,
@@ -4422,7 +4422,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 25004,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 11003,
     "vocal": "11003",
     "tujing": [
@@ -4456,7 +4456,7 @@
   {
     "hid": "11004",
     "name": {
-      "key": "11004",
+      "key": "hero_14006",
       "text": "布兰奇"
     },
     "star": 5,
@@ -4466,7 +4466,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 14006,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 11004,
     "vocal": "11004",
     "tujing": [
@@ -4498,7 +4498,7 @@
   {
     "hid": "11005",
     "name": {
-      "key": "11005",
+      "key": "hero_25003",
       "text": "无牙仔"
     },
     "star": 4,
@@ -4508,7 +4508,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 25003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 11005,
     "vocal": "121323",
     "tujing": [
@@ -4540,7 +4540,7 @@
   {
     "hid": "11006",
     "name": {
-      "key": "11006",
+      "key": "hero_14003",
       "text": "亚丝翠"
     },
     "star": 5,
@@ -4550,7 +4550,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 14003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 11006,
     "vocal": "11006",
     "tujing": [
@@ -4582,7 +4582,7 @@
   {
     "hid": "11009",
     "name": {
-      "key": "11009",
+      "key": "hero_35002",
       "text": "希卡普"
     },
     "star": 4,
@@ -4592,7 +4592,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 35002,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 11009,
     "vocal": "11009",
     "tujing": [
@@ -4624,7 +4624,7 @@
   {
     "hid": "22002",
     "name": {
-      "key": "22002",
+      "key": "hero_34001",
       "text": "贫嘴驴"
     },
     "star": 5,
@@ -4634,7 +4634,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 34001,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 22002,
     "vocal": "22002",
     "tujing": [
@@ -4666,7 +4666,7 @@
   {
     "hid": "90001",
     "name": {
-      "key": "90001",
+      "key": "hero_25001",
       "text": "阿宝"
     },
     "star": 4,
@@ -4676,7 +4676,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 25001,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 90001,
     "vocal": "90001",
     "tujing": [
@@ -4708,7 +4708,7 @@
   {
     "hid": "11011",
     "name": {
-      "key": "11011",
+      "key": "hero_35001",
       "text": "师父"
     },
     "star": 4,
@@ -4718,7 +4718,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 35001,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 11011,
     "vocal": "11011",
     "tujing": [
@@ -4750,7 +4750,7 @@
   {
     "hid": "11008",
     "name": {
-      "key": "11008",
+      "key": "hero_44006",
       "text": "悍娇虎"
     },
     "star": 5,
@@ -4760,7 +4760,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 44006,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 11008,
     "vocal": "11008",
     "tujing": [
@@ -4792,7 +4792,7 @@
   {
     "hid": "11017",
     "name": {
-      "key": "11017",
+      "key": "hero_34006",
       "text": "冰霜杰克"
     },
     "star": 5,
@@ -4802,7 +4802,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 34006,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 11017,
     "vocal": "11017",
     "tujing": [
@@ -4836,7 +4836,7 @@
   {
     "hid": "11018",
     "name": {
-      "key": "11018",
+      "key": "hero_24003",
       "text": "睡神沙人"
     },
     "star": 5,
@@ -4846,7 +4846,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 24003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 11018,
     "vocal": "11018",
     "tujing": [
@@ -4881,7 +4881,7 @@
   {
     "hid": "11019",
     "name": {
-      "key": "11019",
+      "key": "hero_24003",
       "text": "睡神沙人"
     },
     "star": 5,
@@ -4891,7 +4891,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 24003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 11019,
     "vocal": "11019",
     "tujing": [
@@ -4923,7 +4923,7 @@
   {
     "hid": "11020",
     "name": {
-      "key": "11020",
+      "key": "hero_24003",
       "text": "睡神沙人"
     },
     "star": 5,
@@ -4933,7 +4933,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 24003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 11020,
     "vocal": "11020",
     "tujing": [
@@ -4965,7 +4965,7 @@
   {
     "hid": "11021",
     "name": {
-      "key": "11021",
+      "key": "hero_55007",
       "text": "莫甘娜巨怪"
     },
     "star": 5,
@@ -4975,7 +4975,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 55007,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 11021,
     "vocal": "11021",
     "tujing": [
@@ -5007,7 +5007,7 @@
   {
     "hid": "11099",
     "name": {
-      "key": "11099",
+      "key": "hero_24003",
       "text": "睡神沙人"
     },
     "star": 5,
@@ -5017,7 +5017,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 24003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 11099,
     "vocal": "11099",
     "tujing": [
@@ -5049,7 +5049,7 @@
   {
     "hid": "12001",
     "name": {
-      "key": "12001",
+      "key": "hero_24003",
       "text": "睡神沙人"
     },
     "star": 5,
@@ -5059,7 +5059,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 24003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 12001,
     "vocal": "121323",
     "tujing": [
@@ -5091,7 +5091,7 @@
   {
     "hid": "12003",
     "name": {
-      "key": "12003",
+      "key": "hero_24003",
       "text": "睡神沙人"
     },
     "star": 5,
@@ -5101,7 +5101,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 24003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 12003,
     "vocal": "12003",
     "tujing": [
@@ -5135,7 +5135,7 @@
   {
     "hid": "12009",
     "name": {
-      "key": "12009",
+      "key": "hero_24003",
       "text": "睡神沙人"
     },
     "star": 5,
@@ -5145,7 +5145,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 24003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 11009,
     "vocal": "11009",
     "tujing": [
@@ -5177,7 +5177,7 @@
   {
     "hid": "12017",
     "name": {
-      "key": "12017",
+      "key": "hero_24003",
       "text": "睡神沙人"
     },
     "star": 5,
@@ -5187,7 +5187,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 24003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 12017,
     "vocal": "12017",
     "tujing": [
@@ -5221,7 +5221,7 @@
   {
     "hid": "12018",
     "name": {
-      "key": "12018",
+      "key": "hero_24003",
       "text": "睡神沙人"
     },
     "star": 5,
@@ -5231,7 +5231,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 24003,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 12018,
     "vocal": "12018",
     "tujing": [
@@ -5263,7 +5263,7 @@
   {
     "hid": "44005",
     "name": {
-      "key": "44005",
+      "key": "hero_44005",
       "text": "小伊"
     },
     "star": 4,
@@ -5273,7 +5273,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 44005,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 44005,
     "vocal": "44005",
     "tujing": [
@@ -5305,7 +5305,7 @@
   {
     "hid": "15005",
     "name": {
-      "key": "15005",
+      "key": "hero_15001",
       "text": "亚力克斯"
     },
     "star": 5,
@@ -5315,7 +5315,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 15005,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 15005,
     "vocal": "15005",
     "tujing": [
@@ -5347,7 +5347,7 @@
   {
     "hid": "35001",
     "name": {
-      "key": "35001",
+      "key": "hero_35001",
       "text": "师父"
     },
     "star": 4,
@@ -5357,7 +5357,7 @@
     "type": 1,
     "handbook": -1,
     "prefab": 35001,
-    "rotation": "0|8|0",
+    "rotation": "0|0|0",
     "icon": 35001,
     "vocal": "35001",
     "tujing": [
diff --git a/bin/json/game_language.json b/bin/json/game_language.json
index 40d090e60..d25bf6ec8 100644
--- a/bin/json/game_language.json
+++ b/bin/json/game_language.json
@@ -145,80 +145,116 @@
   },
   {
     "keycode": {
-      "key": "hero_star_1",
-      "text": "hero_star_1"
+      "key": "star_2",
+      "text": "star_2"
     }
   },
   {
     "keycode": {
-      "key": "hero_star_2",
-      "text": "hero_star_2"
+      "key": "star_3",
+      "text": "star_3"
     }
   },
   {
     "keycode": {
-      "key": "hero_star_3",
-      "text": "hero_star_3"
+      "key": "star_4",
+      "text": "star_4"
     }
   },
   {
     "keycode": {
-      "key": "hero_star_4",
-      "text": "hero_star_4"
+      "key": "star_5",
+      "text": "star_5"
     }
   },
   {
     "keycode": {
-      "key": "hero_color_1",
-      "text": "hero_color_1"
+      "key": "color_1",
+      "text": "color_1"
     }
   },
   {
     "keycode": {
-      "key": "hero_color_2",
-      "text": "hero_color_2"
+      "key": "color_2",
+      "text": "color_2"
     }
   },
   {
     "keycode": {
-      "key": "hero_color_3",
-      "text": "hero_color_3"
+      "key": "color_3",
+      "text": "color_3"
     }
   },
   {
     "keycode": {
-      "key": "hero_color_4",
-      "text": "hero_color_4"
+      "key": "color_4",
+      "text": "color_4"
     }
   },
   {
     "keycode": {
-      "key": "hero_job_10017",
-      "text": "hero_job_10017"
+      "key": "color_5",
+      "text": "color_5"
     }
   },
   {
     "keycode": {
-      "key": "hero_job_10018",
-      "text": "hero_job_10018"
+      "key": "color_6",
+      "text": "color_6"
     }
   },
   {
     "keycode": {
-      "key": "hero_job_10019",
-      "text": "hero_job_10019"
+      "key": "race_1",
+      "text": "race_1"
     }
   },
   {
     "keycode": {
-      "key": "hero_job_10020",
-      "text": "hero_job_10020"
+      "key": "race_2",
+      "text": "race_2"
     }
   },
   {
     "keycode": {
-      "key": "hero_job_10021",
-      "text": "hero_job_10021"
+      "key": "race_3",
+      "text": "race_3"
+    }
+  },
+  {
+    "keycode": {
+      "key": "race_4",
+      "text": "race_4"
+    }
+  },
+  {
+    "keycode": {
+      "key": "job_1",
+      "text": "job_1"
+    }
+  },
+  {
+    "keycode": {
+      "key": "job_2",
+      "text": "job_2"
+    }
+  },
+  {
+    "keycode": {
+      "key": "job_3",
+      "text": "job_3"
+    }
+  },
+  {
+    "keycode": {
+      "key": "job_4",
+      "text": "job_4"
+    }
+  },
+  {
+    "keycode": {
+      "key": "job_5",
+      "text": "job_5"
     }
   },
   {
@@ -323,6 +359,18 @@
       "text": "tips_1002"
     }
   },
+  {
+    "keycode": {
+      "key": "tips_1003",
+      "text": "tips_1003"
+    }
+  },
+  {
+    "keycode": {
+      "key": "tips_1004",
+      "text": "tips_1004"
+    }
+  },
   {
     "keycode": {
       "key": "num_1001",
@@ -431,6 +479,66 @@
       "text": "num_1018"
     }
   },
+  {
+    "keycode": {
+      "key": "opencond_name_10001",
+      "text": "opencond_name_10001"
+    }
+  },
+  {
+    "keycode": {
+      "key": "opencond_name_10002",
+      "text": "opencond_name_10002"
+    }
+  },
+  {
+    "keycode": {
+      "key": "opencond_name_10003",
+      "text": "opencond_name_10003"
+    }
+  },
+  {
+    "keycode": {
+      "key": "opencond_name_10004",
+      "text": "opencond_name_10004"
+    }
+  },
+  {
+    "keycode": {
+      "key": "opencond_name_10005",
+      "text": "opencond_name_10005"
+    }
+  },
+  {
+    "keycode": {
+      "key": "opencond_name_10006",
+      "text": "opencond_name_10006"
+    }
+  },
+  {
+    "keycode": {
+      "key": "opencond_name_10007",
+      "text": "opencond_name_10007"
+    }
+  },
+  {
+    "keycode": {
+      "key": "opencond_name_10008",
+      "text": "opencond_name_10008"
+    }
+  },
+  {
+    "keycode": {
+      "key": "opencond_name_10009",
+      "text": "opencond_name_10009"
+    }
+  },
+  {
+    "keycode": {
+      "key": "opencond_name_10010",
+      "text": "opencond_name_10010"
+    }
+  },
   {
     "keycode": {
       "key": "skill_190011000",
@@ -502,5 +610,47 @@
       "key": "skill_190011004",
       "text": "skill_190011004"
     }
+  },
+  {
+    "keycode": {
+      "key": "hero_help_10001",
+      "text": "hero_help_10001"
+    }
+  },
+  {
+    "keycode": {
+      "key": "hero_help_10002",
+      "text": "hero_help_10002"
+    }
+  },
+  {
+    "keycode": {
+      "key": "hero_help_10003",
+      "text": "hero_help_10003"
+    }
+  },
+  {
+    "keycode": {
+      "key": "hero_help_10004",
+      "text": "hero_help_10004"
+    }
+  },
+  {
+    "keycode": {
+      "key": "hero_help_10005",
+      "text": "hero_help_10005"
+    }
+  },
+  {
+    "keycode": {
+      "key": "hero_help_10006",
+      "text": "hero_help_10006"
+    }
+  },
+  {
+    "keycode": {
+      "key": "hero_help_10007",
+      "text": "hero_help_10007"
+    }
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_mainlineeasy.json b/bin/json/game_mainlineeasy.json
index 5384ebe8e..2059cc2bd 100644
--- a/bin/json/game_mainlineeasy.json
+++ b/bin/json/game_mainlineeasy.json
@@ -48,7 +48,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      3
+    ],
+    "condition": [
+      0
+    ]
   },
   {
     "id": 102,
@@ -100,7 +106,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      3
+    ],
+    "condition": [
+      1
+    ]
   },
   {
     "id": 103,
@@ -153,7 +165,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      3
+    ],
+    "condition": [
+      2
+    ]
   },
   {
     "id": 104,
@@ -207,7 +225,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      3
+    ],
+    "condition": [
+      3
+    ]
   },
   {
     "id": 105,
@@ -268,7 +292,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      3
+    ],
+    "condition": [
+      4
+    ]
   },
   {
     "id": 106,
@@ -329,7 +359,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      3
+    ],
+    "condition": [
+      5
+    ]
   },
   {
     "id": 107,
@@ -390,7 +426,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      3
+    ],
+    "condition": [
+      6
+    ]
   },
   {
     "id": 108,
@@ -451,7 +493,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      3
+    ],
+    "condition": [
+      7
+    ]
   },
   {
     "id": 109,
@@ -512,7 +560,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 110,
@@ -573,7 +627,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 201,
@@ -634,7 +694,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 202,
@@ -695,7 +761,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 203,
@@ -756,7 +828,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 204,
@@ -817,7 +895,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 205,
@@ -878,7 +962,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 206,
@@ -939,7 +1029,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 207,
@@ -1000,7 +1096,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 208,
@@ -1061,7 +1163,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 209,
@@ -1122,7 +1230,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 210,
@@ -1183,7 +1297,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 301,
@@ -1244,7 +1364,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 302,
@@ -1305,7 +1431,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 303,
@@ -1366,7 +1498,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 304,
@@ -1427,7 +1565,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 305,
@@ -1488,7 +1632,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 306,
@@ -1549,7 +1699,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 307,
@@ -1610,7 +1766,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 308,
@@ -1671,7 +1833,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 309,
@@ -1732,7 +1900,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 310,
@@ -1793,7 +1967,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 401,
@@ -1854,7 +2034,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 402,
@@ -1915,7 +2101,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 403,
@@ -1976,7 +2168,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 404,
@@ -2037,7 +2235,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 405,
@@ -2098,7 +2302,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 406,
@@ -2159,7 +2369,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 407,
@@ -2220,7 +2436,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 408,
@@ -2281,7 +2503,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 409,
@@ -2342,7 +2570,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 410,
@@ -2403,7 +2637,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 501,
@@ -2464,7 +2704,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 502,
@@ -2522,7 +2768,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 503,
@@ -2580,7 +2832,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 504,
@@ -2638,7 +2896,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 505,
@@ -2696,7 +2960,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 506,
@@ -2757,7 +3027,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 507,
@@ -2815,7 +3091,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 508,
@@ -2873,7 +3155,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 509,
@@ -2931,7 +3219,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 510,
@@ -2989,7 +3283,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 601,
@@ -3050,7 +3350,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 602,
@@ -3111,7 +3417,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 603,
@@ -3169,7 +3481,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 604,
@@ -3227,7 +3545,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 605,
@@ -3285,7 +3609,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 606,
@@ -3346,7 +3676,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 607,
@@ -3404,7 +3740,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 608,
@@ -3462,7 +3804,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 609,
@@ -3520,7 +3868,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 610,
@@ -3578,7 +3932,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 701,
@@ -3639,7 +3999,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 702,
@@ -3697,7 +4063,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 703,
@@ -3755,7 +4127,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 704,
@@ -3813,7 +4191,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 705,
@@ -3871,7 +4255,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 706,
@@ -3932,7 +4322,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 707,
@@ -3990,7 +4386,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 708,
@@ -4048,7 +4450,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 709,
@@ -4106,7 +4514,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 710,
@@ -4164,7 +4578,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 801,
@@ -4225,7 +4645,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 802,
@@ -4283,7 +4709,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 803,
@@ -4341,7 +4773,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 804,
@@ -4399,7 +4837,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 805,
@@ -4457,7 +4901,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 806,
@@ -4518,7 +4968,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 807,
@@ -4576,7 +5032,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 808,
@@ -4634,7 +5096,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 809,
@@ -4692,7 +5160,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 810,
@@ -4750,7 +5224,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 901,
@@ -4811,7 +5291,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 902,
@@ -4872,7 +5358,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 903,
@@ -4930,7 +5422,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 904,
@@ -4988,7 +5486,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 905,
@@ -5046,7 +5550,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 906,
@@ -5107,7 +5617,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 907,
@@ -5165,7 +5681,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 908,
@@ -5223,7 +5745,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 909,
@@ -5281,7 +5809,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 910,
@@ -5339,7 +5873,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1001,
@@ -5400,7 +5940,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1002,
@@ -5458,7 +6004,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1003,
@@ -5516,7 +6068,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1004,
@@ -5574,7 +6132,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1005,
@@ -5632,7 +6196,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1006,
@@ -5693,7 +6263,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1007,
@@ -5751,7 +6327,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1008,
@@ -5809,7 +6391,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1009,
@@ -5867,7 +6455,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1010,
@@ -5925,7 +6519,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1101,
@@ -5986,7 +6586,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1102,
@@ -6044,7 +6650,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1103,
@@ -6102,7 +6714,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1104,
@@ -6160,7 +6778,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1105,
@@ -6218,7 +6842,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1106,
@@ -6279,7 +6909,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1107,
@@ -6337,7 +6973,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1108,
@@ -6395,7 +7037,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1109,
@@ -6453,7 +7101,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1110,
@@ -6511,7 +7165,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1201,
@@ -6572,7 +7232,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1202,
@@ -6630,7 +7296,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1203,
@@ -6688,7 +7360,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1204,
@@ -6746,7 +7424,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1205,
@@ -6804,7 +7488,13 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   },
   {
     "id": 1206,
@@ -6865,6 +7555,12 @@
     "desc": {
       "key": "mainline_name_10071",
       "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。"
-    }
+    },
+    "stroyid": [
+      -1
+    ],
+    "condition": [
+      -1
+    ]
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json
index d0305eb2d..9ed3040e5 100644
--- a/bin/json/game_opencond.json
+++ b/bin/json/game_opencond.json
@@ -37,14 +37,14 @@
       "key": "opencond_name_10003",
       "text": "商店"
     },
-    "main": "{\u0022lv\u0022: 0}",
+    "main": "{\u0022lv\u0022: 999}",
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
     "img": "",
     "prompt": {
-      "key": "",
-      "text": ""
+      "key": "opencond_prompt_10002",
+      "text": "暂不开启，敬请期待"
     }
   },
   {
@@ -85,7 +85,7 @@
       "key": "opencond_name_10005",
       "text": "任务"
     },
-    "main": "{\u0022lv\u0022: 0}",
+    "main": "{\u0022lv\u0022: 999}",
     "optional": "",
     "wkqbx": 0,
     "kqbx": 0,
diff --git a/bin/json/game_skill.json b/bin/json/game_skill.json
index 0ee7c60f4..b7ad24739 100644
--- a/bin/json/game_skill.json
+++ b/bin/json/game_skill.json
@@ -113,9 +113,7 @@
       "skill_190011003",
       "skill_190011004"
     ],
-    "buffid": [
-      390002001
-    ]
+    "buffid": []
   },
   {
     "Id": 190013000,
@@ -235,10 +233,7 @@
       "skill_190011003",
       "skill_190011004"
     ],
-    "buffid": [
-      390001002,
-      390003001
-    ]
+    "buffid": []
   },
   {
     "Id": 190015000,
@@ -354,9 +349,7 @@
       "skill_190011003",
       "skill_190011004"
     ],
-    "buffid": [
-      390001001
-    ]
+    "buffid": []
   },
   {
     "Id": 190017000,
@@ -416,9 +409,7 @@
       "skill_190011003",
       "skill_190011004"
     ],
-    "buffid": [
-      390004008
-    ]
+    "buffid": []
   },
   {
     "Id": 190018000,
@@ -5217,10 +5208,10 @@
     "buffid": []
   },
   {
-    "Id": 110011,
+    "Id": 110010,
     "Name": {
-      "key": "skillname_110011",
-      "text": "熊猫拳"
+      "key": "skillname_110010",
+      "text": "阿宝队长技"
     },
     "ico": "skillicon_001",
     "act": "Skill_1",
@@ -5238,32 +5229,86 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
+        ]
+      }
+    ],
+    "Desc": [],
+    "buffid": []
+  },
+  {
+    "Id": 110011,
+    "Name": {
+      "key": "skillname_110011",
+      "text": "熊猫拳"
+    },
+    "ico": "skillicon_001",
+    "act": "Skill_1",
+    "Type": 0,
+    "MaxLV": 6,
+    "CD": [
+      4,
+      4,
+      4,
+      4,
+      4,
+      4
+    ],
+    "Target": 2,
+    "ChildSkill": [
+      {
+        "Id": [
+          210012
+        ]
+      },
+      {
+        "Id": [
+          210012
+        ]
+      },
+      {
+        "Id": [
+          210012
+        ]
+      },
+      {
+        "Id": [
+          210012
+        ]
+      },
+      {
+        "Id": [
+          210012
+        ]
+      },
+      {
+        "Id": [
+          210012
         ]
       }
     ],
@@ -5288,36 +5333,36 @@
       4,
       4
     ],
-    "Target": 1,
+    "Target": 2,
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       }
     ],
@@ -5342,7 +5387,7 @@
       4,
       4
     ],
-    "Target": 1,
+    "Target": 4,
     "ChildSkill": [
       {
         "Id": [
@@ -5400,32 +5445,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       }
     ],
@@ -5454,32 +5499,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210013
         ]
       },
       {
         "Id": [
-          210011
+          210013
         ]
       },
       {
         "Id": [
-          210011
+          210013
         ]
       },
       {
         "Id": [
-          210011
+          210013
         ]
       },
       {
         "Id": [
-          210011
+          210013
         ]
       },
       {
         "Id": [
-          210011
+          210013
         ]
       }
     ],
@@ -5508,32 +5553,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       }
     ],
@@ -5562,32 +5607,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       }
     ],
@@ -5778,32 +5823,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       }
     ],
@@ -5886,32 +5931,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       }
     ],
@@ -5940,32 +5985,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       }
     ],
@@ -6102,32 +6147,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       }
     ],
@@ -6210,32 +6255,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       }
     ],
@@ -6264,32 +6309,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       }
     ],
@@ -6372,32 +6417,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       }
     ],
@@ -6426,32 +6471,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       }
     ],
@@ -6480,32 +6525,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       }
     ],
@@ -6534,32 +6579,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       }
     ],
@@ -6588,32 +6633,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210013
         ]
       },
       {
         "Id": [
-          210011
+          210013
         ]
       },
       {
         "Id": [
-          210011
+          210013
         ]
       },
       {
         "Id": [
-          210011
+          210013
         ]
       },
       {
         "Id": [
-          210011
+          210013
         ]
       },
       {
         "Id": [
-          210011
+          210013
         ]
       }
     ],
@@ -6642,36 +6687,238 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       }
     ],
     "Desc": [],
     "buffid": []
+  },
+  {
+    "Id": 125004011,
+    "Name": {
+      "key": "skillname_110083",
+      "text": "波比队长技"
+    },
+    "ico": "jn_dzj_01",
+    "act": "",
+    "Type": 3,
+    "MaxLV": 1,
+    "CD": [
+      -1,
+      -1,
+      -1,
+      -1,
+      -1,
+      -1
+    ],
+    "Target": 1,
+    "ChildSkill": [
+      {
+        "Id": [
+          225004011
+        ]
+      }
+    ],
+    "Desc": [
+      "队长技：我方全体效果抵抗增加30%"
+    ],
+    "buffid": []
+  },
+  {
+    "Id": 125004111,
+    "Name": {
+      "key": "skillname_150051",
+      "text": "波比1技能"
+    },
+    "ico": "jn_icon_001",
+    "act": "Skill_1",
+    "Type": 1,
+    "MaxLV": 6,
+    "CD": [
+      0,
+      0,
+      0,
+      0,
+      0,
+      0
+    ],
+    "Target": 4,
+    "ChildSkill": [
+      {
+        "Id": [
+          225004111,
+          225004112
+        ]
+      },
+      {
+        "Id": [
+          225004121,
+          225004122
+        ]
+      },
+      {
+        "Id": [
+          225004131,
+          225004132
+        ]
+      },
+      {
+        "Id": [
+          225004141,
+          225004142
+        ]
+      },
+      {
+        "Id": [
+          225004151,
+          225004152
+        ]
+      },
+      {
+        "Id": [
+          225004161,
+          225004162
+        ]
+      }
+    ],
+    "Desc": [
+      "波比对敌方1个目标造成3次攻击力30%的伤害，有40%概率为自身附加2回合【免疫】状态",
+      "伤害提升至35%",
+      "概率触发概率提升至50%",
+      "伤害提升至40%",
+      "概率触发概率提升至60%",
+      "伤害提升至45%"
+    ],
+    "buffid": []
+  },
+  {
+    "Id": 125004211,
+    "Name": {
+      "key": "skillname_150052",
+      "text": "波比2技能"
+    },
+    "ico": "jn_icon_002",
+    "act": "Skill_2",
+    "Type": 2,
+    "MaxLV": 3,
+    "CD": [
+      5,
+      4,
+      3,
+      3,
+      3,
+      3
+    ],
+    "Target": 1,
+    "ChildSkill": [
+      {
+        "Id": [
+          225004211,
+          225004212,
+          225004213
+        ]
+      },
+      {
+        "Id": [
+          225004211,
+          225004212,
+          225004213
+        ]
+      },
+      {
+        "Id": [
+          225004211,
+          225004212,
+          225004213
+        ]
+      }
+    ],
+    "Desc": [
+      "波比清除我方所有减益状态，并平均分配我方生命值百分比，为我方全体附加2回合【攻击提升】状态",
+      "冷却时间减少1回合",
+      "冷却时间减少1回合"
+    ],
+    "buffid": []
+  },
+  {
+    "Id": 125004311,
+    "Name": {
+      "key": "skillname_150053",
+      "text": "波比3技能"
+    },
+    "ico": "jn_icon_003",
+    "act": "Skill_3",
+    "Type": 1,
+    "MaxLV": 5,
+    "CD": [
+      5,
+      5,
+      5,
+      5,
+      4,
+      4
+    ],
+    "Target": 1,
+    "ChildSkill": [
+      {
+        "Id": [
+          225004311
+        ]
+      },
+      {
+        "Id": [
+          225004312
+        ]
+      },
+      {
+        "Id": [
+          225004313
+        ]
+      },
+      {
+        "Id": [
+          225004314
+        ]
+      },
+      {
+        "Id": [
+          225004315
+        ]
+      }
+    ],
+    "Desc": [
+      "进入2回合【喜悦】状态，使我方全体收到伤害降低25%，且在每个队友行动去，为其驱散1个减益状态并回复其最大生命值20%的生命，效果持续期间自身无法行动",
+      "恢复量提升至22%",
+      "恢复量提升至24%",
+      "恢复量提升至26%",
+      "冷却时间减少1回合"
+    ],
+    "buffid": []
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index 451250a84..4ab6d1523 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -4,11 +4,11 @@
     "Desc": "对敌方1个目标造成攻击力80%",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800",
     "AddEffect": false,
@@ -30,11 +30,11 @@
     "Desc": "对全体目标造成攻击力80%以及防御力120%的伤害",
     "From": 2,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800,ProSou2=0,Pro2=Total_Def,ProPar2=1200",
     "AddEffect": false,
@@ -56,13 +56,13 @@
     "Desc": "对全体攻击小于自身的目标造成攻击力80%的伤害",
     "From": 2,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [
-      "ProJudge,Judge0,Key=Total_Atk,Op=0"
+      "Type=ProJudge,Judge0,Key=Total_Atk,Op=0"
     ],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800",
     "AddEffect": false,
@@ -84,15 +84,15 @@
     "Desc": "随机对敌方3个目标造成80%攻击力伤害，优先选择防御力小于自身的目标",
     "From": 2,
     "Limit": 3,
+    "EmitPR": 1000,
     "Where": [
-      "MyProJudge"
+      "Type=MyProJudge"
     ],
     "Order": [
-      "Sort,Sort0,Key=Total_Def,SortMet=0",
+      "Type=Sort,Sort0,Key=Total_Def,SortMet=0",
       "Rnd,SortProJudge,Rely0,Key=Total_Def,Op=0",
       "Rnd,SortProJudge,Rely0,Key=Total_Def,Op=5"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800",
     "AddEffect": false,
@@ -114,11 +114,11 @@
     "Desc": "随机对敌方防御最低的3个目标造成80%攻击力伤害",
     "From": 2,
     "Limit": 3,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Sort,Sort0,Key=Total_Def,SortMet=0"
+      "Type=Sort,Sort0,Key=Total_Def,SortMet=0"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800",
     "AddEffect": false,
@@ -140,13 +140,13 @@
     "Desc": "对敌方全体防御力小于100的敌方造成80%攻击力伤害",
     "From": 2,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [
-      "ProJudge,Judge1,Key=Total_Def,Op=1,Val=100"
+      "Type=ProJudge,Judge1,Key=Total_Def,Op=1,Val=100"
     ],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800",
     "AddEffect": false,
@@ -168,11 +168,11 @@
     "Desc": "对敌方全体的敌方造成攻击力110%伤害，",
     "From": 2,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=1100",
     "AddEffect": false,
@@ -196,14 +196,14 @@
     "Desc": "若自身攻击力大于100，则额外对全体敌方攻击力小于自身的目标造成攻击力50%伤害",
     "From": 2,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [
-      "MyProJudge,Key=Total_Atk,Op=0,Val=100",
-      "ProJudge,Judge0,Key=Total_Atk,Op=0"
+      "Type=MyProJudge,Key=Total_Atk,Op=0,Val=100",
+      "Type=ProJudge,Judge0,Key=Total_Atk,Op=0"
     ],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=50",
     "AddEffect": false,
@@ -225,13 +225,13 @@
     "Desc": "己方全体附加攻击提升，持续2回合,攻击提升40%",
     "From": 1,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001001,Round=2,ProBuff,BufPro1=Buff_Per_Atk,BufQuaType1=1,BufParNum1=1,BufVal1=400",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001001,Round=2,Type=ProBuff,BufPro1=Buff_Per_Atk,BufQuaType1=1,BufParNum1=1,BufVal1=400",
     "AddEffect": false,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -246,13 +246,13 @@
     "Desc": "敌方单体附加攻击下降，持续2回合,攻击下降40%",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002001,Round=2,ProBuff,BufPro1=Buff_Per_Atk,BufQuaType1=0,BufParNum1=1,BufVal1=400",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002001,Round=2,Type=ProBuff,BufPro1=Buff_Per_Atk,BufQuaType1=0,BufParNum1=1,BufVal1=400",
     "AddEffect": true,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -267,13 +267,13 @@
     "Desc": "己方全体附加防御提升，持续2回合,防御提升60%",
     "From": 1,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001002,Round=2,ProBuff,BufPro1=Buff_Per_Def,BufQuaType1=1,BufParNum1=1,BufVal1=600",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001002,Round=2,Type=ProBuff,BufPro1=Buff_Per_Def,BufQuaType1=1,BufParNum1=1,BufVal1=600",
     "AddEffect": false,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -288,13 +288,13 @@
     "Desc": "敌方单体附加防御下降，持续2回合,防御下降60%",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002002,Round=2,ProBuff,BufPro1=Buff_Per_Def,BufQuaType1=0,BufParNum1=1,BufVal1=600",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002002,Round=2,Type=ProBuff,BufPro1=Buff_Per_Def,BufQuaType1=0,BufParNum1=1,BufVal1=600",
     "AddEffect": true,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -309,13 +309,13 @@
     "Desc": "己方全体附加速度提升，持续2回合,速度提升30%",
     "From": 1,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001003,Round=2,ProBuff,BufPro1=Buff_Per_Agi,BufQuaType1=1,BufParNum1=1,BufVal1=300",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001003,Round=2,Type=ProBuff,BufPro1=Buff_Per_Agi,BufQuaType1=1,BufParNum1=1,BufVal1=300",
     "AddEffect": false,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -330,13 +330,13 @@
     "Desc": "敌方单体附加速度下降，持续2回合,速度下降30%",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002003,Round=2,ProBuff,BufPro1=BBuff_Per_Agi,BufQuaType1=0,BufParNum1=1,BufVal1=300",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002003,Round=2,Type=ProBuff,BufPro1=BBuff_Per_Agi,BufQuaType1=0,BufParNum1=1,BufVal1=300",
     "AddEffect": true,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -351,13 +351,13 @@
     "Desc": "己方全体附加暴击提升，持续2回合,暴击率提升30%",
     "From": 1,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001004,Round=2,ProBuff,BufPro1=Add_Cri,BufQuaType1=1,BufParNum1=1,BufVal1=300",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001004,Round=2,Type=ProBuff,BufPro1=Add_Cri,BufQuaType1=1,BufParNum1=1,BufVal1=300",
     "AddEffect": false,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -372,13 +372,13 @@
     "Desc": "敌方单体附加暴击下降，持续2回合,暴击率下降30%",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002004,Round=2,ProBuff,BufPro1=Add_Cri,BufQuaType1=0,BufParNum1=1,BufVal1=300",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002004,Round=2,Type=ProBuff,BufPro1=Add_Cri,BufQuaType1=0,BufParNum1=1,BufVal1=300",
     "AddEffect": true,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -393,13 +393,13 @@
     "Desc": "敌方单体附加烙印，持续2回合,被攻击时，受到的伤害提高25%",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002005,Round=2,ProBuff,BufPro1=SufferDam,BufQuaType1=1,BufParNum1=1,BufVal1=25",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002005,Round=2,Type=ProBuff,BufPro1=SufferDam,BufQuaType1=1,BufParNum1=1,BufVal1=25",
     "AddEffect": true,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -414,13 +414,13 @@
     "Desc": "敌方单体附加失手率提升，持续2回合,失手率提升50%",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002006,Round=2,ProBuff,BufPro1=MissPr,BufQuaType1=1,BufParNum1=1,BufVal1=50",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002006,Round=2,Type=ProBuff,BufPro1=MissPr,BufQuaType1=1,BufParNum1=1,BufVal1=50",
     "AddEffect": true,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -435,13 +435,13 @@
     "Desc": "己方全体附加10层叹息之力,（无法驱散类状态）每层使自身攻击力提升5%，每10层使自身受到伤害降低3%。最高可叠加50层",
     "From": 1,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=10,Id=390001006,Round=-1,ProBuff,BufPro1=Buff_Per_Atk,BufQuaType1=1,BufParNum1=1,BufVal1=50,BufPro2=SufferDam,BufQuaType2=0,BufParNum2=10,BufVal2=30",
+    "Argu": "DoVal=1,Pr=1000,NumVal=10,Id=390001006,Round=-1,Type=ProBuff,BufPro1=Buff_Per_Atk,BufQuaType1=1,BufParNum1=1,BufVal1=50,BufPro2=SufferDam,BufQuaType2=0,BufParNum2=10,BufVal2=30",
     "AddEffect": false,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -456,13 +456,13 @@
     "Desc": "己方全体附加暴击抵抗，持续2回合,受到暴击概率降低30%",
     "From": 1,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001005,Round=2,ProBuff,BufPro1=Add_SufCri,BufQuaType1=1,BufParNum1=1,BufVal1=300",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001005,Round=2,Type=ProBuff,BufPro1=Add_SufCri,BufQuaType1=1,BufParNum1=1,BufVal1=300",
     "AddEffect": false,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -477,13 +477,13 @@
     "Desc": "敌方单体附加眩晕，持续2回合,无法进行任务行动",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390004001,Round=2,TagBuff",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390004001,Round=2,Type=TagBuff",
     "AddEffect": true,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -498,13 +498,13 @@
     "Desc": "敌方单体附加冰冻，持续2回合,无法进行任何行动",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390004002,Round=2,TagBuff",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390004002,Round=2,Type=TagBuff",
     "AddEffect": true,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -519,13 +519,13 @@
     "Desc": "己方全体附加无法获得增益效果，持续2回合,无法附加增益状态（不可驱散）（不配置标签）",
     "From": 1,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390006001,Round=2,TagBuff",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390006001,Round=2,Type=TagBuff",
     "AddEffect": false,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -540,13 +540,13 @@
     "Desc": "己方全体附加无法获得减益效果，持续2回合,无法获得减益效果（不可驱散）（不配置标签）",
     "From": 1,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390005002,Round=2,TagBuff",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390005002,Round=2,Type=TagBuff",
     "AddEffect": false,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -561,11 +561,11 @@
     "Desc": "己方全体附加免疫，持续2回合,无法获得减益效果",
     "From": 1,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490001001,Round=2,CallSkillPas,PasPr=1000,PasReVal=1",
     "AddEffect": false,
@@ -582,13 +582,13 @@
     "Desc": "己方全体附加无敌，持续2回合,无法受到任何伤害",
     "From": 1,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390003001,Round=2,TagBuff",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390003001,Round=2,Type=TagBuff",
     "AddEffect": false,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -603,13 +603,13 @@
     "Desc": "敌方单体附加禁疗，持续2回合,无法恢复生命",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390004003,Round=2,TagBuff",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390004003,Round=2,Type=TagBuff",
     "AddEffect": true,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -624,11 +624,11 @@
     "Desc": "对敌方单体造成3次攻击力80%的伤害，",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=3,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800",
     "AddEffect": false,
@@ -650,11 +650,11 @@
     "Desc": "有50%的概率再次对目标额外造成50%防御力的伤害",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 500,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 500,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Def,ProPar1=500",
     "AddEffect": false,
@@ -676,11 +676,11 @@
     "Desc": "对敌方全体造成攻击力80%的伤害，",
     "From": 2,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800",
     "AddEffect": false,
@@ -704,11 +704,11 @@
     "Desc": "另有50%概率驱散敌方1个增益BUFF",
     "From": 0,
     "Limit": 0,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "BuffAction",
     "Argu": "DoVal=1,Pr=500,Action0,Buff1,RelyType1=1,ID1=201,ActionVal=1",
     "AddEffect": false,
@@ -730,11 +730,11 @@
     "Desc": "对敌方单体造成3次攻击力80%的伤害，",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=3,Pr=1000,ProSou1=0,Pro1=Total_Def,ProPar1=800",
     "AddEffect": false,
@@ -756,11 +756,11 @@
     "Desc": "每次50%概率附加目标最大生命8%的伤害，此附加伤害不超过自身攻击50%（不会暴击）",
     "From": 0,
     "Limit": 0,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=500,Cri=0,ProSou1=1,Pro1=NowTotal_Hp,ProPar1=80,ProSouLim=0,ProLim=Total_Atk,ProParLim=500,AddDmgSk=290039002",
     "AddEffect": false,
@@ -782,11 +782,11 @@
     "Desc": "对敌方单体目标造成80%攻击力伤害，触发暴击时，攻击力伤害系数增加30%",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800,CriType1=1,CriVal1=300",
     "AddEffect": false,
@@ -808,11 +808,11 @@
     "Desc": "对敌方单体目标造成80%攻击力伤害，触发暴击时，造成伤害增加30%",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800,TempPro=CauseDam,TempCriTyp=1,TempCriVal=300",
     "AddEffect": false,
@@ -834,11 +834,11 @@
     "Desc": "对敌方单体目标造成80%攻击力伤害，本次伤害必定暴击",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=3,Pr=1000,Cri=1,ProSou1=0,Pro1=Total_Def,ProPar1=800",
     "AddEffect": false,
@@ -860,11 +860,11 @@
     "Desc": "回复本次伤害30%的血量",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "FrontTre",
     "Argu": "DoVal=1,Pr=1000,Par=300",
     "AddEffect": false,
@@ -886,11 +886,11 @@
     "Desc": "对敌方全体目标造成80%攻击力伤害，本次伤害无视防御100%，敌方每有一个增益BUFF，无视防御减少20%",
     "From": 2,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Def,ProPar1=800,TempProTarget=0,TempPro=IgnoreDefPer,TempPro1,TempProVal=1000,TempDetTarget=0,TempDet2,TempDetID=201,TempDetTpyeVal=1,TempDetQua0,TempDetVal=200",
     "AddEffect": false,
@@ -912,11 +912,11 @@
     "Desc": "对敌方单体目标造成80%攻击力伤害，自身每10点速度增加1%的攻击力伤害",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800,DetTarget1=0,DetType1=0,DetID1=Total_Agi,DetTpyeVal1=10,DetQuaType1=1,DetVal1=10",
     "AddEffect": false,
@@ -938,11 +938,11 @@
     "Desc": "对敌方单体目标造成80%攻击力伤害，自身每个增益BUFF，增加攻击力10%的伤害",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800,DetTarget1=0,DetType1=2,DetID1=201,DetTpyeVal1=10,DetQuaType1=1,DetVal1=100",
     "AddEffect": false,
@@ -964,11 +964,11 @@
     "Desc": "驱散敌方全体增益效果，",
     "From": 2,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "BuffAction",
     "Argu": "DoVal=1,Pr=1000,Action0,Buff1,RelyType1=1,ID1=201,ActionVal=-1",
     "AddEffect": false,
@@ -992,11 +992,11 @@
     "Desc": "随后对敌方全体造成攻击力80%伤害，每驱散1个增益BUFF，对其造成的伤害增加3%",
     "From": 2,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800,TempProTarget=0,TempPro=CauseDam,TempFrontSkId=290046001,TempFront3,TempFrontID=201,TempFrontTpyeVal=1,TempFrontQua1,TempFrontVal=30",
     "AddEffect": false,
@@ -1018,11 +1018,11 @@
     "Desc": "对敌方单体造成80%攻击力伤害",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800",
     "AddEffect": false,
@@ -1044,11 +1044,11 @@
     "Desc": "，对其他敌方目标造成此伤害40%的溅射伤害",
     "From": 6,
     "Limit": 4,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "FrontDmg",
     "Argu": "DoVal=1,Pr=1000,DmgSource0,DmgPar=400",
     "AddEffect": false,
@@ -1070,11 +1070,11 @@
     "Desc": "回复己方全体80%攻击力的血量",
     "From": 1,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Tre",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800",
     "AddEffect": false,
@@ -1095,11 +1095,11 @@
     "Desc": "回复己方全体其最大生命值20%的血量",
     "From": 1,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Tre",
     "Argu": "DoVal=1,Pr=1000,ProSou1=1,Pro1=NowTotal_Hp,ProPar1=200",
     "AddEffect": false,
@@ -1120,11 +1120,11 @@
     "Desc": "己方全体行动值增加30%",
     "From": 1,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Pro",
     "Argu": "DoVal=1,Pr=1000,Pro1=ActValue,QuaType1=1,Val1=300",
     "AddEffect": false,
@@ -1141,11 +1141,11 @@
     "Desc": "敌方全体行动值降低30%",
     "From": 2,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Pro",
     "Argu": "DoVal=1,Pr=1000,Pro1=ActValue,QuaType1=0,Val1=300",
     "AddEffect": true,
@@ -1162,11 +1162,11 @@
     "Desc": "夺取敌方单体30%行动值",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "RobPro",
     "Argu": "DoVal=1,Pr=1000,RobTarget=0,Pro=ActValue,Num=300",
     "AddEffect": false,
@@ -1183,11 +1183,11 @@
     "Desc": "净化己方全体非【防御下降】状态的减益BUFF",
     "From": 1,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "BuffAction",
     "Argu": "DoVal=1,Pr=1000,Action0,BuffType1=1,RelyType1=1,ID1=202,BuffType2=0,RelyType2=0,ID2=390001004,ActionVal1=-1",
     "AddEffect": false,
@@ -1208,11 +1208,11 @@
     "Desc": "驱散敌方全体增益BUFF",
     "From": 2,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "BuffAction",
     "Argu": "DoVal=1,Pr=1000,Action0,BuffType1=1,RelyType1=1,ID1=201,ActionVal=-1",
     "AddEffect": true,
@@ -1233,11 +1233,11 @@
     "Desc": "夺取敌方单体全部增益BUFF给自身",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "BuffAction",
     "Argu": "DoVal=1,Pr=1000,Action1,BuffType1=1,RelyType1=1,ID1=201,ActionVal=-1,Tag=0",
     "AddEffect": false,
@@ -1258,11 +1258,11 @@
     "Desc": "转移己方全体1个减益BUFF给敌方单体",
     "From": 1,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "BuffAction",
     "Argu": "DoVal=1,Pr=1000,Action0,BuffType1=1,RelyType1=1,ID1=202,ActionVal=-1,Tag=1",
     "AddEffect": false,
@@ -1283,11 +1283,11 @@
     "Desc": "己方全体增益BUFF持续回合\u002B1",
     "From": 1,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "BuffCD",
     "Argu": "DoVal=1,Pr=1000,Action0,BuffType1=1,RelyType1=1,ID1=201,Qua1,Val=1",
     "AddEffect": false,
@@ -1304,11 +1304,11 @@
     "Desc": "敌方全体减益BUFF持续回合\u002B1",
     "From": 2,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "BuffCD",
     "Argu": "DoVal=1,Pr=1000,Action0,BuffType1=1,RelyType1=1,ID1=202,Qua1,Val=1",
     "AddEffect": true,
@@ -1325,11 +1325,11 @@
     "Desc": "己方全体所有技能CD-1",
     "From": 1,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "SkillCD",
     "Argu": "DoVal=1,Pr=1000,Val1=2,Type1=0,Par1=1,Val2=3,Type2=0,Par2=1,Val3=4,Type3=0,Par3=1",
     "AddEffect": false,
@@ -1346,11 +1346,11 @@
     "Desc": "敌方全体所有技能CD\u002B1",
     "From": 2,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "SkillCD",
     "Argu": "DoVal=1,Pr=1000,Val1=2,Type1=1,Par1=1,Val2=3,Type2=1,Par2=1,Val3=4,Type3=1,Par3=1",
     "AddEffect": true,
@@ -1367,11 +1367,11 @@
     "Desc": "对敌方单体造成80%攻击力伤害",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800",
     "AddEffect": false,
@@ -1393,11 +1393,11 @@
     "Desc": "，随后自身立即获得回合。",
     "From": 3,
     "Limit": 0,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Round",
     "Argu": "DoVal=1,Pr=1000,Val=1",
     "AddEffect": false,
@@ -1414,11 +1414,11 @@
     "Desc": "复活目标，",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Reborn",
     "Argu": "DoVal=1,Pr=1000",
     "AddEffect": false,
@@ -1435,11 +1435,11 @@
     "Desc": "，并回复其最大生命50%的生命",
     "From": 4,
     "Limit": 0,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Tre",
     "Argu": "DoVal=1,Pr=1000,ProSou1=1,Pro1=NowTotal_Hp,ProPar1=500",
     "AddEffect": false,
@@ -1460,11 +1460,11 @@
     "Desc": "对敌方单体造成80%攻击力伤害，",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800",
     "AddEffect": false,
@@ -1488,11 +1488,11 @@
     "Desc": "有50%概率再次使用该技能进行追击",
     "From": 4,
     "Limit": 0,
+    "EmitPR": 500,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 500,
     "Type": "Again",
     "Argu": "DoVal=1,Pr=500",
     "AddEffect": false,
@@ -1509,11 +1509,11 @@
     "Desc": "对敌方单体造成80%攻击力伤害",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800",
     "AddEffect": false,
@@ -1535,11 +1535,11 @@
     "Desc": "，有50%概率再次使用190063000技能进行追击",
     "From": 4,
     "Limit": 0,
+    "EmitPR": 500,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 500,
     "Type": "CallSkill",
     "Argu": "DoVal=1,Pr=500,Id1=190063000",
     "AddEffect": false,
@@ -1558,11 +1558,11 @@
     "Desc": "自身随机附加攻击提升，暴击提升，防御提升其中一种，持续2回合。",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "RndCallSonSkill",
     "Argu": "DoVal=1,Pr=500,Val=1,Id1=290065001,Id2=290065002,Id3=290065003",
     "AddEffect": false,
@@ -1579,13 +1579,13 @@
     "Desc": "攻击提升",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001001,Round=2,ProBuff,BufPro1=Buff_Per_Atk,BufQuaType1=1,BufParNum1=1,BufVal1=400",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001001,Round=2,Type=ProBuff,BufPro1=Buff_Per_Atk,BufQuaType1=1,BufParNum1=1,BufVal1=400",
     "AddEffect": false,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -1600,13 +1600,13 @@
     "Desc": "暴击提升",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001007,Round=2,ProBuff,BufPro1=Add_Cri,BufQuaType1=1,BufParNum1=1,BufVal1=300",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001007,Round=2,Type=ProBuff,BufPro1=Add_Cri,BufQuaType1=1,BufParNum1=1,BufVal1=300",
     "AddEffect": false,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -1621,13 +1621,13 @@
     "Desc": "防御提升",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001003,Round=2,ProBuff,BufPro1=Buff_Per_Def,BufQuaType1=1,BufParNum1=1,BufVal1=600",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001003,Round=2,Type=ProBuff,BufPro1=Buff_Per_Def,BufQuaType1=1,BufParNum1=1,BufVal1=600",
     "AddEffect": false,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -1642,11 +1642,11 @@
     "Desc": "对敌方随机目标造成80%攻击力伤害",
     "From": 2,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800",
     "AddEffect": false,
@@ -1670,9 +1670,9 @@
     "Desc": "50%概率额外造成50%防御力伤害",
     "From": 0,
     "Limit": 0,
+    "EmitPR": 500,
     "Where": [],
     "Order": [],
-    "EmitPR": 500,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Def,ProPar1=500",
     "AddEffect": false,
@@ -1694,11 +1694,11 @@
     "Desc": "被动1 每回合行动前对敌方全体造成80%攻击力伤害",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490067001,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=290067002",
     "AddEffect": false,
@@ -1718,11 +1718,11 @@
     "Desc": "被动1 触发调用子技能，对敌方全体造成80%攻击力伤害",
     "From": 2,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800",
     "AddEffect": false,
@@ -1741,11 +1741,11 @@
     "Desc": "回合行动前对敌方全体造成80%攻击力伤害",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490068001,Round=1,CallSkillPas,PasPr=1000,PasCall0,PasId1=290068002",
     "AddEffect": false,
@@ -1765,11 +1765,11 @@
     "Desc": "被动1 触发调用子技能，对敌方全体造成80%攻击力伤害",
     "From": 2,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800",
     "AddEffect": false,
@@ -1788,11 +1788,11 @@
     "Desc": "每次攻击前对敌方全体造成80%攻击力伤害",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490069001,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=290068002",
     "AddEffect": false,
@@ -1809,11 +1809,11 @@
     "Desc": "每次受到攻击前对敌方全体造成80%攻击力伤害",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490070001,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=290068002",
     "AddEffect": false,
@@ -1830,11 +1830,11 @@
     "Desc": "暴击时回复自身5%最大生命值血量",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490071001,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=290071002",
     "AddEffect": false,
@@ -1851,11 +1851,11 @@
     "Desc": "回复自身5%最大生命值血量",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 0,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 0,
     "Type": "Tre",
     "Argu": "DoVal=1,Pr=1000,ProSou1=1,Pro1=NowTotal_Hp,ProPar1=50",
     "AddEffect": false,
@@ -1874,11 +1874,11 @@
     "Desc": "被暴击时回复自身5%最大生命值血量",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490072001,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=290071002",
     "AddEffect": false,
@@ -1895,11 +1895,11 @@
     "Desc": "受到致死伤害后免除死亡，每场战斗最多1次",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400102107,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasReVal=1,PasId1=200102112,PasId2=200102113",
     "AddEffect": false,
@@ -1916,11 +1916,11 @@
     "Desc": "击破护盾时，对敌方全体造成80%攻击力伤害",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490074001,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=290068002",
     "AddEffect": false,
@@ -1937,11 +1937,11 @@
     "Desc": "护盾被击破时，对敌方全体造成80%攻击力伤害",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490075001,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=290068002",
     "AddEffect": false,
@@ -1958,11 +1958,11 @@
     "Desc": "攻击时，对敌方全体造成80%攻击力伤害",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490076001,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=290068002",
     "AddEffect": false,
@@ -1979,11 +1979,11 @@
     "Desc": "受到攻击时，对敌方全体造成80%攻击力伤害",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490077001,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=290068002",
     "AddEffect": false,
@@ -2000,11 +2000,11 @@
     "Desc": "击杀敌人后，对敌方全体造成80%攻击力伤害",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490078001,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=290068002",
     "AddEffect": false,
@@ -2021,11 +2021,11 @@
     "Desc": "死亡后，立即复活",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490079001,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=290079002",
     "AddEffect": false,
@@ -2042,11 +2042,11 @@
     "Desc": "复活",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Reborn",
     "Argu": "DoVal=1,Pr=1000",
     "AddEffect": false,
@@ -2065,11 +2065,11 @@
     "Desc": "复活后，对敌方全体造成80%攻击力伤害",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490080001,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=290068002",
     "AddEffect": false,
@@ -2086,11 +2086,11 @@
     "Desc": "BUFF结束，对敌方全体造成80%攻击力伤害",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490081001,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=290068002",
     "AddEffect": false,
@@ -2107,11 +2107,11 @@
     "Desc": "回合结束后，对敌方全体造成80%攻击力伤害",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490082001,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=290068002",
     "AddEffect": false,
@@ -2128,11 +2128,11 @@
     "Desc": "行动结束前，对敌方全体造成80%攻击力伤害",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490083001,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=290068002",
     "AddEffect": false,
@@ -2149,11 +2149,11 @@
     "Desc": "行动结束后，对敌方全体造成80%攻击力伤害",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490084001,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=290068002",
     "AddEffect": false,
@@ -2170,11 +2170,11 @@
     "Desc": "增加敌方全体所有技能CD1回合",
     "From": 2,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "SkillCD",
     "Argu": "DoVal=1,Pr=1000,Val1=2,infType1=1,Par1=1,Val1=3,infType1=1,Par1=1",
     "AddEffect": false,
@@ -2191,11 +2191,11 @@
     "Desc": "减少己方全体所有技能CD1回合",
     "From": 1,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "SkillCD",
     "Argu": "DoVal=1,Pr=1000,Val1=2,infType1=0,Par1=1,Val1=3,infType1=0,Par1=1",
     "AddEffect": false,
@@ -2212,11 +2212,11 @@
     "Desc": "加主被动1 每回合结束后，调用子技能的触发类效果 调用引雷123",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400012101,Round=-1,CallSkillPas,PasPr=1000,PasRouCD=4,PasCall1,PasId1=200012103,PasId2=200012104,PasId3=200012105",
     "AddEffect": false,
@@ -2233,11 +2233,11 @@
     "Desc": "加主被动2 自身的任意主动技能命中敌人触发暴击时调用子技能",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400012102,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=200012109",
     "AddEffect": false,
@@ -2254,11 +2254,11 @@
     "Desc": "被动1 引雷1 在自身新回合开始时，调用子技能的触发类效果",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400012103,Round=1,CallSkillPas,PasPr=1000,PasCall0,PasId1=200012106",
     "AddEffect": false,
@@ -2275,11 +2275,11 @@
     "Desc": "被动1 引雷2 但出于不可行动状态时，调用子技能的触发类效果",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400012104,Round=1,CallSkillPas,PasPr=1000,PasCall0,PasId1=200012107",
     "AddEffect": false,
@@ -2296,11 +2296,11 @@
     "Desc": "被动1 引雷3 【引雷】期间自身每次受到攻击时，调用子技能的触发类效果",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400012105,Round=1,CallSkillPas,PasPr=1000,PasCall0,PasId1=200012108",
     "AddEffect": false,
@@ -2317,11 +2317,11 @@
     "Desc": "引雷1触发 调用子技能对敌方全体造成防御力110%的伤害。",
     "From": 2,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=3,Pr=1000,ProSou1=0,Pro1=Total_Def,ProPar1=1100",
     "AddEffect": false,
@@ -2343,11 +2343,11 @@
     "Desc": "引雷2触发 调用子技能但出于不可行动状态时解除【引雷】状态",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "BuffAction",
     "Argu": "DoVal=3,Pr=1000,Action2,BuffType1=1,RelyType1=1,ID1=1001",
     "AddEffect": false,
@@ -2364,13 +2364,13 @@
     "Desc": "引雷3触发 调用子技能获得1层【雷之庇佑】",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001008,Round=2,ProBuff,BufPro1=Buff_Per_Def,BufQuaType1=1,BufParNum1=1,BufVal1=200",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001008,Round=2,Type=ProBuff,BufPro1=Buff_Per_Def,BufQuaType1=1,BufParNum1=1,BufVal1=200",
     "AddEffect": false,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -2385,11 +2385,11 @@
     "Desc": "主被动2触发 调用的子技能降低此技能1回合冷却",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "SkillCD",
     "Argu": "DoVal=1,Pr=1000,Val1=3,infType1=0,Par1=1",
     "AddEffect": false,
@@ -2406,13 +2406,13 @@
     "Desc": "加被动1 无法受到任何控制效果，",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390003003,Round=-1,TagBuff,BufDoVal=1,BufPr=1000",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390003003,Round=-1,Type=TagBuff,BufDoVal=1,BufPr=1000",
     "AddEffect": false,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -2427,11 +2427,11 @@
     "Desc": "加被动2 每回合行动前为己方全体清除任意一个非无法行动状态的减益状态并回复其5%最大生命值",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400022102,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=200022104,PasId2=200022105",
     "AddEffect": false,
@@ -2448,11 +2448,11 @@
     "Desc": "加被动3 且在任意队友获得减益状态时，自身获得20%行动值提升，每回合仅触发1次。",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400022103,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=200022105",
     "AddEffect": false,
@@ -2469,11 +2469,11 @@
     "Desc": "被动2 触发调用子技能1，己方全体清除任意一个非无法行动状态",
     "From": 1,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "BuffAction",
     "Argu": "DoVal=1,Pr=1000,Action0,BuffType1=1,RelyType1=1,ID1=202,BuffType2=1,RelyType2=0,ID2=604,ActionVal=1",
     "AddEffect": false,
@@ -2490,11 +2490,11 @@
     "Desc": "被动2 触发调用子技能2，并回复其5%最大生命值",
     "From": 1,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Tre",
     "Argu": "DoVal=1,Pr=1000,ProSou1=1,Pro1=NowTotal_Hp,ProPar1=50",
     "AddEffect": false,
@@ -2511,11 +2511,11 @@
     "Desc": "被动3 触发调用子技能，自身获得20%行动值提升，每回合仅触发1次",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Pro",
     "Argu": "DoVal=1,Pr=1000,Pro1=ActValue,QuaType1=1,Val1=200",
     "AddEffect": false,
@@ -2534,13 +2534,13 @@
     "Desc": "被动1 自身攻击不会失手",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390005003,Round=-1,TagBuff,BufDoVal=1,BufPr=1000",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390005003,Round=-1,Type=TagBuff,BufDoVal=1,BufPr=1000",
     "AddEffect": false,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -2555,11 +2555,11 @@
     "Desc": "被动2 当敌方单位使其友方减益状态提前结束时，令该单位失去30%当前生命值，同时失去全部增益状态并获得1回合【石化】效果。",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400092102,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasTarget=3,PasId1=200092103,PasId2=200092104,PasId3=200092105",
     "AddEffect": false,
@@ -2576,9 +2576,9 @@
     "Desc": "被动2 触发调用子技能1，令该单位失去30%当前生命值",
     "From": 0,
     "Limit": 0,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [],
-    "EmitPR": 1000,
     "Type": "NowHpDmg",
     "Argu": "DoVal=1,Pr=1000,Val=300",
     "AddEffect": false,
@@ -2597,9 +2597,9 @@
     "Desc": "被动2 触发调用子技能2，同时失去全部增益状态",
     "From": 0,
     "Limit": 0,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [],
-    "EmitPR": 1000,
     "Type": "BuffAction",
     "Argu": "DoVal=1,Pr=1000,Action0,BuffType1=1,RelyType1=1,ID1=201",
     "AddEffect": false,
@@ -2618,11 +2618,11 @@
     "Desc": "被动2 触发调用子技能3，获得1回合【石化】效果。",
     "From": 0,
     "Limit": 0,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390004004,Round=-1,TagBuff,BufDoVal=1,BufPr=1000",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390004004,Round=-1,Type=TagBuff,BufDoVal=1,BufPr=1000",
     "AddEffect": false,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -2637,13 +2637,13 @@
     "Desc": "被动1 无法获得任意增益状态，",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390006001,Round=-1,TagBuff,BufDoVal=1,BufPr=1000",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390006001,Round=-1,Type=TagBuff,BufDoVal=1,BufPr=1000",
     "AddEffect": false,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -2658,13 +2658,13 @@
     "Desc": "被动2 无法获得任意减益状态，",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390005002,Round=-1,TagBuff,BufDoVal=1,BufPr=1000",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390005002,Round=-1,Type=TagBuff,BufDoVal=1,BufPr=1000",
     "AddEffect": false,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -2679,13 +2679,13 @@
     "Desc": "被动3 受到的所有伤害降低10%",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=300102103,Round=-1,ProBuff,BufPro1=SufferDam,BufQuaType1=0,BufParNum1=1,BufVal1=100",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=300102103,Round=-1,Type=ProBuff,BufPro1=SufferDam,BufQuaType1=0,BufParNum1=1,BufVal1=100",
     "AddEffect": false,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -2700,11 +2700,11 @@
     "Desc": "被动4 每次被施加增益状态时，自身获得1层【叹息之力】",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400102104,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=200102109",
     "AddEffect": false,
@@ -2721,11 +2721,11 @@
     "Desc": "被动5 每次被施加减益状态时，自身获得1层【叹息之力】",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400102105,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=200102109",
     "AddEffect": false,
@@ -2742,11 +2742,11 @@
     "Desc": "被动6 每有1个队友死亡时，自身获得10层【叹息之力】",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=10,Id=400102106,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=200102110",
     "AddEffect": false,
@@ -2763,11 +2763,11 @@
     "Desc": "被动7 每次战斗中首次受到致命伤害时，免除本次死亡",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400102107,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasReVal=1,PasId1=200102112,PasId2=200102113",
     "AddEffect": false,
@@ -2784,11 +2784,11 @@
     "Desc": "被动8 每次战斗中首次受到致命伤害时，根据当前【叹息之力】层数回复自身生命值状态，每层回复自身1%最大生命值状态。",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400102108,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=200102111",
     "AddEffect": false,
@@ -2805,11 +2805,11 @@
     "Desc": "被动4,5 触发调用子技能，自身获得1层【叹息之力】",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001006,Round=-1",
     "AddEffect": false,
@@ -2826,11 +2826,11 @@
     "Desc": "被动6 触发调用子技能，自身获得10层【叹息之力】",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
     "Argu": "DoVal=1,Pr=1000,NumVal=10,Id=390001006,Round=-1",
     "AddEffect": false,
@@ -2847,11 +2847,11 @@
     "Desc": "被动8 触发调用子技能，根据当前【叹息之力】层数回复自身生命值状态，每层回复自身1%最大生命值状态。",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Tre",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=NowTotal_Hp,ProPar1=0,DetTarget1=0,DetType1=1,DetID1=390001006,DetTpyeVal1=1,DetQuaType1=1,DetVal1=10",
     "AddEffect": false,
@@ -2872,13 +2872,13 @@
     "Desc": "免除死亡",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390003004,Round=1,TagBuff,BufDoVal=1,BufPr=1000",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390003004,Round=1,Type=TagBuff,BufDoVal=1,BufPr=1000",
     "AddEffect": false,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -2893,11 +2893,11 @@
     "Desc": "敌方行动结束前，移除免除死亡",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400102113,Round=1,CallSkillPas,PasPr=1000,PasCall0,PasId1=200102114",
     "AddEffect": false,
@@ -2914,11 +2914,11 @@
     "Desc": "移除免除死亡",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "BuffAction",
     "Argu": "DoVal=1,Pr=1000,Action0,BuffType1=1,RelyType1=1,ID1=501",
     "AddEffect": false,
@@ -2935,11 +2935,11 @@
     "Desc": "被动1 对己方任意目标造成治疗效果时会同时为其净化2个减益效果，若目标没有减益效果，则额外为其施加1回合【免疫】效果。",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400162101,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=200162103,PasId2=200162104",
     "AddEffect": false,
@@ -2958,11 +2958,11 @@
     "Desc": "被动2 对己方任意目标造成治疗效果时同时自身治疗量溢出的120%将转变为【护盾】效果，持续2回合。",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400162102,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=200162105",
     "AddEffect": false,
@@ -2979,13 +2979,13 @@
     "Desc": "被动1 触发调用子技能1，若目标有减益效果，净化2个减益效果",
     "From": 0,
     "Limit": 0,
+    "EmitPR": 1000,
     "Where": [
       "BuffRely,Rely1,Key=1,Op=0,Val=1"
     ],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "BuffAction",
     "Argu": "DoVal=1,Pr=1000,Action0,BuffType1=1,RelyType1=1,ID1=202,ActionVal=2",
     "AddEffect": false,
@@ -3002,13 +3002,13 @@
     "Desc": "被动1 触发调用子技能2，若目标没有减益效果，施加1回合【免疫】效果。",
     "From": 0,
     "Limit": 0,
+    "EmitPR": 1000,
     "Where": [
       "BuffRely,Rely1,Key=1,Op=3,Val=0"
     ],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490001001,Round=1,CallSkillPas,PasPr=1000,PasReVal=1",
     "AddEffect": false,
@@ -3025,11 +3025,11 @@
     "Desc": "被动2 触发调用子技能1，自身治疗量溢出的120%将转变为【护盾】效果，持续2回合。",
     "From": 0,
     "Limit": 0,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=300162105,Round=2,CallShieldBuff,BufDoVal=1,BufPr=1000,BufShieldSource2,BufShieldPar=1200",
     "AddEffect": false,
@@ -3046,11 +3046,11 @@
     "Desc": "对敌方单体造成攻击力130%的伤害",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=1300",
     "AddEffect": false,
@@ -3067,13 +3067,13 @@
     "Desc": "，并附加1层【猫猫威慑】状态。",
     "From": 4,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390004008,Round=-1,TagBuff,BufDoVal=1,BufPr=1000",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390004008,Round=-1,Type=TagBuff,BufDoVal=1,BufPr=1000",
     "AddEffect": false,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -3088,11 +3088,11 @@
     "Desc": "给自己加检测敌方死亡的被动",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400191102,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=200191104",
     "AddEffect": false,
@@ -3109,13 +3109,13 @@
     "Desc": "敌方死亡 触发调用子技能，携带者阵亡时清除此状态，并对携带者一方全体造成崔佛（释放者）攻击力40%的效果附加伤害，每层使伤害系数提升40%，最多可叠加5层。",
     "From": 2,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [
       "BuffRely,Rely0,Key=390004008,Op=4,Val=1"
     ],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,DetTarget1=1,DetType1=1,DetID1=390004008,DetTpyeVal1=1,DetQuaType1=1,DetVal1=400",
     "AddEffect": false,
@@ -3132,11 +3132,11 @@
     "Desc": "被动1 每次攻击后，没有Buff5，且标的生命值比例高于50%，则给自己添加行动结束前触发的被动6。每回合仅触发1次 （同时修改被动2回合CD）",
     "From": 3,
     "Limit": 0,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400192101,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=200192106,PasId2=200192107",
     "AddEffect": false,
@@ -3153,11 +3153,11 @@
     "Desc": "被动2 每次攻击后，没有Buff5，且目标的生命值比例小于等于50%，自身获得1层【猫猫推理】。每回合仅触发1次（同时修改被动1回合CD）",
     "From": 3,
     "Limit": 0,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400192102,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=200191108,PasId2=200192109",
     "AddEffect": false,
@@ -3174,11 +3174,11 @@
     "Desc": "被动3 每次攻击后，若有Buff5，则给自己添加行动结束前触发的被动6，并修改被动1,2的回合CD",
     "From": 3,
     "Limit": 0,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400192103,Round=1,CallSkillPas,PasPr=1000,PasCall0,PasReVal=-1,PasId1=200192106,PasId2=200192107,PasId3=200192109",
     "AddEffect": false,
@@ -3195,11 +3195,11 @@
     "Desc": "被动4 检测猫猫推理层数，达到2层立即重置全部技能的冷却时间，并且给自身加下一回合必定对目标进行重复攻击的标记Buff5，之后清除猫猫推理",
     "From": 3,
     "Limit": 0,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400192104,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=200192111,PasId2=200192112,PasId3=200192113,PasId4=200192115",
     "AddEffect": false,
@@ -3216,11 +3216,11 @@
     "Desc": "被动6 被动1，3 触发调用子技能1，给自己加行动结束前触发的被动6",
     "From": 3,
     "Limit": 0,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400192105,Round=1,CallSkillPas,PasPr=1000,PasCall0,PasReVal=-1,PasId1=200192113",
     "AddEffect": false,
@@ -3237,11 +3237,11 @@
     "Desc": "被动1,3 触发调用子技能2，修改被动2回合CD",
     "From": 3,
     "Limit": 0,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "BuffCD",
     "Argu": "DoVal=1,Pr=1000,Action,BuffType1=0,RelyType1=1,ID1=400192102,Qua1,Val=1",
     "AddEffect": false,
@@ -3258,13 +3258,13 @@
     "Desc": "被动2,3 触发调用子技能1，自身获得1层【猫猫推理】。每回合仅触发1次",
     "From": 3,
     "Limit": 0,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddBuff",
-    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=300192114,Round=-1,ProBuff,BufPro1=SufferDam,BufQuaType1=0,BufParNum1=1,BufVal1=150",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=300192114,Round=-1,Type=ProBuff,BufPro1=SufferDam,BufQuaType1=0,BufParNum1=1,BufVal1=150",
     "AddEffect": false,
     "FollowSK": [],
     "SucFollowSK": [],
@@ -3279,11 +3279,11 @@
     "Desc": "被动2 触发调用子技能2，修改被动1回合CD",
     "From": 3,
     "Limit": 0,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "BuffCD",
     "Argu": "DoVal=1,Pr=1000,Action,BuffType1=0,RelyType1=1,ID1=400192101,Qua1,Val=1",
     "AddEffect": false,
@@ -3300,11 +3300,11 @@
     "Desc": "被动4 触发调用子技能1，重置自身全部技能冷却时间。",
     "From": 3,
     "Limit": 0,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "SkillCD",
     "Argu": "DoVal=1,Pr=1000,Val1=3,infType1=0,Par1=10000",
     "AddEffect": false,
@@ -3321,11 +3321,11 @@
     "Desc": "被动4 触发调用子技能2，给自己加下次攻击必定重复攻击的Buff5",
     "From": 3,
     "Limit": 0,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400192112,Round=1,CallSkillPas,PasPr=1000,PasCall0,PasReVal=-1",
     "AddEffect": false,
@@ -3342,9 +3342,9 @@
     "Desc": "被动6 触发调用子技能，对该目标重复释放一次本次攻击所用技能",
     "From": 0,
     "Limit": 0,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [],
-    "EmitPR": 1000,
     "Type": "Again",
     "Argu": "DoVal=1,Pr=1000",
     "AddEffect": false,
@@ -3361,11 +3361,11 @@
     "Desc": "被动4 触发调用子技能3，移除猫猫推理",
     "From": 0,
     "Limit": 0,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "BuffAction",
     "Argu": "DoVal=3,Pr=1000,Action0,BuffType1=0,RelyType1=1,ID1=300192114",
     "AddEffect": false,
@@ -3382,11 +3382,11 @@
     "Desc": "被动1 当队友向敌方任意1个目标发起攻击时，给自己加被动2",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400622101,Round=-1,CallSkillPas",
     "AddEffect": false,
@@ -3403,11 +3403,11 @@
     "Desc": "被动2 友军行动结束前触发，跟随队友对目标造成攻击力40%的伤害",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=400622102,Round=1,DmgParPas,PasPr=1000,PasCall0,PasTarget=1,PasReVal=-1,PasDmgPar=400,PasId1=200626101",
     "AddEffect": false,
@@ -3424,11 +3424,11 @@
     "Desc": "被动1 触发调用子技能，对目标造成攻击力40%的伤害",
     "From": 0,
     "Limit": 0,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=400",
     "AddEffect": false,
@@ -3450,11 +3450,11 @@
     "Desc": "攻击时，如果自身血量大于50%，对敌方全体造成80%攻击力伤害",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490087001,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasDmgPar=400,PasId1=290087002",
     "AddEffect": false,
@@ -3471,11 +3471,11 @@
     "Desc": "对敌方全体造成80%攻击力伤害",
     "From": 2,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800",
     "AddEffect": false,
@@ -3495,9 +3495,9 @@
     "Desc": "受到伤害后触发，对敌方全体造成80%攻击力伤害",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490087002,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=290087002",
     "AddEffect": false,
@@ -3514,9 +3514,9 @@
     "Desc": "为自身添加一个永久的护盾状态，护盾值为自身攻击力的100%",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [],
-    "EmitPR": 1000,
     "Type": "AddBuff",
     "Argu": "DoVal=1,Pr=1000,Id=300192115,Round=-1,Type=ShieldBuff,BufProSou1=0,BufPro1=Total_Atk,BufProPar1=1000",
     "AddEffect": false,
@@ -3533,9 +3533,9 @@
     "Desc": "护盾被击破后触发，对敌方全体造成80%攻击力伤害",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490087003,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=290087002",
     "AddEffect": false,
@@ -3552,9 +3552,9 @@
     "Desc": "击破目标护盾后触发，对敌方全体造成80%攻击力伤害",
     "From": 3,
     "Limit": 1,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [],
-    "EmitPR": 1000,
     "Type": "AddPas",
     "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490087004,Round=-1,CallSkillPas,PasPr=1000,PasCall0,PasId1=290087002",
     "AddEffect": false,
@@ -3571,11 +3571,11 @@
     "Desc": "对敌方全体造成80%攻击力伤害",
     "From": 2,
     "Limit": 5,
+    "EmitPR": 1000,
     "Where": [],
     "Order": [
-      "Rnd"
+      "Type=Rnd"
     ],
-    "EmitPR": 1000,
     "Type": "Dmg",
     "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800",
     "AddEffect": false,
@@ -3586,5 +3586,494 @@
     "Tags": [],
     "RelyTags": [],
     "NoRelyTags": []
+  },
+  {
+    "Id": 210012,
+    "Desc": "对敌方造成80%攻击力伤害",
+    "From": 4,
+    "Limit": 1,
+    "EmitPR": 1000,
+    "Where": [],
+    "Order": [],
+    "Type": "Dmg",
+    "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800",
+    "AddEffect": false,
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
+  },
+  {
+    "Id": 210013,
+    "Desc": "回复当前目标5%最大生命值",
+    "From": 4,
+    "Limit": 1,
+    "EmitPR": 1000,
+    "Where": [],
+    "Order": [],
+    "Type": "Tre",
+    "Argu": "DoVal=1,Pr=1000,ProSou1=1,Pro1=NowTotal_Hp,ProPar1=50",
+    "AddEffect": false,
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
+  },
+  {
+    "Id": 210014,
+    "Desc": "回复全体5%最大生命值",
+    "From": 1,
+    "Limit": 5,
+    "EmitPR": 1000,
+    "Where": [],
+    "Order": [
+      "Type=Rnd"
+    ],
+    "Type": "Tre",
+    "Argu": "DoVal=1,Pr=1000,ProSou1=1,Pro1=NowTotal_Hp,ProPar1=50",
+    "AddEffect": false,
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
+  },
+  {
+    "Id": 225004011,
+    "Desc": "友方全体生命值提升30%",
+    "From": 1,
+    "Limit": 10,
+    "EmitPR": 1000,
+    "Where": [],
+    "Order": [],
+    "Type": "AddBuff",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001001,Round=2,Type=ProBuff,BufPro1=Total_Hp,BufVal1=300,BufQuaType1=1",
+    "AddEffect": false,
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
+  },
+  {
+    "Id": 225004111,
+    "Desc": "攻击一个敌方3次，每次伤害为自身攻击力的30%",
+    "From": 4,
+    "Limit": 1,
+    "EmitPR": 1000,
+    "Where": [],
+    "Order": [],
+    "Type": "Dmg",
+    "Argu": "DoVal=3,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=300",
+    "AddEffect": false,
+    "FollowSK": [
+      290012102
+    ],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
+  },
+  {
+    "Id": 225004112,
+    "Desc": "40%的概率为自身附加2回合免疫",
+    "From": 3,
+    "Limit": 1,
+    "EmitPR": 400,
+    "Where": [],
+    "Order": [],
+    "Type": "AddBuff",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390005002,Round=2",
+    "AddEffect": false,
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
+  },
+  {
+    "Id": 225004121,
+    "Desc": "攻击一个敌方3次，每次伤害为自身攻击力的35%",
+    "From": 4,
+    "Limit": 1,
+    "EmitPR": 1000,
+    "Where": [],
+    "Order": [],
+    "Type": "Dmg",
+    "Argu": "DoVal=3,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=350",
+    "AddEffect": false,
+    "FollowSK": [
+      290012112
+    ],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
+  },
+  {
+    "Id": 225004122,
+    "Desc": "40%的概率为自身附加2回合免疫",
+    "From": 3,
+    "Limit": 1,
+    "EmitPR": 400,
+    "Where": [],
+    "Order": [],
+    "Type": "AddBuff",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390005002,Round=2",
+    "AddEffect": false,
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
+  },
+  {
+    "Id": 225004131,
+    "Desc": "攻击一个敌方3次，每次伤害为自身攻击力的35%",
+    "From": 4,
+    "Limit": 1,
+    "EmitPR": 1000,
+    "Where": [],
+    "Order": [],
+    "Type": "Dmg",
+    "Argu": "DoVal=3,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=350",
+    "AddEffect": false,
+    "FollowSK": [
+      290012122
+    ],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
+  },
+  {
+    "Id": 225004132,
+    "Desc": "50%的概率为自身附加2回合免疫",
+    "From": 3,
+    "Limit": 1,
+    "EmitPR": 500,
+    "Where": [],
+    "Order": [],
+    "Type": "AddBuff",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390005002,Round=2",
+    "AddEffect": false,
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
+  },
+  {
+    "Id": 225004141,
+    "Desc": "攻击一个敌方3次，每次伤害为自身攻击力的40%",
+    "From": 4,
+    "Limit": 1,
+    "EmitPR": 1000,
+    "Where": [],
+    "Order": [],
+    "Type": "Dmg",
+    "Argu": "DoVal=3,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=400",
+    "AddEffect": false,
+    "FollowSK": [
+      290012132
+    ],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
+  },
+  {
+    "Id": 225004142,
+    "Desc": "50%的概率为自身附加2回合免疫",
+    "From": 3,
+    "Limit": 1,
+    "EmitPR": 500,
+    "Where": [],
+    "Order": [],
+    "Type": "AddBuff",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390005002,Round=2",
+    "AddEffect": false,
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
+  },
+  {
+    "Id": 225004151,
+    "Desc": "攻击一个敌方3次，每次伤害为自身攻击力的40%",
+    "From": 4,
+    "Limit": 1,
+    "EmitPR": 1000,
+    "Where": [],
+    "Order": [],
+    "Type": "Dmg",
+    "Argu": "DoVal=3,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=400",
+    "AddEffect": false,
+    "FollowSK": [
+      290012142
+    ],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
+  },
+  {
+    "Id": 225004152,
+    "Desc": "60%的概率为自身附加2回合免疫",
+    "From": 3,
+    "Limit": 1,
+    "EmitPR": 600,
+    "Where": [],
+    "Order": [],
+    "Type": "AddBuff",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390005002,Round=2",
+    "AddEffect": false,
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
+  },
+  {
+    "Id": 225004161,
+    "Desc": "攻击一个敌方3次，每次伤害为自身攻击力的45%",
+    "From": 4,
+    "Limit": 1,
+    "EmitPR": 1000,
+    "Where": [],
+    "Order": [],
+    "Type": "Dmg",
+    "Argu": "DoVal=3,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=450",
+    "AddEffect": false,
+    "FollowSK": [
+      290012152
+    ],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
+  },
+  {
+    "Id": 225004162,
+    "Desc": "60%的概率为自身附加2回合免疫",
+    "From": 3,
+    "Limit": 1,
+    "EmitPR": 600,
+    "Where": [],
+    "Order": [],
+    "Type": "AddBuff",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390005002,Round=2",
+    "AddEffect": false,
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
+  },
+  {
+    "Id": 225004211,
+    "Desc": "净化全体友方减益",
+    "From": 1,
+    "Limit": 10,
+    "EmitPR": 1000,
+    "Where": [],
+    "Order": [],
+    "Type": "RemoveDebuff",
+    "Argu": "DoVal=1,Pr=1000",
+    "AddEffect": false,
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
+  },
+  {
+    "Id": 225004212,
+    "Desc": "平衡全体友方生命比例",
+    "From": 1,
+    "Limit": 10,
+    "EmitPR": 1000,
+    "Where": [],
+    "Order": [],
+    "Type": "AveTre",
+    "Argu": "DoVal=1,Pr=1000,Average=1",
+    "AddEffect": false,
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
+  },
+  {
+    "Id": 225004213,
+    "Desc": "为全体友方附加2回合【攻击提升】",
+    "From": 1,
+    "Limit": 10,
+    "EmitPR": 1000,
+    "Where": [],
+    "Order": [],
+    "Type": "AddBuff",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001001,Round=2,Type=ProBuff,BufPro1=Total_Atk,BufVal1=400,BufQuaType1=1",
+    "AddEffect": false,
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
+  },
+  {
+    "Id": 225004311,
+    "Desc": "获得2回合的【丰收的喜悦】。效果期间自身无法行动",
+    "From": 3,
+    "Limit": 1,
+    "EmitPR": 1000,
+    "Where": [],
+    "Order": [],
+    "Type": "AddBuff",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390004009,Round=2,Type=TagBuff",
+    "AddEffect": false,
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
+  },
+  {
+    "Id": 225004312,
+    "Desc": "获得2回合的【丰收的喜悦】。全体友方受到伤害降低25%",
+    "From": 3,
+    "Limit": 1,
+    "EmitPR": 1000,
+    "Where": [],
+    "Order": [],
+    "Type": "AddBuff",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=300102103,Round=2,Type=ProBuff,BufPro1=SufferDam,BufVal1=250,BufQuaType1=1",
+    "AddEffect": false,
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
+  },
+  {
+    "Id": 225004313,
+    "Desc": "添加行动前检测的被动",
+    "From": 3,
+    "Limit": 1,
+    "EmitPR": 1000,
+    "Where": [],
+    "Order": [],
+    "Type": "AddPas",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=425004301,Round=2,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=290012304",
+    "AddEffect": false,
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
+  },
+  {
+    "Id": 225004314,
+    "Desc": "治疗即将行动的友方，治疗量为目标最大生命值20%",
+    "From": 1,
+    "Limit": 1,
+    "EmitPR": 1000,
+    "Where": [],
+    "Order": [],
+    "Type": "Tre",
+    "Argu": "DoVal=1,Pr=1000,ProSou1=1,Pro1=Total_Hp,ProPar1=20,DetTarget1=1",
+    "AddEffect": false,
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
+  },
+  {
+    "Id": 225004315,
+    "Desc": "并净化其1个减益",
+    "From": 1,
+    "Limit": 1,
+    "EmitPR": 1000,
+    "Where": [],
+    "Order": [],
+    "Type": "RemoveDebuff",
+    "Argu": "DoVal=1,Pr=1000",
+    "AddEffect": false,
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
+  },
+  {
+    "Id": 235002011,
+    "Desc": "友方全体效果命中提升40%",
+    "From": 1,
+    "Limit": 10,
+    "EmitPR": 1000,
+    "Where": [],
+    "Order": [],
+    "Type": "AddBuff",
+    "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001001,Round=2,Type=ProBuff,BufPro1=Total_Hp,BufVal1=300,BufQuaType1=1",
+    "AddEffect": false,
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json
index 0ee7c60f4..b7ad24739 100644
--- a/bin/json/game_skillatk.json
+++ b/bin/json/game_skillatk.json
@@ -113,9 +113,7 @@
       "skill_190011003",
       "skill_190011004"
     ],
-    "buffid": [
-      390002001
-    ]
+    "buffid": []
   },
   {
     "Id": 190013000,
@@ -235,10 +233,7 @@
       "skill_190011003",
       "skill_190011004"
     ],
-    "buffid": [
-      390001002,
-      390003001
-    ]
+    "buffid": []
   },
   {
     "Id": 190015000,
@@ -354,9 +349,7 @@
       "skill_190011003",
       "skill_190011004"
     ],
-    "buffid": [
-      390001001
-    ]
+    "buffid": []
   },
   {
     "Id": 190017000,
@@ -416,9 +409,7 @@
       "skill_190011003",
       "skill_190011004"
     ],
-    "buffid": [
-      390004008
-    ]
+    "buffid": []
   },
   {
     "Id": 190018000,
@@ -5217,10 +5208,10 @@
     "buffid": []
   },
   {
-    "Id": 110011,
+    "Id": 110010,
     "Name": {
-      "key": "skillname_110011",
-      "text": "熊猫拳"
+      "key": "skillname_110010",
+      "text": "阿宝队长技"
     },
     "ico": "skillicon_001",
     "act": "Skill_1",
@@ -5238,32 +5229,86 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
+        ]
+      }
+    ],
+    "Desc": [],
+    "buffid": []
+  },
+  {
+    "Id": 110011,
+    "Name": {
+      "key": "skillname_110011",
+      "text": "熊猫拳"
+    },
+    "ico": "skillicon_001",
+    "act": "Skill_1",
+    "Type": 0,
+    "MaxLV": 6,
+    "CD": [
+      4,
+      4,
+      4,
+      4,
+      4,
+      4
+    ],
+    "Target": 2,
+    "ChildSkill": [
+      {
+        "Id": [
+          210012
+        ]
+      },
+      {
+        "Id": [
+          210012
+        ]
+      },
+      {
+        "Id": [
+          210012
+        ]
+      },
+      {
+        "Id": [
+          210012
+        ]
+      },
+      {
+        "Id": [
+          210012
+        ]
+      },
+      {
+        "Id": [
+          210012
         ]
       }
     ],
@@ -5288,36 +5333,36 @@
       4,
       4
     ],
-    "Target": 1,
+    "Target": 2,
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       }
     ],
@@ -5342,7 +5387,7 @@
       4,
       4
     ],
-    "Target": 1,
+    "Target": 4,
     "ChildSkill": [
       {
         "Id": [
@@ -5400,32 +5445,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       }
     ],
@@ -5454,32 +5499,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210013
         ]
       },
       {
         "Id": [
-          210011
+          210013
         ]
       },
       {
         "Id": [
-          210011
+          210013
         ]
       },
       {
         "Id": [
-          210011
+          210013
         ]
       },
       {
         "Id": [
-          210011
+          210013
         ]
       },
       {
         "Id": [
-          210011
+          210013
         ]
       }
     ],
@@ -5508,32 +5553,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       }
     ],
@@ -5562,32 +5607,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       }
     ],
@@ -5778,32 +5823,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       }
     ],
@@ -5886,32 +5931,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       }
     ],
@@ -5940,32 +5985,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       }
     ],
@@ -6102,32 +6147,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       }
     ],
@@ -6210,32 +6255,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       }
     ],
@@ -6264,32 +6309,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       }
     ],
@@ -6372,32 +6417,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       }
     ],
@@ -6426,32 +6471,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       }
     ],
@@ -6480,32 +6525,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       }
     ],
@@ -6534,32 +6579,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       },
       {
         "Id": [
-          210011
+          210012
         ]
       }
     ],
@@ -6588,32 +6633,32 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210013
         ]
       },
       {
         "Id": [
-          210011
+          210013
         ]
       },
       {
         "Id": [
-          210011
+          210013
         ]
       },
       {
         "Id": [
-          210011
+          210013
         ]
       },
       {
         "Id": [
-          210011
+          210013
         ]
       },
       {
         "Id": [
-          210011
+          210013
         ]
       }
     ],
@@ -6642,36 +6687,238 @@
     "ChildSkill": [
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       },
       {
         "Id": [
-          210011
+          210014
         ]
       }
     ],
     "Desc": [],
     "buffid": []
+  },
+  {
+    "Id": 125004011,
+    "Name": {
+      "key": "skillname_110083",
+      "text": "波比队长技"
+    },
+    "ico": "jn_dzj_01",
+    "act": "",
+    "Type": 3,
+    "MaxLV": 1,
+    "CD": [
+      -1,
+      -1,
+      -1,
+      -1,
+      -1,
+      -1
+    ],
+    "Target": 1,
+    "ChildSkill": [
+      {
+        "Id": [
+          225004011
+        ]
+      }
+    ],
+    "Desc": [
+      "队长技：我方全体效果抵抗增加30%"
+    ],
+    "buffid": []
+  },
+  {
+    "Id": 125004111,
+    "Name": {
+      "key": "skillname_150051",
+      "text": "波比1技能"
+    },
+    "ico": "jn_icon_001",
+    "act": "Skill_1",
+    "Type": 1,
+    "MaxLV": 6,
+    "CD": [
+      0,
+      0,
+      0,
+      0,
+      0,
+      0
+    ],
+    "Target": 4,
+    "ChildSkill": [
+      {
+        "Id": [
+          225004111,
+          225004112
+        ]
+      },
+      {
+        "Id": [
+          225004121,
+          225004122
+        ]
+      },
+      {
+        "Id": [
+          225004131,
+          225004132
+        ]
+      },
+      {
+        "Id": [
+          225004141,
+          225004142
+        ]
+      },
+      {
+        "Id": [
+          225004151,
+          225004152
+        ]
+      },
+      {
+        "Id": [
+          225004161,
+          225004162
+        ]
+      }
+    ],
+    "Desc": [
+      "波比对敌方1个目标造成3次攻击力30%的伤害，有40%概率为自身附加2回合【免疫】状态",
+      "伤害提升至35%",
+      "概率触发概率提升至50%",
+      "伤害提升至40%",
+      "概率触发概率提升至60%",
+      "伤害提升至45%"
+    ],
+    "buffid": []
+  },
+  {
+    "Id": 125004211,
+    "Name": {
+      "key": "skillname_150052",
+      "text": "波比2技能"
+    },
+    "ico": "jn_icon_002",
+    "act": "Skill_2",
+    "Type": 2,
+    "MaxLV": 3,
+    "CD": [
+      5,
+      4,
+      3,
+      3,
+      3,
+      3
+    ],
+    "Target": 1,
+    "ChildSkill": [
+      {
+        "Id": [
+          225004211,
+          225004212,
+          225004213
+        ]
+      },
+      {
+        "Id": [
+          225004211,
+          225004212,
+          225004213
+        ]
+      },
+      {
+        "Id": [
+          225004211,
+          225004212,
+          225004213
+        ]
+      }
+    ],
+    "Desc": [
+      "波比清除我方所有减益状态，并平均分配我方生命值百分比，为我方全体附加2回合【攻击提升】状态",
+      "冷却时间减少1回合",
+      "冷却时间减少1回合"
+    ],
+    "buffid": []
+  },
+  {
+    "Id": 125004311,
+    "Name": {
+      "key": "skillname_150053",
+      "text": "波比3技能"
+    },
+    "ico": "jn_icon_003",
+    "act": "Skill_3",
+    "Type": 1,
+    "MaxLV": 5,
+    "CD": [
+      5,
+      5,
+      5,
+      5,
+      4,
+      4
+    ],
+    "Target": 1,
+    "ChildSkill": [
+      {
+        "Id": [
+          225004311
+        ]
+      },
+      {
+        "Id": [
+          225004312
+        ]
+      },
+      {
+        "Id": [
+          225004313
+        ]
+      },
+      {
+        "Id": [
+          225004314
+        ]
+      },
+      {
+        "Id": [
+          225004315
+        ]
+      }
+    ],
+    "Desc": [
+      "进入2回合【喜悦】状态，使我方全体收到伤害降低25%，且在每个队友行动去，为其驱散1个减益状态并回复其最大生命值20%的生命，效果持续期间自身无法行动",
+      "恢复量提升至22%",
+      "恢复量提升至24%",
+      "恢复量提升至26%",
+      "冷却时间减少1回合"
+    ],
+    "buffid": []
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json
index 9a560db7c..6b276cade 100644
--- a/bin/json/game_skillbuff.json
+++ b/bin/json/game_skillbuff.json
@@ -8,19 +8,18 @@
     },
     "Desc": {
       "key": "skill_buffdes_390001001",
-      "text": "攻击提升40%"
+      "text": "攻击提升"
     },
     "Tags": [
-      "201"
+      "201",
+      "402"
     ],
     "OverlayTimes": 0,
     "SameID": false,
     "RelyTags": [],
-    "NoRelyTags": [
-      "402"
-    ],
-    "buffico": "buff_2",
-    "buffeffect": "effect_buff_attackup",
+    "NoRelyTags": [],
+    "buffico": "",
+    "buffeffect": "",
     "buffpos": ""
   },
   {
@@ -32,19 +31,18 @@
     },
     "Desc": {
       "key": "skill_buffdes_390001002",
-      "text": "防御提升60%"
+      "text": "防御提升"
     },
     "Tags": [
-      "201"
+      "201",
+      "402"
     ],
     "OverlayTimes": 0,
     "SameID": false,
     "RelyTags": [],
-    "NoRelyTags": [
-      "402"
-    ],
-    "buffico": "buff_1",
-    "buffeffect": "effect_buff_fangyu",
+    "NoRelyTags": [],
+    "buffico": "",
+    "buffeffect": "",
     "buffpos": ""
   },
   {
@@ -56,17 +54,16 @@
     },
     "Desc": {
       "key": "skill_buffdes_390001003",
-      "text": "速度提升30%"
+      "text": "速度提升"
     },
     "Tags": [
-      "201"
+      "201",
+      "402"
     ],
     "OverlayTimes": 0,
     "SameID": false,
     "RelyTags": [],
-    "NoRelyTags": [
-      "402"
-    ],
+    "NoRelyTags": [],
     "buffico": "",
     "buffeffect": "",
     "buffpos": ""
@@ -80,17 +77,16 @@
     },
     "Desc": {
       "key": "skill_buffdes_390001004",
-      "text": "暴击率提升30%"
+      "text": "暴击率提升"
     },
     "Tags": [
-      "201"
+      "201",
+      "402"
     ],
     "OverlayTimes": 0,
     "SameID": false,
     "RelyTags": [],
-    "NoRelyTags": [
-      "402"
-    ],
+    "NoRelyTags": [],
     "buffico": "",
     "buffeffect": "",
     "buffpos": ""
@@ -104,17 +100,16 @@
     },
     "Desc": {
       "key": "skill_buffdes_390001005",
-      "text": "受到暴击概率降低30%"
+      "text": "受到暴击概率降低"
     },
     "Tags": [
-      "201"
+      "201",
+      "402"
     ],
     "OverlayTimes": 0,
     "SameID": false,
     "RelyTags": [],
-    "NoRelyTags": [
-      "402"
-    ],
+    "NoRelyTags": [],
     "buffico": "",
     "buffeffect": "",
     "buffpos": ""
@@ -131,14 +126,14 @@
       "text": "（无法驱散类状态）每层使自身攻击力提升5%，每10层使自身受到伤害降低3%。最高可叠加50层"
     },
     "Tags": [
-      "303"
+      "303",
+      "50",
+      "True"
     ],
-    "OverlayTimes": 50,
-    "SameID": true,
+    "OverlayTimes": 0,
+    "SameID": false,
     "RelyTags": [],
-    "NoRelyTags": [
-      "402"
-    ],
+    "NoRelyTags": [],
     "buffico": "",
     "buffeffect": "",
     "buffpos": ""
@@ -155,14 +150,14 @@
       "text": "每层使自身基础防御提升10%，效果抵抗提升5%，最多可叠加10层。"
     },
     "Tags": [
-      "201"
+      "303",
+      "10",
+      "True"
     ],
     "OverlayTimes": 0,
     "SameID": false,
     "RelyTags": [],
-    "NoRelyTags": [
-      "402"
-    ],
+    "NoRelyTags": [],
     "buffico": "",
     "buffeffect": "",
     "buffpos": ""
@@ -179,14 +174,14 @@
       "text": "每次受到攻击提升20%的防御，最多叠加5层"
     },
     "Tags": [
-      "201"
+      "303",
+      "5",
+      "True"
     ],
-    "OverlayTimes": 5,
-    "SameID": true,
+    "OverlayTimes": 0,
+    "SameID": false,
     "RelyTags": [],
-    "NoRelyTags": [
-      "402"
-    ],
+    "NoRelyTags": [],
     "buffico": "",
     "buffeffect": "",
     "buffpos": ""
@@ -200,17 +195,16 @@
     },
     "Desc": {
       "key": "skill_buffdes_390002001",
-      "text": "攻击下降40%"
+      "text": "攻击下降"
     },
     "Tags": [
-      "202"
+      "202",
+      "302"
     ],
     "OverlayTimes": 0,
     "SameID": false,
     "RelyTags": [],
-    "NoRelyTags": [
-      "302"
-    ],
+    "NoRelyTags": [],
     "buffico": "",
     "buffeffect": "",
     "buffpos": ""
@@ -224,17 +218,16 @@
     },
     "Desc": {
       "key": "skill_buffdes_390002002",
-      "text": "防御下降60%"
+      "text": "防御下降"
     },
     "Tags": [
-      "202"
+      "202",
+      "302"
     ],
     "OverlayTimes": 0,
     "SameID": false,
     "RelyTags": [],
-    "NoRelyTags": [
-      "302"
-    ],
+    "NoRelyTags": [],
     "buffico": "",
     "buffeffect": "",
     "buffpos": ""
@@ -248,17 +241,16 @@
     },
     "Desc": {
       "key": "skill_buffdes_390002003",
-      "text": "速度下降30%"
+      "text": "速度下降"
     },
     "Tags": [
-      "202"
+      "202",
+      "302"
     ],
     "OverlayTimes": 0,
     "SameID": false,
     "RelyTags": [],
-    "NoRelyTags": [
-      "302"
-    ],
+    "NoRelyTags": [],
     "buffico": "",
     "buffeffect": "",
     "buffpos": ""
@@ -272,17 +264,16 @@
     },
     "Desc": {
       "key": "skill_buffdes_390002004",
-      "text": "暴击率下降30%"
+      "text": "暴击率下降"
     },
     "Tags": [
-      "202"
+      "202",
+      "302"
     ],
     "OverlayTimes": 0,
     "SameID": false,
     "RelyTags": [],
-    "NoRelyTags": [
-      "302"
-    ],
+    "NoRelyTags": [],
     "buffico": "",
     "buffeffect": "",
     "buffpos": ""
@@ -296,17 +287,16 @@
     },
     "Desc": {
       "key": "skill_buffdes_390002005",
-      "text": "被攻击时，受到的伤害提高25%"
+      "text": "被攻击时，受到的伤害提高"
     },
     "Tags": [
-      "202"
+      "202",
+      "302"
     ],
     "OverlayTimes": 0,
     "SameID": false,
     "RelyTags": [],
-    "NoRelyTags": [
-      "302"
-    ],
+    "NoRelyTags": [],
     "buffico": "",
     "buffeffect": "",
     "buffpos": ""
@@ -320,24 +310,23 @@
     },
     "Desc": {
       "key": "skill_buffdes_390002006",
-      "text": "失手率提升50%"
+      "text": "失手率提升"
     },
     "Tags": [
-      "202"
+      "202",
+      "302"
     ],
     "OverlayTimes": 0,
     "SameID": false,
     "RelyTags": [],
-    "NoRelyTags": [
-      "302"
-    ],
+    "NoRelyTags": [],
     "buffico": "",
     "buffeffect": "",
     "buffpos": ""
   },
   {
     "Id": 390003001,
-    "Type": "TagBuff",
+    "Type": "ProBuff",
     "Name": {
       "key": "skill_buff_390003001",
       "text": "无敌"
@@ -347,22 +336,19 @@
       "text": "不会受到任何伤害"
     },
     "Tags": [
-      "201",
       "301"
     ],
     "OverlayTimes": 0,
     "SameID": false,
     "RelyTags": [],
-    "NoRelyTags": [
-      "402"
-    ],
+    "NoRelyTags": [],
     "buffico": "",
     "buffeffect": "",
     "buffpos": ""
   },
   {
     "Id": 390003002,
-    "Type": "TagBuff",
+    "Type": "ProBuff",
     "Name": {
       "key": "skill_buff_390003002",
       "text": "对峙"
@@ -372,22 +358,19 @@
       "text": "生命最低降为1"
     },
     "Tags": [
-      "201",
       "501"
     ],
     "OverlayTimes": 0,
     "SameID": false,
     "RelyTags": [],
-    "NoRelyTags": [
-      "402"
-    ],
+    "NoRelyTags": [],
     "buffico": "",
     "buffeffect": "",
     "buffpos": ""
   },
   {
     "Id": 390003003,
-    "Type": "TagBuff",
+    "Type": "ProBuff",
     "Name": {
       "key": "skill_buff_390003003",
       "text": "免疫控制效果"
@@ -402,16 +385,14 @@
     "OverlayTimes": 0,
     "SameID": false,
     "RelyTags": [],
-    "NoRelyTags": [
-      "402"
-    ],
+    "NoRelyTags": [],
     "buffico": "",
     "buffeffect": "",
     "buffpos": ""
   },
   {
     "Id": 390003004,
-    "Type": "TagBuff",
+    "Type": "ProBuff",
     "Name": {
       "key": "skill_buff_390003004",
       "text": "免除死亡"
@@ -440,20 +421,19 @@
     },
     "Desc": {
       "key": "skill_buffdes_390004001",
-      "text": "无法进行任务行动"
+      "text": "无法进行任何行动"
     },
     "Tags": [
       "202",
-      "604"
+      "604",
+      "302"
     ],
     "OverlayTimes": 0,
     "SameID": false,
     "RelyTags": [],
-    "NoRelyTags": [
-      "302"
-    ],
+    "NoRelyTags": [],
     "buffico": "",
-    "buffeffect": "effect_buff_xuanyun",
+    "buffeffect": "",
     "buffpos": ""
   },
   {
@@ -469,16 +449,15 @@
     },
     "Tags": [
       "202",
-      "604"
+      "604",
+      "302"
     ],
     "OverlayTimes": 0,
     "SameID": false,
     "RelyTags": [],
-    "NoRelyTags": [
-      "302"
-    ],
+    "NoRelyTags": [],
     "buffico": "",
-    "buffeffect": "effect_buff_bingdong",
+    "buffeffect": "",
     "buffpos": ""
   },
   {
@@ -494,14 +473,13 @@
     },
     "Tags": [
       "202",
-      "401"
+      "401",
+      "302"
     ],
     "OverlayTimes": 0,
     "SameID": false,
     "RelyTags": [],
-    "NoRelyTags": [
-      "302"
-    ],
+    "NoRelyTags": [],
     "buffico": "",
     "buffeffect": "",
     "buffpos": ""
@@ -519,17 +497,13 @@
     },
     "Tags": [
       "202",
-      "604",
       "602",
-      "204"
+      "302"
     ],
     "OverlayTimes": 0,
     "SameID": false,
     "RelyTags": [],
-    "NoRelyTags": [
-      "302",
-      "304"
-    ],
+    "NoRelyTags": [],
     "buffico": "",
     "buffeffect": "",
     "buffpos": ""
@@ -548,15 +522,12 @@
     "Tags": [
       "202",
       "603",
-      "204"
+      "302"
     ],
     "OverlayTimes": 0,
     "SameID": false,
     "RelyTags": [],
-    "NoRelyTags": [
-      "302",
-      "304"
-    ],
+    "NoRelyTags": [],
     "buffico": "",
     "buffeffect": "",
     "buffpos": ""
@@ -574,17 +545,13 @@
     },
     "Tags": [
       "202",
-      "604",
       "606",
-      "204"
+      "302"
     ],
     "OverlayTimes": 0,
     "SameID": false,
     "RelyTags": [],
-    "NoRelyTags": [
-      "302",
-      "304"
-    ],
+    "NoRelyTags": [],
     "buffico": "",
     "buffeffect": "",
     "buffpos": ""
@@ -602,15 +569,13 @@
     },
     "Tags": [
       "202",
-      "204"
+      "603",
+      "302"
     ],
     "OverlayTimes": 0,
     "SameID": false,
     "RelyTags": [],
-    "NoRelyTags": [
-      "302",
-      "304"
-    ],
+    "NoRelyTags": [],
     "buffico": "",
     "buffeffect": "",
     "buffpos": ""
@@ -620,21 +585,20 @@
     "Type": "TagBuff",
     "Name": {
       "key": "skill_buff_390004008",
-      "text": "猫猫威慑  "
+      "text": "猫猫威慑"
     },
     "Desc": {
       "key": "skill_buffdes_390004008",
       "text": "携带者阵亡时清除此状态，并对携带者一方全体造成崔佛（释放者）攻击力40%的效果附加伤害，每层使伤害系数提升40%，最多可叠加5层。"
     },
     "Tags": [
-      "202"
+      "202",
+      "302"
     ],
     "OverlayTimes": 0,
     "SameID": false,
     "RelyTags": [],
-    "NoRelyTags": [
-      "302"
-    ],
+    "NoRelyTags": [],
     "buffico": "",
     "buffeffect": "",
     "buffpos": ""
@@ -651,8 +615,9 @@
       "text": "（无法驱散类状态）可以增强炎阳灼射的威力。"
     },
     "Tags": [
-      "201",
-      "303"
+      "202",
+      "303",
+      "302"
     ],
     "OverlayTimes": 0,
     "SameID": false,
@@ -667,11 +632,11 @@
     "Type": "TagBuff",
     "Name": {
       "key": "skill_buff_390005002",
-      "text": "无法获得减益"
+      "text": "免疫"
     },
     "Desc": {
       "key": "skill_buffdes_390005002",
-      "text": "无法获得减益效果（不可驱散）（不配置标签）"
+      "text": "无法获得减益效果"
     },
     "Tags": [
       "302"
@@ -715,10 +680,10 @@
     },
     "Desc": {
       "key": "skill_buffdes_390006001",
-      "text": "无法附加增益状态（不可驱散）（不配置标签）"
+      "text": "无法附加增益状态"
     },
     "Tags": [
-      "302"
+      "402"
     ],
     "OverlayTimes": 0,
     "SameID": false,
@@ -737,9 +702,12 @@
     },
     "Desc": {
       "key": "skill_buffdes_300102103",
-      "text": "受到的所有伤害降低10%"
+      "text": "受到的所有伤害降低"
     },
-    "Tags": [],
+    "Tags": [
+      "201",
+      "402"
+    ],
     "OverlayTimes": 0,
     "SameID": false,
     "RelyTags": [],
@@ -750,7 +718,7 @@
   },
   {
     "Id": 300162105,
-    "Type": "CallShieldBuff",
+    "Type": "CallShield",
     "Name": {
       "key": "",
       "text": ""
@@ -759,7 +727,10 @@
       "key": "",
       "text": ""
     },
-    "Tags": [],
+    "Tags": [
+      "201",
+      "402"
+    ],
     "OverlayTimes": 0,
     "SameID": false,
     "RelyTags": [],
@@ -780,10 +751,13 @@
       "text": "每层为崔佛（释放者）提供15%伤害减免"
     },
     "Tags": [
-      "201"
+      "201",
+      "2",
+      "True",
+      "402"
     ],
-    "OverlayTimes": 2,
-    "SameID": true,
+    "OverlayTimes": 0,
+    "SameID": false,
     "RelyTags": [],
     "NoRelyTags": [],
     "buffico": "",
@@ -802,7 +776,8 @@
       "text": "增加护盾"
     },
     "Tags": [
-      "102"
+      "201",
+      "402"
     ],
     "OverlayTimes": 0,
     "SameID": false,
diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json
index dcb6ed11b..c35a815d0 100644
--- a/bin/json/game_skillpassive.json
+++ b/bin/json/game_skillpassive.json
@@ -519,7 +519,7 @@
     "When": "ImpEff",
     "Where": "Target=3,Eff1,EffID=101,TriLim=1",
     "AddCon": [
-      "BuffRely,Rely0,Key=300192112,Op=1,Val=1",
+      "Type=BuffRely,RelyType=0,Key=300192112,Op=1,Val=1",
       "ProJudge,Judge1,Key=NowHp_Per,Op=0,Val=500"
     ],
     "Type": "CallSkillPas",
@@ -536,7 +536,7 @@
     "When": "ImpEff",
     "Where": "Target=3,Eff1,EffID=101,TriLim=1",
     "AddCon": [
-      "BuffRely,Rely0,Key=300192112,Op=1,Val=1",
+      "Type=BuffRely,RelyType=0,Key=300192112,Op=1,Val=1",
       "ProJudge,Judge1,Key=NowHp_Per,Op=5,Val=500"
     ],
     "Type": "CallSkillPas",
@@ -553,7 +553,7 @@
     "When": "ImpEff",
     "Where": "Target=3,Eff1,EffID=101,TriLim=1",
     "AddCon": [
-      "BuffRely,Rely0,Key=300192112,Op=0,Val=0"
+      "Type=BuffRely,RelyType=0,Key=300192112,Op=0,Val=0"
     ],
     "Type": "CallSkillPas",
     "MaxEmitTimes": 0,
@@ -569,7 +569,7 @@
     "When": "ImpEff",
     "Where": "Target=3,Eff0,EffID=300192114",
     "AddCon": [
-      "BuffRely,Rely0,Key=300192114,Op=0,Val=1"
+      "Type=BuffRely,RelyType=0,Key=300192114,Op=0,Val=1"
     ],
     "Type": "CallSkillPas",
     "MaxEmitTimes": 0,
@@ -627,7 +627,7 @@
     "When": "ImpEff",
     "Where": "Target=3,Eff1,EffID=101",
     "AddCon": [
-      "ProJudge,Judge1,Key=NowHp_Per,Op=0,Val=500"
+      "Type=ProJudge,RelyType=1,Key=NowHp_Per,Op=0,Val=500"
     ],
     "Type": "CallSkillPas",
     "MaxEmitTimes": 0,
@@ -678,5 +678,21 @@
     "Tags": [],
     "RelyTags": [],
     "NoRelyTags": []
+  },
+  {
+    "Id": 425004301,
+    "Desc": "友方攻击时检测",
+    "When": "RouFro",
+    "Where": "Target=4,TesLim=1,TriLim=1",
+    "AddCon": [
+      "Type=CallSkillPas"
+    ],
+    "Type": "",
+    "MaxEmitTimes": 0,
+    "OverlayTimes": 0,
+    "SameID": false,
+    "Tags": [],
+    "RelyTags": [],
+    "NoRelyTags": []
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_ui.json b/bin/json/game_ui.json
index a7dbaad1c..5e6e7ef23 100644
--- a/bin/json/game_ui.json
+++ b/bin/json/game_ui.json
@@ -518,7 +518,7 @@
   {
     "id": "manual",
     "file": "HeroManualWindow",
-    "unloadpkg": 1,
+    "unloadpkg": 2,
     "loadtype": 0,
     "full": 1,
     "blur": 0,
@@ -706,5 +706,41 @@
     "packagename": "zhandou",
     "comname": "cropping",
     "des": "遮幅"
+  },
+  {
+    "id": "saleconfirmpopup",
+    "file": "SaleConfirmPopup",
+    "unloadpkg": 3,
+    "loadtype": 1,
+    "full": 0,
+    "blur": 1,
+    "package": "tips/tips",
+    "packagename": "tips",
+    "comname": "SaleTips",
+    "des": "出售确认弹窗"
+  },
+  {
+    "id": "accesstopopup",
+    "file": "AccessToPopup",
+    "unloadpkg": 3,
+    "loadtype": 1,
+    "full": 0,
+    "blur": 1,
+    "package": "tips/tips",
+    "packagename": "tips",
+    "comname": "AccessTo",
+    "des": "跳转弹窗"
+  },
+  {
+    "id": "rolestrategy",
+    "file": "RoleStrategyWindow",
+    "unloadpkg": 2,
+    "loadtype": 1,
+    "full": 3,
+    "blur": 0,
+    "package": "roledetails/roledetails",
+    "packagename": "roledetails",
+    "comname": "rolestrategy",
+    "des": "角色攻略"
   }
 ]
\ No newline at end of file
diff --git a/sys/configure/structs/game.mainlineEasyData.go b/sys/configure/structs/game.mainlineEasyData.go
index 0f64e2be0..79ab36fbc 100644
--- a/sys/configure/structs/game.mainlineEasyData.go
+++ b/sys/configure/structs/game.mainlineEasyData.go
@@ -38,6 +38,8 @@ type Game_mainlineEasyData struct {
     Award []*Game_atn
     Title string
     Desc string
+    Stroyid []int32
+    Condition []int32
 }
 
 func (Game_mainlineEasyData) GetTypeId() int {
@@ -125,5 +127,33 @@ func NewGame_mainlineEasyData(_buf map[string]interface{}) (_v *Game_mainlineEas
 
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["title"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Title error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Title, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["desc"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["stroyid"].([]interface{}); !_ok_ { err = errors.New("stroyid error"); return }
+
+                _v.Stroyid = make([]int32, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ int32
+                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+                    _v.Stroyid = append(_v.Stroyid, _list_v_)
+                }
+            }
+
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["condition"].([]interface{}); !_ok_ { err = errors.New("condition error"); return }
+
+                _v.Condition = make([]int32, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ int32
+                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+                    _v.Condition = append(_v.Condition, _list_v_)
+                }
+            }
+
     return
 }
diff --git a/sys/configure/structs/game.skillAfteratkData.go b/sys/configure/structs/game.skillAfteratkData.go
index 1fb48a675..b7b920a31 100644
--- a/sys/configure/structs/game.skillAfteratkData.go
+++ b/sys/configure/structs/game.skillAfteratkData.go
@@ -15,9 +15,9 @@ type Game_skillAfteratkData struct {
     Desc string
     From int32
     Limit int32
+    EmitPR int32
     Where []string
     Order []string
-    EmitPR int32
     Type string
     Argu string
     AddEffect bool
@@ -40,6 +40,7 @@ func NewGame_skillAfteratkData(_buf map[string]interface{}) (_v *Game_skillAfter
     { var _ok_ bool; if _v.Desc, _ok_ = _buf["Desc"].(string); !_ok_ { err = errors.New("Desc error"); return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["From"].(float64); !_ok_ { err = errors.New("From error"); return }; _v.From = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Limit"].(float64); !_ok_ { err = errors.New("Limit error"); return }; _v.Limit = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EmitPR"].(float64); !_ok_ { err = errors.New("EmitPR error"); return }; _v.EmitPR = int32(_tempNum_) }
      {
                 var _arr_ []interface{}
                 var _ok_ bool
@@ -68,7 +69,6 @@ func NewGame_skillAfteratkData(_buf map[string]interface{}) (_v *Game_skillAfter
                 }
             }
 
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EmitPR"].(float64); !_ok_ { err = errors.New("EmitPR error"); return }; _v.EmitPR = int32(_tempNum_) }
     { var _ok_ bool; if _v.Type, _ok_ = _buf["Type"].(string); !_ok_ { err = errors.New("Type error"); return } }
     { var _ok_ bool; if _v.Argu, _ok_ = _buf["Argu"].(string); !_ok_ { err = errors.New("Argu error"); return } }
     { var _ok_ bool; if _v.AddEffect, _ok_ = _buf["AddEffect"].(bool); !_ok_ { err = errors.New("AddEffect error"); return } }
diff --git a/sys/configure/structs/game.skillAtkData.go b/sys/configure/structs/game.skillAtkData.go
index c98090ac2..cac5ba168 100644
--- a/sys/configure/structs/game.skillAtkData.go
+++ b/sys/configure/structs/game.skillAtkData.go
@@ -21,7 +21,7 @@ type Game_skillAtkData struct {
     Target int32
     ChildSkill []*Game_ChildSkills
     Desc []string
-    Buffid []int64
+    Buffid []int32
 }
 
 func (Game_skillAtkData) GetTypeId() int {
@@ -84,11 +84,11 @@ func NewGame_skillAtkData(_buf map[string]interface{}) (_v *Game_skillAtkData, e
                 var _ok_ bool
                 if _arr_, _ok_ = _buf["buffid"].([]interface{}); !_ok_ { err = errors.New("buffid error"); return }
 
-                _v.Buffid = make([]int64, 0, len(_arr_))
+                _v.Buffid = make([]int32, 0, len(_arr_))
                 
                 for _, _e_ := range _arr_ {
-                    var _list_v_ int64
-                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int64(_x_) }
+                    var _list_v_ int32
+                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
                     _v.Buffid = append(_v.Buffid, _list_v_)
                 }
             }
diff --git a/sys/configure/structs/game.skillData.go b/sys/configure/structs/game.skillData.go
index 246a962ab..598329b6c 100644
--- a/sys/configure/structs/game.skillData.go
+++ b/sys/configure/structs/game.skillData.go
@@ -21,7 +21,7 @@ type Game_skillData struct {
     Target int32
     ChildSkill []*Game_ChildSkills
     Desc []string
-    Buffid []int64
+    Buffid []int32
 }
 
 func (Game_skillData) GetTypeId() int {
@@ -84,11 +84,11 @@ func NewGame_skillData(_buf map[string]interface{}) (_v *Game_skillData, err err
                 var _ok_ bool
                 if _arr_, _ok_ = _buf["buffid"].([]interface{}); !_ok_ { err = errors.New("buffid error"); return }
 
-                _v.Buffid = make([]int64, 0, len(_arr_))
+                _v.Buffid = make([]int32, 0, len(_arr_))
                 
                 for _, _e_ := range _arr_ {
-                    var _list_v_ int64
-                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int64(_x_) }
+                    var _list_v_ int32
+                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
                     _v.Buffid = append(_v.Buffid, _list_v_)
                 }
             }