配置更新

bin/json/game_buriedtype.json

@@ -1368,5 +1368,13 @@
     "filter": [
       "eq"
     ]
+  },
+  {
+    "id": 235,
+    "insert": 3,
+    "filter": [
+      "eq",
+      "gte"
+    ]
   }
 ]

bin/json/game_buzkashimount.json

@@ -17,7 +17,6 @@
     ],
     "showmodel": "54101_3_exhibition",
     "model": "54101_3",
-    "controller": "",
     "point": "",
     "etime": 0,
     "stime": 0,
@@ -50,7 +49,6 @@
     ],
     "showmodel": "54101_3_exhibition",
     "model": "54101_3",
-    "controller": "",
     "point": "",
     "etime": 0,
     "stime": 0,
@@ -83,7 +81,6 @@
     ],
     "showmodel": "54101_3_exhibition",
     "model": "54101_3",
-    "controller": "Person/mount/10000M_54101.controller",
     "point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos",
     "etime": 55,
     "stime": 10,
@@ -116,7 +113,6 @@
     ],
     "showmodel": "",
     "model": "",
-    "controller": "",
     "point": "",
     "etime": 0,
     "stime": 0,
@@ -149,7 +145,6 @@
     ],
     "showmodel": "",
     "model": "",
-    "controller": "",
     "point": "",
     "etime": 0,
     "stime": 0,
@@ -182,7 +177,6 @@
     ],
     "showmodel": "54102_3_exhibition",
     "model": "54102_3",
-    "controller": "Person/mount/10000M_54101.controller",
     "point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos",
     "etime": 50,
     "stime": 10,
@@ -215,7 +209,6 @@
     ],
     "showmodel": "54103_1_exhibition",
     "model": "54103_1",
-    "controller": "Person/mount/10000M_54101.controller",
     "point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos",
     "etime": 0,
     "stime": 0,
@@ -248,7 +241,6 @@
     ],
     "showmodel": "54103_2_exhibition",
     "model": "54103_2",
-    "controller": "Person/mount/10000M_54101.controller",
     "point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos",
     "etime": 0,
     "stime": 0,
@@ -281,7 +273,6 @@
     ],
     "showmodel": "54103_3_exhibition",
     "model": "54103_3",
-    "controller": "Person/mount/10000M_54101.controller",
     "point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos",
     "etime": 45,
     "stime": 10,

bin/json/game_buzkashitrack.json

@@ -18,7 +18,7 @@
   {
     "id": 100003,
     "track": "Track",
-    "type": 2,
+    "type": 1,
     "startPos": 3,
     "endPos": 4,
     "local": 2

bin/json/game_item.json

@@ -364,7 +364,7 @@
     "img": "item_10000008",
     "intr": {
       "key": "item_item_intr_8",
-      "text": "蕴含神秘力量的护身符，可以在守护者界面为守护者提供少量的经验值"
+      "text": "蕴含神秘力量的护身符，可以在守护者界面为守护者提供250经验值。"
     },
     "describe": {
       "key": "item_item_describe_8",
@@ -412,7 +412,7 @@
     "img": "item_10000009",
     "intr": {
       "key": "item_item_intr_9",
-      "text": "蕴含神秘力量的护身符，可以在守护者界面为守护者提供中量的经验值"
+      "text": "蕴含神秘力量的护身符，可以在守护者界面为守护者提供2000经验值。"
     },
     "describe": {
       "key": "item_item_describe_9",
@@ -460,7 +460,7 @@
     "img": "item_10000010",
     "intr": {
       "key": "item_item_intr_10",
-      "text": "蕴含神秘力量的护身符，可以在守护者界面为守护者提供大量的经验值"
+      "text": "蕴含神秘力量的护身符，可以在守护者界面为守护者提供8000经验值。"
     },
     "describe": {
       "key": "item_item_describe_10",

bin/json/game_mainchapter.json

@@ -33,7 +33,7 @@
     },
     "desc": {
       "key": "mainchapter_main_chapter_desc_1",
-      "text": "原始人聚集地惊现能量强大的月光原石，主角和守护者们前往收集，却遭到当地“土著居民”们的轮番驱赶……"
+      "text": "为了救治希卡普，你与邦尼兔前往博客岛寻找解毒剂，却不曾想卷入了岛民的纷争与一场阴谋之中……"
     },
     "starreward": 11001,
     "exploreward": 11001,
@@ -78,7 +78,7 @@
     },
     "desc": {
       "key": "mainchapter_main_chapter_desc_2",
-      "text": "复仇者强势归来，带着怨恨与不甘，大龙的回归之路，既是守护者的试炼，亦是神龙大侠的考验。"
+      "text": "原始人聚集地惊现能量强大的月光原石，你和守护者们前往收集，却遭到当地“土著居民”们的轮番驱赶……"
     },
     "starreward": 11002,
     "exploreward": 11002,

bin/json/game_mainstage.json

@@ -217,7 +217,7 @@
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
       "key": "main_stage_bubbletext_1",
-      "text": "你们不要再打了！"
+      "text": "快住手，他们不是猎龙团的人！"
     },
     "animation": [],
     "hide": 0,
@@ -291,8 +291,8 @@
     "herocolor": 0,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "",
+      "key": "main_stage_bubbletext_2",
-      "text": ""
+      "text": "让我找找看，是这个么？"
     },
     "animation": [],
     "hide": 0,
@@ -742,8 +742,8 @@
     "herocolor": 0,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "",
+      "key": "main_stage_bubbletext_7",
-      "text": ""
+      "text": "哦，我的钩牙小宝贝，你一定很难受吧！"
     },
     "animation": [],
     "hide": 0,
@@ -860,8 +860,8 @@
     "herocolor": 0,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "",
+      "key": "main_stage_bubbletext_8",
-      "text": ""
+      "text": "嘎——嘎嘎——"
     },
     "animation": [],
     "hide": 0,
@@ -1099,8 +1099,8 @@
     "herocolor": 0,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "",
+      "key": "main_stage_bubbletext_11",
-      "text": ""
+      "text": "我这是怎么了？"
     },
     "animation": [],
     "hide": 0,
@@ -1214,8 +1214,8 @@
     "herocolor": 0,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "",
+      "key": "main_stage_bubbletext_12",
-      "text": ""
+      "text": "不要再抵抗了，愚蠢的人们！"
     },
     "animation": [],
     "hide": 0,
@@ -1446,7 +1446,7 @@
     "animation": [],
     "hide": 0,
     "destroy": 1,
-    "progress": 1,
+    "progress": 2,
     "stroyshow": 0,
     "frontstoryid": 0,
     "afterstoryid": 200200,
@@ -1553,8 +1553,8 @@
     "herocolor": 0,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "",
+      "key": "main_stage_bubbletext_15",
-      "text": ""
+      "text": "这帮维京人怎么回事！"
     },
     "animation": [],
     "hide": 0,
@@ -1626,8 +1626,8 @@
     "herocolor": 0,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "",
+      "key": "main_stage_bubbletext_16",
-      "text": ""
+      "text": "这就是秘密武器！"
     },
     "animation": [],
     "hide": 0,
@@ -2066,8 +2066,8 @@
     "herocolor": 0,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "",
+      "key": "main_stage_bubbletext_22",
-      "text": ""
+      "text": "……"
     },
     "animation": [],
     "hide": 0,
