diff --git a/shared/resource/warJsons/6001.json b/shared/resource/warJsons/6001.json
index c9fbe10bc..0be461cdf 100644
--- a/shared/resource/warJsons/6001.json
+++ b/shared/resource/warJsons/6001.json
@@ -7,8 +7,8 @@
         "relation": 0,
         "outIndex": 0,
         "dirction": 2,
-        "x": 15,
-        "y": 10,
+        "x": 11,
+        "y": 12,
         "var": 501,
         "lv": 16,
         "hide": 0,
@@ -27,8 +27,8 @@
         "relation": 0,
         "outIndex": 1,
         "dirction": 2,
-        "x": 14,
-        "y": 10,
+        "x": 10,
+        "y": 12,
         "var": 502,
         "lv": 16,
         "hide": 0,
@@ -47,8 +47,8 @@
         "relation": 0,
         "outIndex": 2,
         "dirction": 2,
-        "x": 17,
-        "y": 12,
+        "x": 10,
+        "y": 13,
         "var": 503,
         "lv": 16,
         "hide": 0,
@@ -67,7 +67,7 @@
         "relation": 0,
         "outIndex": 3,
         "dirction": 2,
-        "x": 17,
+        "x": 9,
         "y": 13,
         "var": 504,
         "lv": 16,
@@ -87,8 +87,8 @@
         "relation": 0,
         "outIndex": 4,
         "dirction": 2,
-        "x": 11,
-        "y": 9,
+        "x": 13,
+        "y": 12,
         "var": 505,
         "lv": 16,
         "hide": 0,
@@ -107,8 +107,8 @@
         "relation": 0,
         "outIndex": 5,
         "dirction": 2,
-        "x": 11,
-        "y": 10,
+        "x": 13,
+        "y": 13,
         "var": 506,
         "lv": 16,
         "hide": 0,
@@ -132,8 +132,8 @@
         "var": 2001,
         "lv": 16,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&9360|2&4290|4&2496|5&1560|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&28080|2&4290|4&2496|5&1560|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -152,8 +152,8 @@
         "var": 2002,
         "lv": 16,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&6435|2&4225|4&1560|5&2080|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&19305|2&4225|4&1560|5&2080|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -172,8 +172,8 @@
         "var": 2003,
         "lv": 16,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&5044|2&3484|4&1196|5&1144|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&15132|2&3484|4&1196|5&1144|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -187,13 +187,13 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 0,
-        "x": 15,
-        "y": 17,
+        "x": 9,
+        "y": 7,
         "var": 2004,
         "lv": 16,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&6435|2&4225|4&1560|5&2080|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&19305|2&4225|4&1560|5&2080|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -207,13 +207,13 @@
         "relation": 2,
         "outIndex": 4,
         "dirction": 0,
-        "x": 16,
-        "y": 18,
+        "x": 10,
+        "y": 6,
         "var": 2005,
         "lv": 16,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&6240|2&2860|4&1664|5&1040|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&18720|2&2860|4&1664|5&1040|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -227,13 +227,13 @@
         "relation": 2,
         "outIndex": 5,
         "dirction": 0,
