上传配置文件

bin/json/game_battleready.json

@@ -1776,7 +1776,7 @@
     "disableAiCamera": 1,
     "ChoseCamp": [],
     "DisableCamp": [],
-    "DefaultHero": 0,
+    "DefaultHero": 720021,
     "ChoseHero": [],
     "DisableHero": [],
     "LockSlots": [

bin/json/game_buzkashimount.json

@@ -203,7 +203,7 @@
       "text": "葛伦科的蛋，撒点胡椒和盐，味道应该会很很不错！"
     },
     "Color": 3,
-    "Img": "tx_by_54103",
+    "Img": "tx_by_54103_1",
     "access": [
       10041
     ],
@@ -235,7 +235,7 @@
       "text": "弱小无助但能吃<br>\"你不会指望幼龙能载人飞行吧?\""
     },
     "Color": 3,
-    "Img": "tx_by_54103",
+    "Img": "tx_by_54103_2",
     "access": [
       10041
     ],
@@ -267,7 +267,7 @@
       "text": "葛伦科是巨石类龙，长约4米，高约1.7米，全身披满装甲，尾巴像一个锤子，体态较胖。鱼脚司是他的好朋友（更像父亲），起名为肉球。"
     },
     "Color": 3,
-    "Img": "tx_by_54103",
+    "Img": "tx_by_54103_3",
     "access": [
       10041
     ],

bin/json/game_caravancity.json

@@ -85,8 +85,8 @@
     "sptalk": 11003,
     "buytalk": 11004,
     "weitalk": 11005,
-    "cityeventpro": 400,
+    "cityeventpro": 0,
-    "cityevent": 1
+    "cityevent": 0
   },
   {
     "id": 102,
@@ -210,8 +210,8 @@
     "sptalk": 11003,
     "buytalk": 11004,
     "weitalk": 11005,
-    "cityeventpro": 200,
+    "cityeventpro": 0,
-    "cityevent": 1
+    "cityevent": 0
   },
   {
     "id": 103,
@@ -334,8 +334,8 @@
     "sptalk": 11003,
     "buytalk": 11004,
     "weitalk": 11005,
-    "cityeventpro": 200,
+    "cityeventpro": 0,
-    "cityevent": 1
+    "cityevent": 0
   },
   {
     "id": 104,
@@ -461,8 +461,8 @@
     "sptalk": 11003,
     "buytalk": 11004,
     "weitalk": 11005,
-    "cityeventpro": 200,
+    "cityeventpro": 0,
-    "cityevent": 1
+    "cityevent": 0
   },
   {
     "id": 105,
@@ -587,8 +587,8 @@
     "sptalk": 11003,
     "buytalk": 11004,
     "weitalk": 11005,
-    "cityeventpro": 200,
+    "cityeventpro": 0,
-    "cityevent": 1
+    "cityevent": 0
   },
   {
     "id": 106,
@@ -714,8 +714,8 @@
     "sptalk": 11003,
     "buytalk": 11004,
     "weitalk": 11005,
-    "cityeventpro": 200,
+    "cityeventpro": 0,
-    "cityevent": 1
+    "cityevent": 0
   },
   {
     "id": 107,
@@ -840,8 +840,8 @@
     "sptalk": 11003,
     "buytalk": 11004,
     "weitalk": 11005,
-    "cityeventpro": 200,
+    "cityeventpro": 0,
-    "cityevent": 1
+    "cityevent": 0
   },
   {
     "id": 108,
@@ -966,8 +966,8 @@
     "sptalk": 11003,
     "buytalk": 11004,
     "weitalk": 11005,
-    "cityeventpro": 200,
+    "cityeventpro": 0,
-    "cityevent": 1
+    "cityevent": 0
   },
   {
     "id": 109,
@@ -1092,8 +1092,8 @@
     "sptalk": 11003,
     "buytalk": 11004,
     "weitalk": 11005,
-    "cityeventpro": 200,
+    "cityeventpro": 0,
-    "cityevent": 1
+    "cityevent": 0
   },
   {
     "id": 110,
@@ -1218,8 +1218,8 @@
     "sptalk": 11003,
     "buytalk": 11004,
     "weitalk": 11005,
-    "cityeventpro": 200,
+    "cityeventpro": 0,
-    "cityevent": 1
+    "cityevent": 0
   },
   {
     "id": 111,
@@ -1345,8 +1345,8 @@
     "sptalk": 11003,
     "buytalk": 11004,
     "weitalk": 11005,
-    "cityeventpro": 200,
+    "cityeventpro": 0,
-    "cityevent": 1
+    "cityevent": 0
   },
   {
     "id": 112,
@@ -1471,8 +1471,8 @@
     "sptalk": 11003,
     "buytalk": 11004,
     "weitalk": 11005,
-    "cityeventpro": 200,
+    "cityeventpro": 0,
-    "cityevent": 1
+    "cityevent": 0
   },
   {
     "id": 113,
@@ -1597,7 +1597,7 @@
     "sptalk": 11003,
     "buytalk": 11004,
     "weitalk": 11005,
-    "cityeventpro": 200,
+    "cityeventpro": 0,
-    "cityevent": 1
+    "cityevent": 0
   }
 ]