@@ -2256,7 +2256,7 @@
     "animation": [],
     "hide": 0,
     "destroy": 1,
-    "progress": 1,
+    "progress": 2,
     "stroyshow": 0,
     "frontstoryid": 200310,
     "afterstoryid": 200320,
@@ -2430,8 +2430,8 @@
     "herocolor": 0,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "",
+      "key": "main_stage_bubbletext_26",
-      "text": ""
+      "text": "啊哈哈哈！黑暗即将再度降临！"
     },
     "animation": [],
     "hide": 0,
@@ -2501,13 +2501,13 @@
     "herocolor": 0,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "",
+      "key": "main_stage_bubbletext_27",
-      "text": ""
+      "text": "哦，奥丁神啊！"
     },
     "animation": [],
     "hide": 0,
     "destroy": 1,
-    "progress": 1,
+    "progress": 3,
     "stroyshow": 0,
     "frontstoryid": 200370,
     "afterstoryid": 0,
@@ -2687,8 +2687,8 @@
     "herocolor": 0,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "",
+      "key": "main_stage_bubbletext_29",
-      "text": ""
+      "text": "不知道亚丝翠她们顺不顺利……"
     },
     "animation": [],
     "hide": 0,
@@ -2829,8 +2829,8 @@
     "herocolor": 0,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "",
+      "key": "main_stage_bubbletext_31",
-      "text": ""
+      "text": "难道……漆黑……"
     },
     "animation": [],
     "hide": 0,
@@ -3119,7 +3119,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_2",
+      "key": "main_stage_bubbletext_34",
       "text": "肚子好饿，得去出去找点食物。"
     },
     "animation": [],
@@ -3459,7 +3459,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_4",
+      "key": "main_stage_bubbletext_37",
       "text": "谢谢你帮我们找鸟蛋，你真是个好人。"
     },
     "animation": [],
@@ -3578,7 +3578,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_sq",
     "bubbletext": {
-      "key": "main_stage_bubbletext_5",
+      "key": "main_stage_bubbletext_38",
       "text": "你发现我了？！"
     },
     "animation": [],
@@ -3658,7 +3658,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_6",
+      "key": "main_stage_bubbletext_39",
       "text": "我的天呐！本大爷竟然输了！"
     },
     "animation": [],
@@ -3769,7 +3769,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_7",
+      "key": "main_stage_bubbletext_40",
       "text": "就快到了！那猩猩怪太可怕了，那天要不是盖......"
     },
     "animation": [],
@@ -3840,7 +3840,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_sq",
     "bubbletext": {
-      "key": "",
+      "key": "main_stage_bubbletext_41",
       "text": ""
     },
     "animation": [],
@@ -3917,7 +3917,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_sq",
     "bubbletext": {
-      "key": "",
+      "key": "main_stage_bubbletext_42",
       "text": ""
     },
     "animation": [],
@@ -3994,7 +3994,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_sq",
     "bubbletext": {
-      "key": "",
+      "key": "main_stage_bubbletext_43",
       "text": ""
     },
     "animation": [],
@@ -4073,7 +4073,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_11",
+      "key": "main_stage_bubbletext_44",
       "text": "瓜哥怎么还没有回来？"
     },
     "animation": [],
@@ -4146,7 +4146,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_12",
+      "key": "main_stage_bubbletext_45",
       "text": "巨型猩猩怪的山洞就在前面。"
     },
     "animation": [],
@@ -4219,7 +4219,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_wh",
     "bubbletext": {
-      "key": "main_stage_bubbletext_13",
+      "key": "main_stage_bubbletext_46",
       "text": "肚子......饿！我......有脑子！"
     },
     "animation": [],
@@ -4231,7 +4231,7 @@
     "afterstoryid": 0,
     "maingroupName": {
       "key": "mainchapter_main_stage_maingroupName_3",
-      "text": "精英关卡"
+      "text": "月光暴走"
     },
     "mainlineName": {
       "key": "mainchapter_main_stage_mainlineName_13",
@@ -4333,7 +4333,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_wh",
     "bubbletext": {
-      "key": "",
+      "key": "main_stage_bubbletext_47",
       "text": ""
     },
     "animation": [],
@@ -4345,7 +4345,7 @@
     "afterstoryid": 0,
     "maingroupName": {
       "key": "mainchapter_main_stage_maingroupName_4",
-      "text": "精英关卡"
+      "text": "月光暴走"
     },
     "mainlineName": {
       "key": "mainchapter_main_stage_mainlineName_14",
@@ -4447,7 +4447,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_wh",
     "bubbletext": {
-      "key": "",
+      "key": "main_stage_bubbletext_48",
       "text": ""
     },
     "animation": [],
@@ -4459,7 +4459,7 @@
     "afterstoryid": 10263,
     "maingroupName": {
       "key": "mainchapter_main_stage_maingroupName_5",
-      "text": "精英关卡"
+      "text": "月光暴走"
     },
     "mainlineName": {
       "key": "mainchapter_main_stage_mainlineName_15",
@@ -4561,7 +4561,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_14",
+      "key": "main_stage_bubbletext_49",
       "text": "呀嗷嗷——"
     },
     "animation": [],
@@ -4573,7 +4573,7 @@
     "afterstoryid": 0,
     "maingroupName": {
       "key": "mainchapter_main_stage_maingroupName_6",
-      "text": "精英关卡"
+      "text": "月光暴走"
     },
     "mainlineName": {
       "key": "mainchapter_main_stage_mainlineName_16",
@@ -4675,7 +4675,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "",
+      "key": "main_stage_bubbletext_50",
       "text": ""
     },
     "animation": [],
@@ -4687,7 +4687,7 @@
     "afterstoryid": 0,
     "maingroupName": {
       "key": "mainchapter_main_stage_maingroupName_7",
-      "text": "精英关卡"
+      "text": "月光暴走"
     },
     "mainlineName": {
       "key": "mainchapter_main_stage_mainlineName_17",
@@ -4789,7 +4789,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "",
+      "key": "main_stage_bubbletext_51",
       "text": ""
     },
     "animation": [],
@@ -4801,7 +4801,7 @@
     "afterstoryid": 10264,
     "maingroupName": {
       "key": "mainchapter_main_stage_maingroupName_8",
-      "text": "精英关卡"
+      "text": "月光暴走"
     },
     "mainlineName": {
       "key": "mainchapter_main_stage_mainlineName_18",
@@ -4901,7 +4901,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_15",
+      "key": "main_stage_bubbletext_52",
       "text": "赶紧完成任务，我好交差下班！"
     },
     "animation": [],
@@ -4972,7 +4972,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_sq",
     "bubbletext": {
-      "key": "",
+      "key": "main_stage_bubbletext_53",
       "text": ""
     },
     "animation": [],
@@ -5054,7 +5054,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_sq",
     "bubbletext": {
-      "key": "",
+      "key": "main_stage_bubbletext_54",
       "text": ""
     },
     "animation": [],
@@ -5137,7 +5137,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_18",
+      "key": "main_stage_bubbletext_55",
       "text": "装备找到了吗？"
     },
     "animation": [],
@@ -5208,7 +5208,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_19",
+      "key": "main_stage_bubbletext_56",
       "text": "大猩猩就在前面，打倒它！"
     },
     "animation": [],
