diff --git a/shared/resource/jsons/dic_zyz_se.json b/shared/resource/jsons/dic_zyz_se.json
index c31e680af..09a80a83f 100644
--- a/shared/resource/jsons/dic_zyz_se.json
+++ b/shared/resource/jsons/dic_zyz_se.json
@@ -246,6 +246,234 @@
         "seidNameImage": "&",
         "passivespineName": "&"
     },
+    {
+        "id": 40,
+        "name": "替换嘲讽",
+        "info": "将挑衅的范围变为菱形3格",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 0,
+        "percent": 100,
+        "node": 19,
+        "type": 999,
+        "gainvalue": "47&48&49",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 41,
+        "name": "挑衅1",
+        "info": "行动结束后，对菱形2格范围内最多1个敌军部队施加【怒目】",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 15,
+        "type": 107,
+        "gainvalue": "2012&0&1&101&1",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "tiaoxin",
+        "passivespineName": "&"
+    },
+    {
+        "id": 42,
+        "name": "挑衅2",
+        "info": "行动结束后，对菱形2格范围内最多2个敌军部队施加【怒目】",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 15,
+        "type": 107,
+        "gainvalue": "2012&0&1&101&2",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "tiaoxin",
+        "passivespineName": "&"
+    },
+    {
+        "id": 43,
+        "name": "挑衅3",
+        "info": "行动结束后，对菱形2格范围内最多3个敌军部队施加【怒目】",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 15,
+        "type": 107,
+        "gainvalue": "2012&0&1&101&3",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "tiaoxin",
+        "passivespineName": "&"
+    },
+    {
+        "id": 44,
+        "name": "强化挑衅1",
+        "info": "行动结束后，对菱形3格范围内最多1个敌军部队施加【怒目】",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 15,
+        "type": 107,
+        "gainvalue": "2024&0&1&101&1",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "tiaoxin",
+        "passivespineName": "&"
+    },
+    {
+        "id": 45,
+        "name": "强化挑衅2",
+        "info": "行动结束后，对菱形3格范围内最多2个敌军部队施加【怒目】",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 15,
+        "type": 107,
+        "gainvalue": "2024&0&1&101&2",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "tiaoxin",
+        "passivespineName": "&"
+    },
+    {
+        "id": 46,
+        "name": "强化挑衅3",
+        "info": "行动结束后，对菱形3格范围内最多3个敌军部队施加【怒目】",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 15,
+        "type": 107,
+        "gainvalue": "2024&0&1&101&3",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "tiaoxin",
+        "passivespineName": "&"
+    },
+    {
+        "id": 47,
+        "name": "替换挑衅1",
+        "info": "将挑衅的范围变为菱形3格",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 0,
+        "percent": 100,
+        "node": 19,
+        "type": 604,
+        "gainvalue": "41&44",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 48,
+        "name": "替换挑衅2",
+        "info": "将挑衅的范围变为菱形3格",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 0,
+        "percent": 100,
+        "node": 19,
+        "type": 604,
+        "gainvalue": "42&45",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 49,
+        "name": "替换挑衅3",
+        "info": "将挑衅的范围变为菱形3格",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 0,
+        "percent": 100,
+        "node": 19,
+        "type": 604,
+        "gainvalue": "43&46",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 51,
+        "name": "免疫增益",
+        "info": "免疫增益",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 0,
+        "percent": 100,
+        "node": 19,
+        "type": 102,
+        "gainvalue": "1&",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 52,
+        "name": "免疫减益",
+        "info": "免疫减益",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 0,
+        "percent": 100,
+        "node": 19,
+        "type": 102,
+        "gainvalue": "0&",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
     {
         "id": 101,
         "name": "生命+1",
@@ -10203,17 +10431,93 @@
         "passivespineName": "&"
     },
     {
-        "id": 40,
-        "name": "替换嘲讽",
-        "info": "将挑衅的范围变为菱形3格",
-        "img": 1,
-        "isShow": 0,
+        "id": 60026,
+        "name": "箭塔",
+        "info": "使弓兵的普通攻击射程提高2",
+        "img": "qianghua_2",
+        "isShow": 1,
+        "condition": "606&1&4",
+        "aim": 1,
+        "percent": 100,
+        "node": 16,
+        "type": 602,
+        "gainvalue": "2&",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 60041,
+        "name": "陷坑",
+        "info": "对在此处结束行动的武将造成10%最大生命值的伤害",
+        "img": "liuxue",
+        "isShow": 1,
         "condition": "&",
         "aim": 0,
         "percent": 100,
-        "node": 19,
+        "node": 15,
+        "type": 300,
+        "gainvalue": "7&10&10",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 60042,
+        "name": "丢失控制",
+        "info": "被敌军抢夺",
+        "img": "qianghua_1",
+        "isShow": 1,
+        "condition": "605&1&1",
+        "aim": 0,
+        "percent": 100,
+        "node": 15,
+        "type": 811,
+        "gainvalue": "42&43&1",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 60043,
+        "name": "控制中",
+        "info": "处于我军保护下",
+        "img": "qianghua_2",
+        "isShow": 1,
+        "condition": "605&1&2",
+        "aim": 0,
+        "percent": 100,
+        "node": 15,
+        "type": 811,
+        "gainvalue": "43&42&1",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 61001,
+        "name": "易爆",
+        "info": "被攻击时会被击退，被击毁后会爆炸，破坏周围的碎石",
+        "img": "baozha",
+        "isShow": 1,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 12,
         "type": 999,
-        "gainvalue": "47&48&49",
+        "gainvalue": "61002&61003",
         "times_turn": 0,
         "times_battle": 0,
         "auroaspineName": "&",
@@ -10222,187 +10526,16 @@
         "passivespineName": "&"
     },
     {
-        "id": 41,
-        "name": "挑衅1",
-        "info": "行动结束后，对菱形2格范围内最多1个敌军部队施加【怒目】",
-        "img": 1,
-        "isShow": 0,
-        "condition": "&",
-        "aim": 1,
-        "percent": 100,
-        "node": 15,
-        "type": 107,
-        "gainvalue": "2012&0&1&101&1",
-        "times_turn": 0,
-        "times_battle": 0,
-        "auroaspineName": "&",
-        "rangeSeid": "&",
-        "seidNameImage": "tiaoxin",
-        "passivespineName": "&"
-    },
-    {
-        "id": 42,
-        "name": "挑衅2",
-        "info": "行动结束后，对菱形2格范围内最多2个敌军部队施加【怒目】",
-        "img": 1,
-        "isShow": 0,
-        "condition": "&",
-        "aim": 1,
-        "percent": 100,
-        "node": 15,
-        "type": 107,
-        "gainvalue": "2012&0&1&101&2",
-        "times_turn": 0,
-        "times_battle": 0,
-        "auroaspineName": "&",
-        "rangeSeid": "&",
-        "seidNameImage": "tiaoxin",
-        "passivespineName": "&"
-    },
-    {
-        "id": 43,
-        "name": "挑衅3",
-        "info": "行动结束后，对菱形2格范围内最多3个敌军部队施加【怒目】",
-        "img": 1,
-        "isShow": 0,
-        "condition": "&",
-        "aim": 1,
-        "percent": 100,
-        "node": 15,
-        "type": 107,
-        "gainvalue": "2012&0&1&101&3",
-        "times_turn": 0,
-        "times_battle": 0,
-        "auroaspineName": "&",
-        "rangeSeid": "&",
-        "seidNameImage": "tiaoxin",
-        "passivespineName": "&"
-    },
-    {
-        "id": 44,
-        "name": "强化挑衅1",
-        "info": "行动结束后，对菱形3格范围内最多1个敌军部队施加【怒目】",
-        "img": 1,
-        "isShow": 0,
-        "condition": "&",
-        "aim": 1,
-        "percent": 100,
-        "node": 15,
-        "type": 107,
-        "gainvalue": "2024&0&1&101&1",
-        "times_turn": 0,
-        "times_battle": 0,
-        "auroaspineName": "&",
-        "rangeSeid": "&",
-        "seidNameImage": "tiaoxin",
-        "passivespineName": "&"
-    },
-    {
-        "id": 45,
-        "name": "强化挑衅2",
-        "info": "行动结束后，对菱形3格范围内最多2个敌军部队施加【怒目】",
-        "img": 1,
-        "isShow": 0,
-        "condition": "&",
-        "aim": 1,
-        "percent": 100,
-        "node": 15,
-        "type": 107,
-        "gainvalue": "2024&0&1&101&2",
-        "times_turn": 0,
-        "times_battle": 0,
-        "auroaspineName": "&",
-        "rangeSeid": "&",
-        "seidNameImage": "tiaoxin",
-        "passivespineName": "&"
-    },
-    {
-        "id": 46,
-        "name": "强化挑衅3",
-        "info": "行动结束后，对菱形3格范围内最多3个敌军部队施加【怒目】",
-        "img": 1,
-        "isShow": 0,
-        "condition": "&",
-        "aim": 1,
-        "percent": 100,
-        "node": 15,
-        "type": 107,
-        "gainvalue": "2024&0&1&101&3",
-        "times_turn": 0,
-        "times_battle": 0,
-        "auroaspineName": "&",
-        "rangeSeid": "&",
-        "seidNameImage": "tiaoxin",
-        "passivespineName": "&"
-    },
-    {
-        "id": 47,
-        "name": "替换挑衅1",
-        "info": "将挑衅的范围变为菱形3格",
+        "id": 61002,
+        "name": "击退",
+        "info": "被击退",
         "img": 1,
         "isShow": 0,
         "condition": "&",
         "aim": 0,
         "percent": 100,
-        "node": 19,
-        "type": 604,
-        "gainvalue": "41&44",
-        "times_turn": 0,
-        "times_battle": 0,
-        "auroaspineName": "&",
-        "rangeSeid": "&",
-        "seidNameImage": "&",
-        "passivespineName": "&"
-    },
-    {
-        "id": 48,
-        "name": "替换挑衅2",
-        "info": "将挑衅的范围变为菱形3格",
-        "img": 1,
-        "isShow": 0,
-        "condition": "&",
-        "aim": 0,
-        "percent": 100,
-        "node": 19,
-        "type": 604,
-        "gainvalue": "42&45",
-        "times_turn": 0,
-        "times_battle": 0,
-        "auroaspineName": "&",
-        "rangeSeid": "&",
-        "seidNameImage": "&",
-        "passivespineName": "&"
-    },
-    {
-        "id": 49,
-        "name": "替换挑衅3",
-        "info": "将挑衅的范围变为菱形3格",
-        "img": 1,
-        "isShow": 0,
-        "condition": "&",
-        "aim": 0,
-        "percent": 100,
-        "node": 19,
-        "type": 604,
-        "gainvalue": "43&46",
-        "times_turn": 0,
-        "times_battle": 0,
-        "auroaspineName": "&",
-        "rangeSeid": "&",
-        "seidNameImage": "&",
-        "passivespineName": "&"
-    },
-    {
-        "id": 101,
-        "name": "免疫增益",
-        "info": "免疫增益",
-        "img": 1,
-        "isShow": 0,
-        "condition": "&",
-        "aim": 0,
-        "percent": 100,
-        "node": 19,
-        "type": 102,
+        "node": 8,
+        "type": 403,
         "gainvalue": "1&",
         "times_turn": 0,
         "times_battle": 0,
@@ -10412,17 +10545,93 @@
         "passivespineName": "&"
     },
     {
-        "id": 102,
-        "name": "免疫减益",
-        "info": "免疫减益",
+        "id": 61003,
+        "name": "爆炸",
+        "info": "爆炸",
         "img": 1,
         "isShow": 0,
         "condition": "&",
         "aim": 0,
         "percent": 100,
-        "node": 19,
-        "type": 102,
-        "gainvalue": "0&",
+        "node": 12,
+        "type": 601,
+        "gainvalue": "1001&",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 61004,
+        "name": "猛火车爆炸",
+        "info": "破坏碎石",
+        "img": 0,
+        "isShow": 1,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 7,
+        "type": 999,
+        "gainvalue": "61005&61006",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 61005,
+        "name": "破坏碎石",
+        "info": "破坏碎石",
+        "img": 0,
+        "isShow": 1,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 7,
+        "type": 811,
+        "gainvalue": "44&1&1",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 61006,
+        "name": "造成伤害",
+        "info": "造成伤害",
+        "img": 0,
+        "isShow": 1,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 7,
+        "type": 303,
+        "gainvalue": "1&1008&0&7&10&10",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 61007,
+        "name": "造成伤害",
+        "info": "造成伤害",
+        "img": 0,
+        "isShow": 1,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 7,
+        "type": 303,
+        "gainvalue": "1&1008&1&7&10&10",
         "times_turn": 0,
         "times_battle": 0,
         "auroaspineName": "&",
@@ -10566,7 +10775,7 @@
     {
         "id": 101411,
         "name": "煮酒1",
-        "info": "反击伤害+50%，有50%的概率对目标施加【封技】，持续1回合\n\n【封技】：无法使用回合技和怒气技",
+        "info": "反击伤害+50%，有50%的概率对目标施加【封技】，持续1回合\r\n\r\n【封技】：无法使用回合技和怒气技",
         "img": "zhujiu",
         "isShow": 1,
         "condition": "&",
@@ -10623,7 +10832,7 @@
     {
         "id": 101421,
         "name": "煮酒2",
-        "info": "反击伤害+50%，有50%的概率对目标施加【封技】，持续1回合\n\n【封技】：无法使用回合技和怒气技",
+        "info": "反击伤害+50%，有50%的概率对目标施加【封技】，持续1回合\r\n\r\n【封技】：无法使用回合技和怒气技",
         "img": "zhujiu",
         "isShow": 1,
         "condition": "&",
@@ -10680,7 +10889,7 @@
     {
         "id": 201111,
         "name": "勇将夺甲1",
-        "info": "若攻击方向1格内有敌军，则对其造成50%的物理伤害，并对所有攻击目标施加【破甲】，持续2回合\n\n【破甲】：物防-10%",
+        "info": "若攻击方向1格内有敌军，则对其造成50%的物理伤害，并对所有攻击目标施加【破甲】，持续2回合\r\n\r\n【破甲】：物防-10%",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -10737,7 +10946,7 @@
     {
         "id": 201121,
         "name": "勇将夺甲2",
-        "info": "若攻击方向1格内有敌军，则对其造成70%的物理伤害，并对所有攻击目标施加【破甲】，持续2回合\n\n【破甲】：物防-10%",
+        "info": "若攻击方向1格内有敌军，则对其造成70%的物理伤害，并对所有攻击目标施加【破甲】，持续2回合\r\n\r\n【破甲】：物防-10%",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -10794,7 +11003,7 @@
     {
         "id": 201211,
         "name": "拨矢啖睛1",
-        "info": "自身获得【啖睛】；并使【挑畔】的效果提升为：行动结束时，对3格内最多3个敌军施加【怒目】，持续2回合\n\n【啖睛1】：反弹+15%",
+        "info": "自身获得【啖睛】；并使【挑畔】的效果提升为：行动结束时，对3格内最多3个敌军施加【怒目】，持续2回合\r\n\r\n【啖睛1】：反弹+15%",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -10832,7 +11041,7 @@
     {
         "id": 201221,
         "name": "拨矢啖睛2",
-        "info": "自身获得【啖睛】；并使【挑畔】的效果提升为：行动结束时，对3格内最多3个敌军施加【怒目】，持续2回合\n\n【啖睛1】：反弹+25%",
+        "info": "自身获得【啖睛】；并使【挑畔】的效果提升为：行动结束时，对3格内最多3个敌军施加【怒目】，持续2回合\r\n\r\n【啖睛1】：反弹+25%",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -10870,7 +11079,7 @@
     {
         "id": 201311,
         "name": "刚烈1",
-        "info": "【挑衅】行动结束后，对2格范围内最多1个敌军部队施加【怒目】\n【嘲讽1】：被【怒目】部队视为优先攻击目标",
+        "info": "【挑衅】行动结束后，对2格范围内最多1个敌军部队施加【怒目】\r\n【嘲讽1】：被【怒目】部队视为优先攻击目标",
         "img": "ganglie",
         "isShow": 1,
         "condition": "&",
@@ -10889,7 +11098,7 @@
     {
         "id": 201321,
         "name": "刚烈2",
-        "info": "【挑衅】行动结束后，对2格范围内最多2个敌军部队施加【怒目】\n【嘲讽2】：被【怒目】部队视为优先攻击目标",
+        "info": "【挑衅】行动结束后，对2格范围内最多2个敌军部队施加【怒目】\r\n【嘲讽2】：被【怒目】部队视为优先攻击目标",
         "img": "ganglie",
         "isShow": 1,
         "condition": "&",
@@ -10908,7 +11117,7 @@
     {
         "id": 201331,
         "name": "刚烈3",
-        "info": "【挑衅】行动结束后，对2格范围内最多3个敌军部队施加【怒目】\n【嘲讽3】：被【怒目】部队视为优先攻击目标",
+        "info": "【挑衅】行动结束后，对2格范围内最多3个敌军部队施加【怒目】\r\n【嘲讽3】：被【怒目】部队视为优先攻击目标",
         "img": "ganglie",
         "isShow": 1,
         "condition": "&",
@@ -11478,7 +11687,7 @@
     {
         "id": 401111,
         "name": "战熊号角1",
-        "info": "召唤一只攻击为自身100%的熊协助作战；若熊已经在场，恢复其50%的生命，并使其获得【猛兽1】，持续2回合；当夏侯渊受到攻击时，如果熊在场，则由熊承担全部伤害\n\n【猛兽1】：物攻+10%；暴击率+5%；物防+10%",
+        "info": "召唤一只攻击为自身100%的熊协助作战；若熊已经在场，恢复其50%的生命，并使其获得【猛兽1】，持续2回合；当夏侯渊受到攻击时，如果熊在场，则由熊承担全部伤害\r\n\r\n【猛兽1】：物攻+10%；暴击率+5%；物防+10%",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -11573,7 +11782,7 @@
     {
         "id": 401121,
         "name": "战熊号角2",
-        "info": "召唤一只攻击为自身80%的熊协助作战；若熊已经在场，恢复其50%的生命，并使其获得【猛兽2】，持续2回合；当夏侯渊受到攻击时，如果熊在场，则由熊承担全部伤害\n\n【猛兽2】：物攻+20%；暴击率+10%；物防+20%",
+        "info": "召唤一只攻击为自身80%的熊协助作战；若熊已经在场，恢复其50%的生命，并使其获得【猛兽2】，持续2回合；当夏侯渊受到攻击时，如果熊在场，则由熊承担全部伤害\r\n\r\n【猛兽2】：物攻+20%；暴击率+10%；物防+20%",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -11668,7 +11877,7 @@
     {
         "id": 401211,
         "name": "奔袭1",
-        "info": "自身朝攻击反方向移动1格；获得【迅捷】，持续2回合\n\n【迅捷】：移动力+1",
+        "info": "自身朝攻击反方向移动1格；获得【迅捷】，持续2回合\r\n\r\n【迅捷】：移动力+1",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -11725,7 +11934,7 @@
     {
         "id": 401221,
         "name": "奔袭2",
-        "info": "自身朝攻击反方向移动1格；获得【迅捷】，持续2回合\n\n【迅捷】：移动力+1",
+        "info": "自身朝攻击反方向移动1格；获得【迅捷】，持续2回合\r\n\r\n【迅捷】：移动力+1",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -11782,7 +11991,7 @@
     {
         "id": 401311,
         "name": "镇魂箭1",
-        "info": "主动攻击后，对目标所在格子及周围1格范围的格子施加【地陷】，持续1回合\n\n【地陷】：若敌军在此格结束行动，随机施加1个减益状态",
+        "info": "主动攻击后，对目标所在格子及周围1格范围的格子施加【地陷】，持续1回合\r\n\r\n【地陷】：若敌军在此格结束行动，随机施加1个减益状态",
         "img": "zhenhunjian",
         "isShow": 1,
         "condition": "602&0&2",
@@ -11820,7 +12029,7 @@
     {
         "id": 401321,
         "name": "镇魂箭2",
-        "info": "主动攻击后，对目标所在格子及周围1格范围的格子施加【地陷】，持续2回合\n\n【地陷】：若敌军在此格结束行动，随机施加1个减益状态",
+        "info": "主动攻击后，对目标所在格子及周围1格范围的格子施加【地陷】，持续2回合\r\n\r\n【地陷】：若敌军在此格结束行动，随机施加1个减益状态",
         "img": "zhenhunjian",
         "isShow": 1,
         "condition": "602&0&2",
@@ -11839,7 +12048,7 @@
     {
         "id": 401331,
         "name": "镇魂箭3",
-        "info": "主动攻击后，对目标所在格子及周围1格范围的格子施加【地陷】，持续3回合\n\n【地陷】：若敌军在此格结束行动，随机施加1个减益状态",
+        "info": "主动攻击后，对目标所在格子及周围1格范围的格子施加【地陷】，持续3回合\r\n\r\n【地陷】：若敌军在此格结束行动，随机施加1个减益状态",
         "img": "zhenhunjian",
         "isShow": 1,
         "condition": "602&0&2",
@@ -11915,7 +12124,7 @@
     {
         "id": 501111,
         "name": "十面埋伏1",
-        "info": "伤害由范围内所有敌军分摊承受；对范围内物防最高的1个敌军施加【破甲1】；该技能可以格子为目标施放。\n\n【破甲】：物防-20%",
+        "info": "伤害由范围内所有敌军分摊承受；对范围内物防最高的1个敌军施加【破甲1】；该技能可以格子为目标施放。\r\n\r\n【破甲】：物防-20%",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -11972,7 +12181,7 @@
     {
         "id": 501121,
         "name": "十面埋伏2",
-        "info": "伤害由范围内所有敌军分摊承受；对范围内物防最高的1个敌军施加【破甲2】；该技能可以格子为目标施放。\n\n【破甲】：物防-20%",
+        "info": "伤害由范围内所有敌军分摊承受；对范围内物防最高的1个敌军施加【破甲2】；该技能可以格子为目标施放。\r\n\r\n【破甲】：物防-20%",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -12029,7 +12238,7 @@
     {
         "id": 501211,
         "name": "十胜天机1",
-        "info": "消耗自身30%的生命（最多降为1）；清除3格范围内其他友军1个减益状态；使自身获得【剑风1】；使用技能后可再次攻击。\n\n【剑风1】：普攻射程+1，持续2回合",
+        "info": "消耗自身30%的生命（最多降为1）；清除3格范围内其他友军1个减益状态；使自身获得【剑风1】；使用技能后可再次攻击。\r\n\r\n【剑风1】：普攻射程+1，持续2回合",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -12143,7 +12352,7 @@
     {
         "id": 501221,
         "name": "十胜天机2",
-        "info": "消耗自身30%的生命（最多降为1）；清除3格范围内其他友军1个减益状态；使自身获得【剑风1】；使用技能后可再移动2格及攻击。\n\n【剑风1】：普攻射程+1，持续2回合",
+        "info": "消耗自身30%的生命（最多降为1）；清除3格范围内其他友军1个减益状态；使自身获得【剑风1】；使用技能后可再移动2格及攻击。\r\n\r\n【剑风1】：普攻射程+1，持续2回合",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -12333,7 +12542,7 @@
     {
         "id": 501511,
         "name": "遗计",
-        "info": "郭嘉阵亡后，使所有其他友军恢复30%生命并获得【遗计】，持续2回合\n【遗计】：暴击率+15%，吸血+30%",
+        "info": "郭嘉阵亡后，使所有其他友军恢复30%生命并获得【遗计】，持续2回合\r\n【遗计】：暴击率+15%，吸血+30%",
         "img": "yiji",
         "isShow": 1,
         "condition": "&",
@@ -12693,9 +12902,9 @@
     },
     {
         "id": 701511,
-        "name": "修罗血",
+        "name": "狂战",
         "info": "每10点怒气使自身攻击+1%",
-        "img": "xiuluoxue",
+        "img": "kuangzhan",
         "isShow": 1,
         "condition": "204&",
         "aim": 1,
@@ -13093,7 +13302,7 @@
     {
         "id": 1001211,
         "name": "断援1",
-        "info": "自身获得【毡甲1】（3回合）、【1策减】（3回合）；对方形1格范围内敌军施加【缠足】（1回合）\n\n【毡甲1】：物理减伤+5%\n【策减1】：策略减伤+5%\n【缠足】：移动力-1",
+        "info": "自身获得【毡甲1】（3回合）、【1策减】（3回合）；对方形1格范围内敌军施加【缠足】（1回合）\r\n\r\n【毡甲1】：物理减伤+5%\r\n【策减1】：策略减伤+5%\r\n【缠足】：移动力-1",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -13150,7 +13359,7 @@
     {
         "id": 1001221,
         "name": "断援2",
-        "info": "自身获得【毡甲2】（3回合）、【策减2】（3回合）；对方形1格范围内敌军施加【缠足】（1回合）\n\n【毡甲2】：物理减伤+10%\n【策减2】：策略减伤+10%\n【缠足】：移动力-1",
+        "info": "自身获得【毡甲2】（3回合）、【策减2】（3回合）；对方形1格范围内敌军施加【缠足】（1回合）\r\n\r\n【毡甲2】：物理减伤+10%\r\n【策减2】：策略减伤+10%\r\n【缠足】：移动力-1",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -13549,7 +13758,7 @@
     {
         "id": 1201211,
         "name": "鼓舞1",
-        "info": "使指定友军获得【鼓舞1】，持续2回合\n\n【鼓舞1】：命中+5%",
+        "info": "使指定友军获得【鼓舞1】，持续2回合\r\n\r\n【鼓舞1】：命中+5%",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -13568,7 +13777,7 @@
     {
         "id": 1201221,
         "name": "鼓舞2",
-        "info": "使指定友军获得【鼓舞2】，持续2回合\n\n【鼓舞2】：命中+10%",
+        "info": "使指定友军获得【鼓舞2】，持续2回合\r\n\r\n【鼓舞2】：命中+10%",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -13587,7 +13796,7 @@
     {
         "id": 1201311,
         "name": "识破1",
-        "info": "行动结束时，获得1层【识破1】\n\n【识破1】：物攻+2%，可叠10层",
+        "info": "行动结束时，获得1层【识破1】\r\n\r\n【识破1】：物攻+2%，可叠10层",
         "img": "shipo",
         "isShow": 1,
         "condition": "702&",
@@ -13625,7 +13834,7 @@
     {
         "id": 1201321,
         "name": "识破2",
-        "info": "行动结束时，获得1层【识破1】\n\n【识破1】：物攻+4%，可叠5层",
+        "info": "行动结束时，获得1层【识破1】\r\n\r\n【识破1】：物攻+4%，可叠5层",
         "img": "shipo",
         "isShow": 1,
         "condition": "702&",
@@ -13663,7 +13872,7 @@
     {
         "id": 1201331,
         "name": "识破3",
-        "info": "行动结束时，获得1层【识破1】\n\n【识破1】：物攻+5%，可叠4层",
+        "info": "行动结束时，获得1层【识破1】\r\n\r\n【识破1】：物攻+5%，可叠4层",
         "img": "shipo",
         "isShow": 1,
         "condition": "702&",
@@ -14176,7 +14385,7 @@
     {
         "id": 1601311,
         "name": "谋胆1",
-        "info": "每次行动结束时，获得1层【谋胆1】\n\n【谋胆1】：物攻+2%；暴击率提升2%；最多3层",
+        "info": "每次行动结束时，获得1层【谋胆1】\r\n\r\n【谋胆1】：物攻+2%；暴击率提升2%；最多3层",
         "img": "moudan",
         "isShow": 1,
         "condition": "702&",
@@ -14214,7 +14423,7 @@
     {
         "id": 1601321,
         "name": "谋胆2",
-        "info": "每次行动结束时，获得1层【谋胆2】\n\n【谋胆2】：物攻+3%；暴击率提升3%；最多3层",
+        "info": "每次行动结束时，获得1层【谋胆2】\r\n\r\n【谋胆2】：物攻+3%；暴击率提升3%；最多3层",
         "img": "moudan",
         "isShow": 1,
         "condition": "702&",
@@ -14252,7 +14461,7 @@
     {
         "id": 1601331,
         "name": "谋胆3",
-        "info": "每次行动结束时，获得1层【谋胆3】\n\n【谋胆3】：物攻+4%；暴击率提升4%；最多3层",
+        "info": "每次行动结束时，获得1层【谋胆3】\r\n\r\n【谋胆3】：物攻+4%；暴击率提升4%；最多3层",
         "img": "moudan",
         "isShow": 1,
         "condition": "702&",
@@ -14499,7 +14708,7 @@
     {
         "id": 1701211,
         "name": "长坂断喝1",
-        "info": "对其施加【胆裂1/2】，持续2回合\n\n【胆裂1】：行动结束时怒气-5",
+        "info": "对其施加【胆裂1/2】，持续2回合\r\n\r\n【胆裂1】：行动结束时怒气-5",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -14537,7 +14746,7 @@
     {
         "id": 1701221,
         "name": "长坂断喝2",
-        "info": "对其施加【胆裂1/2】，持续2回合\n\n【胆裂2】：行动结束时怒气-10",
+        "info": "对其施加【胆裂1/2】，持续2回合\r\n\r\n【胆裂2】：行动结束时怒气-10",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -15316,7 +15525,7 @@
     {
         "id": 1801511,
         "name": "插标卖首",
-        "info": "当敌人对自身3格范围内的友军发动主动攻击，该对战结束后关羽对攻击者施加【插标卖首】\n\n【插标卖首】：关羽的怒气技攻击带有该状态敌人时暴击率+50%，持续2回合",
+        "info": "当敌人对自身3格范围内的友军发动主动攻击，该对战结束后关羽对攻击者施加【插标卖首】\r\n\r\n【插标卖首】：关羽的怒气技攻击带有该状态敌人时暴击率+50%，持续2回合",
         "img": "chabiaomaishou",
         "isShow": 1,
         "condition": "&",
@@ -15357,7 +15566,7 @@
         "info": "【插标卖首】：关羽的怒气技攻击带有该状态敌人时暴击率+50%，持续2回合",
         "img": 1,
         "isShow": 0,
-        "condition": "300&2&1801511",
+        "condition": "300&2&1801511|602&1",
         "aim": 0,
         "percent": 100,
         "node": 7,
@@ -15829,45 +16038,7 @@
     {
         "id": 2001211,
         "name": "天地十字1",
-        "info": "对指定敌军发动2连击，施加【疲惫】，持续2回合",
-        "img": 1,
-        "isShow": 0,
-        "condition": "&",
-        "aim": 0,
-        "percent": 100,
-        "node": 999,
-        "type": 999,
-        "gainvalue": "2001212&2001213",
-        "times_turn": 0,
-        "times_battle": 0,
-        "auroaspineName": "&",
-        "rangeSeid": "&",
-        "seidNameImage": "&",
-        "passivespineName": "&"
-    },
-    {
-        "id": 2001212,
-        "name": "2连1",
-        "info": "2连击",
-        "img": 1,
-        "isShow": 0,
-        "condition": "&",
-        "aim": 0,
-        "percent": 100,
-        "node": 7,
-        "type": 301,
-        "gainvalue": "2&",
-        "times_turn": 0,
-        "times_battle": 0,
-        "auroaspineName": "&",
-        "rangeSeid": "&",
-        "seidNameImage": "&",
-        "passivespineName": "&"
-    },
-    {
-        "id": 2001213,
-        "name": "降物伤1",
-        "info": "并施加【疲惫】",
+        "info": "施加【疲惫】，持续2回合",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -15886,45 +16057,7 @@
     {
         "id": 2001221,
         "name": "天地十字2",
-        "info": "对指定敌军发动2连击，施加【疲惫】，持续2回合",
-        "img": 1,
-        "isShow": 0,
-        "condition": "&",
-        "aim": 0,
-        "percent": 100,
-        "node": 999,
-        "type": 999,
-        "gainvalue": "2001222&2001223",
-        "times_turn": 0,
-        "times_battle": 0,
-        "auroaspineName": "&",
-        "rangeSeid": "&",
-        "seidNameImage": "&",
-        "passivespineName": "&"
-    },
-    {
-        "id": 2001222,
-        "name": "2连2",
-        "info": "2连击",
-        "img": 1,
-        "isShow": 0,
-        "condition": "&",
-        "aim": 0,
-        "percent": 100,
-        "node": 7,
-        "type": 301,
-        "gainvalue": "2&",
-        "times_turn": 0,
-        "times_battle": 0,
-        "auroaspineName": "&",
-        "rangeSeid": "&",
-        "seidNameImage": "&",
-        "passivespineName": "&"
-    },
-    {
-        "id": 2001223,
-        "name": "降物伤2",
-        "info": "并施加【疲惫】",
+        "info": "施加【疲惫】，持续2回合",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -16000,7 +16133,7 @@
     {
         "id": 2001411,
         "name": "桃园结义1",
-        "info": "张飞和关羽每有1人在场，刘备受到伤害后，恢复15%受到伤害量的生命值",
+        "info": "张飞或关羽在场时，若刘备受到伤害，为张飞和关羽恢复伤害量15%的生命",
         "img": "taoyuanjieyi",
         "isShow": 1,
         "condition": "&",
@@ -16008,7 +16141,7 @@
         "percent": 100,
         "node": 999,
         "type": 999,
-        "gainvalue": "2001512&2001513",
+        "gainvalue": "2001412&2001413",
         "times_turn": 0,
         "times_battle": 0,
         "auroaspineName": "&",
@@ -16076,7 +16209,7 @@
     {
         "id": 2001421,
         "name": "桃园结义2",
-        "info": "张飞和关羽每有1人在场，刘备受到伤害后，恢复15%受到伤害量的生命值；若张飞和关羽都不在场，刘备减伤+10%",
+        "info": "张飞或关羽在场时，若刘备受到伤害，为张飞和关羽恢复伤害量15%的生命；若张飞和关羽都不在场，刘备减伤+10%",
         "img": "taoyuanjieyi",
         "isShow": 1,
         "condition": "&",
@@ -16084,7 +16217,7 @@
         "percent": 100,
         "node": 999,
         "type": 999,
-        "gainvalue": "2001512&2001513&2001514",
+        "gainvalue": "2001412&2001413&2001414",
         "times_turn": 0,
         "times_battle": 0,
         "auroaspineName": "&",
@@ -16114,7 +16247,7 @@
     {
         "id": 2101111,
         "name": "一箭穿心1",
-        "info": "对其他目标造成15%的物理伤害，并对所有攻击目标施加【箭毒】\n\n【箭毒】：每移动1格，损失3%的生命，持续2回合",
+        "info": "对其他目标造成15%的物理伤害，并对所有攻击目标施加【箭毒】\r\n\r\n【箭毒】：每移动1格，损失3%的生命，持续2回合",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -16190,7 +16323,7 @@
     {
         "id": 2101121,
         "name": "一箭穿心2",
-        "info": "对其他目标造成15%的物理伤害，并对所有攻击目标施加【箭毒】\n\n【箭毒】：每移动1格，损失1%的生命，持续2回合",
+        "info": "对其他目标造成15%的物理伤害，并对所有攻击目标施加【箭毒】\r\n\r\n【箭毒】：每移动1格，损失1%的生命，持续2回合",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -17083,7 +17216,7 @@
     {
         "id": 2201411,
         "name": "智多近妖1",
-        "info": "免疫【封技】；不会被消除增益状态\n\n【封技】：不可使用怒气技和回合技",
+        "info": "免疫【封技】；不会被消除增益状态\r\n\r\n【封技】：不可使用怒气技和回合技",
         "img": "zhiduojinyao",
         "isShow": 1,
         "condition": "&",
@@ -17140,7 +17273,7 @@
     {
         "id": 2201421,
         "name": "智多近妖2",
-        "info": "免疫【封技】；不会被消除增益状态\n\n【封技】：不可使用怒气技和回合技",
+        "info": "免疫【封技】；不会被消除增益状态\r\n\r\n【封技】：不可使用怒气技和回合技",
         "img": "zhiduojinyao",
         "isShow": 1,
         "condition": "&",
@@ -17482,7 +17615,7 @@
     {
         "id": 2401311,
         "name": "骂阵1",
-        "info": "【愚弄】行动结束后，对2格范围内最多1个敌军部队施加【怒目】\n\n【嘲讽1】：被【怒目】部队视为优先攻击目标",
+        "info": "【愚弄】行动结束后，对2格范围内最多1个敌军部队施加【怒目】\r\n\r\n【嘲讽1】：被【怒目】部队视为优先攻击目标",
         "img": "mazhen",
         "isShow": 1,
         "condition": "&",
@@ -17501,7 +17634,7 @@
     {
         "id": 2401321,
         "name": "骂阵2",
-        "info": "【愚弄】行动结束后，对2格范围内最多2个敌军部队施加【怒目】\n\n【嘲讽2】：被【怒目】部队视为优先攻击目标",
+        "info": "【愚弄】行动结束后，对2格范围内最多2个敌军部队施加【怒目】\r\n\r\n【嘲讽2】：被【怒目】部队视为优先攻击目标",
         "img": "mazhen",
         "isShow": 1,
         "condition": "&",
@@ -17520,7 +17653,7 @@
     {
         "id": 2401331,
         "name": "骂阵3",
-        "info": "【愚弄】行动结束后，对2格范围内最多3个敌军部队施加【怒目】\n\n【嘲讽3】：被【怒目】部队视为优先攻击目标",
+        "info": "【愚弄】行动结束后，对2格范围内最多3个敌军部队施加【怒目】\r\n\r\n【嘲讽3】：被【怒目】部队视为优先攻击目标",
         "img": "mazhen",
         "isShow": 1,
         "condition": "&",
@@ -17539,7 +17672,7 @@
     {
         "id": 2401411,
         "name": "镇守1",
-        "info": "每受到一次攻击，获得【镇守1】；行动开始时清除\n\n【镇守1】：物理与策略减伤+10%；可叠加3层",
+        "info": "每受到一次攻击，获得【镇守1】；行动开始时清除\r\n\r\n【镇守1】：物理与策略减伤+10%；可叠加3层",
         "img": "zhenshou",
         "isShow": 1,
         "condition": "&",
@@ -17615,7 +17748,7 @@
     {
         "id": 2401421,
         "name": "镇守2",
-        "info": "每受到一次攻击，获得【镇守2】；行动开始时清除\n\n【镇守2】：物理与策略减伤+15%；可叠加3层",
+        "info": "每受到一次攻击，获得【镇守2】；行动开始时清除\r\n\r\n【镇守2】：物理与策略减伤+15%；可叠加3层",
         "img": "zhenshou",
         "isShow": 1,
         "condition": "&",
@@ -17691,7 +17824,7 @@
     {
         "id": 2401511,
         "name": "反骨",
-        "info": "攻击时有25%的概率对其施加1层【毒骨】，持续2回合；\n\n【毒骨】：行动结束时，造成施加者物攻4%的真实伤害",
+        "info": "攻击时有25%的概率对其施加1层【毒骨】，持续2回合；\r\n\r\n【毒骨】：行动结束时，造成施加者物攻4%的真实伤害",
         "img": "fangu",
         "isShow": 1,
         "condition": "&",
@@ -17805,7 +17938,7 @@
     {
         "id": 2501311,
         "name": "恶言1",
-        "info": "自身获得【嘲讽】，使自身受到技能治疗效果+10%\n\n【嘲讽1】：被【怒目】部队视为优先攻击目标",
+        "info": "自身获得【嘲讽】，使自身受到技能治疗效果+10%\r\n\r\n【嘲讽1】：被【怒目】部队视为优先攻击目标",
         "img": "eyan",
         "isShow": 1,
         "condition": "&",
@@ -17843,7 +17976,7 @@
     {
         "id": 2501321,
         "name": "恶言2",
-        "info": "自身获得【嘲讽】，使自身受到技能治疗效果+15%\n\n【嘲讽2】：被【怒目】部队视为优先攻击目标",
+        "info": "自身获得【嘲讽】，使自身受到技能治疗效果+15%\r\n\r\n【嘲讽2】：被【怒目】部队视为优先攻击目标",
         "img": "eyan",
         "isShow": 1,
         "condition": "&",
@@ -17881,7 +18014,7 @@
     {
         "id": 2501331,
         "name": "恶言3",
-        "info": "自身获得【嘲讽】，使自身受到技能治疗效果+20%\n\n【嘲讽3】：被【怒目】部队视为优先攻击目标",
+        "info": "自身获得【嘲讽】，使自身受到技能治疗效果+20%\r\n\r\n【嘲讽3】：被【怒目】部队视为优先攻击目标",
         "img": "eyan",
         "isShow": 1,
         "condition": "&",
@@ -18204,7 +18337,7 @@
     {
         "id": 2701111,
         "name": "雪兽突击1",
-        "info": "将敌军击退1格，若击退成功，自身获得【猛攻1】，持续2回合\n\n【猛攻1】：物攻+5%",
+        "info": "将敌军击退1格，若击退成功，自身获得【猛攻1】，持续2回合\r\n\r\n【猛攻1】：物攻+5%",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -18261,7 +18394,7 @@
     {
         "id": 2701121,
         "name": "雪兽突击2",
-        "info": "将敌军击退1格，若击退成功，自身获得【猛攻2】，持续2回合\n\n【猛攻2】：物攻+10%",
+        "info": "将敌军击退1格，若击退成功，自身获得【猛攻2】，持续2回合\r\n\r\n【猛攻2】：物攻+10%",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -18451,7 +18584,7 @@
     {
         "id": 2701411,
         "name": "凤鸣阵1",
-        "info": "行动结束时，若本回合没有发动攻击，自身获得【坚守1】\n\n【坚守1】：物防+4%，持续2回合",
+        "info": "行动结束时，若本回合没有发动攻击，自身获得【坚守1】\r\n\r\n【坚守1】：物防+5%，持续2回合",
         "img": "fengmingzhen",
         "isShow": 1,
         "condition": "704&",
@@ -18470,7 +18603,7 @@
     {
         "id": 2701421,
         "name": "凤鸣阵2",
-        "info": "行动结束时，若本回合没有发动攻击，自身获得【坚守2】\n\n【坚守2】：物防+6%，持续2回合",
+        "info": "行动结束时，若本回合没有发动攻击，自身获得【坚守2】\r\n\r\n【坚守2】：物防+10%，持续2回合",
         "img": "fengmingzhen",
         "isShow": 1,
         "condition": "704&",
@@ -18812,7 +18945,7 @@
     {
         "id": 3001311,
         "name": "连攻1",
-        "info": "回合开始时，30%的概率获得状态【连攻】\n\n【连攻】：普攻变为2连击，持续1回合",
+        "info": "回合开始时，30%的概率获得状态【连攻】\r\n\r\n【连攻】：普攻变为2连击，持续1回合",
         "img": "liangong",
         "isShow": 1,
         "condition": "&",
@@ -18850,7 +18983,7 @@
     {
         "id": 3001321,
         "name": "连攻2",
-        "info": "回合开始时，50%的概率获得状态【连攻】\n\n【连攻】：普攻变为2连击，持续1回合",
+        "info": "回合开始时，50%的概率获得状态【连攻】\r\n\r\n【连攻】：普攻变为2连击，持续1回合",
         "img": "liangong",
         "isShow": 1,
         "condition": "&",
@@ -18869,7 +19002,7 @@
     {
         "id": 3001331,
         "name": "连攻3",
-        "info": "回合开始时，80%的概率获得状态【连攻】\n\n【连攻】：普攻变为2连击，持续1回合",
+        "info": "回合开始时，80%的概率获得状态【连攻】\r\n\r\n【连攻】：普攻变为2连击，持续1回合",
         "img": "liangong",
         "isShow": 1,
         "condition": "&",
@@ -19249,7 +19382,7 @@
     {
         "id": 3201211,
         "name": "以攻代守1",
-        "info": "自身获得【增伤1】、【强化挑衅】\n\n【增伤1】：物理增伤+5%\n【强化挑衅】：将挑衅的范围提升为3格",
+        "info": "自身获得【增伤1】、【强化挑衅】\r\n\r\n【增伤1】：物理增伤+5%\r\n【强化挑衅】：将挑衅的范围提升为3格",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -19268,7 +19401,7 @@
     {
         "id": 3201221,
         "name": "以攻代守2",
-        "info": "自身获得【增伤2】、【强化挑衅】\n\n【增伤2】：物理增伤+10%\n【强化挑衅】：将挑衅的范围提升为3格",
+        "info": "自身获得【增伤2】、【强化挑衅】\r\n\r\n【增伤2】：物理增伤+10%\r\n【强化挑衅】：将挑衅的范围提升为3格",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -19287,7 +19420,7 @@
     {
         "id": 3201311,
         "name": "叫阵1",
-        "info": "【挑衅】行动结束后，对2格范围内最多1个敌军部队施加【怒目】\n\n【嘲讽1】：被【怒目】部队视为优先攻击目标",
+        "info": "【挑衅】行动结束后，对2格范围内最多1个敌军部队施加【怒目】\r\n\r\n【嘲讽1】：被【怒目】部队视为优先攻击目标",
         "img": "jiaozhen",
         "isShow": 1,
         "condition": "&",
@@ -19306,7 +19439,7 @@
     {
         "id": 3201321,
         "name": "叫阵2",
-        "info": "【挑衅】行动结束后，对2格范围内最多2个敌军部队施加【怒目】\n\n【嘲讽2】：被【怒目】部队视为优先攻击目标",
+        "info": "【挑衅】行动结束后，对2格范围内最多2个敌军部队施加【怒目】\r\n\r\n【嘲讽2】：被【怒目】部队视为优先攻击目标",
         "img": "jiaozhen",
         "isShow": 1,
         "condition": "&",
@@ -19325,7 +19458,7 @@
     {
         "id": 3201331,
         "name": "叫阵3",
-        "info": "【挑衅】行动结束后，对2格范围内最多3个敌军部队施加【怒目】\n\n【嘲讽3】：被【怒目】部队视为优先攻击目标",
+        "info": "【挑衅】行动结束后，对2格范围内最多3个敌军部队施加【怒目】\r\n\r\n【嘲讽3】：被【怒目】部队视为优先攻击目标",
         "img": "jiaozhen",
         "isShow": 1,
         "condition": "&",
@@ -19344,7 +19477,7 @@
     {
         "id": 3201411,
         "name": "炎盾1",
-        "info": "攻击燃烧敌军时，攻击+10%；被燃烧敌军攻击时，物理减伤+50%；在反击后施加1层【燃烧】（3回合）\n\n【燃烧】：行动结束时，损失5%的生命",
+        "info": "攻击燃烧敌军时，攻击+10%；被燃烧敌军攻击时，物理减伤+50%；在反击后施加1层【燃烧】（3回合）\r\n\r\n【燃烧】：行动结束时，损失5%的生命",
         "img": "yandun",
         "isShow": 1,
         "condition": "602&3",
@@ -19420,7 +19553,7 @@
     {
         "id": 3201421,
         "name": "炎盾2",
-        "info": "攻击燃烧敌军时，攻击+10%；被燃烧敌军攻击时，物理减伤+50%；在反击后施加1层【燃烧】（3回合）\n\n【燃烧】：行动结束时，损失5%的生命",
+        "info": "攻击燃烧敌军时，攻击+10%；被燃烧敌军攻击时，物理减伤+50%；在反击后施加1层【燃烧】（3回合）\r\n\r\n【燃烧】：行动结束时，损失5%的生命",
         "img": "yandun",
         "isShow": 1,
         "condition": "602&3",
@@ -19496,24 +19629,62 @@
     {
         "id": 3201511,
         "name": "不屈",
-        "info": "在敌方行动阶段，受到致命伤害后，使自身获得【死斗】（1回合）（每场战斗1次）\n\n【死斗】：暴击率+100%，状态结束后死亡；不可被清除",
+        "info": "在敌方行动阶段，受到致命伤害后，使自身获得【死斗】（1回合）（每场战斗1次）\r\n\r\n【死斗】：暴击率+100%，状态结束后死亡；不可被清除",
         "img": "buqu",
         "isShow": 1,
         "condition": "503&",
         "aim": 0,
         "percent": 100,
         "node": 12,
+        "type": 802,
+        "gainvalue": "&",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 3201512,
+        "name": "一次不死",
+        "info": "触发时不死",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 0,
+        "percent": 100,
+        "node": 12,
+        "type": 802,
+        "gainvalue": "&",
+        "times_turn": 0,
+        "times_battle": 1,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 3201513,
+        "name": "加状态",
+        "info": "加不死状态",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 0,
+        "percent": 100,
+        "node": 12,
         "type": 100,
         "gainvalue": "3201511&",
         "times_turn": 0,
-        "times_battle": 0,
+        "times_battle": 1,
         "auroaspineName": "&",
         "rangeSeid": "&",
         "seidNameImage": "buqu",
         "passivespineName": "&"
     },
     {
-        "id": 3201512,
+        "id": 3201514,
         "name": "不屈效果",
         "info": "暴击率+100%，状态结束后死亡；不可被清除",
         "img": 1,
@@ -19532,7 +19703,7 @@
         "passivespineName": "&"
     },
     {
-        "id": 3201513,
+        "id": 3201515,
         "name": "不死",
         "info": "不会死亡",
         "img": 1,
@@ -19540,7 +19711,7 @@
         "condition": "&",
         "aim": 0,
         "percent": 100,
-        "node": 19,
+        "node": 12,
         "type": 802,
         "gainvalue": "&",
         "times_turn": 0,
@@ -19551,7 +19722,7 @@
         "passivespineName": "&"
     },
     {
-        "id": 3201514,
+        "id": 3201516,
         "name": "加暴",
         "info": "暴击率+100%",
         "img": 1,
@@ -19705,7 +19876,7 @@
     {
         "id": 3301211,
         "name": "猛锐冠世1",
-        "info": "使自身获得【猛锐冠世1】，持续2回合，不可驱散\n\n【猛锐冠世1】：使下一次承受的伤害减少30%；受到攻击后消除，消除时对携带者周围2格的敌军造成30%的物理伤害",
+        "info": "使自身获得【猛锐冠世1】，持续2回合，不可驱散\r\n\r\n【猛锐冠世1】：使下一次承受的伤害减少30%；受到攻击后消除，消除时对携带者周围2格的敌军造成30%的物理伤害",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -19724,7 +19895,7 @@
     {
         "id": 3301212,
         "name": "猛锐冠世1效果",
-        "info": "使下一次承受的伤害减少30%；受到攻击后消除，消除时对携带者周围2格的敌军造成30%的物理伤害",
+        "info": "使下一次承受的伤害减少15%；受到攻击后消除，消除时对携带者周围2格的敌军造成30%的物理伤害",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -19743,7 +19914,7 @@
     {
         "id": 3301213,
         "name": "减伤1",
-        "info": "使下一次承受的伤害减少30%",
+        "info": "使下一次承受的伤害减少15%",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -19781,7 +19952,7 @@
     {
         "id": 3301221,
         "name": "猛锐冠世2",
-        "info": "使自身获得【猛锐冠世2】，持续2回合，不可驱散\n\n【猛锐冠世2】：使下一次承受的伤害减少50%；受到攻击后消除，消除时对携带者周围2格的敌军造成45%的物理伤害",
+        "info": "使自身获得【猛锐冠世2】，持续2回合，不可驱散\r\n\r\n【猛锐冠世2】：使下一次承受的伤害减少50%；受到攻击后消除，消除时对携带者周围2格的敌军造成45%的物理伤害",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -19800,7 +19971,7 @@
     {
         "id": 3301222,
         "name": "猛锐冠世2效果",
-        "info": "使下一次承受的伤害减少30%；受到攻击后消除，消除时对携带者周围2格的敌军造成45%的物理伤害",
+        "info": "使下一次承受的伤害减少25%；受到攻击后消除，消除时对携带者周围2格的敌军造成45%的物理伤害",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -19819,7 +19990,7 @@
     {
         "id": 3301223,
         "name": "减伤2",
-        "info": "使下一次承受的伤害减少30%",
+        "info": "使下一次承受的伤害减少25%",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -20028,7 +20199,7 @@
     {
         "id": 3301411,
         "name": "锥形阵1",
-        "info": "行动结束后，若自身在危险范围内，获得【毡甲1】，持续1回合\n【毡甲1】：物理减伤+10%",
+        "info": "行动结束后，若自身在危险范围内，获得【毡甲1】，持续1回合\r\n【毡甲1】：物理减伤+5%",
         "img": "zhuixingzhen",
         "isShow": 1,
         "condition": "500&1",
@@ -20047,7 +20218,7 @@
     {
         "id": 3301421,
         "name": "锥形阵2",
-        "info": "行动结束后，若自身在危险范围内，获得【毡甲2】，持续1回合\n【毡甲2】：物理减伤+15%",
+        "info": "行动结束后，若自身在危险范围内，获得【毡甲2】，持续1回合\r\n【毡甲2】：物理减伤+10%",
         "img": "zhuixingzhen",
         "isShow": 1,
         "condition": "500&1",
@@ -20066,7 +20237,7 @@
     {
         "id": 3301511,
         "name": "临死一击",
-        "info": "受到致命伤害时，立刻发动1次【霸王枪】，并对目标2格范围内的敌军施加1层【燃烧】，随后阵亡\n\n【燃烧】：行动结束时，损失3%的生命",
+        "info": "受到致命伤害时，立刻发动1次【霸王枪】，并对目标2格范围内的敌军施加1层【燃烧】，随后阵亡\r\n\r\n【燃烧】：行动结束时，损失3%的生命",
         "img": "linsiyiji",
         "isShow": 1,
         "condition": "&",
@@ -20237,7 +20408,7 @@
     {
         "id": 3401311,
         "name": "炎凰1",
-        "info": "3格内其他友军主动攻击时，有30%的概率对主目标施加【燃烧】，持续2回合\n\n【燃烧】：行动结束时，损失5%的生命",
+        "info": "3格内其他友军主动攻击时，有30%的概率对主目标施加【燃烧】，持续2回合\r\n\r\n【燃烧】：行动结束时，损失5%的生命",
         "img": "yanhuang",
         "isShow": 1,
         "condition": "602&0&1&2|605&2",
@@ -20256,7 +20427,7 @@
     {
         "id": 3401321,
         "name": "炎凰2",
-        "info": "3格内其他友军主动攻击时，有45%的概率对主目标施加【燃烧】，持续2回合\n\n【燃烧】：行动结束时，损失5%的生命",
+        "info": "3格内其他友军主动攻击时，有45%的概率对主目标施加【燃烧】，持续2回合\r\n\r\n【燃烧】：行动结束时，损失5%的生命",
         "img": "yanhuang",
         "isShow": 1,
         "condition": "602&0&1&2|605&2",
@@ -20275,7 +20446,7 @@
     {
         "id": 3401331,
         "name": "炎凰3",
-        "info": "3格内其他友军主动攻击时，有60%的概率对主目标施加【燃烧】，持续2回合\n\n【燃烧】：行动结束时，损失5%的生命",
+        "info": "3格内其他友军主动攻击时，有60%的概率对主目标施加【燃烧】，持续2回合\r\n\r\n【燃烧】：行动结束时，损失5%的生命",
         "img": "yanhuang",
         "isShow": 1,
         "condition": "602&0&1&2|605&2",
@@ -20294,7 +20465,7 @@
     {
         "id": 3401411,
         "name": "琴音1",
-        "info": "主动攻击后，对主目标所在格子施加【琴音1】\n\n【琴音1】：当敌军在此结束行动后，清除其1个强化效果，持续1回合",
+        "info": "主动攻击后，对主目标所在格子施加【琴音1】\r\n\r\n【琴音1】：当敌军在此结束行动后，清除其1个强化效果，持续1回合",
         "img": "qinyin",
         "isShow": 1,
         "condition": "601&1|605&2",
@@ -20332,7 +20503,7 @@
     {
         "id": 3401421,
         "name": "琴音2",
-        "info": "主动攻击后，对主目标所在格子施加【琴音2】\n\n【琴音2】：当敌军在此结束行动后，清除其1个强化效果，持续2回合",
+        "info": "主动攻击后，对主目标所在格子施加【琴音2】\r\n\r\n【琴音2】：当敌军在此结束行动后，清除其1个强化效果，持续2回合",
         "img": "qinyin",
         "isShow": 1,
         "condition": "601&1|605&2",
@@ -20370,7 +20541,7 @@
     {
         "id": 3401511,
         "name": "羽扇纶巾",
-        "info": "每有一个【燃烧】状态被【焚尽天下】清除或自然结束，周瑜获得20点怒气\n\n【燃烧】：行动结束时，损失5%的生命",
+        "info": "每有一个【燃烧】状态被【焚尽天下】清除或自然结束，周瑜获得20点怒气\r\n\r\n【燃烧】：行动结束时，损失5%的生命",
         "img": "yushanguanjin",
         "isShow": 1,
         "condition": "301&10",
@@ -20834,7 +21005,7 @@
         "percent": 100,
         "node": 8,
         "type": 200,
-        "gainvalue": "11&20&20",
+        "gainvalue": "11&5&5",
         "times_turn": 0,
         "times_battle": 0,
         "auroaspineName": "&",
@@ -20845,7 +21016,7 @@
     {
         "id": 3701111,
         "name": "浪子游世",
-        "info": "使自身获得【浪子】（3回合）【增伤1】；释放技能后可再次行动\n\n【浪子】：攻击后对目标施加1层【燃烧】（3回合）\n【增伤1】：物理增伤+5%\n【燃烧】：行动结束时，损失5%的生命",
+        "info": "使自身获得【浪子】（3回合）【增伤1】；释放技能后可再次行动\r\n\r\n【浪子】：攻击后对目标施加1层【燃烧】（3回合）\r\n【增伤1】：物理增伤+5%\r\n【燃烧】：行动结束时，损失5%的生命",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -20921,7 +21092,7 @@
     {
         "id": 3701121,
         "name": "浪子游世",
-        "info": "使自身获得【浪子】（3回合）【增伤2】；释放技能后可再次行动\n\n【浪子】：攻击后对目标施加1层【燃烧】（3回合）\n【增伤2】：物理增伤+10%\n【燃烧】：行动结束时，损失5%的生命",
+        "info": "使自身获得【浪子】（3回合）【增伤2】；释放技能后可再次行动\r\n\r\n【浪子】：攻击后对目标施加1层【燃烧】（3回合）\r\n【增伤2】：物理增伤+10%\r\n【燃烧】：行动结束时，损失5%的生命",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -21111,7 +21282,7 @@
     {
         "id": 3701311,
         "name": "锦铃1",
-        "info": "行动结束后，使自身获得1层【锦铃】\n\n【锦铃】：物攻+1%；可堆叠5层；堆叠至5层后，转化为【锦帆贼】；不可消除\n【锦帆贼】：物攻+10%；无法获得【锦铃】；不可消除",
+        "info": "行动结束后，使自身获得1层【锦铃】\r\n\r\n【锦铃】：物攻+1%；可堆叠5层；堆叠至5层后，转化为【锦帆贼】；不可消除\r\n【锦帆贼】：物攻+10%；无法获得【锦铃】；不可消除",
         "img": "jinling",
         "isShow": 1,
         "condition": "305&1&3701312",
@@ -21206,7 +21377,7 @@
     {
         "id": 3701321,
         "name": "锦铃2",
-        "info": "行动结束后，使自身获得2层【锦铃】\n\n【锦铃】：物攻+1%；可堆叠5层；堆叠至5层后，转化为【锦帆贼】；不可消除\n【锦帆贼】：物攻+10%；无法获得【锦铃】；不可消除",
+        "info": "行动结束后，使自身获得2层【锦铃】\r\n\r\n【锦铃】：物攻+1%；可堆叠5层；堆叠至5层后，转化为【锦帆贼】；不可消除\r\n【锦帆贼】：物攻+10%；无法获得【锦铃】；不可消除",
         "img": "jinling",
         "isShow": 1,
         "condition": "305&1&3701312",
@@ -21225,7 +21396,7 @@
     {
         "id": 3701331,
         "name": "锦铃3",
-        "info": "行动结束后，使自身获得3层【锦铃】\n\n【锦铃】：物攻+1%；可堆叠5层；堆叠至5层后，转化为【锦帆贼】；不可消除\n【锦帆贼】：物攻+10%；无法获得【锦铃】；不可消除",
+        "info": "行动结束后，使自身获得3层【锦铃】\r\n\r\n【锦铃】：物攻+1%；可堆叠5层；堆叠至5层后，转化为【锦帆贼】；不可消除\r\n【锦帆贼】：物攻+10%；无法获得【锦铃】；不可消除",
         "img": "jinling",
         "isShow": 1,
         "condition": "305&1&3701312",
@@ -21282,7 +21453,7 @@
     {
         "id": 3701511,
         "name": "威吓",
-        "info": "受到带有【燃烧】的敌军攻击时，抗暴+10%\n\n【燃烧】：行动结束时，损失5%的生命",
+        "info": "受到带有【燃烧】的敌军攻击时，抗暴+10%\r\n\r\n【燃烧】：行动结束时，损失5%的生命",
         "img": "weihe",
         "isShow": 1,
         "condition": "300&1&10|605&1&2",
@@ -21565,7 +21736,7 @@
         "passivespineName": "&"
     },
     {
-        "id": 3801411,
+        "id": 3801421,
         "name": "枭姬2",
         "info": "攻击时，目标每损失生命10%生命值，自身暴击率提高2%",
         "img": "xiaoji",
@@ -23695,7 +23866,7 @@
     {
         "id": 4901211,
         "name": "陷阵之志1",
-        "info": "使【揶揄】的效果提升为:自身3格范围内的友军受到主动攻击后，使攻击者获得“怒目”，（每回合3次），自身获得【健壮1】和【复仇】，持续2回合\n【健壮1】：接受治疗效果+5%\n【复仇】：反击时物攻+25%",
+        "info": "使【揶揄】的效果提升为:自身3格范围内的友军受到主动攻击后，使攻击者获得“怒目”，（每回合3次），自身获得【健壮1】和【复仇】，持续2回合\r\n【健壮1】：接受治疗效果+5%\r\n【复仇】：反击时物攻+25%",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -23771,7 +23942,7 @@
     {
         "id": 4901221,
         "name": "陷阵之志2",
-        "info": "使【揶揄】的效果提升为:自身3格范围内的友军受到主动攻击后，使攻击者获得“怒目”，（每回合3次），自身获得【健壮2】和【复仇】，持续2回合\n【健壮2】：接受治疗效果+10%\n【复仇】：反击时物攻+50%",
+        "info": "使【揶揄】的效果提升为:自身3格范围内的友军受到主动攻击后，使攻击者获得“怒目”，（每回合3次），自身获得【健壮2】和【复仇】，持续2回合\r\n【健壮2】：接受治疗效果+10%\r\n【复仇】：反击时物攻+50%",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -23847,7 +24018,7 @@
     {
         "id": 4901311,
         "name": "陷阵营1",
-        "info": "【揶揄1】：自身2格范围内的友军受到主动攻击后，使攻击者获得【怒目】（每回合2次）\n【嘲讽1】：被【怒目】部队视为优先攻击目标",
+        "info": "【揶揄1】：自身2格范围内的友军受到主动攻击后，使攻击者获得【怒目】（每回合2次）\r\n【嘲讽1】：被【怒目】部队视为优先攻击目标",
         "img": "xianzhenying",
         "isShow": 1,
         "condition": "&",
@@ -23904,7 +24075,7 @@
     {
         "id": 4901321,
         "name": "陷阵营2",
-        "info": "【揶揄2】：自身2格范围内的友军受到主动攻击后，使攻击者获得【怒目】（每回合2次）\n【嘲讽2】：被【怒目】部队视为优先攻击目标",
+        "info": "【揶揄2】：自身2格范围内的友军受到主动攻击后，使攻击者获得【怒目】（每回合2次）\r\n【嘲讽2】：被【怒目】部队视为优先攻击目标",
         "img": "xianzhenying",
         "isShow": 1,
         "condition": "&",
@@ -23961,7 +24132,7 @@
     {
         "id": 4901331,
         "name": "陷阵营3",
-        "info": "【揶揄3】：自身2格范围内的友军受到主动攻击后，使攻击者获得【怒目】（每回合2次）\n【嘲讽3】：被【怒目】部队视为优先攻击目标",
+        "info": "【揶揄3】：自身2格范围内的友军受到主动攻击后，使攻击者获得【怒目】（每回合2次）\r\n【嘲讽3】：被【怒目】部队视为优先攻击目标",
         "img": "xianzhenying",
         "isShow": 1,
         "condition": "&",
@@ -24398,7 +24569,7 @@
     {
         "id": 5001411,
         "name": "偃月阵1",
-        "info": "攻击时，有75%的概率对其施加【目眩1】，持续2回合\n\n【目眩1】：命中-5%",
+        "info": "攻击时，有75%的概率对其施加【目眩1】，持续2回合\r\n\r\n【目眩1】：命中-5%",
         "img": "yanyuezhen",
         "isShow": 1,
         "condition": "&",
@@ -24417,7 +24588,7 @@
     {
         "id": 5001421,
         "name": "偃月阵2",
-        "info": "攻击时，有100%的概率对其施加【目眩2】，持续2回合\n\n【目眩2】：命中-10%",
+        "info": "攻击时，有100%的概率对其施加【目眩2】，持续2回合\r\n\r\n【目眩2】：命中-10%",
         "img": "yanyuezhen",
         "isShow": 1,
         "condition": "&",
@@ -24436,7 +24607,7 @@
     {
         "id": 5001511,
         "name": "连战",
-        "info": "击杀敌军后，使自身获得【锐眼2】，持续2回合\n\n【锐眼2】：暴击率+10%",
+        "info": "击杀敌军后，使自身获得【锐眼2】，持续2回合\r\n\r\n【锐眼2】：暴击率+10%",
         "img": "lianzhan",
         "isShow": 1,
         "condition": "&",
@@ -24607,7 +24778,7 @@
     {
         "id": 5101311,
         "name": "毒牙1",
-        "info": "普通攻击时有20%的概率对目标施加【蛇毒】，持续2回合\n\n【蛇毒】：【蛇毒】：行动结束时，造成4%攻击的真实伤害，可堆叠5层",
+        "info": "普通攻击时有20%的概率对目标施加【蛇毒】，持续2回合\r\n\r\n【蛇毒】：【蛇毒】：行动结束时，造成4%攻击的真实伤害，可堆叠5层",
         "img": "duya",
         "isShow": 1,
         "condition": "602&0",
@@ -24626,7 +24797,7 @@
     {
         "id": 5101321,
         "name": "毒牙2",
-        "info": "普通攻击时有40%的概率对目标施加【蛇毒】，持续2回合\n\n【蛇毒】：【蛇毒】：行动结束时，造成4%攻击的真实伤害，可堆叠5层",
+        "info": "普通攻击时有40%的概率对目标施加【蛇毒】，持续2回合\r\n\r\n【蛇毒】：【蛇毒】：行动结束时，造成4%攻击的真实伤害，可堆叠5层",
         "img": "duya",
         "isShow": 1,
         "condition": "602&0",
@@ -24645,7 +24816,7 @@
     {
         "id": 5101331,
         "name": "毒牙3",
-        "info": "普通攻击时有80%的概率对目标施加【蛇毒】，持续2回合\n\n【蛇毒】：【蛇毒】：行动结束时，造成4%攻击的真实伤害，可堆叠5层",
+        "info": "普通攻击时有80%的概率对目标施加【蛇毒】，持续2回合\r\n\r\n【蛇毒】：【蛇毒】：行动结束时，造成4%攻击的真实伤害，可堆叠5层",
         "img": "duya",
         "isShow": 1,
         "condition": "602&0",
@@ -24702,7 +24873,7 @@
     {
         "id": 5101511,
         "name": "毒医",
-        "info": "行动结束时，自身3格范围内每有一个带有【蛇毒】的敌军，恢复自身6%策攻的生命，最多生效5次\n\n【蛇毒】：行动结束时，造成5%策攻的伤害，可堆叠5层",
+        "info": "行动结束时，自身3格范围内每有一个带有【蛇毒】的敌军，恢复自身6%策攻的生命，最多生效5次\r\n\r\n【蛇毒】：行动结束时，造成5%策攻的伤害，可堆叠5层",
         "img": "duyi",
         "isShow": 1,
         "condition": "400&2024&5101213&0",
@@ -24766,8 +24937,8 @@
         "aim": 0,
         "percent": 100,
         "node": 7,
-        "type": 100,
-        "gainvalue": "201&",
+        "type": 107,
+        "gainvalue": "1008&1&201",
         "times_turn": 0,
         "times_battle": 0,
         "auroaspineName": "&",
@@ -24805,7 +24976,7 @@
         "percent": 100,
         "node": 7,
         "type": 100,
-        "gainvalue": "202&",
+        "gainvalue": "1008&1&202",
         "times_turn": 0,
         "times_battle": 0,
         "auroaspineName": "&",
@@ -24930,7 +25101,7 @@
     {
         "id": 5201511,
         "name": "戒备",
-        "info": "回合开始时，若上回合没有攻击，则怒气+40",
+        "info": "回合开始时，若上回合没有攻击，则怒气+10",
         "img": "jiebei",
         "isShow": 1,
         "condition": "701&",
@@ -25063,7 +25234,7 @@
     {
         "id": 5301211,
         "name": "墨守为攻1",
-        "info": "自身获得【墨守】；并使【挑衅】的效果提升为：行动结束时，对3格内最多3个敌军施加【怒目】，持续2回合\n【墨守1】：战斗前，对敌人造成一次自身物攻30%的真实伤害，物防+7%。",
+        "info": "自身获得【墨守】和【强化挑衅】\r\n\r\n【强化挑衅】：使施加怒目的范围提高至3格\r\n【墨守】：战斗前，对敌人造成一次自身物攻10%的真实伤害；持续2回合",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -25071,7 +25242,7 @@
         "percent": 100,
         "node": 7,
         "type": 100,
-        "gainvalue": "5301211&5301212",
+        "gainvalue": "40&5301211",
         "times_turn": 0,
         "times_battle": 0,
         "auroaspineName": "&",
@@ -25081,16 +25252,16 @@
     },
     {
         "id": 5301212,
-        "name": "替换1",
-        "info": "挑衅的范围+1，目标+1",
+        "name": "墨守1效果",
+        "info": "战斗前，对敌人造成一次自身物攻10%的真实伤害",
         "img": 1,
         "isShow": 0,
         "condition": "&",
         "aim": 0,
         "percent": 100,
-        "node": 19,
-        "type": 604,
-        "gainvalue": "5301312&5301213",
+        "node": 16,
+        "type": 999,
+        "gainvalue": "5301213&5301214",
         "times_turn": 0,
         "times_battle": 0,
         "auroaspineName": "&",
@@ -25100,50 +25271,12 @@
     },
     {
         "id": 5301213,
-        "name": "强化挑衅1",
-        "info": "【强化挑衅1】行动结束后，对3格范围内最多3个敌军部队施加【怒目】",
-        "img": 1,
-        "isShow": 0,
-        "condition": "&",
-        "aim": 0,
-        "percent": 100,
-        "node": 15,
-        "type": 107,
-        "gainvalue": "2024&0&1&101&3",
-        "times_turn": 0,
-        "times_battle": 0,
-        "auroaspineName": "&",
-        "rangeSeid": "&",
-        "seidNameImage": "&",
-        "passivespineName": "&"
-    },
-    {
-        "id": 5301214,
-        "name": "墨守1效果",
-        "info": "战斗前，对敌人造成一次自身物攻10%的真实伤害，物防+7%。",
-        "img": 1,
-        "isShow": 0,
-        "condition": "&",
-        "aim": 0,
-        "percent": 100,
-        "node": 16,
-        "type": 999,
-        "gainvalue": "5301215&5301216",
-        "times_turn": 0,
-        "times_battle": 0,
-        "auroaspineName": "&",
-        "rangeSeid": "&",
-        "seidNameImage": "&",
-        "passivespineName": "&"
-    },
-    {
-        "id": 5301215,
         "name": "先攻",
         "info": "战斗前，对敌人造成一次自身物攻10%的真实伤害",
         "img": 1,
         "isShow": 0,
         "condition": "&",
-        "aim": 1,
+        "aim": 0,
         "percent": 100,
         "node": 3,
         "type": 300,
@@ -25156,13 +25289,13 @@
         "passivespineName": "&"
     },
     {
-        "id": 5301216,
+        "id": 5301214,
         "name": "先攻",
         "info": "战斗前，对敌人造成一次自身物攻10%的真实伤害",
         "img": 1,
         "isShow": 0,
         "condition": "&",
-        "aim": 1,
+        "aim": 0,
         "percent": 100,
         "node": 4,
         "type": 300,
@@ -25177,7 +25310,7 @@
     {
         "id": 5301221,
         "name": "墨守为攻2",
-        "info": "自身获得【墨守】；并使【挑衅】的效果提升为：行动结束时，对3格内最多3个敌军施加【怒目】，持续2回合\n【墨守1】：战斗前，对敌人造成一次自身物攻10%的真实伤害，物防+10%。",
+        "info": "自身获得【墨守】和【强化挑衅】\r\n\r\n【强化挑衅】：使施加怒目的范围提高至3格\r\n【墨守】：战斗前，对敌人造成一次自身物攻10%的真实伤害；持续2回合",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -25185,7 +25318,7 @@
         "percent": 100,
         "node": 7,
         "type": 100,
-        "gainvalue": "5301221&5301222",
+        "gainvalue": "40&5301221",
         "times_turn": 0,
         "times_battle": 0,
         "auroaspineName": "&",
@@ -25195,16 +25328,16 @@
     },
     {
         "id": 5301222,
-        "name": "替换2",
-        "info": "挑衅的范围+1，目标+1",
+        "name": "墨守2效果",
+        "info": "战斗前，对敌人造成一次自身物攻10%的真实伤害",
         "img": 1,
         "isShow": 0,
         "condition": "&",
         "aim": 0,
         "percent": 100,
-        "node": 19,
-        "type": 604,
-        "gainvalue": "5301312&5301223",
+        "node": 16,
+        "type": 999,
+        "gainvalue": "5301223&5301224",
         "times_turn": 0,
         "times_battle": 0,
         "auroaspineName": "&",
@@ -25214,44 +25347,6 @@
     },
     {
         "id": 5301223,
-        "name": "强化挑衅2",
-        "info": "【强化挑衅1】行动结束后，对3格范围内最多3个敌军部队施加【怒目】",
-        "img": 1,
-        "isShow": 0,
-        "condition": "&",
-        "aim": 0,
-        "percent": 100,
-        "node": 15,
-        "type": 107,
-        "gainvalue": "2024&0&1&101&3",
-        "times_turn": 0,
-        "times_battle": 0,
-        "auroaspineName": "&",
-        "rangeSeid": "&",
-        "seidNameImage": "jiaozhen",
-        "passivespineName": "&"
-    },
-    {
-        "id": 5301224,
-        "name": "墨守2效果",
-        "info": "战斗前，对敌人造成一次自身物攻10%的真实伤害，物防+10%。",
-        "img": 1,
-        "isShow": 0,
-        "condition": "&",
-        "aim": 0,
-        "percent": 100,
-        "node": 16,
-        "type": 999,
-        "gainvalue": "5301215&5301226",
-        "times_turn": 0,
-        "times_battle": 0,
-        "auroaspineName": "&",
-        "rangeSeid": "&",
-        "seidNameImage": "&",
-        "passivespineName": "&"
-    },
-    {
-        "id": 5301225,
         "name": "先攻",
         "info": "战斗前，对敌人造成一次自身物攻10%的真实伤害",
         "img": 1,
@@ -25270,7 +25365,7 @@
         "passivespineName": "&"
     },
     {
-        "id": 5301226,
+        "id": 5301224,
         "name": "先攻",
         "info": "战斗前，对敌人造成一次自身物攻10%的真实伤害",
         "img": 1,
@@ -25291,7 +25386,7 @@
     {
         "id": 5301311,
         "name": "叫阵1",
-        "info": "【挑衅】行动结束后，对2格范围内最多2个敌军部队施加【怒目】\n【嘲讽1】：被【怒目】部队视为优先攻击目标",
+        "info": "【挑衅】行动结束后，对2格范围内最多1个敌军部队施加【怒目】\r\n【嘲讽1】：被【怒目】部队视为优先攻击目标",
         "img": "jiaozhen",
         "isShow": 1,
         "condition": "&",
@@ -25299,45 +25394,7 @@
         "percent": 100,
         "node": 999,
         "type": 999,
-        "gainvalue": "5301312&5301313",
-        "times_turn": 0,
-        "times_battle": 0,
-        "auroaspineName": "&",
-        "rangeSeid": "&",
-        "seidNameImage": "&",
-        "passivespineName": "&"
-    },
-    {
-        "id": 5301312,
-        "name": "挑衅1",
-        "info": "【挑衅】行动结束后，对2格范围内最多2个敌军部队施加【怒目】",
-        "img": 1,
-        "isShow": 0,
-        "condition": "&",
-        "aim": 1,
-        "percent": 100,
-        "node": 15,
-        "type": 107,
-        "gainvalue": "2012&0&1&101&2",
-        "times_turn": 0,
-        "times_battle": 0,
-        "auroaspineName": "&",
-        "rangeSeid": "&",
-        "seidNameImage": "jiaozhen",
-        "passivespineName": "&"
-    },
-    {
-        "id": 5301313,
-        "name": "嘲讽1",
-        "info": "【嘲讽1】：被【怒目】部队视为优先攻击目标",
-        "img": 1,
-        "isShow": 0,
-        "condition": "&",
-        "aim": 0,
-        "percent": 100,
-        "node": 1,
-        "type": 100,
-        "gainvalue": "2&",
+        "gainvalue": "2&41",
         "times_turn": 0,
         "times_battle": 0,
         "auroaspineName": "&",
@@ -25348,7 +25405,7 @@
     {
         "id": 5301321,
         "name": "叫阵2",
-        "info": "【挑衅】行动结束后，对2格范围内最多2个敌军部队施加【怒目】\n【嘲讽2】：被【怒目】部队视为优先攻击目标",
+        "info": "【挑衅】行动结束后，对2格范围内最多2个敌军部队施加【怒目】\r\n【嘲讽2】：被【怒目】部队视为优先攻击目标",
         "img": "jiaozhen",
         "isShow": 1,
         "condition": "&",
@@ -25356,45 +25413,7 @@
         "percent": 100,
         "node": 999,
         "type": 999,
-        "gainvalue": "5301312&5301323",
-        "times_turn": 0,
-        "times_battle": 0,
-        "auroaspineName": "&",
-        "rangeSeid": "&",
-        "seidNameImage": "&",
-        "passivespineName": "&"
-    },
-    {
-        "id": 5301322,
-        "name": "挑衅2",
-        "info": "【挑衅】行动结束后，对2格范围内最多2个敌军部队施加【怒目】",
-        "img": 1,
-        "isShow": 0,
-        "condition": "&",
-        "aim": 1,
-        "percent": 100,
-        "node": 15,
-        "type": 107,
-        "gainvalue": "2012&0&1&101&2",
-        "times_turn": 0,
-        "times_battle": 0,
-        "auroaspineName": "&",
-        "rangeSeid": "&",
-        "seidNameImage": "jiaozhen",
-        "passivespineName": "&"
-    },
-    {
-        "id": 5301323,
-        "name": "嘲讽2",
-        "info": "【嘲讽2】：被【怒目】部队视为优先攻击目标",
-        "img": 1,
-        "isShow": 0,
-        "condition": "&",
-        "aim": 0,
-        "percent": 100,
-        "node": 1,
-        "type": 100,
-        "gainvalue": "3&",
+        "gainvalue": "2&42",
         "times_turn": 0,
         "times_battle": 0,
         "auroaspineName": "&",
@@ -25405,7 +25424,7 @@
     {
         "id": 5301331,
         "name": "叫阵3",
-        "info": "【挑衅】行动结束后，对2格范围内最多2个敌军部队施加【怒目】\n【嘲讽3】：被【怒目】部队视为优先攻击目标",
+        "info": "【挑衅】行动结束后，对2格范围内最多3个敌军部队施加【怒目】\r\n【嘲讽3】：被【怒目】部队视为优先攻击目标",
         "img": "jiaozhen",
         "isShow": 1,
         "condition": "&",
@@ -25413,45 +25432,7 @@
         "percent": 100,
         "node": 999,
         "type": 999,
-        "gainvalue": "5301312&5301333",
-        "times_turn": 0,
-        "times_battle": 0,
-        "auroaspineName": "&",
-        "rangeSeid": "&",
-        "seidNameImage": "&",
-        "passivespineName": "&"
-    },
-    {
-        "id": 5301332,
-        "name": "挑衅3",
-        "info": "【挑衅】行动结束后，对2格范围内最多2个敌军部队施加【怒目】",
-        "img": 1,
-        "isShow": 0,
-        "condition": "&",
-        "aim": 1,
-        "percent": 100,
-        "node": 15,
-        "type": 107,
-        "gainvalue": "2012&0&1&101&2",
-        "times_turn": 0,
-        "times_battle": 0,
-        "auroaspineName": "&",
-        "rangeSeid": "&",
-        "seidNameImage": "jiaozhen",
-        "passivespineName": "&"
-    },
-    {
-        "id": 5301333,
-        "name": "嘲讽3",
-        "info": "【嘲讽3】：被【怒目】部队视为优先攻击目标",
-        "img": 1,
-        "isShow": 0,
-        "condition": "&",
-        "aim": 0,
-        "percent": 100,
-        "node": 1,
-        "type": 100,
-        "gainvalue": "4&",
+        "gainvalue": "2&43",
         "times_turn": 0,
         "times_battle": 0,
         "auroaspineName": "&",
@@ -25660,7 +25641,7 @@
         "percent": 100,
         "node": 9,
         "type": 210,
-        "gainvalue": "10&",
+        "gainvalue": "5&",
         "times_turn": 0,
         "times_battle": 0,
         "auroaspineName": "&",
@@ -25679,7 +25660,7 @@
         "percent": 100,
         "node": 9,
         "type": 210,
-        "gainvalue": "15&",
+        "gainvalue": "10&",
         "times_turn": 0,
         "times_battle": 0,
         "auroaspineName": "&",
@@ -26431,7 +26412,7 @@
     {
         "id": 5601511,
         "name": "倾国倾城",
-        "info": "受到攻击时，对攻击者施加【倾城】\n\n【倾城】：物防-10%",
+        "info": "受到攻击时，对攻击者施加【倾城】\r\n\r\n【倾城】：物防-10%",
         "img": "qingguoqingcheng",
         "isShow": 1,
         "condition": "605&2",
@@ -26887,7 +26868,7 @@
     {
         "id": 5701411,
         "name": "守寸心1",
-        "info": "格挡率+50%；受到攻击后获得【坚守1】，每回合1次\n\n【坚守1】：物防+4%，持续2回合",
+        "info": "格挡率+50%；受到攻击后获得【坚守1】，每回合1次\r\n\r\n【坚守1】：物防+4%，持续2回合",
         "img": "shoucunxin",
         "isShow": 1,
         "condition": "&",
@@ -26944,7 +26925,7 @@
     {
         "id": 5701421,
         "name": "守寸心2",
-        "info": "格挡率+50%；受到攻击后获得【坚守2】，每回合1次\n\n【坚守2】：物防+6%，持续2回合",
+        "info": "格挡率+50%；受到攻击后获得【坚守2】，每回合1次\r\n\r\n【坚守2】：物防+6%，持续2回合",
         "img": "shoucunxin",
         "isShow": 1,
         "condition": "&",
@@ -27305,7 +27286,7 @@
     {
         "id": 5901511,
         "name": "浴火而鸣",
-        "info": "每受到一次攻击，获得一层【善战】，可堆叠5层，堆叠至5层后，转化为【百战】\n【善战】：攻击+1%，物防+1%\n【百战】：物攻+10%，物防+5%；无法获得【善战】；不可消除",
+        "info": "每受到一次攻击，获得一层【善战】，可堆叠5层，堆叠至5层后，转化为【百战】\r\n【善战】：攻击+1%，物防+1%\r\n【百战】：物攻+10%，物防+5%；无法获得【善战】；不可消除",
         "img": "yuhuoerming",
         "isShow": 1,
         "condition": "303&5901512",
@@ -27476,7 +27457,7 @@
     {
         "id": 6201311,
         "name": "揶揄1",
-        "info": "【揶揄1】：自身2格范围内的友军受到主动攻击后，使攻击者获得【怒目】（每回合2次）\n【嘲讽1】：被【怒目】部队视为优先攻击目标",
+        "info": "【揶揄1】：自身2格范围内的友军受到主动攻击后，使攻击者获得【怒目】（每回合2次）\r\n【嘲讽1】：被【怒目】部队视为优先攻击目标",
         "img": "yeyu",
         "isShow": 1,
         "condition": "&",
@@ -27499,7 +27480,7 @@
         "img": 1,
         "isShow": 0,
         "condition": "604&3",
-        "aim": 1,
+        "aim": 0,
         "percent": 100,
         "node": 14,
         "type": 100,
@@ -27533,7 +27514,7 @@
     {
         "id": 6201321,
         "name": "揶揄2",
-        "info": "【揶揄2】：自身2格范围内的友军受到主动攻击后，使攻击者获得【怒目】（每回合2次）\n【嘲讽2】：被【怒目】部队视为优先攻击目标",
+        "info": "【揶揄2】：自身2格范围内的友军受到主动攻击后，使攻击者获得【怒目】（每回合2次）\r\n【嘲讽2】：被【怒目】部队视为优先攻击目标",
         "img": "yeyu",
         "isShow": 1,
         "condition": "&",
@@ -27556,7 +27537,7 @@
         "img": 1,
         "isShow": 0,
         "condition": "604&3",
-        "aim": 1,
+        "aim": 0,
         "percent": 100,
         "node": 14,
         "type": 100,
@@ -27590,7 +27571,7 @@
     {
         "id": 6201331,
         "name": "揶揄3",
-        "info": "【揶揄3】：自身2格范围内的友军受到主动攻击后，使攻击者获得【怒目】（每回合2次）\n【嘲讽3】：被【怒目】部队视为优先攻击目标",
+        "info": "【揶揄3】：自身2格范围内的友军受到主动攻击后，使攻击者获得【怒目】（每回合2次）\r\n【嘲讽3】：被【怒目】部队视为优先攻击目标",
         "img": "yeyu",
         "isShow": 1,
         "condition": "&",
@@ -27613,7 +27594,7 @@
         "img": 1,
         "isShow": 0,
         "condition": "604&3",
-        "aim": 1,
+        "aim": 0,
         "percent": 100,
         "node": 14,
         "type": 100,
@@ -27902,7 +27883,7 @@
         "percent": 100,
         "node": 16,
         "type": 200,
-        "gainvalue": "4&-100&-100&5&-100&-100&19&10&10&10&10&10",
+        "gainvalue": "20&-15&-15&22&-15&-15&19&10&10&10&10&10",
         "times_turn": 0,
         "times_battle": 0,
         "auroaspineName": "&",
@@ -27940,7 +27921,7 @@
         "percent": 100,
         "node": 16,
         "type": 200,
-        "gainvalue": "4&-50&-50&5&-50&-50&19&20&20&10&20&20",
+        "gainvalue": "20&-10&-10&22&-10&-10&19&20&20&10&20&20",
         "times_turn": 0,
         "times_battle": 0,
         "auroaspineName": "&",
@@ -28426,7 +28407,7 @@
     {
         "id": 101501111,
         "name": "并州狼骑被动1",
-        "info": "每次造成伤害时，获得【加攻1】（本场战斗）\n\n【加攻1】：攻击+1%，可叠加4层；不可驱散",
+        "info": "每次造成伤害时，获得【加攻1】（本场战斗）\r\n\r\n【加攻1】：攻击+1%，可叠加4层；不可驱散",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -28464,7 +28445,7 @@
     {
         "id": 101501121,
         "name": "并州狼骑被动2",
-        "info": "每次造成伤害时，获得【加攻2】（本场战斗）\n\n【加攻2】：攻击+2%，可叠加4层；不可驱散",
+        "info": "每次造成伤害时，获得【加攻2】（本场战斗）\r\n\r\n【加攻2】：攻击+2%，可叠加4层；不可驱散",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -28502,7 +28483,7 @@
     {
         "id": 101501131,
         "name": "并州狼骑被动3",
-        "info": "每次造成伤害时，获得【加攻3】（本场战斗）\n\n【加攻3】：攻击+3%，可叠加4层；不可驱散",
+        "info": "每次造成伤害时，获得【加攻3】（本场战斗）\r\n\r\n【加攻3】：攻击+3%，可叠加4层；不可驱散",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -29031,6 +29012,25 @@
         "seidNameImage": "&",
         "passivespineName": "&"
     },
+    {
+        "id": 111501111,
+        "name": "让石头飞",
+        "info": "对处于【箭塔】地形的敌军普攻造成的伤害变为200%的物理伤害",
+        "img": "qianghua_2",
+        "isShow": 1,
+        "condition": "&",
+        "aim": 0,
+        "percent": 100,
+        "node": 7,
+        "type": 205,
+        "gainvalue": "200&",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
     {
         "id": 201101111,
         "name": "烈爪横扫",
@@ -29129,7 +29129,7 @@
     {
         "id": 201201111,
         "name": "撕咬",
-        "info": "对指定敌军造成220%的物理伤害，随后施加【受治疗效果降低3】\n\n【受治疗效果降低3】：受治疗加成-",
+        "info": "对指定敌军造成220%的物理伤害，随后施加【受治疗效果降低3】\r\n\r\n【受治疗效果降低3】：受治疗加成-",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -29148,7 +29148,7 @@
     {
         "id": 202101211,
         "name": "寂灭魔斩",
-        "info": "对指定敌军造成220%的物理伤害并击退2格；施加状态【重伤】\n\n【重伤】：不可行动，失去对周边格子的控制",
+        "info": "对指定敌军造成220%的物理伤害并击退2格；施加状态【重伤】\r\n\r\n【重伤】：不可行动，失去对周边格子的控制",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -29566,7 +29566,7 @@
     {
         "id": 205101111,
         "name": "锦囊妙计",
-        "info": "在地图上的随机格子刷新5个【伤害锦囊】【治疗锦囊】【神秘锦囊】\n\n【伤害锦囊】：玩家武将行动结束时，对郭嘉造成150%攻击的真实伤害\n【治疗锦囊】：我方武将行动结束时，使郭嘉恢复150%攻击的生命值\n【神秘锦囊】：随机获得一项强力增益状态",
+        "info": "在地图上的随机格子刷新5个【伤害锦囊】【治疗锦囊】【神秘锦囊】\r\n\r\n【伤害锦囊】：玩家武将行动结束时，对郭嘉造成150%攻击的真实伤害\r\n【治疗锦囊】：我方武将行动结束时，使郭嘉恢复150%攻击的生命值\r\n【神秘锦囊】：随机获得一项强力增益状态",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -29642,7 +29642,7 @@
     {
         "id": 205201111,
         "name": "力劈",
-        "info": "施加【怒目】\n\n【怒目】：仅可攻击【嘲讽】目标",
+        "info": "施加【怒目】\r\n\r\n【怒目】：仅可攻击【嘲讽】目标",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -29946,7 +29946,7 @@
     {
         "id": 307301111,
         "name": "护持",
-        "info": "对指定目标释放【护盾】（3回合）\n\n【护盾】：抵挡300威力的伤害",
+        "info": "对指定目标释放【护盾】（3回合）\r\n\r\n【护盾】：抵挡300威力的伤害",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -30022,7 +30022,7 @@
     {
         "id": 310101311,
         "name": "黄天意志",
-        "info": "让场上所有单位在行动开始时，若其菱形1格范围内没有单位，则获得1层【阴气侵蚀】；若其菱形1格范围内每有一个单位，则清除1层【阴气侵蚀】\n\n【阴气侵蚀】：造成的伤害和受到的伤害+2%；",
+        "info": "让场上所有单位在行动开始时，若其菱形1格范围内没有单位，则获得1层【阴气侵蚀】；若其菱形1格范围内每有一个单位，则清除1层【阴气侵蚀】\r\n\r\n【阴气侵蚀】：造成的伤害和受到的伤害+2%；",
         "img": "huangtainyizhi",
         "isShow": 1,
         "condition": "&",
@@ -30250,7 +30250,7 @@
     {
         "id": 320101211,
         "name": "召唤宫女",
-        "info": "召唤两名宫女，随后对在场所有宫女施加1层【魂魄之躯】\n\n【魂魄之躯】：物理减伤+25%",
+        "info": "召唤两名宫女，随后对在场所有宫女施加1层【魂魄之躯】\r\n\r\n【魂魄之躯】：物理减伤+25%",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -30345,7 +30345,7 @@
     {
         "id": 320201311,
         "name": "护主",
-        "info": "行动结束时，若【魂魄之躯】达到4层，牺牲自己，并施加1层【怨恨】\n\n【怨恨】：造成的伤害+25%，受到的伤害+25%",
+        "info": "行动结束时，若【魂魄之躯】达到4层，牺牲自己，并施加1层【怨恨】\r\n\r\n【怨恨】：造成的伤害+25%，受到的伤害+25%",
         "img": "huzhu",
         "isShow": 1,
         "condition": "&",
@@ -30801,7 +30801,7 @@
     {
         "id": 320401411,
         "name": "待宰羔羊",
-        "info": "当鬼兵死亡时，对其周围1圈的目标释放【待宰】。\n\n【待宰】：被视为目标，何进会无条件的攻击你；移动力-1",
+        "info": "当鬼兵死亡时，对其周围1圈的目标释放【待宰】。\r\n\r\n【待宰】：被视为目标，何进会无条件的攻击你；移动力-1",
         "img": "daizaigaoyang",
         "isShow": 1,
         "condition": "&",
@@ -30839,7 +30839,7 @@
     {
         "id": 320501111,
         "name": "惊魂丧胆",
-        "info": "对场上所有单位造成80威力的策略伤害；若目标有【惊魂】，对其施加【定身】\n\n【定身】：无法移动，持续1回合",
+        "info": "对场上所有单位造成80威力的策略伤害；若目标有【惊魂】，对其施加【定身】\r\n\r\n【定身】：无法移动，持续1回合",
         "img": 1,
         "isShow": 0,
         "condition": "300&2&320501411",
@@ -30953,7 +30953,7 @@
     {
         "id": 320501411,
         "name": "惊魂",
-        "info": "我方回合开始时，对随机3个敌军施加【惊魂】\n\n【惊魂】：攻击提高20%，但因恐惧无法攻击幽灵敌军，不可驱散，持续3回合；击杀鬼兵时，获得【壮胆】\n【壮胆】：清除自身的【惊魂】状态，免疫【惊魂】，对幽灵增伤20%",
+        "info": "我方回合开始时，对随机3个敌军施加【惊魂】\r\n\r\n【惊魂】：攻击提高20%，但因恐惧无法攻击幽灵敌军，不可驱散，持续3回合；击杀鬼兵时，获得【壮胆】\r\n【壮胆】：清除自身的【惊魂】状态，免疫【惊魂】，对幽灵增伤20%",
         "img": "jinghun",
         "isShow": 1,
         "condition": "&",
@@ -31257,7 +31257,7 @@
     {
         "id": 330301111,
         "name": "无限幽箭",
-        "info": "对范围内敌军造成120威力的策略伤害；对范围内的格子施加【混沌】\n\n【混沌】：行动结束时，对敌方武将造成1%最大生命值的真实伤害\n【滋润】：攻击+1%，持续整场战斗，不可驱散",
+        "info": "对范围内敌军造成120威力的策略伤害；对范围内的格子施加【混沌】\r\n\r\n【混沌】：行动结束时，对敌方武将造成1%最大生命值的真实伤害\r\n【滋润】：攻击+1%，持续整场战斗，不可驱散",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -31333,7 +31333,7 @@
     {
         "id": 330301311,
         "name": "混沌之雨",
-        "info": "我方回合开始时，对随机3个格子施加【混沌】\n\n【深渊】：行动结束时，对敌方武将造成3%最大生命值的真实伤害",
+        "info": "我方回合开始时，对随机3个格子施加【混沌】\r\n\r\n【深渊】：行动结束时，对敌方武将造成3%最大生命值的真实伤害",
         "img": "hundunzhiyu",
         "isShow": 0,
         "condition": "&",
@@ -31352,7 +31352,7 @@
     {
         "id": 330301411,
         "name": "深渊之力",
-        "info": "回合开始时，若场上的邢者不足3人，将场上随机3个【混沌】变为【深渊】\n\n【深渊】：行动结束时，对敌方武将造成3%最大生命值的真实伤害；对友方施加3层滋润\n【滋润】：攻击+1%，持续整场战斗，不可驱散",
+        "info": "回合开始时，若场上的邢者不足3人，将场上随机3个【混沌】变为【深渊】\r\n\r\n【深渊】：行动结束时，对敌方武将造成3%最大生命值的真实伤害；对友方施加3层滋润\r\n【滋润】：攻击+1%，持续整场战斗，不可驱散",
         "img": "shenyuanzhili",
         "isShow": 0,
         "condition": "&",
@@ -31485,7 +31485,7 @@
     {
         "id": 330501311,
         "name": "无懈可击",
-        "info": "被双手保护时，无法被选中为攻击目标；当双手被击破时，获得【弱点暴露】\n\n【弱点暴露】：每当受到攻击时，获得1层；达到10层时，转化为【虚弱】\n【虚弱】：无法行动；受到的伤害+50%",
+        "info": "被双手保护时，无法被选中为攻击目标；当双手被击破时，获得【弱点暴露】\r\n\r\n【弱点暴露】：每当受到攻击时，获得1层；达到10层时，转化为【虚弱】\r\n【虚弱】：无法行动；受到的伤害+50%",
         "img": "wuxiekeji",
         "isShow": 1,
         "condition": "&",
@@ -31846,7 +31846,7 @@
     {
         "id": 340401311,
         "name": "利爪",
-        "info": "攻击后，50%的概率施加【断筋】\n\n【断筋】：移动力-1",
+        "info": "攻击后，50%的概率施加【断筋】\r\n\r\n【断筋】：移动力-1",
         "img": "lizhua",
         "isShow": 0,
         "condition": "&",
@@ -32207,7 +32207,7 @@
     {
         "id": 350201311,
         "name": "随机应变",
-        "info": "行动开始时；随机获得以下状态中的一个\n\n物理增伤+30%\n物理减伤+50%\n策略减伤+50%",
+        "info": "行动开始时；随机获得以下状态中的一个\r\n\r\n物理增伤+30%\r\n物理减伤+50%\r\n策略减伤+50%",
         "img": "suijiyingbian",
         "isShow": 1,
         "condition": "&",
@@ -32283,7 +32283,7 @@
     {
         "id": 350201411,
         "name": "同生共死",
-        "info": "受到致命伤害时，进入【倒地】状态\n\n【倒地】：无法行动;状态结束时，若场上仍有存活的陈兰，将生命之恢复至30%",
+        "info": "受到致命伤害时，进入【倒地】状态\r\n\r\n【倒地】：无法行动;状态结束时，若场上仍有存活的陈兰，将生命之恢复至30%",
         "img": "tongshenggonsi",
         "isShow": 1,
         "condition": "&",
@@ -32511,7 +32511,7 @@
     {
         "id": 350601111,
         "name": "灵魂吞噬",
-        "info": "吞噬一名阳傀的其所有【神秘残魂】，并将其彻底杀死\n\n【神秘残魂】：造成的伤害+1%；受到的伤害+1%；使尸傀无法被彻底杀死",
+        "info": "吞噬一名阳傀的其所有【神秘残魂】，并将其彻底杀死\r\n\r\n【神秘残魂】：造成的伤害+1%；受到的伤害+1%；使尸傀无法被彻底杀死",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -32682,7 +32682,7 @@
     {
         "id": 350701111,
         "name": "残魂",
-        "info": "被击杀时，扣除袁术5%的生命值；若移动至袁术身边，使袁术获得【狂暴】\n\n【狂暴】：造成的伤害+10%",
+        "info": "被击杀时，扣除袁术5%的生命值；若移动至袁术身边，使袁术获得【狂暴】\r\n\r\n【狂暴】：造成的伤害+10%",
         "img": 1,
         "isShow": 0,
         "condition": "&",
@@ -32736,6 +32736,25 @@
         "seidNameImage": "&",
         "passivespineName": "&"
     },
+    {
+        "id": 360101411,
+        "name": "不可选中",
+        "info": "不可选中",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 0,
+        "percent": 100,
+        "node": 19,
+        "type": 810,
+        "gainvalue": "&",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
     {
         "id": 360201311,
         "name": "墨艺-钢牙",
@@ -33268,6 +33287,158 @@
         "seidNameImage": "&",
         "passivespineName": "&"
     },
+    {
+        "id": 361001211,
+        "name": "佛光万丈",
+        "info": "对全体敌军造成100威力的策略伤害；释放时，若场上有存活的化身，会附加额外效果",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 7,
+        "type": 999,
+        "gainvalue": "361001212&361001213&361001214&361001215&361001218",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 361001212,
+        "name": "生",
+        "info": "恢复自身10%生命值",
+        "img": 1,
+        "isShow": 0,
+        "condition": "300&1&361401111",
+        "aim": 0,
+        "percent": 100,
+        "node": 7,
+        "type": 300,
+        "gainvalue": "6&10&10",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 361001213,
+        "name": "老",
+        "info": "攻击、物防、策防下降10%，持续3回合",
+        "img": 1,
+        "isShow": 0,
+        "condition": "300&1&361501111",
+        "aim": 1,
+        "percent": 100,
+        "node": 9,
+        "type": 100,
+        "gainvalue": "361001213&",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 361001214,
+        "name": "病",
+        "info": "每回合损失10%生命值；持续3回合",
+        "img": 1,
+        "isShow": 0,
+        "condition": "300&1&361601111",
+        "aim": 1,
+        "percent": 100,
+        "node": 9,
+        "type": 100,
+        "gainvalue": "361001214&",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 361001215,
+        "name": "死",
+        "info": "额外造成900威力的策略伤害",
+        "img": 1,
+        "isShow": 0,
+        "condition": "300&1&361701111",
+        "aim": 1,
+        "percent": 100,
+        "node": 7,
+        "type": 300,
+        "gainvalue": "2&900&900",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 361001216,
+        "name": "老效果",
+        "info": "攻击、物防、策防下降10%，持续3回合",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 0,
+        "percent": 100,
+        "node": 16,
+        "type": 200,
+        "gainvalue": "2&-10&-10&4-&10&-10&5&-10&-10",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 361001217,
+        "name": "病效果",
+        "info": "每回合损失10%生命值；持续3回合",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 0,
+        "percent": 100,
+        "node": 15,
+        "type": 300,
+        "gainvalue": "7&5&5",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 361001218,
+        "name": "移除雕像",
+        "info": "使场上其余雕像消失",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 9,
+        "type": 812,
+        "gainvalue": "2004&2005&2006&2007",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
     {
         "id": 361001311,
         "name": "佛印",
@@ -33306,6 +33477,177 @@
         "seidNameImage": "&",
         "passivespineName": "&"
     },
+    {
+        "id": 361001411,
+        "name": "召唤雕像",
+        "info": "在指定位置召唤4尊佛像，佛像存在期间，自身无法受到伤害",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 7,
+        "type": 999,
+        "gainvalue": "361001412&361001416",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 361001412,
+        "name": "生",
+        "info": "召唤生",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 7,
+        "type": 809,
+        "gainvalue": "2004&2005&2006&2007",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 361001413,
+        "name": "老",
+        "info": "召唤老",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 7,
+        "type": 809,
+        "gainvalue": "10&7&3615",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 361001414,
+        "name": "病",
+        "info": "召唤病",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 7,
+        "type": 809,
+        "gainvalue": "2&2&3616",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 361001415,
+        "name": "死",
+        "info": "召唤死",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 7,
+        "type": 809,
+        "gainvalue": "10&2&3617",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 361001416,
+        "name": "护盾",
+        "info": "对自身释放护盾",
+        "img": 1,
+        "isShow": 0,
+        "condition": "303&36100151",
+        "aim": 0,
+        "percent": 100,
+        "node": 15,
+        "type": 100,
+        "gainvalue": "36100141&",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 361001511,
+        "name": "金身",
+        "info": "不可选中",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 0,
+        "percent": 100,
+        "node": 7,
+        "type": 999,
+        "gainvalue": "361001512&361001513",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 361001512,
+        "name": "金身",
+        "info": "不可选中",
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 0,
+        "percent": 100,
+        "node": 7,
+        "type": 810,
+        "gainvalue": "&",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 361001513,
+        "name": "消失",
+        "info": "取消不可选中",
+        "img": 1,
+        "isShow": 0,
+        "condition": "407&998&1",
+        "aim": 0,
+        "percent": 100,
+        "node": 19,
+        "type": 115,
+        "gainvalue": "36100141&",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
     {
         "id": 361101111,
         "name": "释放武将",
@@ -33325,6 +33667,158 @@
         "seidNameImage": "&",
         "passivespineName": "&"
     },
+    {
+        "id": 361401111,
+        "name": "生之祝福",
+        "info": "该化身在场时，明王无法被攻击；似乎会对不动明王产生某种增益效果",
+        "img": "sheng",
+        "isShow": 1,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 21,
+        "type": 107,
+        "gainvalue": "998&0&361401111&108&3610",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 361501111,
+        "name": "老之祝福",
+        "info": "该化身在场时，明王无法被攻击；似乎会对不动明王产生某种增益效果",
+        "img": "lao",
+        "isShow": 1,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 21,
+        "type": 107,
+        "gainvalue": "998&0&361501111&108&3610",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 361601111,
+        "name": "病之祝福",
+        "info": "该化身在场时，明王无法被攻击；似乎会对不动明王产生某种增益效果",
+        "img": "bing",
+        "isShow": 1,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 21,
+        "type": 107,
+        "gainvalue": "998&0&361601111&108&3610",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 361701111,
+        "name": "死之祝福",
+        "info": "该化身在场时，明王无法被攻击；似乎会对不动明王产生某种增益效果",
+        "img": "si",
+        "isShow": 1,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 21,
+        "type": 107,
+        "gainvalue": "998&0&361701111&108&3610",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 361401121,
+        "name": "解除生",
+        "info": 0,
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 12,
+        "type": 123,
+        "gainvalue": "998&0&361401111&108&3610",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 361501121,
+        "name": "解除老",
+        "info": 0,
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 12,
+        "type": 123,
+        "gainvalue": "998&0&361501111&108&3610",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 361601121,
+        "name": "解除病",
+        "info": 0,
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 12,
+        "type": 123,
+        "gainvalue": "998&0&361601111&108&3610",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
+    {
+        "id": 361701121,
+        "name": "解除死",
+        "info": 0,
+        "img": 1,
+        "isShow": 0,
+        "condition": "&",
+        "aim": 1,
+        "percent": 100,
+        "node": 12,
+        "type": 123,
+        "gainvalue": "998&0&361701111&108&3610",
+        "times_turn": 0,
+        "times_battle": 0,
+        "auroaspineName": "&",
+        "rangeSeid": "&",
+        "seidNameImage": "&",
+        "passivespineName": "&"
+    },
     {
         "id": 370101311,
         "name": "猴王",
@@ -33404,7 +33898,7 @@
     {
         "id": 370401311,
         "name": "被动1",
-        "info": "攻击后，对效果范围内的格子施加【瘴气】\n\n【瘴气】：友方在此行动结束时，恢复1%生命值；敌方在此行动结束时，损失1%生命值",
+        "info": "攻击后，对效果范围内的格子施加【瘴气】\r\n\r\n【瘴气】：友方在此行动结束时，恢复1%生命值；敌方在此行动结束时，损失1%生命值",
         "img": "beidong",
         "isShow": 1,
         "condition": "&",
@@ -33537,7 +34031,7 @@
     {
         "id": 370601511,
         "name": "瘴疫传播",
-        "info": "攻击后，对目标所在格子施加【瘴疫】\n\n【瘴疫】：敌方在此行动结束时，损失2%生命值并施加【疫病】\n【疫病】：主属性-2%。可叠加层数不限，持续整场战斗，可驱散",
+        "info": "攻击后，对目标所在格子施加【瘴疫】\r\n\r\n【瘴疫】：敌方在此行动结束时，损失2%生命值并施加【疫病】\r\n【疫病】：主属性-2%。可叠加层数不限，持续整场战斗，可驱散",
         "img": "zhangyichuanbo",
         "isShow": 1,
         "condition": "&",
@@ -33651,7 +34145,7 @@
     {
         "id": 370701211,
         "name": "桃花源",
-        "info": "清除所有异常状态，对所在格子施加【桃花源】\n\n【桃花源】：使自身和方形1格范围的格子获得效果：友方单位行动结束时，恢复1%的生命值，并赋予状态【净化】；敌方单位行动结束时，损失1%生命值\n【净化】：免疫【疫病】；持续时间结束时，对所在格子施加【桃花源】",
+        "info": "清除所有异常状态，对所在格子施加【桃花源】\r\n\r\n【桃花源】：使自身和方形1格范围的格子获得效果：友方单位行动结束时，恢复1%的生命值，并赋予状态【净化】；敌方单位行动结束时，损失1%生命值\r\n【净化】：免疫【疫病】；持续时间结束时，对所在格子施加【桃花源】",
         "img": 1,
         "isShow": 0,
         "condition": "&",