完善缴械机制，完善控制对技能的封禁

Readme.md

@@ -22,6 +22,7 @@
 
 
 ## 更新记录 
+- **2023/3/31**；**乐子人**；完善缴械机制和控制对技能的封禁
 - **2023/3/31**；**不明枪兵**；添加火山怪和硫酸怪高等级免战即死
 - **2023/3/29**；**不明枪兵**；解决硫酸史莱姆事件和研究站bug
 - **2023/3/28**；**乐子人**；解决一些技能bug

data/CommonEvents.json

@@ -22,7 +22,7 @@ null,
 {"id":20,"list":[{"code":111,"indent":0,"parameters":[4,5,6,187]},{"code":313,"indent":1,"parameters":[0,5,1,187]},{"code":313,"indent":1,"parameters":[0,5,0,28]},{"code":0,"indent":1,"parameters":[]},{"code":412,"indent":0,"parameters":[]},{"code":0,"indent":0,"parameters":[]}],"name":"老王消耗所有魔力层数","switchId":1,"trigger":0},
 {"id":21,"list":[{"code":111,"indent":0,"parameters":[4,9,6,190]},{"code":115,"indent":1,"parameters":[]},{"code":0,"indent":1,"parameters":[]},{"code":411,"indent":0,"parameters":[]},{"code":111,"indent":1,"parameters":[4,9,6,189]},{"code":313,"indent":2,"parameters":[0,9,1,189]},{"code":313,"indent":2,"parameters":[0,9,0,190]},{"code":0,"indent":2,"parameters":[]},{"code":411,"indent":1,"parameters":[]},{"code":111,"indent":2,"parameters":[4,9,6,188]},{"code":313,"indent":3,"parameters":[0,9,1,188]},{"code":313,"indent":3,"parameters":[0,9,0,189]},{"code":0,"indent":3,"parameters":[]},{"code":411,"indent":2,"parameters":[]},{"code":313,"indent":3,"parameters":[0,9,0,188]},{"code":0,"indent":3,"parameters":[]},{"code":412,"indent":2,"parameters":[]},{"code":0,"indent":2,"parameters":[]},{"code":412,"indent":1,"parameters":[]},{"code":0,"indent":1,"parameters":[]},{"code":412,"indent":0,"parameters":[]},{"code":0,"indent":0,"parameters":[]}],"name":"郝籽势的叠加","switchId":1,"trigger":0},
 {"id":22,"list":[{"code":313,"indent":0,"parameters":[0,9,1,190]},{"code":313,"indent":0,"parameters":[0,9,1,189]},{"code":313,"indent":0,"parameters":[0,9,1,188]},{"code":0,"indent":0,"parameters":[]}],"name":"郝籽强普清空势","switchId":1,"trigger":0},