@@ -5325,7 +5325,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "",
+      "key": "main_stage_bubbletext_57",
       "text": ""
     },
     "animation": [],
@@ -5402,7 +5402,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_21",
+      "key": "main_stage_bubbletext_58",
       "text": "听说这里沉睡着财宝与强大的敌人······（精英难度战斗）"
     },
     "animation": [],
@@ -5521,7 +5521,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_22",
+      "key": "main_stage_bubbletext_59",
       "text": "听说这里沉睡着财宝与强大的敌人······（精英难度战斗）"
     },
     "animation": [],
@@ -5640,7 +5640,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_23",
+      "key": "main_stage_bubbletext_60",
       "text": "听说这里沉睡着财宝与强大的敌人······（精英难度战斗）"
     },
     "animation": [],
@@ -5759,7 +5759,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_24",
+      "key": "main_stage_bubbletext_61",
       "text": "听说这里沉睡着财宝与强大的敌人······（精英难度战斗）"
     },
     "animation": [],
@@ -5878,7 +5878,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_25",
+      "key": "main_stage_bubbletext_62",
       "text": "听说这里沉睡着财宝与强大的敌人······（精英难度战斗）"
     },
     "animation": [],
@@ -5997,7 +5997,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_26",
+      "key": "main_stage_bubbletext_63",
       "text": "听说这里沉睡着财宝与强大的敌人······（精英难度战斗）"
     },
     "animation": [],
@@ -6116,7 +6116,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_27",
+      "key": "main_stage_bubbletext_64",
       "text": "听说这里沉睡着财宝与强大的敌人······（精英难度战斗）"
     },
     "animation": [],
@@ -6235,7 +6235,7 @@
     "herocolor": 1,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_28",
+      "key": "main_stage_bubbletext_65",
       "text": "听说这里沉睡着财宝与强大的敌人······（精英难度战斗）"
     },
     "animation": [],
@@ -6354,7 +6354,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_29",
+      "key": "main_stage_bubbletext_66",
       "text": "这是一处远比上一处更加强大的敌人聚集地·······（困难难度战斗）"
     },
     "animation": [],
@@ -6473,7 +6473,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_30",
+      "key": "main_stage_bubbletext_67",
       "text": "这是一处远比上一处更加强大的敌人聚集地·······（困难难度战斗）"
     },
     "animation": [],
@@ -6592,7 +6592,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_31",
+      "key": "main_stage_bubbletext_68",
       "text": "这是一处远比上一处更加强大的敌人聚集地·······（困难难度战斗）"
     },
     "animation": [],
@@ -6711,7 +6711,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_32",
+      "key": "main_stage_bubbletext_69",
       "text": "这是一处远比上一处更加强大的敌人聚集地·······（困难难度战斗）"
     },
     "animation": [],
@@ -6830,7 +6830,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_33",
+      "key": "main_stage_bubbletext_70",
       "text": "这是一处远比上一处更加强大的敌人聚集地·······（困难难度战斗）"
     },
     "animation": [],
@@ -6949,7 +6949,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_34",
+      "key": "main_stage_bubbletext_71",
       "text": "这是一处远比上一处更加强大的敌人聚集地·······（困难难度战斗）"
     },
     "animation": [],
@@ -7068,7 +7068,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_35",
+      "key": "main_stage_bubbletext_72",
       "text": "这是一处远比上一处更加强大的敌人聚集地·······（困难难度战斗）"
     },
     "animation": [],
@@ -7187,7 +7187,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_36",
+      "key": "main_stage_bubbletext_73",
       "text": "这是一处远比上一处更加强大的敌人聚集地·······（困难难度战斗）"
     },
     "animation": [],
@@ -7306,7 +7306,7 @@
     "herocolor": 3,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_37",
+      "key": "main_stage_bubbletext_74",
       "text": "这是荒野上令所有人闻风丧胆的地方······被瓜哥标注的死亡禁区！（地狱难度战斗）"
     },
     "animation": [],
@@ -7425,7 +7425,7 @@
     "herocolor": 3,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_38",
+      "key": "main_stage_bubbletext_75",
       "text": "这是荒野上令所有人闻风丧胆的地方······被瓜哥标注的死亡禁区！（地狱难度战斗）"
     },
     "animation": [],
@@ -7544,7 +7544,7 @@
     "herocolor": 3,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_39",
+      "key": "main_stage_bubbletext_76",
       "text": "这是荒野上令所有人闻风丧胆的地方······被瓜哥标注的死亡禁区！（地狱难度战斗）"
     },
     "animation": [],
@@ -7663,7 +7663,7 @@
     "herocolor": 3,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_40",
+      "key": "main_stage_bubbletext_77",
       "text": "这是荒野上令所有人闻风丧胆的地方······被瓜哥标注的死亡禁区！（地狱难度战斗）"
     },
     "animation": [],
@@ -7782,7 +7782,7 @@
     "herocolor": 3,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_41",
+      "key": "main_stage_bubbletext_78",
       "text": "这是荒野上令所有人闻风丧胆的地方······被瓜哥标注的死亡禁区！（地狱难度战斗）"
     },
     "animation": [],
@@ -7901,7 +7901,7 @@
     "herocolor": 3,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_42",
+      "key": "main_stage_bubbletext_79",
       "text": "这是荒野上令所有人闻风丧胆的地方······被瓜哥标注的死亡禁区！（地狱难度战斗）"
     },
     "animation": [],
@@ -8020,7 +8020,7 @@
     "herocolor": 3,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_43",
+      "key": "main_stage_bubbletext_80",
       "text": "这是荒野上令所有人闻风丧胆的地方······被瓜哥标注的死亡禁区！（地狱难度战斗）"
     },
     "animation": [],
@@ -8139,7 +8139,7 @@
     "herocolor": 3,
     "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
-      "key": "main_stage_bubbletext_44",
+      "key": "main_stage_bubbletext_81",
       "text": "这是荒野上令所有人闻风丧胆的地方······被瓜哥标注的死亡禁区！（地狱难度战斗）"
     },
     "animation": [],
@@ -8258,7 +8258,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_45",
+      "key": "main_stage_bubbletext_82",
       "text": "测试节点1"
     },
     "animation": [],
@@ -8377,7 +8377,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_46",
+      "key": "main_stage_bubbletext_83",
       "text": "测试节点2"
     },
     "animation": [],
@@ -8454,7 +8454,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_47",
+      "key": "main_stage_bubbletext_84",
       "text": "测试节点3"
     },
     "animation": [],
@@ -8531,7 +8531,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_48",
+      "key": "main_stage_bubbletext_85",
       "text": "测试节点4"
     },
     "animation": [],
@@ -8609,7 +8609,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_49",
+      "key": "main_stage_bubbletext_86",
       "text": "测试节点5"
     },
     "animation": [],
@@ -8686,7 +8686,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_50",
+      "key": "main_stage_bubbletext_87",
       "text": "测试节点6"
     },
     "animation": [],
@@ -8763,7 +8763,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_51",
+      "key": "main_stage_bubbletext_88",
       "text": "测试节点7"
     },
     "animation": [],
@@ -8834,7 +8834,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_52",
+      "key": "main_stage_bubbletext_89",
       "text": "测试节点8"
     },
     "animation": [],