bin/json/game_caravanpaper.json

@@ -24,7 +24,7 @@
     },
     "newspaper_txt": {
       "key": "caravan_caravan_paper_newspaper_txt_2",
-      "text": "阿宝在和平城偷吃被捕"
+      "text": "今日，超人气天团坏蛋联盟亮相美术馆，引起狂热民众跟随，现场一度因骚动引来大量警力维护秩序。四人在警方保护下与馆中珍藏金海豚合影后便匆匆离开。"
     },
     "newspaper_picture": "jgsd_bz_pt_hdlm",
     "weight": 0
@@ -39,7 +39,7 @@
     },
     "newspaper_txt": {
       "key": "caravan_caravan_paper_newspaper_txt_3",
-      "text": "阿宝在博格城偷吃被捕"
+      "text": "本市第一龙头企业宝贝集团发布宝贝奶瓶七系！据称这是有史以来改变最大的奶瓶，曲线型设计，九十八种营养配方，并有多种颜色选择。"
     },
     "newspaper_picture": "jgsd_bz_pt_hdlm",
     "weight": 0
@@ -54,7 +54,7 @@
     },
     "newspaper_txt": {
       "key": "caravan_caravan_paper_newspaper_txt_4",
-      "text": "阿宝在贝特曼城偷吃被捕"
+      "text": "精灵群星巡演开启！王牌歌后波比女王领衔，据悉她将公布新专辑首发曲目。同时摇滚女王巴布，戴塔戴恩，约德尔歌手等众多大腕也倾情加盟。"
     },
     "newspaper_picture": "jgsd_bz_pt_hdlm",
     "weight": 0
@@ -69,7 +69,7 @@
     },
     "newspaper_txt": {
       "key": "caravan_caravan_paper_newspaper_txt_5",
-      "text": "阿宝在加菲斯特城偷吃被捕"
+      "text": "想拥有一场治愈有趣的旅行吗？那就赶快来参加童话王国举办的梦幻航海之旅吧！在靴猫和贫嘴驴的陪伴下，度过七天的快乐时光！"
     },
     "newspaper_picture": "jgsd_bz_pt_hdlm",
     "weight": 0
@@ -114,7 +114,7 @@
     },
     "newspaper_txt": {
       "key": "caravan_caravan_paper_newspaper_txt_8",
-      "text": "阿宝在贝特曼城偷吃被捕"
+      "text": "振奋人心！恐惧灵大军被翡翠宫神龙大侠阿宝成功击退，再起不能！和平谷解除危机。据小道消息称，阿宝最新系列玩偶已经全部售罄。"
     },
     "newspaper_picture": "jgsd_bz_pt_hdlm",
     "weight": 0
@@ -159,7 +159,7 @@
     },
     "newspaper_txt": {
       "key": "caravan_caravan_paper_newspaper_txt_11",
-      "text": "阿宝在博格城偷吃被捕"
+      "text": "近日中轴城频繁有居民反映，在夜晚看见黑色不明生物在上空飞行。记者跟进得知该生物常飞往北方，也许是维京人饲养的神奇生物。"
     },
     "newspaper_picture": "jgsd_bz_pt_hdlm",
     "weight": 0
@@ -174,7 +174,7 @@
     },
     "newspaper_txt": {
       "key": "caravan_caravan_paper_newspaper_txt_12",
-      "text": "阿宝在和平城偷吃被捕"
+      "text": "一股最新的寒潮即将来袭！据家住雪山的市民诺斯先生反应，这股寒潮很可能是冰霜杰克搞的鬼，其目的是为了让圣诞节提前到来，让诺斯先生加班完成工作。"
     },
     "newspaper_picture": "jgsd_bz_pt_hdlm",
     "weight": 0
@@ -204,7 +204,7 @@
     },
     "newspaper_txt": {
       "key": "caravan_caravan_paper_newspaper_txt_14",
-      "text": "阿宝在和平城偷吃被捕"
+      "text": "洞穴墙壁为何有殷红血手印？半夜三更为何狼嚎阵阵？乳臭小孩为何行为像狗？洞穴人到底如何生存？让我们走进洞穴，带大家解谜咕噜一家的奥秘。"
     },
     "newspaper_picture": "jgsd_bz_pt_hdlm",
     "weight": 0
@@ -234,7 +234,7 @@
     },
     "newspaper_txt": {
       "key": "caravan_caravan_paper_newspaper_txt_16",
-      "text": "阿宝在贝特曼城偷吃被捕"
+      "text": "全球巡演的超火爆人气马戏团萨拉戈萨来临！台柱雄狮亚历克斯将和他的伙伴们一起为大家献上极致绚丽的视听盛宴！"
     },
     "newspaper_picture": "jgsd_bz_pt_hdlm",
     "weight": 0