-{"id":23,"list":[{"code":122,"indent":0,"parameters":[1,1,0,3,3,5,5]},{"code":122,"indent":0,"parameters":[1,1,2,3,3,5,2]},{"code":122,"indent":0,"parameters":[1,1,4,0,6]},{"code":311,"indent":0,"parameters":[0,5,0,1,1,false]},{"code":0,"indent":0,"parameters":[]}],"name":"老王强普回血","switchId":1,"trigger":0},
+{"id":23,"list":[{"code":122,"indent":0,"parameters":[1,1,0,3,3,5,5]},{"code":122,"indent":0,"parameters":[1,1,2,3,3,5,2]},{"code":122,"indent":0,"parameters":[1,1,4,0,5]},{"code":311,"indent":0,"parameters":[0,5,0,1,1,false]},{"code":0,"indent":0,"parameters":[]}],"name":"老王强普回血","switchId":1,"trigger":0},
 {"id":24,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
 {"id":25,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},
 {"id":26,"list":[{"code":0,"indent":0,"parameters":[]}],"name":"","switchId":1,"trigger":0},

data/MapInfos.json

@@ -50,10 +50,10 @@ null,
 {"id":48,"expanded":false,"name":"装备店","order":40,"parentId":47,"scrollX":772,"scrollY":483},
 {"id":49,"expanded":false,"name":"物品商店","order":41,"parentId":47,"scrollX":811,"scrollY":483.5},
 {"id":50,"expanded":false,"name":"旅馆：1F","order":42,"parentId":47,"scrollX":819,"scrollY":474.5},
-{"id":51,"expanded":true,"name":"豆豆主星B","order":43,"parentId":34,"scrollX":1852.8,"scrollY":1144.8},
-{"id":52,"expanded":true,"name":"熔岩洞窟：1F","order":44,"parentId":51,"scrollX":1852.8,"scrollY":1144.8},
-{"id":53,"expanded":true,"name":"熔岩洞窟：B1","order":45,"parentId":52,"scrollX":1852.8,"scrollY":1303.2},
-{"id":54,"expanded":false,"name":"熔岩洞窟：B2","order":46,"parentId":53,"scrollX":1872,"scrollY":1144.8},
+{"id":51,"expanded":true,"name":"豆豆主星B","order":43,"parentId":34,"scrollX":885,"scrollY":466.5},
+{"id":52,"expanded":true,"name":"熔岩洞窟：1F","order":44,"parentId":51,"scrollX":1637,"scrollY":1044.5},
+{"id":53,"expanded":true,"name":"熔岩洞窟：B1","order":45,"parentId":52,"scrollX":1637,"scrollY":1303.5},
+{"id":54,"expanded":false,"name":"熔岩洞窟：B2","order":46,"parentId":53,"scrollX":997,"scrollY":1136.5},
 {"id":55,"expanded":true,"name":"好人家一层（彩蛋）","order":24,"parentId":22,"scrollX":1722,"scrollY":716.5},
 {"id":56,"expanded":false,"name":"护甲商店","order":34,"parentId":36,"scrollX":780,"scrollY":477},
 {"id":57,"expanded":false,"name":"武器商店","order":35,"parentId":36,"scrollX":780,"scrollY":477},

data/Skills.json

@@ -33,16 +33,16 @@ null,
 {"id":31,"animationId":47,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"渡鸦12345：孙贼别跑！（PS：给全体敌人\n附加【神圣禁锢】）","effects":[{"code":21,"dataId":33,"value1":1,"value2":0},{"code":44,"dataId":1,"value1":1,"value2":0}],"hitType":0,"iconIndex":330,"message1":"施放了%1！","message2":"","mpCost":30,"name":"律令：禁锢","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":0,"stypeId":4,"successRate":100,"tpCost":50,"tpGain":0},
 {"id":32,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":33,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"薇薇安的技能","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":34,"animationId":123,"damage":{"critical":false,"elementId":0,"formula":"b.hp*0.1","type":1,"variance":0},"description":"薇薇安独有的强大技能，召唤一轮诡异红月，红月下\n薇薇安会变得极其强大，敌人也会被削弱","effects":[{"code":44,"dataId":4,"value1":1,"value2":0},{"code":44,"dataId":2,"value1":1,"value2":0},{"code":21,"dataId":34,"value1":1,"value2":0},{"code":21,"dataId":72,"value1":1,"value2":0}],"hitType":0,"iconIndex":162,"message1":"召唤了红月！","message2":"","mpCost":0,"name":"召唤红月","note":"<SF_SkillUpdate: zhhy, 1>\n<Cooldown: 60>\n<Cooldown Steps: 5>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":1000,"stypeId":3,"successRate":100,"tpCost":100,"tpGain":0},
-{"id":35,"animationId":123,"damage":{"critical":false,"elementId":0,"formula":"b.hp*0.1","type":1,"variance":0},"description":"薇薇安独有的强大技能，召唤一轮诡异红月，红月下\n薇薇安会变得极其强大，敌人也会被削弱","effects":[{"code":44,"dataId":4,"value1":1,"value2":0},{"code":44,"dataId":2,"value1":1,"value2":0},{"code":21,"dataId":34,"value1":1,"value2":0},{"code":21,"dataId":72,"value1":1,"value2":0}],"hitType":0,"iconIndex":162,"message1":"召唤了红月！","message2":"","mpCost":0,"name":"召唤红月","note":"<SF_SkillUpdate: zhhy, 2>\n<Cooldown: 40>\n<Cooldown Steps: 5>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":1000,"stypeId":3,"successRate":100,"tpCost":100,"tpGain":5},
+{"id":34,"animationId":123,"damage":{"critical":false,"elementId":0,"formula":"b.hp*0.1","type":1,"variance":0},"description":"薇薇安独有的强大技能，召唤一轮诡异红月，红月下\n薇薇安会变得极其强大，敌人也会被削弱","effects":[{"code":44,"dataId":4,"value1":1,"value2":0},{"code":44,"dataId":2,"value1":1,"value2":0},{"code":21,"dataId":34,"value1":1,"value2":0},{"code":21,"dataId":72,"value1":1,"value2":0}],"hitType":0,"iconIndex":162,"message1":"召唤了红月！","message2":"","mpCost":0,"name":"召唤红月","note":"<SF_SkillUpdate: zhhy, 1>\n<Cooldown: 60>\n<Cooldown Steps: 5>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":1000,"stypeId":4,"successRate":100,"tpCost":100,"tpGain":0},
+{"id":35,"animationId":123,"damage":{"critical":false,"elementId":0,"formula":"b.hp*0.1","type":1,"variance":0},"description":"薇薇安独有的强大技能，召唤一轮诡异红月，红月下\n薇薇安会变得极其强大，敌人也会被削弱","effects":[{"code":44,"dataId":4,"value1":1,"value2":0},{"code":44,"dataId":2,"value1":1,"value2":0},{"code":21,"dataId":34,"value1":1,"value2":0},{"code":21,"dataId":72,"value1":1,"value2":0}],"hitType":0,"iconIndex":162,"message1":"召唤了红月！","message2":"","mpCost":0,"name":"召唤红月","note":"<SF_SkillUpdate: zhhy, 2>\n<Cooldown: 40>\n<Cooldown Steps: 5>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":1000,"stypeId":4,"successRate":100,"tpCost":100,"tpGain":5},
 {"id":36,"animationId":15,"damage":{"critical":true,"elementId":7,"formula":"1+(1+a.level/198+a.hp/a.mhp - 3/2*b.hp/b.mhp)*(a.mat * 2+a.atk - b.mdf-b.def/2)*(a.level*a.mat/2048+2)","type":1,"variance":10},"description":"用血魔法凝聚的长枪，伤害也会随敌方血量降低而增加。","effects":[{"code":44,"dataId":3,"value1":1,"value2":0}],"hitType":2,"iconIndex":78,"message1":"施放了%1！","message2":"","mpCost":6,"name":"血色长枪I","note":"<SF_SkillUpdate: xscq, 1>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":20,"tpGain":5},
 {"id":37,"animationId":15,"damage":{"critical":true,"elementId":7,"formula":"1+(3/2+a.level/198+a.hp/a.mhp - 2*b.hp/b.mhp)*(a.mat * 2+a.atk - b.mdf-b.def/2)*(a.level*a.mat/2048+2)","type":1,"variance":10},"description":"用血魔法凝聚的长枪，伤害也会随敌方血量降低而增加。","effects":[{"code":44,"dataId":3,"value1":1,"value2":0}],"hitType":2,"iconIndex":78,"message1":"施放了%1！","message2":"","mpCost":8,"name":"血色长枪II","note":"<SF_SkillUpdate: xscq, 2>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":20,"tpGain":5},
 {"id":38,"animationId":15,"damage":{"critical":true,"elementId":7,"formula":"1+(2+a.level/198+a.hp/a.mhp - 5/2*b.hp/b.mhp)*(a.mat * 2+a.atk - b.mdf-b.def/2)*(a.level*a.mat/2048+2)","type":1,"variance":10},"description":"用血魔法凝聚的长枪，伤害也会随敌方血量降低而增加。","effects":[{"code":44,"dataId":3,"value1":1,"value2":0}],"hitType":2,"iconIndex":78,"message1":"施放了%1！","message2":"","mpCost":10,"name":"血色长枪III","note":"<SF_SkillUpdate: xscq, 3>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":-2,"stypeId":1,"successRate":100,"tpCost":20,"tpGain":5},
 {"id":39,"animationId":49,"damage":{"critical":false,"elementId":15,"formula":"150+(5/2*(a.mhp-a.hp)/a.mhp)*(a.mat* 2+a.atk*3/4- b.mdf-b.def/5)*(a.level*a.mat/2048+2)","type":5,"variance":20},"description":"吸血技能，自身HP越低伤害和吸血越高。\n有几率附加【虚弱】","effects":[{"code":21,"dataId":94,"value1":0.05,"value2":0}],"hitType":2,"iconIndex":71,"message1":"使用了%1！","message2":"","mpCost":10,"name":"生命吸取I","note":"<SF_SkillUpdate: smxq, 1>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":5},
 {"id":40,"animationId":49,"damage":{"critical":false,"elementId":15,"formula":"300+(3*(a.mhp-a.hp)/a.mhp)*(a.mat* 2+a.atk*3/4- b.mdf-b.def/5)*(a.level*a.mat/2048+2)","type":5,"variance":10},"description":"吸血技能，自身HP越低伤害和吸血越高。\n有几率附加【虚弱】","effects":[{"code":21,"dataId":94,"value1":0.1,"value2":0}],"hitType":2,"iconIndex":71,"message1":"使用了%1！","message2":"","mpCost":10,"name":"生命吸取II","note":"<SF_SkillUpdate: smxq, 2>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":5,"tpGain":5},
 {"id":41,"animationId":49,"damage":{"critical":true,"elementId":15,"formula":"700+(7/2*(a.mhp-a.hp)/a.mhp)*(a.mat* 2+a.atk- b.mdf-b.def/10)*(a.level*a.mat/2048+2)","type":5,"variance":10},"description":"吸血技能，自身HP越低伤害和吸血越高。\n有几率附加【虚弱】","effects":[{"code":21,"dataId":94,"value1":0.2,"value2":0}],"hitType":2,"iconIndex":71,"message1":"使用了%1！","message2":"","mpCost":15,"name":"生命吸取III","note":"<SF_SkillUpdate: smxq, 3>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":30,"tpGain":5},
-{"id":42,"animationId":51,"damage":{"critical":false,"elementId":0,"formula":"5","type":0,"variance":0},"description":"解体成小蝙蝠，解除减速类和定身类控制，变得更灵活\n且避免大部分暴击，但需要消耗HP来维持解体","effects":[{"code":21,"dataId":20,"value1":1,"value2":0},{"code":44,"dataId":2,"value1":1,"value2":0},{"code":22,"dataId":57,"value1":1,"value2":0},{"code":22,"dataId":54,"value1":1,"value2":0},{"code":22,"dataId":55,"value1":1,"value2":0},{"code":22,"dataId":59,"value1":1,"value2":0},{"code":22,"dataId":61,"value1":1,"value2":0}],"hitType":0,"iconIndex":347,"message1":"","message2":"","mpCost":5,"name":"解体","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":50,"stypeId":3,"successRate":100,"tpCost":5,"tpGain":0},
-{"id":43,"animationId":33,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"从小蝙蝠状态重新聚合成人形","effects":[{"code":22,"dataId":20,"value1":1,"value2":0}],"hitType":0,"iconIndex":345,"message1":"","message2":"","mpCost":5,"name":"聚合","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":3,"successRate":100,"tpCost":5,"tpGain":0},
+{"id":42,"animationId":51,"damage":{"critical":false,"elementId":0,"formula":"5","type":0,"variance":0},"description":"解体成小蝙蝠，解除减速类和定身类控制，变得更灵活\n且避免大部分暴击，但需要消耗HP来维持解体","effects":[{"code":21,"dataId":20,"value1":1,"value2":0},{"code":44,"dataId":2,"value1":1,"value2":0},{"code":22,"dataId":57,"value1":1,"value2":0},{"code":22,"dataId":54,"value1":1,"value2":0},{"code":22,"dataId":55,"value1":1,"value2":0},{"code":22,"dataId":59,"value1":1,"value2":0},{"code":22,"dataId":61,"value1":1,"value2":0}],"hitType":0,"iconIndex":347,"message1":"","message2":"","mpCost":5,"name":"解体","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":50,"stypeId":4,"successRate":100,"tpCost":5,"tpGain":0},
+{"id":43,"animationId":33,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"从小蝙蝠状态重新聚合成人形","effects":[{"code":22,"dataId":20,"value1":1,"value2":0}],"hitType":0,"iconIndex":345,"message1":"","message2":"","mpCost":5,"name":"聚合","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":4,"successRate":100,"tpCost":5,"tpGain":0},
 {"id":44,"animationId":81,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"将HP转化为MP，有几率获得【神经活跃】","effects":[{"code":21,"dataId":148,"value1":0.3,"value2":0},{"code":44,"dataId":6,"value1":1,"value2":0}],"hitType":0,"iconIndex":75,"message1":"使用了%1！","message2":"","mpCost":0,"name":"血灵转化I","note":"<SF_SkillUpdate: xlzh, 1>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":1,"successRate":100,"tpCost":10,"tpGain":0},
 {"id":45,"animationId":81,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"将HP转化为MP，有几率获得【神经活跃】","effects":[{"code":21,"dataId":148,"value1":0.6,"value2":0},{"code":44,"dataId":6,"value1":1,"value2":0}],"hitType":0,"iconIndex":75,"message1":"使用了%1！","message2":"","mpCost":0,"name":"血灵转化II","note":"<SF_SkillUpdate: xlzh, 2>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":1,"successRate":100,"tpCost":10,"tpGain":0},
 {"id":46,"animationId":81,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"将HP转化为MP，必定获得【神经活跃】","effects":[{"code":21,"dataId":148,"value1":1,"value2":0},{"code":44,"dataId":6,"value1":1,"value2":0}],"hitType":0,"iconIndex":75,"message1":"使用了%1！","message2":"","mpCost":0,"name":"血灵转化III","note":"<SF_SkillUpdate: xlzh, 3>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":1,"successRate":100,"tpCost":10,"tpGain":0},
@@ -57,10 +57,10 @@ null,
 {"id":55,"animationId":67,"damage":{"critical":true,"elementId":0,"formula":"1+(4/5+a.level/99)*(a.mat * 12/5 - b.mdf)*(a.level*a.mat/2048+2)","type":1,"variance":20},"description":"薇薇安的电系群攻魔法","effects":[],"hitType":2,"iconIndex":66,"message1":"施放了%1！","message2":"","mpCost":36,"name":"闪电III","note":"<SF_SkillUpdate: sd, 3>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":10,"stypeId":2,"successRate":100,"tpCost":5,"tpGain":8},
 {"id":56,"animationId":26,"damage":{"critical":false,"elementId":0,"formula":"20","type":1,"variance":0},"description":"薇薇安的寒风魔法，伤害很低，但有几率\n将敌人【冰冻】","effects":[{"code":21,"dataId":61,"value1":0.5,"value2":0}],"hitType":2,"iconIndex":65,"message1":"施放了%1！","message2":"","mpCost":2,"name":"寒风","note":"<SF_SkillUpdate: hf, 1>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":0,"stypeId":2,"successRate":100,"tpCost":0,"tpGain":5},
 {"id":57,"animationId":26,"damage":{"critical":false,"elementId":0,"formula":"1+(a.mat * 2 - b.mdf)*(a.level*a.mat/2048+2)","type":1,"variance":20},"description":"强化的寒风技能，伤害更高，几率附加【冰冻】，\n可以解除部分迷雾类技能","effects":[{"code":21,"dataId":61,"value1":0.65,"value2":0},{"code":22,"dataId":169,"value1":1,"value2":0},{"code":22,"dataId":170,"value1":1,"value2":0}],"hitType":2,"iconIndex":65,"message1":"施放了%1！","message2":"","mpCost":12,"name":"深寒风息","note":"<SF_SkillUpdate: hf, 2>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":2,"successRate":100,"tpCost":0,"tpGain":8},
-{"id":58,"animationId":26,"damage":{"critical":false,"elementId":0,"formula":"1+3/2*(a.mat * 2 - b.mdf)*(a.level*a.mat/2048+2)","type":1,"variance":20},"description":"二次强化的寒风技能，伤害更高，几率附加冰冻，\n可以解除所有迷雾类技能","effects":[{"code":21,"dataId":61,"value1":0.8,"value2":0},{"code":22,"dataId":169,"value1":1,"value2":0},{"code":22,"dataId":170,"value1":1,"value2":0},{"code":22,"dataId":171,"value1":1,"value2":0}],"hitType":2,"iconIndex":65,"message1":"施放了%1！","message2":"","mpCost":18,"name":"极寒冻气","note":"<SF_SkillUpdate: hf, 3>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":9},
+{"id":58,"animationId":26,"damage":{"critical":false,"elementId":0,"formula":"1+3/2*(a.mat * 2 - b.mdf)*(a.level*a.mat/2048+2)","type":1,"variance":20},"description":"二次强化的寒风技能，伤害更高，几率附加冰冻，\n可以解除所有迷雾类技能","effects":[{"code":21,"dataId":61,"value1":0.8,"value2":0},{"code":22,"dataId":169,"value1":1,"value2":0},{"code":22,"dataId":170,"value1":1,"value2":0},{"code":22,"dataId":171,"value1":1,"value2":0}],"hitType":2,"iconIndex":65,"message1":"施放了%1！","message2":"","mpCost":18,"name":"极寒冻气","note":"<SF_SkillUpdate: hf, 3>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":2,"successRate":100,"tpCost":0,"tpGain":9},
 {"id":59,"animationId":31,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"释放黑雾遮蔽队友，令队友能够更从容地\n闪避敌人的攻击","effects":[{"code":21,"dataId":169,"value1":1,"value2":0}],"hitType":2,"iconIndex":161,"message1":"施放了%1！","message2":"","mpCost":5,"name":"黑雾","note":"<SF_SkillUpdate: hsmw, 1>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":8,"speed":0,"stypeId":2,"successRate":100,"tpCost":20,"tpGain":0},
 {"id":60,"animationId":31,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"强化的黑雾技能，遮蔽能力被强化，且队友\n在迷雾中暴击率增加10%","effects":[{"code":21,"dataId":170,"value1":1,"value2":0}],"hitType":2,"iconIndex":161,"message1":"施放了%1！","message2":"","mpCost":5,"name":"暗雾","note":"<SF_SkillUpdate: hsmw, 2>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":8,"speed":0,"stypeId":2,"successRate":100,"tpCost":20,"tpGain":0},
-{"id":61,"animationId":31,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"强化的黑雾技能，遮蔽能力被强化，且队友\n在迷雾中暴击率增加20%","effects":[{"code":21,"dataId":171,"value1":1,"value2":0}],"hitType":0,"iconIndex":161,"message1":"使用了%1！","message2":"","mpCost":5,"name":"幽雾","note":"<SF_SkillUpdate: hsmw, 3>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":8,"speed":0,"stypeId":1,"successRate":100,"tpCost":20,"tpGain":0},
+{"id":61,"animationId":31,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"强化的黑雾技能，遮蔽能力被强化，且队友\n在迷雾中暴击率增加20%","effects":[{"code":21,"dataId":171,"value1":1,"value2":0}],"hitType":0,"iconIndex":161,"message1":"使用了%1！","message2":"","mpCost":5,"name":"幽雾","note":"<SF_SkillUpdate: hsmw, 3>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":8,"speed":0,"stypeId":2,"successRate":100,"tpCost":20,"tpGain":0},
 {"id":62,"animationId":109,"damage":{"critical":false,"elementId":0,"formula":"(function () { if (a == b) { return (a.mhp/50+a.hp/25); } else { return ((a.hp/a.mhp+(b.mhp-b.hp)/b.mhp)*(1+a.mat * 3+a.mhp/20)); }})()","type":3,"variance":10},"description":"薇薇安将自己的血液转化为治愈力量治愈队友，\n目标HP比例越低治疗量越大","effects":[{"code":44,"dataId":2,"value1":1,"value2":0}],"hitType":0,"iconIndex":231,"message1":"施放了%1！","message2":"","mpCost":5,"name":"鲜血治愈I","note":"<SF_SkillUpdate: xxzy, 1>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":7,"speed":0,"stypeId":2,"successRate":100,"tpCost":0,"tpGain":5},
 {"id":63,"animationId":109,"damage":{"critical":false,"elementId":0,"formula":"(function () { if (a == b) { return (a.mhp/50+a.hp/25); } else { return ((a.hp/a.mhp+(b.mhp-b.hp)/b.mhp)*(1+a.mat * 4+a.mhp/20)); }})()","type":3,"variance":10},"description":"薇薇安将自己的血液转化为治愈力量治愈队友\n并几率性赋予【毒素抗性】","effects":[{"code":44,"dataId":2,"value1":1,"value2":0},{"code":21,"dataId":151,"value1":0.5,"value2":0}],"hitType":0,"iconIndex":231,"message1":"施放了%1！","message2":"","mpCost":10,"name":"鲜血治愈II","note":"<SF_SkillUpdate: xxzy, 2>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":7,"speed":0,"stypeId":2,"successRate":100,"tpCost":0,"tpGain":5},
 {"id":64,"animationId":109,"damage":{"critical":false,"elementId":0,"formula":"(function () { if (a == b) { return (a.mhp/50+a.hp/25); } else { return ((a.hp/a.mhp+(b.mhp-b.hp)/b.mhp)*(1+a.mat * 5+a.mhp/20)); }})()","type":3,"variance":10},"description":"薇薇安将自己的血液转化为治愈力量治愈队友\n并必定赋予【毒素抗性】，可以解除【生命损耗】","effects":[{"code":44,"dataId":2,"value1":1,"value2":0},{"code":22,"dataId":69,"value1":1,"value2":0},{"code":21,"dataId":151,"value1":1,"value2":0},{"code":22,"dataId":70,"value1":1,"value2":0},{"code":22,"dataId":89,"value1":1,"value2":0}],"hitType":0,"iconIndex":231,"message1":"施放了%1！","message2":"","mpCost":15,"name":"鲜血治愈III","note":"<SF_SkillUpdate: xxzy, 3>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":7,"speed":0,"stypeId":2,"successRate":100,"tpCost":0,"tpGain":5},
@@ -84,8 +84,8 @@ null,
 {"id":82,"animationId":42,"damage":{"critical":false,"elementId":0,"formula":"b.mhp/32+(b.mhp-b.hp)*3/10+a.mat*4","type":3,"variance":20},"description":"帮助队友恢复战斗力，解除【无法战斗】，\n但队友有几率【虚弱】一段时间","effects":[{"code":22,"dataId":1,"value1":1,"value2":0},{"code":21,"dataId":94,"value1":0.5,"value2":0},{"code":21,"dataId":23,"value1":1,"value2":0}],"hitType":0,"iconIndex":221,"message1":"吟唱了%1！","message2":"","mpCost":20,"name":"复苏II","note":"<SF_SkillUpdate: fs, 2>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":9,"speed":-20,"stypeId":2,"successRate":100,"tpCost":0,"tpGain":5},
 {"id":83,"animationId":42,"damage":{"critical":false,"elementId":0,"formula":"b.mhp/32+(b.mhp-b.hp)*2/5+a.mat*9/2","type":3,"variance":20},"description":"复苏技能的最终形态，解除【无法战斗】，\n且不会【虚弱】","effects":[{"code":22,"dataId":1,"value1":1,"value2":0},{"code":21,"dataId":23,"value1":1,"value2":0}],"hitType":0,"iconIndex":221,"message1":"吟唱了%1！","message2":"","mpCost":20,"name":"唤魂潮声","note":"<SF_SkillUpdate: fs, 3>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":9,"speed":-20,"stypeId":2,"successRate":100,"tpCost":0,"tpGain":5},
 {"id":84,"animationId":40,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"解除【中毒】【致盲】【混乱】【麻痹】【睡眠】\n【沉默】【定身】","effects":[{"code":22,"dataId":67,"value1":1,"value2":0},{"code":22,"dataId":68,"value1":1,"value2":0},{"code":22,"dataId":74,"value1":1,"value2":0},{"code":22,"dataId":75,"value1":1,"value2":0},{"code":22,"dataId":59,"value1":1,"value2":0},{"code":22,"dataId":60,"value1":1,"value2":0},{"code":22,"dataId":62,"value1":1,"value2":0},{"code":22,"dataId":64,"value1":1,"value2":0},{"code":22,"dataId":57,"value1":1,"value2":0}],"hitType":0,"iconIndex":88,"message1":"施放了%1！","message2":"","mpCost":6,"name":"驱散","note":"<SF_SkillUpdate: qs, 1>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":7,"speed":0,"stypeId":2,"successRate":100,"tpCost":0,"tpGain":5},
-{"id":85,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"解除【中毒】【剧毒】【辐射】【致盲】【定身】\n【沉默】【麻痹】【睡眠】【混乱】【冰冻】","effects":[{"code":22,"dataId":59,"value1":1,"value2":0},{"code":22,"dataId":60,"value1":1,"value2":0},{"code":22,"dataId":61,"value1":1,"value2":0},{"code":22,"dataId":62,"value1":1,"value2":0},{"code":22,"dataId":64,"value1":1,"value2":0},{"code":22,"dataId":67,"value1":1,"value2":0},{"code":22,"dataId":68,"value1":1,"value2":0},{"code":22,"dataId":74,"value1":1,"value2":0},{"code":22,"dataId":71,"value1":1,"value2":0},{"code":22,"dataId":57,"value1":1,"value2":0}],"hitType":0,"iconIndex":89,"message1":"施放了%1！","message2":"","mpCost":12,"name":"净化","note":"<SF_SkillUpdate: qs, 2>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":7,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":5},
-{"id":86,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"解除绝大部分负面状态，但无法解除减速类控制","effects":[{"code":22,"dataId":59,"value1":1,"value2":0},{"code":22,"dataId":60,"value1":1,"value2":0},{"code":22,"dataId":61,"value1":1,"value2":0},{"code":22,"dataId":62,"value1":1,"value2":0},{"code":22,"dataId":64,"value1":1,"value2":0},{"code":22,"dataId":67,"value1":1,"value2":0},{"code":22,"dataId":68,"value1":1,"value2":0},{"code":22,"dataId":74,"value1":1,"value2":0},{"code":22,"dataId":71,"value1":1,"value2":0},{"code":22,"dataId":96,"value1":1,"value2":0},{"code":22,"dataId":90,"value1":1,"value2":0},{"code":22,"dataId":93,"value1":1,"value2":0},{"code":22,"dataId":89,"value1":1,"value2":0},{"code":22,"dataId":70,"value1":1,"value2":0},{"code":22,"dataId":69,"value1":1,"value2":0},{"code":22,"dataId":111,"value1":1,"value2":0},{"code":22,"dataId":112,"value1":1,"value2":0},{"code":22,"dataId":113,"value1":1,"value2":0},{"code":22,"dataId":57,"value1":1,"value2":0},{"code":22,"dataId":58,"value1":1,"value2":0}],"hitType":0,"iconIndex":87,"message1":"施放了%1！","message2":"","mpCost":18,"name":"康复","note":"<SF_SkillUpdate: qs, 3>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":7,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":8},
+{"id":85,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"解除【中毒】【剧毒】【辐射】【致盲】【定身】\n【沉默】【麻痹】【睡眠】【混乱】【冰冻】","effects":[{"code":22,"dataId":59,"value1":1,"value2":0},{"code":22,"dataId":60,"value1":1,"value2":0},{"code":22,"dataId":61,"value1":1,"value2":0},{"code":22,"dataId":62,"value1":1,"value2":0},{"code":22,"dataId":64,"value1":1,"value2":0},{"code":22,"dataId":67,"value1":1,"value2":0},{"code":22,"dataId":68,"value1":1,"value2":0},{"code":22,"dataId":74,"value1":1,"value2":0},{"code":22,"dataId":71,"value1":1,"value2":0},{"code":22,"dataId":57,"value1":1,"value2":0}],"hitType":0,"iconIndex":89,"message1":"施放了%1！","message2":"","mpCost":12,"name":"净化","note":"<SF_SkillUpdate: qs, 2>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":7,"speed":0,"stypeId":2,"successRate":100,"tpCost":0,"tpGain":5},
+{"id":86,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"解除绝大部分负面状态，但无法解除减速类控制","effects":[{"code":22,"dataId":59,"value1":1,"value2":0},{"code":22,"dataId":60,"value1":1,"value2":0},{"code":22,"dataId":61,"value1":1,"value2":0},{"code":22,"dataId":62,"value1":1,"value2":0},{"code":22,"dataId":64,"value1":1,"value2":0},{"code":22,"dataId":67,"value1":1,"value2":0},{"code":22,"dataId":68,"value1":1,"value2":0},{"code":22,"dataId":74,"value1":1,"value2":0},{"code":22,"dataId":71,"value1":1,"value2":0},{"code":22,"dataId":96,"value1":1,"value2":0},{"code":22,"dataId":90,"value1":1,"value2":0},{"code":22,"dataId":93,"value1":1,"value2":0},{"code":22,"dataId":89,"value1":1,"value2":0},{"code":22,"dataId":70,"value1":1,"value2":0},{"code":22,"dataId":69,"value1":1,"value2":0},{"code":22,"dataId":111,"value1":1,"value2":0},{"code":22,"dataId":112,"value1":1,"value2":0},{"code":22,"dataId":113,"value1":1,"value2":0},{"code":22,"dataId":57,"value1":1,"value2":0},{"code":22,"dataId":58,"value1":1,"value2":0}],"hitType":0,"iconIndex":87,"message1":"施放了%1！","message2":"","mpCost":18,"name":"康复","note":"<SF_SkillUpdate: qs, 3>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":7,"speed":0,"stypeId":2,"successRate":100,"tpCost":0,"tpGain":8},
 {"id":87,"animationId":69,"damage":{"critical":false,"elementId":4,"formula":"1+(a.level/99+1)*(a.mat * 2 - b.mdf)*(a.level*a.mat/2048+2)","type":1,"variance":20},"description":"五月通过魔法书学会的攻击魔法，50%几率附加【减速】","effects":[{"code":21,"dataId":54,"value1":0.5,"value2":0}],"hitType":2,"iconIndex":78,"message1":"施放了%1！","message2":"","mpCost":7,"name":"水箭I","note":"<SF_SkillUpdate: sj, 1>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":4,"speed":0,"stypeId":2,"successRate":100,"tpCost":0,"tpGain":5},
 {"id":88,"animationId":69,"damage":{"critical":false,"elementId":4,"formula":"1+(a.level/99+5/4)*(a.mat * 11/5 - b.mdf)*(a.level*a.mat/2048+2)","type":1,"variance":20},"description":"五月通过魔法书学会的攻击魔法，附加【减速】","effects":[{"code":21,"dataId":54,"value1":1,"value2":0}],"hitType":2,"iconIndex":78,"message1":"施放了%1！","message2":"","mpCost":14,"name":"水箭II","note":"<SF_SkillUpdate: sj, 2>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":4,"speed":0,"stypeId":2,"successRate":100,"tpCost":0,"tpGain":5},
 {"id":89,"animationId":69,"damage":{"critical":false,"elementId":4,"formula":"1+(a.level/99+3/2)*(a.mat * 12/5 - b.mdf)*(a.level*a.mat/2048+2)","type":1,"variance":19},"description":"五月通过魔法书学会的攻击魔法，附加【缓速】","effects":[{"code":21,"dataId":55,"value1":1,"value2":0}],"hitType":2,"iconIndex":78,"message1":"施放了%1！","message2":"","mpCost":21,"name":"水箭III","note":"<SF_SkillUpdate: sj, 3>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":6,"speed":0,"stypeId":2,"successRate":100,"tpCost":0,"tpGain":5},
@@ -97,7 +97,7 @@ null,
 {"id":95,"animationId":32,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"五月哼唱的无名海妖歌曲，有催眠效果","effects":[{"code":21,"dataId":60,"value1":0.8,"value2":0}],"hitType":2,"iconIndex":80,"message1":"哼唱了%1！","message2":"","mpCost":5,"name":"海的安眠曲","note":"<SF_SkillUpdate: hdamq, 1>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":0,"stypeId":1,"successRate":100,"tpCost":5,"tpGain":0},
 {"id":96,"animationId":32,"damage":{"critical":false,"elementId":10,"formula":"1+(a.level/99+6/5)*(a.mat * 11/5 - b.mdf)*(a.level*a.mat/2048+2)","type":1,"variance":20},"description":"解析阿曼妮西斯神术而仿制的类神术，催眠敌人\n并制造噩梦，概率附加【恐惧】和【精神衰弱】","effects":[{"code":21,"dataId":60,"value1":0.9,"value2":0},{"code":21,"dataId":90,"value1":0.2,"value2":0},{"code":21,"dataId":80,"value1":1,"value2":0},{"code":21,"dataId":81,"value1":0.3,"value2":0},{"code":21,"dataId":82,"value1":0.7,"value2":0}],"hitType":2,"iconIndex":80,"message1":"吟唱了%1！","message2":"","mpCost":10,"name":"黄昏安魂曲","note":"<SF_SkillUpdate: hdamq, 2>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":0,"stypeId":3,"successRate":100,"tpCost":10,"tpGain":0},
 {"id":97,"animationId":32,"damage":{"critical":false,"elementId":10,"formula":"1+(a.level/99+7/5)*(a.mat * 12/5 - b.mdf)*(a.level*a.mat/2048+2)","type":1,"variance":20},"description":"解析阿曼妮西斯神术而仿制的类神术，催眠敌人\n并制造噩梦，概率附加【恐惧】和【精神衰弱】","effects":[{"code":21,"dataId":60,"value1":1,"value2":0},{"code":21,"dataId":90,"value1":0.5,"value2":0},{"code":21,"dataId":80,"value1":1,"value2":0},{"code":21,"dataId":81,"value1":0.5,"value2":0},{"code":21,"dataId":82,"value1":1,"value2":0}],"hitType":2,"iconIndex":80,"message1":"吟唱了%1！","message2":"","mpCost":10,"name":"永夜安魂曲","note":"<SF_SkillUpdate: hdamq, 3>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":0,"stypeId":3,"successRate":100,"tpCost":10,"tpGain":0},
-{"id":98,"animationId":31,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"海妖将自己的身体化作活水，\n以抵御各种物理层面的控制效果","effects":[{"code":21,"dataId":9,"value1":1,"value2":0}],"hitType":0,"iconIndex":75,"message1":"使用了%1！","message2":"","mpCost":0,"name":"水无定形","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":1,"successRate":100,"tpCost":50,"tpGain":0},
+{"id":98,"animationId":31,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"海妖将自己的身体化作活水，\n以抵御各种物理层面的控制效果","effects":[{"code":21,"dataId":9,"value1":1,"value2":0},{"code":22,"dataId":57,"value1":1,"value2":0},{"code":22,"dataId":54,"value1":1,"value2":0},{"code":22,"dataId":55,"value1":1,"value2":0},{"code":22,"dataId":59,"value1":1,"value2":0},{"code":22,"dataId":56,"value1":1,"value2":0}],"hitType":0,"iconIndex":333,"message1":"使用了%1！","message2":"","mpCost":0,"name":"水无定形","note":"<SF_SkillUpdate: swdx, 1>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":4,"successRate":100,"tpCost":50,"tpGain":0},
 {"id":99,"animationId":43,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"激活队友的身体潜力，令其恢复HP","effects":[{"code":21,"dataId":119,"value1":1,"value2":0}],"hitType":0,"iconIndex":84,"message1":"施放了%1！","message2":"","mpCost":5,"name":"生命再生","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":8,"speed":0,"stypeId":1,"successRate":100,"tpCost":5,"tpGain":0},
 {"id":100,"animationId":44,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"强化队友的恢复能力","effects":[{"code":21,"dataId":122,"value1":1,"value2":0}],"hitType":0,"iconIndex":195,"message1":"施放了%1！","message2":"","mpCost":10,"name":"再生加速I","note":"<SF_SkillUpdate: zsjs, 1>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":8,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":101,"animationId":44,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"强化队友的恢复能力","effects":[{"code":21,"dataId":122,"value1":1,"value2":0}],"hitType":0,"iconIndex":195,"message1":"施放了%1！","message2":"","mpCost":10,"name":"再生加速II","note":"<SF_SkillUpdate: zsjs, 2>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":8,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
@@ -105,7 +105,7 @@ null,
 {"id":103,"animationId":95,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"安塔维恩海妖特有的海魔形态身上的魔纹解析出来的\n法术，可令队友获得精神系法术的抗性，效果因人而异","effects":[{"code":21,"dataId":148,"value1":0.8,"value2":0},{"code":21,"dataId":149,"value1":0.8,"value2":0}],"hitType":0,"iconIndex":79,"message1":"施放了%1！","message2":"","mpCost":15,"name":"安塔维恩魔纹II","note":"<SF_SkillUpdate: atwemw, 2>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":8,"speed":0,"stypeId":3,"successRate":100,"tpCost":5,"tpGain":0},
 {"id":104,"animationId":95,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"安塔维恩海妖特有的海魔形态身上的魔纹解析出来的\n法术，可令队友获得精神系法术的抗性，效果因人而异","effects":[{"code":21,"dataId":148,"value1":1,"value2":0},{"code":21,"dataId":149,"value1":1,"value2":0}],"hitType":0,"iconIndex":79,"message1":"施放了%1！","message2":"","mpCost":1,"name":"安塔维恩魔纹III","note":"<SF_SkillUpdate: atwemw, 3>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":8,"speed":0,"stypeId":3,"successRate":100,"tpCost":5,"tpGain":0},
 {"id":105,"animationId":19,"damage":{"critical":false,"elementId":1,"formula":"0","type":1,"variance":0},"description":"","effects":[{"code":44,"dataId":13,"value1":1,"value2":0}],"hitType":1,"iconIndex":0,"message1":"鼓起勇气用尾巴戳了一下，对自己造成1点伤害！","message2":"","mpCost":0,"name":"五月的普通攻击","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":0,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":106,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":2,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":106,"animationId":31,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"海妖将自己的身体化作活水，\n以抵御各种物理层面的控制效果","effects":[{"code":21,"dataId":195,"value1":1,"value2":0},{"code":22,"dataId":57,"value1":1,"value2":0},{"code":22,"dataId":54,"value1":1,"value2":0},{"code":22,"dataId":55,"value1":1,"value2":0},{"code":22,"dataId":59,"value1":1,"value2":0},{"code":22,"dataId":56,"value1":1,"value2":0},{"code":22,"dataId":61,"value1":1,"value2":0}],"hitType":0,"iconIndex":333,"message1":"使用了%1！","message2":"","mpCost":0,"name":"水无定形II","note":"<SF_SkillUpdate: swdx, 2>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":4,"successRate":100,"tpCost":20,"tpGain":0},
 {"id":107,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":108,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":109,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
@@ -176,7 +176,7 @@ null,
 {"id":174,"animationId":48,"damage":{"critical":true,"elementId":11,"formula":"1+(a.level/45+1)*(a.mat * 13/5 - b.mdf)*(a.level*a.mat/2048+2)","type":1,"variance":20},"description":"撕裂空间，对随机三个敌方目标造成高额力场伤害，\n使用该禁咒会消耗所有魔力层数","effects":[{"code":44,"dataId":20,"value1":1,"value2":0}],"hitType":2,"iconIndex":167,"message1":"施放了%1！","message2":"","mpCost":60,"name":"禁咒 空间撕裂","note":"","occasion":1,"repeats":2,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":5,"speed":-50,"stypeId":2,"successRate":100,"tpCost":60,"tpGain":2},
 {"id":175,"animationId":0,"damage":{"critical":true,"elementId":-1,"formula":"1+(a.atk * 3/2+a.mat - b.def*6/5-b.mdf/2)*(a.level*a.atk/2048+2)","type":1,"variance":20},"description":"伊扎克斯的普通攻击","effects":[{"code":21,"dataId":0,"value1":1,"value2":0},{"code":44,"dataId":19,"value1":1,"value2":0}],"hitType":1,"iconIndex":0,"message1":"的攻击！","message2":"","mpCost":0,"name":"伊扎克斯的普通攻击","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":0,"successRate":100,"tpCost":0,"tpGain":8},
 {"id":176,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"老王的魔力需要进入战斗状态后一层一层调动，魔力\n层数越高，法强和速度越快，达到三层时会解锁禁咒","effects":[],"hitType":0,"iconIndex":71,"message1":"","message2":"","mpCost":0,"name":"伊扎克斯被动说明","note":"","occasion":3,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":0,"speed":0,"stypeId":3,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":177,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":177,"animationId":0,"damage":{"critical":true,"elementId":-1,"formula":"1+(1+a.level/99)*(a.atk * 3+a.mat*3/2 - b.def-b.mdf/2)*(a.level*a.atk/2048+2)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":0,"value1":1,"value2":0},{"code":44,"dataId":23,"value1":1,"value2":0},{"code":44,"dataId":19,"value1":1,"value2":0}],"hitType":1,"iconIndex":0,"message1":"的强力攻击！","message2":"","mpCost":0,"name":"伊扎克斯三层充能强普","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":0,"successRate":100,"tpCost":0,"tpGain":10},
 {"id":178,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":179,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":180,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
@@ -198,7 +198,7 @@ null,
 {"id":196,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":197,"animationId":43,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"初级组装制成的一次性加速器，强化全体队友移动速度","effects":[{"code":21,"dataId":115,"value1":1,"value2":0},{"code":44,"dataId":7,"value1":1,"value2":0}],"hitType":0,"iconIndex":38,"message1":"使用了%1！","message2":"","mpCost":0,"name":"机械加速器","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":7,"speed":0,"stypeId":3,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":198,"animationId":94,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"初级组装制成的一次性魔能护盾发生器，\n制造护盾保护全体队友","effects":[{"code":44,"dataId":7,"value1":1,"value2":0}],"hitType":0,"iconIndex":161,"message1":"施放了%1！","message2":"","mpCost":0,"name":"小队魔能护盾","note":"<Custom Target Barrier 6 Turns>\nvalue = user.mat*7;\n</Custom Target Barrier 6 Turns>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":7,"speed":0,"stypeId":3,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":199,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"由初级组装制成，强制拘束一个敌方目标的限制装置","effects":[{"code":44,"dataId":7,"value1":1,"value2":0},{"code":21,"dataId":57,"value1":1,"value2":0}],"hitType":0,"iconIndex":196,"message1":"使用了%1！","message2":"","mpCost":0,"name":"机械拘束器","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":199,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"由初级组装制成，强制拘束一个敌方目标的限制装置","effects":[{"code":44,"dataId":7,"value1":1,"value2":0},{"code":21,"dataId":57,"value1":1,"value2":0}],"hitType":0,"iconIndex":196,"message1":"使用了%1！","message2":"","mpCost":0,"name":"机械拘束器","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":3,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":200,"animationId":4,"damage":{"critical":true,"elementId":8,"formula":"100+(1+a.level/40)*(a.mat* 3- b.mdf/2)*(a.level*a.mat/2048+2)","type":1,"variance":20},"description":"初级组装制成的一次性圣光约束炮，\n造成高额单体圣属性伤害","effects":[{"code":44,"dataId":7,"value1":1,"value2":0}],"hitType":2,"iconIndex":72,"message1":"使用了%1！","message2":"","mpCost":0,"name":"圣光约束炮","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":3,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":201,"animationId":96,"damage":{"critical":false,"elementId":11,"formula":"500+（2.5+a.lv/100)*(a.mat * 2.5 - b.mdf)*(a.level*a.mat/2048+2)","type":0,"variance":20},"description":"高级组装制成的强力爆弹，对所有的护盾\n都有着绝强杀伤力","effects":[{"code":44,"dataId":7,"value1":1,"value2":0}],"hitType":2,"iconIndex":171,"message1":"使用了%1！","message2":"","mpCost":0,"name":"结界裂解弹","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":0,"stypeId":3,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":202,"animationId":93,"damage":{"critical":false,"elementId":10,"formula":"600+(2+a.level/30)*(a.mat* 5- b.mdf/2)*(a.level*a.mat/2048+2)","type":1,"variance":20},"description":"高级组装制成的危险爆弹，内部储存了高能级圣光和\n魔能，爆发时会直接杀伤灵魂，且大概率造成【眩晕】","effects":[{"code":44,"dataId":7,"value1":1,"value2":0},{"code":21,"dataId":58,"value1":0.7,"value2":0}],"hitType":2,"iconIndex":75,"message1":"使用了%1！","message2":"","mpCost":0,"name":"圣魔双相弹","note":"","occasion":1,"repeats":2,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":3,"successRate":100,"tpCost":0,"tpGain":0},
@@ -233,9 +233,9 @@ null,
 {"id":231,"animationId":31,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"最炫的特效配最怂的效果————开润！","effects":[{"code":41,"dataId":0,"value1":1,"value2":0}],"hitType":0,"iconIndex":160,"message1":"使用了%1！","message2":"","mpCost":0,"name":"超级•冰火双击•水蒸气逃窜之术","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":8,"speed":0,"stypeId":3,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":232,"animationId":0,"damage":{"critical":true,"elementId":16,"formula":"(1+a.level/99)*(20+(a.atk * 2+a.mat/2 - b.def*6/5+b.mdf/2)*(a.level*a.atk/2048+2))","type":1,"variance":20},"description":"附带属性的爪击，可以伤害到纯元素生物","effects":[{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":0,"iconIndex":105,"message1":"使用了%1！","message2":"","mpCost":5,"name":"冰火爪击","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":6,"speed":0,"stypeId":3,"successRate":100,"tpCost":20,"tpGain":0},
 {"id":233,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"吃下辣条变身巨型哈士奇，每次变身\n都要消耗辣条一包，而且存在变身冷却","effects":[{"code":21,"dataId":10,"value1":1,"value2":0}],"hitType":0,"iconIndex":343,"message1":"吃下辣条准备变身！","message2":"","mpCost":0,"name":"哈士奇变身","note":"<Item 0060 Cost: 1>\n<Cooldown: 30>\n<Cooldown Steps: 10>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":3,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":234,"animationId":4,"damage":{"critical":true,"elementId":8,"formula":"b.hp/30+600*a.level/99+(3/2+a.level/60)*(a.mat* (4+6*a.level/99) - b.mdf/2)*(a.level*a.atk/2048+2)","type":1,"variance":20},"description":"狗•破天一击•炮（青春版），消耗10点狗炮能量","effects":[{"code":44,"dataId":10,"value1":1,"value2":0}],"hitType":2,"iconIndex":338,"message1":"施放了%1！","message2":"","mpCost":0,"name":"小型狗炮","note":"<Item 0066 Cost: 8>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":4,"successRate":100,"tpCost":20,"tpGain":0},
-{"id":235,"animationId":163,"damage":{"critical":true,"elementId":8,"formula":"b.hp/15+1200*a.level/99+(3/2+a.level/40)*(a.mat* (8+12*a.level/99)- b.mdf/2)*(a.level*a.atk/2048+2)","type":1,"variance":20},"description":"狗•破天一击•炮，消耗15点狗炮能量","effects":[{"code":21,"dataId":58,"value1":0.3,"value2":0},{"code":44,"dataId":10,"value1":1,"value2":0}],"hitType":2,"iconIndex":338,"message1":"施放了%1！","message2":"","mpCost":0,"name":"大型狗炮","note":"<Item 0066 Cost: 15>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":0,"stypeId":4,"successRate":100,"tpCost":20,"tpGain":0},
-{"id":236,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"莉莉天生拥有的强大抗寒能力，\n无需任何消耗就可以激活。","effects":[{"code":21,"dataId":150,"value1":1,"value2":0}],"hitType":0,"iconIndex":81,"message1":"激活了自身的抗寒能力！","message2":"","mpCost":0,"name":"北地之哈","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":3,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":234,"animationId":4,"damage":{"critical":true,"elementId":8,"formula":"b.hp/30+600*a.level/99+(3/2+a.level/60)*(a.mat* (4+6*a.level/99) - b.mdf/2)*(a.level*a.atk/2048+2)","type":1,"variance":20},"description":"狗•破天一击•炮（青春版），消耗10点狗炮能量","effects":[{"code":44,"dataId":10,"value1":1,"value2":0}],"hitType":2,"iconIndex":338,"message1":"施放了%1！","message2":"","mpCost":0,"name":"小型狗炮","note":"<Item 0066 Cost: 8>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":3,"successRate":100,"tpCost":20,"tpGain":0},
+{"id":235,"animationId":163,"damage":{"critical":true,"elementId":8,"formula":"b.hp/15+1200*a.level/99+(3/2+a.level/40)*(a.mat* (8+12*a.level/99)- b.mdf/2)*(a.level*a.atk/2048+2)","type":1,"variance":20},"description":"狗•破天一击•炮，消耗15点狗炮能量","effects":[{"code":21,"dataId":58,"value1":0.3,"value2":0},{"code":44,"dataId":10,"value1":1,"value2":0}],"hitType":2,"iconIndex":338,"message1":"施放了%1！","message2":"","mpCost":0,"name":"大型狗炮","note":"<Item 0066 Cost: 15>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":0,"stypeId":3,"successRate":100,"tpCost":20,"tpGain":0},
+{"id":236,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"莉莉天生拥有的强大抗寒能力，无需任何消耗就\n可以激活,且可以在被【冰冻】的时候使用解除【冰冻】","effects":[{"code":22,"dataId":61,"value1":1,"value2":0},{"code":21,"dataId":148,"value1":1,"value2":0},{"code":21,"dataId":150,"value1":1,"value2":0}],"hitType":0,"iconIndex":81,"message1":"激活了自身的抗寒能力！","message2":"","mpCost":0,"name":"北地之哈","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":4,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":237,"animationId":82,"damage":{"critical":true,"elementId":1,"formula":"50+(1/2+4/5*(1-b.hp/b.mhp))*(a.atk * 2+a.mat+a.agi/20 - b.def*4/5)*(a.level*a.atk/2048+2)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":1,"iconIndex":0,"message1":"的狗爪攻击！","message2":"","mpCost":0,"name":"狗形态普通攻击","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":2,"successRate":100,"tpCost":0,"tpGain":10},
 {"id":238,"animationId":0,"damage":{"critical":true,"elementId":16,"formula":"(1+a.level/99)*(20+(a.atk * 2+a.mat - b.def*6/5+b.mdf/2)*(a.level*a.atk/2048+2))","type":1,"variance":20},"description":"成精的哈士奇将释放她的拆家之力","effects":[{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":0,"iconIndex":105,"message1":"使用了%1！","message2":"","mpCost":5,"name":"冰火拆家爪","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":5,"speed":0,"stypeId":3,"successRate":100,"tpCost":20,"tpGain":0},
 {"id":239,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"哈士奇按捺住自己的本性，积累TP并加快行动速度","effects":[{"code":31,"dataId":6,"value1":2,"value2":0}],"hitType":0,"iconIndex":8,"message1":"跃跃欲试","message2":"","mpCost":0,"name":"跃跃欲试","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":15},
@@ -261,7 +261,7 @@ null,
 {"id":259,"animationId":34,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"猫咪的洞察力能够洞察敌方的隐身和反击","effects":[{"code":21,"dataId":105,"value1":1,"value2":0},{"code":21,"dataId":106,"value1":0.3,"value2":0},{"code":21,"dataId":107,"value1":0.05,"value2":0},{"code":21,"dataId":108,"value1":1,"value2":0},{"code":21,"dataId":109,"value1":0.1,"value2":0},{"code":21,"dataId":110,"value1":0.01,"value2":0},{"code":22,"dataId":146,"value1":1,"value2":0}],"hitType":0,"iconIndex":89,"message1":"使用了%1！","message2":"","mpCost":0,"name":"猫之洞察I","note":"<SF_SkillUpdate: mzdc, 1>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":0,"stypeId":1,"successRate":100,"tpCost":15,"tpGain":0},
 {"id":260,"animationId":34,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"猫咪的洞察力能够洞察敌方的隐身和反击，\n有几率使敌方【弱点暴露】","effects":[{"code":22,"dataId":144,"value1":1,"value2":0},{"code":22,"dataId":135,"value1":1,"value2":0},{"code":22,"dataId":145,"value1":1,"value2":0},{"code":21,"dataId":105,"value1":1,"value2":0},{"code":21,"dataId":106,"value1":0.5,"value2":0},{"code":21,"dataId":107,"value1":0.1,"value2":0},{"code":21,"dataId":108,"value1":1,"value2":0},{"code":21,"dataId":109,"value1":0.3,"value2":0},{"code":21,"dataId":110,"value1":0.1,"value2":0},{"code":22,"dataId":146,"value1":1,"value2":0},{"code":22,"dataId":147,"value1":1,"value2":0}],"hitType":0,"iconIndex":89,"message1":"使用了%1！","message2":"","mpCost":0,"name":"猫之洞察II","note":"<SF_SkillUpdate: mzdc, 2>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":15,"tpGain":0},
 {"id":261,"animationId":34,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"猫咪的洞察力能够洞察敌方的隐身和反击，\n有几率使敌方【弱点暴露】","effects":[{"code":22,"dataId":144,"value1":1,"value2":0},{"code":22,"dataId":135,"value1":1,"value2":0},{"code":22,"dataId":145,"value1":1,"value2":0},{"code":21,"dataId":105,"value1":1,"value2":0},{"code":21,"dataId":106,"value1":0.7,"value2":0},{"code":21,"dataId":107,"value1":0.3,"value2":0},{"code":21,"dataId":108,"value1":1,"value2":0},{"code":21,"dataId":109,"value1":0.5,"value2":0},{"code":21,"dataId":110,"value1":0.2,"value2":0},{"code":22,"dataId":146,"value1":1,"value2":0},{"code":22,"dataId":147,"value1":1,"value2":0},{"code":22,"dataId":179,"value1":1,"value2":0}],"hitType":0,"iconIndex":89,"message1":"使用了%1！","message2":"","mpCost":0,"name":"猫之洞察III","note":"<SF_SkillUpdate: mzdc, 3>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":15,"tpGain":0},
-{"id":262,"animationId":-1,"damage":{"critical":true,"elementId":-1,"formula":"5+(1/2+2/5*(1-b.hp/b.mhp))*(a.atk * 2+a.agi/15 - b.def*4/5)*(a.level*a.atk/2048+2)","type":1,"variance":10},"description":"","effects":[{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":1,"iconIndex":76,"message1":"的攻击！","message2":"","mpCost":0,"name":"滚的普通攻击","note":"","occasion":1,"repeats":2,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":0,"successRate":100,"tpCost":0,"tpGain":8},
+{"id":262,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":263,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":264,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"郝籽的技能","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":265,"animationId":10,"damage":{"critical":true,"elementId":6,"formula":"20+(3/5+a.level/150)*(a.atk * 9/5+a.mat + a.agi/20 - b.def-b.mdf/2)*(a.level*a.atk/2048+2)","type":1,"variance":20},"description":"一重势时郝籽会使出的招式，灵感来自于莉莉的\n格斗技巧，可以攻击全体敌人","effects":[{"code":21,"dataId":0,"value1":1,"value2":0},{"code":44,"dataId":22,"value1":1,"value2":0}],"hitType":1,"iconIndex":122,"message1":"使用了%1！","message2":"","mpCost":0,"name":"一重势 • 星河掠影","note":"","occasion":1,"repeats":2,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":0,"stypeId":0,"successRate":100,"tpCost":0,"tpGain":4},
@@ -285,10 +285,10 @@ null,
 {"id":283,"animationId":43,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"回复一定怒气并短时间提高攻击力的技巧","effects":[{"code":31,"dataId":2,"value1":2,"value2":0},{"code":44,"dataId":21,"value1":1,"value2":0}],"hitType":0,"iconIndex":220,"message1":"蓄势待发！","message2":"","mpCost":0,"name":"蓄势待发I","note":"<SF_SkillUpdate: xsdf, 1>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":5},
 {"id":284,"animationId":43,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"回复一定怒气并短时间提高攻击力的技巧","effects":[{"code":31,"dataId":2,"value1":3,"value2":0},{"code":44,"dataId":21,"value1":1,"value2":0}],"hitType":0,"iconIndex":220,"message1":"蓄势待发！","message2":"","mpCost":0,"name":"蓄势待发II","note":"<SF_SkillUpdate: xsdf, 2>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":8},
 {"id":285,"animationId":43,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"回复一定怒气并短时间提高攻击力的技巧","effects":[{"code":31,"dataId":2,"value1":4,"value2":0},{"code":44,"dataId":21,"value1":1,"value2":0}],"hitType":0,"iconIndex":220,"message1":"蓄势待发！","message2":"","mpCost":0,"name":"蓄势待发III","note":"<SF_SkillUpdate: xsdf, 3>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":10},
-{"id":286,"animationId":10,"damage":{"critical":true,"elementId":6,"formula":"20+(3/5+a.lv/150)*(a.atk * 9/5+a.mat + a.agi/20 - b.def-b.mdf/2)*(a.level*a.atk/2048+2)","type":1,"variance":20},"description":"一重势时郝籽会使出的招式，灵感来自于莉莉的格斗技\n巧，可以攻击全体敌人（仅显示，无法直接使用）","effects":[{"code":21,"dataId":0,"value1":1,"value2":0},{"code":44,"dataId":22,"value1":1,"value2":0}],"hitType":1,"iconIndex":122,"message1":"使用了%1！","message2":"","mpCost":0,"name":"一重势 • 星河掠影","note":"","occasion":3,"repeats":2,"requiredWtypeId1":2,"requiredWtypeId2":1,"scope":2,"speed":0,"stypeId":3,"successRate":100,"tpCost":0,"tpGain":4},
-{"id":287,"animationId":18,"damage":{"critical":true,"elementId":6,"formula":"10+(a.lv/150 + 1/4 + b.hp/(b.mhp*2))*(a.atk * 2+a.mat/2+a.agi/40 - b.def-b.mdf/2)*(a.level*a.atk/2048+2)","type":1,"variance":20},"description":"二重势时郝籽会使出的招式，对一个敌人进行\n狂风暴雨般的连续攻击（仅显示，无法直接使用）","effects":[{"code":21,"dataId":0,"value1":1,"value2":0},{"code":44,"dataId":22,"value1":1,"value2":0}],"hitType":1,"iconIndex":72,"message1":"使用了%1！","message2":"暴雨梨花","mpCost":0,"name":"二重势 • 暴雨梨花","note":"","occasion":3,"repeats":7,"requiredWtypeId1":2,"requiredWtypeId2":1,"scope":1,"speed":0,"stypeId":3,"successRate":100,"tpCost":0,"tpGain":8},
-{"id":288,"animationId":16,"damage":{"critical":true,"elementId":6,"formula":"50+(1+a.lv/45+2*(b.mhp-b.hp)/b.mhp)*(a.atk * 3+a.mat*2+a.agi/20 - b.def*6/5-b.mdf/2)*(a.level*a.atk/2048+2)","type":1,"variance":20},"description":"三重势时郝籽会使出的招式，招式原型来自希灵数据库\n中的一击必杀秘技（仅显示，无法直接使用）","effects":[{"code":21,"dataId":0,"value1":1,"value2":0},{"code":21,"dataId":105,"value1":1,"value2":0},{"code":21,"dataId":106,"value1":0.3,"value2":0},{"code":21,"dataId":107,"value1":0.05,"value2":0},{"code":44,"dataId":22,"value1":1,"value2":0}],"hitType":1,"iconIndex":97,"message1":"使用了%1！","message2":"白虹贯日","mpCost":0,"name":"三重势 • 白虹贯日","note":"","occasion":3,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":1000,"stypeId":3,"successRate":100,"tpCost":0,"tpGain":12},
-{"id":289,"animationId":0,"damage":{"critical":false,"elementId":6,"formula":"20+(1+a.level/45)*(a.atk * 3 + a.mat + a.agi/20 - b.def - b.mdf/3)*(a.level*a.atk/2048+2)","type":1,"variance":10},"description":"乱舞状态的普通攻击","effects":[{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":1,"iconIndex":0,"message1":"的多段攻击！","message2":"","mpCost":0,"name":"普通攻击（乱舞状态）","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":6,"speed":0,"stypeId":0,"successRate":100,"tpCost":0,"tpGain":5},
+{"id":286,"animationId":10,"damage":{"critical":true,"elementId":6,"formula":"20+(3/5+a.lv/150)*(a.atk * 9/5+a.mat + a.agi/20 - b.def-b.mdf/2)*(a.level*a.atk/2048+2)","type":1,"variance":20},"description":"一重势时郝籽会使出的招式，灵感来自于莉莉的格斗技\n巧，可以攻击全体敌人（仅显示，无法直接使用）","effects":[{"code":21,"dataId":0,"value1":1,"value2":0},{"code":44,"dataId":22,"value1":1,"value2":0}],"hitType":1,"iconIndex":122,"message1":"使用了%1！","message2":"","mpCost":0,"name":"一重势 • 星河掠影","note":"","occasion":3,"repeats":2,"requiredWtypeId1":2,"requiredWtypeId2":1,"scope":0,"speed":0,"stypeId":3,"successRate":100,"tpCost":0,"tpGain":4},
+{"id":287,"animationId":18,"damage":{"critical":true,"elementId":6,"formula":"10+(a.lv/150 + 1/4 + b.hp/(b.mhp*2))*(a.atk * 2+a.mat/2+a.agi/40 - b.def-b.mdf/2)*(a.level*a.atk/2048+2)","type":1,"variance":20},"description":"二重势时郝籽会使出的招式，对一个敌人进行\n狂风暴雨般的连续攻击（仅显示，无法直接使用）","effects":[{"code":21,"dataId":0,"value1":1,"value2":0},{"code":44,"dataId":22,"value1":1,"value2":0}],"hitType":1,"iconIndex":72,"message1":"使用了%1！","message2":"暴雨梨花","mpCost":0,"name":"二重势 • 暴雨梨花","note":"","occasion":3,"repeats":7,"requiredWtypeId1":2,"requiredWtypeId2":1,"scope":0,"speed":0,"stypeId":3,"successRate":100,"tpCost":0,"tpGain":8},
+{"id":288,"animationId":16,"damage":{"critical":true,"elementId":6,"formula":"50+(1+a.lv/45+2*(b.mhp-b.hp)/b.mhp)*(a.atk * 3+a.mat*2+a.agi/20 - b.def*6/5-b.mdf/2)*(a.level*a.atk/2048+2)","type":1,"variance":20},"description":"三重势时郝籽会使出的招式，招式原型来自希灵数据库\n中的一击必杀秘技（仅显示，无法直接使用）","effects":[{"code":21,"dataId":0,"value1":1,"value2":0},{"code":21,"dataId":105,"value1":1,"value2":0},{"code":21,"dataId":106,"value1":0.3,"value2":0},{"code":21,"dataId":107,"value1":0.05,"value2":0},{"code":44,"dataId":22,"value1":1,"value2":0}],"hitType":1,"iconIndex":97,"message1":"使用了%1！","message2":"白虹贯日","mpCost":0,"name":"三重势 • 白虹贯日","note":"","occasion":3,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":0,"speed":1000,"stypeId":3,"successRate":100,"tpCost":0,"tpGain":12},
+{"id":289,"animationId":0,"damage":{"critical":false,"elementId":6,"formula":"20+(1+a.level/45)*(a.atk * 3 + a.mat + a.agi/20 - b.def - b.mdf/3)*(a.level*a.atk/2048+2)","type":1,"variance":10},"description":"乱舞状态的普通攻击","effects":[{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":1,"iconIndex":0,"message1":"的多段攻击！","message2":"","mpCost":0,"name":"普通攻击（乱舞状态）","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":0,"speed":0,"stypeId":0,"successRate":100,"tpCost":0,"tpGain":5},
 {"id":290,"animationId":0,"damage":{"critical":true,"elementId":6,"formula":"10+(a.atk * 2+a.mat+a.agi/100 - b.def-b.mdf/2)*(a.level*a.atk/2048+2)","type":1,"variance":20},"description":"郝籽的普通攻击","effects":[{"code":21,"dataId":0,"value1":1,"value2":0},{"code":44,"dataId":21,"value1":1,"value2":0}],"hitType":1,"iconIndex":0,"message1":"的攻击！","message2":"","mpCost":0,"name":"郝籽的普通攻击","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":0,"successRate":100,"tpCost":0,"tpGain":5},
 {"id":291,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":292,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"诺兰的技能","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
@@ -301,12 +301,12 @@ null,
 {"id":299,"animationId":125,"damage":{"critical":true,"elementId":1,"formula":"100+(a.atk * 2 - b.def/2)*(a.level*a.atk/2048+2)","type":1,"variance":20},"description":"交响一般气势恢宏的攻势，过于强大的威力\n甚至会对希灵科技缔造的机体造成一定负担和损伤","effects":[{"code":21,"dataId":69,"value1":0.1,"value2":0},{"code":44,"dataId":14,"value1":1,"value2":0}],"hitType":0,"iconIndex":80,"message1":"使用了%1！","message2":"","mpCost":0,"name":"交响I","note":"<SF_SkillUpdate: jx, 1>","occasion":1,"repeats":4,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":0,"stypeId":1,"successRate":100,"tpCost":100,"tpGain":0},
 {"id":300,"animationId":125,"damage":{"critical":true,"elementId":1,"formula":"200+(a.atk * 2 - b.def/3)*(a.level*a.atk/2048+2)","type":1,"variance":20},"description":"交响一般气势恢宏的攻势，过于强大的威力\n甚至会对希灵科技缔造的机体造成一定负担和损伤","effects":[{"code":21,"dataId":69,"value1":0.2,"value2":0},{"code":44,"dataId":14,"value1":1,"value2":0}],"hitType":0,"iconIndex":80,"message1":"使用了%1！","message2":"","mpCost":0,"name":"交响II","note":"<SF_SkillUpdate: jx, 2>","occasion":1,"repeats":4,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":0,"stypeId":1,"successRate":100,"tpCost":100,"tpGain":0},
 {"id":301,"animationId":125,"damage":{"critical":true,"elementId":1,"formula":"400+(a.atk * 2 - b.def/4)*(a.level*a.atk/2048+2)","type":1,"variance":20},"description":"交响一般气势恢宏的攻势，过于强大的威力\n甚至会对希灵科技缔造的机体造成一定负担和损伤","effects":[{"code":21,"dataId":69,"value1":0.3,"value2":0},{"code":44,"dataId":14,"value1":1,"value2":0}],"hitType":0,"iconIndex":80,"message1":"使用了%1！","message2":"","mpCost":0,"name":"交响III","note":"<SF_SkillUpdate: jx, 3>","occasion":1,"repeats":4,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":0,"stypeId":1,"successRate":100,"tpCost":100,"tpGain":0},
-{"id":302,"animationId":41,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"对自己的机体进行应急维修，需要消耗维修零件","effects":[{"code":21,"dataId":13,"value1":1,"value2":0}],"hitType":0,"iconIndex":242,"message1":"开始维修自己的机体！","message2":"","mpCost":0,"name":"应急维修I","note":"<SF_SkillUpdate: yjwx, 1>\n<Item 0065 Cost: 1>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":3,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":303,"animationId":41,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"对自己的机体进行应急维修，需要消耗维修零件","effects":[{"code":21,"dataId":14,"value1":1,"value2":0}],"hitType":0,"iconIndex":242,"message1":"开始维修自己的机体！","message2":"","mpCost":0,"name":"应急维修II","note":"<SF_SkillUpdate: yjwx, 2>\n<Item 0065 Cost: 1>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":3,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":302,"animationId":41,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"对自己的机体进行应急维修，需要消耗维修零件","effects":[{"code":21,"dataId":13,"value1":1,"value2":0}],"hitType":0,"iconIndex":242,"message1":"开始维修自己的机体！","message2":"","mpCost":0,"name":"应急维修I","note":"<SF_SkillUpdate: yjwx, 1>\n<Item 0065 Cost: 1>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":4,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":303,"animationId":41,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"对自己的机体进行应急维修，需要消耗维修零件","effects":[{"code":21,"dataId":14,"value1":1,"value2":0}],"hitType":0,"iconIndex":242,"message1":"开始维修自己的机体！","message2":"","mpCost":0,"name":"应急维修II","note":"<SF_SkillUpdate: yjwx, 2>\n<Item 0065 Cost: 1>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":4,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":304,"animationId":44,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"与敌人缠斗，可以限制他们的反击，同时在近距离下\n可能进行追加的攻击。缠斗状态下诺兰TP回复会加快。","effects":[{"code":21,"dataId":12,"value1":1,"value2":0}],"hitType":0,"iconIndex":100,"message1":"","message2":"","mpCost":0,"name":"缠斗I","note":"<SF_SkillUpdate: cd, 1>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":305,"animationId":44,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"与敌人缠斗，可以限制他们的反击，同时在近距离下\n可能进行追加的攻击。缠斗状态下诺兰TP回复会加快。","effects":[{"code":21,"dataId":182,"value1":1,"value2":0}],"hitType":0,"iconIndex":100,"message1":"","message2":"","mpCost":0,"name":"缠斗II","note":"<SF_SkillUpdate: cd, 2>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":306,"animationId":66,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"过载自己的机体，使战斗力大增并提升TP恢复速度，\n但过载状态会损伤机体","effects":[{"code":21,"dataId":17,"value1":1,"value2":0}],"hitType":0,"iconIndex":336,"message1":"","message2":"","mpCost":0,"name":"机体过载I","note":"<SF_SkillUpdate: jtgz, 1>\n<Cooldown: 25>\n<Cooldown Steps: 1>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":3,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":307,"animationId":65,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"过载自己的机体，使战斗力大增并提升TP恢复速度，\n且对机体护盾再次充能，但过载状态会损伤机体","effects":[{"code":21,"dataId":17,"value1":1,"value2":0},{"code":21,"dataId":30,"value1":1,"value2":0}],"hitType":0,"iconIndex":336,"message1":"","message2":"","mpCost":0,"name":"机体过载II","note":"<SF_SkillUpdate: jtgz, 2>\n<Cooldown: 15>\n<Cooldown Steps: 1>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":3,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":306,"animationId":66,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"过载自己的机体解除控制，使战斗力大增并提升TP恢复\n速度，但过载状态会损伤机体","effects":[{"code":21,"dataId":17,"value1":1,"value2":0},{"code":22,"dataId":54,"value1":1,"value2":0},{"code":22,"dataId":55,"value1":1,"value2":0},{"code":22,"dataId":56,"value1":1,"value2":0},{"code":22,"dataId":57,"value1":1,"value2":0},{"code":22,"dataId":61,"value1":1,"value2":0},{"code":22,"dataId":103,"value1":1,"value2":0}],"hitType":0,"iconIndex":336,"message1":"","message2":"","mpCost":0,"name":"机体过载I","note":"<SF_SkillUpdate: jtgz, 1>\n<Cooldown: 25>\n<Cooldown Steps: 1>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":4,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":307,"animationId":65,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"过载自己的机体解除控制并充能机体护盾，使战斗力\n大增并提升TP恢复速度，但过载状态会损伤机体","effects":[{"code":21,"dataId":17,"value1":1,"value2":0},{"code":22,"dataId":54,"value1":1,"value2":0},{"code":22,"dataId":55,"value1":1,"value2":0},{"code":22,"dataId":56,"value1":1,"value2":0},{"code":22,"dataId":57,"value1":1,"value2":0},{"code":22,"dataId":61,"value1":1,"value2":0},{"code":22,"dataId":103,"value1":1,"value2":0}],"hitType":0,"iconIndex":336,"message1":"","message2":"","mpCost":0,"name":"机体过载II","note":"<SF_SkillUpdate: jtgz, 2>\n<Cooldown: 30>\n<Cooldown Steps: 1>\n<Custom User Barrier>\nvalue = 3/2*user.mhp;\n</Custom User Barrier>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":4,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":308,"animationId":95,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"唯快不破","effects":[{"code":21,"dataId":165,"value1":1,"value2":0}],"hitType":0,"iconIndex":82,"message1":"使用了%1！","message2":"","mpCost":0,"name":"高速机动I","note":"<SF_SkillUpdate: gsjd, 1>","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":3,"successRate":100,"tpCost":30,"tpGain":0},
 {"id":309,"animationId":95,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"唯快不破","effects":[{"code":21,"dataId":166,"value1":1,"value2":0}],"hitType":0,"iconIndex":82,"message1":"使用了%1！","message2":"","mpCost":0,"name":"高速机动II","note":"<SF_SkillUpdate: gsjd, 2>","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":3,"successRate":100,"tpCost":30,"tpGain":0},
 {"id":310,"animationId":95,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"唯快不破","effects":[{"code":21,"dataId":167,"value1":1,"value2":0}],"hitType":0,"iconIndex":82,"message1":"使用了%1！","message2":"","mpCost":0,"name":"高速机动III","note":"<SF_SkillUpdate: gsjd, 3>","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":3,"successRate":100,"tpCost":30,"tpGain":0},
@@ -371,7 +371,7 @@ null,
 {"id":369,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"机械师必备的逃生装置，不属于组装物","effects":[{"code":41,"dataId":0,"value1":1,"value2":0}],"hitType":0,"iconIndex":307,"message1":"使用了%1！","message2":"","mpCost":0,"name":"逃生装置","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":8,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":370,"animationId":0,"damage":{"critical":false,"elementId":6,"formula":"20+(1+a.level/45)*(a.atk * 3 + a.mat + a.agi/20 - b.def - b.mdf/3)*(a.level*a.atk/2048+2)","type":1,"variance":10},"description":"乱舞状态的普通攻击，随机攻击四个敌人\n（仅显示，无法直接使用）","effects":[{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":1,"iconIndex":76,"message1":"的多段攻击！","message2":"","mpCost":0,"name":"普通攻击（乱舞状态）","note":"","occasion":3,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":6,"speed":0,"stypeId":3,"successRate":100,"tpCost":0,"tpGain":5},
 {"id":371,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"郝籽每次使用技能会积攒势，最多三层，不同层数的\n“势”会让她的普通攻击使用不同的招式","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"郝籽被动说明","note":"","occasion":3,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":0,"speed":0,"stypeId":3,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":372,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":372,"animationId":1,"damage":{"critical":true,"elementId":1,"formula":"1+(a.atk * 2+a.agi/200 - b.def*3/2)*(a.level*a.atk/2048+2)","type":1,"variance":20},"description":"","effects":[],"hitType":1,"iconIndex":0,"message1":"赤手空拳的攻击！","message2":"","mpCost":0,"name":"被缴械时的普攻","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":8},
 {"id":373,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":374,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":375,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
@@ -379,8 +379,8 @@ null,
 {"id":377,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":378,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":379,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"各种开场释放的技能","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":380,"animationId":94,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[{"code":21,"dataId":29,"value1":1,"value2":0}],"hitType":0,"iconIndex":0,"message1":"开启了%1！","message2":"","mpCost":0,"name":"刚性护盾","note":"<Custom User Barrier>\nvalue = 5*user.mhp;\n</Custom User Barrier>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":381,"animationId":94,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[{"code":21,"dataId":30,"value1":1,"value2":0}],"hitType":0,"iconIndex":0,"message1":"开启了%1！","message2":"","mpCost":0,"name":"机体能量护盾","note":"<Custom User Barrier>\nvalue = 3/2*user.mhp;\n</Custom User Barrier>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":380,"animationId":94,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"开启了%1！","message2":"","mpCost":0,"name":"刚性护盾","note":"<Custom User Barrier>\nvalue = 5*user.mhp;\n</Custom User Barrier>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":381,"animationId":94,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"开启了%1！","message2":"","mpCost":0,"name":"机体能量护盾","note":"<Custom User Barrier>\nvalue = 3/2*user.mhp;\n</Custom User Barrier>","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":382,"animationId":44,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[{"code":21,"dataId":118,"value1":1,"value2":0}],"hitType":0,"iconIndex":0,"message1":"使用了%1！","message2":"","mpCost":0,"name":"神速","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":383,"animationId":43,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[{"code":21,"dataId":115,"value1":1,"value2":0}],"hitType":0,"iconIndex":0,"message1":"使用了%1！","message2":"","mpCost":0,"name":"群体加速","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":8,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":384,"animationId":34,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[{"code":21,"dataId":161,"value1":1,"value2":0}],"hitType":0,"iconIndex":0,"message1":"使用了%1！","message2":"","mpCost":0,"name":"恶劣挑衅","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
@@ -435,9 +435,9 @@ null,
 {"id":433,"animationId":71,"damage":{"critical":false,"elementId":2,"formula":"10+6/5*(3*a.mat-b.mdf)","type":1,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"施放了%1！","message2":"","mpCost":0,"name":"地震术","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":434,"animationId":80,"damage":{"critical":false,"elementId":5,"formula":"a.mat*2+a.hp-b.mdf/2","type":1,"variance":20},"description":"","effects":[{"code":44,"dataId":11,"value1":1,"value2":0}],"hitType":0,"iconIndex":0,"message1":"使用了%1！","message2":"","mpCost":0,"name":"自爆","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":435,"animationId":50,"damage":{"critical":false,"elementId":5,"formula":"5+6/5*(7/2*a.mat-b.mdf)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":91,"value1":0.5,"value2":0}],"hitType":2,"iconIndex":0,"message1":"使用了%1！","message2":"","mpCost":0,"name":"酸液喷射","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":436,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[{"code":21,"dataId":76,"value1":0.5,"value2":0}],"hitType":0,"iconIndex":0,"message1":"尝试夺取目标的武器！","message2":"","mpCost":0,"name":"缴械","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":437,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[{"code":21,"dataId":76,"value1":0.7,"value2":0}],"hitType":0,"iconIndex":0,"message1":"尝试夺取目标的武器！","message2":"","mpCost":0,"name":"精湛缴械","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":438,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[{"code":21,"dataId":76,"value1":0.9,"value2":0}],"hitType":0,"iconIndex":0,"message1":"尝试夺取目标的武器！","message2":"","mpCost":0,"name":"宗师缴械","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":436,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[{"code":21,"dataId":46,"value1":0.5,"value2":0}],"hitType":0,"iconIndex":0,"message1":"尝试夺取目标的武器！","message2":"","mpCost":0,"name":"缴械","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":437,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[{"code":21,"dataId":46,"value1":0.8,"value2":0}],"hitType":0,"iconIndex":0,"message1":"尝试夺取目标的武器！","message2":"","mpCost":0,"name":"精湛缴械","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":438,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[{"code":21,"dataId":46,"value1":1,"value2":0}],"hitType":0,"iconIndex":0,"message1":"尝试夺取目标的武器！","message2":"","mpCost":0,"name":"宗师缴械","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":439,"animationId":1,"damage":{"critical":false,"elementId":1,"formula":"50","type":1,"variance":20},"description":"","effects":[],"hitType":1,"iconIndex":0,"message1":"的触手混乱地舞动！","message2":"","mpCost":0,"name":"触手混乱舞动","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":440,"animationId":38,"damage":{"critical":false,"elementId":0,"formula":"a.mat*5+(b.mhp-b.hp)/10","type":3,"variance":20},"description":"五月的群体治疗技能，治疗量随损失HP数值增加","effects":[],"hitType":0,"iconIndex":164,"message1":"吟唱了%1！","message2":"","mpCost":24,"name":"治愈之环（奶对面）","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":-20,"stypeId":2,"successRate":100,"tpCost":0,"tpGain":6},
 {"id":441,"animationId":41,"damage":{"critical":false,"elementId":0,"formula":"a.mat*5+(b.mhp-b.hp)/5","type":3,"variance":10},"description":"五月的治疗技能，治疗量随损失HP数值增加，可以解除【抓伤】和【重伤】","effects":[{"code":22,"dataId":69,"value1":1,"value2":0},{"code":22,"dataId":97,"value1":1,"value2":0},{"code":22,"dataId":98,"value1":1,"value2":0},{"code":22,"dataId":99,"value1":1,"value2":0},{"code":22,"dataId":100,"value1":1,"value2":0},{"code":22,"dataId":101,"value1":1,"value2":0}],"hitType":0,"iconIndex":67,"message1":"吟唱了%1！","message2":"","mpCost":21,"name":"水流之激（奶对面）","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":2,"successRate":100,"tpCost":0,"tpGain":5},

data/States.json

@@ -8,7 +8,7 @@ null,
 {"id":6,"autoRemovalTiming":2,"chanceByDamage":100,"traits":[{"code":21,"dataId":2,"value":1.5},{"code":21,"dataId":6,"value":1.5},{"code":22,"dataId":2,"value":0.1},{"code":21,"dataId":3,"value":0.9},{"code":14,"dataId":62,"value":1},{"code":14,"dataId":63,"value":1},{"code":22,"dataId":9,"value":0.04}],"iconIndex":350,"maxTurns":10,"message1":"狂化了！","message2":"","message3":"","message4":"狂化结束了！","minTurns":10,"motion":0,"name":"血之狂化","note":"<SF_StatesOverride: 血之狂暴, 2>","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":7,"autoRemovalTiming":2,"chanceByDamage":100,"traits":[{"code":21,"dataId":3,"value":1.05},{"code":21,"dataId":5,"value":1.05},{"code":11,"dataId":5,"value":0.8},{"code":11,"dataId":4,"value":0.7},{"code":14,"dataId":67,"value":1},{"code":13,"dataId":68,"value":0.8},{"code":11,"dataId":14,"value":0.8},{"code":14,"dataId":97,"value":1},{"code":14,"dataId":98,"value":1},{"code":14,"dataId":99,"value":1},{"code":14,"dataId":100,"value":1},{"code":14,"dataId":101,"value":1}],"iconIndex":165,"maxTurns":5,"message1":"","message2":"","message3":"","message4":"","minTurns":5,"motion":0,"name":"水雾结界","note":"<SF_StatesOverride: 水雾结界, 1>","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":8,"autoRemovalTiming":2,"chanceByDamage":100,"traits":[{"code":21,"dataId":3,"value":1.1},{"code":21,"dataId":5,"value":1.1},{"code":11,"dataId":5,"value":0.7},{"code":11,"dataId":4,"value":0.6},{"code":14,"dataId":67,"value":1},{"code":13,"dataId":68,"value":0.6},{"code":11,"dataId":14,"value":0.7},{"code":14,"dataId":97,"value":1},{"code":14,"dataId":98,"value":1},{"code":14,"dataId":99,"value":1},{"code":14,"dataId":100,"value":1},{"code":14,"dataId":101,"value":1}],"iconIndex":67,"maxTurns":6,"message1":"","message2":"","message3":"","message4":"","minTurns":6,"motion":0,"name":"强化水雾结界","note":"<SF_StatesOverride: 水雾结界, 2>","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
-{"id":9,"autoRemovalTiming":2,"chanceByDamage":100,"traits":[{"code":13,"dataId":61,"value":0.2},{"code":14,"dataId":56,"value":1},{"code":14,"dataId":58,"value":1},{"code":14,"dataId":59,"value":1},{"code":14,"dataId":60,"value":1},{"code":14,"dataId":62,"value":1},{"code":14,"dataId":57,"value":1},{"code":44,"dataId":98,"value":1}],"iconIndex":333,"maxTurns":5,"message1":"变成了流动的活水!","message2":"变成了流动的活水!","message3":"","message4":"从流动状态重新凝聚成型！","minTurns":5,"motion":2,"name":"水无定型","note":"","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
+{"id":9,"autoRemovalTiming":2,"chanceByDamage":100,"traits":[{"code":13,"dataId":61,"value":0.2},{"code":14,"dataId":56,"value":1},{"code":14,"dataId":58,"value":1},{"code":14,"dataId":59,"value":1},{"code":14,"dataId":60,"value":1},{"code":14,"dataId":62,"value":1},{"code":14,"dataId":57,"value":1},{"code":44,"dataId":98,"value":1},{"code":21,"dataId":6,"value":1.1},{"code":22,"dataId":1,"value":0.2},{"code":22,"dataId":4,"value":0.2}],"iconIndex":333,"maxTurns":5,"message1":"变成了流动的活水!","message2":"变成了流动的活水!","message3":"","message4":"从流动状态重新凝聚成型！","minTurns":5,"motion":2,"name":"水无定型","note":"","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":10,"autoRemovalTiming":2,"chanceByDamage":0,"traits":[{"code":21,"dataId":0,"value":1.5},{"code":21,"dataId":1,"value":1.5},{"code":21,"dataId":2,"value":1.5},{"code":21,"dataId":3,"value":1.5},{"code":21,"dataId":4,"value":1.5},{"code":21,"dataId":5,"value":1.5},{"code":21,"dataId":6,"value":1.1},{"code":22,"dataId":7,"value":0.08},{"code":22,"dataId":9,"value":0.1},{"code":11,"dataId":3,"value":0.5},{"code":11,"dataId":5,"value":0.5},{"code":11,"dataId":7,"value":0.5},{"code":13,"dataId":5,"value":0.05},{"code":13,"dataId":6,"value":0.05},{"code":14,"dataId":154,"value":1},{"code":14,"dataId":62,"value":1},{"code":14,"dataId":63,"value":1},{"code":43,"dataId":229,"value":1},{"code":44,"dataId":234,"value":1},{"code":43,"dataId":235,"value":1}],"iconIndex":343,"maxTurns":10,"message1":"变身成了哈士奇形态！","message2":"","message3":"","message4":"变回了人身！","minTurns":10,"motion":0,"name":"哈士奇变身","note":"<SF_CommonAttack: 0237, 5>","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":11,"autoRemovalTiming":2,"chanceByDamage":20,"traits":[{"code":31,"dataId":13,"value":1},{"code":21,"dataId":2,"value":1.2},{"code":21,"dataId":6,"value":1.1},{"code":32,"dataId":36,"value":0.3},{"code":22,"dataId":9,"value":0.05}],"iconIndex":72,"maxTurns":5,"message1":"使用幽能强化了自身！","message2":"","message3":"","message4":"解除了幽能强化！","minTurns":5,"motion":0,"name":"幽能强化","note":"","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":12,"autoRemovalTiming":1,"chanceByDamage":1,"traits":[{"code":21,"dataId":6,"value":0.8},{"code":61,"dataId":0,"value":0.4},{"code":22,"dataId":6,"value":0.5},{"code":32,"dataId":105,"value":0.1},{"code":32,"dataId":106,"value":0.3},{"code":32,"dataId":107,"value":0.5},{"code":22,"dataId":9,"value":0.04}],"iconIndex":111,"maxTurns":6,"message1":"开始与敌人缠斗！","message2":"","message3":"","message4":"恢复了普通的作战姿态！","minTurns":6,"motion":0,"name":"缠斗I","note":"","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":true,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
@@ -20,7 +20,7 @@ null,
 {"id":18,"autoRemovalTiming":2,"chanceByDamage":100,"traits":[{"code":21,"dataId":2,"value":0.9},{"code":21,"dataId":4,"value":1.5},{"code":21,"dataId":6,"value":1.15},{"code":11,"dataId":1,"value":0.05},{"code":11,"dataId":5,"value":0.1},{"code":11,"dataId":8,"value":0.2},{"code":11,"dataId":9,"value":0.9},{"code":22,"dataId":9,"value":0.08}],"iconIndex":72,"maxTurns":10,"message1":"整个人都化作了圣焰!","message2":"","message3":"","message4":"变回了人身！","minTurns":10,"motion":0,"name":"化身圣焰","note":"<SF_CommonAttack: 0322, 4>","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":19,"autoRemovalTiming":2,"chanceByDamage":100,"traits":[{"code":21,"dataId":6,"value":10},{"code":21,"dataId":6,"value":10},{"code":21,"dataId":6,"value":10},{"code":21,"dataId":6,"value":10},{"code":21,"dataId":6,"value":10},{"code":61,"dataId":0,"value":1},{"code":22,"dataId":1,"value":1},{"code":22,"dataId":4,"value":1},{"code":14,"dataId":56,"value":1},{"code":14,"dataId":58,"value":1},{"code":14,"dataId":59,"value":1},{"code":14,"dataId":60,"value":1},{"code":14,"dataId":62,"value":1},{"code":14,"dataId":57,"value":1},{"code":14,"dataId":61,"value":1},{"code":14,"dataId":64,"value":1}],"iconIndex":82,"maxTurns":1,"message1":"","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"瞬移I","note":"","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":20,"autoRemovalTiming":0,"chanceByDamage":1,"traits":[{"code":22,"dataId":1,"value":0.5},{"code":22,"dataId":4,"value":0.3},{"code":21,"dataId":2,"value":0.8},{"code":22,"dataId":7,"value":-0.03},{"code":23,"dataId":2,"value":1.2},{"code":44,"dataId":42,"value":1},{"code":21,"dataId":6,"value":1.1},{"code":43,"dataId":43,"value":1},{"code":23,"dataId":6,"value":0.1},{"code":21,"dataId":4,"value":1.1},{"code":22,"dataId":3,"value":0.5},{"code":22,"dataId":9,"value":0.04}],"iconIndex":347,"maxTurns":1,"message1":"解体成了小蝙蝠！","message2":"解体成了小蝙蝠！","message3":"","message4":"重新聚合成人类形态！","minTurns":1,"motion":0,"name":"解体","note":"","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":true,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
-{"id":21,"autoRemovalTiming":2,"chanceByDamage":10,"traits":[{"code":21,"dataId":6,"value":1.05},{"code":14,"dataId":76,"value":1},{"code":44,"dataId":274,"value":1},{"code":44,"dataId":275,"value":1},{"code":44,"dataId":276,"value":1},{"code":44,"dataId":277,"value":1},{"code":44,"dataId":278,"value":1},{"code":44,"dataId":279,"value":1},{"code":44,"dataId":280,"value":1},{"code":44,"dataId":281,"value":1},{"code":44,"dataId":282,"value":1},{"code":44,"dataId":283,"value":1},{"code":44,"dataId":284,"value":1},{"code":44,"dataId":285,"value":1},{"code":44,"dataId":271,"value":1},{"code":44,"dataId":272,"value":1},{"code":44,"dataId":273,"value":1},{"code":44,"dataId":268,"value":1},{"code":44,"dataId":269,"value":1},{"code":44,"dataId":270,"value":1},{"code":14,"dataId":57,"value":1},{"code":14,"dataId":59,"value":1},{"code":14,"dataId":61,"value":1}],"iconIndex":76,"maxTurns":3,"message1":"开始舞动自己的兵器！","message2":"","message3":"","message4":"恢复了普通的作战姿态！","minTurns":3,"motion":0,"name":"长刃乱舞","note":"<SF_CommonAttack: 0289, 5>","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
+{"id":21,"autoRemovalTiming":2,"chanceByDamage":10,"traits":[{"code":21,"dataId":6,"value":1.05},{"code":14,"dataId":46,"value":1},{"code":44,"dataId":274,"value":1},{"code":44,"dataId":275,"value":1},{"code":44,"dataId":276,"value":1},{"code":44,"dataId":277,"value":1},{"code":44,"dataId":278,"value":1},{"code":44,"dataId":279,"value":1},{"code":44,"dataId":280,"value":1},{"code":44,"dataId":281,"value":1},{"code":44,"dataId":282,"value":1},{"code":44,"dataId":283,"value":1},{"code":44,"dataId":284,"value":1},{"code":44,"dataId":285,"value":1},{"code":44,"dataId":271,"value":1},{"code":44,"dataId":272,"value":1},{"code":44,"dataId":273,"value":1},{"code":44,"dataId":268,"value":1},{"code":44,"dataId":269,"value":1},{"code":44,"dataId":270,"value":1},{"code":14,"dataId":57,"value":1},{"code":14,"dataId":59,"value":1},{"code":14,"dataId":61,"value":1}],"iconIndex":76,"maxTurns":3,"message1":"开始舞动自己的兵器！","message2":"","message3":"","message4":"恢复了普通的作战姿态！","minTurns":3,"motion":0,"name":"长刃乱舞","note":"<SF_CommonAttack: 0289, 5>","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":22,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[{"code":21,"dataId":2,"value":1.2},{"code":21,"dataId":4,"value":1.2},{"code":21,"dataId":6,"value":1.2},{"code":14,"dataId":57,"value":1},{"code":14,"dataId":62,"value":1},{"code":14,"dataId":60,"value":1},{"code":14,"dataId":63,"value":1},{"code":14,"dataId":64,"value":1},{"code":14,"dataId":65,"value":1},{"code":14,"dataId":58,"value":1},{"code":14,"dataId":76,"value":1},{"code":14,"dataId":90,"value":1},{"code":14,"dataId":93,"value":1},{"code":14,"dataId":94,"value":1},{"code":22,"dataId":6,"value":0.5},{"code":22,"dataId":9,"value":0.05}],"iconIndex":117,"maxTurns":1,"message1":"充满了勇气！","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"士气提升","note":"","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":23,"autoRemovalTiming":2,"chanceByDamage":100,"traits":[{"code":11,"dataId":1,"value":0},{"code":11,"dataId":2,"value":0},{"code":11,"dataId":3,"value":0},{"code":11,"dataId":4,"value":0},{"code":11,"dataId":5,"value":0},{"code":11,"dataId":6,"value":0},{"code":11,"dataId":7,"value":0},{"code":11,"dataId":8,"value":0},{"code":11,"dataId":9,"value":0},{"code":11,"dataId":10,"value":0},{"code":11,"dataId":11,"value":0},{"code":11,"dataId":12,"value":0},{"code":11,"dataId":13,"value":0},{"code":11,"dataId":14,"value":0},{"code":11,"dataId":15,"value":0}],"iconIndex":0,"maxTurns":1,"message1":"","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"复活无敌","note":"","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":24,"autoRemovalTiming":2,"chanceByDamage":100,"traits":[{"code":23,"dataId":5,"value":1.4},{"code":22,"dataId":6,"value":0.2},{"code":21,"dataId":6,"value":1.2},{"code":23,"dataId":6,"value":0.8},{"code":22,"dataId":7,"value":0.05},{"code":22,"dataId":5,"value":0.5},{"code":22,"dataId":1,"value":0.2},{"code":22,"dataId":2,"value":0.2},{"code":22,"dataId":9,"value":0.06}],"iconIndex":221,"maxTurns":6,"message1":"领受了神的恩泽！","message2":"","message3":"","message4":"领受的神之恩泽已耗尽！","minTurns":6,"motion":0,"name":"神之恩赐","note":"","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
@@ -28,8 +28,8 @@ null,
 {"id":26,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[{"code":44,"dataId":197,"value":1},{"code":44,"dataId":198,"value":1},{"code":44,"dataId":199,"value":1},{"code":44,"dataId":198,"value":1},{"code":44,"dataId":195,"value":1}],"iconIndex":0,"maxTurns":1,"message1":"","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"禁用初级组装物","note":"","overlay":0,"priority":50,"removeAtBattleEnd":false,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":27,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[{"code":44,"dataId":201,"value":1},{"code":44,"dataId":202,"value":1},{"code":44,"dataId":203,"value":1},{"code":44,"dataId":204,"value":1}],"iconIndex":0,"maxTurns":1,"message1":"","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"禁用高级组装物","note":"","overlay":0,"priority":50,"removeAtBattleEnd":false,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":28,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[{"code":44,"dataId":172,"value":1},{"code":44,"dataId":173,"value":1},{"code":44,"dataId":174,"value":1}],"iconIndex":0,"maxTurns":1,"message1":"","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"禁用三大禁咒","note":"","overlay":0,"priority":50,"removeAtBattleEnd":false,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
-{"id":29,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[{"code":14,"dataId":97,"value":1},{"code":14,"dataId":98,"value":1},{"code":14,"dataId":99,"value":1},{"code":14,"dataId":100,"value":1},{"code":14,"dataId":101,"value":1}],"iconIndex":0,"maxTurns":1,"message1":"","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"刚性护盾","note":"","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
-{"id":30,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[],"iconIndex":0,"maxTurns":1,"message1":"","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"机体护盾","note":"","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
+{"id":29,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[],"iconIndex":0,"maxTurns":1,"message1":"","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"","note":"","overlay":0,"priority":50,"removeAtBattleEnd":false,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
+{"id":30,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[],"iconIndex":0,"maxTurns":1,"message1":"","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"","note":"","overlay":0,"priority":50,"removeAtBattleEnd":false,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":31,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[],"iconIndex":0,"maxTurns":1,"message1":"","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"","note":"","overlay":0,"priority":50,"removeAtBattleEnd":false,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":32,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[],"iconIndex":0,"maxTurns":1,"message1":"","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"主角团技能负面状态","note":"","overlay":0,"priority":50,"removeAtBattleEnd":false,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":33,"autoRemovalTiming":2,"chanceByDamage":100,"traits":[{"code":21,"dataId":6,"value":0.1},{"code":22,"dataId":1,"value":-1},{"code":22,"dataId":4,"value":-1},{"code":22,"dataId":5,"value":-1},{"code":22,"dataId":6,"value":-1}],"iconIndex":330,"maxTurns":1,"message1":"被神术禁锢了！","message2":"被神术禁锢了！","message3":"依旧被神术禁锢！","message4":"受到的神术禁锢解除了！","minTurns":1,"motion":0,"name":"神圣禁锢","note":"","overlay":0,"priority":100,"removeAtBattleEnd":false,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":4,"stepsToRemove":100},
@@ -45,7 +45,7 @@ null,
 {"id":43,"autoRemovalTiming":2,"chanceByDamage":100,"traits":[{"code":21,"dataId":0,"value":0.9},{"code":21,"dataId":1,"value":0.9},{"code":21,"dataId":2,"value":0.9},{"code":21,"dataId":3,"value":0.9},{"code":21,"dataId":4,"value":0.9},{"code":21,"dataId":5,"value":0.9},{"code":21,"dataId":6,"value":0.9},{"code":22,"dataId":0,"value":-0.1},{"code":22,"dataId":1,"value":-0.1},{"code":23,"dataId":2,"value":0.9},{"code":14,"dataId":148,"value":1},{"code":14,"dataId":149,"value":1},{"code":14,"dataId":150,"value":1},{"code":14,"dataId":151,"value":1},{"code":14,"dataId":152,"value":1}],"iconIndex":245,"maxTurns":10,"message1":"被世界规则压制了战斗力！","message2":"被世界规则压制了战斗力！","message3":"","message4":"不再被世界规则压制了！","minTurns":10,"motion":0,"name":"规则干涉","note":"","overlay":0,"priority":100,"removeAtBattleEnd":false,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":44,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[{"code":44,"dataId":234,"value":1},{"code":44,"dataId":235,"value":1}],"iconIndex":0,"maxTurns":1,"message1":"","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"狗炮冷却中","note":"","overlay":0,"priority":50,"removeAtBattleEnd":false,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":45,"autoRemovalTiming":2,"chanceByDamage":100,"traits":[{"code":21,"dataId":6,"value":0.1},{"code":22,"dataId":1,"value":-1},{"code":22,"dataId":4,"value":-1}],"iconIndex":305,"maxTurns":1,"message1":"","message2":"被强行绊倒了！","message3":"","message4":"站了起来！","minTurns":1,"motion":0,"name":"因果律绊倒","note":"","overlay":0,"priority":100,"removeAtBattleEnd":false,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":4,"stepsToRemove":100},
-{"id":46,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[],"iconIndex":0,"maxTurns":1,"message1":"","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"","note":"","overlay":0,"priority":50,"removeAtBattleEnd":false,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
+{"id":46,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[{"code":21,"dataId":2,"value":0.7},{"code":21,"dataId":4,"value":0.7},{"code":44,"dataId":140,"value":1},{"code":44,"dataId":141,"value":1},{"code":44,"dataId":142,"value":1},{"code":44,"dataId":148,"value":1},{"code":44,"dataId":149,"value":1},{"code":44,"dataId":150,"value":1},{"code":44,"dataId":169,"value":1},{"code":44,"dataId":170,"value":1},{"code":44,"dataId":171,"value":1},{"code":44,"dataId":271,"value":1},{"code":44,"dataId":272,"value":1},{"code":44,"dataId":273,"value":1}],"iconIndex":342,"maxTurns":1,"message1":"的武器被夺走了！","message2":"","message3":"","message4":"夺回了自己的武器！","minTurns":1,"motion":0,"name":"被缴械","note":"<SF_CommonAttack: 0372, 7>","overlay":0,"priority":50,"removeAtBattleEnd":false,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":47,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[],"iconIndex":0,"maxTurns":1,"message1":"","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"","note":"","overlay":0,"priority":50,"removeAtBattleEnd":false,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":48,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[],"iconIndex":0,"maxTurns":1,"message1":"","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"","note":"","overlay":0,"priority":50,"removeAtBattleEnd":false,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":49,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[],"iconIndex":0,"maxTurns":1,"message1":"","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"","note":"","overlay":0,"priority":50,"removeAtBattleEnd":false,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
@@ -56,11 +56,11 @@ null,
 {"id":54,"autoRemovalTiming":2,"chanceByDamage":100,"traits":[{"code":21,"dataId":6,"value":0.7},{"code":22,"dataId":1,"value":-0.2}],"iconIndex":54,"maxTurns":6,"message1":"","message2":"","message3":"","message4":"","minTurns":3,"motion":0,"name":"减速","note":"","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":55,"autoRemovalTiming":2,"chanceByDamage":100,"traits":[{"code":21,"dataId":6,"value":0.5},{"code":22,"dataId":1,"value":-0.3}],"iconIndex":62,"maxTurns":6,"message1":"","message2":"","message3":"","message4":"","minTurns":3,"motion":0,"name":"缓速","note":"","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":56,"autoRemovalTiming":2,"chanceByDamage":100,"traits":[{"code":21,"dataId":6,"value":0.4},{"code":22,"dataId":1,"value":-0.9},{"code":22,"dataId":4,"value":-0.9}],"iconIndex":337,"maxTurns":1,"message1":"被打飞到空中！","message2":"被打飞到空中！","message3":"","message4":"落回了地面！","minTurns":1,"motion":0,"name":"浮空","note":"","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
-{"id":57,"autoRemovalTiming":2,"chanceByDamage":10,"traits":[{"code":21,"dataId":6,"value":0.5},{"code":22,"dataId":1,"value":-1},{"code":22,"dataId":4,"value":-1},{"code":42,"dataId":1,"value":1},{"code":42,"dataId":3,"value":1},{"code":44,"dataId":1,"value":1},{"code":44,"dataId":105,"value":1},{"code":44,"dataId":143,"value":1},{"code":44,"dataId":144,"value":1},{"code":44,"dataId":175,"value":1},{"code":44,"dataId":237,"value":1},{"code":44,"dataId":262,"value":1},{"code":44,"dataId":265,"value":1},{"code":44,"dataId":266,"value":1},{"code":44,"dataId":267,"value":1},{"code":44,"dataId":289,"value":1},{"code":44,"dataId":290,"value":1},{"code":44,"dataId":322,"value":1},{"code":44,"dataId":350,"value":1},{"code":44,"dataId":351,"value":1},{"code":44,"dataId":352,"value":1},{"code":44,"dataId":353,"value":1},{"code":44,"dataId":354,"value":1},{"code":44,"dataId":355,"value":1},{"code":44,"dataId":356,"value":1},{"code":44,"dataId":357,"value":1},{"code":44,"dataId":358,"value":1},{"code":44,"dataId":360,"value":1},{"code":44,"dataId":350,"value":1}],"iconIndex":339,"maxTurns":6,"message1":"的身体被定住了！","message2":"的身体被定住了！","message3":"依旧不能移动！","message4":"受到的定身解除了！","minTurns":3,"motion":0,"name":"定身","note":"","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":true,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
+{"id":57,"autoRemovalTiming":2,"chanceByDamage":10,"traits":[{"code":21,"dataId":6,"value":0.5},{"code":22,"dataId":1,"value":-1},{"code":22,"dataId":4,"value":-1},{"code":42,"dataId":1,"value":1},{"code":42,"dataId":3,"value":1},{"code":44,"dataId":1,"value":1},{"code":44,"dataId":105,"value":1},{"code":44,"dataId":143,"value":1},{"code":44,"dataId":144,"value":1},{"code":44,"dataId":175,"value":1},{"code":44,"dataId":237,"value":1},{"code":44,"dataId":265,"value":1},{"code":44,"dataId":266,"value":1},{"code":44,"dataId":267,"value":1},{"code":44,"dataId":289,"value":1},{"code":44,"dataId":290,"value":1},{"code":44,"dataId":322,"value":1},{"code":44,"dataId":350,"value":1},{"code":44,"dataId":351,"value":1},{"code":44,"dataId":352,"value":1},{"code":44,"dataId":353,"value":1},{"code":44,"dataId":354,"value":1},{"code":44,"dataId":355,"value":1},{"code":44,"dataId":356,"value":1},{"code":44,"dataId":357,"value":1},{"code":44,"dataId":358,"value":1},{"code":44,"dataId":360,"value":1},{"code":44,"dataId":350,"value":1}],"iconIndex":339,"maxTurns":6,"message1":"的身体被定住了！","message2":"的身体被定住了！","message3":"依旧不能移动！","message4":"受到的定身解除了！","minTurns":3,"motion":0,"name":"定身","note":"","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":true,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":58,"autoRemovalTiming":2,"chanceByDamage":20,"traits":[{"code":22,"dataId":1,"value":-0.9},{"code":22,"dataId":4,"value":-0.9}],"iconIndex":22,"maxTurns":6,"message1":"陷入了眩晕！","message2":"陷入了眩晕！","message3":"仍旧站立不稳","message4":"的身体站稳了！","minTurns":3,"motion":1,"name":"眩晕","note":"","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":true,"removeByRestriction":false,"removeByWalking":false,"restriction":4,"stepsToRemove":100},
 {"id":59,"autoRemovalTiming":2,"chanceByDamage":10,"traits":[{"code":22,"dataId":1,"value":-0.9},{"code":22,"dataId":4,"value":-0.9},{"code":13,"dataId":76,"value":1.5},{"code":22,"dataId":6,"value":-0.2},{"code":42,"dataId":2,"value":1},{"code":21,"dataId":2,"value":0.5}],"iconIndex":25,"maxTurns":6,"message1":"身体被麻痹了！","message2":"身体被麻痹了！","message3":"","message4":"身体的麻痹解除了！","minTurns":3,"motion":1,"name":"麻痹","note":"","overlay":8,"priority":50,"removeAtBattleEnd":true,"removeByDamage":true,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":60,"autoRemovalTiming":2,"chanceByDamage":100,"traits":[{"code":22,"dataId":1,"value":-1},{"code":11,"dataId":10,"value":1.5},{"code":22,"dataId":6,"value":-0.5}],"iconIndex":24,"maxTurns":6,"message1":"陷入昏睡！","message2":"陷入昏睡1","message3":"仍旧熟睡不醒","message4":"睡醒了！","minTurns":3,"motion":2,"name":"睡眠","note":"","overlay":7,"priority":50,"removeAtBattleEnd":true,"removeByDamage":true,"removeByRestriction":false,"removeByWalking":false,"restriction":4,"stepsToRemove":100},
-{"id":61,"autoRemovalTiming":2,"chanceByDamage":10,"traits":[{"code":22,"dataId":1,"value":-0.9},{"code":22,"dataId":4,"value":-0.9},{"code":21,"dataId":6,"value":0.9},{"code":11,"dataId":4,"value":0.8},{"code":11,"dataId":5,"value":1.5},{"code":11,"dataId":6,"value":1.2},{"code":44,"dataId":1,"value":1},{"code":44,"dataId":105,"value":1},{"code":44,"dataId":143,"value":1},{"code":44,"dataId":144,"value":1},{"code":44,"dataId":175,"value":1},{"code":44,"dataId":237,"value":1},{"code":44,"dataId":262,"value":1},{"code":44,"dataId":265,"value":1},{"code":44,"dataId":266,"value":1},{"code":44,"dataId":267,"value":1},{"code":44,"dataId":289,"value":1},{"code":44,"dataId":290,"value":1},{"code":44,"dataId":322,"value":1},{"code":44,"dataId":350,"value":1},{"code":44,"dataId":351,"value":1},{"code":44,"dataId":352,"value":1},{"code":44,"dataId":353,"value":1},{"code":44,"dataId":354,"value":1},{"code":44,"dataId":355,"value":1},{"code":44,"dataId":356,"value":1},{"code":44,"dataId":357,"value":1},{"code":44,"dataId":358,"value":1},{"code":44,"dataId":360,"value":1},{"code":44,"dataId":350,"value":1},{"code":42,"dataId":1,"value":1},{"code":42,"dataId":2,"value":1},{"code":42,"dataId":3,"value":1}],"iconIndex":65,"maxTurns":6,"message1":"身体被冰冻住了！","message2":"身体被冰冻住了！","message3":"仍旧被冰封！","message4":"身体的冰冻解除了！","minTurns":3,"motion":1,"name":"冰冻","note":"","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":true,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
+{"id":61,"autoRemovalTiming":2,"chanceByDamage":10,"traits":[{"code":22,"dataId":1,"value":-0.9},{"code":22,"dataId":4,"value":-0.9},{"code":21,"dataId":6,"value":0.9},{"code":11,"dataId":4,"value":0.8},{"code":11,"dataId":5,"value":1.5},{"code":11,"dataId":6,"value":1.2},{"code":44,"dataId":1,"value":1},{"code":44,"dataId":105,"value":1},{"code":44,"dataId":143,"value":1},{"code":44,"dataId":144,"value":1},{"code":44,"dataId":175,"value":1},{"code":44,"dataId":237,"value":1},{"code":44,"dataId":265,"value":1},{"code":44,"dataId":266,"value":1},{"code":44,"dataId":267,"value":1},{"code":44,"dataId":289,"value":1},{"code":44,"dataId":290,"value":1},{"code":44,"dataId":322,"value":1},{"code":44,"dataId":350,"value":1},{"code":44,"dataId":351,"value":1},{"code":44,"dataId":352,"value":1},{"code":44,"dataId":353,"value":1},{"code":44,"dataId":354,"value":1},{"code":44,"dataId":355,"value":1},{"code":44,"dataId":356,"value":1},{"code":44,"dataId":357,"value":1},{"code":44,"dataId":358,"value":1},{"code":44,"dataId":360,"value":1},{"code":44,"dataId":350,"value":1},{"code":42,"dataId":1,"value":1},{"code":42,"dataId":2,"value":1},{"code":42,"dataId":3,"value":1}],"iconIndex":65,"maxTurns":6,"message1":"身体被冰冻住了！","message2":"身体被冰冻住了！","message3":"仍旧被冰封！","message4":"身体的冰冻解除了！","minTurns":3,"motion":1,"name":"冰冻","note":"","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":true,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":62,"autoRemovalTiming":2,"chanceByDamage":100,"traits":[{"code":22,"dataId":0,"value":-0.1}],"iconIndex":23,"maxTurns":6,"message1":"陷入了敌我不分的状态！","message2":"陷入了敌我不分的状态！","message3":"","message4":"的混乱状态解除了1","minTurns":3,"motion":1,"name":"混乱","note":"","overlay":5,"priority":50,"removeAtBattleEnd":true,"removeByDamage":true,"removeByRestriction":false,"removeByWalking":false,"restriction":3,"stepsToRemove":100},
 {"id":63,"autoRemovalTiming":2,"chanceByDamage":1,"traits":[{"code":21,"dataId":2,"value":1.5},{"code":21,"dataId":6,"value":1.5},{"code":21,"dataId":3,"value":0.5},{"code":21,"dataId":5,"value":0.5},{"code":22,"dataId":0,"value":-0.1},{"code":11,"dataId":10,"value":1.5}],"iconIndex":21,"maxTurns":10,"message1":"陷入狂乱之中！不分敌友！","message2":"陷入狂乱之中！不分敌友！","message3":"仍旧疯狂！","message4":"的狂乱状态解除了！","minTurns":5,"motion":0,"name":"狂乱","note":"","overlay":4,"priority":50,"removeAtBattleEnd":true,"removeByDamage":true,"removeByRestriction":false,"removeByWalking":false,"restriction":3,"stepsToRemove":100},
 {"id":64,"autoRemovalTiming":2,"chanceByDamage":100,"traits":[{"code":42,"dataId":2,"value":1}],"iconIndex":4,"maxTurns":6,"message1":"被沉默了！","message2":"被沉默了！","message3":"","message4":"受到的沉默效果解除了！","minTurns":3,"motion":0,"name":"沉默","note":"","overlay":3,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
@@ -186,7 +186,7 @@ null,
 {"id":184,"autoRemovalTiming":2,"chanceByDamage":100,"traits":[{"code":22,"dataId":6,"value":0.6},{"code":21,"dataId":2,"value":0.85},{"code":22,"dataId":2,"value":0.3},{"code":22,"dataId":9,"value":0.05}],"iconIndex":77,"maxTurns":3,"message1":"专注于反击！攻击力有所降低。","message2":"专注于反击！攻击力有所降低。","message3":"","message4":"不再专注反击，攻击力恢复！","minTurns":3,"motion":0,"name":"专注反击II","note":"","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":185,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[{"code":21,"dataId":6,"value":1.1},{"code":23,"dataId":5,"value":1.5},{"code":23,"dataId":4,"value":0.9},{"code":21,"dataId":4,"value":1.05}],"iconIndex":320,"maxTurns":1,"message1":"魔力充盈一层！","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"一层魔力充盈","note":"<SF_StatesOverride: 魔力充盈, 1>","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":186,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[{"code":21,"dataId":6,"value":1.15},{"code":23,"dataId":5,"value":2},{"code":23,"dataId":4,"value":0.8},{"code":21,"dataId":4,"value":1.15}],"iconIndex":321,"maxTurns":1,"message1":"魔力充盈二层！","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"二层魔力充盈","note":"<SF_StatesOverride: 魔力充盈, 2>","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
-{"id":187,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[{"code":21,"dataId":6,"value":1.2},{"code":23,"dataId":4,"value":0.6},{"code":21,"dataId":4,"value":1.25}],"iconIndex":322,"maxTurns":3,"message1":"魔力充盈三层！","message2":"","message3":"","message4":"","minTurns":3,"motion":0,"name":"三层魔力充盈","note":"<SF_StatesOverride: 魔力充盈, 3>\n","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
+{"id":187,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[{"code":21,"dataId":6,"value":1.2},{"code":23,"dataId":4,"value":0.6},{"code":21,"dataId":4,"value":1.25}],"iconIndex":322,"maxTurns":3,"message1":"魔力充盈三层！","message2":"","message3":"","message4":"","minTurns":3,"motion":0,"name":"三层魔力充盈","note":"<SF_StatesOverride: 魔力充盈, 3>\n<SF_CommonAttack: 0177, 8>","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":188,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[{"code":21,"dataId":6,"value":1.03}],"iconIndex":320,"maxTurns":1,"message1":"积累了一重势！","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"一重势","note":"<SF_StatesOverride: 势, 1>\n<SF_CommonAttack: 0265, 4>","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":189,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[{"code":21,"dataId":6,"value":1.06}],"iconIndex":321,"maxTurns":1,"message1":"积累了二重势！","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"二重势","note":"<SF_StatesOverride: 势, 2>\n<SF_CommonAttack: 0266, 4>","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":190,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[{"code":21,"dataId":6,"value":1.1},{"code":21,"dataId":2,"value":1.1}],"iconIndex":322,"maxTurns":1,"message1":"积累了三重势！","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"三重势","note":"<SF_StatesOverride: 势, 3>\n<SF_CommonAttack: 0267, 4>","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
@@ -194,7 +194,7 @@ null,
 {"id":192,"autoRemovalTiming":2,"chanceByDamage":100,"traits":[{"code":21,"dataId":6,"value":10},{"code":21,"dataId":6,"value":10},{"code":21,"dataId":6,"value":10},{"code":21,"dataId":6,"value":10},{"code":21,"dataId":6,"value":10},{"code":61,"dataId":0,"value":1},{"code":22,"dataId":1,"value":1},{"code":22,"dataId":4,"value":1},{"code":14,"dataId":56,"value":1},{"code":14,"dataId":58,"value":1},{"code":14,"dataId":59,"value":1},{"code":14,"dataId":60,"value":1},{"code":14,"dataId":62,"value":1},{"code":14,"dataId":57,"value":1},{"code":14,"dataId":61,"value":1},{"code":14,"dataId":64,"value":1}],"iconIndex":82,"maxTurns":1,"message1":"","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"瞬移II","note":"<SF_CommonAttack: 0358, 5>","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":193,"autoRemovalTiming":2,"chanceByDamage":100,"traits":[{"code":21,"dataId":6,"value":10},{"code":21,"dataId":6,"value":10},{"code":21,"dataId":6,"value":10},{"code":21,"dataId":6,"value":10},{"code":21,"dataId":6,"value":10},{"code":61,"dataId":0,"value":1},{"code":22,"dataId":1,"value":1},{"code":22,"dataId":4,"value":1},{"code":14,"dataId":56,"value":1},{"code":14,"dataId":58,"value":1},{"code":14,"dataId":59,"value":1},{"code":14,"dataId":60,"value":1},{"code":14,"dataId":62,"value":1},{"code":14,"dataId":57,"value":1},{"code":14,"dataId":61,"value":1},{"code":14,"dataId":64,"value":1}],"iconIndex":82,"maxTurns":1,"message1":"","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"瞬移III","note":"<SF_CommonAttack: 0358, 5>","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":194,"autoRemovalTiming":2,"chanceByDamage":100,"traits":[{"code":22,"dataId":1,"value":0.5},{"code":22,"dataId":4,"value":0.5}],"iconIndex":0,"maxTurns":1,"message1":"","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"闪避提升","note":"","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
-{"id":195,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[],"iconIndex":0,"maxTurns":1,"message1":"","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"","note":"","overlay":0,"priority":50,"removeAtBattleEnd":false,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
+{"id":195,"autoRemovalTiming":2,"chanceByDamage":100,"traits":[{"code":14,"dataId":56,"value":1},{"code":14,"dataId":58,"value":1},{"code":14,"dataId":59,"value":1},{"code":14,"dataId":60,"value":1},{"code":14,"dataId":62,"value":1},{"code":14,"dataId":57,"value":1},{"code":14,"dataId":61,"value":1},{"code":44,"dataId":106,"value":1},{"code":21,"dataId":6,"value":1.2},{"code":22,"dataId":1,"value":0.3},{"code":22,"dataId":4,"value":0.3}],"iconIndex":333,"maxTurns":5,"message1":"变成了流动的活水!","message2":"变成了流动的活水!","message3":"","message4":"从流动状态重新凝聚成型！","minTurns":5,"motion":2,"name":"水无定型II","note":"","overlay":0,"priority":50,"removeAtBattleEnd":true,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":196,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[],"iconIndex":0,"maxTurns":1,"message1":"","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"","note":"","overlay":0,"priority":50,"removeAtBattleEnd":false,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":197,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[],"iconIndex":0,"maxTurns":1,"message1":"","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"","note":"","overlay":0,"priority":50,"removeAtBattleEnd":false,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},
 {"id":198,"autoRemovalTiming":0,"chanceByDamage":100,"traits":[],"iconIndex":0,"maxTurns":1,"message1":"","message2":"","message3":"","message4":"","minTurns":1,"motion":0,"name":"","note":"","overlay":0,"priority":50,"removeAtBattleEnd":false,"removeByDamage":false,"removeByRestriction":false,"removeByWalking":false,"restriction":0,"stepsToRemove":100},