@@ -8911,7 +8911,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_53",
+      "key": "main_stage_bubbletext_90",
       "text": "测试节点9"
     },
     "animation": [],
@@ -8988,7 +8988,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_54",
+      "key": "main_stage_bubbletext_91",
       "text": "测试节点10"
     },
     "animation": [],
@@ -9059,7 +9059,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_55",
+      "key": "main_stage_bubbletext_92",
       "text": "测试节点11"
     },
     "animation": [],
@@ -9178,7 +9178,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_56",
+      "key": "main_stage_bubbletext_93",
       "text": "测试节点12"
     },
     "animation": [],
@@ -9297,7 +9297,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_57",
+      "key": "main_stage_bubbletext_94",
       "text": "测试节点13"
     },
     "animation": [],
@@ -9416,7 +9416,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_58",
+      "key": "main_stage_bubbletext_95",
       "text": "测试节点14"
     },
     "animation": [],
@@ -9535,7 +9535,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_59",
+      "key": "main_stage_bubbletext_96",
       "text": "测试节点15"
     },
     "animation": [],
@@ -9654,7 +9654,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_60",
+      "key": "main_stage_bubbletext_97",
       "text": "测试节点16"
     },
     "animation": [],
@@ -9773,7 +9773,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_61",
+      "key": "main_stage_bubbletext_98",
       "text": "测试节点17"
     },
     "animation": [],
@@ -9892,7 +9892,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_62",
+      "key": "main_stage_bubbletext_99",
       "text": "测试节点18"
     },
     "animation": [],
@@ -9969,7 +9969,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_63",
+      "key": "main_stage_bubbletext_100",
       "text": "测试节点19"
     },
     "animation": [],
@@ -10046,7 +10046,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_64",
+      "key": "main_stage_bubbletext_101",
       "text": "测试节点20"
     },
     "animation": [],
@@ -10125,7 +10125,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_65",
+      "key": "main_stage_bubbletext_102",
       "text": "测试节点21"
     },
     "animation": [],
@@ -10202,7 +10202,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_66",
+      "key": "main_stage_bubbletext_103",
       "text": "测试节点22"
     },
     "animation": [],
@@ -10279,7 +10279,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_67",
+      "key": "main_stage_bubbletext_104",
       "text": "测试节点23"
     },
     "animation": [],
@@ -10356,7 +10356,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_68",
+      "key": "main_stage_bubbletext_105",
       "text": "测试节点24"
     },
     "animation": [],
@@ -10435,7 +10435,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_69",
+      "key": "main_stage_bubbletext_106",
       "text": "测试节点25"
     },
     "animation": [],
@@ -10512,7 +10512,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_70",
+      "key": "main_stage_bubbletext_107",
       "text": "测试节点26"
     },
     "animation": [],
@@ -10589,7 +10589,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_71",
+      "key": "main_stage_bubbletext_108",
       "text": "测试节点27"
     },
     "animation": [],
@@ -10666,7 +10666,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_72",
+      "key": "main_stage_bubbletext_109",
       "text": "测试节点28"
     },
     "animation": [],
@@ -10745,7 +10745,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_73",
+      "key": "main_stage_bubbletext_110",
       "text": "测试节点29"
     },
     "animation": [],
@@ -10824,7 +10824,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_74",
+      "key": "main_stage_bubbletext_111",
       "text": "测试节点30"
     },
     "animation": [],
@@ -10943,7 +10943,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_75",
+      "key": "main_stage_bubbletext_112",
       "text": "测试节点31"
     },
     "animation": [],
@@ -11020,7 +11020,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_76",
+      "key": "main_stage_bubbletext_113",
       "text": "测试节点32"
     },
     "animation": [],
@@ -11097,7 +11097,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_77",
+      "key": "main_stage_bubbletext_114",
       "text": "测试节点33"
     },
     "animation": [],
@@ -11174,7 +11174,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_78",
+      "key": "main_stage_bubbletext_115",
       "text": "测试节点34"
     },
     "animation": [],
@@ -11293,7 +11293,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_79",
+      "key": "main_stage_bubbletext_116",
       "text": "测试节点35"
     },
     "animation": [],
@@ -11374,7 +11374,7 @@
     "herocolor": 2,
     "heroimg": "zxgq_qp_icon_gth",
     "bubbletext": {
-      "key": "main_stage_bubbletext_79",
+      "key": "main_stage_bubbletext_117",
       "text": "测试节点35"
     },
     "animation": [],

bin/json/game_mainstarreward.json

@@ -17,8 +17,8 @@
     "starnum": 16,
     "reward": [
       {
-        "a": "item",
+        "a": "hero",
-        "t": "10000001",
+        "t": "23003",
         "n": 1
       }
     ]