@@ -249,7 +249,7 @@
     },
     "newspaper_txt": {
       "key": "caravan_caravan_paper_newspaper_txt_17",
-      "text": "阿宝在加菲斯特城偷吃被捕"
+      "text": "今日，超人气天团坏蛋联盟亮相美术馆，引起狂热民众跟随，现场一度因骚动引来大量警力维护秩序。四人在警方保护下与馆中珍藏金海豚合影后便匆匆离开。"
     },
     "newspaper_picture": "jgsd_bz_pt_hdlm",
     "weight": 0

bin/json/game_combatbox.json

@@ -73,11 +73,11 @@
   },
   {
     "id": 10301,
-    "drop": 16001001
+    "drop": 16001002
   },
   {
     "id": 10302,
-    "drop": 16001001
+    "drop": 16001002
   },
   {
     "id": 10303,

bin/json/game_gamesummary.json

@@ -15,7 +15,7 @@
     "jumpId": 166,
     "introduce": {
       "key": "gamesummary_node_introdunce_1",
-      "text": "故事的开始起于一场冒险，那时候谁也不知道，这将是一次漫长又精彩非凡的旅程。"
+      "text": "起初，没有人在意这次冒险，对于反派来说，这不过是又一次嘲讽失败者的机会。"
     },
     "bg": "hkz_wftj_zxgk",
     "icon": "hkz_tx_zxgk",
@@ -48,7 +48,7 @@
     "jumpId": 10015,
     "introduce": {
       "key": "gamesummary_node_introdunce_2",
-      "text": "一流剑客靴猫喜欢比武，他在此建立了一个竞技场，看看城中谁才是最强。"
+      "text": "靴猫继续把玩着手中的剑，他在等，等候那些跃跃欲试站在台上的人，等着那个最强的勇者。"
     },
     "bg": "hkz_wftj_jjc",
     "icon": "hkz_tx_jjc",
@@ -76,7 +76,7 @@
     "jumpId": 10023,
     "introduce": {
       "key": "gamesummary_node_introdunce_3",
-      "text": "月圆之夜，原始人吃光了贡品。被愤怒和饥饿所支配的猩猩发出了震耳欲聋的咆哮。他要让那些狂妄之徒吃点苦头。"
+      "text": "月圆之夜，饥饿的猩猩疯狂咆哮着，它决心给那些吃掉贡品的狂徒尝尝很多点苦头。"
     },
     "bg": "hkz_wftj_sl02",
     "icon": "wjyz_img016",
@@ -114,7 +114,7 @@
     "jumpId": 10025,
     "introduce": {
       "key": "gamesummary_node_introdunce_4",
-      "text": "大厨因为没抓到精灵们而被放逐，对精灵恨之入骨，誓要将精灵赶尽杀绝。夜深无人处，时常能听见她咬牙切齿的诅咒声。"
+      "text": "夜半三更，又传来大厨咬牙切齿的诅咒声。自从被精灵戏耍遭到放逐后，她便日夜赌咒要将精灵赶尽杀绝。"
     },
     "bg": "hkz_wftj_sl01",
     "icon": "wjyz_img014",
@@ -152,7 +152,7 @@
     "jumpId": 10026,
     "introduce": {
       "key": "gamesummary_node_introdunce_5",
-      "text": "波波星人带走了戈格星人的孩子，自此戈格星人开始了对波波星人的追击之旅。焦急和恼怒已经吞噬了他的理智。"
+      "text": "波波星人夺走了戈格星人的孩子！焦急和恼怒吞噬了戈格星人的理智，自此他便对波波星人穷追不舍。"
     },
     "bg": "hkz_wftj_sl03",
     "icon": "wjyz_img017",
@@ -190,7 +190,7 @@
     "jumpId": 10024,
     "introduce": {
       "key": "gamesummary_node_introdunce_6",
-      "text": "盘踞在城堡中看守着财富和公主的巨龙，最讨厌一些不速之客擅闯她的领地。累累的白骨是她给闯入者们的教训。"
+      "text": "盘踞在城堡中看守财富和公主的巨龙，最讨厌一些不速之客擅闯她的领地。累累的白骨是她给闯入者们的警示。"
     },
     "bg": "hkz_wftj_sl04",
     "icon": "wjyz_img015",
@@ -228,7 +228,7 @@
     "jumpId": 10022,
     "introduce": {
       "key": "gamesummary_node_introdunce_7",
-      "text": "贝洛克唤醒沉睡千年的火焰泰坦，身上不断掉落着烈焰，将大地燃烧殆尽，三泰坦一旦汇合，世界将因此毁灭。"
+      "text": "火焰泰坦从海域缓缓升起，身上不断掉落着烈焰，那烈焰将大地燃烧殆尽。"
     },
     "bg": "hkz_wftj_wjyz03",
     "icon": "wjyz_img012",
@@ -271,7 +271,7 @@
     "jumpId": 10020,
     "introduce": {
       "key": "gamesummary_node_introdunce_8",
-      "text": "斯卡尔唤醒沉睡千年的冰霜泰坦，冰块从他冰冷的眼中掉落，所过之处皆冻结成冰山，三泰坦一旦汇合，世界将因此毁灭。"
+      "text": "冰霜泰坦突破了极寒的冰层，冰块从他冰冷的眼中掉落，所过之处皆冻结成冰山。"
     },
     "bg": "hkz_wftj_wjyz02",
     "icon": "wjyz_img011",
@@ -314,7 +314,7 @@
     "jumpId": 10021,
     "introduce": {
       "key": "gamesummary_node_introdunce_9",
-      "text": "贝洛克与斯卡尔胁迫娜璃唤醒沉睡千年的森林泰坦，她将手张开，手中的藤蔓滑落入地，蜿蜒千里，三泰坦一旦汇合，世界将因此毁灭。"
+      "text": "森林泰坦现身于龟裂的大地之上，她张开双臂，数不胜数的藤蔓滑落入地生根，蜿蜒千里。"
     },
     "bg": "hkz_wftj_wjyz01",
     "icon": "wjyz_img013",
@@ -357,7 +357,7 @@
     "jumpId": 10013,
     "introduce": {
       "key": "gamesummary_node_introdunce_10",
-      "text": "美丽，梦幻与诡异兼具，这便是沙人建造的梦境回廊。守护者们可在此磨练技艺。"
+      "text": "美丽梦幻与诡异兼具，这便是沙人建造的梦境回廊。进入的守护者们或超越自我，或沉迷其中不愿醒来。"
     },
     "bg": "hkz_wftj_jyfb",
     "icon": "hkz_tx_jyfb",
@@ -499,7 +499,7 @@
     "jumpId": 11001,
     "introduce": {
       "key": "gamesummary_node_introdunce_14",
-      "text": "去往神秘的远方，探索未知的宇宙，交易珍稀的宝藏！为了充实巨怪市集，巨怪们踏上了列车，开启了漫长的旅途。"
+      "text": "去往神秘的远方，探索未知的宇宙，交易珍稀的宝藏！巨怪们踏上了列车，开始了漫长的旅途。"
     },
     "bg": "hkz_wftj_jgsd",
     "icon": "hkz_tx_jgsd",
@@ -532,7 +532,7 @@
     "jumpId": 10027,
     "introduce": {
       "key": "gamesummary_node_introdunce_16",
-      "text": "史前板块运动形成的天然巨石阵迷宫，道路错综复杂，幽深莫测，原始人们是如何从这里逃出生天的呢？"
+      "text": "史前板块运动形成的天然巨石阵迷宫，道路错综复杂，幽深莫测，似乎永无尽头。"
     },
     "bg": "hkz_wftj_mj",
     "icon": "hkz_tx_mj",

bin/json/game_global.json

@@ -851,7 +851,7 @@
       "n": 200
     },
     "dragon_interaction": 15,