-        "x": 17,
-        "y": 18,
+        "x": 13,
+        "y": 5,
         "var": 2006,
         "lv": 16,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&6110|2&4485|4&1430|5&1950|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&18330|2&4485|4&1430|5&1950|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -241,219 +241,219 @@
     },
     {
         "warId": 6001,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
+        "actorName": "黄巾弓兵",
+        "actorId": 1045,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 0,
-        "x": 16,
-        "y": 4,
+        "x": 14,
+        "y": 5,
         "var": 2007,
         "lv": 16,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&6240|2&2860|4&1664|5&1040|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&15132|2&3484|4&1196|5&1144|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
     },
     {
-        "warId": 6001,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
+        "warId": 0,
+        "actorName": 0,
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 0,
         "dirction": 0,
-        "x": 11,
-        "y": 2,
-        "var": 2008,
-        "lv": 16,
+        "x": 0,
+        "y": 0,
+        "var": 0,
+        "lv": 0,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&6240|2&2860|4&1664|5&1040|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 0,
+        "attribute": 0,
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
     },
     {
-        "warId": 6001,
-        "actorName": "黄巾弓兵",
-        "actorId": 1045,
-        "dataId": 2009,
-        "relation": 2,
-        "outIndex": 8,
+        "warId": 0,
+        "actorName": 0,
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 0,
         "dirction": 0,
-        "x": 12,
-        "y": 2,
-        "var": 2009,
-        "lv": 16,
+        "x": 0,
+        "y": 0,
+        "var": 0,
+        "lv": 0,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&5044|2&3484|4&1196|5&1144|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 0,
+        "attribute": 0,
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
     },
     {
-        "warId": 6001,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
+        "warId": 0,
+        "actorName": 0,
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 0,
         "dirction": 0,
-        "x": 15,
-        "y": 2,
-        "var": 2010,
-        "lv": 16,
+        "x": 0,
+        "y": 0,
+        "var": 0,
+        "lv": 0,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&6240|2&2860|4&1664|5&1040|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 0,
+        "attribute": 0,
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
     },
     {
-        "warId": 6001,
-        "actorName": "黄巾弓兵",
-        "actorId": 1045,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
+        "warId": 0,
+        "actorName": 0,
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 0,
         "dirction": 0,
-        "x": 16,
-        "y": 2,
-        "var": 2011,
-        "lv": 16,
+        "x": 0,
+        "y": 0,
+        "var": 0,
+        "lv": 0,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&5044|2&3484|4&1196|5&1144|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 0,
+        "attribute": 0,
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
     },
     {
-        "warId": 6001,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
-        "dataId": 2012,
-        "relation": 2,
-        "outIndex": 11,
+        "warId": 0,
+        "actorName": 0,
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 0,
         "dirction": 0,
-        "x": 24,
-        "y": 8,
-        "var": 2012,
-        "lv": 16,
+        "x": 0,
+        "y": 0,
+        "var": 0,
+        "lv": 0,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&6240|2&2860|4&1664|5&1040|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 0,
+        "attribute": 0,
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
     },
     {
-        "warId": 6001,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
+        "warId": 0,
+        "actorName": 0,
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 0,
         "dirction": 0,
-        "x": 25,
-        "y": 8,
-        "var": 2013,
-        "lv": 16,
+        "x": 0,
+        "y": 0,
+        "var": 0,
+        "lv": 0,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&6240|2&2860|4&1664|5&1040|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 0,
+        "attribute": 0,
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
     },
     {
-        "warId": 6001,
-        "actorName": "黄巾弓兵",
-        "actorId": 1045,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
+        "warId": 0,
+        "actorName": 0,
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 0,
         "dirction": 0,
-        "x": 25,
-        "y": 9,
-        "var": 2014,
-        "lv": 16,
+        "x": 0,
+        "y": 0,
+        "var": 0,
+        "lv": 0,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&5044|2&3484|4&1196|5&1144|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 0,
+        "attribute": 0,
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
     },
     {
-        "warId": 6001,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
+        "warId": 0,
+        "actorName": 0,
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 0,
         "dirction": 0,
-        "x": 24,
-        "y": 15,
-        "var": 2015,
-        "lv": 16,
+        "x": 0,
+        "y": 0,
+        "var": 0,
+        "lv": 0,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&6240|2&2860|4&1664|5&1040|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 0,
+        "attribute": 0,
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
     },
     {
-        "warId": 6001,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
+        "warId": 0,
+        "actorName": 0,
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 0,
         "dirction": 0,
-        "x": 25,
-        "y": 15,
-        "var": 2016,
-        "lv": 16,
+        "x": 0,
+        "y": 0,
+        "var": 0,
+        "lv": 0,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&6240|2&2860|4&1664|5&1040|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 0,
+        "attribute": 0,
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
     },
     {
-        "warId": 6001,
-        "actorName": "黄巾术士",
-        "actorId": 1119,
-        "dataId": 2017,
-        "relation": 2,
-        "outIndex": 16,
+        "warId": 0,
+        "actorName": 0,
+        "actorId": 0,
+        "dataId": 0,
+        "relation": 0,
+        "outIndex": 0,
         "dirction": 0,
-        "x": 25,
-        "y": 14,
-        "var": 2017,
-        "lv": 16,
+        "x": 0,
+        "y": 0,
+        "var": 0,
+        "lv": 0,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&6110|2&4485|4&1430|5&1950|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 0,
+        "attribute": 0,
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6002.json b/shared/resource/warJsons/6002.json
index b167a1b03..6156200a5 100644
--- a/shared/resource/warJsons/6002.json
+++ b/shared/resource/warJsons/6002.json
@@ -126,14 +126,14 @@
         "dataId": 1501,
         "relation": 2,
         "outIndex": 0,
-        "dirction": 2,
+        "dirction": 1,
         "x": 11,
-        "y": 12,
+        "y": 13,
         "var": 1501,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&7332|2&5382|4&1716|5&2340|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&97290|2&23805|4&7590|5&10350|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -146,14 +146,14 @@
         "dataId": 1502,
         "relation": 2,
         "outIndex": 1,
-        "dirction": 2,
+        "dirction": 1,
         "x": 9,
-        "y": 11,
+        "y": 12,
         "var": 1502,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6110|2&4485|4&1430|5&1950|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -168,12 +168,12 @@
         "outIndex": 2,
         "dirction": 0,
         "x": 13,
-        "y": 11,
+        "y": 12,
         "var": 1503,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6110|2&4485|4&1430|5&1950|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -186,14 +186,34 @@
         "dataId": 1504,
         "relation": 2,
         "outIndex": 3,
-        "dirction": 2,
+        "dirction": 1,
         "x": 7,
-        "y": 10,
+        "y": 11,
         "var": 1504,
         "lv": 30,
         "hide": 0,
         "initial_ai": 2,
-        "attribute": "1&6110|2&4485|4&1430|5&1950|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6002,
+        "actorName": "宫女亡魂",
+        "actorId": 3202,
+        "dataId": 1505,
+        "relation": 2,
+        "outIndex": 4,
+        "dirction": 2,
+        "x": 15,
+        "y": 11,
+        "var": 1505,
+        "lv": 30,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -206,14 +226,14 @@
         "dataId": 1506,
         "relation": 2,
         "outIndex": 5,
-        "dirction": 2,
-        "x": 4,
+        "dirction": 0,
+        "x": 11,
         "y": 8,
         "var": 1506,
         "lv": 30,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&6110|2&4485|4&1430|5&1950|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -227,13 +247,13 @@
         "relation": 2,
         "outIndex": 6,
         "dirction": 0,
-        "x": 18,
-        "y": 8,
+        "x": 8,
+        "y": 7,
         "var": 1507,
         "lv": 30,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&6110|2&4485|4&1430|5&1950|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -246,114 +266,14 @@
         "dataId": 1508,
         "relation": 2,
         "outIndex": 7,
-        "dirction": 2,
-        "x": 8,
-        "y": 3,
+        "dirction": 1,
+        "x": 14,
+        "y": 7,
         "var": 1508,
         "lv": 30,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&6110|2&4485|4&1430|5&1950|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6002,
-        "actorName": "宫女亡魂",
-        "actorId": 3202,
-        "dataId": 1509,
-        "relation": 2,
-        "outIndex": 8,
-        "dirction": 0,
-        "x": 15,
-        "y": 3,
-        "var": 1509,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&6110|2&4485|4&1430|5&1950|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6002,
-        "actorName": "宫女亡魂",
-        "actorId": 3202,
-        "dataId": 1510,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 2,
-        "x": 4,
-        "y": 6,
-        "var": 1510,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&6110|2&4485|4&1430|5&1950|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6002,
-        "actorName": "宫女亡魂",
-        "actorId": 3202,
-        "dataId": 1511,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 0,
-        "x": 18,
-        "y": 6,
-        "var": 1511,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&6110|2&4485|4&1430|5&1950|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6002,
-        "actorName": "宫女亡魂",
-        "actorId": 3202,
-        "dataId": 1512,
-        "relation": 2,
-        "outIndex": 11,
-        "dirction": 2,
-        "x": 8,
-        "y": 12,
-        "var": 1512,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&6110|2&4485|4&1430|5&1950|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6002,
-        "actorName": "宫女亡魂",
-        "actorId": 3202,
-        "dataId": 1513,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 0,
-        "x": 15,
-        "y": 12,
-        "var": 1513,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&6110|2&4485|4&1430|5&1950|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
diff --git a/shared/resource/warJsons/6003.json b/shared/resource/warJsons/6003.json
index 609c60a8b..8c36b6867 100644
--- a/shared/resource/warJsons/6003.json
+++ b/shared/resource/warJsons/6003.json
@@ -127,13 +127,13 @@
         "relation": 2,
         "outIndex": 0,
         "dirction": 2,
-        "x": 8,
-        "y": 8,
+        "x": 13,
+        "y": 9,
         "var": 1501,
         "lv": 34,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&6890|2&3900|4&1885|5&1690|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -147,13 +147,13 @@
         "relation": 2,
         "outIndex": 1,
         "dirction": 0,
-        "x": 14,
-        "y": 9,
+        "x": 11,
+        "y": 10,
         "var": 1502,
         "lv": 34,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&6890|2&3900|4&1885|5&1690|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -167,13 +167,13 @@
         "relation": 2,
         "outIndex": 2,
         "dirction": 2,
-        "x": 6,
-        "y": 10,
+        "x": 11,
+        "y": 11,
         "var": 1503,
         "lv": 34,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&6890|2&3900|4&1885|5&1690|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -187,13 +187,13 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 0,
-        "x": 14,
+        "x": 5,
         "y": 11,
         "var": 1504,
         "lv": 34,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&6890|2&3900|4&1885|5&1690|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -207,13 +207,13 @@
         "relation": 2,
         "outIndex": 4,
         "dirction": 0,
-        "x": 10,
+        "x": 5,
         "y": 12,
         "var": 1505,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6890|2&3900|4&1885|5&1690|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -227,13 +227,13 @@
         "relation": 2,
         "outIndex": 5,
         "dirction": 0,
-        "x": 3,
-        "y": 13,
+        "x": 4,
+        "y": 9,
         "var": 1506,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6890|2&3900|4&1885|5&1690|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -247,13 +247,13 @@
         "relation": 2,
         "outIndex": 6,
         "dirction": 2,
-        "x": 13,
-        "y": 13,
+        "x": 6,
+        "y": 17,
         "var": 1507,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6890|2&3900|4&1885|5&1690|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -267,113 +267,13 @@
         "relation": 2,
         "outIndex": 7,
         "dirction": 2,
-        "x": 7,
-        "y": 15,
+        "x": 12,
+        "y": 17,
         "var": 1508,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6890|2&3900|4&1885|5&1690|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6003,
-        "actorName": "皇宫禁卫鬼侍",
-        "actorId": 3204,
-        "dataId": 1509,
-        "relation": 2,
-        "outIndex": 8,
-        "dirction": 2,
-        "x": 3,
-        "y": 15,
-        "var": 1509,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&6890|2&3900|4&1885|5&1690|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6003,
-        "actorName": "皇宫禁卫鬼侍",
-        "actorId": 3204,
-        "dataId": 1510,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 0,
-        "x": 12,
-        "y": 16,
-        "var": 1510,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&6890|2&3900|4&1885|5&1690|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6003,
-        "actorName": "皇宫禁卫鬼侍",
-        "actorId": 3204,
-        "dataId": 1511,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 2,
-        "x": 8,
-        "y": 17,
-        "var": 1511,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&6890|2&3900|4&1885|5&1690|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6003,
-        "actorName": "皇宫禁卫鬼侍",
-        "actorId": 3204,
-        "dataId": 1512,
-        "relation": 2,
-        "outIndex": 11,
-        "dirction": 0,
-        "x": 11,
-        "y": 17,
-        "var": 1512,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&6890|2&3900|4&1885|5&1690|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6003,
-        "actorName": "皇宫禁卫鬼侍",
-        "actorId": 3204,
-        "dataId": 1513,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 2,
-        "x": 5,
-        "y": 18,
-        "var": 1513,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&6890|2&3900|4&1885|5&1690|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -383,17 +283,17 @@
         "warId": 6003,
         "actorName": "何进",
         "actorId": 3203,
-        "dataId": 1514,
+        "dataId": 1509,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 8,
         "dirction": 0,
         "x": 9,
-        "y": 19,
-        "var": 1514,
+        "y": 16,
+        "var": 1509,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&9360|2&4290|4&2496|5&1560|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&264600|2&40425|4&23520|5&14700|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
diff --git a/shared/resource/warJsons/6004.json b/shared/resource/warJsons/6004.json
index b22b9d821..93e051c60 100644
--- a/shared/resource/warJsons/6004.json
+++ b/shared/resource/warJsons/6004.json
@@ -132,8 +132,8 @@
         "var": 2001,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&9360|2&4290|4&2496|5&1560|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&421200|2&64350|4&37440|5&23400|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -147,13 +147,13 @@
         "relation": 2,
         "outIndex": 1,
         "dirction": 1,
-        "x": 7,
-        "y": 3,
+        "x": 2,
+        "y": 6,
         "var": 2002,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&7800|2&3575|4&2080|5&1300|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -167,13 +167,13 @@
         "relation": 2,
         "outIndex": 2,
         "dirction": 1,
-        "x": 7,
-        "y": 7,
+        "x": 2,
+        "y": 4,
         "var": 2003,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&7800|2&3575|4&2080|5&1300|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -187,13 +187,13 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 1,
-        "x": 10,
-        "y": 3,
+        "x": 5,
+        "y": 7,
         "var": 2004,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&7800|2&3575|4&2080|5&1300|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -207,13 +207,13 @@
         "relation": 2,
         "outIndex": 4,
         "dirction": 1,
-        "x": 10,
+        "x": 6,
         "y": 7,
         "var": 2005,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&7800|2&3575|4&2080|5&1300|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -227,13 +227,13 @@
         "relation": 2,
         "outIndex": 5,
         "dirction": 1,
-        "x": 13,
+        "x": 10,
         "y": 3,
         "var": 2006,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&7800|2&3575|4&2080|5&1300|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -247,13 +247,73 @@
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 13,
-        "y": 7,
+        "x": 10,
+        "y": 2,
         "var": 2007,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&7800|2&3575|4&2080|5&1300|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6004,
+        "actorName": "黄巾鬼卒",
+        "actorId": 3304,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 10,
+        "y": 6,
+        "var": 2008,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6004,
+        "actorName": "黄巾鬼卒",
+        "actorId": 3304,
+        "dataId": 2009,
+        "relation": 2,
+        "outIndex": 8,
+        "dirction": 1,
+        "x": 10,
+        "y": 7,
+        "var": 2009,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6004,
+        "actorName": "黄巾鬼卒",
+        "actorId": 3304,
+        "dataId": 2010,
+        "relation": 2,
+        "outIndex": 9,
+        "dirction": 1,
+        "x": 11,
+        "y": 7,
+        "var": 2010,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
diff --git a/shared/resource/warJsons/6005.json b/shared/resource/warJsons/6005.json
index cf3f67cf1..74d2dd17c 100644
--- a/shared/resource/warJsons/6005.json
+++ b/shared/resource/warJsons/6005.json
@@ -127,13 +127,13 @@
         "relation": 2,
         "outIndex": 0,
         "dirction": 1,
-        "x": 3,
-        "y": 5,
+        "x": 2,
+        "y": 7,
         "var": 2001,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&32430|2&23805|4&7590|5&10350|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&592200|2&144900|4&46200|5&63000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -147,13 +147,13 @@
         "relation": 2,
         "outIndex": 1,
         "dirction": 1,
-        "x": 7,
-        "y": 5,
+        "x": 2,
+        "y": 8,
         "var": 2002,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&28462|2&18687|4&6900|5&9200|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&519750|2&113750|4&42000|5&56000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -167,13 +167,13 @@
         "relation": 2,
         "outIndex": 2,
         "dirction": 1,
-        "x": 7,
-        "y": 6,
+        "x": 3,
+        "y": 8,
         "var": 2003,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&28462|2&18687|4&6900|5&9200|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&519750|2&113750|4&42000|5&56000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -187,13 +187,153 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 1,
-        "x": 7,
-        "y": 4,
+        "x": 2,
+        "y": 3,
         "var": 2004,
         "lv": 20,
         "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&519750|2&113750|4&42000|5&56000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6005,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2005,
+        "relation": 2,
+        "outIndex": 4,
+        "dirction": 1,
+        "x": 3,
+        "y": 2,
+        "var": 2005,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&519750|2&113750|4&42000|5&56000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6005,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2006,
+        "relation": 2,
+        "outIndex": 5,
+        "dirction": 1,
+        "x": 5,
+        "y": 6,
+        "var": 2006,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&519750|2&113750|4&42000|5&56000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6005,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 5,
+        "y": 4,
+        "var": 2007,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&519750|2&113750|4&42000|5&56000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6005,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 6,
+        "y": 8,
+        "var": 2008,
+        "lv": 20,
+        "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&28462|2&18687|4&6900|5&9200|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&519750|2&113750|4&42000|5&56000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6005,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2009,
+        "relation": 2,
+        "outIndex": 8,
+        "dirction": 1,
+        "x": 6,
+        "y": 5,
+        "var": 2009,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&519750|2&113750|4&42000|5&56000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6005,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2010,
+        "relation": 2,
+        "outIndex": 9,
+        "dirction": 1,
+        "x": 6,
+        "y": 4,
+        "var": 2010,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&519750|2&113750|4&42000|5&56000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6005,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2011,
+        "relation": 2,
+        "outIndex": 10,
+        "dirction": 1,
+        "x": 7,
+        "y": 8,
+        "var": 2011,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&519750|2&113750|4&42000|5&56000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
diff --git a/shared/resource/warJsons/6006.json b/shared/resource/warJsons/6006.json
index 61f92a5d3..d785d67c5 100644
--- a/shared/resource/warJsons/6006.json
+++ b/shared/resource/warJsons/6006.json
@@ -7,8 +7,8 @@
         "relation": 0,
         "outIndex": 0,
         "dirction": 1,
-        "x": 8,
-        "y": 2,
+        "x": 4,
+        "y": 3,
         "var": 501,
         "lv": 20,
         "hide": 0,
@@ -30,7 +30,7 @@
         "relation": 0,
         "outIndex": 1,
         "dirction": 1,
-        "x": 8,
+        "x": 5,
         "y": 3,
         "var": 502,
         "lv": 20,
@@ -53,8 +53,8 @@
         "relation": 0,
         "outIndex": 2,
         "dirction": 1,
-        "x": 8,
-        "y": 4,
+        "x": 6,
+        "y": 3,
         "var": 503,
         "lv": 20,
         "hide": 0,
@@ -77,7 +77,7 @@
         "outIndex": 3,
         "dirction": 0,
         "x": 8,
-        "y": 6,
+        "y": 3,
         "var": 504,
         "lv": 20,
         "hide": 0,
@@ -99,8 +99,8 @@
         "relation": 0,
         "outIndex": 4,
         "dirction": 0,
-        "x": 8,
-        "y": 7,
+        "x": 9,
+        "y": 3,
         "var": 505,
         "lv": 20,
         "hide": 0,
@@ -122,8 +122,8 @@
         "relation": 0,
         "outIndex": 5,
         "dirction": 0,
-        "x": 8,
-        "y": 8,
+        "x": 10,
+        "y": 3,
         "var": 506,
         "lv": 20,
         "hide": 0,
@@ -139,19 +139,19 @@
     },
     {
         "warId": 6006,
-        "actorName": "乌桓使者",
-        "actorId": 3402,
+        "actorName": "图吉",
+        "actorId": 3404,
         "dataId": 2001,
         "relation": 2,
         "outIndex": 0,
         "dirction": 0,
-        "x": 11,
-        "y": 5,
+        "x": 7,
+        "y": 7,
         "var": 2001,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 7,
-        "attribute": "1&34155|2&22425|4&8280|5&11040|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&810000|2&123750|4&72000|5&45000|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -162,19 +162,19 @@
     },
     {
         "warId": 6006,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "狼图腾",
+        "actorId": 3409,
         "dataId": 2002,
         "relation": 2,
         "outIndex": 1,
-        "dirction": 0,
-        "x": 13,
-        "y": 3,
+        "dirction": 1,
+        "x": 3,
+        "y": 2,
         "var": 2002,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&25760|2&15180|4&5750|5&5290|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&573750|2&114375|4&33750|5&31875|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -185,19 +185,19 @@
     },
     {
         "warId": 6006,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "狼图腾",
+        "actorId": 3409,
         "dataId": 2003,
         "relation": 2,
         "outIndex": 2,
-        "dirction": 0,
-        "x": 13,
-        "y": 8,
+        "dirction": 2,
+        "x": 11,
+        "y": 2,
         "var": 2003,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&25760|2&15180|4&5750|5&5290|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&573750|2&114375|4&33750|5&31875|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -208,19 +208,19 @@
     },
     {
         "warId": 6006,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "狼图腾",
+        "actorId": 3409,
         "dataId": 2004,
         "relation": 2,
         "outIndex": 3,
-        "dirction": 0,
-        "x": 18,
-        "y": 3,
+        "dirction": 3,
+        "x": 7,
+        "y": 5,
         "var": 2004,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&25760|2&15180|4&5750|5&5290|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&573750|2&114375|4&33750|5&31875|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -231,19 +231,19 @@
     },
     {
         "warId": 6006,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "狼图腾",
+        "actorId": 3409,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
-        "dirction": 0,
-        "x": 18,
+        "dirction": 4,
+        "x": 3,
         "y": 8,
         "var": 2005,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&25760|2&15180|4&5750|5&5290|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&573750|2&114375|4&33750|5&31875|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -254,19 +254,19 @@
     },
     {
         "warId": 6006,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "狼图腾",
+        "actorId": 3409,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
-        "dirction": 0,
-        "x": 22,
-        "y": 3,
+        "dirction": 5,
+        "x": 11,
+        "y": 8,
         "var": 2006,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&25760|2&15180|4&5750|5&5290|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&573750|2&114375|4&33750|5&31875|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -277,19 +277,19 @@
     },
     {
         "warId": 6006,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "巨狼勇士",
+        "actorId": 1134,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 0,
-        "x": 22,
-        "y": 8,
+        "x": 3,
+        "y": 6,
         "var": 2007,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&25760|2&15180|4&5750|5&5290|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&675000|2&103125|4&60000|5&37500|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -300,19 +300,19 @@
     },
     {
         "warId": 6006,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "巨狼勇士",
+        "actorId": 1134,
         "dataId": 2008,
         "relation": 2,
         "outIndex": 7,
         "dirction": 0,
-        "x": 27,
-        "y": 3,
+        "x": 11,
+        "y": 6,
         "var": 2008,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&25760|2&15180|4&5750|5&5290|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&675000|2&103125|4&60000|5&37500|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -323,19 +323,19 @@
     },
     {
         "warId": 6006,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "乌桓萨满",
+        "actorId": 1532,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 0,
-        "x": 27,
+        "x": 5,
         "y": 8,
         "var": 2009,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&25760|2&15180|4&5750|5&5290|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&423000|2&103500|4&33000|5&45000|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -343,5 +343,28 @@
         "bossStage": 0,
         "bloodShow": "1&0",
         "dest_point": 0
+    },
+    {
+        "warId": 6006,
+        "actorName": "乌桓萨满",
+        "actorId": 1532,
+        "dataId": 2010,
+        "relation": 2,
+        "outIndex": 9,
+        "dirction": 0,
+        "x": 9,
+        "y": 8,
+        "var": 2010,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&423000|2&103500|4&33000|5&45000|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bossStage": 0,
+        "bloodShow": 0,
+        "dest_point": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6007.json b/shared/resource/warJsons/6007.json
index 937d59509..df2a9c0c5 100644
--- a/shared/resource/warJsons/6007.json
+++ b/shared/resource/warJsons/6007.json
@@ -133,19 +133,19 @@
     },
     {
         "warId": 6007,
-        "actorName": "弓贼",
-        "actorId": 3502,
+        "actorName": "陈兰",
+        "actorId": 3504,
         "dataId": 2001,
         "relation": 2,
         "outIndex": 0,
         "dirction": 1,
-        "x": 7,
-        "y": 9,
+        "x": 5,
+        "y": 8,
         "var": 2001,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&27887|2&19262|4&6612|5&6325|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&939690|2&177300|4&85695|5&76830|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -155,19 +155,19 @@
     },
     {
         "warId": 6007,
-        "actorName": "雷绪",
-        "actorId": 3501,
+        "actorName": "陈兰",
+        "actorId": 3504,
         "dataId": 2002,
         "relation": 2,
         "outIndex": 1,
         "dirction": 1,
         "x": 7,
-        "y": 7,
+        "y": 8,
         "var": 2002,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&33465|2&23115|4&7935|5&7590|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&939690|2&177300|4&85695|5&76830|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -177,19 +177,19 @@
     },
     {
         "warId": 6007,
-        "actorName": "弓贼",
-        "actorId": 3502,
+        "actorName": "陈兰",
+        "actorId": 3504,
         "dataId": 2003,
         "relation": 2,
         "outIndex": 2,
         "dirction": 1,
-        "x": 7,
-        "y": 11,
+        "x": 9,
+        "y": 8,
         "var": 2003,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&27887|2&19262|4&6612|5&6325|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&939690|2&177300|4&85695|5&76830|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -199,24 +199,134 @@
     },
     {
         "warId": 6007,
-        "actorName": "弓贼",
-        "actorId": 3502,
+        "actorName": "山贼",
+        "actorId": 1012,
         "dataId": 2004,
         "relation": 2,
         "outIndex": 3,
         "dirction": 1,
-        "x": 7,
-        "y": 13,
+        "x": 4,
+        "y": 6,
         "var": 2004,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&27887|2&19262|4&6612|5&6325|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "attribute": "1&709200|2&108350|4&63040|5&39400|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
         "skill": 0,
         "seid": 0,
         "star": 0,
         "spine": 0,
         "bossStage": 0,
         "bloodShow": "1&0"
+    },
+    {
+        "warId": 6007,
+        "actorName": "山贼",
+        "actorId": 1012,
+        "dataId": 2005,
+        "relation": 2,
+        "outIndex": 4,
+        "dirction": 1,
+        "x": 7,
+        "y": 5,
+        "var": 2005,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&709200|2&108350|4&63040|5&39400|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bossStage": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6007,
+        "actorName": "山贼",
+        "actorId": 1012,
+        "dataId": 2006,
+        "relation": 2,
+        "outIndex": 5,
+        "dirction": 1,
+        "x": 10,
+        "y": 6,
+        "var": 2006,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&709200|2&108350|4&63040|5&39400|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bossStage": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6007,
+        "actorName": "山贼弓兵",
+        "actorId": 1042,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 6,
+        "y": 7,
+        "var": 2007,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&573270|2&131990|4&45310|5&43340|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bossStage": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6007,
+        "actorName": "山贼弓兵",
+        "actorId": 1042,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 8,
+        "y": 7,
+        "var": 2008,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&573270|2&131990|4&45310|5&43340|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bossStage": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6007,
+        "actorName": "山贼头目",
+        "actorId": 1043,
+        "dataId": 2009,
+        "relation": 2,
+        "outIndex": 8,
+        "dirction": 1,
+        "x": 7,
+        "y": 7,
+        "var": 2009,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&1063800|2&162525|4&94560|5&59100|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bossStage": 0,
+        "bloodShow": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6008.json b/shared/resource/warJsons/6008.json
index dad4c5724..dd1755d9d 100644
--- a/shared/resource/warJsons/6008.json
+++ b/shared/resource/warJsons/6008.json
@@ -133,13 +133,13 @@
         "relation": 2,
         "outIndex": 0,
         "dirction": 0,
-        "x": 15,
+        "x": 17,
         "y": 7,
         "var": 2001,
         "lv": 70,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&41400|2&18975|4&11040|5&6900|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&1609200|2&245850|4&143040|5&89400|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -154,13 +154,13 @@
         "relation": 2,
         "outIndex": 1,
         "dirction": 1,
-        "x": 13,
+        "x": 15,
         "y": 6,
         "var": 2002,
         "lv": 70,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&27025|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&1050450|2&257025|4&81950|5&111750|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -175,13 +175,13 @@
         "relation": 2,
         "outIndex": 2,
         "dirction": 1,
-        "x": 13,
+        "x": 15,
         "y": 8,
         "var": 2003,
         "lv": 70,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&28462|2&18687|4&6900|5&9200|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&1106325|2&242125|4&89400|5&119200|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -196,13 +196,13 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 0,
-        "x": 15,
+        "x": 17,
         "y": 6,
         "var": 2004,
         "lv": 70,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&27600|2&18400|4&6037|5&9775|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&1072800|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -217,17 +217,185 @@
         "relation": 2,
         "outIndex": 4,
         "dirction": 0,
-        "x": 15,
+        "x": 17,
         "y": 8,
         "var": 2005,
         "lv": 70,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&27600|2&18400|4&6037|5&9775|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&1072800|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
         "skill": 0,
         "seid": 0,
         "star": 0,
         "spine": 0,
         "bloodShow": "0&1"
+    },
+    {
+        "warId": 6008,
+        "actorName": "兵家学子",
+        "actorId": 3606,
+        "dataId": 2006,
+        "relation": 2,
+        "outIndex": 5,
+        "dirction": 1,
+        "x": 9,
+        "y": 9,
+        "var": 2006,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1050450|2&257025|4&81950|5&111750|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6008,
+        "actorName": "儒家学子",
+        "actorId": 3607,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 9,
+        "y": 11,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1106325|2&242125|4&89400|5&119200|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6008,
+        "actorName": "墨家学子",
+        "actorId": 3608,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 0,
+        "x": 1,
+        "y": 9,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1072800|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6008,
+        "actorName": "医家学子",
+        "actorId": 3609,
+        "dataId": 2009,
+        "relation": 2,
+        "outIndex": 8,
+        "dirction": 0,
+        "x": 1,
+        "y": 11,
+        "var": 2009,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1072800|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6008,
+        "actorName": "兵家学子",
+        "actorId": 3606,
+        "dataId": 2010,
+        "relation": 2,
+        "outIndex": 9,
+        "dirction": 1,
+        "x": 8,
+        "y": 5,
+        "var": 2010,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1050450|2&257025|4&81950|5&111750|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6008,
+        "actorName": "儒家学子",
+        "actorId": 3607,
+        "dataId": 2011,
+        "relation": 2,
+        "outIndex": 10,
+        "dirction": 1,
+        "x": 8,
+        "y": 3,
+        "var": 2011,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1106325|2&242125|4&89400|5&119200|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6008,
+        "actorName": "墨家学子",
+        "actorId": 3608,
+        "dataId": 2012,
+        "relation": 2,
+        "outIndex": 11,
+        "dirction": 0,
+        "x": 10,
+        "y": 5,
+        "var": 2012,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1072800|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6008,
+        "actorName": "医家学子",
+        "actorId": 3609,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 0,
+        "x": 10,
+        "y": 3,
+        "var": 2013,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1072800|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6009.json b/shared/resource/warJsons/6009.json
index 33ad103eb..0da451407 100644
--- a/shared/resource/warJsons/6009.json
+++ b/shared/resource/warJsons/6009.json
@@ -7,8 +7,8 @@
         "relation": 0,
         "outIndex": 0,
         "dirction": 2,
-        "x": 15,
-        "y": 10,
+        "x": 11,
+        "y": 12,
         "var": 501,
         "lv": 16,
         "hide": 0,
@@ -27,8 +27,8 @@
         "relation": 0,
         "outIndex": 1,
         "dirction": 2,
-        "x": 14,
-        "y": 10,
+        "x": 10,
+        "y": 12,
         "var": 502,
         "lv": 16,
         "hide": 0,
@@ -47,8 +47,8 @@
         "relation": 0,
         "outIndex": 2,
         "dirction": 2,
-        "x": 17,
-        "y": 12,
+        "x": 10,
+        "y": 13,
         "var": 503,
         "lv": 16,
         "hide": 0,
@@ -67,7 +67,7 @@
         "relation": 0,
         "outIndex": 3,
         "dirction": 2,
-        "x": 17,
+        "x": 9,
         "y": 13,
         "var": 504,
         "lv": 16,
@@ -87,8 +87,8 @@
         "relation": 0,
         "outIndex": 4,
         "dirction": 2,
-        "x": 11,
-        "y": 9,
+        "x": 13,
+        "y": 12,
         "var": 505,
         "lv": 16,
         "hide": 0,
@@ -107,8 +107,8 @@
         "relation": 0,
         "outIndex": 5,
         "dirction": 2,
-        "x": 11,
-        "y": 10,
+        "x": 13,
+        "y": 13,
         "var": 506,
         "lv": 16,
         "hide": 0,
@@ -132,8 +132,8 @@
         "var": 2001,
         "lv": 16,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&88200|2&40425|4&23520|5&14700|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&28080|2&4290|4&2496|5&1560|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -152,8 +152,8 @@
         "var": 2002,
         "lv": 16,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&60637|2&39812|4&14700|5&19600|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&19305|2&4225|4&1560|5&2080|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -172,8 +172,8 @@
         "var": 2003,
         "lv": 16,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&47530|2&32830|4&11270|5&10780|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&15132|2&3484|4&1196|5&1144|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -187,13 +187,13 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 0,
-        "x": 15,
-        "y": 17,
+        "x": 9,
+        "y": 7,
         "var": 2004,
         "lv": 16,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&60637|2&39812|4&14700|5&19600|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "attribute": "1&19305|2&4225|4&1560|5&2080|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -207,13 +207,13 @@
         "relation": 2,
         "outIndex": 4,
         "dirction": 0,
-        "x": 16,
-        "y": 18,
+        "x": 10,
+        "y": 6,
         "var": 2005,
         "lv": 16,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&58800|2&26950|4&15680|5&9800|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "attribute": "1&18720|2&2860|4&1664|5&1040|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -227,13 +227,13 @@
         "relation": 2,
         "outIndex": 5,
         "dirction": 0,
-        "x": 17,
-        "y": 18,
+        "x": 13,
+        "y": 5,
         "var": 2006,
         "lv": 16,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&57575|2&42262|4&13475|5&18375|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "attribute": "1&18330|2&4485|4&1430|5&1950|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -241,219 +241,19 @@
     },
     {
         "warId": 6009,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
+        "actorName": "黄巾弓兵",
+        "actorId": 1045,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 0,
-        "x": 16,
-        "y": 4,
+        "x": 14,
+        "y": 5,
         "var": 2007,
         "lv": 16,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&58800|2&26950|4&15680|5&9800|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6009,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 0,
-        "x": 11,
-        "y": 2,
-        "var": 2008,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&58800|2&26950|4&15680|5&9800|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6009,
-        "actorName": "黄巾弓兵",
-        "actorId": 1045,
-        "dataId": 2009,
-        "relation": 2,
-        "outIndex": 8,
-        "dirction": 0,
-        "x": 12,
-        "y": 2,
-        "var": 2009,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&47530|2&32830|4&11270|5&10780|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6009,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 0,
-        "x": 15,
-        "y": 2,
-        "var": 2010,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&58800|2&26950|4&15680|5&9800|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6009,
-        "actorName": "黄巾弓兵",
-        "actorId": 1045,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 0,
-        "x": 16,
-        "y": 2,
-        "var": 2011,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&47530|2&32830|4&11270|5&10780|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6009,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
-        "dataId": 2012,
-        "relation": 2,
-        "outIndex": 11,
-        "dirction": 0,
-        "x": 24,
-        "y": 8,
-        "var": 2012,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&58800|2&26950|4&15680|5&9800|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6009,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 0,
-        "x": 25,
-        "y": 8,
-        "var": 2013,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&58800|2&26950|4&15680|5&9800|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6009,
-        "actorName": "黄巾弓兵",
-        "actorId": 1045,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 0,
-        "x": 25,
-        "y": 9,
-        "var": 2014,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&47530|2&32830|4&11270|5&10780|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6009,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 0,
-        "x": 24,
-        "y": 15,
-        "var": 2015,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&58800|2&26950|4&15680|5&9800|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6009,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 0,
-        "x": 25,
-        "y": 15,
-        "var": 2016,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&58800|2&26950|4&15680|5&9800|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6009,
-        "actorName": "黄巾术士",
-        "actorId": 1119,
-        "dataId": 2017,
-        "relation": 2,
-        "outIndex": 16,
-        "dirction": 0,
-        "x": 25,
-        "y": 14,
-        "var": 2017,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&57575|2&42262|4&13475|5&18375|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "attribute": "1&15132|2&3484|4&1196|5&1144|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6010.json b/shared/resource/warJsons/6010.json
index 42c6d5a0f..ac50aa7f2 100644
--- a/shared/resource/warJsons/6010.json
+++ b/shared/resource/warJsons/6010.json
@@ -126,14 +126,14 @@
         "dataId": 1501,
         "relation": 2,
         "outIndex": 0,
-        "dirction": 2,
+        "dirction": 1,
         "x": 11,
-        "y": 12,
+        "y": 13,
         "var": 1501,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&69090|2&50715|4&16170|5&22050|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "attribute": "1&97290|2&23805|4&7590|5&10350|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -146,14 +146,14 @@
         "dataId": 1502,
         "relation": 2,
         "outIndex": 1,
-        "dirction": 2,
+        "dirction": 1,
         "x": 9,
-        "y": 11,
+        "y": 12,
         "var": 1502,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&57575|2&42262|4&13475|5&18375|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -168,12 +168,12 @@
         "outIndex": 2,
         "dirction": 0,
         "x": 13,
-        "y": 11,
+        "y": 12,
         "var": 1503,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&57575|2&42262|4&13475|5&18375|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -186,14 +186,34 @@
         "dataId": 1504,
         "relation": 2,
         "outIndex": 3,
-        "dirction": 2,
+        "dirction": 1,
         "x": 7,
-        "y": 10,
+        "y": 11,
         "var": 1504,
         "lv": 30,
         "hide": 0,
         "initial_ai": 2,
-        "attribute": "1&57575|2&42262|4&13475|5&18375|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6010,
+        "actorName": "宫女亡魂",
+        "actorId": 3202,
+        "dataId": 1505,
+        "relation": 2,
+        "outIndex": 4,
+        "dirction": 2,
+        "x": 15,
+        "y": 11,
+        "var": 1505,
+        "lv": 30,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -206,14 +226,14 @@
         "dataId": 1506,
         "relation": 2,
         "outIndex": 5,
-        "dirction": 2,
-        "x": 4,
+        "dirction": 0,
+        "x": 11,
         "y": 8,
         "var": 1506,
         "lv": 30,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&57575|2&42262|4&13475|5&18375|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -227,13 +247,13 @@
         "relation": 2,
         "outIndex": 6,
         "dirction": 0,
-        "x": 18,
-        "y": 8,
+        "x": 8,
+        "y": 7,
         "var": 1507,
         "lv": 30,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&57575|2&42262|4&13475|5&18375|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -246,134 +266,14 @@
         "dataId": 1508,
         "relation": 2,
         "outIndex": 7,
-        "dirction": 2,
-        "x": 8,
-        "y": 3,
+        "dirction": 1,
+        "x": 14,
+        "y": 7,
         "var": 1508,
         "lv": 30,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&57575|2&42262|4&13475|5&18375|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6010,
-        "actorName": "宫女亡魂",
-        "actorId": 3202,
-        "dataId": 1509,
-        "relation": 2,
-        "outIndex": 8,
-        "dirction": 0,
-        "x": 15,
-        "y": 3,
-        "var": 1509,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&57575|2&42262|4&13475|5&18375|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6010,
-        "actorName": "宫女亡魂",
-        "actorId": 3202,
-        "dataId": 1510,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 2,
-        "x": 4,
-        "y": 6,
-        "var": 1510,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&57575|2&42262|4&13475|5&18375|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6010,
-        "actorName": "宫女亡魂",
-        "actorId": 3202,
-        "dataId": 1511,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 0,
-        "x": 18,
-        "y": 6,
-        "var": 1511,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&57575|2&42262|4&13475|5&18375|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6010,
-        "actorName": "宫女亡魂",
-        "actorId": 3202,
-        "dataId": 1512,
-        "relation": 2,
-        "outIndex": 11,
-        "dirction": 2,
-        "x": 8,
-        "y": 12,
-        "var": 1512,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&57575|2&42262|4&13475|5&18375|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6010,
-        "actorName": "宫女亡魂",
-        "actorId": 3202,
-        "dataId": 1513,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 0,
-        "x": 15,
-        "y": 12,
-        "var": 1513,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&57575|2&42262|4&13475|5&18375|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6010,
-        "actorName": "何进",
-        "actorId": 3203,
-        "dataId": 1514,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 0,
-        "x": 9,
-        "y": 19,
-        "var": 1514,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&88200|2&40425|4&23520|5&14700|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
diff --git a/shared/resource/warJsons/6011.json b/shared/resource/warJsons/6011.json
index 1c77f0da6..88fc27b50 100644
--- a/shared/resource/warJsons/6011.json
+++ b/shared/resource/warJsons/6011.json
@@ -127,13 +127,13 @@
         "relation": 2,
         "outIndex": 0,
         "dirction": 2,
-        "x": 8,
-        "y": 8,
+        "x": 13,
+        "y": 9,
         "var": 1501,
         "lv": 34,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&64925|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -147,13 +147,13 @@
         "relation": 2,
         "outIndex": 1,
         "dirction": 0,
-        "x": 14,
-        "y": 9,
+        "x": 11,
+        "y": 10,
         "var": 1502,
         "lv": 34,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&64925|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -167,13 +167,13 @@
         "relation": 2,
         "outIndex": 2,
         "dirction": 2,
-        "x": 6,
-        "y": 10,
+        "x": 11,
+        "y": 11,
         "var": 1503,
         "lv": 34,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&64925|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -187,13 +187,13 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 0,
-        "x": 14,
+        "x": 5,
         "y": 11,
         "var": 1504,
         "lv": 34,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&64925|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -207,13 +207,13 @@
         "relation": 2,
         "outIndex": 4,
         "dirction": 0,
-        "x": 10,
+        "x": 5,
         "y": 12,
         "var": 1505,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&64925|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -227,13 +227,13 @@
         "relation": 2,
         "outIndex": 5,
         "dirction": 0,
-        "x": 3,
-        "y": 13,
+        "x": 4,
+        "y": 9,
         "var": 1506,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&64925|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -247,13 +247,13 @@
         "relation": 2,
         "outIndex": 6,
         "dirction": 2,
-        "x": 13,
-        "y": 13,
+        "x": 6,
+        "y": 17,
         "var": 1507,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&64925|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -267,113 +267,13 @@
         "relation": 2,
         "outIndex": 7,
         "dirction": 2,
-        "x": 7,
-        "y": 15,
+        "x": 12,
+        "y": 17,
         "var": 1508,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&64925|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6011,
-        "actorName": "皇宫禁卫鬼侍",
-        "actorId": 3204,
-        "dataId": 1509,
-        "relation": 2,
-        "outIndex": 8,
-        "dirction": 2,
-        "x": 3,
-        "y": 15,
-        "var": 1509,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&64925|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6011,
-        "actorName": "皇宫禁卫鬼侍",
-        "actorId": 3204,
-        "dataId": 1510,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 0,
-        "x": 12,
-        "y": 16,
-        "var": 1510,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&64925|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6011,
-        "actorName": "皇宫禁卫鬼侍",
-        "actorId": 3204,
-        "dataId": 1511,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 2,
-        "x": 8,
-        "y": 17,
-        "var": 1511,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&64925|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6011,
-        "actorName": "皇宫禁卫鬼侍",
-        "actorId": 3204,
-        "dataId": 1512,
-        "relation": 2,
-        "outIndex": 11,
-        "dirction": 0,
-        "x": 11,
-        "y": 17,
-        "var": 1512,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&64925|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6011,
-        "actorName": "皇宫禁卫鬼侍",
-        "actorId": 3204,
-        "dataId": 1513,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 2,
-        "x": 5,
-        "y": 18,
-        "var": 1513,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&64925|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -383,17 +283,17 @@
         "warId": 6011,
         "actorName": "何进",
         "actorId": 3203,
-        "dataId": 1514,
+        "dataId": 1509,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 8,
         "dirction": 0,
         "x": 9,
-        "y": 19,
-        "var": 1514,
+        "y": 16,
+        "var": 1509,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&88200|2&40425|4&23520|5&14700|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "attribute": "1&264600|2&40425|4&23520|5&14700|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
diff --git a/shared/resource/warJsons/6012.json b/shared/resource/warJsons/6012.json
index 4e984bb6a..27e6e3169 100644
--- a/shared/resource/warJsons/6012.json
+++ b/shared/resource/warJsons/6012.json
@@ -132,8 +132,8 @@
         "var": 2001,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&88200|2&40425|4&23520|5&14700|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&421200|2&64350|4&37440|5&23400|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -147,13 +147,13 @@
         "relation": 2,
         "outIndex": 1,
         "dirction": 1,
-        "x": 7,
-        "y": 3,
+        "x": 2,
+        "y": 6,
         "var": 2002,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&73500|2&33687|4&19600|5&12250|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -167,13 +167,13 @@
         "relation": 2,
         "outIndex": 2,
         "dirction": 1,
-        "x": 7,
-        "y": 7,
+        "x": 2,
+        "y": 4,
         "var": 2003,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&73500|2&33687|4&19600|5&12250|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -187,13 +187,13 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 1,
-        "x": 10,
-        "y": 3,
+        "x": 5,
+        "y": 7,
         "var": 2004,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&73500|2&33687|4&19600|5&12250|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -207,13 +207,13 @@
         "relation": 2,
         "outIndex": 4,
         "dirction": 1,
-        "x": 10,
+        "x": 6,
         "y": 7,
         "var": 2005,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&73500|2&33687|4&19600|5&12250|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -227,13 +227,13 @@
         "relation": 2,
         "outIndex": 5,
         "dirction": 1,
-        "x": 13,
+        "x": 10,
         "y": 3,
         "var": 2006,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&73500|2&33687|4&19600|5&12250|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -247,13 +247,73 @@
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 13,
-        "y": 7,
+        "x": 10,
+        "y": 2,
         "var": 2007,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&73500|2&33687|4&19600|5&12250|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6012,
+        "actorName": "黄巾鬼卒",
+        "actorId": 3304,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 10,
+        "y": 6,
+        "var": 2008,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6012,
+        "actorName": "黄巾鬼卒",
+        "actorId": 3304,
+        "dataId": 2009,
+        "relation": 2,
+        "outIndex": 8,
+        "dirction": 1,
+        "x": 10,
+        "y": 7,
+        "var": 2009,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6012,
+        "actorName": "黄巾鬼卒",
+        "actorId": 3304,
+        "dataId": 2010,
+        "relation": 2,
+        "outIndex": 9,
+        "dirction": 1,
+        "x": 11,
+        "y": 7,
+        "var": 2010,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
diff --git a/shared/resource/warJsons/6013.json b/shared/resource/warJsons/6013.json
index 17b652bf4..44069c9d6 100644
--- a/shared/resource/warJsons/6013.json
+++ b/shared/resource/warJsons/6013.json
@@ -127,13 +127,13 @@
         "relation": 2,
         "outIndex": 0,
         "dirction": 1,
-        "x": 3,
-        "y": 5,
+        "x": 2,
+        "y": 7,
         "var": 2001,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&109980|2&80730|4&25740|5&35100|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&465300|2&113850|4&36300|5&49500|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -147,13 +147,13 @@
         "relation": 2,
         "outIndex": 1,
         "dirction": 1,
-        "x": 7,
-        "y": 5,
+        "x": 2,
+        "y": 8,
         "var": 2002,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&96525|2&63375|4&23400|5&31200|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&408375|2&89375|4&33000|5&44000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -167,13 +167,13 @@
         "relation": 2,
         "outIndex": 2,
         "dirction": 1,
-        "x": 7,
-        "y": 6,
+        "x": 3,
+        "y": 8,
         "var": 2003,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&96525|2&63375|4&23400|5&31200|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&408375|2&89375|4&33000|5&44000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -187,13 +187,153 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 1,
-        "x": 7,
-        "y": 4,
+        "x": 2,
+        "y": 3,
         "var": 2004,
         "lv": 20,
         "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&408375|2&89375|4&33000|5&44000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6013,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2005,
+        "relation": 2,
+        "outIndex": 4,
+        "dirction": 1,
+        "x": 3,
+        "y": 2,
+        "var": 2005,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&408375|2&89375|4&33000|5&44000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6013,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2006,
+        "relation": 2,
+        "outIndex": 5,
+        "dirction": 1,
+        "x": 5,
+        "y": 6,
+        "var": 2006,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&408375|2&89375|4&33000|5&44000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6013,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 5,
+        "y": 4,
+        "var": 2007,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&408375|2&89375|4&33000|5&44000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6013,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 6,
+        "y": 8,
+        "var": 2008,
+        "lv": 20,
+        "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&96525|2&63375|4&23400|5&31200|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "attribute": "1&408375|2&89375|4&33000|5&44000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6013,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2009,
+        "relation": 2,
+        "outIndex": 8,
+        "dirction": 1,
+        "x": 6,
+        "y": 5,
+        "var": 2009,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&408375|2&89375|4&33000|5&44000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6013,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2010,
+        "relation": 2,
+        "outIndex": 9,
+        "dirction": 1,
+        "x": 6,
+        "y": 4,
+        "var": 2010,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&408375|2&89375|4&33000|5&44000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6013,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2011,
+        "relation": 2,
+        "outIndex": 10,
+        "dirction": 1,
+        "x": 7,
+        "y": 8,
+        "var": 2011,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&408375|2&89375|4&33000|5&44000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
diff --git a/shared/resource/warJsons/6014.json b/shared/resource/warJsons/6014.json
index a910cc9da..cf9234a91 100644
--- a/shared/resource/warJsons/6014.json
+++ b/shared/resource/warJsons/6014.json
@@ -7,8 +7,8 @@
         "relation": 0,
         "outIndex": 0,
         "dirction": 1,
-        "x": 8,
-        "y": 2,
+        "x": 4,
+        "y": 3,
         "var": 501,
         "lv": 20,
         "hide": 0,
@@ -30,7 +30,7 @@
         "relation": 0,
         "outIndex": 1,
         "dirction": 1,
-        "x": 8,
+        "x": 5,
         "y": 3,
         "var": 502,
         "lv": 20,
@@ -53,8 +53,8 @@
         "relation": 0,
         "outIndex": 2,
         "dirction": 1,
-        "x": 8,
-        "y": 4,
+        "x": 6,
+        "y": 3,
         "var": 503,
         "lv": 20,
         "hide": 0,
@@ -77,7 +77,7 @@
         "outIndex": 3,
         "dirction": 0,
         "x": 8,
-        "y": 6,
+        "y": 3,
         "var": 504,
         "lv": 20,
         "hide": 0,
@@ -99,8 +99,8 @@
         "relation": 0,
         "outIndex": 4,
         "dirction": 0,
-        "x": 8,
-        "y": 7,
+        "x": 9,
+        "y": 3,
         "var": 505,
         "lv": 20,
         "hide": 0,
@@ -122,8 +122,8 @@
         "relation": 0,
         "outIndex": 5,
         "dirction": 0,
-        "x": 8,
-        "y": 8,
+        "x": 10,
+        "y": 3,
         "var": 506,
         "lv": 20,
         "hide": 0,
@@ -139,19 +139,19 @@
     },
     {
         "warId": 6014,
-        "actorName": "乌桓使者",
-        "actorId": 3402,
+        "actorName": "图吉",
+        "actorId": 3404,
         "dataId": 2001,
         "relation": 2,
         "outIndex": 0,
         "dirction": 0,
-        "x": 11,
-        "y": 5,
+        "x": 7,
+        "y": 7,
         "var": 2001,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 7,
-        "attribute": "1&115830|2&76050|4&28080|5&37440|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&810000|2&123750|4&72000|5&45000|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -162,19 +162,19 @@
     },
     {
         "warId": 6014,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "狼图腾",
+        "actorId": 3409,
         "dataId": 2002,
         "relation": 2,
         "outIndex": 1,
-        "dirction": 0,
-        "x": 13,
-        "y": 3,
+        "dirction": 1,
+        "x": 3,
+        "y": 2,
         "var": 2002,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&87360|2&51480|4&19500|5&17940|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "attribute": "1&573750|2&114375|4&33750|5&31875|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -185,19 +185,19 @@
     },
     {
         "warId": 6014,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "狼图腾",
+        "actorId": 3409,
         "dataId": 2003,
         "relation": 2,
         "outIndex": 2,
-        "dirction": 0,
-        "x": 13,
-        "y": 8,
+        "dirction": 2,
+        "x": 11,
+        "y": 2,
         "var": 2003,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&87360|2&51480|4&19500|5&17940|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "attribute": "1&573750|2&114375|4&33750|5&31875|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -208,19 +208,19 @@
     },
     {
         "warId": 6014,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "狼图腾",
+        "actorId": 3409,
         "dataId": 2004,
         "relation": 2,
         "outIndex": 3,
-        "dirction": 0,
-        "x": 18,
-        "y": 3,
+        "dirction": 3,
+        "x": 7,
+        "y": 5,
         "var": 2004,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&87360|2&51480|4&19500|5&17940|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "attribute": "1&573750|2&114375|4&33750|5&31875|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -231,19 +231,19 @@
     },
     {
         "warId": 6014,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "狼图腾",
+        "actorId": 3409,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
-        "dirction": 0,
-        "x": 18,
+        "dirction": 4,
+        "x": 3,
         "y": 8,
         "var": 2005,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&87360|2&51480|4&19500|5&17940|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "attribute": "1&573750|2&114375|4&33750|5&31875|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -254,19 +254,19 @@
     },
     {
         "warId": 6014,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "狼图腾",
+        "actorId": 3409,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
-        "dirction": 0,
-        "x": 22,
-        "y": 3,
+        "dirction": 5,
+        "x": 11,
+        "y": 8,
         "var": 2006,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&87360|2&51480|4&19500|5&17940|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "attribute": "1&573750|2&114375|4&33750|5&31875|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -277,19 +277,19 @@
     },
     {
         "warId": 6014,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "巨狼勇士",
+        "actorId": 1134,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 0,
-        "x": 22,
-        "y": 8,
+        "x": 3,
+        "y": 6,
         "var": 2007,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&87360|2&51480|4&19500|5&17940|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "attribute": "1&675000|2&103125|4&60000|5&37500|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -300,19 +300,19 @@
     },
     {
         "warId": 6014,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "巨狼勇士",
+        "actorId": 1134,
         "dataId": 2008,
         "relation": 2,
         "outIndex": 7,
         "dirction": 0,
-        "x": 27,
-        "y": 3,
+        "x": 11,
+        "y": 6,
         "var": 2008,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&87360|2&51480|4&19500|5&17940|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "attribute": "1&675000|2&103125|4&60000|5&37500|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -323,19 +323,19 @@
     },
     {
         "warId": 6014,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "乌桓萨满",
+        "actorId": 1532,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 0,
-        "x": 27,
+        "x": 5,
         "y": 8,
         "var": 2009,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&87360|2&51480|4&19500|5&17940|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&423000|2&103500|4&33000|5&45000|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -343,5 +343,28 @@
         "bossStage": 0,
         "bloodShow": "1&0",
         "dest_point": 0
+    },
+    {
+        "warId": 6014,
+        "actorName": "乌桓萨满",
+        "actorId": 1532,
+        "dataId": 2010,
+        "relation": 2,
+        "outIndex": 9,
+        "dirction": 0,
+        "x": 9,
+        "y": 8,
+        "var": 2010,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&423000|2&103500|4&33000|5&45000|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bossStage": 0,
+        "bloodShow": 0,
+        "dest_point": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6015.json b/shared/resource/warJsons/6015.json
index 7f9ccd49f..76990f384 100644
--- a/shared/resource/warJsons/6015.json
+++ b/shared/resource/warJsons/6015.json
@@ -133,19 +133,19 @@
     },
     {
         "warId": 6015,
-        "actorName": "弓贼",
-        "actorId": 3502,
+        "actorName": "陈兰",
+        "actorId": 3504,
         "dataId": 2001,
         "relation": 2,
         "outIndex": 0,
         "dirction": 1,
-        "x": 7,
-        "y": 9,
+        "x": 5,
+        "y": 8,
         "var": 2001,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&94575|2&65325|4&22425|5&21450|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&939690|2&177300|4&85695|5&76830|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -155,19 +155,19 @@
     },
     {
         "warId": 6015,
-        "actorName": "雷绪",
-        "actorId": 3501,
+        "actorName": "陈兰",
+        "actorId": 3504,
         "dataId": 2002,
         "relation": 2,
         "outIndex": 1,
         "dirction": 1,
         "x": 7,
-        "y": 7,
+        "y": 8,
         "var": 2002,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&113490|2&78390|4&26910|5&25740|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&939690|2&177300|4&85695|5&76830|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -177,19 +177,19 @@
     },
     {
         "warId": 6015,
-        "actorName": "弓贼",
-        "actorId": 3502,
+        "actorName": "陈兰",
+        "actorId": 3504,
         "dataId": 2003,
         "relation": 2,
         "outIndex": 2,
         "dirction": 1,
-        "x": 7,
-        "y": 11,
+        "x": 9,
+        "y": 8,
         "var": 2003,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&94575|2&65325|4&22425|5&21450|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&939690|2&177300|4&85695|5&76830|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -199,24 +199,134 @@
     },
     {
         "warId": 6015,
-        "actorName": "弓贼",
-        "actorId": 3502,
+        "actorName": "山贼",
+        "actorId": 1012,
         "dataId": 2004,
         "relation": 2,
         "outIndex": 3,
         "dirction": 1,
-        "x": 7,
-        "y": 13,
+        "x": 4,
+        "y": 6,
         "var": 2004,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&94575|2&65325|4&22425|5&21450|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "attribute": "1&709200|2&108350|4&63040|5&39400|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
         "skill": 0,
         "seid": 0,
         "star": 0,
         "spine": 0,
         "bossStage": 0,
         "bloodShow": "1&0"
+    },
+    {
+        "warId": 6015,
+        "actorName": "山贼",
+        "actorId": 1012,
+        "dataId": 2005,
+        "relation": 2,
+        "outIndex": 4,
+        "dirction": 1,
+        "x": 7,
+        "y": 5,
+        "var": 2005,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&709200|2&108350|4&63040|5&39400|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bossStage": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6015,
+        "actorName": "山贼",
+        "actorId": 1012,
+        "dataId": 2006,
+        "relation": 2,
+        "outIndex": 5,
+        "dirction": 1,
+        "x": 10,
+        "y": 6,
+        "var": 2006,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&709200|2&108350|4&63040|5&39400|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bossStage": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6015,
+        "actorName": "山贼弓兵",
+        "actorId": 1042,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 6,
+        "y": 7,
+        "var": 2007,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&573270|2&131990|4&45310|5&43340|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bossStage": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6015,
+        "actorName": "山贼弓兵",
+        "actorId": 1042,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 8,
+        "y": 7,
+        "var": 2008,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&573270|2&131990|4&45310|5&43340|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bossStage": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6015,
+        "actorName": "山贼头目",
+        "actorId": 1043,
+        "dataId": 2009,
+        "relation": 2,
+        "outIndex": 8,
+        "dirction": 1,
+        "x": 7,
+        "y": 7,
+        "var": 2009,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&1063800|2&162525|4&94560|5&59100|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bossStage": 0,
+        "bloodShow": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6016.json b/shared/resource/warJsons/6016.json
index 16d52d4e7..055b0cc76 100644
--- a/shared/resource/warJsons/6016.json
+++ b/shared/resource/warJsons/6016.json
@@ -133,13 +133,13 @@
         "relation": 2,
         "outIndex": 0,
         "dirction": 0,
-        "x": 15,
+        "x": 17,
         "y": 7,
         "var": 2001,
         "lv": 70,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&140400|2&64350|4&37440|5&23400|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&1609200|2&245850|4&143040|5&89400|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -154,13 +154,13 @@
         "relation": 2,
         "outIndex": 1,
         "dirction": 1,
-        "x": 13,
+        "x": 15,
         "y": 6,
         "var": 2002,
         "lv": 70,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&91650|2&67275|4&21450|5&29250|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&1050450|2&257025|4&81950|5&111750|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -175,13 +175,13 @@
         "relation": 2,
         "outIndex": 2,
         "dirction": 1,
-        "x": 13,
+        "x": 15,
         "y": 8,
         "var": 2003,
         "lv": 70,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&96525|2&63375|4&23400|5&31200|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&1106325|2&242125|4&89400|5&119200|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -196,13 +196,13 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 0,
-        "x": 15,
+        "x": 17,
         "y": 6,
         "var": 2004,
         "lv": 70,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&93600|2&62400|4&20475|5&33150|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&1072800|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -217,17 +217,185 @@
         "relation": 2,
         "outIndex": 4,
         "dirction": 0,
-        "x": 15,
+        "x": 17,
         "y": 8,
         "var": 2005,
         "lv": 70,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&93600|2&62400|4&20475|5&33150|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "initial_ai": 3,
+        "attribute": "1&1072800|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
         "skill": 0,
         "seid": 0,
         "star": 0,
         "spine": 0,
         "bloodShow": "0&1"
+    },
+    {
+        "warId": 6016,
+        "actorName": "兵家学子",
+        "actorId": 3606,
+        "dataId": 2006,
+        "relation": 2,
+        "outIndex": 5,
+        "dirction": 1,
+        "x": 9,
+        "y": 9,
+        "var": 2006,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1050450|2&257025|4&81950|5&111750|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6016,
+        "actorName": "儒家学子",
+        "actorId": 3607,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 9,
+        "y": 11,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1106325|2&242125|4&89400|5&119200|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6016,
+        "actorName": "墨家学子",
+        "actorId": 3608,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 0,
+        "x": 1,
+        "y": 9,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1072800|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6016,
+        "actorName": "医家学子",
+        "actorId": 3609,
+        "dataId": 2009,
+        "relation": 2,
+        "outIndex": 8,
+        "dirction": 0,
+        "x": 1,
+        "y": 11,
+        "var": 2009,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1072800|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6016,
+        "actorName": "兵家学子",
+        "actorId": 3606,
+        "dataId": 2010,
+        "relation": 2,
+        "outIndex": 9,
+        "dirction": 1,
+        "x": 8,
+        "y": 5,
+        "var": 2010,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1050450|2&257025|4&81950|5&111750|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6016,
+        "actorName": "儒家学子",
+        "actorId": 3607,
+        "dataId": 2011,
+        "relation": 2,
+        "outIndex": 10,
+        "dirction": 1,
+        "x": 8,
+        "y": 3,
+        "var": 2011,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1106325|2&242125|4&89400|5&119200|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6016,
+        "actorName": "墨家学子",
+        "actorId": 3608,
+        "dataId": 2012,
+        "relation": 2,
+        "outIndex": 11,
+        "dirction": 0,
+        "x": 10,
+        "y": 5,
+        "var": 2012,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1072800|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6016,
+        "actorName": "医家学子",
+        "actorId": 3609,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 0,
+        "x": 10,
+        "y": 3,
+        "var": 2013,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1072800|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6017.json b/shared/resource/warJsons/6017.json
index ce7c3bdb0..84e7eaaa5 100644
--- a/shared/resource/warJsons/6017.json
+++ b/shared/resource/warJsons/6017.json
@@ -7,8 +7,8 @@
         "relation": 0,
         "outIndex": 0,
         "dirction": 2,
-        "x": 15,
-        "y": 10,
+        "x": 11,
+        "y": 12,
         "var": 501,
         "lv": 16,
         "hide": 0,
@@ -27,8 +27,8 @@
         "relation": 0,
         "outIndex": 1,
         "dirction": 2,
-        "x": 14,
-        "y": 10,
+        "x": 10,
+        "y": 12,
         "var": 502,
         "lv": 16,
         "hide": 0,
@@ -47,8 +47,8 @@
         "relation": 0,
         "outIndex": 2,
         "dirction": 2,
-        "x": 17,
-        "y": 12,
+        "x": 10,
+        "y": 13,
         "var": 503,
         "lv": 16,
         "hide": 0,
@@ -67,7 +67,7 @@
         "relation": 0,
         "outIndex": 3,
         "dirction": 2,
-        "x": 17,
+        "x": 9,
         "y": 13,
         "var": 504,
         "lv": 16,
@@ -87,8 +87,8 @@
         "relation": 0,
         "outIndex": 4,
         "dirction": 2,
-        "x": 11,
-        "y": 9,
+        "x": 13,
+        "y": 12,
         "var": 505,
         "lv": 16,
         "hide": 0,
@@ -107,8 +107,8 @@
         "relation": 0,
         "outIndex": 5,
         "dirction": 2,
-        "x": 11,
-        "y": 10,
+        "x": 13,
+        "y": 13,
         "var": 506,
         "lv": 16,
         "hide": 0,
@@ -132,8 +132,8 @@
         "var": 2001,
         "lv": 16,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&252000|2&115500|4&67200|5&42000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "initial_ai": 3,
+        "attribute": "1&28080|2&4290|4&2496|5&1560|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -152,8 +152,8 @@
         "var": 2002,
         "lv": 16,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&173250|2&113750|4&42000|5&56000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "initial_ai": 3,
+        "attribute": "1&19305|2&4225|4&1560|5&2080|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -172,8 +172,8 @@
         "var": 2003,
         "lv": 16,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&135800|2&93800|4&32200|5&30800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "initial_ai": 3,
+        "attribute": "1&15132|2&3484|4&1196|5&1144|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -187,13 +187,13 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 0,
-        "x": 15,
-        "y": 17,
+        "x": 9,
+        "y": 7,
         "var": 2004,
         "lv": 16,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&173250|2&113750|4&42000|5&56000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "attribute": "1&19305|2&4225|4&1560|5&2080|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -207,13 +207,13 @@
         "relation": 2,
         "outIndex": 4,
         "dirction": 0,
-        "x": 16,
-        "y": 18,
+        "x": 10,
+        "y": 6,
         "var": 2005,
         "lv": 16,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&168000|2&77000|4&44800|5&28000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "attribute": "1&18720|2&2860|4&1664|5&1040|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -227,13 +227,13 @@
         "relation": 2,
         "outIndex": 5,
         "dirction": 0,
-        "x": 17,
-        "y": 18,
+        "x": 13,
+        "y": 5,
         "var": 2006,
         "lv": 16,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&164500|2&120750|4&38500|5&52500|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "attribute": "1&18330|2&4485|4&1430|5&1950|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -241,319 +241,19 @@
     },
     {
         "warId": 6017,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
+        "actorName": "黄巾弓兵",
+        "actorId": 1045,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 0,
-        "x": 16,
-        "y": 4,
+        "x": 14,
+        "y": 5,
         "var": 2007,
         "lv": 16,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&168000|2&77000|4&44800|5&28000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6017,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 0,
-        "x": 11,
-        "y": 2,
-        "var": 2008,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&168000|2&77000|4&44800|5&28000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6017,
-        "actorName": "黄巾弓兵",
-        "actorId": 1045,
-        "dataId": 2009,
-        "relation": 2,
-        "outIndex": 8,
-        "dirction": 0,
-        "x": 12,
-        "y": 2,
-        "var": 2009,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&135800|2&93800|4&32200|5&30800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6017,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 0,
-        "x": 15,
-        "y": 2,
-        "var": 2010,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&168000|2&77000|4&44800|5&28000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6017,
-        "actorName": "黄巾弓兵",
-        "actorId": 1045,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 0,
-        "x": 16,
-        "y": 2,
-        "var": 2011,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&135800|2&93800|4&32200|5&30800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6017,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
-        "dataId": 2012,
-        "relation": 2,
-        "outIndex": 11,
-        "dirction": 0,
-        "x": 24,
-        "y": 8,
-        "var": 2012,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&168000|2&77000|4&44800|5&28000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6017,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 0,
-        "x": 25,
-        "y": 8,
-        "var": 2013,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&168000|2&77000|4&44800|5&28000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6017,
-        "actorName": "黄巾弓兵",
-        "actorId": 1045,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 0,
-        "x": 25,
-        "y": 9,
-        "var": 2014,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&135800|2&93800|4&32200|5&30800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6017,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 0,
-        "x": 24,
-        "y": 15,
-        "var": 2015,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&168000|2&77000|4&44800|5&28000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6017,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 0,
-        "x": 25,
-        "y": 15,
-        "var": 2016,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&168000|2&77000|4&44800|5&28000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6017,
-        "actorName": "黄巾术士",
-        "actorId": 1119,
-        "dataId": 2017,
-        "relation": 2,
-        "outIndex": 16,
-        "dirction": 0,
-        "x": 25,
-        "y": 14,
-        "var": 2017,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&164500|2&120750|4&38500|5&52500|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6017,
-        "actorName": "黄巾术士",
-        "actorId": 1119,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 5,
-        "y": 17,
-        "var": 2018,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&164500|2&120750|4&38500|5&52500|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6017,
-        "actorName": "狼",
-        "actorId": 1014,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 3,
-        "y": 6,
-        "var": 2019,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&142800|2&85400|4&25200|5&23800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6017,
-        "actorName": "狼",
-        "actorId": 1014,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 3,
-        "y": 5,
-        "var": 2020,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&142800|2&85400|4&25200|5&23800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6017,
-        "actorName": "狼",
-        "actorId": 1014,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 2,
-        "y": 6,
-        "var": 2021,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&142800|2&85400|4&25200|5&23800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6017,
-        "actorName": "狼",
-        "actorId": 1014,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 2,
-        "y": 5,
-        "var": 2022,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&142800|2&85400|4&25200|5&23800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "attribute": "1&15132|2&3484|4&1196|5&1144|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6018.json b/shared/resource/warJsons/6018.json
index 10b35403d..0f2258b5f 100644
--- a/shared/resource/warJsons/6018.json
+++ b/shared/resource/warJsons/6018.json
@@ -126,14 +126,14 @@
         "dataId": 1501,
         "relation": 2,
         "outIndex": 0,
-        "dirction": 2,
+        "dirction": 1,
         "x": 11,
-        "y": 12,
+        "y": 13,
         "var": 1501,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&155100|2&113850|4&36300|5&49500|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "attribute": "1&97290|2&23805|4&7590|5&10350|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -146,14 +146,14 @@
         "dataId": 1502,
         "relation": 2,
         "outIndex": 1,
-        "dirction": 2,
+        "dirction": 1,
         "x": 9,
-        "y": 11,
+        "y": 12,
         "var": 1502,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&129250|2&94875|4&30250|5&41250|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -168,12 +168,12 @@
         "outIndex": 2,
         "dirction": 0,
         "x": 13,
-        "y": 11,
+        "y": 12,
         "var": 1503,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&129250|2&94875|4&30250|5&41250|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -186,14 +186,34 @@
         "dataId": 1504,
         "relation": 2,
         "outIndex": 3,
-        "dirction": 2,
+        "dirction": 1,
         "x": 7,
-        "y": 10,
+        "y": 11,
         "var": 1504,
         "lv": 30,
         "hide": 0,
         "initial_ai": 2,
-        "attribute": "1&129250|2&94875|4&30250|5&41250|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6018,
+        "actorName": "宫女亡魂",
+        "actorId": 3202,
+        "dataId": 1505,
+        "relation": 2,
+        "outIndex": 4,
+        "dirction": 2,
+        "x": 15,
+        "y": 11,
+        "var": 1505,
+        "lv": 30,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -206,14 +226,14 @@
         "dataId": 1506,
         "relation": 2,
         "outIndex": 5,
-        "dirction": 2,
-        "x": 4,
+        "dirction": 0,
+        "x": 11,
         "y": 8,
         "var": 1506,
         "lv": 30,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&129250|2&94875|4&30250|5&41250|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -227,13 +247,13 @@
         "relation": 2,
         "outIndex": 6,
         "dirction": 0,
-        "x": 18,
-        "y": 8,
+        "x": 8,
+        "y": 7,
         "var": 1507,
         "lv": 30,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&129250|2&94875|4&30250|5&41250|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -246,134 +266,14 @@
         "dataId": 1508,
         "relation": 2,
         "outIndex": 7,
-        "dirction": 2,
-        "x": 8,
-        "y": 3,
+        "dirction": 1,
+        "x": 14,
+        "y": 7,
         "var": 1508,
         "lv": 30,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&129250|2&94875|4&30250|5&41250|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6018,
-        "actorName": "宫女亡魂",
-        "actorId": 3202,
-        "dataId": 1509,
-        "relation": 2,
-        "outIndex": 8,
-        "dirction": 0,
-        "x": 15,
-        "y": 3,
-        "var": 1509,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&129250|2&94875|4&30250|5&41250|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6018,
-        "actorName": "宫女亡魂",
-        "actorId": 3202,
-        "dataId": 1510,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 2,
-        "x": 4,
-        "y": 6,
-        "var": 1510,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&129250|2&94875|4&30250|5&41250|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6018,
-        "actorName": "宫女亡魂",
-        "actorId": 3202,
-        "dataId": 1511,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 0,
-        "x": 18,
-        "y": 6,
-        "var": 1511,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&129250|2&94875|4&30250|5&41250|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6018,
-        "actorName": "宫女亡魂",
-        "actorId": 3202,
-        "dataId": 1512,
-        "relation": 2,
-        "outIndex": 11,
-        "dirction": 2,
-        "x": 8,
-        "y": 12,
-        "var": 1512,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&129250|2&94875|4&30250|5&41250|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6018,
-        "actorName": "宫女亡魂",
-        "actorId": 3202,
-        "dataId": 1513,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 0,
-        "x": 15,
-        "y": 12,
-        "var": 1513,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&129250|2&94875|4&30250|5&41250|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6018,
-        "actorName": "何进",
-        "actorId": 3203,
-        "dataId": 1514,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 0,
-        "x": 9,
-        "y": 19,
-        "var": 1514,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&198000|2&90750|4&52800|5&33000|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
diff --git a/shared/resource/warJsons/6019.json b/shared/resource/warJsons/6019.json
index df475f5ff..e71454b95 100644
--- a/shared/resource/warJsons/6019.json
+++ b/shared/resource/warJsons/6019.json
@@ -127,13 +127,13 @@
         "relation": 2,
         "outIndex": 0,
         "dirction": 2,
-        "x": 8,
-        "y": 8,
+        "x": 13,
+        "y": 9,
         "var": 1501,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&155025|2&87750|4&42412|5&38025|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -147,13 +147,13 @@
         "relation": 2,
         "outIndex": 1,
         "dirction": 0,
-        "x": 14,
-        "y": 9,
+        "x": 11,
+        "y": 10,
         "var": 1502,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&155025|2&87750|4&42412|5&38025|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -167,13 +167,13 @@
         "relation": 2,
         "outIndex": 2,
         "dirction": 2,
-        "x": 6,
-        "y": 10,
+        "x": 11,
+        "y": 11,
         "var": 1503,
         "lv": 34,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&155025|2&87750|4&42412|5&38025|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -187,13 +187,13 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 0,
-        "x": 14,
+        "x": 5,
         "y": 11,
         "var": 1504,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&155025|2&87750|4&42412|5&38025|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -207,13 +207,13 @@
         "relation": 2,
         "outIndex": 4,
         "dirction": 0,
-        "x": 10,
+        "x": 5,
         "y": 12,
         "var": 1505,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&155025|2&87750|4&42412|5&38025|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -227,13 +227,13 @@
         "relation": 2,
         "outIndex": 5,
         "dirction": 0,
-        "x": 3,
-        "y": 13,
+        "x": 4,
+        "y": 9,
         "var": 1506,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&155025|2&87750|4&42412|5&38025|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -247,13 +247,13 @@
         "relation": 2,
         "outIndex": 6,
         "dirction": 2,
-        "x": 13,
-        "y": 13,
+        "x": 6,
+        "y": 17,
         "var": 1507,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&155025|2&87750|4&42412|5&38025|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -267,113 +267,13 @@
         "relation": 2,
         "outIndex": 7,
         "dirction": 2,
-        "x": 7,
-        "y": 15,
+        "x": 12,
+        "y": 17,
         "var": 1508,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&155025|2&87750|4&42412|5&38025|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6019,
-        "actorName": "皇宫禁卫鬼侍",
-        "actorId": 3204,
-        "dataId": 1509,
-        "relation": 2,
-        "outIndex": 8,
-        "dirction": 2,
-        "x": 3,
-        "y": 15,
-        "var": 1509,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&155025|2&87750|4&42412|5&38025|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6019,
-        "actorName": "皇宫禁卫鬼侍",
-        "actorId": 3204,
-        "dataId": 1510,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 0,
-        "x": 12,
-        "y": 16,
-        "var": 1510,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&155025|2&87750|4&42412|5&38025|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6019,
-        "actorName": "皇宫禁卫鬼侍",
-        "actorId": 3204,
-        "dataId": 1511,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 2,
-        "x": 8,
-        "y": 17,
-        "var": 1511,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&155025|2&87750|4&42412|5&38025|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6019,
-        "actorName": "皇宫禁卫鬼侍",
-        "actorId": 3204,
-        "dataId": 1512,
-        "relation": 2,
-        "outIndex": 11,
-        "dirction": 0,
-        "x": 11,
-        "y": 17,
-        "var": 1512,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&155025|2&87750|4&42412|5&38025|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6019,
-        "actorName": "皇宫禁卫鬼侍",
-        "actorId": 3204,
-        "dataId": 1513,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 2,
-        "x": 5,
-        "y": 18,
-        "var": 1513,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&155025|2&87750|4&42412|5&38025|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -383,17 +283,17 @@
         "warId": 6019,
         "actorName": "何进",
         "actorId": 3203,
-        "dataId": 1514,
+        "dataId": 1509,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 8,
         "dirction": 0,
         "x": 9,
-        "y": 19,
-        "var": 1514,
+        "y": 16,
+        "var": 1509,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&210600|2&96525|4&56160|5&35100|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "attribute": "1&264600|2&40425|4&23520|5&14700|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
diff --git a/shared/resource/warJsons/6020.json b/shared/resource/warJsons/6020.json
index 6f450bbaa..a2bc23898 100644
--- a/shared/resource/warJsons/6020.json
+++ b/shared/resource/warJsons/6020.json
@@ -132,8 +132,8 @@
         "var": 2001,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&228600|2&104775|4&60960|5&38100|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "initial_ai": 3,
+        "attribute": "1&421200|2&64350|4&37440|5&23400|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -147,13 +147,13 @@
         "relation": 2,
         "outIndex": 1,
         "dirction": 1,
-        "x": 7,
-        "y": 3,
+        "x": 2,
+        "y": 6,
         "var": 2002,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&190500|2&87312|4&50800|5&31750|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "initial_ai": 3,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -167,13 +167,13 @@
         "relation": 2,
         "outIndex": 2,
         "dirction": 1,
-        "x": 7,
-        "y": 7,
+        "x": 2,
+        "y": 4,
         "var": 2003,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&190500|2&87312|4&50800|5&31750|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "initial_ai": 3,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -187,13 +187,13 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 1,
-        "x": 10,
-        "y": 3,
+        "x": 5,
+        "y": 7,
         "var": 2004,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&190500|2&87312|4&50800|5&31750|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "initial_ai": 3,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -207,13 +207,13 @@
         "relation": 2,
         "outIndex": 4,
         "dirction": 1,
-        "x": 10,
+        "x": 6,
         "y": 7,
         "var": 2005,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&190500|2&87312|4&50800|5&31750|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "initial_ai": 3,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -227,13 +227,13 @@
         "relation": 2,
         "outIndex": 5,
         "dirction": 1,
-        "x": 13,
+        "x": 10,
         "y": 3,
         "var": 2006,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&190500|2&87312|4&50800|5&31750|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -247,13 +247,73 @@
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 13,
-        "y": 7,
+        "x": 10,
+        "y": 2,
         "var": 2007,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&190500|2&87312|4&50800|5&31750|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6020,
+        "actorName": "黄巾鬼卒",
+        "actorId": 3304,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 10,
+        "y": 6,
+        "var": 2008,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6020,
+        "actorName": "黄巾鬼卒",
+        "actorId": 3304,
+        "dataId": 2009,
+        "relation": 2,
+        "outIndex": 8,
+        "dirction": 1,
+        "x": 10,
+        "y": 7,
+        "var": 2009,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6020,
+        "actorName": "黄巾鬼卒",
+        "actorId": 3304,
+        "dataId": 2010,
+        "relation": 2,
+        "outIndex": 9,
+        "dirction": 1,
+        "x": 11,
+        "y": 7,
+        "var": 2010,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
diff --git a/shared/resource/warJsons/6021.json b/shared/resource/warJsons/6021.json
index 88bff5716..45e098982 100644
--- a/shared/resource/warJsons/6021.json
+++ b/shared/resource/warJsons/6021.json
@@ -127,13 +127,13 @@
         "relation": 2,
         "outIndex": 0,
         "dirction": 1,
-        "x": 3,
-        "y": 5,
+        "x": 2,
+        "y": 7,
         "var": 2001,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&211500|2&155250|4&49500|5&67500|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "initial_ai": 3,
+        "attribute": "1&494910|2&121095|4&38610|5&52650|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -147,13 +147,13 @@
         "relation": 2,
         "outIndex": 1,
         "dirction": 1,
-        "x": 7,
-        "y": 5,
+        "x": 2,
+        "y": 8,
         "var": 2002,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&185625|2&121875|4&45000|5&60000|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "initial_ai": 3,
+        "attribute": "1&434361|2&95062|4&35100|5&46800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -167,13 +167,13 @@
         "relation": 2,
         "outIndex": 2,
         "dirction": 1,
-        "x": 7,
-        "y": 6,
+        "x": 3,
+        "y": 8,
         "var": 2003,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&185625|2&121875|4&45000|5&60000|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "initial_ai": 3,
+        "attribute": "1&434361|2&95062|4&35100|5&46800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -187,13 +187,153 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 1,
-        "x": 7,
-        "y": 4,
+        "x": 2,
+        "y": 3,
         "var": 2004,
         "lv": 20,
         "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&434361|2&95062|4&35100|5&46800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6021,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2005,
+        "relation": 2,
+        "outIndex": 4,
+        "dirction": 1,
+        "x": 3,
+        "y": 2,
+        "var": 2005,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&434361|2&95062|4&35100|5&46800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6021,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2006,
+        "relation": 2,
+        "outIndex": 5,
+        "dirction": 1,
+        "x": 5,
+        "y": 6,
+        "var": 2006,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&434361|2&95062|4&35100|5&46800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6021,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 5,
+        "y": 4,
+        "var": 2007,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&434361|2&95062|4&35100|5&46800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6021,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 6,
+        "y": 8,
+        "var": 2008,
+        "lv": 20,
+        "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&185625|2&121875|4&45000|5&60000|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "attribute": "1&434361|2&95062|4&35100|5&46800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6021,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2009,
+        "relation": 2,
+        "outIndex": 8,
+        "dirction": 1,
+        "x": 6,
+        "y": 5,
+        "var": 2009,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&434361|2&95062|4&35100|5&46800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6021,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2010,
+        "relation": 2,
+        "outIndex": 9,
+        "dirction": 1,
+        "x": 6,
+        "y": 4,
+        "var": 2010,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&434361|2&95062|4&35100|5&46800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6021,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2011,
+        "relation": 2,
+        "outIndex": 10,
+        "dirction": 1,
+        "x": 7,
+        "y": 8,
+        "var": 2011,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&434361|2&95062|4&35100|5&46800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
diff --git a/shared/resource/warJsons/6022.json b/shared/resource/warJsons/6022.json
index 69c147012..4045af618 100644
--- a/shared/resource/warJsons/6022.json
+++ b/shared/resource/warJsons/6022.json
@@ -7,8 +7,8 @@
         "relation": 0,
         "outIndex": 0,
         "dirction": 1,
-        "x": 8,
-        "y": 2,
+        "x": 4,
+        "y": 3,
         "var": 501,
         "lv": 20,
         "hide": 0,
@@ -30,7 +30,7 @@
         "relation": 0,
         "outIndex": 1,
         "dirction": 1,
-        "x": 8,
+        "x": 5,
         "y": 3,
         "var": 502,
         "lv": 20,
@@ -53,8 +53,8 @@
         "relation": 0,
         "outIndex": 2,
         "dirction": 1,
-        "x": 8,
-        "y": 4,
+        "x": 6,
+        "y": 3,
         "var": 503,
         "lv": 20,
         "hide": 0,
@@ -77,7 +77,7 @@
         "outIndex": 3,
         "dirction": 0,
         "x": 8,
-        "y": 6,
+        "y": 3,
         "var": 504,
         "lv": 20,
         "hide": 0,
@@ -99,8 +99,8 @@
         "relation": 0,
         "outIndex": 4,
         "dirction": 0,
-        "x": 8,
-        "y": 7,
+        "x": 9,
+        "y": 3,
         "var": 505,
         "lv": 20,
         "hide": 0,
@@ -122,8 +122,8 @@
         "relation": 0,
         "outIndex": 5,
         "dirction": 0,
-        "x": 8,
-        "y": 8,
+        "x": 10,
+        "y": 3,
         "var": 506,
         "lv": 20,
         "hide": 0,
@@ -139,19 +139,19 @@
     },
     {
         "warId": 6022,
-        "actorName": "乌桓使者",
-        "actorId": 3402,
+        "actorName": "图吉",
+        "actorId": 3404,
         "dataId": 2001,
         "relation": 2,
         "outIndex": 0,
         "dirction": 0,
-        "x": 11,
-        "y": 5,
+        "x": 7,
+        "y": 7,
         "var": 2001,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 7,
-        "attribute": "1&222750|2&146250|4&54000|5&72000|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "initial_ai": 3,
+        "attribute": "1&810000|2&123750|4&72000|5&45000|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -162,19 +162,19 @@
     },
     {
         "warId": 6022,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "狼图腾",
+        "actorId": 3409,
         "dataId": 2002,
         "relation": 2,
         "outIndex": 1,
-        "dirction": 0,
-        "x": 13,
-        "y": 3,
+        "dirction": 1,
+        "x": 3,
+        "y": 2,
         "var": 2002,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&168000|2&99000|4&37500|5&34500|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "attribute": "1&573750|2&114375|4&33750|5&31875|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -185,19 +185,19 @@
     },
     {
         "warId": 6022,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "狼图腾",
+        "actorId": 3409,
         "dataId": 2003,
         "relation": 2,
         "outIndex": 2,
-        "dirction": 0,
-        "x": 13,
-        "y": 8,
+        "dirction": 2,
+        "x": 11,
+        "y": 2,
         "var": 2003,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&168000|2&99000|4&37500|5&34500|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "attribute": "1&573750|2&114375|4&33750|5&31875|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -208,19 +208,19 @@
     },
     {
         "warId": 6022,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "狼图腾",
+        "actorId": 3409,
         "dataId": 2004,
         "relation": 2,
         "outIndex": 3,
-        "dirction": 0,
-        "x": 18,
-        "y": 3,
+        "dirction": 3,
+        "x": 7,
+        "y": 5,
         "var": 2004,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&168000|2&99000|4&37500|5&34500|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "attribute": "1&573750|2&114375|4&33750|5&31875|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -231,19 +231,19 @@
     },
     {
         "warId": 6022,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "狼图腾",
+        "actorId": 3409,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
-        "dirction": 0,
-        "x": 18,
+        "dirction": 4,
+        "x": 3,
         "y": 8,
         "var": 2005,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&168000|2&99000|4&37500|5&34500|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "attribute": "1&573750|2&114375|4&33750|5&31875|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -254,19 +254,19 @@
     },
     {
         "warId": 6022,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "狼图腾",
+        "actorId": 3409,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
-        "dirction": 0,
-        "x": 22,
-        "y": 3,
+        "dirction": 5,
+        "x": 11,
+        "y": 8,
         "var": 2006,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&168000|2&99000|4&37500|5&34500|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "attribute": "1&573750|2&114375|4&33750|5&31875|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -277,19 +277,19 @@
     },
     {
         "warId": 6022,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "巨狼勇士",
+        "actorId": 1134,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 0,
-        "x": 22,
-        "y": 8,
+        "x": 3,
+        "y": 6,
         "var": 2007,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&168000|2&99000|4&37500|5&34500|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "attribute": "1&675000|2&103125|4&60000|5&37500|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -300,19 +300,19 @@
     },
     {
         "warId": 6022,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "巨狼勇士",
+        "actorId": 1134,
         "dataId": 2008,
         "relation": 2,
         "outIndex": 7,
         "dirction": 0,
-        "x": 27,
-        "y": 3,
+        "x": 11,
+        "y": 6,
         "var": 2008,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&168000|2&99000|4&37500|5&34500|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "attribute": "1&675000|2&103125|4&60000|5&37500|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -323,19 +323,19 @@
     },
     {
         "warId": 6022,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "乌桓萨满",
+        "actorId": 1532,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 0,
-        "x": 27,
+        "x": 5,
         "y": 8,
         "var": 2009,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&168000|2&99000|4&37500|5&34500|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "initial_ai": 3,
+        "attribute": "1&423000|2&103500|4&33000|5&45000|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -343,5 +343,28 @@
         "bossStage": 0,
         "bloodShow": "1&0",
         "dest_point": 0
+    },
+    {
+        "warId": 6022,
+        "actorName": "乌桓萨满",
+        "actorId": 1532,
+        "dataId": 2010,
+        "relation": 2,
+        "outIndex": 9,
+        "dirction": 0,
+        "x": 9,
+        "y": 8,
+        "var": 2010,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&423000|2&103500|4&33000|5&45000|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bossStage": 0,
+        "bloodShow": 0,
+        "dest_point": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6023.json b/shared/resource/warJsons/6023.json
index 4224717ce..0c2969303 100644
--- a/shared/resource/warJsons/6023.json
+++ b/shared/resource/warJsons/6023.json
@@ -133,19 +133,19 @@
     },
     {
         "warId": 6023,
-        "actorName": "弓贼",
-        "actorId": 3502,
+        "actorName": "陈兰",
+        "actorId": 3504,
         "dataId": 2001,
         "relation": 2,
         "outIndex": 0,
         "dirction": 1,
-        "x": 7,
-        "y": 9,
+        "x": 5,
+        "y": 8,
         "var": 2001,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&181875|2&125625|4&43125|5&41250|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "initial_ai": 3,
+        "attribute": "1&939690|2&177300|4&85695|5&76830|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -155,19 +155,19 @@
     },
     {
         "warId": 6023,
-        "actorName": "雷绪",
-        "actorId": 3501,
+        "actorName": "陈兰",
+        "actorId": 3504,
         "dataId": 2002,
         "relation": 2,
         "outIndex": 1,
         "dirction": 1,
         "x": 7,
-        "y": 7,
+        "y": 8,
         "var": 2002,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&218250|2&150750|4&51750|5&49500|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "initial_ai": 3,
+        "attribute": "1&939690|2&177300|4&85695|5&76830|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -177,19 +177,19 @@
     },
     {
         "warId": 6023,
-        "actorName": "弓贼",
-        "actorId": 3502,
+        "actorName": "陈兰",
+        "actorId": 3504,
         "dataId": 2003,
         "relation": 2,
         "outIndex": 2,
         "dirction": 1,
-        "x": 7,
-        "y": 11,
+        "x": 9,
+        "y": 8,
         "var": 2003,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&181875|2&125625|4&43125|5&41250|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "initial_ai": 3,
+        "attribute": "1&939690|2&177300|4&85695|5&76830|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -199,24 +199,134 @@
     },
     {
         "warId": 6023,
-        "actorName": "弓贼",
-        "actorId": 3502,
+        "actorName": "山贼",
+        "actorId": 1012,
         "dataId": 2004,
         "relation": 2,
         "outIndex": 3,
         "dirction": 1,
-        "x": 7,
-        "y": 13,
+        "x": 4,
+        "y": 6,
         "var": 2004,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&181875|2&125625|4&43125|5&41250|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "attribute": "1&709200|2&108350|4&63040|5&39400|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
         "skill": 0,
         "seid": 0,
         "star": 0,
         "spine": 0,
         "bossStage": 0,
         "bloodShow": "1&0"
+    },
+    {
+        "warId": 6023,
+        "actorName": "山贼",
+        "actorId": 1012,
+        "dataId": 2005,
+        "relation": 2,
+        "outIndex": 4,
+        "dirction": 1,
+        "x": 7,
+        "y": 5,
+        "var": 2005,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&709200|2&108350|4&63040|5&39400|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bossStage": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6023,
+        "actorName": "山贼",
+        "actorId": 1012,
+        "dataId": 2006,
+        "relation": 2,
+        "outIndex": 5,
+        "dirction": 1,
+        "x": 10,
+        "y": 6,
+        "var": 2006,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&709200|2&108350|4&63040|5&39400|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bossStage": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6023,
+        "actorName": "山贼弓兵",
+        "actorId": 1042,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 6,
+        "y": 7,
+        "var": 2007,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&573270|2&131990|4&45310|5&43340|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bossStage": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6023,
+        "actorName": "山贼弓兵",
+        "actorId": 1042,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 8,
+        "y": 7,
+        "var": 2008,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&573270|2&131990|4&45310|5&43340|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bossStage": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6023,
+        "actorName": "山贼头目",
+        "actorId": 1043,
+        "dataId": 2009,
+        "relation": 2,
+        "outIndex": 8,
+        "dirction": 1,
+        "x": 7,
+        "y": 7,
+        "var": 2009,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&1063800|2&162525|4&94560|5&59100|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bossStage": 0,
+        "bloodShow": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6024.json b/shared/resource/warJsons/6024.json
index aa48c16c9..4fa152c26 100644
--- a/shared/resource/warJsons/6024.json
+++ b/shared/resource/warJsons/6024.json
@@ -133,13 +133,13 @@
         "relation": 2,
         "outIndex": 0,
         "dirction": 0,
-        "x": 15,
+        "x": 17,
         "y": 7,
         "var": 2001,
         "lv": 70,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&270000|2&123750|4&72000|5&45000|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "initial_ai": 3,
+        "attribute": "1&1609200|2&245850|4&143040|5&89400|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -154,13 +154,13 @@
         "relation": 2,
         "outIndex": 1,
         "dirction": 1,
-        "x": 13,
+        "x": 15,
         "y": 6,
         "var": 2002,
         "lv": 70,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&176250|2&129375|4&41250|5&56250|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "initial_ai": 3,
+        "attribute": "1&1050450|2&257025|4&81950|5&111750|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -175,13 +175,13 @@
         "relation": 2,
         "outIndex": 2,
         "dirction": 1,
-        "x": 13,
+        "x": 15,
         "y": 8,
         "var": 2003,
         "lv": 70,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&185625|2&121875|4&45000|5&60000|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "initial_ai": 3,
+        "attribute": "1&1106325|2&242125|4&89400|5&119200|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -196,13 +196,13 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 0,
-        "x": 15,
+        "x": 17,
         "y": 6,
         "var": 2004,
         "lv": 70,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&180000|2&120000|4&39375|5&63750|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "initial_ai": 3,
+        "attribute": "1&1072800|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -217,17 +217,185 @@
         "relation": 2,
         "outIndex": 4,
         "dirction": 0,
-        "x": 15,
+        "x": 17,
         "y": 8,
         "var": 2005,
         "lv": 70,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&180000|2&120000|4&39375|5&63750|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "initial_ai": 3,
+        "attribute": "1&1072800|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
         "skill": 0,
         "seid": 0,
         "star": 0,
         "spine": 0,
         "bloodShow": "0&1"
+    },
+    {
+        "warId": 6024,
+        "actorName": "兵家学子",
+        "actorId": 3606,
+        "dataId": 2006,
+        "relation": 2,
+        "outIndex": 5,
+        "dirction": 1,
+        "x": 9,
+        "y": 9,
+        "var": 2006,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1050450|2&257025|4&81950|5&111750|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6024,
+        "actorName": "儒家学子",
+        "actorId": 3607,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 9,
+        "y": 11,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1106325|2&242125|4&89400|5&119200|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6024,
+        "actorName": "墨家学子",
+        "actorId": 3608,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 0,
+        "x": 1,
+        "y": 9,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1072800|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6024,
+        "actorName": "医家学子",
+        "actorId": 3609,
+        "dataId": 2009,
+        "relation": 2,
+        "outIndex": 8,
+        "dirction": 0,
+        "x": 1,
+        "y": 11,
+        "var": 2009,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1072800|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6024,
+        "actorName": "兵家学子",
+        "actorId": 3606,
+        "dataId": 2010,
+        "relation": 2,
+        "outIndex": 9,
+        "dirction": 1,
+        "x": 8,
+        "y": 5,
+        "var": 2010,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1050450|2&257025|4&81950|5&111750|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6024,
+        "actorName": "儒家学子",
+        "actorId": 3607,
+        "dataId": 2011,
+        "relation": 2,
+        "outIndex": 10,
+        "dirction": 1,
+        "x": 8,
+        "y": 3,
+        "var": 2011,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1106325|2&242125|4&89400|5&119200|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6024,
+        "actorName": "墨家学子",
+        "actorId": 3608,
+        "dataId": 2012,
+        "relation": 2,
+        "outIndex": 11,
+        "dirction": 0,
+        "x": 10,
+        "y": 5,
+        "var": 2012,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1072800|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6024,
+        "actorName": "医家学子",
+        "actorId": 3609,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 0,
+        "x": 10,
+        "y": 3,
+        "var": 2013,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1072800|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6025.json b/shared/resource/warJsons/6025.json
index 8742e6853..e8f0b60d4 100644
--- a/shared/resource/warJsons/6025.json
+++ b/shared/resource/warJsons/6025.json
@@ -7,8 +7,8 @@
         "relation": 0,
         "outIndex": 0,
         "dirction": 2,
-        "x": 15,
-        "y": 10,
+        "x": 11,
+        "y": 12,
         "var": 501,
         "lv": 16,
         "hide": 0,
@@ -27,8 +27,8 @@
         "relation": 0,
         "outIndex": 1,
         "dirction": 2,
-        "x": 14,
-        "y": 10,
+        "x": 10,
+        "y": 12,
         "var": 502,
         "lv": 16,
         "hide": 0,
@@ -47,8 +47,8 @@
         "relation": 0,
         "outIndex": 2,
         "dirction": 2,
-        "x": 17,
-        "y": 12,
+        "x": 10,
+        "y": 13,
         "var": 503,
         "lv": 16,
         "hide": 0,
@@ -67,7 +67,7 @@
         "relation": 0,
         "outIndex": 3,
         "dirction": 2,
-        "x": 17,
+        "x": 9,
         "y": 13,
         "var": 504,
         "lv": 16,
@@ -87,8 +87,8 @@
         "relation": 0,
         "outIndex": 4,
         "dirction": 2,
-        "x": 11,
-        "y": 9,
+        "x": 13,
+        "y": 12,
         "var": 505,
         "lv": 16,
         "hide": 0,
@@ -107,8 +107,8 @@
         "relation": 0,
         "outIndex": 5,
         "dirction": 2,
-        "x": 11,
-        "y": 10,
+        "x": 13,
+        "y": 13,
         "var": 506,
         "lv": 16,
         "hide": 0,
@@ -132,8 +132,8 @@
         "var": 2001,
         "lv": 16,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&354600|2&162525|4&94560|5&59100|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "initial_ai": 3,
+        "attribute": "1&28080|2&4290|4&2496|5&1560|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -152,8 +152,8 @@
         "var": 2002,
         "lv": 16,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&243787|2&160062|4&59100|5&78800|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "initial_ai": 3,
+        "attribute": "1&19305|2&4225|4&1560|5&2080|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -172,8 +172,8 @@
         "var": 2003,
         "lv": 16,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&191090|2&131990|4&45310|5&43340|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "initial_ai": 3,
+        "attribute": "1&15132|2&3484|4&1196|5&1144|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -187,13 +187,13 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 0,
-        "x": 15,
-        "y": 17,
+        "x": 9,
+        "y": 7,
         "var": 2004,
         "lv": 16,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&243787|2&160062|4&59100|5&78800|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "attribute": "1&19305|2&4225|4&1560|5&2080|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -207,13 +207,13 @@
         "relation": 2,
         "outIndex": 4,
         "dirction": 0,
-        "x": 16,
-        "y": 18,
+        "x": 10,
+        "y": 6,
         "var": 2005,
         "lv": 16,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&236400|2&108350|4&63040|5&39400|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "attribute": "1&18720|2&2860|4&1664|5&1040|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -227,13 +227,13 @@
         "relation": 2,
         "outIndex": 5,
         "dirction": 0,
-        "x": 17,
-        "y": 18,
+        "x": 13,
+        "y": 5,
         "var": 2006,
         "lv": 16,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&231475|2&169912|4&54175|5&73875|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "attribute": "1&18330|2&4485|4&1430|5&1950|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -241,319 +241,19 @@
     },
     {
         "warId": 6025,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
+        "actorName": "黄巾弓兵",
+        "actorId": 1045,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 0,
-        "x": 16,
-        "y": 4,
+        "x": 14,
+        "y": 5,
         "var": 2007,
         "lv": 16,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&236400|2&108350|4&63040|5&39400|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6025,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 0,
-        "x": 11,
-        "y": 2,
-        "var": 2008,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&236400|2&108350|4&63040|5&39400|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6025,
-        "actorName": "黄巾弓兵",
-        "actorId": 1045,
-        "dataId": 2009,
-        "relation": 2,
-        "outIndex": 8,
-        "dirction": 0,
-        "x": 12,
-        "y": 2,
-        "var": 2009,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&191090|2&131990|4&45310|5&43340|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6025,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 0,
-        "x": 15,
-        "y": 2,
-        "var": 2010,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&236400|2&108350|4&63040|5&39400|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6025,
-        "actorName": "黄巾弓兵",
-        "actorId": 1045,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 0,
-        "x": 16,
-        "y": 2,
-        "var": 2011,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&191090|2&131990|4&45310|5&43340|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6025,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
-        "dataId": 2012,
-        "relation": 2,
-        "outIndex": 11,
-        "dirction": 0,
-        "x": 24,
-        "y": 8,
-        "var": 2012,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&236400|2&108350|4&63040|5&39400|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6025,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 0,
-        "x": 25,
-        "y": 8,
-        "var": 2013,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&236400|2&108350|4&63040|5&39400|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6025,
-        "actorName": "黄巾弓兵",
-        "actorId": 1045,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 0,
-        "x": 25,
-        "y": 9,
-        "var": 2014,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&191090|2&131990|4&45310|5&43340|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6025,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 0,
-        "x": 24,
-        "y": 15,
-        "var": 2015,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&236400|2&108350|4&63040|5&39400|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6025,
-        "actorName": "黄巾步兵",
-        "actorId": 1008,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 0,
-        "x": 25,
-        "y": 15,
-        "var": 2016,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&236400|2&108350|4&63040|5&39400|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6025,
-        "actorName": "黄巾术士",
-        "actorId": 1119,
-        "dataId": 2017,
-        "relation": 2,
-        "outIndex": 16,
-        "dirction": 0,
-        "x": 25,
-        "y": 14,
-        "var": 2017,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&231475|2&169912|4&54175|5&73875|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6025,
-        "actorName": "黄巾术士",
-        "actorId": 1119,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 5,
-        "y": 17,
-        "var": 2018,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&231475|2&169912|4&54175|5&73875|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6025,
-        "actorName": "狼",
-        "actorId": 1014,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 3,
-        "y": 6,
-        "var": 2019,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&200940|2&120170|4&35460|5&33490|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6025,
-        "actorName": "狼",
-        "actorId": 1014,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 3,
-        "y": 5,
-        "var": 2020,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&200940|2&120170|4&35460|5&33490|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6025,
-        "actorName": "狼",
-        "actorId": 1014,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 2,
-        "y": 6,
-        "var": 2021,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&200940|2&120170|4&35460|5&33490|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6025,
-        "actorName": "狼",
-        "actorId": 1014,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 2,
-        "y": 5,
-        "var": 2022,
-        "lv": 16,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&200940|2&120170|4&35460|5&33490|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "attribute": "1&15132|2&3484|4&1196|5&1144|9&100000|10&5000|11&10000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6026.json b/shared/resource/warJsons/6026.json
index af9d6ac44..58461ef57 100644
--- a/shared/resource/warJsons/6026.json
+++ b/shared/resource/warJsons/6026.json
@@ -126,14 +126,14 @@
         "dataId": 1501,
         "relation": 2,
         "outIndex": 0,
-        "dirction": 2,
+        "dirction": 1,
         "x": 11,
-        "y": 12,
+        "y": 13,
         "var": 1501,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&277770|2&203895|4&65010|5&88650|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "attribute": "1&97290|2&23805|4&7590|5&10350|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -146,14 +146,14 @@
         "dataId": 1502,
         "relation": 2,
         "outIndex": 1,
-        "dirction": 2,
+        "dirction": 1,
         "x": 9,
-        "y": 11,
+        "y": 12,
         "var": 1502,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&231475|2&169912|4&54175|5&73875|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -168,12 +168,12 @@
         "outIndex": 2,
         "dirction": 0,
         "x": 13,
-        "y": 11,
+        "y": 12,
         "var": 1503,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&231475|2&169912|4&54175|5&73875|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -186,14 +186,34 @@
         "dataId": 1504,
         "relation": 2,
         "outIndex": 3,
-        "dirction": 2,
+        "dirction": 1,
         "x": 7,
-        "y": 10,
+        "y": 11,
         "var": 1504,
         "lv": 30,
         "hide": 0,
         "initial_ai": 2,
-        "attribute": "1&231475|2&169912|4&54175|5&73875|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6026,
+        "actorName": "宫女亡魂",
+        "actorId": 3202,
+        "dataId": 1505,
+        "relation": 2,
+        "outIndex": 4,
+        "dirction": 2,
+        "x": 15,
+        "y": 11,
+        "var": 1505,
+        "lv": 30,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -206,14 +226,14 @@
         "dataId": 1506,
         "relation": 2,
         "outIndex": 5,
-        "dirction": 2,
-        "x": 4,
+        "dirction": 0,
+        "x": 11,
         "y": 8,
         "var": 1506,
         "lv": 30,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&231475|2&169912|4&54175|5&73875|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -227,13 +247,13 @@
         "relation": 2,
         "outIndex": 6,
         "dirction": 0,
-        "x": 18,
-        "y": 8,
+        "x": 8,
+        "y": 7,
         "var": 1507,
         "lv": 30,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&231475|2&169912|4&54175|5&73875|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -246,114 +266,14 @@
         "dataId": 1508,
         "relation": 2,
         "outIndex": 7,
-        "dirction": 2,
-        "x": 8,
-        "y": 3,
+        "dirction": 1,
+        "x": 14,
+        "y": 7,
         "var": 1508,
         "lv": 30,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&231475|2&169912|4&54175|5&73875|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6026,
-        "actorName": "宫女亡魂",
-        "actorId": 3202,
-        "dataId": 1509,
-        "relation": 2,
-        "outIndex": 8,
-        "dirction": 0,
-        "x": 15,
-        "y": 3,
-        "var": 1509,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&231475|2&169912|4&54175|5&73875|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6026,
-        "actorName": "宫女亡魂",
-        "actorId": 3202,
-        "dataId": 1510,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 2,
-        "x": 4,
-        "y": 6,
-        "var": 1510,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&231475|2&169912|4&54175|5&73875|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6026,
-        "actorName": "宫女亡魂",
-        "actorId": 3202,
-        "dataId": 1511,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 0,
-        "x": 18,
-        "y": 6,
-        "var": 1511,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&231475|2&169912|4&54175|5&73875|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6026,
-        "actorName": "宫女亡魂",
-        "actorId": 3202,
-        "dataId": 1512,
-        "relation": 2,
-        "outIndex": 11,
-        "dirction": 2,
-        "x": 8,
-        "y": 12,
-        "var": 1512,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&231475|2&169912|4&54175|5&73875|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6026,
-        "actorName": "宫女亡魂",
-        "actorId": 3202,
-        "dataId": 1513,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 0,
-        "x": 15,
-        "y": 12,
-        "var": 1513,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&231475|2&169912|4&54175|5&73875|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "attribute": "1&81075|2&19837|4&6325|5&8625|9&105000|10&5000|11&15000|12&0|18&50000|19&0|20&0|21&0|22&0|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
diff --git a/shared/resource/warJsons/6027.json b/shared/resource/warJsons/6027.json
index 4ff0e1c36..a25dc0282 100644
--- a/shared/resource/warJsons/6027.json
+++ b/shared/resource/warJsons/6027.json
@@ -127,13 +127,13 @@
         "relation": 2,
         "outIndex": 0,
         "dirction": 2,
-        "x": 8,
-        "y": 8,
+        "x": 13,
+        "y": 9,
         "var": 1501,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&261025|2&147750|4&71412|5&64025|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -147,13 +147,13 @@
         "relation": 2,
         "outIndex": 1,
         "dirction": 0,
-        "x": 14,
-        "y": 9,
+        "x": 11,
+        "y": 10,
         "var": 1502,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&261025|2&147750|4&71412|5&64025|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -167,13 +167,13 @@
         "relation": 2,
         "outIndex": 2,
         "dirction": 2,
-        "x": 6,
-        "y": 10,
+        "x": 11,
+        "y": 11,
         "var": 1503,
         "lv": 34,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&261025|2&147750|4&71412|5&64025|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -187,13 +187,13 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 0,
-        "x": 14,
+        "x": 5,
         "y": 11,
         "var": 1504,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&261025|2&147750|4&71412|5&64025|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -207,13 +207,13 @@
         "relation": 2,
         "outIndex": 4,
         "dirction": 0,
-        "x": 10,
+        "x": 5,
         "y": 12,
         "var": 1505,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&261025|2&147750|4&71412|5&64025|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -227,13 +227,13 @@
         "relation": 2,
         "outIndex": 5,
         "dirction": 0,
-        "x": 3,
-        "y": 13,
+        "x": 4,
+        "y": 9,
         "var": 1506,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&261025|2&147750|4&71412|5&64025|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -247,13 +247,13 @@
         "relation": 2,
         "outIndex": 6,
         "dirction": 2,
-        "x": 13,
-        "y": 13,
+        "x": 6,
+        "y": 17,
         "var": 1507,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&261025|2&147750|4&71412|5&64025|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -267,113 +267,13 @@
         "relation": 2,
         "outIndex": 7,
         "dirction": 2,
-        "x": 7,
-        "y": 15,
+        "x": 12,
+        "y": 17,
         "var": 1508,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&261025|2&147750|4&71412|5&64025|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6027,
-        "actorName": "皇宫禁卫鬼侍",
-        "actorId": 3204,
-        "dataId": 1509,
-        "relation": 2,
-        "outIndex": 8,
-        "dirction": 2,
-        "x": 3,
-        "y": 15,
-        "var": 1509,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&261025|2&147750|4&71412|5&64025|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6027,
-        "actorName": "皇宫禁卫鬼侍",
-        "actorId": 3204,
-        "dataId": 1510,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 0,
-        "x": 12,
-        "y": 16,
-        "var": 1510,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&261025|2&147750|4&71412|5&64025|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6027,
-        "actorName": "皇宫禁卫鬼侍",
-        "actorId": 3204,
-        "dataId": 1511,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 2,
-        "x": 8,
-        "y": 17,
-        "var": 1511,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&261025|2&147750|4&71412|5&64025|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6027,
-        "actorName": "皇宫禁卫鬼侍",
-        "actorId": 3204,
-        "dataId": 1512,
-        "relation": 2,
-        "outIndex": 11,
-        "dirction": 0,
-        "x": 11,
-        "y": 17,
-        "var": 1512,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&261025|2&147750|4&71412|5&64025|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
-        "skill": 0,
-        "seid": 0,
-        "star": 0,
-        "spine": 0
-    },
-    {
-        "warId": 6027,
-        "actorName": "皇宫禁卫鬼侍",
-        "actorId": 3204,
-        "dataId": 1513,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 2,
-        "x": 5,
-        "y": 18,
-        "var": 1513,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&261025|2&147750|4&71412|5&64025|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "attribute": "1&194775|2&36750|4&17762|5&15925|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -383,17 +283,17 @@
         "warId": 6027,
         "actorName": "何进",
         "actorId": 3203,
-        "dataId": 1514,
+        "dataId": 1509,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 8,
         "dirction": 0,
         "x": 9,
-        "y": 19,
-        "var": 1514,
+        "y": 16,
+        "var": 1509,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&354600|2&162525|4&94560|5&59100|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "attribute": "1&264600|2&40425|4&23520|5&14700|9&110000|10&10000|11&20000|12&5000|18&50000|19&10000|20&10000|21&10000|22&10000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
diff --git a/shared/resource/warJsons/6028.json b/shared/resource/warJsons/6028.json
index fcdf5ba16..ecfb9559c 100644
--- a/shared/resource/warJsons/6028.json
+++ b/shared/resource/warJsons/6028.json
@@ -132,8 +132,8 @@
         "var": 2001,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&354600|2&162525|4&94560|5&59100|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "initial_ai": 3,
+        "attribute": "1&421200|2&64350|4&37440|5&23400|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -147,13 +147,13 @@
         "relation": 2,
         "outIndex": 1,
         "dirction": 1,
-        "x": 7,
-        "y": 3,
+        "x": 2,
+        "y": 6,
         "var": 2002,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&295500|2&135437|4&78800|5&49250|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "initial_ai": 3,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -167,13 +167,13 @@
         "relation": 2,
         "outIndex": 2,
         "dirction": 1,
-        "x": 7,
-        "y": 7,
+        "x": 2,
+        "y": 4,
         "var": 2003,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&295500|2&135437|4&78800|5&49250|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "initial_ai": 3,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -187,13 +187,13 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 1,
-        "x": 10,
-        "y": 3,
+        "x": 5,
+        "y": 7,
         "var": 2004,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&295500|2&135437|4&78800|5&49250|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "initial_ai": 3,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -207,13 +207,13 @@
         "relation": 2,
         "outIndex": 4,
         "dirction": 1,
-        "x": 10,
+        "x": 6,
         "y": 7,
         "var": 2005,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&295500|2&135437|4&78800|5&49250|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "initial_ai": 3,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -227,13 +227,13 @@
         "relation": 2,
         "outIndex": 5,
         "dirction": 1,
-        "x": 13,
+        "x": 10,
         "y": 3,
         "var": 2006,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&295500|2&135437|4&78800|5&49250|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -247,13 +247,73 @@
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 13,
-        "y": 7,
+        "x": 10,
+        "y": 2,
         "var": 2007,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&295500|2&135437|4&78800|5&49250|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6028,
+        "actorName": "黄巾鬼卒",
+        "actorId": 3304,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 10,
+        "y": 6,
+        "var": 2008,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6028,
+        "actorName": "黄巾鬼卒",
+        "actorId": 3304,
+        "dataId": 2009,
+        "relation": 2,
+        "outIndex": 8,
+        "dirction": 1,
+        "x": 10,
+        "y": 7,
+        "var": 2009,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6028,
+        "actorName": "黄巾鬼卒",
+        "actorId": 3304,
+        "dataId": 2010,
+        "relation": 2,
+        "outIndex": 9,
+        "dirction": 1,
+        "x": 11,
+        "y": 7,
+        "var": 2010,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&351000|2&53625|4&31200|5&19500|9&115000|10&20000|11&25000|12&15000|18&50000|19&20000|20&20000|21&20000|22&20000|28&50000",
         "skill": 0,
         "seid": 0,
         "star": 0,
diff --git a/shared/resource/warJsons/6029.json b/shared/resource/warJsons/6029.json
index c5df76f1b..3cbbef0a6 100644
--- a/shared/resource/warJsons/6029.json
+++ b/shared/resource/warJsons/6029.json
@@ -127,13 +127,13 @@
         "relation": 2,
         "outIndex": 0,
         "dirction": 1,
-        "x": 3,
-        "y": 5,
+        "x": 2,
+        "y": 7,
         "var": 2001,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&420180|2&308430|4&98340|5&134100|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "initial_ai": 3,
+        "attribute": "1&537210|2&131445|4&41910|5&57150|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -147,13 +147,13 @@
         "relation": 2,
         "outIndex": 1,
         "dirction": 1,
-        "x": 7,
-        "y": 5,
+        "x": 2,
+        "y": 8,
         "var": 2002,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&368775|2&242125|4&89400|5&119200|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "initial_ai": 3,
+        "attribute": "1&471486|2&103187|4&38100|5&50800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -167,13 +167,13 @@
         "relation": 2,
         "outIndex": 2,
         "dirction": 1,
-        "x": 7,
-        "y": 6,
+        "x": 3,
+        "y": 8,
         "var": 2003,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&368775|2&242125|4&89400|5&119200|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "initial_ai": 3,
+        "attribute": "1&471486|2&103187|4&38100|5&50800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -187,13 +187,153 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 1,
-        "x": 7,
-        "y": 4,
+        "x": 2,
+        "y": 3,
         "var": 2004,
         "lv": 20,
         "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&471486|2&103187|4&38100|5&50800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6029,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2005,
+        "relation": 2,
+        "outIndex": 4,
+        "dirction": 1,
+        "x": 3,
+        "y": 2,
+        "var": 2005,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&471486|2&103187|4&38100|5&50800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6029,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2006,
+        "relation": 2,
+        "outIndex": 5,
+        "dirction": 1,
+        "x": 5,
+        "y": 6,
+        "var": 2006,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&471486|2&103187|4&38100|5&50800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6029,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 5,
+        "y": 4,
+        "var": 2007,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&471486|2&103187|4&38100|5&50800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6029,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 6,
+        "y": 8,
+        "var": 2008,
+        "lv": 20,
+        "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&368775|2&242125|4&89400|5&119200|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "attribute": "1&471486|2&103187|4&38100|5&50800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6029,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2009,
+        "relation": 2,
+        "outIndex": 8,
+        "dirction": 1,
+        "x": 6,
+        "y": 5,
+        "var": 2009,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&471486|2&103187|4&38100|5&50800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6029,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2010,
+        "relation": 2,
+        "outIndex": 9,
+        "dirction": 1,
+        "x": 6,
+        "y": 4,
+        "var": 2010,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&471486|2&103187|4&38100|5&50800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0
+    },
+    {
+        "warId": 6029,
+        "actorName": "阴曹刑者",
+        "actorId": 3306,
+        "dataId": 2011,
+        "relation": 2,
+        "outIndex": 10,
+        "dirction": 1,
+        "x": 7,
+        "y": 8,
+        "var": 2011,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&471486|2&103187|4&38100|5&50800|9&120000|10&30000|11&30000|12&25000|18&55000|19&30000|20&30000|21&30000|22&30000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
diff --git a/shared/resource/warJsons/6030.json b/shared/resource/warJsons/6030.json
index a1722f8de..cd8526195 100644
--- a/shared/resource/warJsons/6030.json
+++ b/shared/resource/warJsons/6030.json
@@ -7,8 +7,8 @@
         "relation": 0,
         "outIndex": 0,
         "dirction": 1,
-        "x": 8,
-        "y": 2,
+        "x": 4,
+        "y": 3,
         "var": 501,
         "lv": 20,
         "hide": 0,
@@ -30,7 +30,7 @@
         "relation": 0,
         "outIndex": 1,
         "dirction": 1,
-        "x": 8,
+        "x": 5,
         "y": 3,
         "var": 502,
         "lv": 20,
@@ -53,8 +53,8 @@
         "relation": 0,
         "outIndex": 2,
         "dirction": 1,
-        "x": 8,
-        "y": 4,
+        "x": 6,
+        "y": 3,
         "var": 503,
         "lv": 20,
         "hide": 0,
@@ -77,7 +77,7 @@
         "outIndex": 3,
         "dirction": 0,
         "x": 8,
-        "y": 6,
+        "y": 3,
         "var": 504,
         "lv": 20,
         "hide": 0,
@@ -99,8 +99,8 @@
         "relation": 0,
         "outIndex": 4,
         "dirction": 0,
-        "x": 8,
-        "y": 7,
+        "x": 9,
+        "y": 3,
         "var": 505,
         "lv": 20,
         "hide": 0,
@@ -122,8 +122,8 @@
         "relation": 0,
         "outIndex": 5,
         "dirction": 0,
-        "x": 8,
-        "y": 8,
+        "x": 10,
+        "y": 3,
         "var": 506,
         "lv": 20,
         "hide": 0,
@@ -139,19 +139,19 @@
     },
     {
         "warId": 6030,
-        "actorName": "乌桓使者",
-        "actorId": 3402,
+        "actorName": "图吉",
+        "actorId": 3404,
         "dataId": 2001,
         "relation": 2,
         "outIndex": 0,
         "dirction": 0,
-        "x": 11,
-        "y": 5,
+        "x": 7,
+        "y": 7,
         "var": 2001,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 7,
-        "attribute": "1&442530|2&290550|4&107280|5&143040|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "initial_ai": 3,
+        "attribute": "1&810000|2&123750|4&72000|5&45000|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -162,19 +162,19 @@
     },
     {
         "warId": 6030,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "狼图腾",
+        "actorId": 3409,
         "dataId": 2002,
         "relation": 2,
         "outIndex": 1,
-        "dirction": 0,
-        "x": 13,
-        "y": 3,
+        "dirction": 1,
+        "x": 3,
+        "y": 2,
         "var": 2002,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&333760|2&196680|4&74500|5&68540|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "attribute": "1&573750|2&114375|4&33750|5&31875|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -185,19 +185,19 @@
     },
     {
         "warId": 6030,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "狼图腾",
+        "actorId": 3409,
         "dataId": 2003,
         "relation": 2,
         "outIndex": 2,
-        "dirction": 0,
-        "x": 13,
-        "y": 8,
+        "dirction": 2,
+        "x": 11,
+        "y": 2,
         "var": 2003,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&333760|2&196680|4&74500|5&68540|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "attribute": "1&573750|2&114375|4&33750|5&31875|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -208,19 +208,19 @@
     },
     {
         "warId": 6030,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "狼图腾",
+        "actorId": 3409,
         "dataId": 2004,
         "relation": 2,
         "outIndex": 3,
-        "dirction": 0,
-        "x": 18,
-        "y": 3,
+        "dirction": 3,
+        "x": 7,
+        "y": 5,
         "var": 2004,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&333760|2&196680|4&74500|5&68540|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "attribute": "1&573750|2&114375|4&33750|5&31875|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -231,19 +231,19 @@
     },
     {
         "warId": 6030,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "狼图腾",
+        "actorId": 3409,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
-        "dirction": 0,
-        "x": 18,
+        "dirction": 4,
+        "x": 3,
         "y": 8,
         "var": 2005,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&333760|2&196680|4&74500|5&68540|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "attribute": "1&573750|2&114375|4&33750|5&31875|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -254,19 +254,19 @@
     },
     {
         "warId": 6030,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "狼图腾",
+        "actorId": 3409,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
-        "dirction": 0,
-        "x": 22,
-        "y": 3,
+        "dirction": 5,
+        "x": 11,
+        "y": 8,
         "var": 2006,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&333760|2&196680|4&74500|5&68540|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "attribute": "1&573750|2&114375|4&33750|5&31875|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -277,19 +277,19 @@
     },
     {
         "warId": 6030,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "巨狼勇士",
+        "actorId": 1134,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 0,
-        "x": 22,
-        "y": 8,
+        "x": 3,
+        "y": 6,
         "var": 2007,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&333760|2&196680|4&74500|5&68540|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "attribute": "1&675000|2&103125|4&60000|5&37500|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -300,19 +300,19 @@
     },
     {
         "warId": 6030,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "巨狼勇士",
+        "actorId": 1134,
         "dataId": 2008,
         "relation": 2,
         "outIndex": 7,
         "dirction": 0,
-        "x": 27,
-        "y": 3,
+        "x": 11,
+        "y": 6,
         "var": 2008,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&333760|2&196680|4&74500|5&68540|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "attribute": "1&675000|2&103125|4&60000|5&37500|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -323,19 +323,19 @@
     },
     {
         "warId": 6030,
-        "actorName": "乌桓突骑",
-        "actorId": 3403,
+        "actorName": "乌桓萨满",
+        "actorId": 1532,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 0,
-        "x": 27,
+        "x": 5,
         "y": 8,
         "var": 2009,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&333760|2&196680|4&74500|5&68540|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "initial_ai": 3,
+        "attribute": "1&423000|2&103500|4&33000|5&45000|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -343,5 +343,28 @@
         "bossStage": 0,
         "bloodShow": "1&0",
         "dest_point": 0
+    },
+    {
+        "warId": 6030,
+        "actorName": "乌桓萨满",
+        "actorId": 1532,
+        "dataId": 2010,
+        "relation": 2,
+        "outIndex": 9,
+        "dirction": 0,
+        "x": 9,
+        "y": 8,
+        "var": 2010,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&423000|2&103500|4&33000|5&45000|9&130000|10&40000|11&40000|12&35000|18&55000|19&40000|20&40000|21&40000|22&40000|28&55000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bossStage": 0,
+        "bloodShow": 0,
+        "dest_point": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6031.json b/shared/resource/warJsons/6031.json
index a0d9b6f0a..d5d1fba2d 100644
--- a/shared/resource/warJsons/6031.json
+++ b/shared/resource/warJsons/6031.json
@@ -133,19 +133,19 @@
     },
     {
         "warId": 6031,
-        "actorName": "弓贼",
-        "actorId": 3502,
+        "actorName": "陈兰",
+        "actorId": 3504,
         "dataId": 2001,
         "relation": 2,
         "outIndex": 0,
         "dirction": 1,
-        "x": 7,
-        "y": 9,
+        "x": 5,
+        "y": 8,
         "var": 2001,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&361325|2&249575|4&85675|5&81950|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "initial_ai": 3,
+        "attribute": "1&939690|2&177300|4&85695|5&76830|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -155,19 +155,19 @@
     },
     {
         "warId": 6031,
-        "actorName": "雷绪",
-        "actorId": 3501,
+        "actorName": "陈兰",
+        "actorId": 3504,
         "dataId": 2002,
         "relation": 2,
         "outIndex": 1,
         "dirction": 1,
         "x": 7,
-        "y": 7,
+        "y": 8,
         "var": 2002,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&433590|2&299490|4&102810|5&98340|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "initial_ai": 3,
+        "attribute": "1&939690|2&177300|4&85695|5&76830|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -177,19 +177,19 @@
     },
     {
         "warId": 6031,
-        "actorName": "弓贼",
-        "actorId": 3502,
+        "actorName": "陈兰",
+        "actorId": 3504,
         "dataId": 2003,
         "relation": 2,
         "outIndex": 2,
         "dirction": 1,
-        "x": 7,
-        "y": 11,
+        "x": 9,
+        "y": 8,
         "var": 2003,
         "lv": 20,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&361325|2&249575|4&85675|5&81950|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "initial_ai": 3,
+        "attribute": "1&939690|2&177300|4&85695|5&76830|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -199,24 +199,134 @@
     },
     {
         "warId": 6031,
-        "actorName": "弓贼",
-        "actorId": 3502,
+        "actorName": "山贼",
+        "actorId": 1012,
         "dataId": 2004,
         "relation": 2,
         "outIndex": 3,
         "dirction": 1,
-        "x": 7,
-        "y": 13,
+        "x": 4,
+        "y": 6,
         "var": 2004,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&361325|2&249575|4&85675|5&81950|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "attribute": "1&709200|2&108350|4&63040|5&39400|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
         "skill": 0,
         "seid": 0,
         "star": 0,
         "spine": 0,
         "bossStage": 0,
         "bloodShow": "1&0"
+    },
+    {
+        "warId": 6031,
+        "actorName": "山贼",
+        "actorId": 1012,
+        "dataId": 2005,
+        "relation": 2,
+        "outIndex": 4,
+        "dirction": 1,
+        "x": 7,
+        "y": 5,
+        "var": 2005,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&709200|2&108350|4&63040|5&39400|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bossStage": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6031,
+        "actorName": "山贼",
+        "actorId": 1012,
+        "dataId": 2006,
+        "relation": 2,
+        "outIndex": 5,
+        "dirction": 1,
+        "x": 10,
+        "y": 6,
+        "var": 2006,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&709200|2&108350|4&63040|5&39400|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bossStage": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6031,
+        "actorName": "山贼弓兵",
+        "actorId": 1042,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 6,
+        "y": 7,
+        "var": 2007,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&573270|2&131990|4&45310|5&43340|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bossStage": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6031,
+        "actorName": "山贼弓兵",
+        "actorId": 1042,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 8,
+        "y": 7,
+        "var": 2008,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&573270|2&131990|4&45310|5&43340|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bossStage": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6031,
+        "actorName": "山贼头目",
+        "actorId": 1043,
+        "dataId": 2009,
+        "relation": 2,
+        "outIndex": 8,
+        "dirction": 1,
+        "x": 7,
+        "y": 7,
+        "var": 2009,
+        "lv": 20,
+        "hide": 0,
+        "initial_ai": 1,
+        "attribute": "1&1063800|2&162525|4&94560|5&59100|9&140000|10&50000|11&50000|12&45000|18&55000|19&50000|20&50000|21&50000|22&50000|28&60000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bossStage": 0,
+        "bloodShow": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6032.json b/shared/resource/warJsons/6032.json
index 91c0d3100..b1fe6c5e2 100644
--- a/shared/resource/warJsons/6032.json
+++ b/shared/resource/warJsons/6032.json
@@ -133,13 +133,13 @@
         "relation": 2,
         "outIndex": 0,
         "dirction": 0,
-        "x": 15,
+        "x": 17,
         "y": 7,
         "var": 2001,
         "lv": 70,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&536400|2&245850|4&143040|5&89400|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "initial_ai": 3,
+        "attribute": "1&1609200|2&245850|4&143040|5&89400|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -154,13 +154,13 @@
         "relation": 2,
         "outIndex": 1,
         "dirction": 1,
-        "x": 13,
+        "x": 15,
         "y": 6,
         "var": 2002,
         "lv": 70,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&350150|2&257025|4&81950|5&111750|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "initial_ai": 3,
+        "attribute": "1&1050450|2&257025|4&81950|5&111750|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -175,13 +175,13 @@
         "relation": 2,
         "outIndex": 2,
         "dirction": 1,
-        "x": 13,
+        "x": 15,
         "y": 8,
         "var": 2003,
         "lv": 70,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&368775|2&242125|4&89400|5&119200|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "initial_ai": 3,
+        "attribute": "1&1106325|2&242125|4&89400|5&119200|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -196,13 +196,13 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 0,
-        "x": 15,
+        "x": 17,
         "y": 6,
         "var": 2004,
         "lv": 70,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&357600|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "initial_ai": 3,
+        "attribute": "1&1072800|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
         "skill": 0,
         "seid": 0,
         "star": 0,
@@ -217,17 +217,185 @@
         "relation": 2,
         "outIndex": 4,
         "dirction": 0,
-        "x": 15,
+        "x": 17,
         "y": 8,
         "var": 2005,
         "lv": 70,
         "hide": 0,
-        "initial_ai": 1,
-        "attribute": "1&357600|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "initial_ai": 3,
+        "attribute": "1&1072800|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
         "skill": 0,
         "seid": 0,
         "star": 0,
         "spine": 0,
         "bloodShow": "0&1"
+    },
+    {
+        "warId": 6032,
+        "actorName": "兵家学子",
+        "actorId": 3606,
+        "dataId": 2006,
+        "relation": 2,
+        "outIndex": 5,
+        "dirction": 1,
+        "x": 9,
+        "y": 9,
+        "var": 2006,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1050450|2&257025|4&81950|5&111750|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6032,
+        "actorName": "儒家学子",
+        "actorId": 3607,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 9,
+        "y": 11,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1106325|2&242125|4&89400|5&119200|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6032,
+        "actorName": "墨家学子",
+        "actorId": 3608,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 0,
+        "x": 1,
+        "y": 9,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1072800|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6032,
+        "actorName": "医家学子",
+        "actorId": 3609,
+        "dataId": 2009,
+        "relation": 2,
+        "outIndex": 8,
+        "dirction": 0,
+        "x": 1,
+        "y": 11,
+        "var": 2009,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1072800|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6032,
+        "actorName": "兵家学子",
+        "actorId": 3606,
+        "dataId": 2010,
+        "relation": 2,
+        "outIndex": 9,
+        "dirction": 1,
+        "x": 8,
+        "y": 5,
+        "var": 2010,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1050450|2&257025|4&81950|5&111750|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6032,
+        "actorName": "儒家学子",
+        "actorId": 3607,
+        "dataId": 2011,
+        "relation": 2,
+        "outIndex": 10,
+        "dirction": 1,
+        "x": 8,
+        "y": 3,
+        "var": 2011,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1106325|2&242125|4&89400|5&119200|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6032,
+        "actorName": "墨家学子",
+        "actorId": 3608,
+        "dataId": 2012,
+        "relation": 2,
+        "outIndex": 11,
+        "dirction": 0,
+        "x": 10,
+        "y": 5,
+        "var": 2012,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1072800|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
+    },
+    {
+        "warId": 6032,
+        "actorName": "医家学子",
+        "actorId": 3609,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 0,
+        "x": 10,
+        "y": 3,
+        "var": 2013,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&1072800|2&238400|4&78225|5&126650|9&160000|10&70000|11&70000|12&65000|18&60000|19&70000|20&70000|21&70000|22&70000|28&70000",
+        "skill": 0,
+        "seid": 0,
+        "star": 0,
+        "spine": 0,
+        "bloodShow": 0
     }
 ]
\ No newline at end of file