@@ -74,7 +74,7 @@
   {
     "id": 7,
     "boxid": 11003,
-    "starnum": 8,
+    "starnum": 4,
     "reward": [
       {
         "a": "attr",
@@ -86,7 +86,7 @@
   {
     "id": 8,
     "boxid": 11003,
-    "starnum": 16,
+    "starnum": 8,
     "reward": [
       {
         "a": "item",
@@ -98,7 +98,7 @@
   {
     "id": 9,
     "boxid": 11003,
-    "starnum": 24,
+    "starnum": 12,
     "reward": [
       {
         "a": "item",
@@ -110,7 +110,7 @@
   {
     "id": 10,
     "boxid": 11004,
-    "starnum": 8,
+    "starnum": 4,
     "reward": [
       {
         "a": "attr",
@@ -122,7 +122,7 @@
   {
     "id": 11,
     "boxid": 11004,
-    "starnum": 16,
+    "starnum": 8,
     "reward": [
       {
         "a": "item",
@@ -134,7 +134,7 @@
   {
     "id": 12,
     "boxid": 11004,
-    "starnum": 24,
+    "starnum": 12,
     "reward": [
       {
         "a": "item",
@@ -146,7 +146,7 @@
   {
     "id": 13,
     "boxid": 11005,
-    "starnum": 8,
+    "starnum": 4,
     "reward": [
       {
         "a": "attr",
@@ -158,7 +158,7 @@
   {
     "id": 14,
     "boxid": 11005,
-    "starnum": 16,
+    "starnum": 8,
     "reward": [
       {
         "a": "item",
@@ -170,7 +170,7 @@
   {
     "id": 15,
     "boxid": 11005,
-    "starnum": 24,
+    "starnum": 12,
     "reward": [
       {
         "a": "item",
@@ -182,7 +182,7 @@
   {
     "id": 16,
     "boxid": 11006,
-    "starnum": 8,
+    "starnum": 4,
     "reward": [
       {
         "a": "attr",
@@ -194,7 +194,7 @@
   {
     "id": 17,
     "boxid": 11006,
-    "starnum": 16,
+    "starnum": 8,
     "reward": [
       {
         "a": "item",
@@ -206,7 +206,7 @@
   {
     "id": 18,
     "boxid": 11006,
-    "starnum": 24,
+    "starnum": 12,
     "reward": [
       {
         "a": "item",
@@ -218,7 +218,7 @@
   {
     "id": 19,
     "boxid": 11007,
-    "starnum": 8,
+    "starnum": 4,
     "reward": [
       {
         "a": "attr",
@@ -230,7 +230,7 @@
   {
     "id": 20,
     "boxid": 11007,
-    "starnum": 16,
+    "starnum": 8,
     "reward": [
       {
         "a": "item",
@@ -242,7 +242,7 @@
   {
     "id": 21,
     "boxid": 11007,
-    "starnum": 24,
+    "starnum": 12,
     "reward": [
       {
         "a": "item",
@@ -254,7 +254,7 @@
   {
     "id": 22,
     "boxid": 11008,
-    "starnum": 8,
+    "starnum": 4,
     "reward": [
       {
         "a": "attr",
@@ -266,7 +266,7 @@
   {
     "id": 23,
     "boxid": 11008,
-    "starnum": 16,
+    "starnum": 8,
     "reward": [
       {
         "a": "item",
@@ -278,7 +278,7 @@
   {
     "id": 24,
     "boxid": 11008,
-    "starnum": 24,
+    "starnum": 12,
     "reward": [
       {
         "a": "item",

bin/json/game_monsterformat.json

@@ -30,7 +30,7 @@
     "equip": [],
     "newskill": [],
     "lv": 1,
-    "hppro": 1,
+    "hppro": 1.1,
     "atkpro": 0.5,
     "defpro": 0.61,
     "skill1": 1,
@@ -50,7 +50,7 @@
     "equip": [],
     "newskill": [],
     "lv": 1,
-    "hppro": 1,
+    "hppro": 1.1,
     "atkpro": 0.45,
     "defpro": 0.69,
     "skill1": 1,
@@ -630,7 +630,7 @@
     "equip": [],
     "newskill": [],
     "lv": 2,
-    "hppro": 0.92,
+    "hppro": 1.1,
     "atkpro": 0.6,
     "defpro": 0.62,
     "skill1": 1,
@@ -650,7 +650,7 @@
     "equip": [],
     "newskill": [],
     "lv": 2,
-    "hppro": 0.92,
+    "hppro": 1.1,
     "atkpro": 0.57,
     "defpro": 0.71,
     "skill1": 1,
@@ -232512,13 +232512,13 @@
     "equip": [],
     "newskill": [],
     "lv": 1,
-    "hppro": 0.8,
+    "hppro": 0.3,
-    "atkpro": 0.5,
+    "atkpro": 2,
     "defpro": 0.1,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
-    "speed": 76,
+    "speed": 130,
     "modelsize": 1
   },
   {
@@ -232612,9 +232612,9 @@
     "equip": [],
     "newskill": [],
     "lv": 2,
-    "hppro": 0.5,
+    "hppro": 1,
     "atkpro": 0.5,
-    "defpro": 0.1,
+    "defpro": 0.5,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
@@ -232632,9 +232632,9 @@
     "equip": [],
     "newskill": [],
     "lv": 2,
-    "hppro": 0.5,
+    "hppro": 1,
     "atkpro": 0.5,
-    "defpro": 0.1,
+    "defpro": 0.5,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
@@ -232652,9 +232652,9 @@
     "equip": [],
     "newskill": [],
     "lv": 2,
-    "hppro": 0.5,
+    "hppro": 1,
     "atkpro": 0.5,
-    "defpro": 0.1,
+    "defpro": 0.5,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
@@ -232672,9 +232672,9 @@
     "equip": [],
     "newskill": [],
     "lv": 2,
-    "hppro": 0.3,
+    "hppro": 1,
     "atkpro": 0.5,
-    "defpro": 0.1,
+    "defpro": 0.5,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
@@ -232692,9 +232692,9 @@
     "equip": [],
     "newskill": [],
     "lv": 2,
-    "hppro": 0.5,
+    "hppro": 1,
     "atkpro": 0.5,
-    "defpro": 0.1,
+    "defpro": 0.5,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
@@ -232712,9 +232712,9 @@
     "equip": [],
     "newskill": [],
     "lv": 4,
-    "hppro": 0.5,
+    "hppro": 0.45,
     "atkpro": 0.5,
-    "defpro": 0.1,
+    "defpro": 1,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
@@ -232732,9 +232732,9 @@
     "equip": [],
     "newskill": [],
     "lv": 4,
-    "hppro": 0.3,
+    "hppro": 0.45,
     "atkpro": 0.5,
-    "defpro": 0.1,
+    "defpro": 1,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
@@ -232752,9 +232752,9 @@
     "equip": [],
     "newskill": [],
     "lv": 4,
-    "hppro": 0.3,
+    "hppro": 0.45,
     "atkpro": 0.5,
-    "defpro": 0.1,
+    "defpro": 1,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
@@ -232772,9 +232772,9 @@
     "equip": [],
     "newskill": [],
     "lv": 4,
-    "hppro": 0.3,
+    "hppro": 0.45,
     "atkpro": 0.5,
-    "defpro": 0.1,
+    "defpro": 1,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
@@ -232792,9 +232792,9 @@
     "equip": [],
     "newskill": [],
     "lv": 4,
-    "hppro": 0.3,
+    "hppro": 0.45,
     "atkpro": 0.5,
-    "defpro": 0.1,
+    "defpro": 1,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
@@ -238152,7 +238152,7 @@
     "equip": [],
     "newskill": [],
     "lv": 1,
-    "hppro": 1,
+    "hppro": 1.5,
     "atkpro": 1,
     "defpro": 1,
     "skill1": 1,

bin/json/game_opencond.json

@@ -124,10 +124,6 @@
       {
         "key": 1,
         "param": 1
-      },
-      {
-        "key": 2,
-        "param": 1100108
       }
     ],
     "wkqbx": 2,
@@ -173,7 +169,7 @@
     "main": [
       {
         "key": 1,
-        "param": 10
+        "param": 1
       }
     ],
     "wkqbx": 0,
@@ -197,10 +193,6 @@
       {
         "key": 1,
         "param": 1
-      },
-      {
-        "key": 2,
-        "param": 1100108
       }
     ],
     "wkqbx": 2,
@@ -247,10 +239,6 @@
       {
         "key": 1,
         "param": 1
-      },
-      {
-        "key": 3,
-        "param": 20090
       }
     ],
     "wkqbx": 0,
@@ -389,10 +377,6 @@
       {
         "key": 1,
         "param": 1
-      },
-      {
-        "key": 2,
-        "param": 1100404
       }
     ],
     "wkqbx": 0,
@@ -462,10 +446,6 @@
       {
         "key": 1,
         "param": 1
-      },
-      {
-        "key": 2,
-        "param": 1100108
       }
     ],
     "wkqbx": 0,
@@ -600,7 +580,12 @@
       "key": "opencond_opencond_name_26",
       "text": "藏书馆"
     },
-    "main": [],
+    "main": [
+      {
+        "key": 1,
+        "param": 1
+      }
+    ],
     "wkqbx": 2,
     "kqbx": 0,
     "img": "zc_icon_01",
@@ -645,10 +630,6 @@
       {
         "key": 1,
         "param": 1
-      },
-      {
-        "key": 2,
-        "param": 1100608
       }
     ],
     "wkqbx": 2,
@@ -695,10 +676,6 @@
       {
         "key": 1,
         "param": 1
-      },
-      {
-        "key": 2,
-        "param": 1100404
       }
     ],
     "wkqbx": 0,
@@ -722,10 +699,6 @@
       {
         "key": 1,
         "param": 1
-      },
-      {
-        "key": 2,
-        "param": 1100208
       }
     ],
     "wkqbx": 0,
@@ -791,7 +764,12 @@
       "key": "opencond_opencond_name_34",
       "text": "俱乐部聊天"
     },
-    "main": [],
+    "main": [
+      {
+        "key": 1,
+        "param": 1
+      }
+    ],
     "wkqbx": 0,
     "kqbx": 0,
     "img": "zc_icon_01",
@@ -882,10 +860,6 @@
       {
         "key": 1,
         "param": 1
-      },
-      {
-        "key": 2,
-        "param": 1100304
       }
     ],
     "wkqbx": 0,
@@ -909,10 +883,6 @@
       {
         "key": 1,
         "param": 1
-      },
-      {
-        "key": 2,
-        "param": 1100508
       }
     ],
     "wkqbx": 0,
@@ -1050,7 +1020,7 @@
     "main": [
       {
         "key": 1,
-        "param": 50
+        "param": 70
       }
     ],
     "wkqbx": 2,
@@ -1529,10 +1499,6 @@
       {
         "key": 1,
         "param": 1
-      },
-      {
-        "key": 2,
-        "param": 1100308
       }
     ],
     "wkqbx": 1,
@@ -1654,10 +1620,6 @@
       {
         "key": 1,
         "param": 1
-      },
-      {
-        "key": 2,
-        "param": 1100204
       }
     ],
     "wkqbx": 0,
@@ -1681,10 +1643,6 @@
       {
         "key": 1,
         "param": 10
-      },
-      {
-        "key": 3,
-        "param": 20080
       }
     ],
     "wkqbx": 3,
@@ -1731,10 +1689,6 @@
       {
         "key": 1,
         "param": 1
-      },
-      {
-        "key": 2,
-        "param": 1100808
       }
     ],
     "wkqbx": 0,
@@ -1758,10 +1712,6 @@
       {
         "key": 1,
         "param": 1
-      },
-      {
-        "key": 2,
-        "param": 1101208
       }
     ],
     "wkqbx": 0,
@@ -1785,10 +1735,6 @@
       {
         "key": 1,
         "param": 1
-      },
-      {
-        "key": 2,
-        "param": 1100604
       }
     ],
     "wkqbx": 0,
@@ -1812,10 +1758,6 @@
       {
         "key": 1,
         "param": 1
-      },
-      {
-        "key": 2,
-        "param": 1100108
       }
     ],
     "wkqbx": 0,
@@ -1839,10 +1781,6 @@
       {
         "key": 1,
         "param": 1
-      },
-      {
-        "key": 2,
-        "param": 1100504
       }
     ],
     "wkqbx": 0,
@@ -1866,10 +1804,6 @@
       {
         "key": 1,
         "param": 1
-      },
-      {
-        "key": 2,
-        "param": 1100108
       }
     ],
     "wkqbx": 0,
@@ -1911,10 +1845,6 @@
       {
         "key": 4,
         "param": 10
-      },
-      {
-        "key": 1,
-        "param": 10
       }
     ],
     "wkqbx": 0,
@@ -1938,10 +1868,6 @@
       {
         "key": 1,
         "param": 1
-      },
-      {
-        "key": 2,
-        "param": 1101208
       }
     ],
     "wkqbx": 0,
@@ -1961,12 +1887,7 @@
       "key": "opencond_opencond_name_83",
       "text": "无极塔"
     },
-    "main": [
+    "main": [],
-      {
-        "key": 2,
-        "param": 1101008
-      }
-    ],
     "wkqbx": 0,
     "kqbx": 0,
     "img": "",
@@ -1988,10 +1909,6 @@
       {
         "key": 1,
         "param": 1
-      },
-      {
-        "key": 2,
-        "param": 1101008
       }
     ],
     "wkqbx": 2,
@@ -2015,10 +1932,6 @@
       {
         "key": 1,
         "param": 1
-      },
-      {
-        "key": 2,
-        "param": 1100408
       }
     ],
     "wkqbx": 2,
@@ -2064,7 +1977,7 @@
     "main": [
       {
         "key": 1,
-        "param": 7
+        "param": 1
       }
     ],
     "wkqbx": 2,
@@ -2089,7 +2002,7 @@
     "main": [
       {
         "key": 1,
-        "param": 4
+        "param": 1
       }
     ],
     "wkqbx": 0,

bin/json/game_rdtasknpc.json

@@ -929,6 +929,510 @@
     ],
     "goto": 0
   },
+  {
+    "id": 101011,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101014,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101018,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101021,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101024,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101028,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101031,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101034,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101038,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101041,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101044,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101048,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101051,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101054,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101058,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101061,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101064,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101068,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101071,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101074,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101078,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101081,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101084,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101088,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101091,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101094,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101098,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101101,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101104,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101108,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101111,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101114,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101118,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101121,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101124,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101128,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101131,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101134,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101138,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101141,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101144,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 101148,
+    "heroid": 44004,
+    "Levelid": 0,
+    "datas": [
+      "CommandScene",
+      "功能入口_主线",
+      "905"
+    ],
+    "event": [],
+    "goto": 0
+  },
   {
     "id": 10110,
     "heroid": 44004,

bin/json/game_shop.json

@@ -28,8 +28,6 @@
       10001,
       10001,
       10001,
-      10001,
-      10001,
       10001
     ]
   },

bin/json/game_skillafteratk.json

@@ -5141,11 +5141,10 @@
       -1,
       1000
     ],
-    "FollowSK": [],
+    "FollowSK": [
-    "SucFollowSK": [
-      235001212,
       235001213
     ],
+    "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -5184,12 +5183,13 @@
     "Order": "",
     "Limit": 10,
     "ExecuteCnt": 1,
-    "Type": 3,
+    "Type": 19,
     "Argu": [
       391000077,
       1000,
       1,
-      2
+      2,
+      50
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -5223,6 +5223,29 @@
     "RevisiCondition": "",
     "RevisiParams": []
   },
+  {
+    "Id": 235001215,
+    "EmitPR": 1000,
+    "From": 3,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 2,
+    "Argu": [
+      435001211,
+      -1,
+      -1
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
   {
     "Id": 235001221,
     "EmitPR": 1000,
@@ -6463,7 +6486,7 @@
     "ExecuteCnt": 1,
     "Type": 8,
     "Argu": [
-      1,
+      3,
       -1,
       1000
     ],
@@ -15123,7 +15146,7 @@
     "ExecuteCnt": 1,
     "Type": 15,
     "Argu": [
-      1,
+      3,
       -1
     ],
     "FollowSK": [],
@@ -20211,10 +20234,7 @@
     "Argu": [
       1,
       4,
-      3500,
+      3500
-      1,
-      2,
-      50
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -22520,9 +22540,9 @@
     "ExecuteCnt": 1,
     "Type": 7,
     "Argu": [
+      3,
       1,
-      1,
+      1
-      3
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -23582,7 +23602,7 @@
   {
     "Id": 243003321,
     "EmitPR": 1000,
-    "From": 4,
+    "From": 14,
     "Where": [],
     "Order": "PropertyUp=3",
     "Limit": 1,
@@ -23607,7 +23627,7 @@
   {
     "Id": 243003331,
     "EmitPR": 1000,
-    "From": 4,
+    "From": 14,
     "Where": [],
     "Order": "PropertyUp=3",
     "Limit": 1,
@@ -23632,7 +23652,7 @@
   {
     "Id": 243003341,
     "EmitPR": 1000,
-    "From": 4,
+    "From": 14,
     "Where": [],
     "Order": "PropertyUp=3",
     "Limit": 1,
@@ -23657,7 +23677,7 @@
   {
     "Id": 243003351,
     "EmitPR": 1000,
-    "From": 4,
+    "From": 14,
     "Where": [],
     "Order": "PropertyUp=3",
     "Limit": 1,
@@ -25091,9 +25111,9 @@
     "ExecuteCnt": 1,
     "Type": 7,
     "Argu": [
-      2,
+      390001004,
-      1,
+      -1,
-      390001004
+      1
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -28781,10 +28801,9 @@
     "ExecuteCnt": 1,
     "Type": 7,
     "Argu": [
-      2,
+      10,
       1,
-      390001401,
+      1
-      390001404
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -29627,15 +29646,15 @@
     "Where": [],
     "Order": "",
     "Limit": 10,
-    "ExecuteCnt": 8,
+    "ExecuteCnt": 5,
     "Type": 1,
     "Argu": [
       1,
       4,
-      500,
+      800,
       1,
       18,
-      150
+      30
     ],
     "FollowSK": [
       214002312
@@ -29681,15 +29700,15 @@
     "Where": [],
     "Order": "",
     "Limit": 10,
-    "ExecuteCnt": 8,
+    "ExecuteCnt": 5,
     "Type": 1,
     "Argu": [
       1,
       4,
-      600,
+      900,
       1,
       18,
-      150
+      30
     ],
     "FollowSK": [
       214002312
@@ -29711,15 +29730,15 @@
     "Where": [],
     "Order": "",
     "Limit": 10,
-    "ExecuteCnt": 8,
+    "ExecuteCnt": 5,
     "Type": 1,
     "Argu": [
       1,
       4,
-      700,
+      1000,
       1,
       18,
-      150
+      30
     ],
     "FollowSK": [
       214002312
@@ -29741,15 +29760,15 @@
     "Where": [],
     "Order": "",
     "Limit": 10,
-    "ExecuteCnt": 8,
+    "ExecuteCnt": 5,
     "Type": 1,
     "Argu": [
       1,
       4,
-      800,
+      1100,
       1,
       18,
-      150
+      30
     ],
     "FollowSK": [
       214002312
@@ -29771,12 +29790,12 @@
     "Where": [],
     "Order": "",
     "Limit": 10,
-    "ExecuteCnt": 8,
+    "ExecuteCnt": 5,
     "Type": 1,
     "Argu": [
       1,
       4,
-      900,
+      1200,
       1,
       18,
       150
@@ -34792,7 +34811,7 @@
   {
     "Id": 235004312,
     "EmitPR": 1000,
-    "From": 11,
+    "From": 2,
     "Where": [],
     "Order": "",
     "Limit": 10,
@@ -56490,6 +56509,7 @@
     "Type": 7,
     "Argu": [
       1,
+      -1,
       1
     ],
     "FollowSK": [],
@@ -56865,7 +56885,7 @@
       391000058,
       1000,
       1,
-      1
+      -1
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -56925,6 +56945,29 @@
     "RevisiCondition": "",
     "RevisiParams": []
   },
+  {
+    "Id": 944005318,
+    "EmitPR": 1000,
+    "From": 3,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 2,
+    "Argu": [
+      494400533,
+      -1,
+      -1
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
   {
     "Id": 935001311,
     "EmitPR": 1000,
@@ -57813,7 +57856,7 @@
     "Type": 5,
     "Argu": [
       2,
-      150
+      300
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -58111,7 +58154,7 @@
   {
     "Id": 935005313,
     "EmitPR": 1000,
-    "From": 3,
+    "From": 1,
     "Where": [],
     "Order": "",
     "Limit": 10,
@@ -59720,7 +59763,7 @@
       390001127,
       1000,
       1,
-      1
+      2
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -60189,7 +60232,7 @@
     "Type": 2,
     "Argu": [
       494300331,
-      1,
+      -1,
       -1
     ],
     "FollowSK": [],
@@ -60877,7 +60920,7 @@
     "RevisiParams": []
   },
   {
-    "Id": 914008314,
+    "Id": 914002314,
     "EmitPR": 1000,
     "From": 3,
     "Where": [],

bin/json/game_skillatk.json

@@ -4410,10 +4410,10 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
+        244006316,
         244006311,
         244006312,
-        244006313,
+        244006313
-        244006316
       ]
     },
     "passSkill": [],
@@ -4446,10 +4446,10 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
+        244006316,
         244006311,
         244006312,
-        244006323,
+        244006323
-        244006316
       ]
     },
     "passSkill": [],
@@ -4482,10 +4482,10 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
+        244006316,
         244006311,
         244006312,
-        244006333,
+        244006333
-        244006316
       ]
     },
     "passSkill": [],
@@ -4518,10 +4518,10 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
+        244006316,
         244006311,
         244006312,
-        244006343,
+        244006343
-        244006316
       ]
     },
     "passSkill": [],
@@ -4554,10 +4554,10 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
+        244006316,
         244006311,
         244006312,
-        244006353,
+        244006353
-        244006316
       ]
     },
     "passSkill": [],
@@ -4590,10 +4590,10 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
+        244006316,
         244006311,
         244006312,
-        244006353,
+        244006353
-        244006316
       ]
     },
     "passSkill": [],
@@ -8697,17 +8697,15 @@
     "ChildSkill": {
       "Id": [
         235005311,
-        235005312,
         235005313
       ]
     },
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_135005311_1",
-      "text": "幸运·普雷斯科特为己方附加2回合[color=#37d8a9]免疫[/color]和[color=#37d8a9]防御提升[/color]状态，并对敌方目标造成5次攻击力80%的伤害，并附加2回合[color=#e5621b]防御下降[/color]的状态。"
+      "text": "幸运·普雷斯科特为己方附加2回合[color=#37d8a9]防御提升[/color]状态，并对敌方目标造成5次攻击力80%的伤害，并附加2回合[color=#e5621b]防御下降[/color]的状态。"
     },
     "buffid": [
-      390001111,
       390001002,
       390001007
     ],
@@ -8733,7 +8731,6 @@
     "ChildSkill": {
       "Id": [
         235005311,
-        235005312,
         235005323
       ]
     },
@@ -8743,7 +8740,6 @@
       "text": "伤害提升至85%。"
     },
     "buffid": [
-      390001111,
       390001002,
       390001007
     ],
@@ -8769,7 +8765,6 @@
     "ChildSkill": {
       "Id": [
         235005311,
-        235005312,
         235005333
       ]
     },
@@ -8779,7 +8774,6 @@
       "text": "伤害提升至90%。"
     },
     "buffid": [
-      390001111,
       390001002,
       390001007
     ],
@@ -8805,7 +8799,6 @@
     "ChildSkill": {
       "Id": [
         235005311,
-        235005312,
         235005343
       ]
     },
@@ -8815,7 +8808,6 @@
       "text": "伤害提升至95%。"
     },
     "buffid": [
-      390001111,
       390001002,
       390001007
     ],
@@ -8841,7 +8833,6 @@
     "ChildSkill": {
       "Id": [
         235005311,
-        235005312,
         235005353
       ]
     },
@@ -8851,7 +8842,6 @@
       "text": "伤害提升至100%。"
     },
     "buffid": [
-      390001111,
       390001002,
       390001007
     ],
@@ -22639,7 +22629,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_114002311_2",
-      "text": "伤害提升480%。"
+      "text": "伤害提升450%。"
     },
     "buffid": [
       390001006
@@ -22671,7 +22661,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_114002311_3",
-      "text": "伤害提升560%。"
+      "text": "伤害提升500%。"
     },
     "buffid": [
       390001006
@@ -22703,7 +22693,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_114002311_4",
-      "text": "伤害提升640%。"
+      "text": "伤害提升550%。"
     },
     "buffid": [
       390001006
@@ -22735,7 +22725,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_114002311_5",
-      "text": "伤害提升720%。"
+      "text": "伤害提升600%。"
     },
     "buffid": [
       390001006
@@ -45553,7 +45543,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_944001433_1",
-      "text": "攻击生命值小于50%的目标伤害增加30%"
+      "text": "攻击生命值大于50%的目标伤害增加30%"
     },
     "buffid": [],
     "map": ""
@@ -45908,7 +45898,7 @@
     "Target": 0,
     "ChildSkill": {
       "Id": [
-        944005317
+        944005318
       ]
     },
     "passSkill": [],

bin/json/game_skillbuff.json

@@ -415,8 +415,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      14,
+      13,
-      150
+      -150
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -2832,7 +2832,8 @@
     ],
     "Effect": [
       1,
-      6
+      6,
+      10
     ],
     "AddEffect": false,
     "RemoveType": true,
@@ -2934,7 +2935,8 @@
     "CoexistCheckArgu": [],
     "Effect": [
       1,
-      6
+      6,
+      10
     ],
     "AddEffect": false,
     "RemoveType": true,
@@ -10326,8 +10328,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      21,
+      111,
-      -30
+      30
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -10928,7 +10930,7 @@
     },
     "Desc": {
       "key": "skill_skill_buff_Desc_391000076",
-      "text": "3技能最终伤害增加10%"
+      "text": "造成伤害提升30%"
     },
     "BuffType": 33,
     "EffectArgu": [

bin/json/game_skillpassive.json

@@ -1661,7 +1661,7 @@
   {
     "Id": 413005212,
     "When": 3,
-    "FromCheck": "Target=3",
+    "FromCheck": "",
     "TargetCheck": "Target=1,HasBuff=390001001",
     "MainSkillCheck": "",
     "AfterSkillCheck": "",
@@ -1681,7 +1681,7 @@
   {
     "Id": 413005213,
     "When": 3,
-    "FromCheck": "Target=3",
+    "FromCheck": "",
     "TargetCheck": "Target=1,HasBuff=390001001",
     "MainSkillCheck": "",
     "AfterSkillCheck": "",
@@ -1702,7 +1702,7 @@
     "Id": 424009011,
     "When": 10,
     "FromCheck": "Target=3",
-    "TargetCheck": "Target=3",
+    "TargetCheck": "",
     "MainSkillCheck": "MainSkillID=124009111",
     "AfterSkillCheck": "",
     "BuffCheck": "",
@@ -2323,9 +2323,10 @@
     "Type": "BeatBack",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
-    "MaxEmitTimesInRound": 1,
+    "MaxEmitTimesInRound": 99,
     "Callback": [
-      114002111
+      1,
+      1000
     ]
   },
   {
@@ -8017,11 +8018,11 @@
   {
     "Id": 494500131,
     "When": 28,
-    "FromCheck": "Target=3",
+    "FromCheck": "",
     "TargetCheck": "Target=2,HasBuff=3",
     "MainSkillCheck": "SkillPos=3",
     "AfterSkillCheck": "",
-    "BuffCheck": "Succ=1",
+    "BuffCheck": "HasBuff=3,Succ=1",
     "DpsCheck": "",
     "AddCon": [],
     "PasPr": 1000,
@@ -8195,7 +8196,7 @@
     "Callback": [
       1,
       1000,
-      914008314
+      914002314
     ]
   },
   {
@@ -8315,8 +8316,7 @@
     "MaxEmitTimes": 0,
     "MaxEmitTimesInRound": 0,
     "Callback": [
-      913003315,
+      913003315
-      913003316
     ]
   },
   {
@@ -8778,5 +8778,45 @@
     "Callback": [
       253007212
     ]
+  },
+  {
+    "Id": 494400533,
+    "When": 16,
+    "FromCheck": "Target=3",
+    "TargetCheck": "",
+    "MainSkillCheck": "SkillPos=3",
+    "AfterSkillCheck": "",
+    "BuffCheck": "",
+    "DpsCheck": "",
+    "AddCon": [],
+    "PasPr": 1000,
+    "PasCorrection": 0,
+    "Type": "CallSkillPas",
+    "MaxEmitTimesInRoundByRole": 0,
+    "MaxEmitTimes": 0,
+    "MaxEmitTimesInRound": 0,
+    "Callback": [
+      944005316
+    ]
+  },
+  {
+    "Id": 435001213,
+    "When": 18,
+    "FromCheck": "",
+    "TargetCheck": "Target=3",
+    "MainSkillCheck": "SkillPos=2",
+    "AfterSkillCheck": "",
+    "BuffCheck": "BuffID=390001119,BuffID=390001120,BuffID=390001121,Succ=1",
+    "DpsCheck": "",
+    "AddCon": [],
+    "PasPr": 1000,
+    "PasCorrection": 0,
+    "Type": "CallSkillPas",
+    "MaxEmitTimesInRoundByRole": 0,
+    "MaxEmitTimes": 0,
+    "MaxEmitTimesInRound": 0,
+    "Callback": [
+      235001212
+    ]
   }
 ]

sys/configure/structs/Game.BuffEffectType.go

@@ -19,4 +19,5 @@ const (
     GameBuffEffectType_Shield = 7
     GameBuffEffectType_Overall = 8
     GameBuffEffectType_Shifu = 9
+    GameBuffEffectType_Dot = 10
 )

sys/configure/structs/Game.BuzkashiMountData.go

@@ -20,7 +20,6 @@ type GameBuzkashiMountData struct {
     Access []int32
     Showmodel string
     Model string
-    Controller string
     Point string
     Etime int32
     Stime int32
@@ -65,7 +64,6 @@ func (_v *GameBuzkashiMountData)Deserialize(_buf map[string]interface{}) (err er
 
     { var _ok_ bool; if _v.Showmodel, _ok_ = _buf["showmodel"].(string); !_ok_ { err = errors.New("showmodel error"); return } }
     { var _ok_ bool; if _v.Model, _ok_ = _buf["model"].(string); !_ok_ { err = errors.New("model error"); return } }
-    { var _ok_ bool; if _v.Controller, _ok_ = _buf["controller"].(string); !_ok_ { err = errors.New("controller error"); return } }
     { var _ok_ bool; if _v.Point, _ok_ = _buf["point"].(string); !_ok_ { err = errors.New("point error"); return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["etime"].(float64); !_ok_ { err = errors.New("etime error"); return }; _v.Etime = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stime"].(float64); !_ok_ { err = errors.New("stime error"); return }; _v.Stime = int32(_tempNum_) }