-    "dialogueclickcd": 1,
+    "dialogueclickcd": 0.3,
     "doragon_item": "24012003",
     "sign_account": 28
   }

bin/json/game_gm.json

@@ -449,26 +449,6 @@
     "data": "102",
     "prefix": ""
   },
-  {
-    "id": 46,
-    "type": 4,
-    "text": {
-      "key": "GM_GM_text_51",
-      "text": "查看周常任务"
-    },
-    "data": "110",
-    "prefix": ""
-  },
-  {
-    "id": 47,
-    "type": 4,
-    "text": {
-      "key": "GM_GM_text_52",
-      "text": "前往成就任务"
-    },
-    "data": "111",
-    "prefix": ""
-  },
   {
     "id": 48,
     "type": 4,
@@ -619,16 +599,6 @@
     "data": "171",
     "prefix": ""
   },
-  {
-    "id": 63,
-    "type": 4,
-    "text": {
-      "key": "GM_GM_text_71",
-      "text": "打开俱乐部boss（需加入公会）"
-    },
-    "data": "172",
-    "prefix": ""
-  },
   {
     "id": 64,
     "type": 4,
@@ -649,16 +619,6 @@
     "data": "721",
     "prefix": ""
   },
-  {
-    "id": 66,
-    "type": 4,
-    "text": {
-      "key": "GM_GM_text_74",
-      "text": "进行锻造"
-    },
-    "data": "1001",
-    "prefix": ""
-  },
   {
     "id": 67,
     "type": 4,
@@ -749,16 +709,6 @@
     "data": "905",
     "prefix": ""
   },
-  {
-    "id": 78,
-    "type": 4,
-    "text": {
-      "key": "GM_GM_text_88",
-      "text": "前往俱乐部"
-    },
-    "data": "907",
-    "prefix": ""
-  },
   {
     "id": 79,
     "type": 4,

bin/json/game_item.json

@@ -20157,7 +20157,7 @@
     "id": "25000001",
     "name": {
       "key": "item_item_name_414",
-      "text": "仙女泪滴"
+      "text": "仙女泪水"
     },
     "usetype": 1,
     "color": 3,

bin/json/game_lottery.json

@@ -90482,12 +90482,36 @@
   {
     "id": 3771,
     "lotteryid": 16001001,
-    "description": "记忆碎片第1章第1关",
+    "description": "记忆碎片第1章第1关怪物深厚的宝箱",
     "type": 1,
     "groupwt": 1,
     "groupid": 1001,
     "subtype": 1,
-    "groupnum": 2,
+    "groupnum": 4,
+    "itemid": {
+      "a": "item",
+      "t": "16001001",
+      "n": 1
+    },
+    "itemdes": "",
+    "itemwt": 1000,
+    "min": 1,
+    "max": 1,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 3772,
+    "lotteryid": 16001002,
+    "description": "记忆碎片第1章第1关其他2个宝箱",
+    "type": 1,
+    "groupwt": 1,
+    "groupid": 1001,
+    "subtype": 1,
+    "groupnum": 1,
     "itemid": {
       "a": "item",
       "t": "16001001",

bin/json/game_mainstage.json

@@ -2624,7 +2624,7 @@
     "destroy": 1,
     "progress": 1,
     "stroyshow": 0,
-    "frontstoryid": 300380,
+    "frontstoryid": 200380,
     "afterstoryid": 0,
     "maingroupName": {
       "key": "",

bin/json/game_monsterformat.json

@@ -238172,7 +238172,7 @@
     "equip": [],
     "newskill": [],
     "lv": 1,
-    "hppro": 0.3,
+    "hppro": 0.2,
     "atkpro": 1,
     "defpro": 1,
     "skill1": 1,
@@ -238383,6 +238383,26 @@
     "speed": 140,
     "modelsize": 1
   },
+  {
+    "Id": 720021,
+    "pos": 1,
+    "captainId": 0,
+    "IsBoss": 0,
+    "bossHpCnt": 0,
+    "heroid": 14003,
+    "star": 4,
+    "equip": [],
+    "newskill": [],
+    "lv": 10,
+    "hppro": 1,
+    "atkpro": 1,
+    "defpro": 1,
+    "skill1": 1,
+    "skill2": 1,
+    "skill3": 1,
+    "speed": 140,
+    "modelsize": 1
+  },
   {
     "Id": 800001,
     "pos": 1,

bin/json/game_navigation.json

@@ -9,7 +9,7 @@
     "sceneicon": "ty_qp_my01",
     "functionname": {
       "key": "navigation_Sheet1_functionname_1",
-      "text": "商铺"
+      "text": "商店"
     },
     "npcName": [
       "功能入口-商人"

bin/json/game_shop.json

@@ -61,11 +61,11 @@
     "tab": 3,
     "shopname": {
       "key": "shop_shop_shopname_3",
-      "text": "友情商店"
+      "text": "友情专柜"
     },
     "upper_shop": {
       "key": "shop_shop_upper_shop_3",
-      "text": "玩法商店"
+      "text": "奇趣商店"
     },
     "rtype": 2,
     "rtime": 1,
@@ -85,11 +85,11 @@
     "tab": 4,
     "shopname": {
       "key": "shop_shop_shopname_4",
-      "text": "竞技商店"
+      "text": "斗士专柜"
     },
     "upper_shop": {
       "key": "shop_shop_upper_shop_4",
-      "text": "玩法商店"
+      "text": "奇趣商店"
     },
     "rtype": 2,
     "rtime": 7,
@@ -111,11 +111,11 @@
     "tab": 5,
     "shopname": {
       "key": "shop_shop_shopname_5",
-      "text": "俱乐部商店"
+      "text": "名流专柜"
     },
     "upper_shop": {
       "key": "shop_shop_upper_shop_5",
-      "text": "玩法商店"
+      "text": "奇趣商店"
     },
     "rtype": 2,
     "rtime": 7,
@@ -137,11 +137,11 @@
     "tab": 6,
     "shopname": {
       "key": "shop_shop_shopname_6",
-      "text": "守护者商店"
+      "text": "守护专柜"
     },
     "upper_shop": {
       "key": "shop_shop_upper_shop_6",
-      "text": "玩法商店"
+      "text": "奇趣商店"
     },
     "rtype": 2,
     "rtime": 21,

bin/json/game_skillafteratk.json

@@ -51800,7 +51800,30 @@
       390001401,
       1000,
       1,
-      1
+      2
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 813002215,
+    "EmitPR": 1000,
+    "From": 3,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 2,
+    "Argu": [
+      481300223,
+      -1,
+      -1
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -52245,7 +52268,7 @@
     "ExecuteCnt": 1,
     "Type": 2,
     "Argu": [
-      414007211,
+      481400721,
       -1,
       -1
     ],
@@ -52292,7 +52315,7 @@
     "ExecuteCnt": 1,
     "Type": 2,
     "Argu": [
-      414007211,
+      481400722,
       -1,
       -1
     ],
@@ -52339,7 +52362,7 @@
     "ExecuteCnt": 1,
     "Type": 2,
     "Argu": [
-      481400721,
+      481400723,
       -1,
       -1
     ],
@@ -52426,7 +52449,7 @@
   {
     "Id": 814003213,
     "EmitPR": 1000,
-    "From": 4,
+    "From": 3,
     "Where": [],
     "Order": "",
     "Limit": 10,
@@ -52436,7 +52459,7 @@
       391000014,
       1000,
       1,
-      2
+      -1
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -52481,7 +52504,7 @@
     "ExecuteCnt": 1,
     "Type": 2,
     "Argu": [
-      484500321,
+      481400322,
       -1,
       -1
     ],
@@ -52504,7 +52527,7 @@
     "ExecuteCnt": 1,
     "Type": 2,
     "Argu": [
-      484500322,
+      484500321,
       -1,
       -1
     ],
@@ -53919,6 +53942,29 @@
     "RevisiCondition": "",
     "RevisiParams": []
   },
+  {
+    "Id": 813004216,
+    "EmitPR": 1000,
+    "From": 3,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 2,
+    "Argu": [
+      481300423,
+      -1,
+      -1
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
   {
     "Id": 833003111,
     "EmitPR": 1000,
@@ -54702,10 +54748,33 @@
     "ExecuteCnt": 1,
     "Type": 3,
     "Argu": [
-      390001011,
+      391000085,
       1000,
       1,
-      1
+      -1
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 813001216,
+    "EmitPR": 1000,
+    "From": 3,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 2,
+    "Argu": [
+      481300123,
+      -1,
+      -1
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -54750,7 +54819,7 @@
     "ExecuteCnt": 1,
     "Type": 2,
     "Argu": [
-      414005211,
+      481400521,
       -1,
       -1
     ],
@@ -55268,7 +55337,7 @@
       390001004,
       1000,
       1,
-      2
+      4
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -55292,7 +55361,7 @@
       390001001,
       1000,
       1,
-      1
+      2
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -57302,8 +57371,10 @@
   {
     "Id": 915005313,
     "EmitPR": 1000,
-    "From": 12,
+    "From": 1,
-    "Where": [],
+    "Where": [
+      "EnemyNoBuff=1"
+    ],
     "Order": "",
     "Limit": 10,
     "ExecuteCnt": 1,
@@ -57312,7 +57383,7 @@
       390001111,
       1000,
       1,
-      2
+      1
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -58950,7 +59021,7 @@
   {
     "Id": 934002311,
     "EmitPR": 1000,
-    "From": 4,
+    "From": 3,
     "Where": [],
     "Order": "",
     "Limit": 10,
@@ -59043,7 +59114,7 @@
   {
     "Id": 934002315,
     "EmitPR": 1000,
-    "From": 12,
+    "From": 3,
     "Where": [],
     "Order": "",
     "Limit": 10,
@@ -59063,6 +59134,29 @@
     "RevisiCondition": "",
     "RevisiParams": []
   },
+  {
+    "Id": 934002316,
+    "EmitPR": 1000,
+    "From": 3,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 2,
+    "Argu": [
+      493400232,
+      -1,
+      -1
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
   {
     "Id": 924005311,
     "EmitPR": 1000,
@@ -60322,7 +60416,7 @@
     "Argu": [
       390001205,
       1000,
-      1,
+      3,
       -1
     ],
     "FollowSK": [],

bin/json/game_skillatk.json

@@ -343,8 +343,7 @@
     "ChildSkill": {
       "Id": [
         225004314,
-        225004312,
+        225004312
-        225004313
       ]
     },
     "passSkill": [],
@@ -377,8 +376,7 @@
     "ChildSkill": {
       "Id": [
         225004324,
-        225004312,
+        225004312
-        225004313
       ]
     },
     "passSkill": [],
@@ -411,8 +409,7 @@
     "ChildSkill": {
       "Id": [
         225004334,
-        225004312,
+        225004312
-        225004313
       ]
     },
     "passSkill": [],
@@ -445,8 +442,7 @@
     "ChildSkill": {
       "Id": [
         225004344,
-        225004312,
+        225004312
-        225004313
       ]
     },
     "passSkill": [],
@@ -479,8 +475,7 @@
     "ChildSkill": {
       "Id": [
         225004344,
-        225004312,
+        225004312
-        225004313
       ]
     },
     "passSkill": [],
@@ -13590,7 +13585,6 @@
     "ChildSkill": {
       "Id": [
         213004211,
-        213004212,
         213004213
       ]
     },
@@ -13600,8 +13594,7 @@
       "text": "法夸德勋爵对敌方1个目标发起攻击，造成攻击力300%的伤害，并为自身附加2回合[color=#37d8a9]攻击提升[/color]状态和2回合[color=#37d8a9]殊死较量[/color]状态。"
     },
     "buffid": [
-      390001001,
+      390001001
-      390001104
     ],
     "map": ""
   },
@@ -13625,7 +13618,6 @@
     "ChildSkill": {
       "Id": [
         213004211,
-        213004212,
         213004223
       ]
     },
@@ -13635,8 +13627,7 @@
       "text": "伤害提升至330%。"
     },
     "buffid": [
-      390001001,
+      390001001
-      390001104
     ],
     "map": ""
   },
@@ -13660,7 +13651,6 @@
     "ChildSkill": {
       "Id": [
         213004211,
-        213004212,
         213004233
       ]
     },
@@ -13670,8 +13660,7 @@
       "text": "伤害提升至360%。"
     },
     "buffid": [
-      390001001,
+      390001001
-      390001104
     ],
     "map": ""
   },
@@ -13695,7 +13684,6 @@
     "ChildSkill": {
       "Id": [
         213004211,
-        213004212,
         213004243
       ]
     },
@@ -13705,8 +13693,7 @@
       "text": "伤害提升至390%。"
     },
     "buffid": [
-      390001001,
+      390001001
-      390001104
     ],
     "map": ""
   },
@@ -13730,7 +13717,6 @@
     "ChildSkill": {
       "Id": [
         213004211,
-        213004212,
         213004253
       ]
     },
@@ -13740,8 +13726,7 @@
       "text": "伤害提升至430%。"
     },
     "buffid": [
-      390001001,
+      390001001
-      390001104
     ],
     "map": ""
   },
@@ -38407,10 +38392,12 @@
     "Target": 0,
     "ChildSkill": {
       "Id": [
-        813004215
+        813004216
       ]
     },
-    "passSkill": [],
+    "passSkill": [
+      813004216
+    ],
     "Desc": {
       "key": "skill_skill_atk_Desc_813004423_1",
       "text": "释放2技能后30%概率为自身添加2回合【殊死较量】状态"
@@ -42759,7 +42746,7 @@
     "Target": 0,
     "ChildSkill": {
       "Id": [
-        934002311
+        934002316
       ]
     },
     "passSkill": [],

bin/json/game_skillbuff.json

@@ -1534,7 +1534,7 @@
     },
     "Desc": {
       "key": "skill_skill_buff_Desc_390001207",
-      "text": "使己方收到伤害降低25%，且在每个队友行动前，为其驱散1个减益状态并回复其最大生命值20%的生命，效果持续期间自身无法行动。"
+      "text": "每个队友行动前，为其驱散1个减益状态并回复其最大生命值20%的生命，效果持续期间自身无法行动。"
     },
     "BuffType": 32,
     "EffectArgu": [],
@@ -1561,16 +1561,16 @@
     "Id": 390001208,
     "Name": {
       "key": "skill_skill_buff_Name_390001208",
-      "text": "[color=#37d8a9]爱的抱抱[/color] "
+      "text": "爱的抱抱减伤"
     },
     "Desc": {
       "key": "skill_skill_buff_Desc_390001208",
-      "text": "使己方收到伤害降低25%，且在每个队友行动前，为其驱散1个减益状态并回复其最大生命值20%的生命，效果持续期间自身无法行动。"
+      "text": "每个队友行动前，为其驱散1个减益状态并回复其最大生命值20%的生命，效果持续期间自身无法行动。"
     },
     "BuffType": 20,
     "EffectArgu": [
       13,
-      350
+      250
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -8571,7 +8571,6 @@
       23,
       1,
       2,
-      2,
       30
     ],
     "BufParNum": 1,
@@ -8869,9 +8868,7 @@
     },
     "BuffType": 112,
     "EffectArgu": [
-      14,
+      120
-      120,
-      0
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -10900,7 +10897,7 @@
     },
     "BuffType": 79,
     "EffectArgu": [
-      3,
+      0,
       100,
       -400
     ],
@@ -11215,5 +11212,39 @@
     "buffeffect": "",
     "buffpos": "根节点",
     "forbidFloat": 0
+  },
+  {
+    "Id": 391000085,
+    "Name": {
+      "key": "skill_skill_buff_Name_391000085",
+      "text": "[color=#37d8a9]伤害提升[/color] "
+    },
+    "Desc": {
+      "key": "skill_skill_buff_Desc_391000085",
+      "text": "血量造成伤害提升10%。"
+    },
+    "BuffType": 33,
+    "EffectArgu": [
+      0,
+      100,
+      500
+    ],
+    "BufParNum": 1,
+    "RelyCheckArgu": [],
+    "CoexistCheckArgu": [],
+    "Effect": [
+      3
+    ],
+    "AddEffect": false,
+    "RemoveType": true,
+    "Priority": 0,
+    "NotOverlay": 0,
+    "OverlayTimes": 3,
+    "SameID": false,
+    "golbalbufficon": "",
+    "buffIcon": "",
+    "buffeffect": "",
+    "buffpos": "根节点",
+    "forbidFloat": 0
   }
 ]

bin/json/game_skillpassive.json

@@ -1403,7 +1403,7 @@
     "When": 16,
     "FromCheck": "Target=3",
     "TargetCheck": "Target=2,Nobuff=3",
-    "MainSkillCheck": "",
+    "MainSkillCheck": "MainSkillID=114005211",
     "AfterSkillCheck": "",
     "BuffCheck": "",
     "DpsCheck": "",
@@ -5567,9 +5567,9 @@
   },
   {
     "Id": 481300221,
-    "When": 15,
+    "When": 4,
     "FromCheck": "",
-    "TargetCheck": "Target=2",
+    "TargetCheck": "Target=2,Hpproless=500",
     "MainSkillCheck": "",
     "AfterSkillCheck": "",
     "BuffCheck": "",
@@ -5587,10 +5587,10 @@
   },
   {
     "Id": 481300222,
-    "When": 15,
+    "When": 16,
-    "FromCheck": "Target=3",
+    "FromCheck": "",
-    "TargetCheck": "Target=2",
+    "TargetCheck": "Target=2,HasBuff=390001401",
-    "MainSkillCheck": "",
+    "MainSkillCheck": "SkillPos=2",
     "AfterSkillCheck": "",
     "BuffCheck": "",
     "DpsCheck": "",
@@ -5602,12 +5602,12 @@
     "MaxEmitTimes": 0,
     "MaxEmitTimesInRound": 0,
     "Callback": [
-      813002215
+      813002214
     ]
   },
   {
     "Id": 481300321,
-    "When": 2,
+    "When": 16,
     "FromCheck": "",
     "TargetCheck": "Target=3,Hpproless=600",
     "MainSkillCheck": "",
@@ -5808,8 +5808,8 @@
   {
     "Id": 481400521,
     "When": 15,
-    "FromCheck": "",
+    "FromCheck": "Target=3",
-    "TargetCheck": "Target=3",
+    "TargetCheck": "",
     "MainSkillCheck": "",
     "AfterSkillCheck": "",
     "BuffCheck": "",
@@ -5887,7 +5887,7 @@
   },
   {
     "Id": 481500221,
-    "When": 2,
+    "When": 16,
     "FromCheck": "",
     "TargetCheck": "Target=3,HpproGreater=600",
     "MainSkillCheck": "",
@@ -7714,12 +7714,12 @@
   },
   {
     "Id": 492500431,
-    "When": 2,
+    "When": 19,
-    "FromCheck": "",
+    "FromCheck": "Target=3",
-    "TargetCheck": "Target=3,HasBuff=390001207",
+    "TargetCheck": "",
-    "MainSkillCheck": "",
+    "MainSkillCheck": "SkillPos=3",
     "AfterSkillCheck": "",
-    "BuffCheck": "",
+    "BuffCheck": "BuffID=390001207,Succ=1",
     "DpsCheck": "",
     "AddCon": [],
     "PasPr": 1000,
@@ -8541,7 +8541,7 @@
   },
   {
     "Id": 493400231,
-    "When": 16,
+    "When": 3,
     "FromCheck": "",
     "TargetCheck": "Target=3",
     "MainSkillCheck": "SkillPos=3",
@@ -8818,5 +8818,85 @@
     "Callback": [
       235001212
     ]
+  },
+  {
+    "Id": 493400232,
+    "When": 20,
+    "FromCheck": "",
+    "TargetCheck": "Target=3",
+    "MainSkillCheck": "SkillPos=3",
+    "AfterSkillCheck": "",
+    "BuffCheck": "",
+    "DpsCheck": "",
+    "AddCon": [],
+    "PasPr": 1000,
+    "PasCorrection": 0,
+    "Type": "CallSkillPas",
+    "MaxEmitTimesInRoundByRole": 0,
+    "MaxEmitTimes": 0,
+    "MaxEmitTimesInRound": 0,
+    "Callback": [
+      934002311
+    ]
+  },
+  {
+    "Id": 481300223,
+    "When": 16,
+    "FromCheck": "Target=3",
+    "TargetCheck": "",
+    "MainSkillCheck": "SkillPos=1",
+    "AfterSkillCheck": "",
+    "BuffCheck": "",
+    "DpsCheck": "",
+    "AddCon": [],
+    "PasPr": 1000,
+    "PasCorrection": 0,
+    "Type": "CallSkillPas",
+    "MaxEmitTimesInRoundByRole": 0,
+    "MaxEmitTimes": 0,
+    "MaxEmitTimesInRound": 0,
+    "Callback": [
+      813002111
+    ]
+  },
+  {
+    "Id": 481300423,
+    "When": 16,
+    "FromCheck": "Target=3",
+    "TargetCheck": "",
+    "MainSkillCheck": "SkillPos=2",
+    "AfterSkillCheck": "",
+    "BuffCheck": "",
+    "DpsCheck": "",
+    "AddCon": [],
+    "PasPr": 1000,
+    "PasCorrection": 0,
+    "Type": "CallSkillPas",
+    "MaxEmitTimesInRoundByRole": 0,
+    "MaxEmitTimes": 0,
+    "MaxEmitTimesInRound": 0,
+    "Callback": [
+      813004215
+    ]
+  },
+  {
+    "Id": 481400322,
+    "When": 16,
+    "FromCheck": "",
+    "TargetCheck": "Target=2",
+    "MainSkillCheck": "SkillPos=2",
+    "AfterSkillCheck": "",
+    "BuffCheck": "",
+    "DpsCheck": "",
+    "AddCon": [],
+    "PasPr": 1000,
+    "PasCorrection": 0,
+    "Type": "CallSkillPas",
+    "MaxEmitTimesInRoundByRole": 0,
+    "MaxEmitTimes": 0,
+    "MaxEmitTimesInRound": 0,
+    "Callback": [
+      814003214
+    ]
   }
 ]