diff --git a/shared/resource/warJsons/6025.json b/shared/resource/warJsons/6025.json
index f1faa874e..f9087c480 100644
--- a/shared/resource/warJsons/6025.json
+++ b/shared/resource/warJsons/6025.json
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6025,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 17,
+        "y": 4,
         "var": 2007,
         "lv": 30,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6025,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 7,
-        "y": 2,
-        "var": 2008,
-        "lv": 30,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
+        "attribute": "1&2880|2&1320|4&768|5&480",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6025,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 17,
+        "y": 5,
+        "var": 2008,
+        "lv": 30,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&2880|2&1320|4&768|5&480",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6025,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 4,
         "var": 2009,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2880|2&1320|4&768|5&480",
+        "attribute": "1&2688|2&1584|4&600|5&552",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6025,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 5,
         "var": 2010,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2880|2&1320|4&768|5&480",
+        "attribute": "1&2688|2&1584|4&600|5&552",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6025,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 4,
         "var": 2011,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2688|2&1584|4&600|5&552",
+        "attribute": "1&2376|2&1560|4&576|5&768",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,38 +341,18 @@
     },
     {
         "warId": 6025,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 5,
         "var": 2012,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2688|2&1584|4&600|5&552",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6025,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 19,
-        "y": 4,
-        "var": 2013,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&2376|2&1560|4&576|5&768",
         "skill": 0,
         "seid": 0,
@@ -381,19 +361,39 @@
     },
     {
         "warId": 6025,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 1,
+        "x": 18,
+        "y": 13,
+        "var": 2013,
+        "lv": 30,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&2880|2&1320|4&768|5&480",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6025,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
         "x": 19,
-        "y": 5,
+        "y": 13,
         "var": 2014,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2376|2&1560|4&576|5&768",
+        "attribute": "1&2880|2&1320|4&768|5&480",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,19 @@
     },
     {
         "warId": 6025,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 20,
-        "y": 4,
+        "x": 18,
+        "y": 14,
         "var": 2015,
         "lv": 30,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
+        "attribute": "1&2688|2&1584|4&600|5&552",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -421,19 +421,19 @@
     },
     {
         "warId": 6025,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2016,
         "relation": 2,
         "outIndex": 15,
         "dirction": 1,
-        "x": 20,
-        "y": 5,
+        "x": 19,
+        "y": 14,
         "var": 2016,
         "lv": 30,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
+        "attribute": "1&2688|2&1584|4&600|5&552",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -441,19 +441,19 @@
     },
     {
         "warId": 6025,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
         "x": 18,
-        "y": 13,
+        "y": 15,
         "var": 2017,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2880|2&1320|4&768|5&480",
+        "attribute": "1&2376|2&1560|4&576|5&768",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -461,142 +461,22 @@
     },
     {
         "warId": 6025,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2018,
         "relation": 2,
         "outIndex": 17,
         "dirction": 1,
         "x": 19,
-        "y": 13,
+        "y": 15,
         "var": 2018,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2880|2&1320|4&768|5&480",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6025,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 18,
-        "y": 14,
-        "var": 2019,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&2688|2&1584|4&600|5&552",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6025,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 19,
-        "y": 14,
-        "var": 2020,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&2688|2&1584|4&600|5&552",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6025,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 18,
-        "y": 15,
-        "var": 2021,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&2376|2&1560|4&576|5&768",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6025,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 19,
-        "y": 15,
-        "var": 2022,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&2376|2&1560|4&576|5&768",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6025,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 17,
-        "y": 15,
-        "var": 2023,
-        "lv": 30,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6025,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 15,
-        "var": 2024,
-        "lv": 30,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6026.json b/shared/resource/warJsons/6026.json
index 62a35701a..b7e082433 100644
--- a/shared/resource/warJsons/6026.json
+++ b/shared/resource/warJsons/6026.json
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6026,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 17,
+        "y": 4,
         "var": 2007,
         "lv": 30,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6026,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 7,
-        "y": 2,
-        "var": 2008,
-        "lv": 30,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
+        "attribute": "1&2880|2&1320|4&768|5&480",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6026,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 17,
+        "y": 5,
+        "var": 2008,
+        "lv": 30,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&2880|2&1320|4&768|5&480",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6026,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 4,
         "var": 2009,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2880|2&1320|4&768|5&480",
+        "attribute": "1&2688|2&1584|4&600|5&552",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6026,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 5,
         "var": 2010,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2880|2&1320|4&768|5&480",
+        "attribute": "1&2688|2&1584|4&600|5&552",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6026,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 4,
         "var": 2011,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2688|2&1584|4&600|5&552",
+        "attribute": "1&2376|2&1560|4&576|5&768",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,38 +341,18 @@
     },
     {
         "warId": 6026,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 5,
         "var": 2012,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2688|2&1584|4&600|5&552",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6026,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 19,
-        "y": 4,
-        "var": 2013,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&2376|2&1560|4&576|5&768",
         "skill": 0,
         "seid": 0,
@@ -381,19 +361,39 @@
     },
     {
         "warId": 6026,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 1,
+        "x": 18,
+        "y": 13,
+        "var": 2013,
+        "lv": 30,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&2880|2&1320|4&768|5&480",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6026,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
         "x": 19,
-        "y": 5,
+        "y": 13,
         "var": 2014,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2376|2&1560|4&576|5&768",
+        "attribute": "1&2880|2&1320|4&768|5&480",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,19 @@
     },
     {
         "warId": 6026,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 20,
-        "y": 4,
+        "x": 18,
+        "y": 14,
         "var": 2015,
         "lv": 30,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
+        "attribute": "1&2688|2&1584|4&600|5&552",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -421,19 +421,19 @@
     },
     {
         "warId": 6026,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2016,
         "relation": 2,
         "outIndex": 15,
         "dirction": 1,
-        "x": 20,
-        "y": 5,
+        "x": 19,
+        "y": 14,
         "var": 2016,
         "lv": 30,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
+        "attribute": "1&2688|2&1584|4&600|5&552",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -441,19 +441,19 @@
     },
     {
         "warId": 6026,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
         "x": 18,
-        "y": 13,
+        "y": 15,
         "var": 2017,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2880|2&1320|4&768|5&480",
+        "attribute": "1&2376|2&1560|4&576|5&768",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -461,142 +461,22 @@
     },
     {
         "warId": 6026,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2018,
         "relation": 2,
         "outIndex": 17,
         "dirction": 1,
         "x": 19,
-        "y": 13,
+        "y": 15,
         "var": 2018,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2880|2&1320|4&768|5&480",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6026,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 18,
-        "y": 14,
-        "var": 2019,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&2688|2&1584|4&600|5&552",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6026,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 19,
-        "y": 14,
-        "var": 2020,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&2688|2&1584|4&600|5&552",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6026,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 18,
-        "y": 15,
-        "var": 2021,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&2376|2&1560|4&576|5&768",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6026,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 19,
-        "y": 15,
-        "var": 2022,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&2376|2&1560|4&576|5&768",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6026,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 17,
-        "y": 15,
-        "var": 2023,
-        "lv": 30,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6026,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 15,
-        "var": 2024,
-        "lv": 30,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6027.json b/shared/resource/warJsons/6027.json
index 29cddbc62..78df3132d 100644
--- a/shared/resource/warJsons/6027.json
+++ b/shared/resource/warJsons/6027.json
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6027,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 17,
+        "y": 4,
         "var": 2007,
         "lv": 30,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6027,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 7,
-        "y": 2,
-        "var": 2008,
-        "lv": 30,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
+        "attribute": "1&2880|2&1320|4&768|5&480",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6027,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 17,
+        "y": 5,
+        "var": 2008,
+        "lv": 30,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&2880|2&1320|4&768|5&480",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6027,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 4,
         "var": 2009,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2880|2&1320|4&768|5&480",
+        "attribute": "1&2688|2&1584|4&600|5&552",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6027,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 5,
         "var": 2010,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2880|2&1320|4&768|5&480",
+        "attribute": "1&2688|2&1584|4&600|5&552",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6027,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 4,
         "var": 2011,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2688|2&1584|4&600|5&552",
+        "attribute": "1&2376|2&1560|4&576|5&768",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,38 +341,18 @@
     },
     {
         "warId": 6027,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 5,
         "var": 2012,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2688|2&1584|4&600|5&552",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6027,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 19,
-        "y": 4,
-        "var": 2013,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&2376|2&1560|4&576|5&768",
         "skill": 0,
         "seid": 0,
@@ -381,19 +361,39 @@
     },
     {
         "warId": 6027,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 1,
+        "x": 18,
+        "y": 13,
+        "var": 2013,
+        "lv": 30,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&2880|2&1320|4&768|5&480",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6027,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
         "x": 19,
-        "y": 5,
+        "y": 13,
         "var": 2014,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2376|2&1560|4&576|5&768",
+        "attribute": "1&2880|2&1320|4&768|5&480",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,19 @@
     },
     {
         "warId": 6027,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 20,
-        "y": 4,
+        "x": 18,
+        "y": 14,
         "var": 2015,
         "lv": 30,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
+        "attribute": "1&2688|2&1584|4&600|5&552",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -421,19 +421,19 @@
     },
     {
         "warId": 6027,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2016,
         "relation": 2,
         "outIndex": 15,
         "dirction": 1,
-        "x": 20,
-        "y": 5,
+        "x": 19,
+        "y": 14,
         "var": 2016,
         "lv": 30,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
+        "attribute": "1&2688|2&1584|4&600|5&552",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -441,19 +441,19 @@
     },
     {
         "warId": 6027,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
         "x": 18,
-        "y": 13,
+        "y": 15,
         "var": 2017,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2880|2&1320|4&768|5&480",
+        "attribute": "1&2376|2&1560|4&576|5&768",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -461,142 +461,22 @@
     },
     {
         "warId": 6027,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2018,
         "relation": 2,
         "outIndex": 17,
         "dirction": 1,
         "x": 19,
-        "y": 13,
+        "y": 15,
         "var": 2018,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2880|2&1320|4&768|5&480",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6027,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 18,
-        "y": 14,
-        "var": 2019,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&2688|2&1584|4&600|5&552",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6027,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 19,
-        "y": 14,
-        "var": 2020,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&2688|2&1584|4&600|5&552",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6027,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 18,
-        "y": 15,
-        "var": 2021,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&2376|2&1560|4&576|5&768",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6027,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 19,
-        "y": 15,
-        "var": 2022,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&2376|2&1560|4&576|5&768",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6027,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 17,
-        "y": 15,
-        "var": 2023,
-        "lv": 30,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6027,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 15,
-        "var": 2024,
-        "lv": 30,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6028.json b/shared/resource/warJsons/6028.json
index 99889236f..b7946ebe1 100644
--- a/shared/resource/warJsons/6028.json
+++ b/shared/resource/warJsons/6028.json
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6028,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 17,
+        "y": 4,
         "var": 2007,
         "lv": 30,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6028,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 7,
-        "y": 2,
-        "var": 2008,
-        "lv": 30,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
+        "attribute": "1&2880|2&1320|4&768|5&480",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6028,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 17,
+        "y": 5,
+        "var": 2008,
+        "lv": 30,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&2880|2&1320|4&768|5&480",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6028,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 4,
         "var": 2009,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2880|2&1320|4&768|5&480",
+        "attribute": "1&2688|2&1584|4&600|5&552",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6028,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 5,
         "var": 2010,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2880|2&1320|4&768|5&480",
+        "attribute": "1&2688|2&1584|4&600|5&552",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6028,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 4,
         "var": 2011,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2688|2&1584|4&600|5&552",
+        "attribute": "1&2376|2&1560|4&576|5&768",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,38 +341,18 @@
     },
     {
         "warId": 6028,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 5,
         "var": 2012,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2688|2&1584|4&600|5&552",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6028,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 19,
-        "y": 4,
-        "var": 2013,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&2376|2&1560|4&576|5&768",
         "skill": 0,
         "seid": 0,
@@ -381,19 +361,39 @@
     },
     {
         "warId": 6028,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 1,
+        "x": 18,
+        "y": 13,
+        "var": 2013,
+        "lv": 30,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&2880|2&1320|4&768|5&480",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6028,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
         "x": 19,
-        "y": 5,
+        "y": 13,
         "var": 2014,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2376|2&1560|4&576|5&768",
+        "attribute": "1&2880|2&1320|4&768|5&480",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,19 @@
     },
     {
         "warId": 6028,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 20,
-        "y": 4,
+        "x": 18,
+        "y": 14,
         "var": 2015,
         "lv": 30,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
+        "attribute": "1&2688|2&1584|4&600|5&552",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -421,19 +421,19 @@
     },
     {
         "warId": 6028,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2016,
         "relation": 2,
         "outIndex": 15,
         "dirction": 1,
-        "x": 20,
-        "y": 5,
+        "x": 19,
+        "y": 14,
         "var": 2016,
         "lv": 30,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
+        "attribute": "1&2688|2&1584|4&600|5&552",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -441,19 +441,19 @@
     },
     {
         "warId": 6028,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
         "x": 18,
-        "y": 13,
+        "y": 15,
         "var": 2017,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2880|2&1320|4&768|5&480",
+        "attribute": "1&2376|2&1560|4&576|5&768",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -461,142 +461,22 @@
     },
     {
         "warId": 6028,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2018,
         "relation": 2,
         "outIndex": 17,
         "dirction": 1,
         "x": 19,
-        "y": 13,
+        "y": 15,
         "var": 2018,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2880|2&1320|4&768|5&480",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6028,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 18,
-        "y": 14,
-        "var": 2019,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&2688|2&1584|4&600|5&552",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6028,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 19,
-        "y": 14,
-        "var": 2020,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&2688|2&1584|4&600|5&552",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6028,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 18,
-        "y": 15,
-        "var": 2021,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&2376|2&1560|4&576|5&768",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6028,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 19,
-        "y": 15,
-        "var": 2022,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&2376|2&1560|4&576|5&768",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6028,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 17,
-        "y": 15,
-        "var": 2023,
-        "lv": 30,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6028,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 15,
-        "var": 2024,
-        "lv": 30,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6029.json b/shared/resource/warJsons/6029.json
index 037220df3..75a79a9cf 100644
--- a/shared/resource/warJsons/6029.json
+++ b/shared/resource/warJsons/6029.json
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6029,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 17,
+        "y": 4,
         "var": 2007,
         "lv": 30,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6029,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 7,
-        "y": 2,
-        "var": 2008,
-        "lv": 30,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
+        "attribute": "1&2880|2&1320|4&768|5&480",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6029,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 17,
+        "y": 5,
+        "var": 2008,
+        "lv": 30,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&2880|2&1320|4&768|5&480",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6029,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 4,
         "var": 2009,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2880|2&1320|4&768|5&480",
+        "attribute": "1&2688|2&1584|4&600|5&552",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6029,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 5,
         "var": 2010,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2880|2&1320|4&768|5&480",
+        "attribute": "1&2688|2&1584|4&600|5&552",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6029,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 4,
         "var": 2011,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2688|2&1584|4&600|5&552",
+        "attribute": "1&2376|2&1560|4&576|5&768",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,38 +341,18 @@
     },
     {
         "warId": 6029,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 5,
         "var": 2012,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2688|2&1584|4&600|5&552",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6029,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 19,
-        "y": 4,
-        "var": 2013,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&2376|2&1560|4&576|5&768",
         "skill": 0,
         "seid": 0,
@@ -381,19 +361,39 @@
     },
     {
         "warId": 6029,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 1,
+        "x": 18,
+        "y": 13,
+        "var": 2013,
+        "lv": 30,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&2880|2&1320|4&768|5&480",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6029,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
         "x": 19,
-        "y": 5,
+        "y": 13,
         "var": 2014,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2376|2&1560|4&576|5&768",
+        "attribute": "1&2880|2&1320|4&768|5&480",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,19 @@
     },
     {
         "warId": 6029,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 20,
-        "y": 4,
+        "x": 18,
+        "y": 14,
         "var": 2015,
         "lv": 30,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
+        "attribute": "1&2688|2&1584|4&600|5&552",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -421,19 +421,19 @@
     },
     {
         "warId": 6029,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2016,
         "relation": 2,
         "outIndex": 15,
         "dirction": 1,
-        "x": 20,
-        "y": 5,
+        "x": 19,
+        "y": 14,
         "var": 2016,
         "lv": 30,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
+        "attribute": "1&2688|2&1584|4&600|5&552",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -441,19 +441,19 @@
     },
     {
         "warId": 6029,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
         "x": 18,
-        "y": 13,
+        "y": 15,
         "var": 2017,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2880|2&1320|4&768|5&480",
+        "attribute": "1&2376|2&1560|4&576|5&768",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -461,142 +461,22 @@
     },
     {
         "warId": 6029,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2018,
         "relation": 2,
         "outIndex": 17,
         "dirction": 1,
         "x": 19,
-        "y": 13,
+        "y": 15,
         "var": 2018,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2880|2&1320|4&768|5&480",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6029,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 18,
-        "y": 14,
-        "var": 2019,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&2688|2&1584|4&600|5&552",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6029,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 19,
-        "y": 14,
-        "var": 2020,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&2688|2&1584|4&600|5&552",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6029,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 18,
-        "y": 15,
-        "var": 2021,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&2376|2&1560|4&576|5&768",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6029,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 19,
-        "y": 15,
-        "var": 2022,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&2376|2&1560|4&576|5&768",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6029,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 17,
-        "y": 15,
-        "var": 2023,
-        "lv": 30,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6029,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 15,
-        "var": 2024,
-        "lv": 30,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6030.json b/shared/resource/warJsons/6030.json
index 79f7a9757..9f4f9089e 100644
--- a/shared/resource/warJsons/6030.json
+++ b/shared/resource/warJsons/6030.json
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6030,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 17,
+        "y": 4,
         "var": 2007,
         "lv": 30,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6030,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 7,
-        "y": 2,
-        "var": 2008,
-        "lv": 30,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
+        "attribute": "1&2880|2&1320|4&768|5&480",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6030,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 17,
+        "y": 5,
+        "var": 2008,
+        "lv": 30,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&2880|2&1320|4&768|5&480",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6030,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 4,
         "var": 2009,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2880|2&1320|4&768|5&480",
+        "attribute": "1&2688|2&1584|4&600|5&552",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6030,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 5,
         "var": 2010,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2880|2&1320|4&768|5&480",
+        "attribute": "1&2688|2&1584|4&600|5&552",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6030,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 4,
         "var": 2011,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2688|2&1584|4&600|5&552",
+        "attribute": "1&2376|2&1560|4&576|5&768",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,38 +341,18 @@
     },
     {
         "warId": 6030,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 5,
         "var": 2012,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2688|2&1584|4&600|5&552",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6030,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 19,
-        "y": 4,
-        "var": 2013,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&2376|2&1560|4&576|5&768",
         "skill": 0,
         "seid": 0,
@@ -381,19 +361,39 @@
     },
     {
         "warId": 6030,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 1,
+        "x": 18,
+        "y": 13,
+        "var": 2013,
+        "lv": 30,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&2880|2&1320|4&768|5&480",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6030,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
         "x": 19,
-        "y": 5,
+        "y": 13,
         "var": 2014,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2376|2&1560|4&576|5&768",
+        "attribute": "1&2880|2&1320|4&768|5&480",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,19 @@
     },
     {
         "warId": 6030,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 20,
-        "y": 4,
+        "x": 18,
+        "y": 14,
         "var": 2015,
         "lv": 30,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
+        "attribute": "1&2688|2&1584|4&600|5&552",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -421,19 +421,19 @@
     },
     {
         "warId": 6030,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2016,
         "relation": 2,
         "outIndex": 15,
         "dirction": 1,
-        "x": 20,
-        "y": 5,
+        "x": 19,
+        "y": 14,
         "var": 2016,
         "lv": 30,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
+        "attribute": "1&2688|2&1584|4&600|5&552",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -441,19 +441,19 @@
     },
     {
         "warId": 6030,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
         "x": 18,
-        "y": 13,
+        "y": 15,
         "var": 2017,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2880|2&1320|4&768|5&480",
+        "attribute": "1&2376|2&1560|4&576|5&768",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -461,142 +461,22 @@
     },
     {
         "warId": 6030,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2018,
         "relation": 2,
         "outIndex": 17,
         "dirction": 1,
         "x": 19,
-        "y": 13,
+        "y": 15,
         "var": 2018,
         "lv": 30,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&2880|2&1320|4&768|5&480",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6030,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 18,
-        "y": 14,
-        "var": 2019,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&2688|2&1584|4&600|5&552",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6030,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 19,
-        "y": 14,
-        "var": 2020,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&2688|2&1584|4&600|5&552",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6030,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 18,
-        "y": 15,
-        "var": 2021,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&2376|2&1560|4&576|5&768",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6030,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 19,
-        "y": 15,
-        "var": 2022,
-        "lv": 30,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&2376|2&1560|4&576|5&768",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6030,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 17,
-        "y": 15,
-        "var": 2023,
-        "lv": 30,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6030,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 15,
-        "var": 2024,
-        "lv": 30,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&2256|2&1656|4&528|5&720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6031.json b/shared/resource/warJsons/6031.json
index 65e3d7d39..91b23ac72 100644
--- a/shared/resource/warJsons/6031.json
+++ b/shared/resource/warJsons/6031.json
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6031,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 17,
+        "y": 4,
         "var": 2007,
         "lv": 32,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6031,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 7,
-        "y": 2,
-        "var": 2008,
-        "lv": 32,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
+        "attribute": "1&5520|2&2530|4&1472|5&920",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6031,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 17,
+        "y": 5,
+        "var": 2008,
+        "lv": 32,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6031,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 4,
         "var": 2009,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "attribute": "1&5152|2&3036|4&1150|5&1058",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6031,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 5,
         "var": 2010,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "attribute": "1&5152|2&3036|4&1150|5&1058",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6031,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 4,
         "var": 2011,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5152|2&3036|4&1150|5&1058",
+        "attribute": "1&4554|2&2990|4&1104|5&1472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,38 +341,18 @@
     },
     {
         "warId": 6031,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 5,
         "var": 2012,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5152|2&3036|4&1150|5&1058",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6031,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 19,
-        "y": 4,
-        "var": 2013,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&4554|2&2990|4&1104|5&1472",
         "skill": 0,
         "seid": 0,
@@ -381,19 +361,39 @@
     },
     {
         "warId": 6031,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 1,
+        "x": 18,
+        "y": 13,
+        "var": 2013,
+        "lv": 32,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6031,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
         "x": 19,
-        "y": 5,
+        "y": 13,
         "var": 2014,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&4554|2&2990|4&1104|5&1472",
+        "attribute": "1&5520|2&2530|4&1472|5&920",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,19 @@
     },
     {
         "warId": 6031,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 20,
-        "y": 4,
+        "x": 18,
+        "y": 14,
         "var": 2015,
         "lv": 32,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
+        "attribute": "1&5152|2&3036|4&1150|5&1058",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -421,19 +421,19 @@
     },
     {
         "warId": 6031,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2016,
         "relation": 2,
         "outIndex": 15,
         "dirction": 1,
-        "x": 20,
-        "y": 5,
+        "x": 19,
+        "y": 14,
         "var": 2016,
         "lv": 32,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
+        "attribute": "1&5152|2&3036|4&1150|5&1058",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -441,19 +441,19 @@
     },
     {
         "warId": 6031,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
         "x": 18,
-        "y": 13,
+        "y": 15,
         "var": 2017,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "attribute": "1&4554|2&2990|4&1104|5&1472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -461,142 +461,22 @@
     },
     {
         "warId": 6031,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2018,
         "relation": 2,
         "outIndex": 17,
         "dirction": 1,
         "x": 19,
-        "y": 13,
+        "y": 15,
         "var": 2018,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5520|2&2530|4&1472|5&920",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6031,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 18,
-        "y": 14,
-        "var": 2019,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&5152|2&3036|4&1150|5&1058",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6031,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 19,
-        "y": 14,
-        "var": 2020,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&5152|2&3036|4&1150|5&1058",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6031,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 18,
-        "y": 15,
-        "var": 2021,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&4554|2&2990|4&1104|5&1472",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6031,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 19,
-        "y": 15,
-        "var": 2022,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&4554|2&2990|4&1104|5&1472",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6031,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 17,
-        "y": 15,
-        "var": 2023,
-        "lv": 32,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6031,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 15,
-        "var": 2024,
-        "lv": 32,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6032.json b/shared/resource/warJsons/6032.json
index 2edd1e6fc..f34dc3b69 100644
--- a/shared/resource/warJsons/6032.json
+++ b/shared/resource/warJsons/6032.json
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6032,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 17,
+        "y": 4,
         "var": 2007,
         "lv": 32,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6032,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 7,
-        "y": 2,
-        "var": 2008,
-        "lv": 32,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
+        "attribute": "1&5520|2&2530|4&1472|5&920",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6032,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 17,
+        "y": 5,
+        "var": 2008,
+        "lv": 32,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6032,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 4,
         "var": 2009,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "attribute": "1&5152|2&3036|4&1150|5&1058",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6032,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 5,
         "var": 2010,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "attribute": "1&5152|2&3036|4&1150|5&1058",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6032,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 4,
         "var": 2011,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5152|2&3036|4&1150|5&1058",
+        "attribute": "1&4554|2&2990|4&1104|5&1472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,38 +341,18 @@
     },
     {
         "warId": 6032,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 5,
         "var": 2012,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5152|2&3036|4&1150|5&1058",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6032,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 19,
-        "y": 4,
-        "var": 2013,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&4554|2&2990|4&1104|5&1472",
         "skill": 0,
         "seid": 0,
@@ -381,19 +361,39 @@
     },
     {
         "warId": 6032,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 1,
+        "x": 18,
+        "y": 13,
+        "var": 2013,
+        "lv": 32,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6032,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
         "x": 19,
-        "y": 5,
+        "y": 13,
         "var": 2014,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&4554|2&2990|4&1104|5&1472",
+        "attribute": "1&5520|2&2530|4&1472|5&920",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,19 @@
     },
     {
         "warId": 6032,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 20,
-        "y": 4,
+        "x": 18,
+        "y": 14,
         "var": 2015,
         "lv": 32,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
+        "attribute": "1&5152|2&3036|4&1150|5&1058",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -421,19 +421,19 @@
     },
     {
         "warId": 6032,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2016,
         "relation": 2,
         "outIndex": 15,
         "dirction": 1,
-        "x": 20,
-        "y": 5,
+        "x": 19,
+        "y": 14,
         "var": 2016,
         "lv": 32,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
+        "attribute": "1&5152|2&3036|4&1150|5&1058",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -441,19 +441,19 @@
     },
     {
         "warId": 6032,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
         "x": 18,
-        "y": 13,
+        "y": 15,
         "var": 2017,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "attribute": "1&4554|2&2990|4&1104|5&1472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -461,142 +461,22 @@
     },
     {
         "warId": 6032,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2018,
         "relation": 2,
         "outIndex": 17,
         "dirction": 1,
         "x": 19,
-        "y": 13,
+        "y": 15,
         "var": 2018,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5520|2&2530|4&1472|5&920",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6032,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 18,
-        "y": 14,
-        "var": 2019,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&5152|2&3036|4&1150|5&1058",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6032,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 19,
-        "y": 14,
-        "var": 2020,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&5152|2&3036|4&1150|5&1058",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6032,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 18,
-        "y": 15,
-        "var": 2021,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&4554|2&2990|4&1104|5&1472",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6032,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 19,
-        "y": 15,
-        "var": 2022,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&4554|2&2990|4&1104|5&1472",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6032,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 17,
-        "y": 15,
-        "var": 2023,
-        "lv": 32,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6032,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 15,
-        "var": 2024,
-        "lv": 32,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6033.json b/shared/resource/warJsons/6033.json
index f49e03ea4..55eb8576a 100644
--- a/shared/resource/warJsons/6033.json
+++ b/shared/resource/warJsons/6033.json
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6033,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 17,
+        "y": 4,
         "var": 2007,
         "lv": 32,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6033,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 7,
-        "y": 2,
-        "var": 2008,
-        "lv": 32,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
+        "attribute": "1&5520|2&2530|4&1472|5&920",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6033,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 17,
+        "y": 5,
+        "var": 2008,
+        "lv": 32,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6033,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 4,
         "var": 2009,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "attribute": "1&5152|2&3036|4&1150|5&1058",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6033,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 5,
         "var": 2010,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "attribute": "1&5152|2&3036|4&1150|5&1058",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6033,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 4,
         "var": 2011,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5152|2&3036|4&1150|5&1058",
+        "attribute": "1&4554|2&2990|4&1104|5&1472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,38 +341,18 @@
     },
     {
         "warId": 6033,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 5,
         "var": 2012,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5152|2&3036|4&1150|5&1058",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6033,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 19,
-        "y": 4,
-        "var": 2013,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&4554|2&2990|4&1104|5&1472",
         "skill": 0,
         "seid": 0,
@@ -381,19 +361,39 @@
     },
     {
         "warId": 6033,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 1,
+        "x": 18,
+        "y": 13,
+        "var": 2013,
+        "lv": 32,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6033,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
         "x": 19,
-        "y": 5,
+        "y": 13,
         "var": 2014,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&4554|2&2990|4&1104|5&1472",
+        "attribute": "1&5520|2&2530|4&1472|5&920",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,19 @@
     },
     {
         "warId": 6033,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 20,
-        "y": 4,
+        "x": 18,
+        "y": 14,
         "var": 2015,
         "lv": 32,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
+        "attribute": "1&5152|2&3036|4&1150|5&1058",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -421,19 +421,19 @@
     },
     {
         "warId": 6033,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2016,
         "relation": 2,
         "outIndex": 15,
         "dirction": 1,
-        "x": 20,
-        "y": 5,
+        "x": 19,
+        "y": 14,
         "var": 2016,
         "lv": 32,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
+        "attribute": "1&5152|2&3036|4&1150|5&1058",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -441,19 +441,19 @@
     },
     {
         "warId": 6033,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
         "x": 18,
-        "y": 13,
+        "y": 15,
         "var": 2017,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "attribute": "1&4554|2&2990|4&1104|5&1472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -461,142 +461,22 @@
     },
     {
         "warId": 6033,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2018,
         "relation": 2,
         "outIndex": 17,
         "dirction": 1,
         "x": 19,
-        "y": 13,
+        "y": 15,
         "var": 2018,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5520|2&2530|4&1472|5&920",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6033,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 18,
-        "y": 14,
-        "var": 2019,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&5152|2&3036|4&1150|5&1058",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6033,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 19,
-        "y": 14,
-        "var": 2020,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&5152|2&3036|4&1150|5&1058",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6033,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 18,
-        "y": 15,
-        "var": 2021,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&4554|2&2990|4&1104|5&1472",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6033,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 19,
-        "y": 15,
-        "var": 2022,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&4554|2&2990|4&1104|5&1472",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6033,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 17,
-        "y": 15,
-        "var": 2023,
-        "lv": 32,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6033,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 15,
-        "var": 2024,
-        "lv": 32,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6034.json b/shared/resource/warJsons/6034.json
index 99d492af9..337e83181 100644
--- a/shared/resource/warJsons/6034.json
+++ b/shared/resource/warJsons/6034.json
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6034,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 17,
+        "y": 4,
         "var": 2007,
         "lv": 32,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6034,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 7,
-        "y": 2,
-        "var": 2008,
-        "lv": 32,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
+        "attribute": "1&5520|2&2530|4&1472|5&920",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6034,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 17,
+        "y": 5,
+        "var": 2008,
+        "lv": 32,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6034,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 4,
         "var": 2009,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "attribute": "1&5152|2&3036|4&1150|5&1058",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6034,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 5,
         "var": 2010,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "attribute": "1&5152|2&3036|4&1150|5&1058",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6034,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 4,
         "var": 2011,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5152|2&3036|4&1150|5&1058",
+        "attribute": "1&4554|2&2990|4&1104|5&1472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,38 +341,18 @@
     },
     {
         "warId": 6034,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 5,
         "var": 2012,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5152|2&3036|4&1150|5&1058",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6034,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 19,
-        "y": 4,
-        "var": 2013,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&4554|2&2990|4&1104|5&1472",
         "skill": 0,
         "seid": 0,
@@ -381,19 +361,39 @@
     },
     {
         "warId": 6034,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 1,
+        "x": 18,
+        "y": 13,
+        "var": 2013,
+        "lv": 32,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6034,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
         "x": 19,
-        "y": 5,
+        "y": 13,
         "var": 2014,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&4554|2&2990|4&1104|5&1472",
+        "attribute": "1&5520|2&2530|4&1472|5&920",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,19 @@
     },
     {
         "warId": 6034,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 20,
-        "y": 4,
+        "x": 18,
+        "y": 14,
         "var": 2015,
         "lv": 32,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
+        "attribute": "1&5152|2&3036|4&1150|5&1058",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -421,19 +421,19 @@
     },
     {
         "warId": 6034,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2016,
         "relation": 2,
         "outIndex": 15,
         "dirction": 1,
-        "x": 20,
-        "y": 5,
+        "x": 19,
+        "y": 14,
         "var": 2016,
         "lv": 32,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
+        "attribute": "1&5152|2&3036|4&1150|5&1058",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -441,19 +441,19 @@
     },
     {
         "warId": 6034,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
         "x": 18,
-        "y": 13,
+        "y": 15,
         "var": 2017,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "attribute": "1&4554|2&2990|4&1104|5&1472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -461,142 +461,22 @@
     },
     {
         "warId": 6034,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2018,
         "relation": 2,
         "outIndex": 17,
         "dirction": 1,
         "x": 19,
-        "y": 13,
+        "y": 15,
         "var": 2018,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5520|2&2530|4&1472|5&920",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6034,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 18,
-        "y": 14,
-        "var": 2019,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&5152|2&3036|4&1150|5&1058",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6034,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 19,
-        "y": 14,
-        "var": 2020,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&5152|2&3036|4&1150|5&1058",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6034,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 18,
-        "y": 15,
-        "var": 2021,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&4554|2&2990|4&1104|5&1472",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6034,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 19,
-        "y": 15,
-        "var": 2022,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&4554|2&2990|4&1104|5&1472",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6034,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 17,
-        "y": 15,
-        "var": 2023,
-        "lv": 32,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6034,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 15,
-        "var": 2024,
-        "lv": 32,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6035.json b/shared/resource/warJsons/6035.json
index 127b2924a..95f13b37b 100644
--- a/shared/resource/warJsons/6035.json
+++ b/shared/resource/warJsons/6035.json
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6035,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 17,
+        "y": 4,
         "var": 2007,
         "lv": 32,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6035,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 7,
-        "y": 2,
-        "var": 2008,
-        "lv": 32,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
+        "attribute": "1&5520|2&2530|4&1472|5&920",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6035,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 17,
+        "y": 5,
+        "var": 2008,
+        "lv": 32,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6035,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 4,
         "var": 2009,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "attribute": "1&5152|2&3036|4&1150|5&1058",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6035,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 5,
         "var": 2010,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "attribute": "1&5152|2&3036|4&1150|5&1058",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6035,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 4,
         "var": 2011,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5152|2&3036|4&1150|5&1058",
+        "attribute": "1&4554|2&2990|4&1104|5&1472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,38 +341,18 @@
     },
     {
         "warId": 6035,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 5,
         "var": 2012,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5152|2&3036|4&1150|5&1058",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6035,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 19,
-        "y": 4,
-        "var": 2013,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&4554|2&2990|4&1104|5&1472",
         "skill": 0,
         "seid": 0,
@@ -381,19 +361,39 @@
     },
     {
         "warId": 6035,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 1,
+        "x": 18,
+        "y": 13,
+        "var": 2013,
+        "lv": 32,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6035,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
         "x": 19,
-        "y": 5,
+        "y": 13,
         "var": 2014,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&4554|2&2990|4&1104|5&1472",
+        "attribute": "1&5520|2&2530|4&1472|5&920",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,19 @@
     },
     {
         "warId": 6035,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 20,
-        "y": 4,
+        "x": 18,
+        "y": 14,
         "var": 2015,
         "lv": 32,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
+        "attribute": "1&5152|2&3036|4&1150|5&1058",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -421,19 +421,19 @@
     },
     {
         "warId": 6035,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2016,
         "relation": 2,
         "outIndex": 15,
         "dirction": 1,
-        "x": 20,
-        "y": 5,
+        "x": 19,
+        "y": 14,
         "var": 2016,
         "lv": 32,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
+        "attribute": "1&5152|2&3036|4&1150|5&1058",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -441,19 +441,19 @@
     },
     {
         "warId": 6035,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
         "x": 18,
-        "y": 13,
+        "y": 15,
         "var": 2017,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "attribute": "1&4554|2&2990|4&1104|5&1472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -461,142 +461,22 @@
     },
     {
         "warId": 6035,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2018,
         "relation": 2,
         "outIndex": 17,
         "dirction": 1,
         "x": 19,
-        "y": 13,
+        "y": 15,
         "var": 2018,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5520|2&2530|4&1472|5&920",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6035,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 18,
-        "y": 14,
-        "var": 2019,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&5152|2&3036|4&1150|5&1058",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6035,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 19,
-        "y": 14,
-        "var": 2020,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&5152|2&3036|4&1150|5&1058",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6035,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 18,
-        "y": 15,
-        "var": 2021,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&4554|2&2990|4&1104|5&1472",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6035,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 19,
-        "y": 15,
-        "var": 2022,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&4554|2&2990|4&1104|5&1472",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6035,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 17,
-        "y": 15,
-        "var": 2023,
-        "lv": 32,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6035,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 15,
-        "var": 2024,
-        "lv": 32,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6036.json b/shared/resource/warJsons/6036.json
index 01708a6fb..321b6d653 100644
--- a/shared/resource/warJsons/6036.json
+++ b/shared/resource/warJsons/6036.json
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6036,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 17,
+        "y": 4,
         "var": 2007,
         "lv": 32,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6036,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 7,
-        "y": 2,
-        "var": 2008,
-        "lv": 32,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
+        "attribute": "1&5520|2&2530|4&1472|5&920",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6036,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 17,
+        "y": 5,
+        "var": 2008,
+        "lv": 32,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6036,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 4,
         "var": 2009,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "attribute": "1&5152|2&3036|4&1150|5&1058",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6036,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 5,
         "var": 2010,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "attribute": "1&5152|2&3036|4&1150|5&1058",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6036,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 4,
         "var": 2011,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5152|2&3036|4&1150|5&1058",
+        "attribute": "1&4554|2&2990|4&1104|5&1472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,38 +341,18 @@
     },
     {
         "warId": 6036,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 5,
         "var": 2012,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5152|2&3036|4&1150|5&1058",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6036,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 19,
-        "y": 4,
-        "var": 2013,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&4554|2&2990|4&1104|5&1472",
         "skill": 0,
         "seid": 0,
@@ -381,19 +361,39 @@
     },
     {
         "warId": 6036,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 1,
+        "x": 18,
+        "y": 13,
+        "var": 2013,
+        "lv": 32,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6036,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
         "x": 19,
-        "y": 5,
+        "y": 13,
         "var": 2014,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&4554|2&2990|4&1104|5&1472",
+        "attribute": "1&5520|2&2530|4&1472|5&920",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,19 @@
     },
     {
         "warId": 6036,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 20,
-        "y": 4,
+        "x": 18,
+        "y": 14,
         "var": 2015,
         "lv": 32,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
+        "attribute": "1&5152|2&3036|4&1150|5&1058",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -421,19 +421,19 @@
     },
     {
         "warId": 6036,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2016,
         "relation": 2,
         "outIndex": 15,
         "dirction": 1,
-        "x": 20,
-        "y": 5,
+        "x": 19,
+        "y": 14,
         "var": 2016,
         "lv": 32,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
+        "attribute": "1&5152|2&3036|4&1150|5&1058",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -441,19 +441,19 @@
     },
     {
         "warId": 6036,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
         "x": 18,
-        "y": 13,
+        "y": 15,
         "var": 2017,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5520|2&2530|4&1472|5&920",
+        "attribute": "1&4554|2&2990|4&1104|5&1472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -461,142 +461,22 @@
     },
     {
         "warId": 6036,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2018,
         "relation": 2,
         "outIndex": 17,
         "dirction": 1,
         "x": 19,
-        "y": 13,
+        "y": 15,
         "var": 2018,
         "lv": 32,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5520|2&2530|4&1472|5&920",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6036,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 18,
-        "y": 14,
-        "var": 2019,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&5152|2&3036|4&1150|5&1058",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6036,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 19,
-        "y": 14,
-        "var": 2020,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&5152|2&3036|4&1150|5&1058",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6036,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 18,
-        "y": 15,
-        "var": 2021,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&4554|2&2990|4&1104|5&1472",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6036,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 19,
-        "y": 15,
-        "var": 2022,
-        "lv": 32,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&4554|2&2990|4&1104|5&1472",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6036,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 17,
-        "y": 15,
-        "var": 2023,
-        "lv": 32,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6036,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 15,
-        "var": 2024,
-        "lv": 32,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&4324|2&3174|4&1012|5&1380",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6037.json b/shared/resource/warJsons/6037.json
index 1938dfbc1..9a718f6f7 100644
--- a/shared/resource/warJsons/6037.json
+++ b/shared/resource/warJsons/6037.json
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6037,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 17,
+        "y": 4,
         "var": 2007,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6037,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 7,
-        "y": 2,
-        "var": 2008,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
+        "attribute": "1&8640|2&3960|4&2304|5&1440",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6037,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 17,
+        "y": 5,
+        "var": 2008,
+        "lv": 34,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6037,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 4,
         "var": 2009,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "attribute": "1&8064|2&4752|4&1800|5&1656",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6037,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 5,
         "var": 2010,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "attribute": "1&8064|2&4752|4&1800|5&1656",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6037,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 4,
         "var": 2011,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8064|2&4752|4&1800|5&1656",
+        "attribute": "1&7128|2&4680|4&1728|5&2304",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,38 +341,18 @@
     },
     {
         "warId": 6037,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 5,
         "var": 2012,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8064|2&4752|4&1800|5&1656",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6037,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 19,
-        "y": 4,
-        "var": 2013,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&7128|2&4680|4&1728|5&2304",
         "skill": 0,
         "seid": 0,
@@ -381,19 +361,39 @@
     },
     {
         "warId": 6037,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 1,
+        "x": 18,
+        "y": 13,
+        "var": 2013,
+        "lv": 34,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6037,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
         "x": 19,
-        "y": 5,
+        "y": 13,
         "var": 2014,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&7128|2&4680|4&1728|5&2304",
+        "attribute": "1&8640|2&3960|4&2304|5&1440",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,19 @@
     },
     {
         "warId": 6037,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 20,
-        "y": 4,
+        "x": 18,
+        "y": 14,
         "var": 2015,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
+        "attribute": "1&8064|2&4752|4&1800|5&1656",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -421,19 +421,19 @@
     },
     {
         "warId": 6037,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2016,
         "relation": 2,
         "outIndex": 15,
         "dirction": 1,
-        "x": 20,
-        "y": 5,
+        "x": 19,
+        "y": 14,
         "var": 2016,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
+        "attribute": "1&8064|2&4752|4&1800|5&1656",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -441,19 +441,19 @@
     },
     {
         "warId": 6037,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
         "x": 18,
-        "y": 13,
+        "y": 15,
         "var": 2017,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "attribute": "1&7128|2&4680|4&1728|5&2304",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -461,142 +461,22 @@
     },
     {
         "warId": 6037,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2018,
         "relation": 2,
         "outIndex": 17,
         "dirction": 1,
         "x": 19,
-        "y": 13,
+        "y": 15,
         "var": 2018,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8640|2&3960|4&2304|5&1440",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6037,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 18,
-        "y": 14,
-        "var": 2019,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&8064|2&4752|4&1800|5&1656",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6037,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 19,
-        "y": 14,
-        "var": 2020,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&8064|2&4752|4&1800|5&1656",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6037,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 18,
-        "y": 15,
-        "var": 2021,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&7128|2&4680|4&1728|5&2304",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6037,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 19,
-        "y": 15,
-        "var": 2022,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&7128|2&4680|4&1728|5&2304",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6037,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 17,
-        "y": 15,
-        "var": 2023,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6037,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 15,
-        "var": 2024,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6038.json b/shared/resource/warJsons/6038.json
index f08e57739..8ebb397f3 100644
--- a/shared/resource/warJsons/6038.json
+++ b/shared/resource/warJsons/6038.json
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6038,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 17,
+        "y": 4,
         "var": 2007,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6038,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 7,
-        "y": 2,
-        "var": 2008,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
+        "attribute": "1&8640|2&3960|4&2304|5&1440",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6038,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 17,
+        "y": 5,
+        "var": 2008,
+        "lv": 34,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6038,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 4,
         "var": 2009,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "attribute": "1&8064|2&4752|4&1800|5&1656",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6038,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 5,
         "var": 2010,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "attribute": "1&8064|2&4752|4&1800|5&1656",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6038,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 4,
         "var": 2011,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8064|2&4752|4&1800|5&1656",
+        "attribute": "1&7128|2&4680|4&1728|5&2304",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,38 +341,18 @@
     },
     {
         "warId": 6038,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 5,
         "var": 2012,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8064|2&4752|4&1800|5&1656",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6038,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 19,
-        "y": 4,
-        "var": 2013,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&7128|2&4680|4&1728|5&2304",
         "skill": 0,
         "seid": 0,
@@ -381,19 +361,39 @@
     },
     {
         "warId": 6038,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 1,
+        "x": 18,
+        "y": 13,
+        "var": 2013,
+        "lv": 34,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6038,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
         "x": 19,
-        "y": 5,
+        "y": 13,
         "var": 2014,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&7128|2&4680|4&1728|5&2304",
+        "attribute": "1&8640|2&3960|4&2304|5&1440",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,19 @@
     },
     {
         "warId": 6038,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 20,
-        "y": 4,
+        "x": 18,
+        "y": 14,
         "var": 2015,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
+        "attribute": "1&8064|2&4752|4&1800|5&1656",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -421,19 +421,19 @@
     },
     {
         "warId": 6038,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2016,
         "relation": 2,
         "outIndex": 15,
         "dirction": 1,
-        "x": 20,
-        "y": 5,
+        "x": 19,
+        "y": 14,
         "var": 2016,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
+        "attribute": "1&8064|2&4752|4&1800|5&1656",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -441,19 +441,19 @@
     },
     {
         "warId": 6038,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
         "x": 18,
-        "y": 13,
+        "y": 15,
         "var": 2017,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "attribute": "1&7128|2&4680|4&1728|5&2304",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -461,142 +461,22 @@
     },
     {
         "warId": 6038,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2018,
         "relation": 2,
         "outIndex": 17,
         "dirction": 1,
         "x": 19,
-        "y": 13,
+        "y": 15,
         "var": 2018,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8640|2&3960|4&2304|5&1440",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6038,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 18,
-        "y": 14,
-        "var": 2019,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&8064|2&4752|4&1800|5&1656",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6038,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 19,
-        "y": 14,
-        "var": 2020,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&8064|2&4752|4&1800|5&1656",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6038,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 18,
-        "y": 15,
-        "var": 2021,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&7128|2&4680|4&1728|5&2304",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6038,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 19,
-        "y": 15,
-        "var": 2022,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&7128|2&4680|4&1728|5&2304",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6038,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 17,
-        "y": 15,
-        "var": 2023,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6038,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 15,
-        "var": 2024,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6039.json b/shared/resource/warJsons/6039.json
index bb6b19ab5..a2e396499 100644
--- a/shared/resource/warJsons/6039.json
+++ b/shared/resource/warJsons/6039.json
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6039,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 17,
+        "y": 4,
         "var": 2007,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6039,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 7,
-        "y": 2,
-        "var": 2008,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
+        "attribute": "1&8640|2&3960|4&2304|5&1440",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6039,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 17,
+        "y": 5,
+        "var": 2008,
+        "lv": 34,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6039,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 4,
         "var": 2009,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "attribute": "1&8064|2&4752|4&1800|5&1656",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6039,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 5,
         "var": 2010,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "attribute": "1&8064|2&4752|4&1800|5&1656",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6039,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 4,
         "var": 2011,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8064|2&4752|4&1800|5&1656",
+        "attribute": "1&7128|2&4680|4&1728|5&2304",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,38 +341,18 @@
     },
     {
         "warId": 6039,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 5,
         "var": 2012,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8064|2&4752|4&1800|5&1656",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6039,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 19,
-        "y": 4,
-        "var": 2013,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&7128|2&4680|4&1728|5&2304",
         "skill": 0,
         "seid": 0,
@@ -381,19 +361,39 @@
     },
     {
         "warId": 6039,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 1,
+        "x": 18,
+        "y": 13,
+        "var": 2013,
+        "lv": 34,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6039,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
         "x": 19,
-        "y": 5,
+        "y": 13,
         "var": 2014,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&7128|2&4680|4&1728|5&2304",
+        "attribute": "1&8640|2&3960|4&2304|5&1440",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,19 @@
     },
     {
         "warId": 6039,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 20,
-        "y": 4,
+        "x": 18,
+        "y": 14,
         "var": 2015,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
+        "attribute": "1&8064|2&4752|4&1800|5&1656",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -421,19 +421,19 @@
     },
     {
         "warId": 6039,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2016,
         "relation": 2,
         "outIndex": 15,
         "dirction": 1,
-        "x": 20,
-        "y": 5,
+        "x": 19,
+        "y": 14,
         "var": 2016,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
+        "attribute": "1&8064|2&4752|4&1800|5&1656",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -441,19 +441,19 @@
     },
     {
         "warId": 6039,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
         "x": 18,
-        "y": 13,
+        "y": 15,
         "var": 2017,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "attribute": "1&7128|2&4680|4&1728|5&2304",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -461,142 +461,22 @@
     },
     {
         "warId": 6039,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2018,
         "relation": 2,
         "outIndex": 17,
         "dirction": 1,
         "x": 19,
-        "y": 13,
+        "y": 15,
         "var": 2018,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8640|2&3960|4&2304|5&1440",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6039,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 18,
-        "y": 14,
-        "var": 2019,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&8064|2&4752|4&1800|5&1656",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6039,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 19,
-        "y": 14,
-        "var": 2020,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&8064|2&4752|4&1800|5&1656",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6039,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 18,
-        "y": 15,
-        "var": 2021,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&7128|2&4680|4&1728|5&2304",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6039,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 19,
-        "y": 15,
-        "var": 2022,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&7128|2&4680|4&1728|5&2304",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6039,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 17,
-        "y": 15,
-        "var": 2023,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6039,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 15,
-        "var": 2024,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6040.json b/shared/resource/warJsons/6040.json
index 65b112aaa..a5b0f738c 100644
--- a/shared/resource/warJsons/6040.json
+++ b/shared/resource/warJsons/6040.json
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6040,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 17,
+        "y": 4,
         "var": 2007,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6040,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 7,
-        "y": 2,
-        "var": 2008,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
+        "attribute": "1&8640|2&3960|4&2304|5&1440",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6040,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 17,
+        "y": 5,
+        "var": 2008,
+        "lv": 34,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6040,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 4,
         "var": 2009,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "attribute": "1&8064|2&4752|4&1800|5&1656",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6040,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 5,
         "var": 2010,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "attribute": "1&8064|2&4752|4&1800|5&1656",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6040,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 4,
         "var": 2011,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8064|2&4752|4&1800|5&1656",
+        "attribute": "1&7128|2&4680|4&1728|5&2304",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,38 +341,18 @@
     },
     {
         "warId": 6040,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 5,
         "var": 2012,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8064|2&4752|4&1800|5&1656",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6040,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 19,
-        "y": 4,
-        "var": 2013,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&7128|2&4680|4&1728|5&2304",
         "skill": 0,
         "seid": 0,
@@ -381,19 +361,39 @@
     },
     {
         "warId": 6040,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 1,
+        "x": 18,
+        "y": 13,
+        "var": 2013,
+        "lv": 34,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6040,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
         "x": 19,
-        "y": 5,
+        "y": 13,
         "var": 2014,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&7128|2&4680|4&1728|5&2304",
+        "attribute": "1&8640|2&3960|4&2304|5&1440",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,19 @@
     },
     {
         "warId": 6040,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 20,
-        "y": 4,
+        "x": 18,
+        "y": 14,
         "var": 2015,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
+        "attribute": "1&8064|2&4752|4&1800|5&1656",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -421,19 +421,19 @@
     },
     {
         "warId": 6040,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2016,
         "relation": 2,
         "outIndex": 15,
         "dirction": 1,
-        "x": 20,
-        "y": 5,
+        "x": 19,
+        "y": 14,
         "var": 2016,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
+        "attribute": "1&8064|2&4752|4&1800|5&1656",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -441,19 +441,19 @@
     },
     {
         "warId": 6040,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
         "x": 18,
-        "y": 13,
+        "y": 15,
         "var": 2017,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "attribute": "1&7128|2&4680|4&1728|5&2304",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -461,142 +461,22 @@
     },
     {
         "warId": 6040,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2018,
         "relation": 2,
         "outIndex": 17,
         "dirction": 1,
         "x": 19,
-        "y": 13,
+        "y": 15,
         "var": 2018,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8640|2&3960|4&2304|5&1440",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6040,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 18,
-        "y": 14,
-        "var": 2019,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&8064|2&4752|4&1800|5&1656",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6040,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 19,
-        "y": 14,
-        "var": 2020,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&8064|2&4752|4&1800|5&1656",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6040,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 18,
-        "y": 15,
-        "var": 2021,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&7128|2&4680|4&1728|5&2304",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6040,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 19,
-        "y": 15,
-        "var": 2022,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&7128|2&4680|4&1728|5&2304",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6040,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 17,
-        "y": 15,
-        "var": 2023,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6040,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 15,
-        "var": 2024,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6041.json b/shared/resource/warJsons/6041.json
index c6a0cb78d..86ef87300 100644
--- a/shared/resource/warJsons/6041.json
+++ b/shared/resource/warJsons/6041.json
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6041,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 17,
+        "y": 4,
         "var": 2007,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6041,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 7,
-        "y": 2,
-        "var": 2008,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
+        "attribute": "1&8640|2&3960|4&2304|5&1440",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6041,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 17,
+        "y": 5,
+        "var": 2008,
+        "lv": 34,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6041,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 4,
         "var": 2009,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "attribute": "1&8064|2&4752|4&1800|5&1656",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6041,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 5,
         "var": 2010,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "attribute": "1&8064|2&4752|4&1800|5&1656",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6041,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 4,
         "var": 2011,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8064|2&4752|4&1800|5&1656",
+        "attribute": "1&7128|2&4680|4&1728|5&2304",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,38 +341,18 @@
     },
     {
         "warId": 6041,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 5,
         "var": 2012,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8064|2&4752|4&1800|5&1656",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6041,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 19,
-        "y": 4,
-        "var": 2013,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&7128|2&4680|4&1728|5&2304",
         "skill": 0,
         "seid": 0,
@@ -381,19 +361,39 @@
     },
     {
         "warId": 6041,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 1,
+        "x": 18,
+        "y": 13,
+        "var": 2013,
+        "lv": 34,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6041,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
         "x": 19,
-        "y": 5,
+        "y": 13,
         "var": 2014,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&7128|2&4680|4&1728|5&2304",
+        "attribute": "1&8640|2&3960|4&2304|5&1440",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,19 @@
     },
     {
         "warId": 6041,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 20,
-        "y": 4,
+        "x": 18,
+        "y": 14,
         "var": 2015,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
+        "attribute": "1&8064|2&4752|4&1800|5&1656",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -421,19 +421,19 @@
     },
     {
         "warId": 6041,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2016,
         "relation": 2,
         "outIndex": 15,
         "dirction": 1,
-        "x": 20,
-        "y": 5,
+        "x": 19,
+        "y": 14,
         "var": 2016,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
+        "attribute": "1&8064|2&4752|4&1800|5&1656",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -441,19 +441,19 @@
     },
     {
         "warId": 6041,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
         "x": 18,
-        "y": 13,
+        "y": 15,
         "var": 2017,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "attribute": "1&7128|2&4680|4&1728|5&2304",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -461,142 +461,22 @@
     },
     {
         "warId": 6041,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2018,
         "relation": 2,
         "outIndex": 17,
         "dirction": 1,
         "x": 19,
-        "y": 13,
+        "y": 15,
         "var": 2018,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8640|2&3960|4&2304|5&1440",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6041,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 18,
-        "y": 14,
-        "var": 2019,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&8064|2&4752|4&1800|5&1656",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6041,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 19,
-        "y": 14,
-        "var": 2020,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&8064|2&4752|4&1800|5&1656",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6041,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 18,
-        "y": 15,
-        "var": 2021,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&7128|2&4680|4&1728|5&2304",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6041,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 19,
-        "y": 15,
-        "var": 2022,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&7128|2&4680|4&1728|5&2304",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6041,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 17,
-        "y": 15,
-        "var": 2023,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6041,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 15,
-        "var": 2024,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6042.json b/shared/resource/warJsons/6042.json
index 365098819..79ff2b211 100644
--- a/shared/resource/warJsons/6042.json
+++ b/shared/resource/warJsons/6042.json
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6042,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 17,
+        "y": 4,
         "var": 2007,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6042,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 7,
-        "y": 2,
-        "var": 2008,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
+        "attribute": "1&8640|2&3960|4&2304|5&1440",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6042,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 17,
+        "y": 5,
+        "var": 2008,
+        "lv": 34,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6042,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 4,
         "var": 2009,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "attribute": "1&8064|2&4752|4&1800|5&1656",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6042,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 5,
         "var": 2010,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "attribute": "1&8064|2&4752|4&1800|5&1656",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6042,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 4,
         "var": 2011,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8064|2&4752|4&1800|5&1656",
+        "attribute": "1&7128|2&4680|4&1728|5&2304",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,38 +341,18 @@
     },
     {
         "warId": 6042,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 5,
         "var": 2012,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8064|2&4752|4&1800|5&1656",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6042,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 19,
-        "y": 4,
-        "var": 2013,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&7128|2&4680|4&1728|5&2304",
         "skill": 0,
         "seid": 0,
@@ -381,19 +361,39 @@
     },
     {
         "warId": 6042,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 1,
+        "x": 18,
+        "y": 13,
+        "var": 2013,
+        "lv": 34,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6042,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
         "x": 19,
-        "y": 5,
+        "y": 13,
         "var": 2014,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&7128|2&4680|4&1728|5&2304",
+        "attribute": "1&8640|2&3960|4&2304|5&1440",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,19 @@
     },
     {
         "warId": 6042,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 20,
-        "y": 4,
+        "x": 18,
+        "y": 14,
         "var": 2015,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
+        "attribute": "1&8064|2&4752|4&1800|5&1656",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -421,19 +421,19 @@
     },
     {
         "warId": 6042,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2016,
         "relation": 2,
         "outIndex": 15,
         "dirction": 1,
-        "x": 20,
-        "y": 5,
+        "x": 19,
+        "y": 14,
         "var": 2016,
         "lv": 34,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
+        "attribute": "1&8064|2&4752|4&1800|5&1656",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -441,19 +441,19 @@
     },
     {
         "warId": 6042,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
         "x": 18,
-        "y": 13,
+        "y": 15,
         "var": 2017,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8640|2&3960|4&2304|5&1440",
+        "attribute": "1&7128|2&4680|4&1728|5&2304",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -461,142 +461,22 @@
     },
     {
         "warId": 6042,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2018,
         "relation": 2,
         "outIndex": 17,
         "dirction": 1,
         "x": 19,
-        "y": 13,
+        "y": 15,
         "var": 2018,
         "lv": 34,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8640|2&3960|4&2304|5&1440",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6042,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 18,
-        "y": 14,
-        "var": 2019,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&8064|2&4752|4&1800|5&1656",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6042,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 19,
-        "y": 14,
-        "var": 2020,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&8064|2&4752|4&1800|5&1656",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6042,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 18,
-        "y": 15,
-        "var": 2021,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&7128|2&4680|4&1728|5&2304",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6042,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 19,
-        "y": 15,
-        "var": 2022,
-        "lv": 34,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&7128|2&4680|4&1728|5&2304",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6042,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 17,
-        "y": 15,
-        "var": 2023,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6042,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 15,
-        "var": 2024,
-        "lv": 34,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&6768|2&4968|4&1584|5&2160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6043.json b/shared/resource/warJsons/6043.json
index 80aa4ff18..1a78cda76 100644
--- a/shared/resource/warJsons/6043.json
+++ b/shared/resource/warJsons/6043.json
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6043,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 17,
+        "y": 4,
         "var": 2007,
         "lv": 38,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6043,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 7,
-        "y": 2,
-        "var": 2008,
-        "lv": 38,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
+        "attribute": "1&12960|2&5940|4&3456|5&2160",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6043,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 17,
+        "y": 5,
+        "var": 2008,
+        "lv": 38,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6043,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 4,
         "var": 2009,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "attribute": "1&12096|2&7128|4&2700|5&2484",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6043,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 5,
         "var": 2010,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "attribute": "1&12096|2&7128|4&2700|5&2484",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6043,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 4,
         "var": 2011,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12096|2&7128|4&2700|5&2484",
+        "attribute": "1&10692|2&7020|4&2592|5&3456",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,38 +341,18 @@
     },
     {
         "warId": 6043,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 5,
         "var": 2012,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12096|2&7128|4&2700|5&2484",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6043,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 19,
-        "y": 4,
-        "var": 2013,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&10692|2&7020|4&2592|5&3456",
         "skill": 0,
         "seid": 0,
@@ -381,19 +361,39 @@
     },
     {
         "warId": 6043,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 1,
+        "x": 18,
+        "y": 13,
+        "var": 2013,
+        "lv": 38,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6043,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
         "x": 19,
-        "y": 5,
+        "y": 13,
         "var": 2014,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10692|2&7020|4&2592|5&3456",
+        "attribute": "1&12960|2&5940|4&3456|5&2160",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,19 @@
     },
     {
         "warId": 6043,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 20,
-        "y": 4,
+        "x": 18,
+        "y": 14,
         "var": 2015,
         "lv": 38,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
+        "attribute": "1&12096|2&7128|4&2700|5&2484",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -421,19 +421,19 @@
     },
     {
         "warId": 6043,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2016,
         "relation": 2,
         "outIndex": 15,
         "dirction": 1,
-        "x": 20,
-        "y": 5,
+        "x": 19,
+        "y": 14,
         "var": 2016,
         "lv": 38,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
+        "attribute": "1&12096|2&7128|4&2700|5&2484",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -441,19 +441,19 @@
     },
     {
         "warId": 6043,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
         "x": 18,
-        "y": 13,
+        "y": 15,
         "var": 2017,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "attribute": "1&10692|2&7020|4&2592|5&3456",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -461,142 +461,22 @@
     },
     {
         "warId": 6043,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2018,
         "relation": 2,
         "outIndex": 17,
         "dirction": 1,
         "x": 19,
-        "y": 13,
+        "y": 15,
         "var": 2018,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12960|2&5940|4&3456|5&2160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6043,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 18,
-        "y": 14,
-        "var": 2019,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&12096|2&7128|4&2700|5&2484",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6043,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 19,
-        "y": 14,
-        "var": 2020,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&12096|2&7128|4&2700|5&2484",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6043,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 18,
-        "y": 15,
-        "var": 2021,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&10692|2&7020|4&2592|5&3456",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6043,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 19,
-        "y": 15,
-        "var": 2022,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&10692|2&7020|4&2592|5&3456",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6043,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 17,
-        "y": 15,
-        "var": 2023,
-        "lv": 38,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6043,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 15,
-        "var": 2024,
-        "lv": 38,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6044.json b/shared/resource/warJsons/6044.json
index d879081ca..39015bdf9 100644
--- a/shared/resource/warJsons/6044.json
+++ b/shared/resource/warJsons/6044.json
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6044,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 17,
+        "y": 4,
         "var": 2007,
         "lv": 38,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6044,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 7,
-        "y": 2,
-        "var": 2008,
-        "lv": 38,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
+        "attribute": "1&12960|2&5940|4&3456|5&2160",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6044,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 17,
+        "y": 5,
+        "var": 2008,
+        "lv": 38,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6044,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 4,
         "var": 2009,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "attribute": "1&12096|2&7128|4&2700|5&2484",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6044,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 5,
         "var": 2010,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "attribute": "1&12096|2&7128|4&2700|5&2484",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6044,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 4,
         "var": 2011,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12096|2&7128|4&2700|5&2484",
+        "attribute": "1&10692|2&7020|4&2592|5&3456",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,38 +341,18 @@
     },
     {
         "warId": 6044,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 5,
         "var": 2012,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12096|2&7128|4&2700|5&2484",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6044,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 19,
-        "y": 4,
-        "var": 2013,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&10692|2&7020|4&2592|5&3456",
         "skill": 0,
         "seid": 0,
@@ -381,19 +361,39 @@
     },
     {
         "warId": 6044,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 1,
+        "x": 18,
+        "y": 13,
+        "var": 2013,
+        "lv": 38,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6044,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
         "x": 19,
-        "y": 5,
+        "y": 13,
         "var": 2014,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10692|2&7020|4&2592|5&3456",
+        "attribute": "1&12960|2&5940|4&3456|5&2160",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,19 @@
     },
     {
         "warId": 6044,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 20,
-        "y": 4,
+        "x": 18,
+        "y": 14,
         "var": 2015,
         "lv": 38,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
+        "attribute": "1&12096|2&7128|4&2700|5&2484",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -421,19 +421,19 @@
     },
     {
         "warId": 6044,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2016,
         "relation": 2,
         "outIndex": 15,
         "dirction": 1,
-        "x": 20,
-        "y": 5,
+        "x": 19,
+        "y": 14,
         "var": 2016,
         "lv": 38,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
+        "attribute": "1&12096|2&7128|4&2700|5&2484",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -441,19 +441,19 @@
     },
     {
         "warId": 6044,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
         "x": 18,
-        "y": 13,
+        "y": 15,
         "var": 2017,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "attribute": "1&10692|2&7020|4&2592|5&3456",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -461,142 +461,22 @@
     },
     {
         "warId": 6044,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2018,
         "relation": 2,
         "outIndex": 17,
         "dirction": 1,
         "x": 19,
-        "y": 13,
+        "y": 15,
         "var": 2018,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12960|2&5940|4&3456|5&2160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6044,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 18,
-        "y": 14,
-        "var": 2019,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&12096|2&7128|4&2700|5&2484",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6044,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 19,
-        "y": 14,
-        "var": 2020,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&12096|2&7128|4&2700|5&2484",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6044,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 18,
-        "y": 15,
-        "var": 2021,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&10692|2&7020|4&2592|5&3456",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6044,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 19,
-        "y": 15,
-        "var": 2022,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&10692|2&7020|4&2592|5&3456",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6044,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 17,
-        "y": 15,
-        "var": 2023,
-        "lv": 38,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6044,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 15,
-        "var": 2024,
-        "lv": 38,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6045.json b/shared/resource/warJsons/6045.json
index 8cc8cab73..3eff64eea 100644
--- a/shared/resource/warJsons/6045.json
+++ b/shared/resource/warJsons/6045.json
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6045,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 17,
+        "y": 4,
         "var": 2007,
         "lv": 38,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6045,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 7,
-        "y": 2,
-        "var": 2008,
-        "lv": 38,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
+        "attribute": "1&12960|2&5940|4&3456|5&2160",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6045,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 17,
+        "y": 5,
+        "var": 2008,
+        "lv": 38,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6045,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 4,
         "var": 2009,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "attribute": "1&12096|2&7128|4&2700|5&2484",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6045,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 5,
         "var": 2010,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "attribute": "1&12096|2&7128|4&2700|5&2484",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6045,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 4,
         "var": 2011,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12096|2&7128|4&2700|5&2484",
+        "attribute": "1&10692|2&7020|4&2592|5&3456",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,38 +341,18 @@
     },
     {
         "warId": 6045,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 5,
         "var": 2012,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12096|2&7128|4&2700|5&2484",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6045,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 19,
-        "y": 4,
-        "var": 2013,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&10692|2&7020|4&2592|5&3456",
         "skill": 0,
         "seid": 0,
@@ -381,19 +361,39 @@
     },
     {
         "warId": 6045,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 1,
+        "x": 18,
+        "y": 13,
+        "var": 2013,
+        "lv": 38,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6045,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
         "x": 19,
-        "y": 5,
+        "y": 13,
         "var": 2014,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10692|2&7020|4&2592|5&3456",
+        "attribute": "1&12960|2&5940|4&3456|5&2160",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,19 @@
     },
     {
         "warId": 6045,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 20,
-        "y": 4,
+        "x": 18,
+        "y": 14,
         "var": 2015,
         "lv": 38,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
+        "attribute": "1&12096|2&7128|4&2700|5&2484",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -421,19 +421,19 @@
     },
     {
         "warId": 6045,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2016,
         "relation": 2,
         "outIndex": 15,
         "dirction": 1,
-        "x": 20,
-        "y": 5,
+        "x": 19,
+        "y": 14,
         "var": 2016,
         "lv": 38,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
+        "attribute": "1&12096|2&7128|4&2700|5&2484",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -441,19 +441,19 @@
     },
     {
         "warId": 6045,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
         "x": 18,
-        "y": 13,
+        "y": 15,
         "var": 2017,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "attribute": "1&10692|2&7020|4&2592|5&3456",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -461,142 +461,22 @@
     },
     {
         "warId": 6045,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2018,
         "relation": 2,
         "outIndex": 17,
         "dirction": 1,
         "x": 19,
-        "y": 13,
+        "y": 15,
         "var": 2018,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12960|2&5940|4&3456|5&2160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6045,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 18,
-        "y": 14,
-        "var": 2019,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&12096|2&7128|4&2700|5&2484",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6045,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 19,
-        "y": 14,
-        "var": 2020,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&12096|2&7128|4&2700|5&2484",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6045,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 18,
-        "y": 15,
-        "var": 2021,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&10692|2&7020|4&2592|5&3456",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6045,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 19,
-        "y": 15,
-        "var": 2022,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&10692|2&7020|4&2592|5&3456",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6045,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 17,
-        "y": 15,
-        "var": 2023,
-        "lv": 38,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6045,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 15,
-        "var": 2024,
-        "lv": 38,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6046.json b/shared/resource/warJsons/6046.json
index 258c54bc5..c22ca9f99 100644
--- a/shared/resource/warJsons/6046.json
+++ b/shared/resource/warJsons/6046.json
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6046,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 17,
+        "y": 4,
         "var": 2007,
         "lv": 38,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6046,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 7,
-        "y": 2,
-        "var": 2008,
-        "lv": 38,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
+        "attribute": "1&12960|2&5940|4&3456|5&2160",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6046,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 17,
+        "y": 5,
+        "var": 2008,
+        "lv": 38,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6046,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 4,
         "var": 2009,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "attribute": "1&12096|2&7128|4&2700|5&2484",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6046,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 5,
         "var": 2010,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "attribute": "1&12096|2&7128|4&2700|5&2484",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6046,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 4,
         "var": 2011,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12096|2&7128|4&2700|5&2484",
+        "attribute": "1&10692|2&7020|4&2592|5&3456",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,38 +341,18 @@
     },
     {
         "warId": 6046,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 5,
         "var": 2012,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12096|2&7128|4&2700|5&2484",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6046,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 19,
-        "y": 4,
-        "var": 2013,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&10692|2&7020|4&2592|5&3456",
         "skill": 0,
         "seid": 0,
@@ -381,19 +361,39 @@
     },
     {
         "warId": 6046,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 1,
+        "x": 18,
+        "y": 13,
+        "var": 2013,
+        "lv": 38,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6046,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
         "x": 19,
-        "y": 5,
+        "y": 13,
         "var": 2014,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10692|2&7020|4&2592|5&3456",
+        "attribute": "1&12960|2&5940|4&3456|5&2160",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,19 @@
     },
     {
         "warId": 6046,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 20,
-        "y": 4,
+        "x": 18,
+        "y": 14,
         "var": 2015,
         "lv": 38,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
+        "attribute": "1&12096|2&7128|4&2700|5&2484",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -421,19 +421,19 @@
     },
     {
         "warId": 6046,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2016,
         "relation": 2,
         "outIndex": 15,
         "dirction": 1,
-        "x": 20,
-        "y": 5,
+        "x": 19,
+        "y": 14,
         "var": 2016,
         "lv": 38,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
+        "attribute": "1&12096|2&7128|4&2700|5&2484",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -441,19 +441,19 @@
     },
     {
         "warId": 6046,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
         "x": 18,
-        "y": 13,
+        "y": 15,
         "var": 2017,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "attribute": "1&10692|2&7020|4&2592|5&3456",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -461,142 +461,22 @@
     },
     {
         "warId": 6046,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2018,
         "relation": 2,
         "outIndex": 17,
         "dirction": 1,
         "x": 19,
-        "y": 13,
+        "y": 15,
         "var": 2018,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12960|2&5940|4&3456|5&2160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6046,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 18,
-        "y": 14,
-        "var": 2019,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&12096|2&7128|4&2700|5&2484",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6046,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 19,
-        "y": 14,
-        "var": 2020,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&12096|2&7128|4&2700|5&2484",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6046,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 18,
-        "y": 15,
-        "var": 2021,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&10692|2&7020|4&2592|5&3456",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6046,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 19,
-        "y": 15,
-        "var": 2022,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&10692|2&7020|4&2592|5&3456",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6046,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 17,
-        "y": 15,
-        "var": 2023,
-        "lv": 38,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6046,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 15,
-        "var": 2024,
-        "lv": 38,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6047.json b/shared/resource/warJsons/6047.json
index fc990c0e6..515e4cdd0 100644
--- a/shared/resource/warJsons/6047.json
+++ b/shared/resource/warJsons/6047.json
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6047,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 17,
+        "y": 4,
         "var": 2007,
         "lv": 38,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6047,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 7,
-        "y": 2,
-        "var": 2008,
-        "lv": 38,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
+        "attribute": "1&12960|2&5940|4&3456|5&2160",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6047,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 17,
+        "y": 5,
+        "var": 2008,
+        "lv": 38,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6047,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 4,
         "var": 2009,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "attribute": "1&12096|2&7128|4&2700|5&2484",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6047,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 5,
         "var": 2010,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "attribute": "1&12096|2&7128|4&2700|5&2484",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6047,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 4,
         "var": 2011,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12096|2&7128|4&2700|5&2484",
+        "attribute": "1&10692|2&7020|4&2592|5&3456",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,38 +341,18 @@
     },
     {
         "warId": 6047,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 5,
         "var": 2012,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12096|2&7128|4&2700|5&2484",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6047,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 19,
-        "y": 4,
-        "var": 2013,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&10692|2&7020|4&2592|5&3456",
         "skill": 0,
         "seid": 0,
@@ -381,19 +361,39 @@
     },
     {
         "warId": 6047,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 1,
+        "x": 18,
+        "y": 13,
+        "var": 2013,
+        "lv": 38,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6047,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
         "x": 19,
-        "y": 5,
+        "y": 13,
         "var": 2014,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10692|2&7020|4&2592|5&3456",
+        "attribute": "1&12960|2&5940|4&3456|5&2160",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,19 @@
     },
     {
         "warId": 6047,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 20,
-        "y": 4,
+        "x": 18,
+        "y": 14,
         "var": 2015,
         "lv": 38,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
+        "attribute": "1&12096|2&7128|4&2700|5&2484",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -421,19 +421,19 @@
     },
     {
         "warId": 6047,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2016,
         "relation": 2,
         "outIndex": 15,
         "dirction": 1,
-        "x": 20,
-        "y": 5,
+        "x": 19,
+        "y": 14,
         "var": 2016,
         "lv": 38,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
+        "attribute": "1&12096|2&7128|4&2700|5&2484",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -441,19 +441,19 @@
     },
     {
         "warId": 6047,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
         "x": 18,
-        "y": 13,
+        "y": 15,
         "var": 2017,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "attribute": "1&10692|2&7020|4&2592|5&3456",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -461,142 +461,22 @@
     },
     {
         "warId": 6047,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2018,
         "relation": 2,
         "outIndex": 17,
         "dirction": 1,
         "x": 19,
-        "y": 13,
+        "y": 15,
         "var": 2018,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12960|2&5940|4&3456|5&2160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6047,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 18,
-        "y": 14,
-        "var": 2019,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&12096|2&7128|4&2700|5&2484",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6047,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 19,
-        "y": 14,
-        "var": 2020,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&12096|2&7128|4&2700|5&2484",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6047,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 18,
-        "y": 15,
-        "var": 2021,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&10692|2&7020|4&2592|5&3456",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6047,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 19,
-        "y": 15,
-        "var": 2022,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&10692|2&7020|4&2592|5&3456",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6047,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 17,
-        "y": 15,
-        "var": 2023,
-        "lv": 38,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6047,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 15,
-        "var": 2024,
-        "lv": 38,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6048.json b/shared/resource/warJsons/6048.json
index 403737b96..ba5b84e03 100644
--- a/shared/resource/warJsons/6048.json
+++ b/shared/resource/warJsons/6048.json
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6048,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 17,
+        "y": 4,
         "var": 2007,
         "lv": 38,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6048,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 7,
-        "y": 2,
-        "var": 2008,
-        "lv": 38,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
+        "attribute": "1&12960|2&5940|4&3456|5&2160",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6048,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 17,
+        "y": 5,
+        "var": 2008,
+        "lv": 38,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6048,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 4,
         "var": 2009,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "attribute": "1&12096|2&7128|4&2700|5&2484",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6048,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 5,
         "var": 2010,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "attribute": "1&12096|2&7128|4&2700|5&2484",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6048,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 4,
         "var": 2011,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12096|2&7128|4&2700|5&2484",
+        "attribute": "1&10692|2&7020|4&2592|5&3456",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,38 +341,18 @@
     },
     {
         "warId": 6048,
-        "actorName": "骑兵",
-        "actorId": 1003,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 18,
+        "x": 19,
         "y": 5,
         "var": 2012,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12096|2&7128|4&2700|5&2484",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6048,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 19,
-        "y": 4,
-        "var": 2013,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&10692|2&7020|4&2592|5&3456",
         "skill": 0,
         "seid": 0,
@@ -381,19 +361,39 @@
     },
     {
         "warId": 6048,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2013,
+        "relation": 2,
+        "outIndex": 12,
+        "dirction": 1,
+        "x": 18,
+        "y": 13,
+        "var": 2013,
+        "lv": 38,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6048,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
         "x": 19,
-        "y": 5,
+        "y": 13,
         "var": 2014,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10692|2&7020|4&2592|5&3456",
+        "attribute": "1&12960|2&5940|4&3456|5&2160",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,19 @@
     },
     {
         "warId": 6048,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 20,
-        "y": 4,
+        "x": 18,
+        "y": 14,
         "var": 2015,
         "lv": 38,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
+        "attribute": "1&12096|2&7128|4&2700|5&2484",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -421,19 +421,19 @@
     },
     {
         "warId": 6048,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵",
+        "actorId": 1003,
         "dataId": 2016,
         "relation": 2,
         "outIndex": 15,
         "dirction": 1,
-        "x": 20,
-        "y": 5,
+        "x": 19,
+        "y": 14,
         "var": 2016,
         "lv": 38,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
+        "attribute": "1&12096|2&7128|4&2700|5&2484",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -441,19 +441,19 @@
     },
     {
         "warId": 6048,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
         "x": 18,
-        "y": 13,
+        "y": 15,
         "var": 2017,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12960|2&5940|4&3456|5&2160",
+        "attribute": "1&10692|2&7020|4&2592|5&3456",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -461,142 +461,22 @@
     },
     {
         "warId": 6048,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2018,
         "relation": 2,
         "outIndex": 17,
         "dirction": 1,
         "x": 19,
-        "y": 13,
+        "y": 15,
         "var": 2018,
         "lv": 38,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12960|2&5940|4&3456|5&2160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6048,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 18,
-        "y": 14,
-        "var": 2019,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&12096|2&7128|4&2700|5&2484",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6048,
-        "actorName": "骑兵",
-        "actorId": 1003,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 19,
-        "y": 14,
-        "var": 2020,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&12096|2&7128|4&2700|5&2484",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6048,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 18,
-        "y": 15,
-        "var": 2021,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&10692|2&7020|4&2592|5&3456",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6048,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 19,
-        "y": 15,
-        "var": 2022,
-        "lv": 38,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&10692|2&7020|4&2592|5&3456",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6048,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 17,
-        "y": 15,
-        "var": 2023,
-        "lv": 38,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6048,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 15,
-        "var": 2024,
-        "lv": 38,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10152|2&7452|4&2376|5&3240",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6049.json b/shared/resource/warJsons/6049.json
index e3b048af0..2b83d7fa5 100644
--- a/shared/resource/warJsons/6049.json
+++ b/shared/resource/warJsons/6049.json
@@ -201,8 +201,8 @@
     },
     {
         "warId": 6049,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
@@ -221,19 +221,19 @@
     },
     {
         "warId": 6049,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
-        "x": 6,
-        "y": 11,
+        "x": 3,
+        "y": 12,
         "var": 2006,
         "lv": 50,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5640|2&4140|4&1320|5&1800",
+        "attribute": "1&8400|2&4950|4&1875|5&1725",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6049,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
+        "dirction": 1,
+        "x": 17,
         "y": 12,
         "var": 2007,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8400|2&4950|4&1875|5&1725",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6049,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 5,
-        "y": 11,
-        "var": 2008,
-        "lv": 50,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&7275|2&5025|4&1725|5&1650",
+        "attribute": "1&7200|2&3300|4&1920|5&1200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6049,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 19,
+        "y": 12,
+        "var": 2008,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&7200|2&3300|4&1920|5&1200",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6049,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 17,
-        "y": 12,
+        "y": 13,
         "var": 2009,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&7200|2&3300|4&1920|5&1200",
+        "attribute": "1&6360|2&3600|4&1740|5&1560",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6049,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
         "x": 19,
-        "y": 12,
+        "y": 13,
         "var": 2010,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&7200|2&3300|4&1920|5&1200",
+        "attribute": "1&6360|2&3600|4&1740|5&1560",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6049,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 13,
         "var": 2011,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6360|2&3600|4&1740|5&1560",
+        "attribute": "1&5820|2&4020|4&1380|5&1320",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,19 +341,19 @@
     },
     {
         "warId": 6049,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 19,
-        "y": 13,
+        "x": 18,
+        "y": 12,
         "var": 2012,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6360|2&3600|4&1740|5&1560",
+        "attribute": "1&8400|2&4950|4&1875|5&1725",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -361,19 +361,19 @@
     },
     {
         "warId": 6049,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2013,
         "relation": 2,
         "outIndex": 12,
         "dirction": 1,
-        "x": 18,
-        "y": 13,
+        "x": 15,
+        "y": 3,
         "var": 2013,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5820|2&4020|4&1380|5&1320",
+        "attribute": "1&7200|2&3300|4&1920|5&1200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -381,19 +381,19 @@
     },
     {
         "warId": 6049,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
-        "x": 19,
-        "y": 10,
+        "x": 16,
+        "y": 3,
         "var": 2014,
         "lv": 50,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5640|2&4140|4&1320|5&1800",
+        "attribute": "1&7200|2&3300|4&1920|5&1200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,39 @@
     },
     {
         "warId": 6049,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 18,
-        "y": 12,
+        "x": 14,
+        "y": 2,
         "var": 2015,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8400|2&4950|4&1875|5&1725",
+        "attribute": "1&6360|2&3600|4&1740|5&1560",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6049,
+        "actorName": "枪兵",
+        "actorId": 1002,
+        "dataId": 2016,
+        "relation": 2,
+        "outIndex": 15,
+        "dirction": 1,
+        "x": 17,
+        "y": 2,
+        "var": 2016,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&6360|2&3600|4&1740|5&1560",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,153 +443,33 @@
         "warId": 6049,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 16,
-        "y": 10,
-        "var": 2016,
-        "lv": 50,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&7275|2&5025|4&1725|5&1650",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6049,
-        "actorName": "步兵",
-        "actorId": 1001,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
-        "x": 15,
-        "y": 3,
+        "x": 16,
+        "y": 2,
         "var": 2017,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&7200|2&3300|4&1920|5&1200",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6049,
-        "actorName": "步兵",
-        "actorId": 1001,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 16,
-        "y": 3,
-        "var": 2018,
-        "lv": 50,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&7200|2&3300|4&1920|5&1200",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6049,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 14,
-        "y": 2,
-        "var": 2019,
-        "lv": 50,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&6360|2&3600|4&1740|5&1560",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6049,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 17,
-        "y": 2,
-        "var": 2020,
-        "lv": 50,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&6360|2&3600|4&1740|5&1560",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6049,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 16,
-        "y": 2,
-        "var": 2021,
-        "lv": 50,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&5820|2&4020|4&1380|5&1320",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6049,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 18,
-        "y": 4,
-        "var": 2022,
-        "lv": 50,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&5640|2&4140|4&1320|5&1800",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6049,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2023,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 17,
         "dirction": 1,
         "x": 15,
         "y": 2,
-        "var": 2023,
+        "var": 2018,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
@@ -578,25 +478,5 @@
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6049,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 17,
-        "y": 4,
-        "var": 2024,
-        "lv": 50,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&7275|2&5025|4&1725|5&1650",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6050.json b/shared/resource/warJsons/6050.json
index f67798e8d..7370f1912 100644
--- a/shared/resource/warJsons/6050.json
+++ b/shared/resource/warJsons/6050.json
@@ -201,8 +201,8 @@
     },
     {
         "warId": 6050,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
@@ -221,19 +221,19 @@
     },
     {
         "warId": 6050,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
-        "x": 6,
-        "y": 11,
+        "x": 3,
+        "y": 12,
         "var": 2006,
         "lv": 50,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5640|2&4140|4&1320|5&1800",
+        "attribute": "1&8400|2&4950|4&1875|5&1725",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6050,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
+        "dirction": 1,
+        "x": 17,
         "y": 12,
         "var": 2007,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8400|2&4950|4&1875|5&1725",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6050,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 5,
-        "y": 11,
-        "var": 2008,
-        "lv": 50,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&7275|2&5025|4&1725|5&1650",
+        "attribute": "1&7200|2&3300|4&1920|5&1200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6050,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 19,
+        "y": 12,
+        "var": 2008,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&7200|2&3300|4&1920|5&1200",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6050,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 17,
-        "y": 12,
+        "y": 13,
         "var": 2009,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&7200|2&3300|4&1920|5&1200",
+        "attribute": "1&6360|2&3600|4&1740|5&1560",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6050,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
         "x": 19,
-        "y": 12,
+        "y": 13,
         "var": 2010,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&7200|2&3300|4&1920|5&1200",
+        "attribute": "1&6360|2&3600|4&1740|5&1560",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6050,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 13,
         "var": 2011,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6360|2&3600|4&1740|5&1560",
+        "attribute": "1&5820|2&4020|4&1380|5&1320",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,19 +341,19 @@
     },
     {
         "warId": 6050,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 19,
-        "y": 13,
+        "x": 18,
+        "y": 12,
         "var": 2012,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6360|2&3600|4&1740|5&1560",
+        "attribute": "1&8400|2&4950|4&1875|5&1725",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -361,19 +361,19 @@
     },
     {
         "warId": 6050,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2013,
         "relation": 2,
         "outIndex": 12,
         "dirction": 1,
-        "x": 18,
-        "y": 13,
+        "x": 15,
+        "y": 3,
         "var": 2013,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5820|2&4020|4&1380|5&1320",
+        "attribute": "1&7200|2&3300|4&1920|5&1200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -381,19 +381,19 @@
     },
     {
         "warId": 6050,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
-        "x": 19,
-        "y": 10,
+        "x": 16,
+        "y": 3,
         "var": 2014,
         "lv": 50,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5640|2&4140|4&1320|5&1800",
+        "attribute": "1&7200|2&3300|4&1920|5&1200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,39 @@
     },
     {
         "warId": 6050,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 18,
-        "y": 12,
+        "x": 14,
+        "y": 2,
         "var": 2015,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8400|2&4950|4&1875|5&1725",
+        "attribute": "1&6360|2&3600|4&1740|5&1560",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6050,
+        "actorName": "枪兵",
+        "actorId": 1002,
+        "dataId": 2016,
+        "relation": 2,
+        "outIndex": 15,
+        "dirction": 1,
+        "x": 17,
+        "y": 2,
+        "var": 2016,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&6360|2&3600|4&1740|5&1560",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,153 +443,33 @@
         "warId": 6050,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 16,
-        "y": 10,
-        "var": 2016,
-        "lv": 50,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&7275|2&5025|4&1725|5&1650",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6050,
-        "actorName": "步兵",
-        "actorId": 1001,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
-        "x": 15,
-        "y": 3,
+        "x": 16,
+        "y": 2,
         "var": 2017,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&7200|2&3300|4&1920|5&1200",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6050,
-        "actorName": "步兵",
-        "actorId": 1001,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 16,
-        "y": 3,
-        "var": 2018,
-        "lv": 50,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&7200|2&3300|4&1920|5&1200",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6050,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 14,
-        "y": 2,
-        "var": 2019,
-        "lv": 50,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&6360|2&3600|4&1740|5&1560",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6050,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 17,
-        "y": 2,
-        "var": 2020,
-        "lv": 50,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&6360|2&3600|4&1740|5&1560",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6050,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 16,
-        "y": 2,
-        "var": 2021,
-        "lv": 50,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&5820|2&4020|4&1380|5&1320",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6050,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 18,
-        "y": 4,
-        "var": 2022,
-        "lv": 50,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&5640|2&4140|4&1320|5&1800",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6050,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2023,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 17,
         "dirction": 1,
         "x": 15,
         "y": 2,
-        "var": 2023,
+        "var": 2018,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
@@ -578,25 +478,5 @@
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6050,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 17,
-        "y": 4,
-        "var": 2024,
-        "lv": 50,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&7275|2&5025|4&1725|5&1650",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6051.json b/shared/resource/warJsons/6051.json
index 0a4964987..59725e761 100644
--- a/shared/resource/warJsons/6051.json
+++ b/shared/resource/warJsons/6051.json
@@ -201,8 +201,8 @@
     },
     {
         "warId": 6051,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
@@ -221,19 +221,19 @@
     },
     {
         "warId": 6051,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
-        "x": 6,
-        "y": 11,
+        "x": 3,
+        "y": 12,
         "var": 2006,
         "lv": 50,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5640|2&4140|4&1320|5&1800",
+        "attribute": "1&8400|2&4950|4&1875|5&1725",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6051,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
+        "dirction": 1,
+        "x": 17,
         "y": 12,
         "var": 2007,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8400|2&4950|4&1875|5&1725",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6051,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 5,
-        "y": 11,
-        "var": 2008,
-        "lv": 50,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&7275|2&5025|4&1725|5&1650",
+        "attribute": "1&7200|2&3300|4&1920|5&1200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6051,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 19,
+        "y": 12,
+        "var": 2008,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&7200|2&3300|4&1920|5&1200",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6051,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 17,
-        "y": 12,
+        "y": 13,
         "var": 2009,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&7200|2&3300|4&1920|5&1200",
+        "attribute": "1&6360|2&3600|4&1740|5&1560",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6051,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
         "x": 19,
-        "y": 12,
+        "y": 13,
         "var": 2010,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&7200|2&3300|4&1920|5&1200",
+        "attribute": "1&6360|2&3600|4&1740|5&1560",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6051,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 13,
         "var": 2011,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6360|2&3600|4&1740|5&1560",
+        "attribute": "1&5820|2&4020|4&1380|5&1320",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,19 +341,19 @@
     },
     {
         "warId": 6051,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 19,
-        "y": 13,
+        "x": 18,
+        "y": 12,
         "var": 2012,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6360|2&3600|4&1740|5&1560",
+        "attribute": "1&8400|2&4950|4&1875|5&1725",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -361,19 +361,19 @@
     },
     {
         "warId": 6051,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2013,
         "relation": 2,
         "outIndex": 12,
         "dirction": 1,
-        "x": 18,
-        "y": 13,
+        "x": 15,
+        "y": 3,
         "var": 2013,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5820|2&4020|4&1380|5&1320",
+        "attribute": "1&7200|2&3300|4&1920|5&1200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -381,19 +381,19 @@
     },
     {
         "warId": 6051,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
-        "x": 19,
-        "y": 10,
+        "x": 16,
+        "y": 3,
         "var": 2014,
         "lv": 50,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5640|2&4140|4&1320|5&1800",
+        "attribute": "1&7200|2&3300|4&1920|5&1200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,39 @@
     },
     {
         "warId": 6051,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 18,
-        "y": 12,
+        "x": 14,
+        "y": 2,
         "var": 2015,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8400|2&4950|4&1875|5&1725",
+        "attribute": "1&6360|2&3600|4&1740|5&1560",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6051,
+        "actorName": "枪兵",
+        "actorId": 1002,
+        "dataId": 2016,
+        "relation": 2,
+        "outIndex": 15,
+        "dirction": 1,
+        "x": 17,
+        "y": 2,
+        "var": 2016,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&6360|2&3600|4&1740|5&1560",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,153 +443,33 @@
         "warId": 6051,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 16,
-        "y": 10,
-        "var": 2016,
-        "lv": 50,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&7275|2&5025|4&1725|5&1650",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6051,
-        "actorName": "步兵",
-        "actorId": 1001,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
-        "x": 15,
-        "y": 3,
+        "x": 16,
+        "y": 2,
         "var": 2017,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&7200|2&3300|4&1920|5&1200",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6051,
-        "actorName": "步兵",
-        "actorId": 1001,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 16,
-        "y": 3,
-        "var": 2018,
-        "lv": 50,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&7200|2&3300|4&1920|5&1200",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6051,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 14,
-        "y": 2,
-        "var": 2019,
-        "lv": 50,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&6360|2&3600|4&1740|5&1560",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6051,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 17,
-        "y": 2,
-        "var": 2020,
-        "lv": 50,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&6360|2&3600|4&1740|5&1560",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6051,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 16,
-        "y": 2,
-        "var": 2021,
-        "lv": 50,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&5820|2&4020|4&1380|5&1320",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6051,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 18,
-        "y": 4,
-        "var": 2022,
-        "lv": 50,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&5640|2&4140|4&1320|5&1800",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6051,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2023,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 17,
         "dirction": 1,
         "x": 15,
         "y": 2,
-        "var": 2023,
+        "var": 2018,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
@@ -578,25 +478,5 @@
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6051,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 17,
-        "y": 4,
-        "var": 2024,
-        "lv": 50,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&7275|2&5025|4&1725|5&1650",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6052.json b/shared/resource/warJsons/6052.json
index 2300b8009..8f53f9875 100644
--- a/shared/resource/warJsons/6052.json
+++ b/shared/resource/warJsons/6052.json
@@ -201,8 +201,8 @@
     },
     {
         "warId": 6052,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
@@ -221,19 +221,19 @@
     },
     {
         "warId": 6052,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
-        "x": 6,
-        "y": 11,
+        "x": 3,
+        "y": 12,
         "var": 2006,
         "lv": 50,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5640|2&4140|4&1320|5&1800",
+        "attribute": "1&8400|2&4950|4&1875|5&1725",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6052,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
+        "dirction": 1,
+        "x": 17,
         "y": 12,
         "var": 2007,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8400|2&4950|4&1875|5&1725",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6052,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 5,
-        "y": 11,
-        "var": 2008,
-        "lv": 50,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&7275|2&5025|4&1725|5&1650",
+        "attribute": "1&7200|2&3300|4&1920|5&1200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6052,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 19,
+        "y": 12,
+        "var": 2008,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&7200|2&3300|4&1920|5&1200",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6052,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 17,
-        "y": 12,
+        "y": 13,
         "var": 2009,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&7200|2&3300|4&1920|5&1200",
+        "attribute": "1&6360|2&3600|4&1740|5&1560",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6052,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
         "x": 19,
-        "y": 12,
+        "y": 13,
         "var": 2010,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&7200|2&3300|4&1920|5&1200",
+        "attribute": "1&6360|2&3600|4&1740|5&1560",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6052,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 13,
         "var": 2011,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6360|2&3600|4&1740|5&1560",
+        "attribute": "1&5820|2&4020|4&1380|5&1320",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,19 +341,19 @@
     },
     {
         "warId": 6052,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 19,
-        "y": 13,
+        "x": 18,
+        "y": 12,
         "var": 2012,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6360|2&3600|4&1740|5&1560",
+        "attribute": "1&8400|2&4950|4&1875|5&1725",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -361,19 +361,19 @@
     },
     {
         "warId": 6052,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2013,
         "relation": 2,
         "outIndex": 12,
         "dirction": 1,
-        "x": 18,
-        "y": 13,
+        "x": 15,
+        "y": 3,
         "var": 2013,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5820|2&4020|4&1380|5&1320",
+        "attribute": "1&7200|2&3300|4&1920|5&1200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -381,19 +381,19 @@
     },
     {
         "warId": 6052,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
-        "x": 19,
-        "y": 10,
+        "x": 16,
+        "y": 3,
         "var": 2014,
         "lv": 50,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5640|2&4140|4&1320|5&1800",
+        "attribute": "1&7200|2&3300|4&1920|5&1200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,39 @@
     },
     {
         "warId": 6052,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 18,
-        "y": 12,
+        "x": 14,
+        "y": 2,
         "var": 2015,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8400|2&4950|4&1875|5&1725",
+        "attribute": "1&6360|2&3600|4&1740|5&1560",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6052,
+        "actorName": "枪兵",
+        "actorId": 1002,
+        "dataId": 2016,
+        "relation": 2,
+        "outIndex": 15,
+        "dirction": 1,
+        "x": 17,
+        "y": 2,
+        "var": 2016,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&6360|2&3600|4&1740|5&1560",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,153 +443,33 @@
         "warId": 6052,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 16,
-        "y": 10,
-        "var": 2016,
-        "lv": 50,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&7275|2&5025|4&1725|5&1650",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6052,
-        "actorName": "步兵",
-        "actorId": 1001,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
-        "x": 15,
-        "y": 3,
+        "x": 16,
+        "y": 2,
         "var": 2017,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&7200|2&3300|4&1920|5&1200",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6052,
-        "actorName": "步兵",
-        "actorId": 1001,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 16,
-        "y": 3,
-        "var": 2018,
-        "lv": 50,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&7200|2&3300|4&1920|5&1200",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6052,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 14,
-        "y": 2,
-        "var": 2019,
-        "lv": 50,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&6360|2&3600|4&1740|5&1560",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6052,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 17,
-        "y": 2,
-        "var": 2020,
-        "lv": 50,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&6360|2&3600|4&1740|5&1560",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6052,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 16,
-        "y": 2,
-        "var": 2021,
-        "lv": 50,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&5820|2&4020|4&1380|5&1320",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6052,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 18,
-        "y": 4,
-        "var": 2022,
-        "lv": 50,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&5640|2&4140|4&1320|5&1800",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6052,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2023,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 17,
         "dirction": 1,
         "x": 15,
         "y": 2,
-        "var": 2023,
+        "var": 2018,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
@@ -578,25 +478,5 @@
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6052,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 17,
-        "y": 4,
-        "var": 2024,
-        "lv": 50,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&7275|2&5025|4&1725|5&1650",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6053.json b/shared/resource/warJsons/6053.json
index 98ae2148c..e94c4feff 100644
--- a/shared/resource/warJsons/6053.json
+++ b/shared/resource/warJsons/6053.json
@@ -201,8 +201,8 @@
     },
     {
         "warId": 6053,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
@@ -221,19 +221,19 @@
     },
     {
         "warId": 6053,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
-        "x": 6,
-        "y": 11,
+        "x": 3,
+        "y": 12,
         "var": 2006,
         "lv": 50,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5640|2&4140|4&1320|5&1800",
+        "attribute": "1&8400|2&4950|4&1875|5&1725",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6053,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
+        "dirction": 1,
+        "x": 17,
         "y": 12,
         "var": 2007,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8400|2&4950|4&1875|5&1725",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6053,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 5,
-        "y": 11,
-        "var": 2008,
-        "lv": 50,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&7275|2&5025|4&1725|5&1650",
+        "attribute": "1&7200|2&3300|4&1920|5&1200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6053,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 19,
+        "y": 12,
+        "var": 2008,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&7200|2&3300|4&1920|5&1200",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6053,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 17,
-        "y": 12,
+        "y": 13,
         "var": 2009,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&7200|2&3300|4&1920|5&1200",
+        "attribute": "1&6360|2&3600|4&1740|5&1560",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6053,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
         "x": 19,
-        "y": 12,
+        "y": 13,
         "var": 2010,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&7200|2&3300|4&1920|5&1200",
+        "attribute": "1&6360|2&3600|4&1740|5&1560",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6053,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 13,
         "var": 2011,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6360|2&3600|4&1740|5&1560",
+        "attribute": "1&5820|2&4020|4&1380|5&1320",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,19 +341,19 @@
     },
     {
         "warId": 6053,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 19,
-        "y": 13,
+        "x": 18,
+        "y": 12,
         "var": 2012,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6360|2&3600|4&1740|5&1560",
+        "attribute": "1&8400|2&4950|4&1875|5&1725",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -361,19 +361,19 @@
     },
     {
         "warId": 6053,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2013,
         "relation": 2,
         "outIndex": 12,
         "dirction": 1,
-        "x": 18,
-        "y": 13,
+        "x": 15,
+        "y": 3,
         "var": 2013,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5820|2&4020|4&1380|5&1320",
+        "attribute": "1&7200|2&3300|4&1920|5&1200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -381,19 +381,19 @@
     },
     {
         "warId": 6053,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
-        "x": 19,
-        "y": 10,
+        "x": 16,
+        "y": 3,
         "var": 2014,
         "lv": 50,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5640|2&4140|4&1320|5&1800",
+        "attribute": "1&7200|2&3300|4&1920|5&1200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,39 @@
     },
     {
         "warId": 6053,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 18,
-        "y": 12,
+        "x": 14,
+        "y": 2,
         "var": 2015,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8400|2&4950|4&1875|5&1725",
+        "attribute": "1&6360|2&3600|4&1740|5&1560",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6053,
+        "actorName": "枪兵",
+        "actorId": 1002,
+        "dataId": 2016,
+        "relation": 2,
+        "outIndex": 15,
+        "dirction": 1,
+        "x": 17,
+        "y": 2,
+        "var": 2016,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&6360|2&3600|4&1740|5&1560",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,153 +443,33 @@
         "warId": 6053,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 16,
-        "y": 10,
-        "var": 2016,
-        "lv": 50,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&7275|2&5025|4&1725|5&1650",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6053,
-        "actorName": "步兵",
-        "actorId": 1001,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
-        "x": 15,
-        "y": 3,
+        "x": 16,
+        "y": 2,
         "var": 2017,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&7200|2&3300|4&1920|5&1200",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6053,
-        "actorName": "步兵",
-        "actorId": 1001,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 16,
-        "y": 3,
-        "var": 2018,
-        "lv": 50,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&7200|2&3300|4&1920|5&1200",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6053,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 14,
-        "y": 2,
-        "var": 2019,
-        "lv": 50,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&6360|2&3600|4&1740|5&1560",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6053,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 17,
-        "y": 2,
-        "var": 2020,
-        "lv": 50,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&6360|2&3600|4&1740|5&1560",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6053,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 16,
-        "y": 2,
-        "var": 2021,
-        "lv": 50,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&5820|2&4020|4&1380|5&1320",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6053,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 18,
-        "y": 4,
-        "var": 2022,
-        "lv": 50,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&5640|2&4140|4&1320|5&1800",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6053,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2023,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 17,
         "dirction": 1,
         "x": 15,
         "y": 2,
-        "var": 2023,
+        "var": 2018,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
@@ -578,25 +478,5 @@
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6053,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 17,
-        "y": 4,
-        "var": 2024,
-        "lv": 50,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&7275|2&5025|4&1725|5&1650",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6054.json b/shared/resource/warJsons/6054.json
index 2be6f74a2..6c12a6fb5 100644
--- a/shared/resource/warJsons/6054.json
+++ b/shared/resource/warJsons/6054.json
@@ -201,8 +201,8 @@
     },
     {
         "warId": 6054,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
@@ -221,19 +221,19 @@
     },
     {
         "warId": 6054,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
-        "x": 6,
-        "y": 11,
+        "x": 3,
+        "y": 12,
         "var": 2006,
         "lv": 50,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5640|2&4140|4&1320|5&1800",
+        "attribute": "1&8400|2&4950|4&1875|5&1725",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -241,39 +241,19 @@
     },
     {
         "warId": 6054,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
+        "dirction": 1,
+        "x": 17,
         "y": 12,
         "var": 2007,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8400|2&4950|4&1875|5&1725",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6054,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 5,
-        "y": 11,
-        "var": 2008,
-        "lv": 50,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&7275|2&5025|4&1725|5&1650",
+        "attribute": "1&7200|2&3300|4&1920|5&1200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6054,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 19,
+        "y": 12,
+        "var": 2008,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&7200|2&3300|4&1920|5&1200",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6054,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 17,
-        "y": 12,
+        "y": 13,
         "var": 2009,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&7200|2&3300|4&1920|5&1200",
+        "attribute": "1&6360|2&3600|4&1740|5&1560",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6054,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
         "x": 19,
-        "y": 12,
+        "y": 13,
         "var": 2010,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&7200|2&3300|4&1920|5&1200",
+        "attribute": "1&6360|2&3600|4&1740|5&1560",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6054,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 13,
         "var": 2011,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6360|2&3600|4&1740|5&1560",
+        "attribute": "1&5820|2&4020|4&1380|5&1320",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,19 +341,19 @@
     },
     {
         "warId": 6054,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 19,
-        "y": 13,
+        "x": 18,
+        "y": 12,
         "var": 2012,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&6360|2&3600|4&1740|5&1560",
+        "attribute": "1&8400|2&4950|4&1875|5&1725",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -361,19 +361,19 @@
     },
     {
         "warId": 6054,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2013,
         "relation": 2,
         "outIndex": 12,
         "dirction": 1,
-        "x": 18,
-        "y": 13,
+        "x": 15,
+        "y": 3,
         "var": 2013,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5820|2&4020|4&1380|5&1320",
+        "attribute": "1&7200|2&3300|4&1920|5&1200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -381,19 +381,19 @@
     },
     {
         "warId": 6054,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
-        "x": 19,
-        "y": 10,
+        "x": 16,
+        "y": 3,
         "var": 2014,
         "lv": 50,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&5640|2&4140|4&1320|5&1800",
+        "attribute": "1&7200|2&3300|4&1920|5&1200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,39 @@
     },
     {
         "warId": 6054,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 18,
-        "y": 12,
+        "x": 14,
+        "y": 2,
         "var": 2015,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8400|2&4950|4&1875|5&1725",
+        "attribute": "1&6360|2&3600|4&1740|5&1560",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6054,
+        "actorName": "枪兵",
+        "actorId": 1002,
+        "dataId": 2016,
+        "relation": 2,
+        "outIndex": 15,
+        "dirction": 1,
+        "x": 17,
+        "y": 2,
+        "var": 2016,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&6360|2&3600|4&1740|5&1560",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,153 +443,33 @@
         "warId": 6054,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 16,
-        "y": 10,
-        "var": 2016,
-        "lv": 50,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&7275|2&5025|4&1725|5&1650",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6054,
-        "actorName": "步兵",
-        "actorId": 1001,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
-        "x": 15,
-        "y": 3,
+        "x": 16,
+        "y": 2,
         "var": 2017,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&7200|2&3300|4&1920|5&1200",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6054,
-        "actorName": "步兵",
-        "actorId": 1001,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 16,
-        "y": 3,
-        "var": 2018,
-        "lv": 50,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&7200|2&3300|4&1920|5&1200",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6054,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 14,
-        "y": 2,
-        "var": 2019,
-        "lv": 50,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&6360|2&3600|4&1740|5&1560",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6054,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 17,
-        "y": 2,
-        "var": 2020,
-        "lv": 50,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&6360|2&3600|4&1740|5&1560",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6054,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 16,
-        "y": 2,
-        "var": 2021,
-        "lv": 50,
-        "hide": 0,
-        "initial_ai": 3,
         "attribute": "1&5820|2&4020|4&1380|5&1320",
         "skill": 0,
         "seid": 0,
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6054,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 18,
-        "y": 4,
-        "var": 2022,
-        "lv": 50,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&5640|2&4140|4&1320|5&1800",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6054,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2023,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 17,
         "dirction": 1,
         "x": 15,
         "y": 2,
-        "var": 2023,
+        "var": 2018,
         "lv": 50,
         "hide": 0,
         "initial_ai": 3,
@@ -578,25 +478,5 @@
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6054,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 17,
-        "y": 4,
-        "var": 2024,
-        "lv": 50,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&7275|2&5025|4&1725|5&1650",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6055.json b/shared/resource/warJsons/6055.json
index 7b55e7067..f341578c4 100644
--- a/shared/resource/warJsons/6055.json
+++ b/shared/resource/warJsons/6055.json
@@ -130,7 +130,7 @@
         "x": 2,
         "y": 12,
         "var": 2001,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&10320|2&4730|4&2752|5&1720",
@@ -150,7 +150,7 @@
         "x": 4,
         "y": 12,
         "var": 2002,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&10320|2&4730|4&2752|5&1720",
@@ -170,7 +170,7 @@
         "x": 2,
         "y": 13,
         "var": 2003,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&9116|2&5160|4&2494|5&2236",
@@ -190,7 +190,7 @@
         "x": 4,
         "y": 13,
         "var": 2004,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&9116|2&5160|4&2494|5&2236",
@@ -201,8 +201,8 @@
     },
     {
         "warId": 6055,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
@@ -210,7 +210,7 @@
         "x": 3,
         "y": 13,
         "var": 2005,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&8342|2&5762|4&1978|5&1892",
@@ -221,36 +221,16 @@
     },
     {
         "warId": 6055,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
-        "x": 6,
-        "y": 11,
-        "var": 2006,
-        "lv": 52,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&8084|2&5934|4&1892|5&2580",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6055,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
         "x": 3,
         "y": 12,
-        "var": 2007,
-        "lv": 52,
+        "var": 2006,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&12040|2&7095|4&2687|5&2472",
@@ -261,19 +241,19 @@
     },
     {
         "warId": 6055,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2008,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 5,
-        "y": 11,
-        "var": 2008,
-        "lv": 52,
-        "hide": 1,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 17,
+        "y": 12,
+        "var": 2007,
+        "lv": 50,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10427|2&7202|4&2472|5&2365",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6055,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 19,
+        "y": 12,
+        "var": 2008,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6055,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 17,
-        "y": 12,
+        "y": 13,
         "var": 2009,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6055,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
         "x": 19,
-        "y": 12,
+        "y": 13,
         "var": 2010,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6055,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 13,
         "var": 2011,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,19 +341,19 @@
     },
     {
         "warId": 6055,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 19,
-        "y": 13,
+        "x": 18,
+        "y": 12,
         "var": 2012,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -361,19 +361,19 @@
     },
     {
         "warId": 6055,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2013,
         "relation": 2,
         "outIndex": 12,
         "dirction": 1,
-        "x": 18,
-        "y": 13,
+        "x": 15,
+        "y": 3,
         "var": 2013,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8342|2&5762|4&1978|5&1892",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -381,19 +381,19 @@
     },
     {
         "warId": 6055,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
-        "x": 19,
-        "y": 10,
+        "x": 16,
+        "y": 3,
         "var": 2014,
-        "lv": 52,
-        "hide": 1,
+        "lv": 50,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8084|2&5934|4&1892|5&2580",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,39 @@
     },
     {
         "warId": 6055,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 18,
-        "y": 12,
+        "x": 14,
+        "y": 2,
         "var": 2015,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12040|2&7095|4&2687|5&2472",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6055,
+        "actorName": "枪兵",
+        "actorId": 1002,
+        "dataId": 2016,
+        "relation": 2,
+        "outIndex": 15,
+        "dirction": 1,
+        "x": 17,
+        "y": 2,
+        "var": 2016,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,114 +443,14 @@
         "warId": 6055,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 16,
-        "y": 10,
-        "var": 2016,
-        "lv": 52,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10427|2&7202|4&2472|5&2365",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6055,
-        "actorName": "步兵",
-        "actorId": 1001,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
-        "x": 15,
-        "y": 3,
+        "x": 16,
+        "y": 2,
         "var": 2017,
-        "lv": 52,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&10320|2&4730|4&2752|5&1720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6055,
-        "actorName": "步兵",
-        "actorId": 1001,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 16,
-        "y": 3,
-        "var": 2018,
-        "lv": 52,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&10320|2&4730|4&2752|5&1720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6055,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 14,
-        "y": 2,
-        "var": 2019,
-        "lv": 52,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&9116|2&5160|4&2494|5&2236",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6055,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 17,
-        "y": 2,
-        "var": 2020,
-        "lv": 52,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&9116|2&5160|4&2494|5&2236",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6055,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 16,
-        "y": 2,
-        "var": 2021,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&8342|2&5762|4&1978|5&1892",
@@ -539,38 +459,18 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6055,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 18,
-        "y": 4,
-        "var": 2022,
-        "lv": 52,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&8084|2&5934|4&1892|5&2580",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6055,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2023,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 17,
         "dirction": 1,
         "x": 15,
         "y": 2,
-        "var": 2023,
-        "lv": 52,
+        "var": 2018,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&12040|2&7095|4&2687|5&2472",
@@ -578,25 +478,5 @@
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6055,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 17,
-        "y": 4,
-        "var": 2024,
-        "lv": 52,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10427|2&7202|4&2472|5&2365",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6056.json b/shared/resource/warJsons/6056.json
index f9388e039..7250db9d9 100644
--- a/shared/resource/warJsons/6056.json
+++ b/shared/resource/warJsons/6056.json
@@ -130,7 +130,7 @@
         "x": 2,
         "y": 12,
         "var": 2001,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&10320|2&4730|4&2752|5&1720",
@@ -150,7 +150,7 @@
         "x": 4,
         "y": 12,
         "var": 2002,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&10320|2&4730|4&2752|5&1720",
@@ -170,7 +170,7 @@
         "x": 2,
         "y": 13,
         "var": 2003,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&9116|2&5160|4&2494|5&2236",
@@ -190,7 +190,7 @@
         "x": 4,
         "y": 13,
         "var": 2004,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&9116|2&5160|4&2494|5&2236",
@@ -201,8 +201,8 @@
     },
     {
         "warId": 6056,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
@@ -210,7 +210,7 @@
         "x": 3,
         "y": 13,
         "var": 2005,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&8342|2&5762|4&1978|5&1892",
@@ -221,36 +221,16 @@
     },
     {
         "warId": 6056,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
-        "x": 6,
-        "y": 11,
-        "var": 2006,
-        "lv": 52,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&8084|2&5934|4&1892|5&2580",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6056,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
         "x": 3,
         "y": 12,
-        "var": 2007,
-        "lv": 52,
+        "var": 2006,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&12040|2&7095|4&2687|5&2472",
@@ -261,19 +241,19 @@
     },
     {
         "warId": 6056,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2008,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 5,
-        "y": 11,
-        "var": 2008,
-        "lv": 52,
-        "hide": 1,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 17,
+        "y": 12,
+        "var": 2007,
+        "lv": 50,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10427|2&7202|4&2472|5&2365",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6056,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 19,
+        "y": 12,
+        "var": 2008,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6056,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 17,
-        "y": 12,
+        "y": 13,
         "var": 2009,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6056,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
         "x": 19,
-        "y": 12,
+        "y": 13,
         "var": 2010,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6056,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 13,
         "var": 2011,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,19 +341,19 @@
     },
     {
         "warId": 6056,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 19,
-        "y": 13,
+        "x": 18,
+        "y": 12,
         "var": 2012,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -361,19 +361,19 @@
     },
     {
         "warId": 6056,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2013,
         "relation": 2,
         "outIndex": 12,
         "dirction": 1,
-        "x": 18,
-        "y": 13,
+        "x": 15,
+        "y": 3,
         "var": 2013,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8342|2&5762|4&1978|5&1892",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -381,19 +381,19 @@
     },
     {
         "warId": 6056,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
-        "x": 19,
-        "y": 10,
+        "x": 16,
+        "y": 3,
         "var": 2014,
-        "lv": 52,
-        "hide": 1,
+        "lv": 50,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8084|2&5934|4&1892|5&2580",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,39 @@
     },
     {
         "warId": 6056,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 18,
-        "y": 12,
+        "x": 14,
+        "y": 2,
         "var": 2015,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12040|2&7095|4&2687|5&2472",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6056,
+        "actorName": "枪兵",
+        "actorId": 1002,
+        "dataId": 2016,
+        "relation": 2,
+        "outIndex": 15,
+        "dirction": 1,
+        "x": 17,
+        "y": 2,
+        "var": 2016,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,114 +443,14 @@
         "warId": 6056,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 16,
-        "y": 10,
-        "var": 2016,
-        "lv": 52,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10427|2&7202|4&2472|5&2365",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6056,
-        "actorName": "步兵",
-        "actorId": 1001,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
-        "x": 15,
-        "y": 3,
+        "x": 16,
+        "y": 2,
         "var": 2017,
-        "lv": 52,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&10320|2&4730|4&2752|5&1720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6056,
-        "actorName": "步兵",
-        "actorId": 1001,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 16,
-        "y": 3,
-        "var": 2018,
-        "lv": 52,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&10320|2&4730|4&2752|5&1720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6056,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 14,
-        "y": 2,
-        "var": 2019,
-        "lv": 52,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&9116|2&5160|4&2494|5&2236",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6056,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 17,
-        "y": 2,
-        "var": 2020,
-        "lv": 52,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&9116|2&5160|4&2494|5&2236",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6056,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 16,
-        "y": 2,
-        "var": 2021,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&8342|2&5762|4&1978|5&1892",
@@ -539,38 +459,18 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6056,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 18,
-        "y": 4,
-        "var": 2022,
-        "lv": 52,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&8084|2&5934|4&1892|5&2580",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6056,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2023,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 17,
         "dirction": 1,
         "x": 15,
         "y": 2,
-        "var": 2023,
-        "lv": 52,
+        "var": 2018,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&12040|2&7095|4&2687|5&2472",
@@ -578,25 +478,5 @@
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6056,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 17,
-        "y": 4,
-        "var": 2024,
-        "lv": 52,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10427|2&7202|4&2472|5&2365",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6057.json b/shared/resource/warJsons/6057.json
index 8d9e74eeb..cc7a36a3a 100644
--- a/shared/resource/warJsons/6057.json
+++ b/shared/resource/warJsons/6057.json
@@ -130,7 +130,7 @@
         "x": 2,
         "y": 12,
         "var": 2001,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&10320|2&4730|4&2752|5&1720",
@@ -150,7 +150,7 @@
         "x": 4,
         "y": 12,
         "var": 2002,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&10320|2&4730|4&2752|5&1720",
@@ -170,7 +170,7 @@
         "x": 2,
         "y": 13,
         "var": 2003,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&9116|2&5160|4&2494|5&2236",
@@ -190,7 +190,7 @@
         "x": 4,
         "y": 13,
         "var": 2004,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&9116|2&5160|4&2494|5&2236",
@@ -201,8 +201,8 @@
     },
     {
         "warId": 6057,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
@@ -210,7 +210,7 @@
         "x": 3,
         "y": 13,
         "var": 2005,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&8342|2&5762|4&1978|5&1892",
@@ -221,36 +221,16 @@
     },
     {
         "warId": 6057,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
-        "x": 6,
-        "y": 11,
-        "var": 2006,
-        "lv": 52,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&8084|2&5934|4&1892|5&2580",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6057,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
         "x": 3,
         "y": 12,
-        "var": 2007,
-        "lv": 52,
+        "var": 2006,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&12040|2&7095|4&2687|5&2472",
@@ -261,19 +241,19 @@
     },
     {
         "warId": 6057,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2008,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 5,
-        "y": 11,
-        "var": 2008,
-        "lv": 52,
-        "hide": 1,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 17,
+        "y": 12,
+        "var": 2007,
+        "lv": 50,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10427|2&7202|4&2472|5&2365",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6057,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 19,
+        "y": 12,
+        "var": 2008,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6057,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 17,
-        "y": 12,
+        "y": 13,
         "var": 2009,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6057,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
         "x": 19,
-        "y": 12,
+        "y": 13,
         "var": 2010,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6057,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 13,
         "var": 2011,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,19 +341,19 @@
     },
     {
         "warId": 6057,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 19,
-        "y": 13,
+        "x": 18,
+        "y": 12,
         "var": 2012,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -361,19 +361,19 @@
     },
     {
         "warId": 6057,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2013,
         "relation": 2,
         "outIndex": 12,
         "dirction": 1,
-        "x": 18,
-        "y": 13,
+        "x": 15,
+        "y": 3,
         "var": 2013,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8342|2&5762|4&1978|5&1892",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -381,19 +381,19 @@
     },
     {
         "warId": 6057,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
-        "x": 19,
-        "y": 10,
+        "x": 16,
+        "y": 3,
         "var": 2014,
-        "lv": 52,
-        "hide": 1,
+        "lv": 50,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8084|2&5934|4&1892|5&2580",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,39 @@
     },
     {
         "warId": 6057,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 18,
-        "y": 12,
+        "x": 14,
+        "y": 2,
         "var": 2015,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12040|2&7095|4&2687|5&2472",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6057,
+        "actorName": "枪兵",
+        "actorId": 1002,
+        "dataId": 2016,
+        "relation": 2,
+        "outIndex": 15,
+        "dirction": 1,
+        "x": 17,
+        "y": 2,
+        "var": 2016,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,114 +443,14 @@
         "warId": 6057,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 16,
-        "y": 10,
-        "var": 2016,
-        "lv": 52,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10427|2&7202|4&2472|5&2365",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6057,
-        "actorName": "步兵",
-        "actorId": 1001,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
-        "x": 15,
-        "y": 3,
+        "x": 16,
+        "y": 2,
         "var": 2017,
-        "lv": 52,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&10320|2&4730|4&2752|5&1720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6057,
-        "actorName": "步兵",
-        "actorId": 1001,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 16,
-        "y": 3,
-        "var": 2018,
-        "lv": 52,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&10320|2&4730|4&2752|5&1720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6057,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 14,
-        "y": 2,
-        "var": 2019,
-        "lv": 52,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&9116|2&5160|4&2494|5&2236",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6057,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 17,
-        "y": 2,
-        "var": 2020,
-        "lv": 52,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&9116|2&5160|4&2494|5&2236",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6057,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 16,
-        "y": 2,
-        "var": 2021,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&8342|2&5762|4&1978|5&1892",
@@ -539,38 +459,18 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6057,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 18,
-        "y": 4,
-        "var": 2022,
-        "lv": 52,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&8084|2&5934|4&1892|5&2580",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6057,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2023,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 17,
         "dirction": 1,
         "x": 15,
         "y": 2,
-        "var": 2023,
-        "lv": 52,
+        "var": 2018,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&12040|2&7095|4&2687|5&2472",
@@ -578,25 +478,5 @@
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6057,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 17,
-        "y": 4,
-        "var": 2024,
-        "lv": 52,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10427|2&7202|4&2472|5&2365",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6058.json b/shared/resource/warJsons/6058.json
index 716954908..aa6bec618 100644
--- a/shared/resource/warJsons/6058.json
+++ b/shared/resource/warJsons/6058.json
@@ -130,7 +130,7 @@
         "x": 2,
         "y": 12,
         "var": 2001,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&10320|2&4730|4&2752|5&1720",
@@ -150,7 +150,7 @@
         "x": 4,
         "y": 12,
         "var": 2002,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&10320|2&4730|4&2752|5&1720",
@@ -170,7 +170,7 @@
         "x": 2,
         "y": 13,
         "var": 2003,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&9116|2&5160|4&2494|5&2236",
@@ -190,7 +190,7 @@
         "x": 4,
         "y": 13,
         "var": 2004,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&9116|2&5160|4&2494|5&2236",
@@ -201,8 +201,8 @@
     },
     {
         "warId": 6058,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
@@ -210,7 +210,7 @@
         "x": 3,
         "y": 13,
         "var": 2005,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&8342|2&5762|4&1978|5&1892",
@@ -221,36 +221,16 @@
     },
     {
         "warId": 6058,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
-        "x": 6,
-        "y": 11,
-        "var": 2006,
-        "lv": 52,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&8084|2&5934|4&1892|5&2580",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6058,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
         "x": 3,
         "y": 12,
-        "var": 2007,
-        "lv": 52,
+        "var": 2006,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&12040|2&7095|4&2687|5&2472",
@@ -261,19 +241,19 @@
     },
     {
         "warId": 6058,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2008,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 5,
-        "y": 11,
-        "var": 2008,
-        "lv": 52,
-        "hide": 1,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 17,
+        "y": 12,
+        "var": 2007,
+        "lv": 50,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10427|2&7202|4&2472|5&2365",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6058,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 19,
+        "y": 12,
+        "var": 2008,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6058,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 17,
-        "y": 12,
+        "y": 13,
         "var": 2009,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6058,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
         "x": 19,
-        "y": 12,
+        "y": 13,
         "var": 2010,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6058,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 13,
         "var": 2011,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,19 +341,19 @@
     },
     {
         "warId": 6058,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 19,
-        "y": 13,
+        "x": 18,
+        "y": 12,
         "var": 2012,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -361,19 +361,19 @@
     },
     {
         "warId": 6058,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2013,
         "relation": 2,
         "outIndex": 12,
         "dirction": 1,
-        "x": 18,
-        "y": 13,
+        "x": 15,
+        "y": 3,
         "var": 2013,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8342|2&5762|4&1978|5&1892",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -381,19 +381,19 @@
     },
     {
         "warId": 6058,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
-        "x": 19,
-        "y": 10,
+        "x": 16,
+        "y": 3,
         "var": 2014,
-        "lv": 52,
-        "hide": 1,
+        "lv": 50,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8084|2&5934|4&1892|5&2580",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,39 @@
     },
     {
         "warId": 6058,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 18,
-        "y": 12,
+        "x": 14,
+        "y": 2,
         "var": 2015,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12040|2&7095|4&2687|5&2472",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6058,
+        "actorName": "枪兵",
+        "actorId": 1002,
+        "dataId": 2016,
+        "relation": 2,
+        "outIndex": 15,
+        "dirction": 1,
+        "x": 17,
+        "y": 2,
+        "var": 2016,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,114 +443,14 @@
         "warId": 6058,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 16,
-        "y": 10,
-        "var": 2016,
-        "lv": 52,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10427|2&7202|4&2472|5&2365",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6058,
-        "actorName": "步兵",
-        "actorId": 1001,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
-        "x": 15,
-        "y": 3,
+        "x": 16,
+        "y": 2,
         "var": 2017,
-        "lv": 52,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&10320|2&4730|4&2752|5&1720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6058,
-        "actorName": "步兵",
-        "actorId": 1001,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 16,
-        "y": 3,
-        "var": 2018,
-        "lv": 52,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&10320|2&4730|4&2752|5&1720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6058,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 14,
-        "y": 2,
-        "var": 2019,
-        "lv": 52,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&9116|2&5160|4&2494|5&2236",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6058,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 17,
-        "y": 2,
-        "var": 2020,
-        "lv": 52,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&9116|2&5160|4&2494|5&2236",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6058,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 16,
-        "y": 2,
-        "var": 2021,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&8342|2&5762|4&1978|5&1892",
@@ -539,38 +459,18 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6058,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 18,
-        "y": 4,
-        "var": 2022,
-        "lv": 52,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&8084|2&5934|4&1892|5&2580",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6058,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2023,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 17,
         "dirction": 1,
         "x": 15,
         "y": 2,
-        "var": 2023,
-        "lv": 52,
+        "var": 2018,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&12040|2&7095|4&2687|5&2472",
@@ -578,25 +478,5 @@
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6058,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 17,
-        "y": 4,
-        "var": 2024,
-        "lv": 52,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10427|2&7202|4&2472|5&2365",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6059.json b/shared/resource/warJsons/6059.json
index ee4cab5f6..0fc1d1f87 100644
--- a/shared/resource/warJsons/6059.json
+++ b/shared/resource/warJsons/6059.json
@@ -130,7 +130,7 @@
         "x": 2,
         "y": 12,
         "var": 2001,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&10320|2&4730|4&2752|5&1720",
@@ -150,7 +150,7 @@
         "x": 4,
         "y": 12,
         "var": 2002,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&10320|2&4730|4&2752|5&1720",
@@ -170,7 +170,7 @@
         "x": 2,
         "y": 13,
         "var": 2003,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&9116|2&5160|4&2494|5&2236",
@@ -190,7 +190,7 @@
         "x": 4,
         "y": 13,
         "var": 2004,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&9116|2&5160|4&2494|5&2236",
@@ -201,8 +201,8 @@
     },
     {
         "warId": 6059,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
@@ -210,7 +210,7 @@
         "x": 3,
         "y": 13,
         "var": 2005,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&8342|2&5762|4&1978|5&1892",
@@ -221,36 +221,16 @@
     },
     {
         "warId": 6059,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
-        "x": 6,
-        "y": 11,
-        "var": 2006,
-        "lv": 52,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&8084|2&5934|4&1892|5&2580",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6059,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
         "x": 3,
         "y": 12,
-        "var": 2007,
-        "lv": 52,
+        "var": 2006,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&12040|2&7095|4&2687|5&2472",
@@ -261,19 +241,19 @@
     },
     {
         "warId": 6059,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2008,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 5,
-        "y": 11,
-        "var": 2008,
-        "lv": 52,
-        "hide": 1,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 17,
+        "y": 12,
+        "var": 2007,
+        "lv": 50,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10427|2&7202|4&2472|5&2365",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6059,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 19,
+        "y": 12,
+        "var": 2008,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6059,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 17,
-        "y": 12,
+        "y": 13,
         "var": 2009,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6059,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
         "x": 19,
-        "y": 12,
+        "y": 13,
         "var": 2010,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6059,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 13,
         "var": 2011,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,19 +341,19 @@
     },
     {
         "warId": 6059,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 19,
-        "y": 13,
+        "x": 18,
+        "y": 12,
         "var": 2012,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -361,19 +361,19 @@
     },
     {
         "warId": 6059,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2013,
         "relation": 2,
         "outIndex": 12,
         "dirction": 1,
-        "x": 18,
-        "y": 13,
+        "x": 15,
+        "y": 3,
         "var": 2013,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8342|2&5762|4&1978|5&1892",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -381,19 +381,19 @@
     },
     {
         "warId": 6059,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
-        "x": 19,
-        "y": 10,
+        "x": 16,
+        "y": 3,
         "var": 2014,
-        "lv": 52,
-        "hide": 1,
+        "lv": 50,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8084|2&5934|4&1892|5&2580",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,39 @@
     },
     {
         "warId": 6059,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 18,
-        "y": 12,
+        "x": 14,
+        "y": 2,
         "var": 2015,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12040|2&7095|4&2687|5&2472",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6059,
+        "actorName": "枪兵",
+        "actorId": 1002,
+        "dataId": 2016,
+        "relation": 2,
+        "outIndex": 15,
+        "dirction": 1,
+        "x": 17,
+        "y": 2,
+        "var": 2016,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,114 +443,14 @@
         "warId": 6059,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 16,
-        "y": 10,
-        "var": 2016,
-        "lv": 52,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10427|2&7202|4&2472|5&2365",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6059,
-        "actorName": "步兵",
-        "actorId": 1001,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
-        "x": 15,
-        "y": 3,
+        "x": 16,
+        "y": 2,
         "var": 2017,
-        "lv": 52,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&10320|2&4730|4&2752|5&1720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6059,
-        "actorName": "步兵",
-        "actorId": 1001,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 16,
-        "y": 3,
-        "var": 2018,
-        "lv": 52,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&10320|2&4730|4&2752|5&1720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6059,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 14,
-        "y": 2,
-        "var": 2019,
-        "lv": 52,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&9116|2&5160|4&2494|5&2236",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6059,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 17,
-        "y": 2,
-        "var": 2020,
-        "lv": 52,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&9116|2&5160|4&2494|5&2236",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6059,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 16,
-        "y": 2,
-        "var": 2021,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&8342|2&5762|4&1978|5&1892",
@@ -539,38 +459,18 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6059,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 18,
-        "y": 4,
-        "var": 2022,
-        "lv": 52,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&8084|2&5934|4&1892|5&2580",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6059,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2023,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 17,
         "dirction": 1,
         "x": 15,
         "y": 2,
-        "var": 2023,
-        "lv": 52,
+        "var": 2018,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&12040|2&7095|4&2687|5&2472",
@@ -578,25 +478,5 @@
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6059,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 17,
-        "y": 4,
-        "var": 2024,
-        "lv": 52,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10427|2&7202|4&2472|5&2365",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6060.json b/shared/resource/warJsons/6060.json
index 58a8e6941..6a7a15965 100644
--- a/shared/resource/warJsons/6060.json
+++ b/shared/resource/warJsons/6060.json
@@ -130,7 +130,7 @@
         "x": 2,
         "y": 12,
         "var": 2001,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&10320|2&4730|4&2752|5&1720",
@@ -150,7 +150,7 @@
         "x": 4,
         "y": 12,
         "var": 2002,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&10320|2&4730|4&2752|5&1720",
@@ -170,7 +170,7 @@
         "x": 2,
         "y": 13,
         "var": 2003,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&9116|2&5160|4&2494|5&2236",
@@ -190,7 +190,7 @@
         "x": 4,
         "y": 13,
         "var": 2004,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&9116|2&5160|4&2494|5&2236",
@@ -201,8 +201,8 @@
     },
     {
         "warId": 6060,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
@@ -210,7 +210,7 @@
         "x": 3,
         "y": 13,
         "var": 2005,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&8342|2&5762|4&1978|5&1892",
@@ -221,36 +221,16 @@
     },
     {
         "warId": 6060,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
-        "x": 6,
-        "y": 11,
-        "var": 2006,
-        "lv": 52,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&8084|2&5934|4&1892|5&2580",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6060,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
         "x": 3,
         "y": 12,
-        "var": 2007,
-        "lv": 52,
+        "var": 2006,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&12040|2&7095|4&2687|5&2472",
@@ -261,19 +241,19 @@
     },
     {
         "warId": 6060,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2008,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 5,
-        "y": 11,
-        "var": 2008,
-        "lv": 52,
-        "hide": 1,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 17,
+        "y": 12,
+        "var": 2007,
+        "lv": 50,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10427|2&7202|4&2472|5&2365",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +263,37 @@
         "warId": 6060,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 19,
+        "y": 12,
+        "var": 2008,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6060,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 17,
-        "y": 12,
+        "y": 13,
         "var": 2009,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6060,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
         "x": 19,
-        "y": 12,
+        "y": 13,
         "var": 2010,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6060,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 13,
         "var": 2011,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,19 +341,19 @@
     },
     {
         "warId": 6060,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 19,
-        "y": 13,
+        "x": 18,
+        "y": 12,
         "var": 2012,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -361,19 +361,19 @@
     },
     {
         "warId": 6060,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2013,
         "relation": 2,
         "outIndex": 12,
         "dirction": 1,
-        "x": 18,
-        "y": 13,
+        "x": 15,
+        "y": 3,
         "var": 2013,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8342|2&5762|4&1978|5&1892",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -381,19 +381,19 @@
     },
     {
         "warId": 6060,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
-        "x": 19,
-        "y": 10,
+        "x": 16,
+        "y": 3,
         "var": 2014,
-        "lv": 52,
-        "hide": 1,
+        "lv": 50,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&8084|2&5934|4&1892|5&2580",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,39 @@
     },
     {
         "warId": 6060,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 18,
-        "y": 12,
+        "x": 14,
+        "y": 2,
         "var": 2015,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12040|2&7095|4&2687|5&2472",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6060,
+        "actorName": "枪兵",
+        "actorId": 1002,
+        "dataId": 2016,
+        "relation": 2,
+        "outIndex": 15,
+        "dirction": 1,
+        "x": 17,
+        "y": 2,
+        "var": 2016,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,114 +443,14 @@
         "warId": 6060,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 16,
-        "y": 10,
-        "var": 2016,
-        "lv": 52,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10427|2&7202|4&2472|5&2365",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6060,
-        "actorName": "步兵",
-        "actorId": 1001,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
-        "x": 15,
-        "y": 3,
+        "x": 16,
+        "y": 2,
         "var": 2017,
-        "lv": 52,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&10320|2&4730|4&2752|5&1720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6060,
-        "actorName": "步兵",
-        "actorId": 1001,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 16,
-        "y": 3,
-        "var": 2018,
-        "lv": 52,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&10320|2&4730|4&2752|5&1720",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6060,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 14,
-        "y": 2,
-        "var": 2019,
-        "lv": 52,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&9116|2&5160|4&2494|5&2236",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6060,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 17,
-        "y": 2,
-        "var": 2020,
-        "lv": 52,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&9116|2&5160|4&2494|5&2236",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6060,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 16,
-        "y": 2,
-        "var": 2021,
-        "lv": 52,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&8342|2&5762|4&1978|5&1892",
@@ -539,38 +459,18 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6060,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 18,
-        "y": 4,
-        "var": 2022,
-        "lv": 52,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&8084|2&5934|4&1892|5&2580",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6060,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2023,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 17,
         "dirction": 1,
         "x": 15,
         "y": 2,
-        "var": 2023,
-        "lv": 52,
+        "var": 2018,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
         "attribute": "1&12040|2&7095|4&2687|5&2472",
@@ -578,25 +478,5 @@
         "seid": 0,
         "star": 2,
         "spine": 0
-    },
-    {
-        "warId": 6060,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 17,
-        "y": 4,
-        "var": 2024,
-        "lv": 52,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&10427|2&7202|4&2472|5&2365",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6061.json b/shared/resource/warJsons/6061.json
index d2724d186..17f76e816 100644
--- a/shared/resource/warJsons/6061.json
+++ b/shared/resource/warJsons/6061.json
@@ -130,10 +130,10 @@
         "x": 2,
         "y": 12,
         "var": 2001,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 4,
         "y": 12,
         "var": 2002,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 2,
         "y": 13,
         "var": 2003,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 13,
         "var": 2004,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,8 +201,8 @@
     },
     {
         "warId": 6061,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
@@ -210,30 +210,10 @@
         "x": 3,
         "y": 13,
         "var": 2005,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&11640|2&8040|4&2760|5&2640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6061,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 11,
-        "var": 2006,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&11280|2&8280|4&2640|5&3600",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,37 +223,17 @@
         "warId": 6061,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2007,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 5,
         "dirction": 2,
         "x": 3,
         "y": 12,
-        "var": 2007,
-        "lv": 54,
+        "var": 2006,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&16800|2&9900|4&3750|5&3450",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6061,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 5,
-        "y": 11,
-        "var": 2008,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,57 @@
         "warId": 6061,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 17,
+        "y": 12,
+        "var": 2007,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6061,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 19,
+        "y": 12,
+        "var": 2008,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6061,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 17,
-        "y": 12,
+        "y": 13,
         "var": 2009,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6061,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
         "x": 19,
-        "y": 12,
+        "y": 13,
         "var": 2010,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6061,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 13,
         "var": 2011,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,19 +341,19 @@
     },
     {
         "warId": 6061,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 19,
-        "y": 13,
+        "x": 18,
+        "y": 12,
         "var": 2012,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -361,19 +361,19 @@
     },
     {
         "warId": 6061,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2013,
         "relation": 2,
         "outIndex": 12,
         "dirction": 1,
-        "x": 18,
-        "y": 13,
+        "x": 15,
+        "y": 3,
         "var": 2013,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&11640|2&8040|4&2760|5&2640",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -381,19 +381,19 @@
     },
     {
         "warId": 6061,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
-        "x": 19,
-        "y": 10,
+        "x": 16,
+        "y": 3,
         "var": 2014,
-        "lv": 54,
-        "hide": 1,
+        "lv": 50,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&11280|2&8280|4&2640|5&3600",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,39 @@
     },
     {
         "warId": 6061,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 18,
-        "y": 12,
+        "x": 14,
+        "y": 2,
         "var": 2015,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&16800|2&9900|4&3750|5&3450",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6061,
+        "actorName": "枪兵",
+        "actorId": 1002,
+        "dataId": 2016,
+        "relation": 2,
+        "outIndex": 15,
+        "dirction": 1,
+        "x": 17,
+        "y": 2,
+        "var": 2016,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,137 +443,17 @@
         "warId": 6061,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 16,
-        "y": 10,
-        "var": 2016,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6061,
-        "actorName": "步兵",
-        "actorId": 1001,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
-        "x": 15,
-        "y": 3,
+        "x": 16,
+        "y": 2,
         "var": 2017,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6061,
-        "actorName": "步兵",
-        "actorId": 1001,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 16,
-        "y": 3,
-        "var": 2018,
-        "lv": 54,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6061,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 14,
-        "y": 2,
-        "var": 2019,
-        "lv": 54,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6061,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 17,
-        "y": 2,
-        "var": 2020,
-        "lv": 54,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6061,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 16,
-        "y": 2,
-        "var": 2021,
-        "lv": 54,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&11640|2&8040|4&2760|5&2640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6061,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 18,
-        "y": 4,
-        "var": 2022,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&11280|2&8280|4&2640|5&3600",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,37 +463,17 @@
         "warId": 6061,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2023,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 17,
         "dirction": 1,
         "x": 15,
         "y": 2,
-        "var": 2023,
-        "lv": 54,
+        "var": 2018,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&16800|2&9900|4&3750|5&3450",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6061,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 17,
-        "y": 4,
-        "var": 2024,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6062.json b/shared/resource/warJsons/6062.json
index 84eb27861..d3d025323 100644
--- a/shared/resource/warJsons/6062.json
+++ b/shared/resource/warJsons/6062.json
@@ -130,10 +130,10 @@
         "x": 2,
         "y": 12,
         "var": 2001,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 4,
         "y": 12,
         "var": 2002,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 2,
         "y": 13,
         "var": 2003,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 13,
         "var": 2004,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,8 +201,8 @@
     },
     {
         "warId": 6062,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
@@ -210,30 +210,10 @@
         "x": 3,
         "y": 13,
         "var": 2005,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&11640|2&8040|4&2760|5&2640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6062,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 11,
-        "var": 2006,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&11280|2&8280|4&2640|5&3600",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,37 +223,17 @@
         "warId": 6062,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2007,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 5,
         "dirction": 2,
         "x": 3,
         "y": 12,
-        "var": 2007,
-        "lv": 54,
+        "var": 2006,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&16800|2&9900|4&3750|5&3450",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6062,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 5,
-        "y": 11,
-        "var": 2008,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,57 @@
         "warId": 6062,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 17,
+        "y": 12,
+        "var": 2007,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6062,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 19,
+        "y": 12,
+        "var": 2008,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6062,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 17,
-        "y": 12,
+        "y": 13,
         "var": 2009,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6062,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
         "x": 19,
-        "y": 12,
+        "y": 13,
         "var": 2010,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6062,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 13,
         "var": 2011,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,19 +341,19 @@
     },
     {
         "warId": 6062,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 19,
-        "y": 13,
+        "x": 18,
+        "y": 12,
         "var": 2012,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -361,19 +361,19 @@
     },
     {
         "warId": 6062,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2013,
         "relation": 2,
         "outIndex": 12,
         "dirction": 1,
-        "x": 18,
-        "y": 13,
+        "x": 15,
+        "y": 3,
         "var": 2013,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&11640|2&8040|4&2760|5&2640",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -381,19 +381,19 @@
     },
     {
         "warId": 6062,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
-        "x": 19,
-        "y": 10,
+        "x": 16,
+        "y": 3,
         "var": 2014,
-        "lv": 54,
-        "hide": 1,
+        "lv": 50,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&11280|2&8280|4&2640|5&3600",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,39 @@
     },
     {
         "warId": 6062,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 18,
-        "y": 12,
+        "x": 14,
+        "y": 2,
         "var": 2015,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&16800|2&9900|4&3750|5&3450",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6062,
+        "actorName": "枪兵",
+        "actorId": 1002,
+        "dataId": 2016,
+        "relation": 2,
+        "outIndex": 15,
+        "dirction": 1,
+        "x": 17,
+        "y": 2,
+        "var": 2016,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,137 +443,17 @@
         "warId": 6062,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 16,
-        "y": 10,
-        "var": 2016,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6062,
-        "actorName": "步兵",
-        "actorId": 1001,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
-        "x": 15,
-        "y": 3,
+        "x": 16,
+        "y": 2,
         "var": 2017,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6062,
-        "actorName": "步兵",
-        "actorId": 1001,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 16,
-        "y": 3,
-        "var": 2018,
-        "lv": 54,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6062,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 14,
-        "y": 2,
-        "var": 2019,
-        "lv": 54,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6062,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 17,
-        "y": 2,
-        "var": 2020,
-        "lv": 54,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6062,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 16,
-        "y": 2,
-        "var": 2021,
-        "lv": 54,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&11640|2&8040|4&2760|5&2640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6062,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 18,
-        "y": 4,
-        "var": 2022,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&11280|2&8280|4&2640|5&3600",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,37 +463,17 @@
         "warId": 6062,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2023,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 17,
         "dirction": 1,
         "x": 15,
         "y": 2,
-        "var": 2023,
-        "lv": 54,
+        "var": 2018,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&16800|2&9900|4&3750|5&3450",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6062,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 17,
-        "y": 4,
-        "var": 2024,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6063.json b/shared/resource/warJsons/6063.json
index 8acc09443..d9811d6a6 100644
--- a/shared/resource/warJsons/6063.json
+++ b/shared/resource/warJsons/6063.json
@@ -130,10 +130,10 @@
         "x": 2,
         "y": 12,
         "var": 2001,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 4,
         "y": 12,
         "var": 2002,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 2,
         "y": 13,
         "var": 2003,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 13,
         "var": 2004,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,8 +201,8 @@
     },
     {
         "warId": 6063,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
@@ -210,30 +210,10 @@
         "x": 3,
         "y": 13,
         "var": 2005,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&11640|2&8040|4&2760|5&2640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6063,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 11,
-        "var": 2006,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&11280|2&8280|4&2640|5&3600",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,37 +223,17 @@
         "warId": 6063,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2007,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 5,
         "dirction": 2,
         "x": 3,
         "y": 12,
-        "var": 2007,
-        "lv": 54,
+        "var": 2006,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&16800|2&9900|4&3750|5&3450",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6063,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 5,
-        "y": 11,
-        "var": 2008,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,57 @@
         "warId": 6063,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 17,
+        "y": 12,
+        "var": 2007,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6063,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 19,
+        "y": 12,
+        "var": 2008,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6063,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 17,
-        "y": 12,
+        "y": 13,
         "var": 2009,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6063,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
         "x": 19,
-        "y": 12,
+        "y": 13,
         "var": 2010,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6063,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 13,
         "var": 2011,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,19 +341,19 @@
     },
     {
         "warId": 6063,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 19,
-        "y": 13,
+        "x": 18,
+        "y": 12,
         "var": 2012,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -361,19 +361,19 @@
     },
     {
         "warId": 6063,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2013,
         "relation": 2,
         "outIndex": 12,
         "dirction": 1,
-        "x": 18,
-        "y": 13,
+        "x": 15,
+        "y": 3,
         "var": 2013,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&11640|2&8040|4&2760|5&2640",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -381,19 +381,19 @@
     },
     {
         "warId": 6063,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
-        "x": 19,
-        "y": 10,
+        "x": 16,
+        "y": 3,
         "var": 2014,
-        "lv": 54,
-        "hide": 1,
+        "lv": 50,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&11280|2&8280|4&2640|5&3600",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,39 @@
     },
     {
         "warId": 6063,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 18,
-        "y": 12,
+        "x": 14,
+        "y": 2,
         "var": 2015,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&16800|2&9900|4&3750|5&3450",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6063,
+        "actorName": "枪兵",
+        "actorId": 1002,
+        "dataId": 2016,
+        "relation": 2,
+        "outIndex": 15,
+        "dirction": 1,
+        "x": 17,
+        "y": 2,
+        "var": 2016,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,137 +443,17 @@
         "warId": 6063,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 16,
-        "y": 10,
-        "var": 2016,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6063,
-        "actorName": "步兵",
-        "actorId": 1001,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
-        "x": 15,
-        "y": 3,
+        "x": 16,
+        "y": 2,
         "var": 2017,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6063,
-        "actorName": "步兵",
-        "actorId": 1001,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 16,
-        "y": 3,
-        "var": 2018,
-        "lv": 54,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6063,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 14,
-        "y": 2,
-        "var": 2019,
-        "lv": 54,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6063,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 17,
-        "y": 2,
-        "var": 2020,
-        "lv": 54,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6063,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 16,
-        "y": 2,
-        "var": 2021,
-        "lv": 54,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&11640|2&8040|4&2760|5&2640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6063,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 18,
-        "y": 4,
-        "var": 2022,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&11280|2&8280|4&2640|5&3600",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,37 +463,17 @@
         "warId": 6063,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2023,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 17,
         "dirction": 1,
         "x": 15,
         "y": 2,
-        "var": 2023,
-        "lv": 54,
+        "var": 2018,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&16800|2&9900|4&3750|5&3450",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6063,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 17,
-        "y": 4,
-        "var": 2024,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6064.json b/shared/resource/warJsons/6064.json
index dd213f3d5..5fec3c80d 100644
--- a/shared/resource/warJsons/6064.json
+++ b/shared/resource/warJsons/6064.json
@@ -130,10 +130,10 @@
         "x": 2,
         "y": 12,
         "var": 2001,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 4,
         "y": 12,
         "var": 2002,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 2,
         "y": 13,
         "var": 2003,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 13,
         "var": 2004,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,8 +201,8 @@
     },
     {
         "warId": 6064,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
@@ -210,30 +210,10 @@
         "x": 3,
         "y": 13,
         "var": 2005,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&11640|2&8040|4&2760|5&2640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6064,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 11,
-        "var": 2006,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&11280|2&8280|4&2640|5&3600",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,37 +223,17 @@
         "warId": 6064,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2007,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 5,
         "dirction": 2,
         "x": 3,
         "y": 12,
-        "var": 2007,
-        "lv": 54,
+        "var": 2006,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&16800|2&9900|4&3750|5&3450",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6064,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 5,
-        "y": 11,
-        "var": 2008,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,57 @@
         "warId": 6064,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 17,
+        "y": 12,
+        "var": 2007,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6064,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 19,
+        "y": 12,
+        "var": 2008,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6064,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 17,
-        "y": 12,
+        "y": 13,
         "var": 2009,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6064,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
         "x": 19,
-        "y": 12,
+        "y": 13,
         "var": 2010,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6064,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 13,
         "var": 2011,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,19 +341,19 @@
     },
     {
         "warId": 6064,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 19,
-        "y": 13,
+        "x": 18,
+        "y": 12,
         "var": 2012,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -361,19 +361,19 @@
     },
     {
         "warId": 6064,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2013,
         "relation": 2,
         "outIndex": 12,
         "dirction": 1,
-        "x": 18,
-        "y": 13,
+        "x": 15,
+        "y": 3,
         "var": 2013,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&11640|2&8040|4&2760|5&2640",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -381,19 +381,19 @@
     },
     {
         "warId": 6064,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
-        "x": 19,
-        "y": 10,
+        "x": 16,
+        "y": 3,
         "var": 2014,
-        "lv": 54,
-        "hide": 1,
+        "lv": 50,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&11280|2&8280|4&2640|5&3600",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,39 @@
     },
     {
         "warId": 6064,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 18,
-        "y": 12,
+        "x": 14,
+        "y": 2,
         "var": 2015,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&16800|2&9900|4&3750|5&3450",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6064,
+        "actorName": "枪兵",
+        "actorId": 1002,
+        "dataId": 2016,
+        "relation": 2,
+        "outIndex": 15,
+        "dirction": 1,
+        "x": 17,
+        "y": 2,
+        "var": 2016,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,137 +443,17 @@
         "warId": 6064,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 16,
-        "y": 10,
-        "var": 2016,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6064,
-        "actorName": "步兵",
-        "actorId": 1001,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
-        "x": 15,
-        "y": 3,
+        "x": 16,
+        "y": 2,
         "var": 2017,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6064,
-        "actorName": "步兵",
-        "actorId": 1001,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 16,
-        "y": 3,
-        "var": 2018,
-        "lv": 54,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6064,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 14,
-        "y": 2,
-        "var": 2019,
-        "lv": 54,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6064,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 17,
-        "y": 2,
-        "var": 2020,
-        "lv": 54,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6064,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 16,
-        "y": 2,
-        "var": 2021,
-        "lv": 54,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&11640|2&8040|4&2760|5&2640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6064,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 18,
-        "y": 4,
-        "var": 2022,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&11280|2&8280|4&2640|5&3600",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,37 +463,17 @@
         "warId": 6064,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2023,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 17,
         "dirction": 1,
         "x": 15,
         "y": 2,
-        "var": 2023,
-        "lv": 54,
+        "var": 2018,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&16800|2&9900|4&3750|5&3450",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6064,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 17,
-        "y": 4,
-        "var": 2024,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6065.json b/shared/resource/warJsons/6065.json
index 99fb6ff62..83676a307 100644
--- a/shared/resource/warJsons/6065.json
+++ b/shared/resource/warJsons/6065.json
@@ -130,10 +130,10 @@
         "x": 2,
         "y": 12,
         "var": 2001,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 4,
         "y": 12,
         "var": 2002,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 2,
         "y": 13,
         "var": 2003,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 13,
         "var": 2004,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,8 +201,8 @@
     },
     {
         "warId": 6065,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
@@ -210,30 +210,10 @@
         "x": 3,
         "y": 13,
         "var": 2005,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&11640|2&8040|4&2760|5&2640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6065,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 11,
-        "var": 2006,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&11280|2&8280|4&2640|5&3600",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,37 +223,17 @@
         "warId": 6065,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2007,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 5,
         "dirction": 2,
         "x": 3,
         "y": 12,
-        "var": 2007,
-        "lv": 54,
+        "var": 2006,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&16800|2&9900|4&3750|5&3450",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6065,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 5,
-        "y": 11,
-        "var": 2008,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,57 @@
         "warId": 6065,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 17,
+        "y": 12,
+        "var": 2007,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6065,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 19,
+        "y": 12,
+        "var": 2008,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6065,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 17,
-        "y": 12,
+        "y": 13,
         "var": 2009,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6065,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
         "x": 19,
-        "y": 12,
+        "y": 13,
         "var": 2010,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6065,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 13,
         "var": 2011,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,19 +341,19 @@
     },
     {
         "warId": 6065,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 19,
-        "y": 13,
+        "x": 18,
+        "y": 12,
         "var": 2012,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -361,19 +361,19 @@
     },
     {
         "warId": 6065,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2013,
         "relation": 2,
         "outIndex": 12,
         "dirction": 1,
-        "x": 18,
-        "y": 13,
+        "x": 15,
+        "y": 3,
         "var": 2013,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&11640|2&8040|4&2760|5&2640",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -381,19 +381,19 @@
     },
     {
         "warId": 6065,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
-        "x": 19,
-        "y": 10,
+        "x": 16,
+        "y": 3,
         "var": 2014,
-        "lv": 54,
-        "hide": 1,
+        "lv": 50,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&11280|2&8280|4&2640|5&3600",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,39 @@
     },
     {
         "warId": 6065,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 18,
-        "y": 12,
+        "x": 14,
+        "y": 2,
         "var": 2015,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&16800|2&9900|4&3750|5&3450",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6065,
+        "actorName": "枪兵",
+        "actorId": 1002,
+        "dataId": 2016,
+        "relation": 2,
+        "outIndex": 15,
+        "dirction": 1,
+        "x": 17,
+        "y": 2,
+        "var": 2016,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,137 +443,17 @@
         "warId": 6065,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 16,
-        "y": 10,
-        "var": 2016,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6065,
-        "actorName": "步兵",
-        "actorId": 1001,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
-        "x": 15,
-        "y": 3,
+        "x": 16,
+        "y": 2,
         "var": 2017,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6065,
-        "actorName": "步兵",
-        "actorId": 1001,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 16,
-        "y": 3,
-        "var": 2018,
-        "lv": 54,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6065,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 14,
-        "y": 2,
-        "var": 2019,
-        "lv": 54,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6065,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 17,
-        "y": 2,
-        "var": 2020,
-        "lv": 54,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6065,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 16,
-        "y": 2,
-        "var": 2021,
-        "lv": 54,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&11640|2&8040|4&2760|5&2640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6065,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 18,
-        "y": 4,
-        "var": 2022,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&11280|2&8280|4&2640|5&3600",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,37 +463,17 @@
         "warId": 6065,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2023,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 17,
         "dirction": 1,
         "x": 15,
         "y": 2,
-        "var": 2023,
-        "lv": 54,
+        "var": 2018,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&16800|2&9900|4&3750|5&3450",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6065,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 17,
-        "y": 4,
-        "var": 2024,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6066.json b/shared/resource/warJsons/6066.json
index 9b2e53649..36f2b9c94 100644
--- a/shared/resource/warJsons/6066.json
+++ b/shared/resource/warJsons/6066.json
@@ -130,10 +130,10 @@
         "x": 2,
         "y": 12,
         "var": 2001,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 4,
         "y": 12,
         "var": 2002,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 2,
         "y": 13,
         "var": 2003,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 13,
         "var": 2004,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,8 +201,8 @@
     },
     {
         "warId": 6066,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
@@ -210,30 +210,10 @@
         "x": 3,
         "y": 13,
         "var": 2005,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&11640|2&8040|4&2760|5&2640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6066,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 11,
-        "var": 2006,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&11280|2&8280|4&2640|5&3600",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,37 +223,17 @@
         "warId": 6066,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2007,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 5,
         "dirction": 2,
         "x": 3,
         "y": 12,
-        "var": 2007,
-        "lv": 54,
+        "var": 2006,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&16800|2&9900|4&3750|5&3450",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6066,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 5,
-        "y": 11,
-        "var": 2008,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,57 @@
         "warId": 6066,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 17,
+        "y": 12,
+        "var": 2007,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6066,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 19,
+        "y": 12,
+        "var": 2008,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6066,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 17,
-        "y": 12,
+        "y": 13,
         "var": 2009,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6066,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
         "x": 19,
-        "y": 12,
+        "y": 13,
         "var": 2010,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6066,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 13,
         "var": 2011,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,19 +341,19 @@
     },
     {
         "warId": 6066,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 19,
-        "y": 13,
+        "x": 18,
+        "y": 12,
         "var": 2012,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -361,19 +361,19 @@
     },
     {
         "warId": 6066,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2013,
         "relation": 2,
         "outIndex": 12,
         "dirction": 1,
-        "x": 18,
-        "y": 13,
+        "x": 15,
+        "y": 3,
         "var": 2013,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&11640|2&8040|4&2760|5&2640",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -381,19 +381,19 @@
     },
     {
         "warId": 6066,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
-        "x": 19,
-        "y": 10,
+        "x": 16,
+        "y": 3,
         "var": 2014,
-        "lv": 54,
-        "hide": 1,
+        "lv": 50,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&11280|2&8280|4&2640|5&3600",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,39 @@
     },
     {
         "warId": 6066,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 18,
-        "y": 12,
+        "x": 14,
+        "y": 2,
         "var": 2015,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&16800|2&9900|4&3750|5&3450",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6066,
+        "actorName": "枪兵",
+        "actorId": 1002,
+        "dataId": 2016,
+        "relation": 2,
+        "outIndex": 15,
+        "dirction": 1,
+        "x": 17,
+        "y": 2,
+        "var": 2016,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,137 +443,17 @@
         "warId": 6066,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 16,
-        "y": 10,
-        "var": 2016,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6066,
-        "actorName": "步兵",
-        "actorId": 1001,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
-        "x": 15,
-        "y": 3,
+        "x": 16,
+        "y": 2,
         "var": 2017,
-        "lv": 54,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6066,
-        "actorName": "步兵",
-        "actorId": 1001,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 16,
-        "y": 3,
-        "var": 2018,
-        "lv": 54,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14400|2&6600|4&3840|5&2400",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6066,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 14,
-        "y": 2,
-        "var": 2019,
-        "lv": 54,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6066,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 17,
-        "y": 2,
-        "var": 2020,
-        "lv": 54,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&12720|2&7200|4&3480|5&3120",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6066,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 16,
-        "y": 2,
-        "var": 2021,
-        "lv": 54,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&11640|2&8040|4&2760|5&2640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6066,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 18,
-        "y": 4,
-        "var": 2022,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&11280|2&8280|4&2640|5&3600",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,37 +463,17 @@
         "warId": 6066,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2023,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 17,
         "dirction": 1,
         "x": 15,
         "y": 2,
-        "var": 2023,
-        "lv": 54,
+        "var": 2018,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&16800|2&9900|4&3750|5&3450",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6066,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 17,
-        "y": 4,
-        "var": 2024,
-        "lv": 54,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6067.json b/shared/resource/warJsons/6067.json
index 5dfbb0522..65fb3997a 100644
--- a/shared/resource/warJsons/6067.json
+++ b/shared/resource/warJsons/6067.json
@@ -130,10 +130,10 @@
         "x": 2,
         "y": 12,
         "var": 2001,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 4,
         "y": 12,
         "var": 2002,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 2,
         "y": 13,
         "var": 2003,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 13,
         "var": 2004,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,8 +201,8 @@
     },
     {
         "warId": 6067,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
@@ -210,30 +210,10 @@
         "x": 3,
         "y": 13,
         "var": 2005,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&17460|2&12060|4&4140|5&3960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6067,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 11,
-        "var": 2006,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&16920|2&12420|4&3960|5&5400",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,37 +223,17 @@
         "warId": 6067,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2007,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 5,
         "dirction": 2,
         "x": 3,
         "y": 12,
-        "var": 2007,
-        "lv": 58,
+        "var": 2006,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25200|2&14850|4&5625|5&5175",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6067,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 5,
-        "y": 11,
-        "var": 2008,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&21825|2&15075|4&5175|5&4950",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,57 @@
         "warId": 6067,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 17,
+        "y": 12,
+        "var": 2007,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6067,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 19,
+        "y": 12,
+        "var": 2008,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6067,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 17,
-        "y": 12,
+        "y": 13,
         "var": 2009,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6067,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
         "x": 19,
-        "y": 12,
+        "y": 13,
         "var": 2010,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6067,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 13,
         "var": 2011,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,19 +341,19 @@
     },
     {
         "warId": 6067,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 19,
-        "y": 13,
+        "x": 18,
+        "y": 12,
         "var": 2012,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -361,19 +361,19 @@
     },
     {
         "warId": 6067,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2013,
         "relation": 2,
         "outIndex": 12,
         "dirction": 1,
-        "x": 18,
-        "y": 13,
+        "x": 15,
+        "y": 3,
         "var": 2013,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&17460|2&12060|4&4140|5&3960",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -381,19 +381,19 @@
     },
     {
         "warId": 6067,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
-        "x": 19,
-        "y": 10,
+        "x": 16,
+        "y": 3,
         "var": 2014,
-        "lv": 58,
-        "hide": 1,
+        "lv": 50,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&16920|2&12420|4&3960|5&5400",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,39 @@
     },
     {
         "warId": 6067,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 18,
-        "y": 12,
+        "x": 14,
+        "y": 2,
         "var": 2015,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25200|2&14850|4&5625|5&5175",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6067,
+        "actorName": "枪兵",
+        "actorId": 1002,
+        "dataId": 2016,
+        "relation": 2,
+        "outIndex": 15,
+        "dirction": 1,
+        "x": 17,
+        "y": 2,
+        "var": 2016,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,137 +443,17 @@
         "warId": 6067,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 16,
-        "y": 10,
-        "var": 2016,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&21825|2&15075|4&5175|5&4950",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6067,
-        "actorName": "步兵",
-        "actorId": 1001,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
-        "x": 15,
-        "y": 3,
+        "x": 16,
+        "y": 2,
         "var": 2017,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6067,
-        "actorName": "步兵",
-        "actorId": 1001,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 16,
-        "y": 3,
-        "var": 2018,
-        "lv": 58,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6067,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 14,
-        "y": 2,
-        "var": 2019,
-        "lv": 58,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6067,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 17,
-        "y": 2,
-        "var": 2020,
-        "lv": 58,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6067,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 16,
-        "y": 2,
-        "var": 2021,
-        "lv": 58,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&17460|2&12060|4&4140|5&3960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6067,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 18,
-        "y": 4,
-        "var": 2022,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&16920|2&12420|4&3960|5&5400",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,37 +463,17 @@
         "warId": 6067,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2023,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 17,
         "dirction": 1,
         "x": 15,
         "y": 2,
-        "var": 2023,
-        "lv": 58,
+        "var": 2018,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25200|2&14850|4&5625|5&5175",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6067,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 17,
-        "y": 4,
-        "var": 2024,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&21825|2&15075|4&5175|5&4950",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6068.json b/shared/resource/warJsons/6068.json
index 3a4b641ab..b1b4bb270 100644
--- a/shared/resource/warJsons/6068.json
+++ b/shared/resource/warJsons/6068.json
@@ -130,10 +130,10 @@
         "x": 2,
         "y": 12,
         "var": 2001,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 4,
         "y": 12,
         "var": 2002,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 2,
         "y": 13,
         "var": 2003,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 13,
         "var": 2004,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,8 +201,8 @@
     },
     {
         "warId": 6068,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
@@ -210,30 +210,10 @@
         "x": 3,
         "y": 13,
         "var": 2005,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&17460|2&12060|4&4140|5&3960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6068,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 11,
-        "var": 2006,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&16920|2&12420|4&3960|5&5400",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,37 +223,17 @@
         "warId": 6068,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2007,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 5,
         "dirction": 2,
         "x": 3,
         "y": 12,
-        "var": 2007,
-        "lv": 58,
+        "var": 2006,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25200|2&14850|4&5625|5&5175",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6068,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 5,
-        "y": 11,
-        "var": 2008,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&21825|2&15075|4&5175|5&4950",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,57 @@
         "warId": 6068,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 17,
+        "y": 12,
+        "var": 2007,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6068,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 19,
+        "y": 12,
+        "var": 2008,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6068,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 17,
-        "y": 12,
+        "y": 13,
         "var": 2009,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6068,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
         "x": 19,
-        "y": 12,
+        "y": 13,
         "var": 2010,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6068,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 13,
         "var": 2011,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,19 +341,19 @@
     },
     {
         "warId": 6068,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 19,
-        "y": 13,
+        "x": 18,
+        "y": 12,
         "var": 2012,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -361,19 +361,19 @@
     },
     {
         "warId": 6068,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2013,
         "relation": 2,
         "outIndex": 12,
         "dirction": 1,
-        "x": 18,
-        "y": 13,
+        "x": 15,
+        "y": 3,
         "var": 2013,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&17460|2&12060|4&4140|5&3960",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -381,19 +381,19 @@
     },
     {
         "warId": 6068,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
-        "x": 19,
-        "y": 10,
+        "x": 16,
+        "y": 3,
         "var": 2014,
-        "lv": 58,
-        "hide": 1,
+        "lv": 50,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&16920|2&12420|4&3960|5&5400",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,39 @@
     },
     {
         "warId": 6068,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 18,
-        "y": 12,
+        "x": 14,
+        "y": 2,
         "var": 2015,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25200|2&14850|4&5625|5&5175",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6068,
+        "actorName": "枪兵",
+        "actorId": 1002,
+        "dataId": 2016,
+        "relation": 2,
+        "outIndex": 15,
+        "dirction": 1,
+        "x": 17,
+        "y": 2,
+        "var": 2016,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,137 +443,17 @@
         "warId": 6068,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 16,
-        "y": 10,
-        "var": 2016,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&21825|2&15075|4&5175|5&4950",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6068,
-        "actorName": "步兵",
-        "actorId": 1001,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
-        "x": 15,
-        "y": 3,
+        "x": 16,
+        "y": 2,
         "var": 2017,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6068,
-        "actorName": "步兵",
-        "actorId": 1001,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 16,
-        "y": 3,
-        "var": 2018,
-        "lv": 58,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6068,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 14,
-        "y": 2,
-        "var": 2019,
-        "lv": 58,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6068,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 17,
-        "y": 2,
-        "var": 2020,
-        "lv": 58,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6068,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 16,
-        "y": 2,
-        "var": 2021,
-        "lv": 58,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&17460|2&12060|4&4140|5&3960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6068,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 18,
-        "y": 4,
-        "var": 2022,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&16920|2&12420|4&3960|5&5400",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,37 +463,17 @@
         "warId": 6068,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2023,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 17,
         "dirction": 1,
         "x": 15,
         "y": 2,
-        "var": 2023,
-        "lv": 58,
+        "var": 2018,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25200|2&14850|4&5625|5&5175",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6068,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 17,
-        "y": 4,
-        "var": 2024,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&21825|2&15075|4&5175|5&4950",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6069.json b/shared/resource/warJsons/6069.json
index e741f6adc..545891d10 100644
--- a/shared/resource/warJsons/6069.json
+++ b/shared/resource/warJsons/6069.json
@@ -130,10 +130,10 @@
         "x": 2,
         "y": 12,
         "var": 2001,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 4,
         "y": 12,
         "var": 2002,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 2,
         "y": 13,
         "var": 2003,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 13,
         "var": 2004,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,8 +201,8 @@
     },
     {
         "warId": 6069,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
@@ -210,30 +210,10 @@
         "x": 3,
         "y": 13,
         "var": 2005,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&17460|2&12060|4&4140|5&3960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6069,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 11,
-        "var": 2006,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&16920|2&12420|4&3960|5&5400",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,37 +223,17 @@
         "warId": 6069,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2007,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 5,
         "dirction": 2,
         "x": 3,
         "y": 12,
-        "var": 2007,
-        "lv": 58,
+        "var": 2006,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25200|2&14850|4&5625|5&5175",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6069,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 5,
-        "y": 11,
-        "var": 2008,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&21825|2&15075|4&5175|5&4950",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,57 @@
         "warId": 6069,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 17,
+        "y": 12,
+        "var": 2007,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6069,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 19,
+        "y": 12,
+        "var": 2008,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6069,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 17,
-        "y": 12,
+        "y": 13,
         "var": 2009,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6069,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
         "x": 19,
-        "y": 12,
+        "y": 13,
         "var": 2010,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6069,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 13,
         "var": 2011,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,19 +341,19 @@
     },
     {
         "warId": 6069,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 19,
-        "y": 13,
+        "x": 18,
+        "y": 12,
         "var": 2012,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -361,19 +361,19 @@
     },
     {
         "warId": 6069,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2013,
         "relation": 2,
         "outIndex": 12,
         "dirction": 1,
-        "x": 18,
-        "y": 13,
+        "x": 15,
+        "y": 3,
         "var": 2013,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&17460|2&12060|4&4140|5&3960",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -381,19 +381,19 @@
     },
     {
         "warId": 6069,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
-        "x": 19,
-        "y": 10,
+        "x": 16,
+        "y": 3,
         "var": 2014,
-        "lv": 58,
-        "hide": 1,
+        "lv": 50,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&16920|2&12420|4&3960|5&5400",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,39 @@
     },
     {
         "warId": 6069,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 18,
-        "y": 12,
+        "x": 14,
+        "y": 2,
         "var": 2015,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25200|2&14850|4&5625|5&5175",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6069,
+        "actorName": "枪兵",
+        "actorId": 1002,
+        "dataId": 2016,
+        "relation": 2,
+        "outIndex": 15,
+        "dirction": 1,
+        "x": 17,
+        "y": 2,
+        "var": 2016,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,137 +443,17 @@
         "warId": 6069,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 16,
-        "y": 10,
-        "var": 2016,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&21825|2&15075|4&5175|5&4950",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6069,
-        "actorName": "步兵",
-        "actorId": 1001,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
-        "x": 15,
-        "y": 3,
+        "x": 16,
+        "y": 2,
         "var": 2017,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6069,
-        "actorName": "步兵",
-        "actorId": 1001,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 16,
-        "y": 3,
-        "var": 2018,
-        "lv": 58,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6069,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 14,
-        "y": 2,
-        "var": 2019,
-        "lv": 58,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6069,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 17,
-        "y": 2,
-        "var": 2020,
-        "lv": 58,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6069,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 16,
-        "y": 2,
-        "var": 2021,
-        "lv": 58,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&17460|2&12060|4&4140|5&3960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6069,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 18,
-        "y": 4,
-        "var": 2022,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&16920|2&12420|4&3960|5&5400",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,37 +463,17 @@
         "warId": 6069,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2023,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 17,
         "dirction": 1,
         "x": 15,
         "y": 2,
-        "var": 2023,
-        "lv": 58,
+        "var": 2018,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25200|2&14850|4&5625|5&5175",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6069,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 17,
-        "y": 4,
-        "var": 2024,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&21825|2&15075|4&5175|5&4950",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6070.json b/shared/resource/warJsons/6070.json
index ff64a89b6..8cec854a0 100644
--- a/shared/resource/warJsons/6070.json
+++ b/shared/resource/warJsons/6070.json
@@ -130,10 +130,10 @@
         "x": 2,
         "y": 12,
         "var": 2001,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 4,
         "y": 12,
         "var": 2002,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 2,
         "y": 13,
         "var": 2003,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 13,
         "var": 2004,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,8 +201,8 @@
     },
     {
         "warId": 6070,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
@@ -210,30 +210,10 @@
         "x": 3,
         "y": 13,
         "var": 2005,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&17460|2&12060|4&4140|5&3960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6070,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 11,
-        "var": 2006,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&16920|2&12420|4&3960|5&5400",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,37 +223,17 @@
         "warId": 6070,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2007,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 5,
         "dirction": 2,
         "x": 3,
         "y": 12,
-        "var": 2007,
-        "lv": 58,
+        "var": 2006,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25200|2&14850|4&5625|5&5175",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6070,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 5,
-        "y": 11,
-        "var": 2008,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&21825|2&15075|4&5175|5&4950",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,57 @@
         "warId": 6070,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 17,
+        "y": 12,
+        "var": 2007,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6070,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 19,
+        "y": 12,
+        "var": 2008,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6070,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 17,
-        "y": 12,
+        "y": 13,
         "var": 2009,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6070,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
         "x": 19,
-        "y": 12,
+        "y": 13,
         "var": 2010,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6070,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 13,
         "var": 2011,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,19 +341,19 @@
     },
     {
         "warId": 6070,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 19,
-        "y": 13,
+        "x": 18,
+        "y": 12,
         "var": 2012,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -361,19 +361,19 @@
     },
     {
         "warId": 6070,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2013,
         "relation": 2,
         "outIndex": 12,
         "dirction": 1,
-        "x": 18,
-        "y": 13,
+        "x": 15,
+        "y": 3,
         "var": 2013,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&17460|2&12060|4&4140|5&3960",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -381,19 +381,19 @@
     },
     {
         "warId": 6070,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
-        "x": 19,
-        "y": 10,
+        "x": 16,
+        "y": 3,
         "var": 2014,
-        "lv": 58,
-        "hide": 1,
+        "lv": 50,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&16920|2&12420|4&3960|5&5400",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,39 @@
     },
     {
         "warId": 6070,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 18,
-        "y": 12,
+        "x": 14,
+        "y": 2,
         "var": 2015,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25200|2&14850|4&5625|5&5175",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6070,
+        "actorName": "枪兵",
+        "actorId": 1002,
+        "dataId": 2016,
+        "relation": 2,
+        "outIndex": 15,
+        "dirction": 1,
+        "x": 17,
+        "y": 2,
+        "var": 2016,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,137 +443,17 @@
         "warId": 6070,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 16,
-        "y": 10,
-        "var": 2016,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&21825|2&15075|4&5175|5&4950",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6070,
-        "actorName": "步兵",
-        "actorId": 1001,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
-        "x": 15,
-        "y": 3,
+        "x": 16,
+        "y": 2,
         "var": 2017,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6070,
-        "actorName": "步兵",
-        "actorId": 1001,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 16,
-        "y": 3,
-        "var": 2018,
-        "lv": 58,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6070,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 14,
-        "y": 2,
-        "var": 2019,
-        "lv": 58,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6070,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 17,
-        "y": 2,
-        "var": 2020,
-        "lv": 58,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6070,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 16,
-        "y": 2,
-        "var": 2021,
-        "lv": 58,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&17460|2&12060|4&4140|5&3960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6070,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 18,
-        "y": 4,
-        "var": 2022,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&16920|2&12420|4&3960|5&5400",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,37 +463,17 @@
         "warId": 6070,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2023,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 17,
         "dirction": 1,
         "x": 15,
         "y": 2,
-        "var": 2023,
-        "lv": 58,
+        "var": 2018,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25200|2&14850|4&5625|5&5175",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6070,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 17,
-        "y": 4,
-        "var": 2024,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&21825|2&15075|4&5175|5&4950",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6071.json b/shared/resource/warJsons/6071.json
index c489e7601..5b62a6eab 100644
--- a/shared/resource/warJsons/6071.json
+++ b/shared/resource/warJsons/6071.json
@@ -130,10 +130,10 @@
         "x": 2,
         "y": 12,
         "var": 2001,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 4,
         "y": 12,
         "var": 2002,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 2,
         "y": 13,
         "var": 2003,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 13,
         "var": 2004,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,8 +201,8 @@
     },
     {
         "warId": 6071,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
@@ -210,30 +210,10 @@
         "x": 3,
         "y": 13,
         "var": 2005,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&17460|2&12060|4&4140|5&3960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6071,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 11,
-        "var": 2006,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&16920|2&12420|4&3960|5&5400",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,37 +223,17 @@
         "warId": 6071,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2007,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 5,
         "dirction": 2,
         "x": 3,
         "y": 12,
-        "var": 2007,
-        "lv": 58,
+        "var": 2006,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25200|2&14850|4&5625|5&5175",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6071,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 5,
-        "y": 11,
-        "var": 2008,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&21825|2&15075|4&5175|5&4950",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,57 @@
         "warId": 6071,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 17,
+        "y": 12,
+        "var": 2007,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6071,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 19,
+        "y": 12,
+        "var": 2008,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6071,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 17,
-        "y": 12,
+        "y": 13,
         "var": 2009,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6071,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
         "x": 19,
-        "y": 12,
+        "y": 13,
         "var": 2010,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6071,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 13,
         "var": 2011,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,19 +341,19 @@
     },
     {
         "warId": 6071,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 19,
-        "y": 13,
+        "x": 18,
+        "y": 12,
         "var": 2012,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -361,19 +361,19 @@
     },
     {
         "warId": 6071,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2013,
         "relation": 2,
         "outIndex": 12,
         "dirction": 1,
-        "x": 18,
-        "y": 13,
+        "x": 15,
+        "y": 3,
         "var": 2013,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&17460|2&12060|4&4140|5&3960",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -381,19 +381,19 @@
     },
     {
         "warId": 6071,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
-        "x": 19,
-        "y": 10,
+        "x": 16,
+        "y": 3,
         "var": 2014,
-        "lv": 58,
-        "hide": 1,
+        "lv": 50,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&16920|2&12420|4&3960|5&5400",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,39 @@
     },
     {
         "warId": 6071,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 18,
-        "y": 12,
+        "x": 14,
+        "y": 2,
         "var": 2015,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25200|2&14850|4&5625|5&5175",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6071,
+        "actorName": "枪兵",
+        "actorId": 1002,
+        "dataId": 2016,
+        "relation": 2,
+        "outIndex": 15,
+        "dirction": 1,
+        "x": 17,
+        "y": 2,
+        "var": 2016,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,137 +443,17 @@
         "warId": 6071,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 16,
-        "y": 10,
-        "var": 2016,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&21825|2&15075|4&5175|5&4950",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6071,
-        "actorName": "步兵",
-        "actorId": 1001,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
-        "x": 15,
-        "y": 3,
+        "x": 16,
+        "y": 2,
         "var": 2017,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6071,
-        "actorName": "步兵",
-        "actorId": 1001,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 16,
-        "y": 3,
-        "var": 2018,
-        "lv": 58,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6071,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 14,
-        "y": 2,
-        "var": 2019,
-        "lv": 58,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6071,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 17,
-        "y": 2,
-        "var": 2020,
-        "lv": 58,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6071,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 16,
-        "y": 2,
-        "var": 2021,
-        "lv": 58,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&17460|2&12060|4&4140|5&3960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6071,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 18,
-        "y": 4,
-        "var": 2022,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&16920|2&12420|4&3960|5&5400",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,37 +463,17 @@
         "warId": 6071,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2023,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 17,
         "dirction": 1,
         "x": 15,
         "y": 2,
-        "var": 2023,
-        "lv": 58,
+        "var": 2018,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25200|2&14850|4&5625|5&5175",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6071,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 17,
-        "y": 4,
-        "var": 2024,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&21825|2&15075|4&5175|5&4950",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6072.json b/shared/resource/warJsons/6072.json
index 87c77e456..8aabf26f1 100644
--- a/shared/resource/warJsons/6072.json
+++ b/shared/resource/warJsons/6072.json
@@ -130,10 +130,10 @@
         "x": 2,
         "y": 12,
         "var": 2001,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 4,
         "y": 12,
         "var": 2002,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 2,
         "y": 13,
         "var": 2003,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 13,
         "var": 2004,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,8 +201,8 @@
     },
     {
         "warId": 6072,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
@@ -210,30 +210,10 @@
         "x": 3,
         "y": 13,
         "var": 2005,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&17460|2&12060|4&4140|5&3960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6072,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 11,
-        "var": 2006,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&16920|2&12420|4&3960|5&5400",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,37 +223,17 @@
         "warId": 6072,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2007,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 5,
         "dirction": 2,
         "x": 3,
         "y": 12,
-        "var": 2007,
-        "lv": 58,
+        "var": 2006,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25200|2&14850|4&5625|5&5175",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6072,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 5,
-        "y": 11,
-        "var": 2008,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&21825|2&15075|4&5175|5&4950",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,57 @@
         "warId": 6072,
         "actorName": "步兵",
         "actorId": 1001,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 17,
+        "y": 12,
+        "var": 2007,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6072,
+        "actorName": "步兵",
+        "actorId": 1001,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 19,
+        "y": 12,
+        "var": 2008,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6072,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 17,
-        "y": 12,
+        "y": 13,
         "var": 2009,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -301,19 +301,19 @@
     },
     {
         "warId": 6072,
-        "actorName": "步兵",
-        "actorId": 1001,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2010,
         "relation": 2,
         "outIndex": 9,
         "dirction": 1,
         "x": 19,
-        "y": 12,
+        "y": 13,
         "var": 2010,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -321,19 +321,19 @@
     },
     {
         "warId": 6072,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2011,
         "relation": 2,
         "outIndex": 10,
         "dirction": 1,
-        "x": 17,
+        "x": 18,
         "y": 13,
         "var": 2011,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -341,19 +341,19 @@
     },
     {
         "warId": 6072,
-        "actorName": "枪兵",
-        "actorId": 1002,
+        "actorName": "骑兵将领",
+        "actorId": 1037,
         "dataId": 2012,
         "relation": 2,
         "outIndex": 11,
         "dirction": 1,
-        "x": 19,
-        "y": 13,
+        "x": 18,
+        "y": 12,
         "var": 2012,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -361,19 +361,19 @@
     },
     {
         "warId": 6072,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2013,
         "relation": 2,
         "outIndex": 12,
         "dirction": 1,
-        "x": 18,
-        "y": 13,
+        "x": 15,
+        "y": 3,
         "var": 2013,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&17460|2&12060|4&4140|5&3960",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -381,19 +381,19 @@
     },
     {
         "warId": 6072,
-        "actorName": "策士",
-        "actorId": 1006,
+        "actorName": "步兵",
+        "actorId": 1001,
         "dataId": 2014,
         "relation": 2,
         "outIndex": 13,
         "dirction": 1,
-        "x": 19,
-        "y": 10,
+        "x": 16,
+        "y": 3,
         "var": 2014,
-        "lv": 58,
-        "hide": 1,
+        "lv": 50,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&16920|2&12420|4&3960|5&5400",
+        "attribute": "1&10320|2&4730|4&2752|5&1720",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -401,19 +401,39 @@
     },
     {
         "warId": 6072,
-        "actorName": "骑兵将领",
-        "actorId": 1037,
+        "actorName": "枪兵",
+        "actorId": 1002,
         "dataId": 2015,
         "relation": 2,
         "outIndex": 14,
         "dirction": 1,
-        "x": 18,
-        "y": 12,
+        "x": 14,
+        "y": 2,
         "var": 2015,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25200|2&14850|4&5625|5&5175",
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6072,
+        "actorName": "枪兵",
+        "actorId": 1002,
+        "dataId": 2016,
+        "relation": 2,
+        "outIndex": 15,
+        "dirction": 1,
+        "x": 17,
+        "y": 2,
+        "var": 2016,
+        "lv": 50,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&9116|2&5160|4&2494|5&2236",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,137 +443,17 @@
         "warId": 6072,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 16,
-        "y": 10,
-        "var": 2016,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&21825|2&15075|4&5175|5&4950",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6072,
-        "actorName": "步兵",
-        "actorId": 1001,
         "dataId": 2017,
         "relation": 2,
         "outIndex": 16,
         "dirction": 1,
-        "x": 15,
-        "y": 3,
+        "x": 16,
+        "y": 2,
         "var": 2017,
-        "lv": 58,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6072,
-        "actorName": "步兵",
-        "actorId": 1001,
-        "dataId": 2018,
-        "relation": 2,
-        "outIndex": 17,
-        "dirction": 1,
-        "x": 16,
-        "y": 3,
-        "var": 2018,
-        "lv": 58,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&21600|2&9900|4&5760|5&3600",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6072,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2019,
-        "relation": 2,
-        "outIndex": 18,
-        "dirction": 1,
-        "x": 14,
-        "y": 2,
-        "var": 2019,
-        "lv": 58,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6072,
-        "actorName": "枪兵",
-        "actorId": 1002,
-        "dataId": 2020,
-        "relation": 2,
-        "outIndex": 19,
-        "dirction": 1,
-        "x": 17,
-        "y": 2,
-        "var": 2020,
-        "lv": 58,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19080|2&10800|4&5220|5&4680",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6072,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 16,
-        "y": 2,
-        "var": 2021,
-        "lv": 58,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&17460|2&12060|4&4140|5&3960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6072,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 18,
-        "y": 4,
-        "var": 2022,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&16920|2&12420|4&3960|5&5400",
+        "attribute": "1&8342|2&5762|4&1978|5&1892",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,37 +463,17 @@
         "warId": 6072,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2023,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 17,
         "dirction": 1,
         "x": 15,
         "y": 2,
-        "var": 2023,
-        "lv": 58,
+        "var": 2018,
+        "lv": 50,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25200|2&14850|4&5625|5&5175",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6072,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 17,
-        "y": 4,
-        "var": 2024,
-        "lv": 58,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&21825|2&15075|4&5175|5&4950",
+        "attribute": "1&12040|2&7095|4&2687|5&2472",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6073.json b/shared/resource/warJsons/6073.json
index 99ecfb4f8..e7555983e 100644
--- a/shared/resource/warJsons/6073.json
+++ b/shared/resource/warJsons/6073.json
@@ -201,19 +201,19 @@
     },
     {
         "warId": 6073,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 3,
-        "y": 2,
+        "y": 3,
         "var": 2005,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -221,58 +221,18 @@
     },
     {
         "warId": 6073,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
+        "actorName": "文官将领",
+        "actorId": 1038,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
         "x": 3,
-        "y": 3,
+        "y": 5,
         "var": 2006,
         "lv": 70,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&18187|2&12562|4&4312|5&4125",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6073,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
-        "y": 4,
-        "var": 2007,
-        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14100|2&10350|4&3300|5&4500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6073,
-        "actorName": "文官将领",
-        "actorId": 1038,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 3,
-        "y": 5,
-        "var": 2008,
-        "lv": 70,
-        "hide": 1,
-        "initial_ai": 3,
         "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
@@ -283,53 +243,53 @@
         "warId": 6073,
         "actorName": "枪兵",
         "actorId": 1002,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 8,
+        "y": 12,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6073,
+        "actorName": "枪兵将领",
+        "actorId": 1041,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 9,
+        "y": 12,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6073,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 8,
-        "y": 12,
-        "var": 2009,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&15900|2&9000|4&4350|5&3900",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6073,
-        "actorName": "枪兵将领",
-        "actorId": 1041,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 1,
-        "x": 9,
-        "y": 12,
-        "var": 2010,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19875|2&11250|4&5437|5&4875",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6073,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 1,
-        "x": 8,
         "y": 13,
-        "var": 2011,
+        "var": 2009,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -343,13 +303,13 @@
         "warId": 6073,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 9,
         "y": 13,
-        "var": 2012,
+        "var": 2010,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -359,39 +319,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6073,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 8,
-        "y": 14,
-        "var": 2013,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6073,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2014,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 10,
         "dirction": 1,
         "x": 7,
         "y": 14,
-        "var": 2014,
+        "var": 2011,
         "lv": 70,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
@@ -399,39 +339,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6073,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 9,
-        "y": 14,
-        "var": 2015,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14100|2&10350|4&3300|5&4500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6073,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 10,
         "y": 14,
-        "var": 2016,
+        "var": 2012,
         "lv": 70,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
@@ -443,13 +363,13 @@
         "warId": 6073,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2017,
+        "var": 2013,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -463,13 +383,13 @@
         "warId": 6073,
         "actorName": "枪兵将领",
         "actorId": 1041,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
+        "var": 2014,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -483,13 +403,13 @@
         "warId": 6073,
         "actorName": "游侠",
         "actorId": 1005,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 12,
-        "var": 2019,
+        "var": 2015,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -503,13 +423,13 @@
         "warId": 6073,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
+        "var": 2016,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -519,39 +439,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6073,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 12,
-        "var": 2021,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6073,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2022,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2022,
+        "var": 2017,
         "lv": 70,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
@@ -559,39 +459,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6073,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2023,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14100|2&10350|4&3300|5&4500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6073,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 21,
         "y": 13,
-        "var": 2024,
+        "var": 2018,
         "lv": 70,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
diff --git a/shared/resource/warJsons/6074.json b/shared/resource/warJsons/6074.json
index aef92d442..5f45c1cc2 100644
--- a/shared/resource/warJsons/6074.json
+++ b/shared/resource/warJsons/6074.json
@@ -201,19 +201,19 @@
     },
     {
         "warId": 6074,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 3,
-        "y": 2,
+        "y": 3,
         "var": 2005,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -221,58 +221,18 @@
     },
     {
         "warId": 6074,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
+        "actorName": "文官将领",
+        "actorId": 1038,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
         "x": 3,
-        "y": 3,
+        "y": 5,
         "var": 2006,
         "lv": 70,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&18187|2&12562|4&4312|5&4125",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6074,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
-        "y": 4,
-        "var": 2007,
-        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14100|2&10350|4&3300|5&4500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6074,
-        "actorName": "文官将领",
-        "actorId": 1038,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 3,
-        "y": 5,
-        "var": 2008,
-        "lv": 70,
-        "hide": 1,
-        "initial_ai": 3,
         "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
@@ -283,53 +243,53 @@
         "warId": 6074,
         "actorName": "枪兵",
         "actorId": 1002,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 8,
+        "y": 12,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6074,
+        "actorName": "枪兵将领",
+        "actorId": 1041,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 9,
+        "y": 12,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6074,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 8,
-        "y": 12,
-        "var": 2009,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&15900|2&9000|4&4350|5&3900",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6074,
-        "actorName": "枪兵将领",
-        "actorId": 1041,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 1,
-        "x": 9,
-        "y": 12,
-        "var": 2010,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19875|2&11250|4&5437|5&4875",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6074,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 1,
-        "x": 8,
         "y": 13,
-        "var": 2011,
+        "var": 2009,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -343,13 +303,13 @@
         "warId": 6074,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 9,
         "y": 13,
-        "var": 2012,
+        "var": 2010,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -359,39 +319,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6074,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 8,
-        "y": 14,
-        "var": 2013,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6074,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2014,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 10,
         "dirction": 1,
         "x": 7,
         "y": 14,
-        "var": 2014,
+        "var": 2011,
         "lv": 70,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
@@ -399,39 +339,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6074,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 9,
-        "y": 14,
-        "var": 2015,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14100|2&10350|4&3300|5&4500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6074,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 10,
         "y": 14,
-        "var": 2016,
+        "var": 2012,
         "lv": 70,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
@@ -443,13 +363,13 @@
         "warId": 6074,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2017,
+        "var": 2013,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -463,13 +383,13 @@
         "warId": 6074,
         "actorName": "枪兵将领",
         "actorId": 1041,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
+        "var": 2014,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -483,13 +403,13 @@
         "warId": 6074,
         "actorName": "游侠",
         "actorId": 1005,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 12,
-        "var": 2019,
+        "var": 2015,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -503,13 +423,13 @@
         "warId": 6074,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
+        "var": 2016,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -519,39 +439,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6074,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 12,
-        "var": 2021,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6074,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2022,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2022,
+        "var": 2017,
         "lv": 70,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
@@ -559,39 +459,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6074,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2023,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14100|2&10350|4&3300|5&4500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6074,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 21,
         "y": 13,
-        "var": 2024,
+        "var": 2018,
         "lv": 70,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
diff --git a/shared/resource/warJsons/6075.json b/shared/resource/warJsons/6075.json
index 4000dc307..3247248fc 100644
--- a/shared/resource/warJsons/6075.json
+++ b/shared/resource/warJsons/6075.json
@@ -201,19 +201,19 @@
     },
     {
         "warId": 6075,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 3,
-        "y": 2,
+        "y": 3,
         "var": 2005,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -221,58 +221,18 @@
     },
     {
         "warId": 6075,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
+        "actorName": "文官将领",
+        "actorId": 1038,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
         "x": 3,
-        "y": 3,
+        "y": 5,
         "var": 2006,
         "lv": 70,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&18187|2&12562|4&4312|5&4125",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6075,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
-        "y": 4,
-        "var": 2007,
-        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14100|2&10350|4&3300|5&4500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6075,
-        "actorName": "文官将领",
-        "actorId": 1038,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 3,
-        "y": 5,
-        "var": 2008,
-        "lv": 70,
-        "hide": 1,
-        "initial_ai": 3,
         "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
@@ -283,53 +243,53 @@
         "warId": 6075,
         "actorName": "枪兵",
         "actorId": 1002,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 8,
+        "y": 12,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6075,
+        "actorName": "枪兵将领",
+        "actorId": 1041,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 9,
+        "y": 12,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6075,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 8,
-        "y": 12,
-        "var": 2009,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&15900|2&9000|4&4350|5&3900",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6075,
-        "actorName": "枪兵将领",
-        "actorId": 1041,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 1,
-        "x": 9,
-        "y": 12,
-        "var": 2010,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19875|2&11250|4&5437|5&4875",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6075,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 1,
-        "x": 8,
         "y": 13,
-        "var": 2011,
+        "var": 2009,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -343,13 +303,13 @@
         "warId": 6075,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 9,
         "y": 13,
-        "var": 2012,
+        "var": 2010,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -359,39 +319,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6075,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 8,
-        "y": 14,
-        "var": 2013,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6075,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2014,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 10,
         "dirction": 1,
         "x": 7,
         "y": 14,
-        "var": 2014,
+        "var": 2011,
         "lv": 70,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
@@ -399,39 +339,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6075,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 9,
-        "y": 14,
-        "var": 2015,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14100|2&10350|4&3300|5&4500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6075,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 10,
         "y": 14,
-        "var": 2016,
+        "var": 2012,
         "lv": 70,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
@@ -443,13 +363,13 @@
         "warId": 6075,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2017,
+        "var": 2013,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -463,13 +383,13 @@
         "warId": 6075,
         "actorName": "枪兵将领",
         "actorId": 1041,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
+        "var": 2014,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -483,13 +403,13 @@
         "warId": 6075,
         "actorName": "游侠",
         "actorId": 1005,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 12,
-        "var": 2019,
+        "var": 2015,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -503,13 +423,13 @@
         "warId": 6075,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
+        "var": 2016,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -519,39 +439,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6075,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 12,
-        "var": 2021,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6075,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2022,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2022,
+        "var": 2017,
         "lv": 70,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
@@ -559,39 +459,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6075,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2023,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14100|2&10350|4&3300|5&4500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6075,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 21,
         "y": 13,
-        "var": 2024,
+        "var": 2018,
         "lv": 70,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
diff --git a/shared/resource/warJsons/6076.json b/shared/resource/warJsons/6076.json
index 6522429ee..24b4a489f 100644
--- a/shared/resource/warJsons/6076.json
+++ b/shared/resource/warJsons/6076.json
@@ -201,19 +201,19 @@
     },
     {
         "warId": 6076,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 3,
-        "y": 2,
+        "y": 3,
         "var": 2005,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -221,58 +221,18 @@
     },
     {
         "warId": 6076,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
+        "actorName": "文官将领",
+        "actorId": 1038,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
         "x": 3,
-        "y": 3,
+        "y": 5,
         "var": 2006,
         "lv": 70,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&18187|2&12562|4&4312|5&4125",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6076,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
-        "y": 4,
-        "var": 2007,
-        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14100|2&10350|4&3300|5&4500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6076,
-        "actorName": "文官将领",
-        "actorId": 1038,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 3,
-        "y": 5,
-        "var": 2008,
-        "lv": 70,
-        "hide": 1,
-        "initial_ai": 3,
         "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
@@ -283,53 +243,53 @@
         "warId": 6076,
         "actorName": "枪兵",
         "actorId": 1002,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 8,
+        "y": 12,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6076,
+        "actorName": "枪兵将领",
+        "actorId": 1041,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 9,
+        "y": 12,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6076,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 8,
-        "y": 12,
-        "var": 2009,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&15900|2&9000|4&4350|5&3900",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6076,
-        "actorName": "枪兵将领",
-        "actorId": 1041,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 1,
-        "x": 9,
-        "y": 12,
-        "var": 2010,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19875|2&11250|4&5437|5&4875",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6076,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 1,
-        "x": 8,
         "y": 13,
-        "var": 2011,
+        "var": 2009,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -343,13 +303,13 @@
         "warId": 6076,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 9,
         "y": 13,
-        "var": 2012,
+        "var": 2010,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -359,39 +319,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6076,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 8,
-        "y": 14,
-        "var": 2013,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6076,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2014,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 10,
         "dirction": 1,
         "x": 7,
         "y": 14,
-        "var": 2014,
+        "var": 2011,
         "lv": 70,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
@@ -399,39 +339,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6076,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 9,
-        "y": 14,
-        "var": 2015,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14100|2&10350|4&3300|5&4500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6076,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 10,
         "y": 14,
-        "var": 2016,
+        "var": 2012,
         "lv": 70,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
@@ -443,13 +363,13 @@
         "warId": 6076,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2017,
+        "var": 2013,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -463,13 +383,13 @@
         "warId": 6076,
         "actorName": "枪兵将领",
         "actorId": 1041,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
+        "var": 2014,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -483,13 +403,13 @@
         "warId": 6076,
         "actorName": "游侠",
         "actorId": 1005,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 12,
-        "var": 2019,
+        "var": 2015,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -503,13 +423,13 @@
         "warId": 6076,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
+        "var": 2016,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -519,39 +439,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6076,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 12,
-        "var": 2021,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6076,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2022,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2022,
+        "var": 2017,
         "lv": 70,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
@@ -559,39 +459,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6076,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2023,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14100|2&10350|4&3300|5&4500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6076,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 21,
         "y": 13,
-        "var": 2024,
+        "var": 2018,
         "lv": 70,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
diff --git a/shared/resource/warJsons/6077.json b/shared/resource/warJsons/6077.json
index 3855ec027..1f456acdb 100644
--- a/shared/resource/warJsons/6077.json
+++ b/shared/resource/warJsons/6077.json
@@ -201,19 +201,19 @@
     },
     {
         "warId": 6077,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 3,
-        "y": 2,
+        "y": 3,
         "var": 2005,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -221,58 +221,18 @@
     },
     {
         "warId": 6077,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
+        "actorName": "文官将领",
+        "actorId": 1038,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
         "x": 3,
-        "y": 3,
+        "y": 5,
         "var": 2006,
         "lv": 70,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&18187|2&12562|4&4312|5&4125",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6077,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
-        "y": 4,
-        "var": 2007,
-        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14100|2&10350|4&3300|5&4500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6077,
-        "actorName": "文官将领",
-        "actorId": 1038,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 3,
-        "y": 5,
-        "var": 2008,
-        "lv": 70,
-        "hide": 1,
-        "initial_ai": 3,
         "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
@@ -283,53 +243,53 @@
         "warId": 6077,
         "actorName": "枪兵",
         "actorId": 1002,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 8,
+        "y": 12,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6077,
+        "actorName": "枪兵将领",
+        "actorId": 1041,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 9,
+        "y": 12,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6077,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 8,
-        "y": 12,
-        "var": 2009,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&15900|2&9000|4&4350|5&3900",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6077,
-        "actorName": "枪兵将领",
-        "actorId": 1041,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 1,
-        "x": 9,
-        "y": 12,
-        "var": 2010,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19875|2&11250|4&5437|5&4875",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6077,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 1,
-        "x": 8,
         "y": 13,
-        "var": 2011,
+        "var": 2009,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -343,13 +303,13 @@
         "warId": 6077,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 9,
         "y": 13,
-        "var": 2012,
+        "var": 2010,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -359,39 +319,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6077,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 8,
-        "y": 14,
-        "var": 2013,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6077,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2014,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 10,
         "dirction": 1,
         "x": 7,
         "y": 14,
-        "var": 2014,
+        "var": 2011,
         "lv": 70,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
@@ -399,39 +339,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6077,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 9,
-        "y": 14,
-        "var": 2015,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14100|2&10350|4&3300|5&4500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6077,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 10,
         "y": 14,
-        "var": 2016,
+        "var": 2012,
         "lv": 70,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
@@ -443,13 +363,13 @@
         "warId": 6077,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2017,
+        "var": 2013,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -463,13 +383,13 @@
         "warId": 6077,
         "actorName": "枪兵将领",
         "actorId": 1041,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
+        "var": 2014,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -483,13 +403,13 @@
         "warId": 6077,
         "actorName": "游侠",
         "actorId": 1005,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 12,
-        "var": 2019,
+        "var": 2015,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -503,13 +423,13 @@
         "warId": 6077,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
+        "var": 2016,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -519,39 +439,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6077,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 12,
-        "var": 2021,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6077,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2022,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2022,
+        "var": 2017,
         "lv": 70,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
@@ -559,39 +459,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6077,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2023,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14100|2&10350|4&3300|5&4500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6077,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 21,
         "y": 13,
-        "var": 2024,
+        "var": 2018,
         "lv": 70,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
diff --git a/shared/resource/warJsons/6078.json b/shared/resource/warJsons/6078.json
index deabaa808..db99e7a32 100644
--- a/shared/resource/warJsons/6078.json
+++ b/shared/resource/warJsons/6078.json
@@ -201,19 +201,19 @@
     },
     {
         "warId": 6078,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 3,
-        "y": 2,
+        "y": 3,
         "var": 2005,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -221,58 +221,18 @@
     },
     {
         "warId": 6078,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
+        "actorName": "文官将领",
+        "actorId": 1038,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
         "x": 3,
-        "y": 3,
+        "y": 5,
         "var": 2006,
         "lv": 70,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&18187|2&12562|4&4312|5&4125",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6078,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
-        "y": 4,
-        "var": 2007,
-        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&14100|2&10350|4&3300|5&4500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6078,
-        "actorName": "文官将领",
-        "actorId": 1038,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 3,
-        "y": 5,
-        "var": 2008,
-        "lv": 70,
-        "hide": 1,
-        "initial_ai": 3,
         "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
@@ -283,53 +243,53 @@
         "warId": 6078,
         "actorName": "枪兵",
         "actorId": 1002,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 8,
+        "y": 12,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6078,
+        "actorName": "枪兵将领",
+        "actorId": 1041,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 9,
+        "y": 12,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6078,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 8,
-        "y": 12,
-        "var": 2009,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&15900|2&9000|4&4350|5&3900",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6078,
-        "actorName": "枪兵将领",
-        "actorId": 1041,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 1,
-        "x": 9,
-        "y": 12,
-        "var": 2010,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19875|2&11250|4&5437|5&4875",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6078,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 1,
-        "x": 8,
         "y": 13,
-        "var": 2011,
+        "var": 2009,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -343,13 +303,13 @@
         "warId": 6078,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 9,
         "y": 13,
-        "var": 2012,
+        "var": 2010,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -359,39 +319,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6078,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 8,
-        "y": 14,
-        "var": 2013,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6078,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2014,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 10,
         "dirction": 1,
         "x": 7,
         "y": 14,
-        "var": 2014,
+        "var": 2011,
         "lv": 70,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
@@ -399,39 +339,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6078,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 9,
-        "y": 14,
-        "var": 2015,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14100|2&10350|4&3300|5&4500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6078,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 10,
         "y": 14,
-        "var": 2016,
+        "var": 2012,
         "lv": 70,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
@@ -443,13 +363,13 @@
         "warId": 6078,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2017,
+        "var": 2013,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -463,13 +383,13 @@
         "warId": 6078,
         "actorName": "枪兵将领",
         "actorId": 1041,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
+        "var": 2014,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -483,13 +403,13 @@
         "warId": 6078,
         "actorName": "游侠",
         "actorId": 1005,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 12,
-        "var": 2019,
+        "var": 2015,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -503,13 +423,13 @@
         "warId": 6078,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
+        "var": 2016,
         "lv": 70,
         "hide": 0,
         "initial_ai": 3,
@@ -519,39 +439,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6078,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 12,
-        "var": 2021,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14550|2&10050|4&3450|5&3300",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6078,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2022,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2022,
+        "var": 2017,
         "lv": 70,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
@@ -559,39 +459,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6078,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2023,
-        "lv": 70,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&14100|2&10350|4&3300|5&4500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6078,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 21,
         "y": 13,
-        "var": 2024,
+        "var": 2018,
         "lv": 70,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
diff --git a/shared/resource/warJsons/6079.json b/shared/resource/warJsons/6079.json
index 8ae2e0d2a..79db410ff 100644
--- a/shared/resource/warJsons/6079.json
+++ b/shared/resource/warJsons/6079.json
@@ -130,10 +130,10 @@
         "x": 5,
         "y": 2,
         "var": 2001,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21200|2&12000|4&5800|5&5200",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 5,
         "y": 3,
         "var": 2002,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26500|2&15000|4&7250|5&6500",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 4,
         "y": 2,
         "var": 2003,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19800|2&13000|4&4800|5&6400",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 3,
         "var": 2004,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&24750|2&16250|4&6000|5&8000",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,19 +201,19 @@
     },
     {
         "warId": 6079,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 3,
-        "y": 2,
+        "y": 3,
         "var": 2005,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19400|2&13400|4&4600|5&4400",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -221,59 +221,19 @@
     },
     {
         "warId": 6079,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
+        "actorName": "文官将领",
+        "actorId": 1038,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
         "x": 3,
-        "y": 3,
+        "y": 5,
         "var": 2006,
-        "lv": 72,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&24250|2&16750|4&5750|5&5500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6079,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
-        "y": 4,
-        "var": 2007,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&18800|2&13800|4&4400|5&6000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6079,
-        "actorName": "文官将领",
-        "actorId": 1038,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 3,
-        "y": 5,
-        "var": 2008,
-        "lv": 72,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&23500|2&17250|4&5500|5&7500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,57 +243,57 @@
         "warId": 6079,
         "actorName": "枪兵",
         "actorId": 1002,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 8,
+        "y": 12,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6079,
+        "actorName": "枪兵将领",
+        "actorId": 1041,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 9,
+        "y": 12,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6079,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 8,
-        "y": 12,
-        "var": 2009,
-        "lv": 72,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&21200|2&12000|4&5800|5&5200",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6079,
-        "actorName": "枪兵将领",
-        "actorId": 1041,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 1,
-        "x": 9,
-        "y": 12,
-        "var": 2010,
-        "lv": 72,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26500|2&15000|4&7250|5&6500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6079,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 1,
-        "x": 8,
         "y": 13,
-        "var": 2011,
-        "lv": 72,
+        "var": 2009,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19800|2&13000|4&4800|5&6400",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,37 +303,17 @@
         "warId": 6079,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 9,
         "y": 13,
-        "var": 2012,
-        "lv": 72,
+        "var": 2010,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&24750|2&16250|4&6000|5&8000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6079,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 8,
-        "y": 14,
-        "var": 2013,
-        "lv": 72,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19400|2&13400|4&4600|5&4400",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -383,37 +323,17 @@
         "warId": 6079,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2014,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 10,
         "dirction": 1,
         "x": 7,
         "y": 14,
-        "var": 2014,
-        "lv": 72,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&24250|2&16750|4&5750|5&5500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6079,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 9,
-        "y": 14,
-        "var": 2015,
-        "lv": 72,
+        "var": 2011,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&18800|2&13800|4&4400|5&6000",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6079,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 10,
         "y": 14,
-        "var": 2016,
-        "lv": 72,
-        "hide": 1,
+        "var": 2012,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&23500|2&17250|4&5500|5&7500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6079,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2017,
-        "lv": 72,
+        "var": 2013,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21200|2&12000|4&5800|5&5200",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6079,
         "actorName": "枪兵将领",
         "actorId": 1041,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 72,
+        "var": 2014,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26500|2&15000|4&7250|5&6500",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6079,
         "actorName": "游侠",
         "actorId": 1005,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 12,
-        "var": 2019,
-        "lv": 72,
+        "var": 2015,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19800|2&13000|4&4800|5&6400",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,37 +423,17 @@
         "warId": 6079,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 72,
+        "var": 2016,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&24750|2&16250|4&6000|5&8000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6079,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 12,
-        "var": 2021,
-        "lv": 72,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19400|2&13400|4&4600|5&4400",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -543,37 +443,17 @@
         "warId": 6079,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2022,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2022,
-        "lv": 72,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&24250|2&16750|4&5750|5&5500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6079,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2023,
-        "lv": 72,
+        "var": 2017,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&18800|2&13800|4&4400|5&6000",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6079,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 21,
         "y": 13,
-        "var": 2024,
-        "lv": 72,
-        "hide": 1,
+        "var": 2018,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&23500|2&17250|4&5500|5&7500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6080.json b/shared/resource/warJsons/6080.json
index d2fe50181..782706474 100644
--- a/shared/resource/warJsons/6080.json
+++ b/shared/resource/warJsons/6080.json
@@ -130,10 +130,10 @@
         "x": 5,
         "y": 2,
         "var": 2001,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21200|2&12000|4&5800|5&5200",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 5,
         "y": 3,
         "var": 2002,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26500|2&15000|4&7250|5&6500",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 4,
         "y": 2,
         "var": 2003,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19800|2&13000|4&4800|5&6400",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 3,
         "var": 2004,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&24750|2&16250|4&6000|5&8000",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,19 +201,19 @@
     },
     {
         "warId": 6080,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 3,
-        "y": 2,
+        "y": 3,
         "var": 2005,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19400|2&13400|4&4600|5&4400",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -221,59 +221,19 @@
     },
     {
         "warId": 6080,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
+        "actorName": "文官将领",
+        "actorId": 1038,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
         "x": 3,
-        "y": 3,
+        "y": 5,
         "var": 2006,
-        "lv": 72,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&24250|2&16750|4&5750|5&5500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6080,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
-        "y": 4,
-        "var": 2007,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&18800|2&13800|4&4400|5&6000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6080,
-        "actorName": "文官将领",
-        "actorId": 1038,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 3,
-        "y": 5,
-        "var": 2008,
-        "lv": 72,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&23500|2&17250|4&5500|5&7500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,57 +243,57 @@
         "warId": 6080,
         "actorName": "枪兵",
         "actorId": 1002,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 8,
+        "y": 12,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6080,
+        "actorName": "枪兵将领",
+        "actorId": 1041,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 9,
+        "y": 12,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6080,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 8,
-        "y": 12,
-        "var": 2009,
-        "lv": 72,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&21200|2&12000|4&5800|5&5200",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6080,
-        "actorName": "枪兵将领",
-        "actorId": 1041,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 1,
-        "x": 9,
-        "y": 12,
-        "var": 2010,
-        "lv": 72,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26500|2&15000|4&7250|5&6500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6080,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 1,
-        "x": 8,
         "y": 13,
-        "var": 2011,
-        "lv": 72,
+        "var": 2009,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19800|2&13000|4&4800|5&6400",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,37 +303,17 @@
         "warId": 6080,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 9,
         "y": 13,
-        "var": 2012,
-        "lv": 72,
+        "var": 2010,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&24750|2&16250|4&6000|5&8000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6080,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 8,
-        "y": 14,
-        "var": 2013,
-        "lv": 72,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19400|2&13400|4&4600|5&4400",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -383,37 +323,17 @@
         "warId": 6080,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2014,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 10,
         "dirction": 1,
         "x": 7,
         "y": 14,
-        "var": 2014,
-        "lv": 72,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&24250|2&16750|4&5750|5&5500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6080,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 9,
-        "y": 14,
-        "var": 2015,
-        "lv": 72,
+        "var": 2011,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&18800|2&13800|4&4400|5&6000",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6080,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 10,
         "y": 14,
-        "var": 2016,
-        "lv": 72,
-        "hide": 1,
+        "var": 2012,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&23500|2&17250|4&5500|5&7500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6080,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2017,
-        "lv": 72,
+        "var": 2013,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21200|2&12000|4&5800|5&5200",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6080,
         "actorName": "枪兵将领",
         "actorId": 1041,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 72,
+        "var": 2014,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26500|2&15000|4&7250|5&6500",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6080,
         "actorName": "游侠",
         "actorId": 1005,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 12,
-        "var": 2019,
-        "lv": 72,
+        "var": 2015,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19800|2&13000|4&4800|5&6400",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,37 +423,17 @@
         "warId": 6080,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 72,
+        "var": 2016,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&24750|2&16250|4&6000|5&8000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6080,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 12,
-        "var": 2021,
-        "lv": 72,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19400|2&13400|4&4600|5&4400",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -543,37 +443,17 @@
         "warId": 6080,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2022,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2022,
-        "lv": 72,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&24250|2&16750|4&5750|5&5500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6080,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2023,
-        "lv": 72,
+        "var": 2017,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&18800|2&13800|4&4400|5&6000",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6080,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 21,
         "y": 13,
-        "var": 2024,
-        "lv": 72,
-        "hide": 1,
+        "var": 2018,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&23500|2&17250|4&5500|5&7500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6081.json b/shared/resource/warJsons/6081.json
index 7e9061e76..b007017e4 100644
--- a/shared/resource/warJsons/6081.json
+++ b/shared/resource/warJsons/6081.json
@@ -130,10 +130,10 @@
         "x": 5,
         "y": 2,
         "var": 2001,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21200|2&12000|4&5800|5&5200",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 5,
         "y": 3,
         "var": 2002,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26500|2&15000|4&7250|5&6500",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 4,
         "y": 2,
         "var": 2003,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19800|2&13000|4&4800|5&6400",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 3,
         "var": 2004,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&24750|2&16250|4&6000|5&8000",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,19 +201,19 @@
     },
     {
         "warId": 6081,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 3,
-        "y": 2,
+        "y": 3,
         "var": 2005,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19400|2&13400|4&4600|5&4400",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -221,59 +221,19 @@
     },
     {
         "warId": 6081,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
+        "actorName": "文官将领",
+        "actorId": 1038,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
         "x": 3,
-        "y": 3,
+        "y": 5,
         "var": 2006,
-        "lv": 72,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&24250|2&16750|4&5750|5&5500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6081,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
-        "y": 4,
-        "var": 2007,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&18800|2&13800|4&4400|5&6000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6081,
-        "actorName": "文官将领",
-        "actorId": 1038,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 3,
-        "y": 5,
-        "var": 2008,
-        "lv": 72,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&23500|2&17250|4&5500|5&7500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,57 +243,57 @@
         "warId": 6081,
         "actorName": "枪兵",
         "actorId": 1002,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 8,
+        "y": 12,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6081,
+        "actorName": "枪兵将领",
+        "actorId": 1041,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 9,
+        "y": 12,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6081,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 8,
-        "y": 12,
-        "var": 2009,
-        "lv": 72,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&21200|2&12000|4&5800|5&5200",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6081,
-        "actorName": "枪兵将领",
-        "actorId": 1041,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 1,
-        "x": 9,
-        "y": 12,
-        "var": 2010,
-        "lv": 72,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26500|2&15000|4&7250|5&6500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6081,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 1,
-        "x": 8,
         "y": 13,
-        "var": 2011,
-        "lv": 72,
+        "var": 2009,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19800|2&13000|4&4800|5&6400",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,37 +303,17 @@
         "warId": 6081,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 9,
         "y": 13,
-        "var": 2012,
-        "lv": 72,
+        "var": 2010,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&24750|2&16250|4&6000|5&8000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6081,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 8,
-        "y": 14,
-        "var": 2013,
-        "lv": 72,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19400|2&13400|4&4600|5&4400",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -383,37 +323,17 @@
         "warId": 6081,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2014,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 10,
         "dirction": 1,
         "x": 7,
         "y": 14,
-        "var": 2014,
-        "lv": 72,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&24250|2&16750|4&5750|5&5500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6081,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 9,
-        "y": 14,
-        "var": 2015,
-        "lv": 72,
+        "var": 2011,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&18800|2&13800|4&4400|5&6000",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6081,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 10,
         "y": 14,
-        "var": 2016,
-        "lv": 72,
-        "hide": 1,
+        "var": 2012,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&23500|2&17250|4&5500|5&7500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6081,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2017,
-        "lv": 72,
+        "var": 2013,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21200|2&12000|4&5800|5&5200",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6081,
         "actorName": "枪兵将领",
         "actorId": 1041,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 72,
+        "var": 2014,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26500|2&15000|4&7250|5&6500",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6081,
         "actorName": "游侠",
         "actorId": 1005,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 12,
-        "var": 2019,
-        "lv": 72,
+        "var": 2015,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19800|2&13000|4&4800|5&6400",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,37 +423,17 @@
         "warId": 6081,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 72,
+        "var": 2016,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&24750|2&16250|4&6000|5&8000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6081,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 12,
-        "var": 2021,
-        "lv": 72,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19400|2&13400|4&4600|5&4400",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -543,37 +443,17 @@
         "warId": 6081,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2022,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2022,
-        "lv": 72,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&24250|2&16750|4&5750|5&5500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6081,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2023,
-        "lv": 72,
+        "var": 2017,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&18800|2&13800|4&4400|5&6000",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6081,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 21,
         "y": 13,
-        "var": 2024,
-        "lv": 72,
-        "hide": 1,
+        "var": 2018,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&23500|2&17250|4&5500|5&7500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6082.json b/shared/resource/warJsons/6082.json
index 5137150c1..72465fd53 100644
--- a/shared/resource/warJsons/6082.json
+++ b/shared/resource/warJsons/6082.json
@@ -130,10 +130,10 @@
         "x": 5,
         "y": 2,
         "var": 2001,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21200|2&12000|4&5800|5&5200",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 5,
         "y": 3,
         "var": 2002,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26500|2&15000|4&7250|5&6500",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 4,
         "y": 2,
         "var": 2003,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19800|2&13000|4&4800|5&6400",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 3,
         "var": 2004,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&24750|2&16250|4&6000|5&8000",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,19 +201,19 @@
     },
     {
         "warId": 6082,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 3,
-        "y": 2,
+        "y": 3,
         "var": 2005,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19400|2&13400|4&4600|5&4400",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -221,59 +221,19 @@
     },
     {
         "warId": 6082,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
+        "actorName": "文官将领",
+        "actorId": 1038,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
         "x": 3,
-        "y": 3,
+        "y": 5,
         "var": 2006,
-        "lv": 72,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&24250|2&16750|4&5750|5&5500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6082,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
-        "y": 4,
-        "var": 2007,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&18800|2&13800|4&4400|5&6000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6082,
-        "actorName": "文官将领",
-        "actorId": 1038,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 3,
-        "y": 5,
-        "var": 2008,
-        "lv": 72,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&23500|2&17250|4&5500|5&7500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,57 +243,57 @@
         "warId": 6082,
         "actorName": "枪兵",
         "actorId": 1002,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 8,
+        "y": 12,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6082,
+        "actorName": "枪兵将领",
+        "actorId": 1041,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 9,
+        "y": 12,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6082,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 8,
-        "y": 12,
-        "var": 2009,
-        "lv": 72,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&21200|2&12000|4&5800|5&5200",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6082,
-        "actorName": "枪兵将领",
-        "actorId": 1041,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 1,
-        "x": 9,
-        "y": 12,
-        "var": 2010,
-        "lv": 72,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26500|2&15000|4&7250|5&6500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6082,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 1,
-        "x": 8,
         "y": 13,
-        "var": 2011,
-        "lv": 72,
+        "var": 2009,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19800|2&13000|4&4800|5&6400",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,37 +303,17 @@
         "warId": 6082,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 9,
         "y": 13,
-        "var": 2012,
-        "lv": 72,
+        "var": 2010,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&24750|2&16250|4&6000|5&8000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6082,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 8,
-        "y": 14,
-        "var": 2013,
-        "lv": 72,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19400|2&13400|4&4600|5&4400",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -383,37 +323,17 @@
         "warId": 6082,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2014,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 10,
         "dirction": 1,
         "x": 7,
         "y": 14,
-        "var": 2014,
-        "lv": 72,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&24250|2&16750|4&5750|5&5500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6082,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 9,
-        "y": 14,
-        "var": 2015,
-        "lv": 72,
+        "var": 2011,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&18800|2&13800|4&4400|5&6000",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6082,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 10,
         "y": 14,
-        "var": 2016,
-        "lv": 72,
-        "hide": 1,
+        "var": 2012,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&23500|2&17250|4&5500|5&7500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6082,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2017,
-        "lv": 72,
+        "var": 2013,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21200|2&12000|4&5800|5&5200",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6082,
         "actorName": "枪兵将领",
         "actorId": 1041,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 72,
+        "var": 2014,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26500|2&15000|4&7250|5&6500",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6082,
         "actorName": "游侠",
         "actorId": 1005,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 12,
-        "var": 2019,
-        "lv": 72,
+        "var": 2015,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19800|2&13000|4&4800|5&6400",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,37 +423,17 @@
         "warId": 6082,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 72,
+        "var": 2016,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&24750|2&16250|4&6000|5&8000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6082,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 12,
-        "var": 2021,
-        "lv": 72,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19400|2&13400|4&4600|5&4400",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -543,37 +443,17 @@
         "warId": 6082,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2022,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2022,
-        "lv": 72,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&24250|2&16750|4&5750|5&5500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6082,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2023,
-        "lv": 72,
+        "var": 2017,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&18800|2&13800|4&4400|5&6000",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6082,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 21,
         "y": 13,
-        "var": 2024,
-        "lv": 72,
-        "hide": 1,
+        "var": 2018,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&23500|2&17250|4&5500|5&7500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6083.json b/shared/resource/warJsons/6083.json
index 3eb4fef1b..da447a507 100644
--- a/shared/resource/warJsons/6083.json
+++ b/shared/resource/warJsons/6083.json
@@ -130,10 +130,10 @@
         "x": 5,
         "y": 2,
         "var": 2001,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21200|2&12000|4&5800|5&5200",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 5,
         "y": 3,
         "var": 2002,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26500|2&15000|4&7250|5&6500",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 4,
         "y": 2,
         "var": 2003,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19800|2&13000|4&4800|5&6400",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 3,
         "var": 2004,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&24750|2&16250|4&6000|5&8000",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,19 +201,19 @@
     },
     {
         "warId": 6083,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 3,
-        "y": 2,
+        "y": 3,
         "var": 2005,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19400|2&13400|4&4600|5&4400",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -221,59 +221,19 @@
     },
     {
         "warId": 6083,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
+        "actorName": "文官将领",
+        "actorId": 1038,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
         "x": 3,
-        "y": 3,
+        "y": 5,
         "var": 2006,
-        "lv": 72,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&24250|2&16750|4&5750|5&5500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6083,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
-        "y": 4,
-        "var": 2007,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&18800|2&13800|4&4400|5&6000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6083,
-        "actorName": "文官将领",
-        "actorId": 1038,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 3,
-        "y": 5,
-        "var": 2008,
-        "lv": 72,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&23500|2&17250|4&5500|5&7500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,57 +243,57 @@
         "warId": 6083,
         "actorName": "枪兵",
         "actorId": 1002,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 8,
+        "y": 12,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6083,
+        "actorName": "枪兵将领",
+        "actorId": 1041,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 9,
+        "y": 12,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6083,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 8,
-        "y": 12,
-        "var": 2009,
-        "lv": 72,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&21200|2&12000|4&5800|5&5200",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6083,
-        "actorName": "枪兵将领",
-        "actorId": 1041,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 1,
-        "x": 9,
-        "y": 12,
-        "var": 2010,
-        "lv": 72,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26500|2&15000|4&7250|5&6500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6083,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 1,
-        "x": 8,
         "y": 13,
-        "var": 2011,
-        "lv": 72,
+        "var": 2009,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19800|2&13000|4&4800|5&6400",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,37 +303,17 @@
         "warId": 6083,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 9,
         "y": 13,
-        "var": 2012,
-        "lv": 72,
+        "var": 2010,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&24750|2&16250|4&6000|5&8000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6083,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 8,
-        "y": 14,
-        "var": 2013,
-        "lv": 72,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19400|2&13400|4&4600|5&4400",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -383,37 +323,17 @@
         "warId": 6083,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2014,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 10,
         "dirction": 1,
         "x": 7,
         "y": 14,
-        "var": 2014,
-        "lv": 72,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&24250|2&16750|4&5750|5&5500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6083,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 9,
-        "y": 14,
-        "var": 2015,
-        "lv": 72,
+        "var": 2011,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&18800|2&13800|4&4400|5&6000",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6083,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 10,
         "y": 14,
-        "var": 2016,
-        "lv": 72,
-        "hide": 1,
+        "var": 2012,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&23500|2&17250|4&5500|5&7500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6083,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2017,
-        "lv": 72,
+        "var": 2013,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21200|2&12000|4&5800|5&5200",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6083,
         "actorName": "枪兵将领",
         "actorId": 1041,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 72,
+        "var": 2014,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26500|2&15000|4&7250|5&6500",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6083,
         "actorName": "游侠",
         "actorId": 1005,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 12,
-        "var": 2019,
-        "lv": 72,
+        "var": 2015,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19800|2&13000|4&4800|5&6400",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,37 +423,17 @@
         "warId": 6083,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 72,
+        "var": 2016,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&24750|2&16250|4&6000|5&8000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6083,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 12,
-        "var": 2021,
-        "lv": 72,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19400|2&13400|4&4600|5&4400",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -543,37 +443,17 @@
         "warId": 6083,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2022,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2022,
-        "lv": 72,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&24250|2&16750|4&5750|5&5500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6083,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2023,
-        "lv": 72,
+        "var": 2017,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&18800|2&13800|4&4400|5&6000",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6083,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 21,
         "y": 13,
-        "var": 2024,
-        "lv": 72,
-        "hide": 1,
+        "var": 2018,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&23500|2&17250|4&5500|5&7500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6084.json b/shared/resource/warJsons/6084.json
index 98c18d5d8..467bb81d3 100644
--- a/shared/resource/warJsons/6084.json
+++ b/shared/resource/warJsons/6084.json
@@ -130,10 +130,10 @@
         "x": 5,
         "y": 2,
         "var": 2001,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21200|2&12000|4&5800|5&5200",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 5,
         "y": 3,
         "var": 2002,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26500|2&15000|4&7250|5&6500",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 4,
         "y": 2,
         "var": 2003,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19800|2&13000|4&4800|5&6400",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 3,
         "var": 2004,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&24750|2&16250|4&6000|5&8000",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,19 +201,19 @@
     },
     {
         "warId": 6084,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 3,
-        "y": 2,
+        "y": 3,
         "var": 2005,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19400|2&13400|4&4600|5&4400",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -221,59 +221,19 @@
     },
     {
         "warId": 6084,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
+        "actorName": "文官将领",
+        "actorId": 1038,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
         "x": 3,
-        "y": 3,
+        "y": 5,
         "var": 2006,
-        "lv": 72,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&24250|2&16750|4&5750|5&5500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6084,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
-        "y": 4,
-        "var": 2007,
-        "lv": 72,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&18800|2&13800|4&4400|5&6000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6084,
-        "actorName": "文官将领",
-        "actorId": 1038,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 3,
-        "y": 5,
-        "var": 2008,
-        "lv": 72,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&23500|2&17250|4&5500|5&7500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,57 +243,57 @@
         "warId": 6084,
         "actorName": "枪兵",
         "actorId": 1002,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 8,
+        "y": 12,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6084,
+        "actorName": "枪兵将领",
+        "actorId": 1041,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 9,
+        "y": 12,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6084,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 8,
-        "y": 12,
-        "var": 2009,
-        "lv": 72,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&21200|2&12000|4&5800|5&5200",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6084,
-        "actorName": "枪兵将领",
-        "actorId": 1041,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 1,
-        "x": 9,
-        "y": 12,
-        "var": 2010,
-        "lv": 72,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26500|2&15000|4&7250|5&6500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6084,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 1,
-        "x": 8,
         "y": 13,
-        "var": 2011,
-        "lv": 72,
+        "var": 2009,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19800|2&13000|4&4800|5&6400",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,37 +303,17 @@
         "warId": 6084,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 9,
         "y": 13,
-        "var": 2012,
-        "lv": 72,
+        "var": 2010,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&24750|2&16250|4&6000|5&8000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6084,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 8,
-        "y": 14,
-        "var": 2013,
-        "lv": 72,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19400|2&13400|4&4600|5&4400",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -383,37 +323,17 @@
         "warId": 6084,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2014,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 10,
         "dirction": 1,
         "x": 7,
         "y": 14,
-        "var": 2014,
-        "lv": 72,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&24250|2&16750|4&5750|5&5500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6084,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 9,
-        "y": 14,
-        "var": 2015,
-        "lv": 72,
+        "var": 2011,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&18800|2&13800|4&4400|5&6000",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6084,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 10,
         "y": 14,
-        "var": 2016,
-        "lv": 72,
-        "hide": 1,
+        "var": 2012,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&23500|2&17250|4&5500|5&7500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6084,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2017,
-        "lv": 72,
+        "var": 2013,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&21200|2&12000|4&5800|5&5200",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6084,
         "actorName": "枪兵将领",
         "actorId": 1041,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 72,
+        "var": 2014,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26500|2&15000|4&7250|5&6500",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6084,
         "actorName": "游侠",
         "actorId": 1005,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 12,
-        "var": 2019,
-        "lv": 72,
+        "var": 2015,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&19800|2&13000|4&4800|5&6400",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,37 +423,17 @@
         "warId": 6084,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 72,
+        "var": 2016,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&24750|2&16250|4&6000|5&8000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6084,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 12,
-        "var": 2021,
-        "lv": 72,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&19400|2&13400|4&4600|5&4400",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -543,37 +443,17 @@
         "warId": 6084,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2022,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2022,
-        "lv": 72,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&24250|2&16750|4&5750|5&5500",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6084,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2023,
-        "lv": 72,
+        "var": 2017,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&18800|2&13800|4&4400|5&6000",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6084,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 21,
         "y": 13,
-        "var": 2024,
-        "lv": 72,
-        "hide": 1,
+        "var": 2018,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&23500|2&17250|4&5500|5&7500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6085.json b/shared/resource/warJsons/6085.json
index c323ff0b7..9261f7708 100644
--- a/shared/resource/warJsons/6085.json
+++ b/shared/resource/warJsons/6085.json
@@ -130,10 +130,10 @@
         "x": 5,
         "y": 2,
         "var": 2001,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&28620|2&16200|4&7830|5&7020",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 5,
         "y": 3,
         "var": 2002,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35775|2&20250|4&9787|5&8775",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 4,
         "y": 2,
         "var": 2003,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26730|2&17550|4&6480|5&8640",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 3,
         "var": 2004,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33412|2&21937|4&8100|5&10800",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,19 +201,19 @@
     },
     {
         "warId": 6085,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 3,
-        "y": 2,
+        "y": 3,
         "var": 2005,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26190|2&18090|4&6210|5&5940",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -221,59 +221,19 @@
     },
     {
         "warId": 6085,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
+        "actorName": "文官将领",
+        "actorId": 1038,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
         "x": 3,
-        "y": 3,
+        "y": 5,
         "var": 2006,
-        "lv": 74,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&32737|2&22612|4&7762|5&7425",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6085,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
-        "y": 4,
-        "var": 2007,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25380|2&18630|4&5940|5&8100",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6085,
-        "actorName": "文官将领",
-        "actorId": 1038,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 3,
-        "y": 5,
-        "var": 2008,
-        "lv": 74,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&31725|2&23287|4&7425|5&10125",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,57 +243,57 @@
         "warId": 6085,
         "actorName": "枪兵",
         "actorId": 1002,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 8,
+        "y": 12,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6085,
+        "actorName": "枪兵将领",
+        "actorId": 1041,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 9,
+        "y": 12,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6085,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 8,
-        "y": 12,
-        "var": 2009,
-        "lv": 74,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&28620|2&16200|4&7830|5&7020",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6085,
-        "actorName": "枪兵将领",
-        "actorId": 1041,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 1,
-        "x": 9,
-        "y": 12,
-        "var": 2010,
-        "lv": 74,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&35775|2&20250|4&9787|5&8775",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6085,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 1,
-        "x": 8,
         "y": 13,
-        "var": 2011,
-        "lv": 74,
+        "var": 2009,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26730|2&17550|4&6480|5&8640",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,37 +303,17 @@
         "warId": 6085,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 9,
         "y": 13,
-        "var": 2012,
-        "lv": 74,
+        "var": 2010,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33412|2&21937|4&8100|5&10800",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6085,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 8,
-        "y": 14,
-        "var": 2013,
-        "lv": 74,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26190|2&18090|4&6210|5&5940",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -383,37 +323,17 @@
         "warId": 6085,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2014,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 10,
         "dirction": 1,
         "x": 7,
         "y": 14,
-        "var": 2014,
-        "lv": 74,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&32737|2&22612|4&7762|5&7425",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6085,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 9,
-        "y": 14,
-        "var": 2015,
-        "lv": 74,
+        "var": 2011,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25380|2&18630|4&5940|5&8100",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6085,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 10,
         "y": 14,
-        "var": 2016,
-        "lv": 74,
-        "hide": 1,
+        "var": 2012,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&31725|2&23287|4&7425|5&10125",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6085,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2017,
-        "lv": 74,
+        "var": 2013,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&28620|2&16200|4&7830|5&7020",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6085,
         "actorName": "枪兵将领",
         "actorId": 1041,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 74,
+        "var": 2014,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35775|2&20250|4&9787|5&8775",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6085,
         "actorName": "游侠",
         "actorId": 1005,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 12,
-        "var": 2019,
-        "lv": 74,
+        "var": 2015,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26730|2&17550|4&6480|5&8640",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,37 +423,17 @@
         "warId": 6085,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 74,
+        "var": 2016,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33412|2&21937|4&8100|5&10800",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6085,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 12,
-        "var": 2021,
-        "lv": 74,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26190|2&18090|4&6210|5&5940",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -543,37 +443,17 @@
         "warId": 6085,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2022,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2022,
-        "lv": 74,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&32737|2&22612|4&7762|5&7425",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6085,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2023,
-        "lv": 74,
+        "var": 2017,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25380|2&18630|4&5940|5&8100",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6085,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 21,
         "y": 13,
-        "var": 2024,
-        "lv": 74,
-        "hide": 1,
+        "var": 2018,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&31725|2&23287|4&7425|5&10125",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6086.json b/shared/resource/warJsons/6086.json
index 524c40831..56d78b8a2 100644
--- a/shared/resource/warJsons/6086.json
+++ b/shared/resource/warJsons/6086.json
@@ -130,10 +130,10 @@
         "x": 5,
         "y": 2,
         "var": 2001,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&28620|2&16200|4&7830|5&7020",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 5,
         "y": 3,
         "var": 2002,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35775|2&20250|4&9787|5&8775",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 4,
         "y": 2,
         "var": 2003,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26730|2&17550|4&6480|5&8640",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 3,
         "var": 2004,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33412|2&21937|4&8100|5&10800",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,19 +201,19 @@
     },
     {
         "warId": 6086,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 3,
-        "y": 2,
+        "y": 3,
         "var": 2005,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26190|2&18090|4&6210|5&5940",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -221,59 +221,19 @@
     },
     {
         "warId": 6086,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
+        "actorName": "文官将领",
+        "actorId": 1038,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
         "x": 3,
-        "y": 3,
+        "y": 5,
         "var": 2006,
-        "lv": 74,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&32737|2&22612|4&7762|5&7425",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6086,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
-        "y": 4,
-        "var": 2007,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25380|2&18630|4&5940|5&8100",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6086,
-        "actorName": "文官将领",
-        "actorId": 1038,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 3,
-        "y": 5,
-        "var": 2008,
-        "lv": 74,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&31725|2&23287|4&7425|5&10125",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,57 +243,57 @@
         "warId": 6086,
         "actorName": "枪兵",
         "actorId": 1002,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 8,
+        "y": 12,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6086,
+        "actorName": "枪兵将领",
+        "actorId": 1041,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 9,
+        "y": 12,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6086,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 8,
-        "y": 12,
-        "var": 2009,
-        "lv": 74,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&28620|2&16200|4&7830|5&7020",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6086,
-        "actorName": "枪兵将领",
-        "actorId": 1041,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 1,
-        "x": 9,
-        "y": 12,
-        "var": 2010,
-        "lv": 74,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&35775|2&20250|4&9787|5&8775",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6086,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 1,
-        "x": 8,
         "y": 13,
-        "var": 2011,
-        "lv": 74,
+        "var": 2009,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26730|2&17550|4&6480|5&8640",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,37 +303,17 @@
         "warId": 6086,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 9,
         "y": 13,
-        "var": 2012,
-        "lv": 74,
+        "var": 2010,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33412|2&21937|4&8100|5&10800",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6086,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 8,
-        "y": 14,
-        "var": 2013,
-        "lv": 74,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26190|2&18090|4&6210|5&5940",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -383,37 +323,17 @@
         "warId": 6086,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2014,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 10,
         "dirction": 1,
         "x": 7,
         "y": 14,
-        "var": 2014,
-        "lv": 74,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&32737|2&22612|4&7762|5&7425",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6086,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 9,
-        "y": 14,
-        "var": 2015,
-        "lv": 74,
+        "var": 2011,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25380|2&18630|4&5940|5&8100",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6086,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 10,
         "y": 14,
-        "var": 2016,
-        "lv": 74,
-        "hide": 1,
+        "var": 2012,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&31725|2&23287|4&7425|5&10125",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6086,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2017,
-        "lv": 74,
+        "var": 2013,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&28620|2&16200|4&7830|5&7020",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6086,
         "actorName": "枪兵将领",
         "actorId": 1041,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 74,
+        "var": 2014,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35775|2&20250|4&9787|5&8775",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6086,
         "actorName": "游侠",
         "actorId": 1005,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 12,
-        "var": 2019,
-        "lv": 74,
+        "var": 2015,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26730|2&17550|4&6480|5&8640",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,37 +423,17 @@
         "warId": 6086,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 74,
+        "var": 2016,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33412|2&21937|4&8100|5&10800",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6086,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 12,
-        "var": 2021,
-        "lv": 74,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26190|2&18090|4&6210|5&5940",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -543,37 +443,17 @@
         "warId": 6086,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2022,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2022,
-        "lv": 74,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&32737|2&22612|4&7762|5&7425",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6086,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2023,
-        "lv": 74,
+        "var": 2017,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25380|2&18630|4&5940|5&8100",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6086,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 21,
         "y": 13,
-        "var": 2024,
-        "lv": 74,
-        "hide": 1,
+        "var": 2018,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&31725|2&23287|4&7425|5&10125",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6087.json b/shared/resource/warJsons/6087.json
index 5ffeadfd4..3f3b87415 100644
--- a/shared/resource/warJsons/6087.json
+++ b/shared/resource/warJsons/6087.json
@@ -130,10 +130,10 @@
         "x": 5,
         "y": 2,
         "var": 2001,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&28620|2&16200|4&7830|5&7020",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 5,
         "y": 3,
         "var": 2002,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35775|2&20250|4&9787|5&8775",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 4,
         "y": 2,
         "var": 2003,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26730|2&17550|4&6480|5&8640",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 3,
         "var": 2004,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33412|2&21937|4&8100|5&10800",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,19 +201,19 @@
     },
     {
         "warId": 6087,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 3,
-        "y": 2,
+        "y": 3,
         "var": 2005,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26190|2&18090|4&6210|5&5940",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -221,59 +221,19 @@
     },
     {
         "warId": 6087,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
+        "actorName": "文官将领",
+        "actorId": 1038,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
         "x": 3,
-        "y": 3,
+        "y": 5,
         "var": 2006,
-        "lv": 74,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&32737|2&22612|4&7762|5&7425",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6087,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
-        "y": 4,
-        "var": 2007,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25380|2&18630|4&5940|5&8100",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6087,
-        "actorName": "文官将领",
-        "actorId": 1038,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 3,
-        "y": 5,
-        "var": 2008,
-        "lv": 74,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&31725|2&23287|4&7425|5&10125",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,57 +243,57 @@
         "warId": 6087,
         "actorName": "枪兵",
         "actorId": 1002,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 8,
+        "y": 12,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6087,
+        "actorName": "枪兵将领",
+        "actorId": 1041,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 9,
+        "y": 12,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6087,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 8,
-        "y": 12,
-        "var": 2009,
-        "lv": 74,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&28620|2&16200|4&7830|5&7020",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6087,
-        "actorName": "枪兵将领",
-        "actorId": 1041,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 1,
-        "x": 9,
-        "y": 12,
-        "var": 2010,
-        "lv": 74,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&35775|2&20250|4&9787|5&8775",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6087,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 1,
-        "x": 8,
         "y": 13,
-        "var": 2011,
-        "lv": 74,
+        "var": 2009,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26730|2&17550|4&6480|5&8640",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,37 +303,17 @@
         "warId": 6087,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 9,
         "y": 13,
-        "var": 2012,
-        "lv": 74,
+        "var": 2010,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33412|2&21937|4&8100|5&10800",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6087,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 8,
-        "y": 14,
-        "var": 2013,
-        "lv": 74,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26190|2&18090|4&6210|5&5940",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -383,37 +323,17 @@
         "warId": 6087,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2014,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 10,
         "dirction": 1,
         "x": 7,
         "y": 14,
-        "var": 2014,
-        "lv": 74,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&32737|2&22612|4&7762|5&7425",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6087,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 9,
-        "y": 14,
-        "var": 2015,
-        "lv": 74,
+        "var": 2011,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25380|2&18630|4&5940|5&8100",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6087,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 10,
         "y": 14,
-        "var": 2016,
-        "lv": 74,
-        "hide": 1,
+        "var": 2012,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&31725|2&23287|4&7425|5&10125",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6087,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2017,
-        "lv": 74,
+        "var": 2013,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&28620|2&16200|4&7830|5&7020",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6087,
         "actorName": "枪兵将领",
         "actorId": 1041,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 74,
+        "var": 2014,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35775|2&20250|4&9787|5&8775",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6087,
         "actorName": "游侠",
         "actorId": 1005,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 12,
-        "var": 2019,
-        "lv": 74,
+        "var": 2015,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26730|2&17550|4&6480|5&8640",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,37 +423,17 @@
         "warId": 6087,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 74,
+        "var": 2016,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33412|2&21937|4&8100|5&10800",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6087,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 12,
-        "var": 2021,
-        "lv": 74,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26190|2&18090|4&6210|5&5940",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -543,37 +443,17 @@
         "warId": 6087,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2022,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2022,
-        "lv": 74,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&32737|2&22612|4&7762|5&7425",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6087,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2023,
-        "lv": 74,
+        "var": 2017,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25380|2&18630|4&5940|5&8100",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6087,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 21,
         "y": 13,
-        "var": 2024,
-        "lv": 74,
-        "hide": 1,
+        "var": 2018,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&31725|2&23287|4&7425|5&10125",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6088.json b/shared/resource/warJsons/6088.json
index 4271e70fa..f55278b03 100644
--- a/shared/resource/warJsons/6088.json
+++ b/shared/resource/warJsons/6088.json
@@ -130,10 +130,10 @@
         "x": 5,
         "y": 2,
         "var": 2001,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&28620|2&16200|4&7830|5&7020",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 5,
         "y": 3,
         "var": 2002,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35775|2&20250|4&9787|5&8775",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 4,
         "y": 2,
         "var": 2003,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26730|2&17550|4&6480|5&8640",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 3,
         "var": 2004,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33412|2&21937|4&8100|5&10800",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,19 +201,19 @@
     },
     {
         "warId": 6088,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 3,
-        "y": 2,
+        "y": 3,
         "var": 2005,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26190|2&18090|4&6210|5&5940",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -221,59 +221,19 @@
     },
     {
         "warId": 6088,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
+        "actorName": "文官将领",
+        "actorId": 1038,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
         "x": 3,
-        "y": 3,
+        "y": 5,
         "var": 2006,
-        "lv": 74,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&32737|2&22612|4&7762|5&7425",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6088,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
-        "y": 4,
-        "var": 2007,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25380|2&18630|4&5940|5&8100",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6088,
-        "actorName": "文官将领",
-        "actorId": 1038,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 3,
-        "y": 5,
-        "var": 2008,
-        "lv": 74,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&31725|2&23287|4&7425|5&10125",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,57 +243,57 @@
         "warId": 6088,
         "actorName": "枪兵",
         "actorId": 1002,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 8,
+        "y": 12,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6088,
+        "actorName": "枪兵将领",
+        "actorId": 1041,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 9,
+        "y": 12,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6088,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 8,
-        "y": 12,
-        "var": 2009,
-        "lv": 74,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&28620|2&16200|4&7830|5&7020",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6088,
-        "actorName": "枪兵将领",
-        "actorId": 1041,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 1,
-        "x": 9,
-        "y": 12,
-        "var": 2010,
-        "lv": 74,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&35775|2&20250|4&9787|5&8775",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6088,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 1,
-        "x": 8,
         "y": 13,
-        "var": 2011,
-        "lv": 74,
+        "var": 2009,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26730|2&17550|4&6480|5&8640",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,37 +303,17 @@
         "warId": 6088,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 9,
         "y": 13,
-        "var": 2012,
-        "lv": 74,
+        "var": 2010,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33412|2&21937|4&8100|5&10800",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6088,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 8,
-        "y": 14,
-        "var": 2013,
-        "lv": 74,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26190|2&18090|4&6210|5&5940",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -383,37 +323,17 @@
         "warId": 6088,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2014,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 10,
         "dirction": 1,
         "x": 7,
         "y": 14,
-        "var": 2014,
-        "lv": 74,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&32737|2&22612|4&7762|5&7425",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6088,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 9,
-        "y": 14,
-        "var": 2015,
-        "lv": 74,
+        "var": 2011,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25380|2&18630|4&5940|5&8100",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6088,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 10,
         "y": 14,
-        "var": 2016,
-        "lv": 74,
-        "hide": 1,
+        "var": 2012,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&31725|2&23287|4&7425|5&10125",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6088,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2017,
-        "lv": 74,
+        "var": 2013,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&28620|2&16200|4&7830|5&7020",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6088,
         "actorName": "枪兵将领",
         "actorId": 1041,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 74,
+        "var": 2014,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35775|2&20250|4&9787|5&8775",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6088,
         "actorName": "游侠",
         "actorId": 1005,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 12,
-        "var": 2019,
-        "lv": 74,
+        "var": 2015,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26730|2&17550|4&6480|5&8640",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,37 +423,17 @@
         "warId": 6088,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 74,
+        "var": 2016,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33412|2&21937|4&8100|5&10800",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6088,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 12,
-        "var": 2021,
-        "lv": 74,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26190|2&18090|4&6210|5&5940",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -543,37 +443,17 @@
         "warId": 6088,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2022,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2022,
-        "lv": 74,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&32737|2&22612|4&7762|5&7425",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6088,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2023,
-        "lv": 74,
+        "var": 2017,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25380|2&18630|4&5940|5&8100",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6088,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 21,
         "y": 13,
-        "var": 2024,
-        "lv": 74,
-        "hide": 1,
+        "var": 2018,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&31725|2&23287|4&7425|5&10125",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6089.json b/shared/resource/warJsons/6089.json
index e82ef36a6..dc60badc7 100644
--- a/shared/resource/warJsons/6089.json
+++ b/shared/resource/warJsons/6089.json
@@ -130,10 +130,10 @@
         "x": 5,
         "y": 2,
         "var": 2001,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&28620|2&16200|4&7830|5&7020",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 5,
         "y": 3,
         "var": 2002,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35775|2&20250|4&9787|5&8775",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 4,
         "y": 2,
         "var": 2003,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26730|2&17550|4&6480|5&8640",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 3,
         "var": 2004,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33412|2&21937|4&8100|5&10800",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,19 +201,19 @@
     },
     {
         "warId": 6089,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 3,
-        "y": 2,
+        "y": 3,
         "var": 2005,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26190|2&18090|4&6210|5&5940",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -221,59 +221,19 @@
     },
     {
         "warId": 6089,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
+        "actorName": "文官将领",
+        "actorId": 1038,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
         "x": 3,
-        "y": 3,
+        "y": 5,
         "var": 2006,
-        "lv": 74,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&32737|2&22612|4&7762|5&7425",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6089,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
-        "y": 4,
-        "var": 2007,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25380|2&18630|4&5940|5&8100",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6089,
-        "actorName": "文官将领",
-        "actorId": 1038,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 3,
-        "y": 5,
-        "var": 2008,
-        "lv": 74,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&31725|2&23287|4&7425|5&10125",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,57 +243,57 @@
         "warId": 6089,
         "actorName": "枪兵",
         "actorId": 1002,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 8,
+        "y": 12,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6089,
+        "actorName": "枪兵将领",
+        "actorId": 1041,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 9,
+        "y": 12,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6089,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 8,
-        "y": 12,
-        "var": 2009,
-        "lv": 74,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&28620|2&16200|4&7830|5&7020",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6089,
-        "actorName": "枪兵将领",
-        "actorId": 1041,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 1,
-        "x": 9,
-        "y": 12,
-        "var": 2010,
-        "lv": 74,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&35775|2&20250|4&9787|5&8775",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6089,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 1,
-        "x": 8,
         "y": 13,
-        "var": 2011,
-        "lv": 74,
+        "var": 2009,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26730|2&17550|4&6480|5&8640",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,37 +303,17 @@
         "warId": 6089,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 9,
         "y": 13,
-        "var": 2012,
-        "lv": 74,
+        "var": 2010,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33412|2&21937|4&8100|5&10800",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6089,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 8,
-        "y": 14,
-        "var": 2013,
-        "lv": 74,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26190|2&18090|4&6210|5&5940",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -383,37 +323,17 @@
         "warId": 6089,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2014,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 10,
         "dirction": 1,
         "x": 7,
         "y": 14,
-        "var": 2014,
-        "lv": 74,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&32737|2&22612|4&7762|5&7425",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6089,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 9,
-        "y": 14,
-        "var": 2015,
-        "lv": 74,
+        "var": 2011,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25380|2&18630|4&5940|5&8100",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6089,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 10,
         "y": 14,
-        "var": 2016,
-        "lv": 74,
-        "hide": 1,
+        "var": 2012,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&31725|2&23287|4&7425|5&10125",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6089,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2017,
-        "lv": 74,
+        "var": 2013,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&28620|2&16200|4&7830|5&7020",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6089,
         "actorName": "枪兵将领",
         "actorId": 1041,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 74,
+        "var": 2014,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35775|2&20250|4&9787|5&8775",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6089,
         "actorName": "游侠",
         "actorId": 1005,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 12,
-        "var": 2019,
-        "lv": 74,
+        "var": 2015,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26730|2&17550|4&6480|5&8640",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,37 +423,17 @@
         "warId": 6089,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 74,
+        "var": 2016,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33412|2&21937|4&8100|5&10800",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6089,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 12,
-        "var": 2021,
-        "lv": 74,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26190|2&18090|4&6210|5&5940",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -543,37 +443,17 @@
         "warId": 6089,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2022,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2022,
-        "lv": 74,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&32737|2&22612|4&7762|5&7425",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6089,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2023,
-        "lv": 74,
+        "var": 2017,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25380|2&18630|4&5940|5&8100",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6089,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 21,
         "y": 13,
-        "var": 2024,
-        "lv": 74,
-        "hide": 1,
+        "var": 2018,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&31725|2&23287|4&7425|5&10125",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6090.json b/shared/resource/warJsons/6090.json
index 341a17e22..aab2bf52d 100644
--- a/shared/resource/warJsons/6090.json
+++ b/shared/resource/warJsons/6090.json
@@ -130,10 +130,10 @@
         "x": 5,
         "y": 2,
         "var": 2001,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&28620|2&16200|4&7830|5&7020",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 5,
         "y": 3,
         "var": 2002,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35775|2&20250|4&9787|5&8775",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 4,
         "y": 2,
         "var": 2003,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26730|2&17550|4&6480|5&8640",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 3,
         "var": 2004,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33412|2&21937|4&8100|5&10800",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,19 +201,19 @@
     },
     {
         "warId": 6090,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 3,
-        "y": 2,
+        "y": 3,
         "var": 2005,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26190|2&18090|4&6210|5&5940",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -221,59 +221,19 @@
     },
     {
         "warId": 6090,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
+        "actorName": "文官将领",
+        "actorId": 1038,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
         "x": 3,
-        "y": 3,
+        "y": 5,
         "var": 2006,
-        "lv": 74,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&32737|2&22612|4&7762|5&7425",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6090,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
-        "y": 4,
-        "var": 2007,
-        "lv": 74,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25380|2&18630|4&5940|5&8100",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6090,
-        "actorName": "文官将领",
-        "actorId": 1038,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 3,
-        "y": 5,
-        "var": 2008,
-        "lv": 74,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&31725|2&23287|4&7425|5&10125",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,57 +243,57 @@
         "warId": 6090,
         "actorName": "枪兵",
         "actorId": 1002,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 8,
+        "y": 12,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6090,
+        "actorName": "枪兵将领",
+        "actorId": 1041,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 9,
+        "y": 12,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6090,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 8,
-        "y": 12,
-        "var": 2009,
-        "lv": 74,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&28620|2&16200|4&7830|5&7020",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6090,
-        "actorName": "枪兵将领",
-        "actorId": 1041,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 1,
-        "x": 9,
-        "y": 12,
-        "var": 2010,
-        "lv": 74,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&35775|2&20250|4&9787|5&8775",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6090,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 1,
-        "x": 8,
         "y": 13,
-        "var": 2011,
-        "lv": 74,
+        "var": 2009,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26730|2&17550|4&6480|5&8640",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,37 +303,17 @@
         "warId": 6090,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 9,
         "y": 13,
-        "var": 2012,
-        "lv": 74,
+        "var": 2010,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33412|2&21937|4&8100|5&10800",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6090,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 8,
-        "y": 14,
-        "var": 2013,
-        "lv": 74,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26190|2&18090|4&6210|5&5940",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -383,37 +323,17 @@
         "warId": 6090,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2014,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 10,
         "dirction": 1,
         "x": 7,
         "y": 14,
-        "var": 2014,
-        "lv": 74,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&32737|2&22612|4&7762|5&7425",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6090,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 9,
-        "y": 14,
-        "var": 2015,
-        "lv": 74,
+        "var": 2011,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25380|2&18630|4&5940|5&8100",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6090,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 10,
         "y": 14,
-        "var": 2016,
-        "lv": 74,
-        "hide": 1,
+        "var": 2012,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&31725|2&23287|4&7425|5&10125",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6090,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2017,
-        "lv": 74,
+        "var": 2013,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&28620|2&16200|4&7830|5&7020",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6090,
         "actorName": "枪兵将领",
         "actorId": 1041,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 74,
+        "var": 2014,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35775|2&20250|4&9787|5&8775",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6090,
         "actorName": "游侠",
         "actorId": 1005,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 12,
-        "var": 2019,
-        "lv": 74,
+        "var": 2015,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&26730|2&17550|4&6480|5&8640",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,37 +423,17 @@
         "warId": 6090,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 74,
+        "var": 2016,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33412|2&21937|4&8100|5&10800",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6090,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 12,
-        "var": 2021,
-        "lv": 74,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26190|2&18090|4&6210|5&5940",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -543,37 +443,17 @@
         "warId": 6090,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2022,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2022,
-        "lv": 74,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&32737|2&22612|4&7762|5&7425",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6090,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2023,
-        "lv": 74,
+        "var": 2017,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&25380|2&18630|4&5940|5&8100",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6090,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 21,
         "y": 13,
-        "var": 2024,
-        "lv": 74,
-        "hide": 1,
+        "var": 2018,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&31725|2&23287|4&7425|5&10125",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6091.json b/shared/resource/warJsons/6091.json
index 51bdc4125..4af8b9cbb 100644
--- a/shared/resource/warJsons/6091.json
+++ b/shared/resource/warJsons/6091.json
@@ -130,10 +130,10 @@
         "x": 5,
         "y": 2,
         "var": 2001,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&38160|2&21600|4&10440|5&9360",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 5,
         "y": 3,
         "var": 2002,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47700|2&27000|4&13050|5&11700",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 4,
         "y": 2,
         "var": 2003,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35640|2&23400|4&8640|5&11520",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 3,
         "var": 2004,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&44550|2&29250|4&10800|5&14400",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,19 +201,19 @@
     },
     {
         "warId": 6091,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 3,
-        "y": 2,
+        "y": 3,
         "var": 2005,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&34920|2&24120|4&8280|5&7920",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -221,59 +221,19 @@
     },
     {
         "warId": 6091,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
+        "actorName": "文官将领",
+        "actorId": 1038,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
         "x": 3,
-        "y": 3,
+        "y": 5,
         "var": 2006,
-        "lv": 78,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&43650|2&30150|4&10350|5&9900",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6091,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
-        "y": 4,
-        "var": 2007,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33840|2&24840|4&7920|5&10800",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6091,
-        "actorName": "文官将领",
-        "actorId": 1038,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 3,
-        "y": 5,
-        "var": 2008,
-        "lv": 78,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&42300|2&31050|4&9900|5&13500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,57 +243,57 @@
         "warId": 6091,
         "actorName": "枪兵",
         "actorId": 1002,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 8,
+        "y": 12,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6091,
+        "actorName": "枪兵将领",
+        "actorId": 1041,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 9,
+        "y": 12,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6091,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 8,
-        "y": 12,
-        "var": 2009,
-        "lv": 78,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&38160|2&21600|4&10440|5&9360",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6091,
-        "actorName": "枪兵将领",
-        "actorId": 1041,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 1,
-        "x": 9,
-        "y": 12,
-        "var": 2010,
-        "lv": 78,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&47700|2&27000|4&13050|5&11700",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6091,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 1,
-        "x": 8,
         "y": 13,
-        "var": 2011,
-        "lv": 78,
+        "var": 2009,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35640|2&23400|4&8640|5&11520",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,37 +303,17 @@
         "warId": 6091,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 9,
         "y": 13,
-        "var": 2012,
-        "lv": 78,
+        "var": 2010,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&44550|2&29250|4&10800|5&14400",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6091,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 8,
-        "y": 14,
-        "var": 2013,
-        "lv": 78,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&34920|2&24120|4&8280|5&7920",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -383,37 +323,17 @@
         "warId": 6091,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2014,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 10,
         "dirction": 1,
         "x": 7,
         "y": 14,
-        "var": 2014,
-        "lv": 78,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&43650|2&30150|4&10350|5&9900",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6091,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 9,
-        "y": 14,
-        "var": 2015,
-        "lv": 78,
+        "var": 2011,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33840|2&24840|4&7920|5&10800",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6091,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 10,
         "y": 14,
-        "var": 2016,
-        "lv": 78,
-        "hide": 1,
+        "var": 2012,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&42300|2&31050|4&9900|5&13500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6091,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2017,
-        "lv": 78,
+        "var": 2013,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&38160|2&21600|4&10440|5&9360",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6091,
         "actorName": "枪兵将领",
         "actorId": 1041,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 78,
+        "var": 2014,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47700|2&27000|4&13050|5&11700",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6091,
         "actorName": "游侠",
         "actorId": 1005,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 12,
-        "var": 2019,
-        "lv": 78,
+        "var": 2015,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35640|2&23400|4&8640|5&11520",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,37 +423,17 @@
         "warId": 6091,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 78,
+        "var": 2016,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&44550|2&29250|4&10800|5&14400",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6091,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 12,
-        "var": 2021,
-        "lv": 78,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&34920|2&24120|4&8280|5&7920",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -543,37 +443,17 @@
         "warId": 6091,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2022,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2022,
-        "lv": 78,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&43650|2&30150|4&10350|5&9900",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6091,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2023,
-        "lv": 78,
+        "var": 2017,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33840|2&24840|4&7920|5&10800",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6091,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 21,
         "y": 13,
-        "var": 2024,
-        "lv": 78,
-        "hide": 1,
+        "var": 2018,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&42300|2&31050|4&9900|5&13500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6092.json b/shared/resource/warJsons/6092.json
index a63ac091a..f72ca46ba 100644
--- a/shared/resource/warJsons/6092.json
+++ b/shared/resource/warJsons/6092.json
@@ -130,10 +130,10 @@
         "x": 5,
         "y": 2,
         "var": 2001,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&38160|2&21600|4&10440|5&9360",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 5,
         "y": 3,
         "var": 2002,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47700|2&27000|4&13050|5&11700",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 4,
         "y": 2,
         "var": 2003,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35640|2&23400|4&8640|5&11520",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 3,
         "var": 2004,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&44550|2&29250|4&10800|5&14400",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,19 +201,19 @@
     },
     {
         "warId": 6092,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 3,
-        "y": 2,
+        "y": 3,
         "var": 2005,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&34920|2&24120|4&8280|5&7920",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -221,59 +221,19 @@
     },
     {
         "warId": 6092,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
+        "actorName": "文官将领",
+        "actorId": 1038,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
         "x": 3,
-        "y": 3,
+        "y": 5,
         "var": 2006,
-        "lv": 78,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&43650|2&30150|4&10350|5&9900",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6092,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
-        "y": 4,
-        "var": 2007,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33840|2&24840|4&7920|5&10800",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6092,
-        "actorName": "文官将领",
-        "actorId": 1038,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 3,
-        "y": 5,
-        "var": 2008,
-        "lv": 78,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&42300|2&31050|4&9900|5&13500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,57 +243,57 @@
         "warId": 6092,
         "actorName": "枪兵",
         "actorId": 1002,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 8,
+        "y": 12,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6092,
+        "actorName": "枪兵将领",
+        "actorId": 1041,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 9,
+        "y": 12,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6092,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 8,
-        "y": 12,
-        "var": 2009,
-        "lv": 78,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&38160|2&21600|4&10440|5&9360",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6092,
-        "actorName": "枪兵将领",
-        "actorId": 1041,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 1,
-        "x": 9,
-        "y": 12,
-        "var": 2010,
-        "lv": 78,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&47700|2&27000|4&13050|5&11700",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6092,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 1,
-        "x": 8,
         "y": 13,
-        "var": 2011,
-        "lv": 78,
+        "var": 2009,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35640|2&23400|4&8640|5&11520",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,37 +303,17 @@
         "warId": 6092,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 9,
         "y": 13,
-        "var": 2012,
-        "lv": 78,
+        "var": 2010,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&44550|2&29250|4&10800|5&14400",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6092,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 8,
-        "y": 14,
-        "var": 2013,
-        "lv": 78,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&34920|2&24120|4&8280|5&7920",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -383,37 +323,17 @@
         "warId": 6092,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2014,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 10,
         "dirction": 1,
         "x": 7,
         "y": 14,
-        "var": 2014,
-        "lv": 78,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&43650|2&30150|4&10350|5&9900",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6092,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 9,
-        "y": 14,
-        "var": 2015,
-        "lv": 78,
+        "var": 2011,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33840|2&24840|4&7920|5&10800",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6092,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 10,
         "y": 14,
-        "var": 2016,
-        "lv": 78,
-        "hide": 1,
+        "var": 2012,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&42300|2&31050|4&9900|5&13500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6092,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2017,
-        "lv": 78,
+        "var": 2013,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&38160|2&21600|4&10440|5&9360",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6092,
         "actorName": "枪兵将领",
         "actorId": 1041,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 78,
+        "var": 2014,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47700|2&27000|4&13050|5&11700",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6092,
         "actorName": "游侠",
         "actorId": 1005,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 12,
-        "var": 2019,
-        "lv": 78,
+        "var": 2015,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35640|2&23400|4&8640|5&11520",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,37 +423,17 @@
         "warId": 6092,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 78,
+        "var": 2016,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&44550|2&29250|4&10800|5&14400",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6092,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 12,
-        "var": 2021,
-        "lv": 78,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&34920|2&24120|4&8280|5&7920",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -543,37 +443,17 @@
         "warId": 6092,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2022,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2022,
-        "lv": 78,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&43650|2&30150|4&10350|5&9900",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6092,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2023,
-        "lv": 78,
+        "var": 2017,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33840|2&24840|4&7920|5&10800",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6092,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 21,
         "y": 13,
-        "var": 2024,
-        "lv": 78,
-        "hide": 1,
+        "var": 2018,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&42300|2&31050|4&9900|5&13500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6093.json b/shared/resource/warJsons/6093.json
index 651909070..44cc6b906 100644
--- a/shared/resource/warJsons/6093.json
+++ b/shared/resource/warJsons/6093.json
@@ -130,10 +130,10 @@
         "x": 5,
         "y": 2,
         "var": 2001,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&38160|2&21600|4&10440|5&9360",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 5,
         "y": 3,
         "var": 2002,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47700|2&27000|4&13050|5&11700",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 4,
         "y": 2,
         "var": 2003,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35640|2&23400|4&8640|5&11520",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 3,
         "var": 2004,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&44550|2&29250|4&10800|5&14400",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,19 +201,19 @@
     },
     {
         "warId": 6093,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 3,
-        "y": 2,
+        "y": 3,
         "var": 2005,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&34920|2&24120|4&8280|5&7920",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -221,59 +221,19 @@
     },
     {
         "warId": 6093,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
+        "actorName": "文官将领",
+        "actorId": 1038,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
         "x": 3,
-        "y": 3,
+        "y": 5,
         "var": 2006,
-        "lv": 78,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&43650|2&30150|4&10350|5&9900",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6093,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
-        "y": 4,
-        "var": 2007,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33840|2&24840|4&7920|5&10800",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6093,
-        "actorName": "文官将领",
-        "actorId": 1038,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 3,
-        "y": 5,
-        "var": 2008,
-        "lv": 78,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&42300|2&31050|4&9900|5&13500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,57 +243,57 @@
         "warId": 6093,
         "actorName": "枪兵",
         "actorId": 1002,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 8,
+        "y": 12,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6093,
+        "actorName": "枪兵将领",
+        "actorId": 1041,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 9,
+        "y": 12,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6093,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 8,
-        "y": 12,
-        "var": 2009,
-        "lv": 78,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&38160|2&21600|4&10440|5&9360",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6093,
-        "actorName": "枪兵将领",
-        "actorId": 1041,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 1,
-        "x": 9,
-        "y": 12,
-        "var": 2010,
-        "lv": 78,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&47700|2&27000|4&13050|5&11700",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6093,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 1,
-        "x": 8,
         "y": 13,
-        "var": 2011,
-        "lv": 78,
+        "var": 2009,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35640|2&23400|4&8640|5&11520",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,37 +303,17 @@
         "warId": 6093,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 9,
         "y": 13,
-        "var": 2012,
-        "lv": 78,
+        "var": 2010,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&44550|2&29250|4&10800|5&14400",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6093,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 8,
-        "y": 14,
-        "var": 2013,
-        "lv": 78,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&34920|2&24120|4&8280|5&7920",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -383,37 +323,17 @@
         "warId": 6093,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2014,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 10,
         "dirction": 1,
         "x": 7,
         "y": 14,
-        "var": 2014,
-        "lv": 78,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&43650|2&30150|4&10350|5&9900",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6093,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 9,
-        "y": 14,
-        "var": 2015,
-        "lv": 78,
+        "var": 2011,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33840|2&24840|4&7920|5&10800",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6093,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 10,
         "y": 14,
-        "var": 2016,
-        "lv": 78,
-        "hide": 1,
+        "var": 2012,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&42300|2&31050|4&9900|5&13500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6093,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2017,
-        "lv": 78,
+        "var": 2013,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&38160|2&21600|4&10440|5&9360",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6093,
         "actorName": "枪兵将领",
         "actorId": 1041,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 78,
+        "var": 2014,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47700|2&27000|4&13050|5&11700",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6093,
         "actorName": "游侠",
         "actorId": 1005,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 12,
-        "var": 2019,
-        "lv": 78,
+        "var": 2015,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35640|2&23400|4&8640|5&11520",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,37 +423,17 @@
         "warId": 6093,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 78,
+        "var": 2016,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&44550|2&29250|4&10800|5&14400",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6093,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 12,
-        "var": 2021,
-        "lv": 78,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&34920|2&24120|4&8280|5&7920",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -543,37 +443,17 @@
         "warId": 6093,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2022,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2022,
-        "lv": 78,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&43650|2&30150|4&10350|5&9900",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6093,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2023,
-        "lv": 78,
+        "var": 2017,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33840|2&24840|4&7920|5&10800",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6093,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 21,
         "y": 13,
-        "var": 2024,
-        "lv": 78,
-        "hide": 1,
+        "var": 2018,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&42300|2&31050|4&9900|5&13500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6094.json b/shared/resource/warJsons/6094.json
index adc2dd831..af6f8ee98 100644
--- a/shared/resource/warJsons/6094.json
+++ b/shared/resource/warJsons/6094.json
@@ -130,10 +130,10 @@
         "x": 5,
         "y": 2,
         "var": 2001,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&38160|2&21600|4&10440|5&9360",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 5,
         "y": 3,
         "var": 2002,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47700|2&27000|4&13050|5&11700",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 4,
         "y": 2,
         "var": 2003,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35640|2&23400|4&8640|5&11520",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 3,
         "var": 2004,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&44550|2&29250|4&10800|5&14400",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,19 +201,19 @@
     },
     {
         "warId": 6094,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 3,
-        "y": 2,
+        "y": 3,
         "var": 2005,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&34920|2&24120|4&8280|5&7920",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -221,59 +221,19 @@
     },
     {
         "warId": 6094,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
+        "actorName": "文官将领",
+        "actorId": 1038,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
         "x": 3,
-        "y": 3,
+        "y": 5,
         "var": 2006,
-        "lv": 78,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&43650|2&30150|4&10350|5&9900",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6094,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
-        "y": 4,
-        "var": 2007,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33840|2&24840|4&7920|5&10800",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6094,
-        "actorName": "文官将领",
-        "actorId": 1038,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 3,
-        "y": 5,
-        "var": 2008,
-        "lv": 78,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&42300|2&31050|4&9900|5&13500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,57 +243,57 @@
         "warId": 6094,
         "actorName": "枪兵",
         "actorId": 1002,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 8,
+        "y": 12,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6094,
+        "actorName": "枪兵将领",
+        "actorId": 1041,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 9,
+        "y": 12,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6094,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 8,
-        "y": 12,
-        "var": 2009,
-        "lv": 78,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&38160|2&21600|4&10440|5&9360",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6094,
-        "actorName": "枪兵将领",
-        "actorId": 1041,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 1,
-        "x": 9,
-        "y": 12,
-        "var": 2010,
-        "lv": 78,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&47700|2&27000|4&13050|5&11700",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6094,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 1,
-        "x": 8,
         "y": 13,
-        "var": 2011,
-        "lv": 78,
+        "var": 2009,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35640|2&23400|4&8640|5&11520",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,37 +303,17 @@
         "warId": 6094,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 9,
         "y": 13,
-        "var": 2012,
-        "lv": 78,
+        "var": 2010,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&44550|2&29250|4&10800|5&14400",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6094,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 8,
-        "y": 14,
-        "var": 2013,
-        "lv": 78,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&34920|2&24120|4&8280|5&7920",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -383,37 +323,17 @@
         "warId": 6094,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2014,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 10,
         "dirction": 1,
         "x": 7,
         "y": 14,
-        "var": 2014,
-        "lv": 78,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&43650|2&30150|4&10350|5&9900",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6094,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 9,
-        "y": 14,
-        "var": 2015,
-        "lv": 78,
+        "var": 2011,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33840|2&24840|4&7920|5&10800",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6094,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 10,
         "y": 14,
-        "var": 2016,
-        "lv": 78,
-        "hide": 1,
+        "var": 2012,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&42300|2&31050|4&9900|5&13500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6094,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2017,
-        "lv": 78,
+        "var": 2013,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&38160|2&21600|4&10440|5&9360",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6094,
         "actorName": "枪兵将领",
         "actorId": 1041,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 78,
+        "var": 2014,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47700|2&27000|4&13050|5&11700",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6094,
         "actorName": "游侠",
         "actorId": 1005,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 12,
-        "var": 2019,
-        "lv": 78,
+        "var": 2015,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35640|2&23400|4&8640|5&11520",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,37 +423,17 @@
         "warId": 6094,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 78,
+        "var": 2016,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&44550|2&29250|4&10800|5&14400",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6094,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 12,
-        "var": 2021,
-        "lv": 78,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&34920|2&24120|4&8280|5&7920",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -543,37 +443,17 @@
         "warId": 6094,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2022,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2022,
-        "lv": 78,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&43650|2&30150|4&10350|5&9900",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6094,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2023,
-        "lv": 78,
+        "var": 2017,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33840|2&24840|4&7920|5&10800",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6094,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 21,
         "y": 13,
-        "var": 2024,
-        "lv": 78,
-        "hide": 1,
+        "var": 2018,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&42300|2&31050|4&9900|5&13500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6095.json b/shared/resource/warJsons/6095.json
index 4633d8b4e..7d902fd64 100644
--- a/shared/resource/warJsons/6095.json
+++ b/shared/resource/warJsons/6095.json
@@ -130,10 +130,10 @@
         "x": 5,
         "y": 2,
         "var": 2001,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&38160|2&21600|4&10440|5&9360",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 5,
         "y": 3,
         "var": 2002,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47700|2&27000|4&13050|5&11700",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 4,
         "y": 2,
         "var": 2003,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35640|2&23400|4&8640|5&11520",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 3,
         "var": 2004,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&44550|2&29250|4&10800|5&14400",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,19 +201,19 @@
     },
     {
         "warId": 6095,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 3,
-        "y": 2,
+        "y": 3,
         "var": 2005,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&34920|2&24120|4&8280|5&7920",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -221,59 +221,19 @@
     },
     {
         "warId": 6095,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
+        "actorName": "文官将领",
+        "actorId": 1038,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
         "x": 3,
-        "y": 3,
+        "y": 5,
         "var": 2006,
-        "lv": 78,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&43650|2&30150|4&10350|5&9900",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6095,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
-        "y": 4,
-        "var": 2007,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33840|2&24840|4&7920|5&10800",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6095,
-        "actorName": "文官将领",
-        "actorId": 1038,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 3,
-        "y": 5,
-        "var": 2008,
-        "lv": 78,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&42300|2&31050|4&9900|5&13500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,57 +243,57 @@
         "warId": 6095,
         "actorName": "枪兵",
         "actorId": 1002,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 8,
+        "y": 12,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6095,
+        "actorName": "枪兵将领",
+        "actorId": 1041,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 9,
+        "y": 12,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6095,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 8,
-        "y": 12,
-        "var": 2009,
-        "lv": 78,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&38160|2&21600|4&10440|5&9360",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6095,
-        "actorName": "枪兵将领",
-        "actorId": 1041,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 1,
-        "x": 9,
-        "y": 12,
-        "var": 2010,
-        "lv": 78,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&47700|2&27000|4&13050|5&11700",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6095,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 1,
-        "x": 8,
         "y": 13,
-        "var": 2011,
-        "lv": 78,
+        "var": 2009,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35640|2&23400|4&8640|5&11520",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,37 +303,17 @@
         "warId": 6095,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 9,
         "y": 13,
-        "var": 2012,
-        "lv": 78,
+        "var": 2010,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&44550|2&29250|4&10800|5&14400",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6095,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 8,
-        "y": 14,
-        "var": 2013,
-        "lv": 78,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&34920|2&24120|4&8280|5&7920",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -383,37 +323,17 @@
         "warId": 6095,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2014,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 10,
         "dirction": 1,
         "x": 7,
         "y": 14,
-        "var": 2014,
-        "lv": 78,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&43650|2&30150|4&10350|5&9900",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6095,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 9,
-        "y": 14,
-        "var": 2015,
-        "lv": 78,
+        "var": 2011,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33840|2&24840|4&7920|5&10800",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6095,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 10,
         "y": 14,
-        "var": 2016,
-        "lv": 78,
-        "hide": 1,
+        "var": 2012,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&42300|2&31050|4&9900|5&13500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6095,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2017,
-        "lv": 78,
+        "var": 2013,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&38160|2&21600|4&10440|5&9360",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6095,
         "actorName": "枪兵将领",
         "actorId": 1041,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 78,
+        "var": 2014,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47700|2&27000|4&13050|5&11700",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6095,
         "actorName": "游侠",
         "actorId": 1005,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 12,
-        "var": 2019,
-        "lv": 78,
+        "var": 2015,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35640|2&23400|4&8640|5&11520",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,37 +423,17 @@
         "warId": 6095,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 78,
+        "var": 2016,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&44550|2&29250|4&10800|5&14400",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6095,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 12,
-        "var": 2021,
-        "lv": 78,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&34920|2&24120|4&8280|5&7920",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -543,37 +443,17 @@
         "warId": 6095,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2022,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2022,
-        "lv": 78,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&43650|2&30150|4&10350|5&9900",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6095,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2023,
-        "lv": 78,
+        "var": 2017,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33840|2&24840|4&7920|5&10800",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6095,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 21,
         "y": 13,
-        "var": 2024,
-        "lv": 78,
-        "hide": 1,
+        "var": 2018,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&42300|2&31050|4&9900|5&13500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6096.json b/shared/resource/warJsons/6096.json
index d797e5c0c..af852bfa1 100644
--- a/shared/resource/warJsons/6096.json
+++ b/shared/resource/warJsons/6096.json
@@ -130,10 +130,10 @@
         "x": 5,
         "y": 2,
         "var": 2001,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&38160|2&21600|4&10440|5&9360",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 5,
         "y": 3,
         "var": 2002,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47700|2&27000|4&13050|5&11700",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 4,
         "y": 2,
         "var": 2003,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35640|2&23400|4&8640|5&11520",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,10 +190,10 @@
         "x": 4,
         "y": 3,
         "var": 2004,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&44550|2&29250|4&10800|5&14400",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -201,19 +201,19 @@
     },
     {
         "warId": 6096,
-        "actorName": "弓兵",
-        "actorId": 1004,
+        "actorName": "弓兵将领",
+        "actorId": 1056,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 3,
-        "y": 2,
+        "y": 3,
         "var": 2005,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&34920|2&24120|4&8280|5&7920",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -221,59 +221,19 @@
     },
     {
         "warId": 6096,
-        "actorName": "弓兵将领",
-        "actorId": 1056,
+        "actorName": "文官将领",
+        "actorId": 1038,
         "dataId": 2006,
         "relation": 2,
         "outIndex": 5,
         "dirction": 2,
         "x": 3,
-        "y": 3,
+        "y": 5,
         "var": 2006,
-        "lv": 78,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&43650|2&30150|4&10350|5&9900",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6096,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 3,
-        "y": 4,
-        "var": 2007,
-        "lv": 78,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33840|2&24840|4&7920|5&10800",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6096,
-        "actorName": "文官将领",
-        "actorId": 1038,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 2,
-        "x": 3,
-        "y": 5,
-        "var": 2008,
-        "lv": 78,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&42300|2&31050|4&9900|5&13500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,57 +243,57 @@
         "warId": 6096,
         "actorName": "枪兵",
         "actorId": 1002,
+        "dataId": 2007,
+        "relation": 2,
+        "outIndex": 6,
+        "dirction": 1,
+        "x": 8,
+        "y": 12,
+        "var": 2007,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6096,
+        "actorName": "枪兵将领",
+        "actorId": 1041,
+        "dataId": 2008,
+        "relation": 2,
+        "outIndex": 7,
+        "dirction": 1,
+        "x": 9,
+        "y": 12,
+        "var": 2008,
+        "lv": 70,
+        "hide": 0,
+        "initial_ai": 3,
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
+        "skill": 0,
+        "seid": 0,
+        "star": 2,
+        "spine": 0
+    },
+    {
+        "warId": 6096,
+        "actorName": "游侠",
+        "actorId": 1005,
         "dataId": 2009,
         "relation": 2,
         "outIndex": 8,
         "dirction": 1,
         "x": 8,
-        "y": 12,
-        "var": 2009,
-        "lv": 78,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&38160|2&21600|4&10440|5&9360",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6096,
-        "actorName": "枪兵将领",
-        "actorId": 1041,
-        "dataId": 2010,
-        "relation": 2,
-        "outIndex": 9,
-        "dirction": 1,
-        "x": 9,
-        "y": 12,
-        "var": 2010,
-        "lv": 78,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&47700|2&27000|4&13050|5&11700",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6096,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2011,
-        "relation": 2,
-        "outIndex": 10,
-        "dirction": 1,
-        "x": 8,
         "y": 13,
-        "var": 2011,
-        "lv": 78,
+        "var": 2009,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35640|2&23400|4&8640|5&11520",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,37 +303,17 @@
         "warId": 6096,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 9,
         "y": 13,
-        "var": 2012,
-        "lv": 78,
+        "var": 2010,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&44550|2&29250|4&10800|5&14400",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6096,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 8,
-        "y": 14,
-        "var": 2013,
-        "lv": 78,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&34920|2&24120|4&8280|5&7920",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -383,37 +323,17 @@
         "warId": 6096,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2014,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 10,
         "dirction": 1,
         "x": 7,
         "y": 14,
-        "var": 2014,
-        "lv": 78,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&43650|2&30150|4&10350|5&9900",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6096,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 9,
-        "y": 14,
-        "var": 2015,
-        "lv": 78,
+        "var": 2011,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33840|2&24840|4&7920|5&10800",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6096,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 10,
         "y": 14,
-        "var": 2016,
-        "lv": 78,
-        "hide": 1,
+        "var": 2012,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&42300|2&31050|4&9900|5&13500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6096,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2017,
-        "lv": 78,
+        "var": 2013,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&38160|2&21600|4&10440|5&9360",
+        "attribute": "1&15900|2&9000|4&4350|5&3900",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6096,
         "actorName": "枪兵将领",
         "actorId": 1041,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 78,
+        "var": 2014,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47700|2&27000|4&13050|5&11700",
+        "attribute": "1&19875|2&11250|4&5437|5&4875",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6096,
         "actorName": "游侠",
         "actorId": 1005,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 12,
-        "var": 2019,
-        "lv": 78,
+        "var": 2015,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&35640|2&23400|4&8640|5&11520",
+        "attribute": "1&14850|2&9750|4&3600|5&4800",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,37 +423,17 @@
         "warId": 6096,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 78,
+        "var": 2016,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&44550|2&29250|4&10800|5&14400",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6096,
-        "actorName": "弓兵",
-        "actorId": 1004,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 12,
-        "var": 2021,
-        "lv": 78,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&34920|2&24120|4&8280|5&7920",
+        "attribute": "1&18562|2&12187|4&4500|5&6000",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -543,37 +443,17 @@
         "warId": 6096,
         "actorName": "弓兵将领",
         "actorId": 1056,
-        "dataId": 2022,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2022,
-        "lv": 78,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&43650|2&30150|4&10350|5&9900",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6096,
-        "actorName": "策士",
-        "actorId": 1006,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2023,
-        "lv": 78,
+        "var": 2017,
+        "lv": 70,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&33840|2&24840|4&7920|5&10800",
+        "attribute": "1&18187|2&12562|4&4312|5&4125",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6096,
         "actorName": "文官将领",
         "actorId": 1038,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 21,
         "y": 13,
-        "var": 2024,
-        "lv": 78,
-        "hide": 1,
+        "var": 2018,
+        "lv": 70,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&42300|2&31050|4&9900|5&13500",
+        "attribute": "1&17625|2&12937|4&4125|5&5625",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6097.json b/shared/resource/warJsons/6097.json
index f285cab0e..5d14f37fd 100644
--- a/shared/resource/warJsons/6097.json
+++ b/shared/resource/warJsons/6097.json
@@ -201,58 +201,18 @@
     },
     {
         "warId": 6097,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "黄巾力士",
+        "actorId": 1015,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 6,
-        "y": 12,
+        "y": 11,
         "var": 2005,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&27720|2&18200|4&6720|5&8960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6097,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 13,
-        "var": 2006,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26880|2&17920|4&5880|5&9520",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6097,
-        "actorName": "黄巾力士",
-        "actorId": 1015,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 6,
-        "y": 11,
-        "var": 2007,
-        "lv": 90,
-        "hide": 1,
-        "initial_ai": 3,
         "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
@@ -263,15 +223,15 @@
         "warId": 6097,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2008,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 7,
+        "outIndex": 5,
         "dirction": 2,
         "x": 7,
         "y": 11,
-        "var": 2008,
+        "var": 2006,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
@@ -283,13 +243,13 @@
         "warId": 6097,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 13,
         "y": 4,
-        "var": 2009,
+        "var": 2007,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -303,13 +263,13 @@
         "warId": 6097,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 13,
         "y": 3,
-        "var": 2010,
+        "var": 2008,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -323,13 +283,13 @@
         "warId": 6097,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 14,
         "y": 4,
-        "var": 2011,
+        "var": 2009,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -343,13 +303,13 @@
         "warId": 6097,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 14,
         "y": 3,
-        "var": 2012,
+        "var": 2010,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -359,59 +319,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6097,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 15,
-        "y": 4,
-        "var": 2013,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&27720|2&18200|4&6720|5&8960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6097,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 1,
-        "x": 15,
-        "y": 3,
-        "var": 2014,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26880|2&17920|4&5880|5&9520",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6097,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2015,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 14,
+        "outIndex": 10,
         "dirction": 1,
         "x": 16,
         "y": 4,
-        "var": 2015,
+        "var": 2011,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
@@ -423,15 +343,15 @@
         "warId": 6097,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 16,
         "y": 3,
-        "var": 2016,
+        "var": 2012,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
@@ -443,13 +363,13 @@
         "warId": 6097,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 10,
-        "var": 2017,
+        "var": 2013,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -463,13 +383,13 @@
         "warId": 6097,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
+        "var": 2014,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -483,13 +403,13 @@
         "warId": 6097,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 10,
-        "var": 2019,
+        "var": 2015,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -503,13 +423,13 @@
         "warId": 6097,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
+        "var": 2016,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -519,59 +439,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6097,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 10,
-        "var": 2021,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&27720|2&18200|4&6720|5&8960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6097,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2022,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26880|2&17920|4&5880|5&9520",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6097,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2023,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2023,
+        "var": 2017,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
@@ -583,15 +463,15 @@
         "warId": 6097,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2024,
+        "var": 2018,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
diff --git a/shared/resource/warJsons/6098.json b/shared/resource/warJsons/6098.json
index 816922aac..bf9825998 100644
--- a/shared/resource/warJsons/6098.json
+++ b/shared/resource/warJsons/6098.json
@@ -201,58 +201,18 @@
     },
     {
         "warId": 6098,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "黄巾力士",
+        "actorId": 1015,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 6,
-        "y": 12,
+        "y": 11,
         "var": 2005,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&27720|2&18200|4&6720|5&8960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6098,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 13,
-        "var": 2006,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26880|2&17920|4&5880|5&9520",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6098,
-        "actorName": "黄巾力士",
-        "actorId": 1015,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 6,
-        "y": 11,
-        "var": 2007,
-        "lv": 90,
-        "hide": 1,
-        "initial_ai": 3,
         "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
@@ -263,15 +223,15 @@
         "warId": 6098,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2008,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 7,
+        "outIndex": 5,
         "dirction": 2,
         "x": 7,
         "y": 11,
-        "var": 2008,
+        "var": 2006,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
@@ -283,13 +243,13 @@
         "warId": 6098,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 13,
         "y": 4,
-        "var": 2009,
+        "var": 2007,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -303,13 +263,13 @@
         "warId": 6098,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 13,
         "y": 3,
-        "var": 2010,
+        "var": 2008,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -323,13 +283,13 @@
         "warId": 6098,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 14,
         "y": 4,
-        "var": 2011,
+        "var": 2009,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -343,13 +303,13 @@
         "warId": 6098,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 14,
         "y": 3,
-        "var": 2012,
+        "var": 2010,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -359,59 +319,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6098,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 15,
-        "y": 4,
-        "var": 2013,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&27720|2&18200|4&6720|5&8960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6098,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 1,
-        "x": 15,
-        "y": 3,
-        "var": 2014,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26880|2&17920|4&5880|5&9520",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6098,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2015,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 14,
+        "outIndex": 10,
         "dirction": 1,
         "x": 16,
         "y": 4,
-        "var": 2015,
+        "var": 2011,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
@@ -423,15 +343,15 @@
         "warId": 6098,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 16,
         "y": 3,
-        "var": 2016,
+        "var": 2012,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
@@ -443,13 +363,13 @@
         "warId": 6098,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 10,
-        "var": 2017,
+        "var": 2013,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -463,13 +383,13 @@
         "warId": 6098,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
+        "var": 2014,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -483,13 +403,13 @@
         "warId": 6098,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 10,
-        "var": 2019,
+        "var": 2015,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -503,13 +423,13 @@
         "warId": 6098,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
+        "var": 2016,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -519,59 +439,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6098,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 10,
-        "var": 2021,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&27720|2&18200|4&6720|5&8960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6098,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2022,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26880|2&17920|4&5880|5&9520",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6098,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2023,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2023,
+        "var": 2017,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
@@ -583,15 +463,15 @@
         "warId": 6098,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2024,
+        "var": 2018,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
diff --git a/shared/resource/warJsons/6099.json b/shared/resource/warJsons/6099.json
index 865733920..ed1977982 100644
--- a/shared/resource/warJsons/6099.json
+++ b/shared/resource/warJsons/6099.json
@@ -201,58 +201,18 @@
     },
     {
         "warId": 6099,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "黄巾力士",
+        "actorId": 1015,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 6,
-        "y": 12,
+        "y": 11,
         "var": 2005,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&27720|2&18200|4&6720|5&8960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6099,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 13,
-        "var": 2006,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26880|2&17920|4&5880|5&9520",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6099,
-        "actorName": "黄巾力士",
-        "actorId": 1015,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 6,
-        "y": 11,
-        "var": 2007,
-        "lv": 90,
-        "hide": 1,
-        "initial_ai": 3,
         "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
@@ -263,15 +223,15 @@
         "warId": 6099,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2008,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 7,
+        "outIndex": 5,
         "dirction": 2,
         "x": 7,
         "y": 11,
-        "var": 2008,
+        "var": 2006,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
@@ -283,13 +243,13 @@
         "warId": 6099,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 13,
         "y": 4,
-        "var": 2009,
+        "var": 2007,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -303,13 +263,13 @@
         "warId": 6099,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 13,
         "y": 3,
-        "var": 2010,
+        "var": 2008,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -323,13 +283,13 @@
         "warId": 6099,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 14,
         "y": 4,
-        "var": 2011,
+        "var": 2009,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -343,13 +303,13 @@
         "warId": 6099,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 14,
         "y": 3,
-        "var": 2012,
+        "var": 2010,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -359,59 +319,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6099,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 15,
-        "y": 4,
-        "var": 2013,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&27720|2&18200|4&6720|5&8960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6099,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 1,
-        "x": 15,
-        "y": 3,
-        "var": 2014,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26880|2&17920|4&5880|5&9520",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6099,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2015,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 14,
+        "outIndex": 10,
         "dirction": 1,
         "x": 16,
         "y": 4,
-        "var": 2015,
+        "var": 2011,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
@@ -423,15 +343,15 @@
         "warId": 6099,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 16,
         "y": 3,
-        "var": 2016,
+        "var": 2012,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
@@ -443,13 +363,13 @@
         "warId": 6099,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 10,
-        "var": 2017,
+        "var": 2013,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -463,13 +383,13 @@
         "warId": 6099,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
+        "var": 2014,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -483,13 +403,13 @@
         "warId": 6099,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 10,
-        "var": 2019,
+        "var": 2015,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -503,13 +423,13 @@
         "warId": 6099,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
+        "var": 2016,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -519,59 +439,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6099,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 10,
-        "var": 2021,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&27720|2&18200|4&6720|5&8960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6099,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2022,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26880|2&17920|4&5880|5&9520",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6099,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2023,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2023,
+        "var": 2017,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
@@ -583,15 +463,15 @@
         "warId": 6099,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2024,
+        "var": 2018,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
diff --git a/shared/resource/warJsons/6100.json b/shared/resource/warJsons/6100.json
index 7b9b62bd2..0f05ad54d 100644
--- a/shared/resource/warJsons/6100.json
+++ b/shared/resource/warJsons/6100.json
@@ -201,58 +201,18 @@
     },
     {
         "warId": 6100,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "黄巾力士",
+        "actorId": 1015,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 6,
-        "y": 12,
+        "y": 11,
         "var": 2005,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&27720|2&18200|4&6720|5&8960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6100,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 13,
-        "var": 2006,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26880|2&17920|4&5880|5&9520",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6100,
-        "actorName": "黄巾力士",
-        "actorId": 1015,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 6,
-        "y": 11,
-        "var": 2007,
-        "lv": 90,
-        "hide": 1,
-        "initial_ai": 3,
         "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
@@ -263,15 +223,15 @@
         "warId": 6100,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2008,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 7,
+        "outIndex": 5,
         "dirction": 2,
         "x": 7,
         "y": 11,
-        "var": 2008,
+        "var": 2006,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
@@ -283,13 +243,13 @@
         "warId": 6100,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 13,
         "y": 4,
-        "var": 2009,
+        "var": 2007,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -303,13 +263,13 @@
         "warId": 6100,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 13,
         "y": 3,
-        "var": 2010,
+        "var": 2008,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -323,13 +283,13 @@
         "warId": 6100,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 14,
         "y": 4,
-        "var": 2011,
+        "var": 2009,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -343,13 +303,13 @@
         "warId": 6100,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 14,
         "y": 3,
-        "var": 2012,
+        "var": 2010,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -359,59 +319,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6100,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 15,
-        "y": 4,
-        "var": 2013,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&27720|2&18200|4&6720|5&8960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6100,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 1,
-        "x": 15,
-        "y": 3,
-        "var": 2014,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26880|2&17920|4&5880|5&9520",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6100,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2015,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 14,
+        "outIndex": 10,
         "dirction": 1,
         "x": 16,
         "y": 4,
-        "var": 2015,
+        "var": 2011,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
@@ -423,15 +343,15 @@
         "warId": 6100,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 16,
         "y": 3,
-        "var": 2016,
+        "var": 2012,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
@@ -443,13 +363,13 @@
         "warId": 6100,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 10,
-        "var": 2017,
+        "var": 2013,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -463,13 +383,13 @@
         "warId": 6100,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
+        "var": 2014,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -483,13 +403,13 @@
         "warId": 6100,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 10,
-        "var": 2019,
+        "var": 2015,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -503,13 +423,13 @@
         "warId": 6100,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
+        "var": 2016,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -519,59 +439,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6100,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 10,
-        "var": 2021,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&27720|2&18200|4&6720|5&8960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6100,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2022,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26880|2&17920|4&5880|5&9520",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6100,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2023,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2023,
+        "var": 2017,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
@@ -583,15 +463,15 @@
         "warId": 6100,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2024,
+        "var": 2018,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
diff --git a/shared/resource/warJsons/6101.json b/shared/resource/warJsons/6101.json
index 91d789813..8db862020 100644
--- a/shared/resource/warJsons/6101.json
+++ b/shared/resource/warJsons/6101.json
@@ -201,58 +201,18 @@
     },
     {
         "warId": 6101,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "黄巾力士",
+        "actorId": 1015,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 6,
-        "y": 12,
+        "y": 11,
         "var": 2005,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&27720|2&18200|4&6720|5&8960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6101,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 13,
-        "var": 2006,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26880|2&17920|4&5880|5&9520",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6101,
-        "actorName": "黄巾力士",
-        "actorId": 1015,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 6,
-        "y": 11,
-        "var": 2007,
-        "lv": 90,
-        "hide": 1,
-        "initial_ai": 3,
         "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
@@ -263,15 +223,15 @@
         "warId": 6101,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2008,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 7,
+        "outIndex": 5,
         "dirction": 2,
         "x": 7,
         "y": 11,
-        "var": 2008,
+        "var": 2006,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
@@ -283,13 +243,13 @@
         "warId": 6101,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 13,
         "y": 4,
-        "var": 2009,
+        "var": 2007,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -303,13 +263,13 @@
         "warId": 6101,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 13,
         "y": 3,
-        "var": 2010,
+        "var": 2008,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -323,13 +283,13 @@
         "warId": 6101,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 14,
         "y": 4,
-        "var": 2011,
+        "var": 2009,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -343,13 +303,13 @@
         "warId": 6101,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 14,
         "y": 3,
-        "var": 2012,
+        "var": 2010,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -359,59 +319,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6101,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 15,
-        "y": 4,
-        "var": 2013,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&27720|2&18200|4&6720|5&8960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6101,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 1,
-        "x": 15,
-        "y": 3,
-        "var": 2014,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26880|2&17920|4&5880|5&9520",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6101,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2015,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 14,
+        "outIndex": 10,
         "dirction": 1,
         "x": 16,
         "y": 4,
-        "var": 2015,
+        "var": 2011,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
@@ -423,15 +343,15 @@
         "warId": 6101,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 16,
         "y": 3,
-        "var": 2016,
+        "var": 2012,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
@@ -443,13 +363,13 @@
         "warId": 6101,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 10,
-        "var": 2017,
+        "var": 2013,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -463,13 +383,13 @@
         "warId": 6101,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
+        "var": 2014,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -483,13 +403,13 @@
         "warId": 6101,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 10,
-        "var": 2019,
+        "var": 2015,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -503,13 +423,13 @@
         "warId": 6101,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
+        "var": 2016,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -519,59 +439,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6101,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 10,
-        "var": 2021,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&27720|2&18200|4&6720|5&8960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6101,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2022,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26880|2&17920|4&5880|5&9520",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6101,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2023,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2023,
+        "var": 2017,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
@@ -583,15 +463,15 @@
         "warId": 6101,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2024,
+        "var": 2018,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
diff --git a/shared/resource/warJsons/6102.json b/shared/resource/warJsons/6102.json
index 7cbcea058..5d9f151b6 100644
--- a/shared/resource/warJsons/6102.json
+++ b/shared/resource/warJsons/6102.json
@@ -201,58 +201,18 @@
     },
     {
         "warId": 6102,
-        "actorName": "游侠",
-        "actorId": 1005,
+        "actorName": "黄巾力士",
+        "actorId": 1015,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
         "dirction": 2,
         "x": 6,
-        "y": 12,
+        "y": 11,
         "var": 2005,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&27720|2&18200|4&6720|5&8960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6102,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 13,
-        "var": 2006,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26880|2&17920|4&5880|5&9520",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6102,
-        "actorName": "黄巾力士",
-        "actorId": 1015,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 2,
-        "x": 6,
-        "y": 11,
-        "var": 2007,
-        "lv": 90,
-        "hide": 1,
-        "initial_ai": 3,
         "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
@@ -263,15 +223,15 @@
         "warId": 6102,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2008,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 7,
+        "outIndex": 5,
         "dirction": 2,
         "x": 7,
         "y": 11,
-        "var": 2008,
+        "var": 2006,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
@@ -283,13 +243,13 @@
         "warId": 6102,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 13,
         "y": 4,
-        "var": 2009,
+        "var": 2007,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -303,13 +263,13 @@
         "warId": 6102,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 13,
         "y": 3,
-        "var": 2010,
+        "var": 2008,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -323,13 +283,13 @@
         "warId": 6102,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 14,
         "y": 4,
-        "var": 2011,
+        "var": 2009,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -343,13 +303,13 @@
         "warId": 6102,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 14,
         "y": 3,
-        "var": 2012,
+        "var": 2010,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -359,59 +319,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6102,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 15,
-        "y": 4,
-        "var": 2013,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&27720|2&18200|4&6720|5&8960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6102,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 1,
-        "x": 15,
-        "y": 3,
-        "var": 2014,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26880|2&17920|4&5880|5&9520",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6102,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2015,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 14,
+        "outIndex": 10,
         "dirction": 1,
         "x": 16,
         "y": 4,
-        "var": 2015,
+        "var": 2011,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
@@ -423,15 +343,15 @@
         "warId": 6102,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 16,
         "y": 3,
-        "var": 2016,
+        "var": 2012,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
@@ -443,13 +363,13 @@
         "warId": 6102,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 10,
-        "var": 2017,
+        "var": 2013,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -463,13 +383,13 @@
         "warId": 6102,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
+        "var": 2014,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -483,13 +403,13 @@
         "warId": 6102,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 10,
-        "var": 2019,
+        "var": 2015,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -503,13 +423,13 @@
         "warId": 6102,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
+        "var": 2016,
         "lv": 90,
         "hide": 0,
         "initial_ai": 3,
@@ -519,59 +439,19 @@
         "star": 2,
         "spine": 0
     },
-    {
-        "warId": 6102,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 10,
-        "var": 2021,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&27720|2&18200|4&6720|5&8960",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6102,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2022,
-        "lv": 90,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&26880|2&17920|4&5880|5&9520",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
     {
         "warId": 6102,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2023,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2023,
+        "var": 2017,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
@@ -583,15 +463,15 @@
         "warId": 6102,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2024,
+        "var": 2018,
         "lv": 90,
-        "hide": 1,
+        "hide": 0,
         "initial_ai": 3,
         "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
diff --git a/shared/resource/warJsons/6103.json b/shared/resource/warJsons/6103.json
index afc9463aa..9d8f9679d 100644
--- a/shared/resource/warJsons/6103.json
+++ b/shared/resource/warJsons/6103.json
@@ -130,10 +130,10 @@
         "x": 8,
         "y": 12,
         "var": 2001,
-        "lv": 92,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&68400|2&31350|4&18240|5&11400",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 8,
         "y": 13,
         "var": 2002,
-        "lv": 92,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53580|2&39330|4&12540|5&17100",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 7,
         "y": 12,
         "var": 2003,
-        "lv": 92,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&45600|2&20900|4&12160|5&7600",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,50 +190,10 @@
         "x": 7,
         "y": 13,
         "var": 2004,
-        "lv": 92,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&40280|2&22800|4&11020|5&9880",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6103,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2005,
-        "relation": 2,
-        "outIndex": 4,
-        "dirction": 2,
-        "x": 6,
-        "y": 12,
-        "var": 2005,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&37620|2&24700|4&9120|5&12160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6103,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 13,
-        "var": 2006,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&36480|2&24320|4&7980|5&12920",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,17 +203,17 @@
         "warId": 6103,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2007,
+        "dataId": 2005,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 4,
         "dirction": 2,
         "x": 6,
         "y": 11,
-        "var": 2007,
-        "lv": 92,
-        "hide": 1,
+        "var": 2005,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47025|2&30875|4&11400|5&15200",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -263,17 +223,17 @@
         "warId": 6103,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2008,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 7,
+        "outIndex": 5,
         "dirction": 2,
         "x": 7,
         "y": 11,
-        "var": 2008,
-        "lv": 92,
-        "hide": 1,
+        "var": 2006,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53200|2&31350|4&11875|5&10925",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,17 @@
         "warId": 6103,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 13,
         "y": 4,
-        "var": 2009,
-        "lv": 92,
+        "var": 2007,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&63840|2&37620|4&14250|5&13110",
+        "attribute": "1&47040|2&27720|4&10500|5&9660",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -303,17 +263,17 @@
         "warId": 6103,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 13,
         "y": 3,
-        "var": 2010,
-        "lv": 92,
+        "var": 2008,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53580|2&39330|4&12540|5&17100",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -323,17 +283,17 @@
         "warId": 6103,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 14,
         "y": 4,
-        "var": 2011,
-        "lv": 92,
+        "var": 2009,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&45600|2&20900|4&12160|5&7600",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,57 +303,17 @@
         "warId": 6103,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 14,
         "y": 3,
-        "var": 2012,
-        "lv": 92,
+        "var": 2010,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&40280|2&22800|4&11020|5&9880",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6103,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 15,
-        "y": 4,
-        "var": 2013,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&37620|2&24700|4&9120|5&12160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6103,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 1,
-        "x": 15,
-        "y": 3,
-        "var": 2014,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&36480|2&24320|4&7980|5&12920",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -403,17 +323,17 @@
         "warId": 6103,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2015,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 14,
+        "outIndex": 10,
         "dirction": 1,
         "x": 16,
         "y": 4,
-        "var": 2015,
-        "lv": 92,
-        "hide": 1,
+        "var": 2011,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47025|2&30875|4&11400|5&15200",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6103,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 16,
         "y": 3,
-        "var": 2016,
-        "lv": 92,
-        "hide": 1,
+        "var": 2012,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53200|2&31350|4&11875|5&10925",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6103,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 10,
-        "var": 2017,
-        "lv": 92,
+        "var": 2013,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&68400|2&31350|4&18240|5&11400",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6103,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 92,
+        "var": 2014,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53580|2&39330|4&12540|5&17100",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6103,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 10,
-        "var": 2019,
-        "lv": 92,
+        "var": 2015,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&45600|2&20900|4&12160|5&7600",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,57 +423,17 @@
         "warId": 6103,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 92,
+        "var": 2016,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&40280|2&22800|4&11020|5&9880",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6103,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 10,
-        "var": 2021,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&37620|2&24700|4&9120|5&12160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6103,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2022,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&36480|2&24320|4&7980|5&12920",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,17 +443,17 @@
         "warId": 6103,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2023,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2023,
-        "lv": 92,
-        "hide": 1,
+        "var": 2017,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47025|2&30875|4&11400|5&15200",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6103,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2024,
-        "lv": 92,
-        "hide": 1,
+        "var": 2018,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53200|2&31350|4&11875|5&10925",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6104.json b/shared/resource/warJsons/6104.json
index 995f6d121..bc2ffbdcc 100644
--- a/shared/resource/warJsons/6104.json
+++ b/shared/resource/warJsons/6104.json
@@ -130,10 +130,10 @@
         "x": 8,
         "y": 12,
         "var": 2001,
-        "lv": 92,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&68400|2&31350|4&18240|5&11400",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 8,
         "y": 13,
         "var": 2002,
-        "lv": 92,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53580|2&39330|4&12540|5&17100",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 7,
         "y": 12,
         "var": 2003,
-        "lv": 92,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&45600|2&20900|4&12160|5&7600",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,50 +190,10 @@
         "x": 7,
         "y": 13,
         "var": 2004,
-        "lv": 92,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&40280|2&22800|4&11020|5&9880",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6104,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2005,
-        "relation": 2,
-        "outIndex": 4,
-        "dirction": 2,
-        "x": 6,
-        "y": 12,
-        "var": 2005,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&37620|2&24700|4&9120|5&12160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6104,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 13,
-        "var": 2006,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&36480|2&24320|4&7980|5&12920",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,17 +203,17 @@
         "warId": 6104,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2007,
+        "dataId": 2005,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 4,
         "dirction": 2,
         "x": 6,
         "y": 11,
-        "var": 2007,
-        "lv": 92,
-        "hide": 1,
+        "var": 2005,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47025|2&30875|4&11400|5&15200",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -263,17 +223,17 @@
         "warId": 6104,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2008,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 7,
+        "outIndex": 5,
         "dirction": 2,
         "x": 7,
         "y": 11,
-        "var": 2008,
-        "lv": 92,
-        "hide": 1,
+        "var": 2006,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53200|2&31350|4&11875|5&10925",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,17 @@
         "warId": 6104,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 13,
         "y": 4,
-        "var": 2009,
-        "lv": 92,
+        "var": 2007,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&63840|2&37620|4&14250|5&13110",
+        "attribute": "1&47040|2&27720|4&10500|5&9660",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -303,17 +263,17 @@
         "warId": 6104,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 13,
         "y": 3,
-        "var": 2010,
-        "lv": 92,
+        "var": 2008,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53580|2&39330|4&12540|5&17100",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -323,17 +283,17 @@
         "warId": 6104,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 14,
         "y": 4,
-        "var": 2011,
-        "lv": 92,
+        "var": 2009,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&45600|2&20900|4&12160|5&7600",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,57 +303,17 @@
         "warId": 6104,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 14,
         "y": 3,
-        "var": 2012,
-        "lv": 92,
+        "var": 2010,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&40280|2&22800|4&11020|5&9880",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6104,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 15,
-        "y": 4,
-        "var": 2013,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&37620|2&24700|4&9120|5&12160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6104,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 1,
-        "x": 15,
-        "y": 3,
-        "var": 2014,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&36480|2&24320|4&7980|5&12920",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -403,17 +323,17 @@
         "warId": 6104,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2015,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 14,
+        "outIndex": 10,
         "dirction": 1,
         "x": 16,
         "y": 4,
-        "var": 2015,
-        "lv": 92,
-        "hide": 1,
+        "var": 2011,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47025|2&30875|4&11400|5&15200",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6104,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 16,
         "y": 3,
-        "var": 2016,
-        "lv": 92,
-        "hide": 1,
+        "var": 2012,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53200|2&31350|4&11875|5&10925",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6104,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 10,
-        "var": 2017,
-        "lv": 92,
+        "var": 2013,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&68400|2&31350|4&18240|5&11400",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6104,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 92,
+        "var": 2014,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53580|2&39330|4&12540|5&17100",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6104,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 10,
-        "var": 2019,
-        "lv": 92,
+        "var": 2015,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&45600|2&20900|4&12160|5&7600",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,57 +423,17 @@
         "warId": 6104,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 92,
+        "var": 2016,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&40280|2&22800|4&11020|5&9880",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6104,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 10,
-        "var": 2021,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&37620|2&24700|4&9120|5&12160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6104,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2022,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&36480|2&24320|4&7980|5&12920",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,17 +443,17 @@
         "warId": 6104,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2023,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2023,
-        "lv": 92,
-        "hide": 1,
+        "var": 2017,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47025|2&30875|4&11400|5&15200",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6104,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2024,
-        "lv": 92,
-        "hide": 1,
+        "var": 2018,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53200|2&31350|4&11875|5&10925",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6105.json b/shared/resource/warJsons/6105.json
index 532eee9c7..456c5a32b 100644
--- a/shared/resource/warJsons/6105.json
+++ b/shared/resource/warJsons/6105.json
@@ -130,10 +130,10 @@
         "x": 8,
         "y": 12,
         "var": 2001,
-        "lv": 92,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&68400|2&31350|4&18240|5&11400",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 8,
         "y": 13,
         "var": 2002,
-        "lv": 92,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53580|2&39330|4&12540|5&17100",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 7,
         "y": 12,
         "var": 2003,
-        "lv": 92,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&45600|2&20900|4&12160|5&7600",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,50 +190,10 @@
         "x": 7,
         "y": 13,
         "var": 2004,
-        "lv": 92,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&40280|2&22800|4&11020|5&9880",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6105,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2005,
-        "relation": 2,
-        "outIndex": 4,
-        "dirction": 2,
-        "x": 6,
-        "y": 12,
-        "var": 2005,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&37620|2&24700|4&9120|5&12160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6105,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 13,
-        "var": 2006,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&36480|2&24320|4&7980|5&12920",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,17 +203,17 @@
         "warId": 6105,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2007,
+        "dataId": 2005,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 4,
         "dirction": 2,
         "x": 6,
         "y": 11,
-        "var": 2007,
-        "lv": 92,
-        "hide": 1,
+        "var": 2005,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47025|2&30875|4&11400|5&15200",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -263,17 +223,17 @@
         "warId": 6105,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2008,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 7,
+        "outIndex": 5,
         "dirction": 2,
         "x": 7,
         "y": 11,
-        "var": 2008,
-        "lv": 92,
-        "hide": 1,
+        "var": 2006,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53200|2&31350|4&11875|5&10925",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,17 @@
         "warId": 6105,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 13,
         "y": 4,
-        "var": 2009,
-        "lv": 92,
+        "var": 2007,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&63840|2&37620|4&14250|5&13110",
+        "attribute": "1&47040|2&27720|4&10500|5&9660",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -303,17 +263,17 @@
         "warId": 6105,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 13,
         "y": 3,
-        "var": 2010,
-        "lv": 92,
+        "var": 2008,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53580|2&39330|4&12540|5&17100",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -323,17 +283,17 @@
         "warId": 6105,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 14,
         "y": 4,
-        "var": 2011,
-        "lv": 92,
+        "var": 2009,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&45600|2&20900|4&12160|5&7600",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,57 +303,17 @@
         "warId": 6105,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 14,
         "y": 3,
-        "var": 2012,
-        "lv": 92,
+        "var": 2010,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&40280|2&22800|4&11020|5&9880",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6105,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 15,
-        "y": 4,
-        "var": 2013,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&37620|2&24700|4&9120|5&12160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6105,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 1,
-        "x": 15,
-        "y": 3,
-        "var": 2014,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&36480|2&24320|4&7980|5&12920",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -403,17 +323,17 @@
         "warId": 6105,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2015,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 14,
+        "outIndex": 10,
         "dirction": 1,
         "x": 16,
         "y": 4,
-        "var": 2015,
-        "lv": 92,
-        "hide": 1,
+        "var": 2011,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47025|2&30875|4&11400|5&15200",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6105,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 16,
         "y": 3,
-        "var": 2016,
-        "lv": 92,
-        "hide": 1,
+        "var": 2012,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53200|2&31350|4&11875|5&10925",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6105,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 10,
-        "var": 2017,
-        "lv": 92,
+        "var": 2013,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&68400|2&31350|4&18240|5&11400",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6105,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 92,
+        "var": 2014,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53580|2&39330|4&12540|5&17100",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6105,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 10,
-        "var": 2019,
-        "lv": 92,
+        "var": 2015,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&45600|2&20900|4&12160|5&7600",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,57 +423,17 @@
         "warId": 6105,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 92,
+        "var": 2016,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&40280|2&22800|4&11020|5&9880",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6105,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 10,
-        "var": 2021,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&37620|2&24700|4&9120|5&12160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6105,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2022,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&36480|2&24320|4&7980|5&12920",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,17 +443,17 @@
         "warId": 6105,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2023,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2023,
-        "lv": 92,
-        "hide": 1,
+        "var": 2017,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47025|2&30875|4&11400|5&15200",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6105,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2024,
-        "lv": 92,
-        "hide": 1,
+        "var": 2018,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53200|2&31350|4&11875|5&10925",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6106.json b/shared/resource/warJsons/6106.json
index dcfc0cfdc..f4ef9647b 100644
--- a/shared/resource/warJsons/6106.json
+++ b/shared/resource/warJsons/6106.json
@@ -130,10 +130,10 @@
         "x": 8,
         "y": 12,
         "var": 2001,
-        "lv": 92,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&68400|2&31350|4&18240|5&11400",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 8,
         "y": 13,
         "var": 2002,
-        "lv": 92,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53580|2&39330|4&12540|5&17100",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 7,
         "y": 12,
         "var": 2003,
-        "lv": 92,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&45600|2&20900|4&12160|5&7600",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,50 +190,10 @@
         "x": 7,
         "y": 13,
         "var": 2004,
-        "lv": 92,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&40280|2&22800|4&11020|5&9880",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6106,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2005,
-        "relation": 2,
-        "outIndex": 4,
-        "dirction": 2,
-        "x": 6,
-        "y": 12,
-        "var": 2005,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&37620|2&24700|4&9120|5&12160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6106,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 13,
-        "var": 2006,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&36480|2&24320|4&7980|5&12920",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,17 +203,17 @@
         "warId": 6106,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2007,
+        "dataId": 2005,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 4,
         "dirction": 2,
         "x": 6,
         "y": 11,
-        "var": 2007,
-        "lv": 92,
-        "hide": 1,
+        "var": 2005,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47025|2&30875|4&11400|5&15200",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -263,17 +223,17 @@
         "warId": 6106,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2008,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 7,
+        "outIndex": 5,
         "dirction": 2,
         "x": 7,
         "y": 11,
-        "var": 2008,
-        "lv": 92,
-        "hide": 1,
+        "var": 2006,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53200|2&31350|4&11875|5&10925",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,17 @@
         "warId": 6106,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 13,
         "y": 4,
-        "var": 2009,
-        "lv": 92,
+        "var": 2007,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&63840|2&37620|4&14250|5&13110",
+        "attribute": "1&47040|2&27720|4&10500|5&9660",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -303,17 +263,17 @@
         "warId": 6106,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 13,
         "y": 3,
-        "var": 2010,
-        "lv": 92,
+        "var": 2008,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53580|2&39330|4&12540|5&17100",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -323,17 +283,17 @@
         "warId": 6106,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 14,
         "y": 4,
-        "var": 2011,
-        "lv": 92,
+        "var": 2009,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&45600|2&20900|4&12160|5&7600",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,57 +303,17 @@
         "warId": 6106,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 14,
         "y": 3,
-        "var": 2012,
-        "lv": 92,
+        "var": 2010,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&40280|2&22800|4&11020|5&9880",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6106,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 15,
-        "y": 4,
-        "var": 2013,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&37620|2&24700|4&9120|5&12160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6106,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 1,
-        "x": 15,
-        "y": 3,
-        "var": 2014,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&36480|2&24320|4&7980|5&12920",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -403,17 +323,17 @@
         "warId": 6106,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2015,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 14,
+        "outIndex": 10,
         "dirction": 1,
         "x": 16,
         "y": 4,
-        "var": 2015,
-        "lv": 92,
-        "hide": 1,
+        "var": 2011,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47025|2&30875|4&11400|5&15200",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6106,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 16,
         "y": 3,
-        "var": 2016,
-        "lv": 92,
-        "hide": 1,
+        "var": 2012,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53200|2&31350|4&11875|5&10925",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6106,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 10,
-        "var": 2017,
-        "lv": 92,
+        "var": 2013,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&68400|2&31350|4&18240|5&11400",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6106,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 92,
+        "var": 2014,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53580|2&39330|4&12540|5&17100",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6106,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 10,
-        "var": 2019,
-        "lv": 92,
+        "var": 2015,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&45600|2&20900|4&12160|5&7600",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,57 +423,17 @@
         "warId": 6106,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 92,
+        "var": 2016,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&40280|2&22800|4&11020|5&9880",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6106,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 10,
-        "var": 2021,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&37620|2&24700|4&9120|5&12160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6106,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2022,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&36480|2&24320|4&7980|5&12920",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,17 +443,17 @@
         "warId": 6106,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2023,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2023,
-        "lv": 92,
-        "hide": 1,
+        "var": 2017,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47025|2&30875|4&11400|5&15200",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6106,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2024,
-        "lv": 92,
-        "hide": 1,
+        "var": 2018,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53200|2&31350|4&11875|5&10925",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6107.json b/shared/resource/warJsons/6107.json
index 795691da1..41bb6ea62 100644
--- a/shared/resource/warJsons/6107.json
+++ b/shared/resource/warJsons/6107.json
@@ -130,10 +130,10 @@
         "x": 8,
         "y": 12,
         "var": 2001,
-        "lv": 92,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&68400|2&31350|4&18240|5&11400",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 8,
         "y": 13,
         "var": 2002,
-        "lv": 92,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53580|2&39330|4&12540|5&17100",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 7,
         "y": 12,
         "var": 2003,
-        "lv": 92,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&45600|2&20900|4&12160|5&7600",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,50 +190,10 @@
         "x": 7,
         "y": 13,
         "var": 2004,
-        "lv": 92,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&40280|2&22800|4&11020|5&9880",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6107,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2005,
-        "relation": 2,
-        "outIndex": 4,
-        "dirction": 2,
-        "x": 6,
-        "y": 12,
-        "var": 2005,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&37620|2&24700|4&9120|5&12160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6107,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 13,
-        "var": 2006,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&36480|2&24320|4&7980|5&12920",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,17 +203,17 @@
         "warId": 6107,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2007,
+        "dataId": 2005,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 4,
         "dirction": 2,
         "x": 6,
         "y": 11,
-        "var": 2007,
-        "lv": 92,
-        "hide": 1,
+        "var": 2005,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47025|2&30875|4&11400|5&15200",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -263,17 +223,17 @@
         "warId": 6107,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2008,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 7,
+        "outIndex": 5,
         "dirction": 2,
         "x": 7,
         "y": 11,
-        "var": 2008,
-        "lv": 92,
-        "hide": 1,
+        "var": 2006,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53200|2&31350|4&11875|5&10925",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,17 @@
         "warId": 6107,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 13,
         "y": 4,
-        "var": 2009,
-        "lv": 92,
+        "var": 2007,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&63840|2&37620|4&14250|5&13110",
+        "attribute": "1&47040|2&27720|4&10500|5&9660",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -303,17 +263,17 @@
         "warId": 6107,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 13,
         "y": 3,
-        "var": 2010,
-        "lv": 92,
+        "var": 2008,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53580|2&39330|4&12540|5&17100",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -323,17 +283,17 @@
         "warId": 6107,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 14,
         "y": 4,
-        "var": 2011,
-        "lv": 92,
+        "var": 2009,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&45600|2&20900|4&12160|5&7600",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,57 +303,17 @@
         "warId": 6107,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 14,
         "y": 3,
-        "var": 2012,
-        "lv": 92,
+        "var": 2010,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&40280|2&22800|4&11020|5&9880",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6107,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 15,
-        "y": 4,
-        "var": 2013,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&37620|2&24700|4&9120|5&12160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6107,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 1,
-        "x": 15,
-        "y": 3,
-        "var": 2014,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&36480|2&24320|4&7980|5&12920",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -403,17 +323,17 @@
         "warId": 6107,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2015,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 14,
+        "outIndex": 10,
         "dirction": 1,
         "x": 16,
         "y": 4,
-        "var": 2015,
-        "lv": 92,
-        "hide": 1,
+        "var": 2011,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47025|2&30875|4&11400|5&15200",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6107,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 16,
         "y": 3,
-        "var": 2016,
-        "lv": 92,
-        "hide": 1,
+        "var": 2012,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53200|2&31350|4&11875|5&10925",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6107,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 10,
-        "var": 2017,
-        "lv": 92,
+        "var": 2013,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&68400|2&31350|4&18240|5&11400",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6107,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 92,
+        "var": 2014,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53580|2&39330|4&12540|5&17100",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6107,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 10,
-        "var": 2019,
-        "lv": 92,
+        "var": 2015,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&45600|2&20900|4&12160|5&7600",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,57 +423,17 @@
         "warId": 6107,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 92,
+        "var": 2016,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&40280|2&22800|4&11020|5&9880",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6107,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 10,
-        "var": 2021,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&37620|2&24700|4&9120|5&12160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6107,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2022,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&36480|2&24320|4&7980|5&12920",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,17 +443,17 @@
         "warId": 6107,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2023,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2023,
-        "lv": 92,
-        "hide": 1,
+        "var": 2017,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47025|2&30875|4&11400|5&15200",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6107,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2024,
-        "lv": 92,
-        "hide": 1,
+        "var": 2018,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53200|2&31350|4&11875|5&10925",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6108.json b/shared/resource/warJsons/6108.json
index a397e1c58..a4dc78278 100644
--- a/shared/resource/warJsons/6108.json
+++ b/shared/resource/warJsons/6108.json
@@ -130,10 +130,10 @@
         "x": 8,
         "y": 12,
         "var": 2001,
-        "lv": 92,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&68400|2&31350|4&18240|5&11400",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 8,
         "y": 13,
         "var": 2002,
-        "lv": 92,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53580|2&39330|4&12540|5&17100",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 7,
         "y": 12,
         "var": 2003,
-        "lv": 92,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&45600|2&20900|4&12160|5&7600",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,50 +190,10 @@
         "x": 7,
         "y": 13,
         "var": 2004,
-        "lv": 92,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&40280|2&22800|4&11020|5&9880",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6108,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2005,
-        "relation": 2,
-        "outIndex": 4,
-        "dirction": 2,
-        "x": 6,
-        "y": 12,
-        "var": 2005,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&37620|2&24700|4&9120|5&12160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6108,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 13,
-        "var": 2006,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&36480|2&24320|4&7980|5&12920",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,17 +203,17 @@
         "warId": 6108,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2007,
+        "dataId": 2005,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 4,
         "dirction": 2,
         "x": 6,
         "y": 11,
-        "var": 2007,
-        "lv": 92,
-        "hide": 1,
+        "var": 2005,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47025|2&30875|4&11400|5&15200",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -263,17 +223,17 @@
         "warId": 6108,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2008,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 7,
+        "outIndex": 5,
         "dirction": 2,
         "x": 7,
         "y": 11,
-        "var": 2008,
-        "lv": 92,
-        "hide": 1,
+        "var": 2006,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53200|2&31350|4&11875|5&10925",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,17 @@
         "warId": 6108,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 13,
         "y": 4,
-        "var": 2009,
-        "lv": 92,
+        "var": 2007,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&63840|2&37620|4&14250|5&13110",
+        "attribute": "1&47040|2&27720|4&10500|5&9660",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -303,17 +263,17 @@
         "warId": 6108,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 13,
         "y": 3,
-        "var": 2010,
-        "lv": 92,
+        "var": 2008,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53580|2&39330|4&12540|5&17100",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -323,17 +283,17 @@
         "warId": 6108,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 14,
         "y": 4,
-        "var": 2011,
-        "lv": 92,
+        "var": 2009,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&45600|2&20900|4&12160|5&7600",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,57 +303,17 @@
         "warId": 6108,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 14,
         "y": 3,
-        "var": 2012,
-        "lv": 92,
+        "var": 2010,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&40280|2&22800|4&11020|5&9880",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6108,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 15,
-        "y": 4,
-        "var": 2013,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&37620|2&24700|4&9120|5&12160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6108,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 1,
-        "x": 15,
-        "y": 3,
-        "var": 2014,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&36480|2&24320|4&7980|5&12920",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -403,17 +323,17 @@
         "warId": 6108,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2015,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 14,
+        "outIndex": 10,
         "dirction": 1,
         "x": 16,
         "y": 4,
-        "var": 2015,
-        "lv": 92,
-        "hide": 1,
+        "var": 2011,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47025|2&30875|4&11400|5&15200",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6108,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 16,
         "y": 3,
-        "var": 2016,
-        "lv": 92,
-        "hide": 1,
+        "var": 2012,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53200|2&31350|4&11875|5&10925",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6108,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 10,
-        "var": 2017,
-        "lv": 92,
+        "var": 2013,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&68400|2&31350|4&18240|5&11400",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6108,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 92,
+        "var": 2014,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53580|2&39330|4&12540|5&17100",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6108,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 10,
-        "var": 2019,
-        "lv": 92,
+        "var": 2015,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&45600|2&20900|4&12160|5&7600",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,57 +423,17 @@
         "warId": 6108,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 92,
+        "var": 2016,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&40280|2&22800|4&11020|5&9880",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6108,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 10,
-        "var": 2021,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&37620|2&24700|4&9120|5&12160",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6108,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2022,
-        "lv": 92,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&36480|2&24320|4&7980|5&12920",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,17 +443,17 @@
         "warId": 6108,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2023,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2023,
-        "lv": 92,
-        "hide": 1,
+        "var": 2017,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&47025|2&30875|4&11400|5&15200",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6108,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2024,
-        "lv": 92,
-        "hide": 1,
+        "var": 2018,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53200|2&31350|4&11875|5&10925",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6109.json b/shared/resource/warJsons/6109.json
index 20c685a5f..112973bdb 100644
--- a/shared/resource/warJsons/6109.json
+++ b/shared/resource/warJsons/6109.json
@@ -130,10 +130,10 @@
         "x": 8,
         "y": 12,
         "var": 2001,
-        "lv": 94,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90000|2&41250|4&24000|5&15000",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 8,
         "y": 13,
         "var": 2002,
-        "lv": 94,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70500|2&51750|4&16500|5&22500",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 7,
         "y": 12,
         "var": 2003,
-        "lv": 94,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&60000|2&27500|4&16000|5&10000",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,50 +190,10 @@
         "x": 7,
         "y": 13,
         "var": 2004,
-        "lv": 94,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53000|2&30000|4&14500|5&13000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6109,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2005,
-        "relation": 2,
-        "outIndex": 4,
-        "dirction": 2,
-        "x": 6,
-        "y": 12,
-        "var": 2005,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&49500|2&32500|4&12000|5&16000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6109,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 13,
-        "var": 2006,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&48000|2&32000|4&10500|5&17000",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,17 +203,17 @@
         "warId": 6109,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2007,
+        "dataId": 2005,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 4,
         "dirction": 2,
         "x": 6,
         "y": 11,
-        "var": 2007,
-        "lv": 94,
-        "hide": 1,
+        "var": 2005,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&61875|2&40625|4&15000|5&20000",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -263,17 +223,17 @@
         "warId": 6109,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2008,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 7,
+        "outIndex": 5,
         "dirction": 2,
         "x": 7,
         "y": 11,
-        "var": 2008,
-        "lv": 94,
-        "hide": 1,
+        "var": 2006,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70000|2&41250|4&15625|5&14375",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,17 @@
         "warId": 6109,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 13,
         "y": 4,
-        "var": 2009,
-        "lv": 94,
+        "var": 2007,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&84000|2&49500|4&18750|5&17250",
+        "attribute": "1&47040|2&27720|4&10500|5&9660",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -303,17 +263,17 @@
         "warId": 6109,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 13,
         "y": 3,
-        "var": 2010,
-        "lv": 94,
+        "var": 2008,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70500|2&51750|4&16500|5&22500",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -323,17 +283,17 @@
         "warId": 6109,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 14,
         "y": 4,
-        "var": 2011,
-        "lv": 94,
+        "var": 2009,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&60000|2&27500|4&16000|5&10000",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,57 +303,17 @@
         "warId": 6109,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 14,
         "y": 3,
-        "var": 2012,
-        "lv": 94,
+        "var": 2010,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53000|2&30000|4&14500|5&13000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6109,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 15,
-        "y": 4,
-        "var": 2013,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&49500|2&32500|4&12000|5&16000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6109,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 1,
-        "x": 15,
-        "y": 3,
-        "var": 2014,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&48000|2&32000|4&10500|5&17000",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -403,17 +323,17 @@
         "warId": 6109,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2015,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 14,
+        "outIndex": 10,
         "dirction": 1,
         "x": 16,
         "y": 4,
-        "var": 2015,
-        "lv": 94,
-        "hide": 1,
+        "var": 2011,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&61875|2&40625|4&15000|5&20000",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6109,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 16,
         "y": 3,
-        "var": 2016,
-        "lv": 94,
-        "hide": 1,
+        "var": 2012,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70000|2&41250|4&15625|5&14375",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6109,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 10,
-        "var": 2017,
-        "lv": 94,
+        "var": 2013,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90000|2&41250|4&24000|5&15000",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6109,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 94,
+        "var": 2014,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70500|2&51750|4&16500|5&22500",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6109,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 10,
-        "var": 2019,
-        "lv": 94,
+        "var": 2015,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&60000|2&27500|4&16000|5&10000",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,57 +423,17 @@
         "warId": 6109,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 94,
+        "var": 2016,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53000|2&30000|4&14500|5&13000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6109,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 10,
-        "var": 2021,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&49500|2&32500|4&12000|5&16000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6109,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2022,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&48000|2&32000|4&10500|5&17000",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,17 +443,17 @@
         "warId": 6109,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2023,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2023,
-        "lv": 94,
-        "hide": 1,
+        "var": 2017,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&61875|2&40625|4&15000|5&20000",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6109,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2024,
-        "lv": 94,
-        "hide": 1,
+        "var": 2018,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70000|2&41250|4&15625|5&14375",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6110.json b/shared/resource/warJsons/6110.json
index f00dc6f55..1285b8c3c 100644
--- a/shared/resource/warJsons/6110.json
+++ b/shared/resource/warJsons/6110.json
@@ -130,10 +130,10 @@
         "x": 8,
         "y": 12,
         "var": 2001,
-        "lv": 94,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90000|2&41250|4&24000|5&15000",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 8,
         "y": 13,
         "var": 2002,
-        "lv": 94,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70500|2&51750|4&16500|5&22500",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 7,
         "y": 12,
         "var": 2003,
-        "lv": 94,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&60000|2&27500|4&16000|5&10000",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,50 +190,10 @@
         "x": 7,
         "y": 13,
         "var": 2004,
-        "lv": 94,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53000|2&30000|4&14500|5&13000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6110,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2005,
-        "relation": 2,
-        "outIndex": 4,
-        "dirction": 2,
-        "x": 6,
-        "y": 12,
-        "var": 2005,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&49500|2&32500|4&12000|5&16000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6110,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 13,
-        "var": 2006,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&48000|2&32000|4&10500|5&17000",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,17 +203,17 @@
         "warId": 6110,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2007,
+        "dataId": 2005,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 4,
         "dirction": 2,
         "x": 6,
         "y": 11,
-        "var": 2007,
-        "lv": 94,
-        "hide": 1,
+        "var": 2005,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&61875|2&40625|4&15000|5&20000",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -263,17 +223,17 @@
         "warId": 6110,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2008,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 7,
+        "outIndex": 5,
         "dirction": 2,
         "x": 7,
         "y": 11,
-        "var": 2008,
-        "lv": 94,
-        "hide": 1,
+        "var": 2006,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70000|2&41250|4&15625|5&14375",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,17 @@
         "warId": 6110,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 13,
         "y": 4,
-        "var": 2009,
-        "lv": 94,
+        "var": 2007,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&84000|2&49500|4&18750|5&17250",
+        "attribute": "1&47040|2&27720|4&10500|5&9660",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -303,17 +263,17 @@
         "warId": 6110,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 13,
         "y": 3,
-        "var": 2010,
-        "lv": 94,
+        "var": 2008,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70500|2&51750|4&16500|5&22500",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -323,17 +283,17 @@
         "warId": 6110,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 14,
         "y": 4,
-        "var": 2011,
-        "lv": 94,
+        "var": 2009,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&60000|2&27500|4&16000|5&10000",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,57 +303,17 @@
         "warId": 6110,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 14,
         "y": 3,
-        "var": 2012,
-        "lv": 94,
+        "var": 2010,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53000|2&30000|4&14500|5&13000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6110,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 15,
-        "y": 4,
-        "var": 2013,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&49500|2&32500|4&12000|5&16000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6110,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 1,
-        "x": 15,
-        "y": 3,
-        "var": 2014,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&48000|2&32000|4&10500|5&17000",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -403,17 +323,17 @@
         "warId": 6110,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2015,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 14,
+        "outIndex": 10,
         "dirction": 1,
         "x": 16,
         "y": 4,
-        "var": 2015,
-        "lv": 94,
-        "hide": 1,
+        "var": 2011,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&61875|2&40625|4&15000|5&20000",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6110,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 16,
         "y": 3,
-        "var": 2016,
-        "lv": 94,
-        "hide": 1,
+        "var": 2012,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70000|2&41250|4&15625|5&14375",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6110,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 10,
-        "var": 2017,
-        "lv": 94,
+        "var": 2013,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90000|2&41250|4&24000|5&15000",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6110,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 94,
+        "var": 2014,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70500|2&51750|4&16500|5&22500",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6110,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 10,
-        "var": 2019,
-        "lv": 94,
+        "var": 2015,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&60000|2&27500|4&16000|5&10000",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,57 +423,17 @@
         "warId": 6110,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 94,
+        "var": 2016,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53000|2&30000|4&14500|5&13000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6110,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 10,
-        "var": 2021,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&49500|2&32500|4&12000|5&16000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6110,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2022,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&48000|2&32000|4&10500|5&17000",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,17 +443,17 @@
         "warId": 6110,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2023,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2023,
-        "lv": 94,
-        "hide": 1,
+        "var": 2017,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&61875|2&40625|4&15000|5&20000",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6110,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2024,
-        "lv": 94,
-        "hide": 1,
+        "var": 2018,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70000|2&41250|4&15625|5&14375",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6111.json b/shared/resource/warJsons/6111.json
index 1ac51b6b1..d925bb8bf 100644
--- a/shared/resource/warJsons/6111.json
+++ b/shared/resource/warJsons/6111.json
@@ -130,10 +130,10 @@
         "x": 8,
         "y": 12,
         "var": 2001,
-        "lv": 94,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90000|2&41250|4&24000|5&15000",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 8,
         "y": 13,
         "var": 2002,
-        "lv": 94,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70500|2&51750|4&16500|5&22500",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 7,
         "y": 12,
         "var": 2003,
-        "lv": 94,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&60000|2&27500|4&16000|5&10000",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,50 +190,10 @@
         "x": 7,
         "y": 13,
         "var": 2004,
-        "lv": 94,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53000|2&30000|4&14500|5&13000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6111,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2005,
-        "relation": 2,
-        "outIndex": 4,
-        "dirction": 2,
-        "x": 6,
-        "y": 12,
-        "var": 2005,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&49500|2&32500|4&12000|5&16000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6111,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 13,
-        "var": 2006,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&48000|2&32000|4&10500|5&17000",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,17 +203,17 @@
         "warId": 6111,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2007,
+        "dataId": 2005,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 4,
         "dirction": 2,
         "x": 6,
         "y": 11,
-        "var": 2007,
-        "lv": 94,
-        "hide": 1,
+        "var": 2005,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&61875|2&40625|4&15000|5&20000",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -263,17 +223,17 @@
         "warId": 6111,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2008,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 7,
+        "outIndex": 5,
         "dirction": 2,
         "x": 7,
         "y": 11,
-        "var": 2008,
-        "lv": 94,
-        "hide": 1,
+        "var": 2006,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70000|2&41250|4&15625|5&14375",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,17 @@
         "warId": 6111,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 13,
         "y": 4,
-        "var": 2009,
-        "lv": 94,
+        "var": 2007,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&84000|2&49500|4&18750|5&17250",
+        "attribute": "1&47040|2&27720|4&10500|5&9660",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -303,17 +263,17 @@
         "warId": 6111,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 13,
         "y": 3,
-        "var": 2010,
-        "lv": 94,
+        "var": 2008,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70500|2&51750|4&16500|5&22500",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -323,17 +283,17 @@
         "warId": 6111,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 14,
         "y": 4,
-        "var": 2011,
-        "lv": 94,
+        "var": 2009,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&60000|2&27500|4&16000|5&10000",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,57 +303,17 @@
         "warId": 6111,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 14,
         "y": 3,
-        "var": 2012,
-        "lv": 94,
+        "var": 2010,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53000|2&30000|4&14500|5&13000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6111,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 15,
-        "y": 4,
-        "var": 2013,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&49500|2&32500|4&12000|5&16000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6111,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 1,
-        "x": 15,
-        "y": 3,
-        "var": 2014,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&48000|2&32000|4&10500|5&17000",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -403,17 +323,17 @@
         "warId": 6111,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2015,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 14,
+        "outIndex": 10,
         "dirction": 1,
         "x": 16,
         "y": 4,
-        "var": 2015,
-        "lv": 94,
-        "hide": 1,
+        "var": 2011,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&61875|2&40625|4&15000|5&20000",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6111,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 16,
         "y": 3,
-        "var": 2016,
-        "lv": 94,
-        "hide": 1,
+        "var": 2012,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70000|2&41250|4&15625|5&14375",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6111,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 10,
-        "var": 2017,
-        "lv": 94,
+        "var": 2013,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90000|2&41250|4&24000|5&15000",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6111,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 94,
+        "var": 2014,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70500|2&51750|4&16500|5&22500",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6111,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 10,
-        "var": 2019,
-        "lv": 94,
+        "var": 2015,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&60000|2&27500|4&16000|5&10000",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,57 +423,17 @@
         "warId": 6111,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 94,
+        "var": 2016,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53000|2&30000|4&14500|5&13000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6111,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 10,
-        "var": 2021,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&49500|2&32500|4&12000|5&16000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6111,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2022,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&48000|2&32000|4&10500|5&17000",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,17 +443,17 @@
         "warId": 6111,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2023,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2023,
-        "lv": 94,
-        "hide": 1,
+        "var": 2017,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&61875|2&40625|4&15000|5&20000",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6111,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2024,
-        "lv": 94,
-        "hide": 1,
+        "var": 2018,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70000|2&41250|4&15625|5&14375",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6112.json b/shared/resource/warJsons/6112.json
index 6b733eef0..dc8e680d0 100644
--- a/shared/resource/warJsons/6112.json
+++ b/shared/resource/warJsons/6112.json
@@ -130,10 +130,10 @@
         "x": 8,
         "y": 12,
         "var": 2001,
-        "lv": 94,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90000|2&41250|4&24000|5&15000",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 8,
         "y": 13,
         "var": 2002,
-        "lv": 94,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70500|2&51750|4&16500|5&22500",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 7,
         "y": 12,
         "var": 2003,
-        "lv": 94,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&60000|2&27500|4&16000|5&10000",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,50 +190,10 @@
         "x": 7,
         "y": 13,
         "var": 2004,
-        "lv": 94,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53000|2&30000|4&14500|5&13000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6112,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2005,
-        "relation": 2,
-        "outIndex": 4,
-        "dirction": 2,
-        "x": 6,
-        "y": 12,
-        "var": 2005,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&49500|2&32500|4&12000|5&16000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6112,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 13,
-        "var": 2006,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&48000|2&32000|4&10500|5&17000",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,17 +203,17 @@
         "warId": 6112,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2007,
+        "dataId": 2005,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 4,
         "dirction": 2,
         "x": 6,
         "y": 11,
-        "var": 2007,
-        "lv": 94,
-        "hide": 1,
+        "var": 2005,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&61875|2&40625|4&15000|5&20000",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -263,17 +223,17 @@
         "warId": 6112,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2008,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 7,
+        "outIndex": 5,
         "dirction": 2,
         "x": 7,
         "y": 11,
-        "var": 2008,
-        "lv": 94,
-        "hide": 1,
+        "var": 2006,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70000|2&41250|4&15625|5&14375",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,17 @@
         "warId": 6112,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 13,
         "y": 4,
-        "var": 2009,
-        "lv": 94,
+        "var": 2007,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&84000|2&49500|4&18750|5&17250",
+        "attribute": "1&47040|2&27720|4&10500|5&9660",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -303,17 +263,17 @@
         "warId": 6112,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 13,
         "y": 3,
-        "var": 2010,
-        "lv": 94,
+        "var": 2008,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70500|2&51750|4&16500|5&22500",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -323,17 +283,17 @@
         "warId": 6112,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 14,
         "y": 4,
-        "var": 2011,
-        "lv": 94,
+        "var": 2009,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&60000|2&27500|4&16000|5&10000",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,57 +303,17 @@
         "warId": 6112,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 14,
         "y": 3,
-        "var": 2012,
-        "lv": 94,
+        "var": 2010,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53000|2&30000|4&14500|5&13000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6112,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 15,
-        "y": 4,
-        "var": 2013,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&49500|2&32500|4&12000|5&16000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6112,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 1,
-        "x": 15,
-        "y": 3,
-        "var": 2014,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&48000|2&32000|4&10500|5&17000",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -403,17 +323,17 @@
         "warId": 6112,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2015,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 14,
+        "outIndex": 10,
         "dirction": 1,
         "x": 16,
         "y": 4,
-        "var": 2015,
-        "lv": 94,
-        "hide": 1,
+        "var": 2011,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&61875|2&40625|4&15000|5&20000",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6112,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 16,
         "y": 3,
-        "var": 2016,
-        "lv": 94,
-        "hide": 1,
+        "var": 2012,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70000|2&41250|4&15625|5&14375",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6112,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 10,
-        "var": 2017,
-        "lv": 94,
+        "var": 2013,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90000|2&41250|4&24000|5&15000",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6112,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 94,
+        "var": 2014,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70500|2&51750|4&16500|5&22500",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6112,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 10,
-        "var": 2019,
-        "lv": 94,
+        "var": 2015,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&60000|2&27500|4&16000|5&10000",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,57 +423,17 @@
         "warId": 6112,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 94,
+        "var": 2016,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53000|2&30000|4&14500|5&13000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6112,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 10,
-        "var": 2021,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&49500|2&32500|4&12000|5&16000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6112,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2022,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&48000|2&32000|4&10500|5&17000",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,17 +443,17 @@
         "warId": 6112,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2023,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2023,
-        "lv": 94,
-        "hide": 1,
+        "var": 2017,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&61875|2&40625|4&15000|5&20000",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6112,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2024,
-        "lv": 94,
-        "hide": 1,
+        "var": 2018,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70000|2&41250|4&15625|5&14375",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6113.json b/shared/resource/warJsons/6113.json
index 9c217ca3e..ca948790a 100644
--- a/shared/resource/warJsons/6113.json
+++ b/shared/resource/warJsons/6113.json
@@ -130,10 +130,10 @@
         "x": 8,
         "y": 12,
         "var": 2001,
-        "lv": 94,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90000|2&41250|4&24000|5&15000",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 8,
         "y": 13,
         "var": 2002,
-        "lv": 94,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70500|2&51750|4&16500|5&22500",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 7,
         "y": 12,
         "var": 2003,
-        "lv": 94,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&60000|2&27500|4&16000|5&10000",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,50 +190,10 @@
         "x": 7,
         "y": 13,
         "var": 2004,
-        "lv": 94,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53000|2&30000|4&14500|5&13000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6113,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2005,
-        "relation": 2,
-        "outIndex": 4,
-        "dirction": 2,
-        "x": 6,
-        "y": 12,
-        "var": 2005,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&49500|2&32500|4&12000|5&16000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6113,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 13,
-        "var": 2006,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&48000|2&32000|4&10500|5&17000",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,17 +203,17 @@
         "warId": 6113,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2007,
+        "dataId": 2005,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 4,
         "dirction": 2,
         "x": 6,
         "y": 11,
-        "var": 2007,
-        "lv": 94,
-        "hide": 1,
+        "var": 2005,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&61875|2&40625|4&15000|5&20000",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -263,17 +223,17 @@
         "warId": 6113,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2008,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 7,
+        "outIndex": 5,
         "dirction": 2,
         "x": 7,
         "y": 11,
-        "var": 2008,
-        "lv": 94,
-        "hide": 1,
+        "var": 2006,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70000|2&41250|4&15625|5&14375",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,17 @@
         "warId": 6113,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 13,
         "y": 4,
-        "var": 2009,
-        "lv": 94,
+        "var": 2007,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&84000|2&49500|4&18750|5&17250",
+        "attribute": "1&47040|2&27720|4&10500|5&9660",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -303,17 +263,17 @@
         "warId": 6113,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 13,
         "y": 3,
-        "var": 2010,
-        "lv": 94,
+        "var": 2008,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70500|2&51750|4&16500|5&22500",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -323,17 +283,17 @@
         "warId": 6113,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 14,
         "y": 4,
-        "var": 2011,
-        "lv": 94,
+        "var": 2009,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&60000|2&27500|4&16000|5&10000",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,57 +303,17 @@
         "warId": 6113,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 14,
         "y": 3,
-        "var": 2012,
-        "lv": 94,
+        "var": 2010,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53000|2&30000|4&14500|5&13000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6113,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 15,
-        "y": 4,
-        "var": 2013,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&49500|2&32500|4&12000|5&16000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6113,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 1,
-        "x": 15,
-        "y": 3,
-        "var": 2014,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&48000|2&32000|4&10500|5&17000",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -403,17 +323,17 @@
         "warId": 6113,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2015,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 14,
+        "outIndex": 10,
         "dirction": 1,
         "x": 16,
         "y": 4,
-        "var": 2015,
-        "lv": 94,
-        "hide": 1,
+        "var": 2011,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&61875|2&40625|4&15000|5&20000",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6113,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 16,
         "y": 3,
-        "var": 2016,
-        "lv": 94,
-        "hide": 1,
+        "var": 2012,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70000|2&41250|4&15625|5&14375",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6113,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 10,
-        "var": 2017,
-        "lv": 94,
+        "var": 2013,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90000|2&41250|4&24000|5&15000",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6113,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 94,
+        "var": 2014,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70500|2&51750|4&16500|5&22500",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6113,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 10,
-        "var": 2019,
-        "lv": 94,
+        "var": 2015,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&60000|2&27500|4&16000|5&10000",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,57 +423,17 @@
         "warId": 6113,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 94,
+        "var": 2016,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53000|2&30000|4&14500|5&13000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6113,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 10,
-        "var": 2021,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&49500|2&32500|4&12000|5&16000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6113,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2022,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&48000|2&32000|4&10500|5&17000",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,17 +443,17 @@
         "warId": 6113,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2023,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2023,
-        "lv": 94,
-        "hide": 1,
+        "var": 2017,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&61875|2&40625|4&15000|5&20000",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6113,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2024,
-        "lv": 94,
-        "hide": 1,
+        "var": 2018,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70000|2&41250|4&15625|5&14375",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6114.json b/shared/resource/warJsons/6114.json
index 5181e75f2..56b261b54 100644
--- a/shared/resource/warJsons/6114.json
+++ b/shared/resource/warJsons/6114.json
@@ -130,10 +130,10 @@
         "x": 8,
         "y": 12,
         "var": 2001,
-        "lv": 94,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90000|2&41250|4&24000|5&15000",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 8,
         "y": 13,
         "var": 2002,
-        "lv": 94,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70500|2&51750|4&16500|5&22500",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 7,
         "y": 12,
         "var": 2003,
-        "lv": 94,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&60000|2&27500|4&16000|5&10000",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,50 +190,10 @@
         "x": 7,
         "y": 13,
         "var": 2004,
-        "lv": 94,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53000|2&30000|4&14500|5&13000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6114,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2005,
-        "relation": 2,
-        "outIndex": 4,
-        "dirction": 2,
-        "x": 6,
-        "y": 12,
-        "var": 2005,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&49500|2&32500|4&12000|5&16000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6114,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 13,
-        "var": 2006,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&48000|2&32000|4&10500|5&17000",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,17 +203,17 @@
         "warId": 6114,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2007,
+        "dataId": 2005,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 4,
         "dirction": 2,
         "x": 6,
         "y": 11,
-        "var": 2007,
-        "lv": 94,
-        "hide": 1,
+        "var": 2005,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&61875|2&40625|4&15000|5&20000",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -263,17 +223,17 @@
         "warId": 6114,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2008,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 7,
+        "outIndex": 5,
         "dirction": 2,
         "x": 7,
         "y": 11,
-        "var": 2008,
-        "lv": 94,
-        "hide": 1,
+        "var": 2006,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70000|2&41250|4&15625|5&14375",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,17 @@
         "warId": 6114,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 13,
         "y": 4,
-        "var": 2009,
-        "lv": 94,
+        "var": 2007,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&84000|2&49500|4&18750|5&17250",
+        "attribute": "1&47040|2&27720|4&10500|5&9660",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -303,17 +263,17 @@
         "warId": 6114,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 13,
         "y": 3,
-        "var": 2010,
-        "lv": 94,
+        "var": 2008,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70500|2&51750|4&16500|5&22500",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -323,17 +283,17 @@
         "warId": 6114,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 14,
         "y": 4,
-        "var": 2011,
-        "lv": 94,
+        "var": 2009,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&60000|2&27500|4&16000|5&10000",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,57 +303,17 @@
         "warId": 6114,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 14,
         "y": 3,
-        "var": 2012,
-        "lv": 94,
+        "var": 2010,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53000|2&30000|4&14500|5&13000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6114,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 15,
-        "y": 4,
-        "var": 2013,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&49500|2&32500|4&12000|5&16000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6114,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 1,
-        "x": 15,
-        "y": 3,
-        "var": 2014,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&48000|2&32000|4&10500|5&17000",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -403,17 +323,17 @@
         "warId": 6114,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2015,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 14,
+        "outIndex": 10,
         "dirction": 1,
         "x": 16,
         "y": 4,
-        "var": 2015,
-        "lv": 94,
-        "hide": 1,
+        "var": 2011,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&61875|2&40625|4&15000|5&20000",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6114,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 16,
         "y": 3,
-        "var": 2016,
-        "lv": 94,
-        "hide": 1,
+        "var": 2012,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70000|2&41250|4&15625|5&14375",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6114,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 10,
-        "var": 2017,
-        "lv": 94,
+        "var": 2013,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90000|2&41250|4&24000|5&15000",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6114,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 94,
+        "var": 2014,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70500|2&51750|4&16500|5&22500",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6114,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 10,
-        "var": 2019,
-        "lv": 94,
+        "var": 2015,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&60000|2&27500|4&16000|5&10000",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,57 +423,17 @@
         "warId": 6114,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 94,
+        "var": 2016,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&53000|2&30000|4&14500|5&13000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6114,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 10,
-        "var": 2021,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&49500|2&32500|4&12000|5&16000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6114,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2022,
-        "lv": 94,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&48000|2&32000|4&10500|5&17000",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,17 +443,17 @@
         "warId": 6114,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2023,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2023,
-        "lv": 94,
-        "hide": 1,
+        "var": 2017,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&61875|2&40625|4&15000|5&20000",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6114,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2024,
-        "lv": 94,
-        "hide": 1,
+        "var": 2018,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&70000|2&41250|4&15625|5&14375",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6115.json b/shared/resource/warJsons/6115.json
index 2fceb016e..f81bdfec9 100644
--- a/shared/resource/warJsons/6115.json
+++ b/shared/resource/warJsons/6115.json
@@ -130,10 +130,10 @@
         "x": 8,
         "y": 12,
         "var": 2001,
-        "lv": 98,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&115200|2&52800|4&30720|5&19200",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 8,
         "y": 13,
         "var": 2002,
-        "lv": 98,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90240|2&66240|4&21120|5&28800",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 7,
         "y": 12,
         "var": 2003,
-        "lv": 98,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&76800|2&35200|4&20480|5&12800",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,50 +190,10 @@
         "x": 7,
         "y": 13,
         "var": 2004,
-        "lv": 98,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&67840|2&38400|4&18560|5&16640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6115,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2005,
-        "relation": 2,
-        "outIndex": 4,
-        "dirction": 2,
-        "x": 6,
-        "y": 12,
-        "var": 2005,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&63360|2&41600|4&15360|5&20480",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6115,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 13,
-        "var": 2006,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&61440|2&40960|4&13440|5&21760",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,17 +203,17 @@
         "warId": 6115,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2007,
+        "dataId": 2005,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 4,
         "dirction": 2,
         "x": 6,
         "y": 11,
-        "var": 2007,
-        "lv": 98,
-        "hide": 1,
+        "var": 2005,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&79200|2&52000|4&19200|5&25600",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -263,17 +223,17 @@
         "warId": 6115,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2008,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 7,
+        "outIndex": 5,
         "dirction": 2,
         "x": 7,
         "y": 11,
-        "var": 2008,
-        "lv": 98,
-        "hide": 1,
+        "var": 2006,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&89600|2&52800|4&20000|5&18400",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,17 @@
         "warId": 6115,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 13,
         "y": 4,
-        "var": 2009,
-        "lv": 98,
+        "var": 2007,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&107520|2&63360|4&24000|5&22080",
+        "attribute": "1&47040|2&27720|4&10500|5&9660",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -303,17 +263,17 @@
         "warId": 6115,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 13,
         "y": 3,
-        "var": 2010,
-        "lv": 98,
+        "var": 2008,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90240|2&66240|4&21120|5&28800",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -323,17 +283,17 @@
         "warId": 6115,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 14,
         "y": 4,
-        "var": 2011,
-        "lv": 98,
+        "var": 2009,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&76800|2&35200|4&20480|5&12800",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,57 +303,17 @@
         "warId": 6115,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 14,
         "y": 3,
-        "var": 2012,
-        "lv": 98,
+        "var": 2010,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&67840|2&38400|4&18560|5&16640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6115,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 15,
-        "y": 4,
-        "var": 2013,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&63360|2&41600|4&15360|5&20480",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6115,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 1,
-        "x": 15,
-        "y": 3,
-        "var": 2014,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&61440|2&40960|4&13440|5&21760",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -403,17 +323,17 @@
         "warId": 6115,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2015,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 14,
+        "outIndex": 10,
         "dirction": 1,
         "x": 16,
         "y": 4,
-        "var": 2015,
-        "lv": 98,
-        "hide": 1,
+        "var": 2011,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&79200|2&52000|4&19200|5&25600",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6115,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 16,
         "y": 3,
-        "var": 2016,
-        "lv": 98,
-        "hide": 1,
+        "var": 2012,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&89600|2&52800|4&20000|5&18400",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6115,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 10,
-        "var": 2017,
-        "lv": 98,
+        "var": 2013,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&115200|2&52800|4&30720|5&19200",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6115,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 98,
+        "var": 2014,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90240|2&66240|4&21120|5&28800",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6115,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 10,
-        "var": 2019,
-        "lv": 98,
+        "var": 2015,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&76800|2&35200|4&20480|5&12800",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,57 +423,17 @@
         "warId": 6115,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 98,
+        "var": 2016,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&67840|2&38400|4&18560|5&16640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6115,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 10,
-        "var": 2021,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&63360|2&41600|4&15360|5&20480",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6115,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2022,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&61440|2&40960|4&13440|5&21760",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,17 +443,17 @@
         "warId": 6115,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2023,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2023,
-        "lv": 98,
-        "hide": 1,
+        "var": 2017,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&79200|2&52000|4&19200|5&25600",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6115,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2024,
-        "lv": 98,
-        "hide": 1,
+        "var": 2018,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&89600|2&52800|4&20000|5&18400",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6116.json b/shared/resource/warJsons/6116.json
index bb4bb6525..54b92212d 100644
--- a/shared/resource/warJsons/6116.json
+++ b/shared/resource/warJsons/6116.json
@@ -130,10 +130,10 @@
         "x": 8,
         "y": 12,
         "var": 2001,
-        "lv": 98,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&115200|2&52800|4&30720|5&19200",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 8,
         "y": 13,
         "var": 2002,
-        "lv": 98,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90240|2&66240|4&21120|5&28800",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 7,
         "y": 12,
         "var": 2003,
-        "lv": 98,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&76800|2&35200|4&20480|5&12800",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,50 +190,10 @@
         "x": 7,
         "y": 13,
         "var": 2004,
-        "lv": 98,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&67840|2&38400|4&18560|5&16640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6116,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2005,
-        "relation": 2,
-        "outIndex": 4,
-        "dirction": 2,
-        "x": 6,
-        "y": 12,
-        "var": 2005,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&63360|2&41600|4&15360|5&20480",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6116,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 13,
-        "var": 2006,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&61440|2&40960|4&13440|5&21760",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,17 +203,17 @@
         "warId": 6116,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2007,
+        "dataId": 2005,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 4,
         "dirction": 2,
         "x": 6,
         "y": 11,
-        "var": 2007,
-        "lv": 98,
-        "hide": 1,
+        "var": 2005,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&79200|2&52000|4&19200|5&25600",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -263,17 +223,17 @@
         "warId": 6116,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2008,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 7,
+        "outIndex": 5,
         "dirction": 2,
         "x": 7,
         "y": 11,
-        "var": 2008,
-        "lv": 98,
-        "hide": 1,
+        "var": 2006,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&89600|2&52800|4&20000|5&18400",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,17 @@
         "warId": 6116,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 13,
         "y": 4,
-        "var": 2009,
-        "lv": 98,
+        "var": 2007,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&107520|2&63360|4&24000|5&22080",
+        "attribute": "1&47040|2&27720|4&10500|5&9660",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -303,17 +263,17 @@
         "warId": 6116,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 13,
         "y": 3,
-        "var": 2010,
-        "lv": 98,
+        "var": 2008,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90240|2&66240|4&21120|5&28800",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -323,17 +283,17 @@
         "warId": 6116,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 14,
         "y": 4,
-        "var": 2011,
-        "lv": 98,
+        "var": 2009,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&76800|2&35200|4&20480|5&12800",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,57 +303,17 @@
         "warId": 6116,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 14,
         "y": 3,
-        "var": 2012,
-        "lv": 98,
+        "var": 2010,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&67840|2&38400|4&18560|5&16640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6116,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 15,
-        "y": 4,
-        "var": 2013,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&63360|2&41600|4&15360|5&20480",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6116,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 1,
-        "x": 15,
-        "y": 3,
-        "var": 2014,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&61440|2&40960|4&13440|5&21760",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -403,17 +323,17 @@
         "warId": 6116,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2015,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 14,
+        "outIndex": 10,
         "dirction": 1,
         "x": 16,
         "y": 4,
-        "var": 2015,
-        "lv": 98,
-        "hide": 1,
+        "var": 2011,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&79200|2&52000|4&19200|5&25600",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6116,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 16,
         "y": 3,
-        "var": 2016,
-        "lv": 98,
-        "hide": 1,
+        "var": 2012,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&89600|2&52800|4&20000|5&18400",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6116,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 10,
-        "var": 2017,
-        "lv": 98,
+        "var": 2013,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&115200|2&52800|4&30720|5&19200",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6116,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 98,
+        "var": 2014,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90240|2&66240|4&21120|5&28800",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6116,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 10,
-        "var": 2019,
-        "lv": 98,
+        "var": 2015,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&76800|2&35200|4&20480|5&12800",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,57 +423,17 @@
         "warId": 6116,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 98,
+        "var": 2016,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&67840|2&38400|4&18560|5&16640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6116,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 10,
-        "var": 2021,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&63360|2&41600|4&15360|5&20480",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6116,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2022,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&61440|2&40960|4&13440|5&21760",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,17 +443,17 @@
         "warId": 6116,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2023,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2023,
-        "lv": 98,
-        "hide": 1,
+        "var": 2017,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&79200|2&52000|4&19200|5&25600",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6116,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2024,
-        "lv": 98,
-        "hide": 1,
+        "var": 2018,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&89600|2&52800|4&20000|5&18400",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6117.json b/shared/resource/warJsons/6117.json
index 48118389b..2257815d5 100644
--- a/shared/resource/warJsons/6117.json
+++ b/shared/resource/warJsons/6117.json
@@ -130,10 +130,10 @@
         "x": 8,
         "y": 12,
         "var": 2001,
-        "lv": 98,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&115200|2&52800|4&30720|5&19200",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 8,
         "y": 13,
         "var": 2002,
-        "lv": 98,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90240|2&66240|4&21120|5&28800",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 7,
         "y": 12,
         "var": 2003,
-        "lv": 98,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&76800|2&35200|4&20480|5&12800",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,50 +190,10 @@
         "x": 7,
         "y": 13,
         "var": 2004,
-        "lv": 98,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&67840|2&38400|4&18560|5&16640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6117,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2005,
-        "relation": 2,
-        "outIndex": 4,
-        "dirction": 2,
-        "x": 6,
-        "y": 12,
-        "var": 2005,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&63360|2&41600|4&15360|5&20480",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6117,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 13,
-        "var": 2006,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&61440|2&40960|4&13440|5&21760",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,17 +203,17 @@
         "warId": 6117,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2007,
+        "dataId": 2005,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 4,
         "dirction": 2,
         "x": 6,
         "y": 11,
-        "var": 2007,
-        "lv": 98,
-        "hide": 1,
+        "var": 2005,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&79200|2&52000|4&19200|5&25600",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -263,17 +223,17 @@
         "warId": 6117,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2008,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 7,
+        "outIndex": 5,
         "dirction": 2,
         "x": 7,
         "y": 11,
-        "var": 2008,
-        "lv": 98,
-        "hide": 1,
+        "var": 2006,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&89600|2&52800|4&20000|5&18400",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,17 @@
         "warId": 6117,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 13,
         "y": 4,
-        "var": 2009,
-        "lv": 98,
+        "var": 2007,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&107520|2&63360|4&24000|5&22080",
+        "attribute": "1&47040|2&27720|4&10500|5&9660",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -303,17 +263,17 @@
         "warId": 6117,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 13,
         "y": 3,
-        "var": 2010,
-        "lv": 98,
+        "var": 2008,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90240|2&66240|4&21120|5&28800",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -323,17 +283,17 @@
         "warId": 6117,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 14,
         "y": 4,
-        "var": 2011,
-        "lv": 98,
+        "var": 2009,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&76800|2&35200|4&20480|5&12800",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,57 +303,17 @@
         "warId": 6117,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 14,
         "y": 3,
-        "var": 2012,
-        "lv": 98,
+        "var": 2010,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&67840|2&38400|4&18560|5&16640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6117,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 15,
-        "y": 4,
-        "var": 2013,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&63360|2&41600|4&15360|5&20480",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6117,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 1,
-        "x": 15,
-        "y": 3,
-        "var": 2014,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&61440|2&40960|4&13440|5&21760",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -403,17 +323,17 @@
         "warId": 6117,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2015,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 14,
+        "outIndex": 10,
         "dirction": 1,
         "x": 16,
         "y": 4,
-        "var": 2015,
-        "lv": 98,
-        "hide": 1,
+        "var": 2011,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&79200|2&52000|4&19200|5&25600",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6117,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 16,
         "y": 3,
-        "var": 2016,
-        "lv": 98,
-        "hide": 1,
+        "var": 2012,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&89600|2&52800|4&20000|5&18400",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6117,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 10,
-        "var": 2017,
-        "lv": 98,
+        "var": 2013,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&115200|2&52800|4&30720|5&19200",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6117,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 98,
+        "var": 2014,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90240|2&66240|4&21120|5&28800",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6117,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 10,
-        "var": 2019,
-        "lv": 98,
+        "var": 2015,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&76800|2&35200|4&20480|5&12800",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,57 +423,17 @@
         "warId": 6117,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 98,
+        "var": 2016,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&67840|2&38400|4&18560|5&16640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6117,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 10,
-        "var": 2021,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&63360|2&41600|4&15360|5&20480",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6117,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2022,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&61440|2&40960|4&13440|5&21760",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,17 +443,17 @@
         "warId": 6117,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2023,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2023,
-        "lv": 98,
-        "hide": 1,
+        "var": 2017,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&79200|2&52000|4&19200|5&25600",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6117,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2024,
-        "lv": 98,
-        "hide": 1,
+        "var": 2018,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&89600|2&52800|4&20000|5&18400",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6118.json b/shared/resource/warJsons/6118.json
index 75f358a4e..f19d60a12 100644
--- a/shared/resource/warJsons/6118.json
+++ b/shared/resource/warJsons/6118.json
@@ -130,10 +130,10 @@
         "x": 8,
         "y": 12,
         "var": 2001,
-        "lv": 98,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&115200|2&52800|4&30720|5&19200",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 8,
         "y": 13,
         "var": 2002,
-        "lv": 98,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90240|2&66240|4&21120|5&28800",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 7,
         "y": 12,
         "var": 2003,
-        "lv": 98,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&76800|2&35200|4&20480|5&12800",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,50 +190,10 @@
         "x": 7,
         "y": 13,
         "var": 2004,
-        "lv": 98,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&67840|2&38400|4&18560|5&16640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6118,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2005,
-        "relation": 2,
-        "outIndex": 4,
-        "dirction": 2,
-        "x": 6,
-        "y": 12,
-        "var": 2005,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&63360|2&41600|4&15360|5&20480",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6118,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 13,
-        "var": 2006,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&61440|2&40960|4&13440|5&21760",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,17 +203,17 @@
         "warId": 6118,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2007,
+        "dataId": 2005,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 4,
         "dirction": 2,
         "x": 6,
         "y": 11,
-        "var": 2007,
-        "lv": 98,
-        "hide": 1,
+        "var": 2005,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&79200|2&52000|4&19200|5&25600",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -263,17 +223,17 @@
         "warId": 6118,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2008,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 7,
+        "outIndex": 5,
         "dirction": 2,
         "x": 7,
         "y": 11,
-        "var": 2008,
-        "lv": 98,
-        "hide": 1,
+        "var": 2006,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&89600|2&52800|4&20000|5&18400",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,17 @@
         "warId": 6118,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 13,
         "y": 4,
-        "var": 2009,
-        "lv": 98,
+        "var": 2007,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&107520|2&63360|4&24000|5&22080",
+        "attribute": "1&47040|2&27720|4&10500|5&9660",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -303,17 +263,17 @@
         "warId": 6118,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 13,
         "y": 3,
-        "var": 2010,
-        "lv": 98,
+        "var": 2008,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90240|2&66240|4&21120|5&28800",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -323,17 +283,17 @@
         "warId": 6118,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 14,
         "y": 4,
-        "var": 2011,
-        "lv": 98,
+        "var": 2009,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&76800|2&35200|4&20480|5&12800",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,57 +303,17 @@
         "warId": 6118,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 14,
         "y": 3,
-        "var": 2012,
-        "lv": 98,
+        "var": 2010,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&67840|2&38400|4&18560|5&16640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6118,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 15,
-        "y": 4,
-        "var": 2013,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&63360|2&41600|4&15360|5&20480",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6118,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 1,
-        "x": 15,
-        "y": 3,
-        "var": 2014,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&61440|2&40960|4&13440|5&21760",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -403,17 +323,17 @@
         "warId": 6118,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2015,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 14,
+        "outIndex": 10,
         "dirction": 1,
         "x": 16,
         "y": 4,
-        "var": 2015,
-        "lv": 98,
-        "hide": 1,
+        "var": 2011,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&79200|2&52000|4&19200|5&25600",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6118,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 16,
         "y": 3,
-        "var": 2016,
-        "lv": 98,
-        "hide": 1,
+        "var": 2012,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&89600|2&52800|4&20000|5&18400",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6118,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 10,
-        "var": 2017,
-        "lv": 98,
+        "var": 2013,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&115200|2&52800|4&30720|5&19200",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6118,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 98,
+        "var": 2014,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90240|2&66240|4&21120|5&28800",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6118,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 10,
-        "var": 2019,
-        "lv": 98,
+        "var": 2015,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&76800|2&35200|4&20480|5&12800",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,57 +423,17 @@
         "warId": 6118,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 98,
+        "var": 2016,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&67840|2&38400|4&18560|5&16640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6118,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 10,
-        "var": 2021,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&63360|2&41600|4&15360|5&20480",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6118,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2022,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&61440|2&40960|4&13440|5&21760",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,17 +443,17 @@
         "warId": 6118,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2023,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2023,
-        "lv": 98,
-        "hide": 1,
+        "var": 2017,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&79200|2&52000|4&19200|5&25600",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6118,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2024,
-        "lv": 98,
-        "hide": 1,
+        "var": 2018,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&89600|2&52800|4&20000|5&18400",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6119.json b/shared/resource/warJsons/6119.json
index e587f791a..429542a74 100644
--- a/shared/resource/warJsons/6119.json
+++ b/shared/resource/warJsons/6119.json
@@ -130,10 +130,10 @@
         "x": 8,
         "y": 12,
         "var": 2001,
-        "lv": 98,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&115200|2&52800|4&30720|5&19200",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -150,10 +150,10 @@
         "x": 8,
         "y": 13,
         "var": 2002,
-        "lv": 98,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90240|2&66240|4&21120|5&28800",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -170,10 +170,10 @@
         "x": 7,
         "y": 12,
         "var": 2003,
-        "lv": 98,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&76800|2&35200|4&20480|5&12800",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -190,50 +190,10 @@
         "x": 7,
         "y": 13,
         "var": 2004,
-        "lv": 98,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&67840|2&38400|4&18560|5&16640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6119,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2005,
-        "relation": 2,
-        "outIndex": 4,
-        "dirction": 2,
-        "x": 6,
-        "y": 12,
-        "var": 2005,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&63360|2&41600|4&15360|5&20480",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6119,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 13,
-        "var": 2006,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&61440|2&40960|4&13440|5&21760",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -243,17 +203,17 @@
         "warId": 6119,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2007,
+        "dataId": 2005,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 4,
         "dirction": 2,
         "x": 6,
         "y": 11,
-        "var": 2007,
-        "lv": 98,
-        "hide": 1,
+        "var": 2005,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&79200|2&52000|4&19200|5&25600",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -263,17 +223,17 @@
         "warId": 6119,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2008,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 7,
+        "outIndex": 5,
         "dirction": 2,
         "x": 7,
         "y": 11,
-        "var": 2008,
-        "lv": 98,
-        "hide": 1,
+        "var": 2006,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&89600|2&52800|4&20000|5&18400",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -283,17 +243,17 @@
         "warId": 6119,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 13,
         "y": 4,
-        "var": 2009,
-        "lv": 98,
+        "var": 2007,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&107520|2&63360|4&24000|5&22080",
+        "attribute": "1&47040|2&27720|4&10500|5&9660",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -303,17 +263,17 @@
         "warId": 6119,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 13,
         "y": 3,
-        "var": 2010,
-        "lv": 98,
+        "var": 2008,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90240|2&66240|4&21120|5&28800",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -323,17 +283,17 @@
         "warId": 6119,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 14,
         "y": 4,
-        "var": 2011,
-        "lv": 98,
+        "var": 2009,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&76800|2&35200|4&20480|5&12800",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -343,57 +303,17 @@
         "warId": 6119,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 14,
         "y": 3,
-        "var": 2012,
-        "lv": 98,
+        "var": 2010,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&67840|2&38400|4&18560|5&16640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6119,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 15,
-        "y": 4,
-        "var": 2013,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&63360|2&41600|4&15360|5&20480",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6119,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 1,
-        "x": 15,
-        "y": 3,
-        "var": 2014,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&61440|2&40960|4&13440|5&21760",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -403,17 +323,17 @@
         "warId": 6119,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2015,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 14,
+        "outIndex": 10,
         "dirction": 1,
         "x": 16,
         "y": 4,
-        "var": 2015,
-        "lv": 98,
-        "hide": 1,
+        "var": 2011,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&79200|2&52000|4&19200|5&25600",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -423,17 +343,17 @@
         "warId": 6119,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 16,
         "y": 3,
-        "var": 2016,
-        "lv": 98,
-        "hide": 1,
+        "var": 2012,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&89600|2&52800|4&20000|5&18400",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -443,17 +363,17 @@
         "warId": 6119,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 10,
-        "var": 2017,
-        "lv": 98,
+        "var": 2013,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&115200|2&52800|4&30720|5&19200",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -463,17 +383,17 @@
         "warId": 6119,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 98,
+        "var": 2014,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90240|2&66240|4&21120|5&28800",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -483,17 +403,17 @@
         "warId": 6119,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 10,
-        "var": 2019,
-        "lv": 98,
+        "var": 2015,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&76800|2&35200|4&20480|5&12800",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -503,57 +423,17 @@
         "warId": 6119,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 98,
+        "var": 2016,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&67840|2&38400|4&18560|5&16640",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6119,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 10,
-        "var": 2021,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&63360|2&41600|4&15360|5&20480",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6119,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2022,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&61440|2&40960|4&13440|5&21760",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -563,17 +443,17 @@
         "warId": 6119,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2023,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2023,
-        "lv": 98,
-        "hide": 1,
+        "var": 2017,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&79200|2&52000|4&19200|5&25600",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
         "star": 2,
@@ -583,17 +463,17 @@
         "warId": 6119,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2024,
-        "lv": 98,
-        "hide": 1,
+        "var": 2018,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&89600|2&52800|4&20000|5&18400",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
         "star": 2,
diff --git a/shared/resource/warJsons/6120.json b/shared/resource/warJsons/6120.json
index c73f83626..89d5794c0 100644
--- a/shared/resource/warJsons/6120.json
+++ b/shared/resource/warJsons/6120.json
@@ -130,13 +130,13 @@
         "x": 8,
         "y": 12,
         "var": 2001,
-        "lv": 98,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&115200|2&52800|4&30720|5&19200",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
-        "star": 3,
+        "star": 2,
         "spine": 0
     },
     {
@@ -150,13 +150,13 @@
         "x": 8,
         "y": 13,
         "var": 2002,
-        "lv": 98,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90240|2&66240|4&21120|5&28800",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
-        "star": 3,
+        "star": 2,
         "spine": 0
     },
     {
@@ -170,13 +170,13 @@
         "x": 7,
         "y": 12,
         "var": 2003,
-        "lv": 98,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&76800|2&35200|4&20480|5&12800",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
-        "star": 3,
+        "star": 2,
         "spine": 0
     },
     {
@@ -190,413 +190,293 @@
         "x": 7,
         "y": 13,
         "var": 2004,
-        "lv": 98,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&67840|2&38400|4&18560|5&16640",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6120,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2005,
-        "relation": 2,
-        "outIndex": 4,
-        "dirction": 2,
-        "x": 6,
-        "y": 12,
-        "var": 2005,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&63360|2&41600|4&15360|5&20480",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6120,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2006,
-        "relation": 2,
-        "outIndex": 5,
-        "dirction": 2,
-        "x": 6,
-        "y": 13,
-        "var": 2006,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&61440|2&40960|4&13440|5&21760",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
+        "star": 2,
         "spine": 0
     },
     {
         "warId": 6120,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2007,
+        "dataId": 2005,
         "relation": 2,
-        "outIndex": 6,
+        "outIndex": 4,
         "dirction": 2,
         "x": 6,
         "y": 11,
-        "var": 2007,
-        "lv": 98,
-        "hide": 1,
+        "var": 2005,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&79200|2&52000|4&19200|5&25600",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
-        "star": 3,
+        "star": 2,
         "spine": 0
     },
     {
         "warId": 6120,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2008,
+        "dataId": 2006,
         "relation": 2,
-        "outIndex": 7,
+        "outIndex": 5,
         "dirction": 2,
         "x": 7,
         "y": 11,
-        "var": 2008,
-        "lv": 98,
-        "hide": 1,
+        "var": 2006,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&89600|2&52800|4&20000|5&18400",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
-        "star": 3,
+        "star": 2,
         "spine": 0
     },
     {
         "warId": 6120,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 13,
         "y": 4,
-        "var": 2009,
-        "lv": 98,
+        "var": 2007,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&107520|2&63360|4&24000|5&22080",
+        "attribute": "1&47040|2&27720|4&10500|5&9660",
         "skill": 0,
         "seid": 0,
-        "star": 3,
+        "star": 2,
         "spine": 0
     },
     {
         "warId": 6120,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 13,
         "y": 3,
-        "var": 2010,
-        "lv": 98,
+        "var": 2008,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90240|2&66240|4&21120|5&28800",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
-        "star": 3,
+        "star": 2,
         "spine": 0
     },
     {
         "warId": 6120,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 14,
         "y": 4,
-        "var": 2011,
-        "lv": 98,
+        "var": 2009,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&76800|2&35200|4&20480|5&12800",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
-        "star": 3,
+        "star": 2,
         "spine": 0
     },
     {
         "warId": 6120,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 14,
         "y": 3,
-        "var": 2012,
-        "lv": 98,
+        "var": 2010,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&67840|2&38400|4&18560|5&16640",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6120,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2013,
-        "relation": 2,
-        "outIndex": 12,
-        "dirction": 1,
-        "x": 15,
-        "y": 4,
-        "var": 2013,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&63360|2&41600|4&15360|5&20480",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6120,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2014,
-        "relation": 2,
-        "outIndex": 13,
-        "dirction": 1,
-        "x": 15,
-        "y": 3,
-        "var": 2014,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&61440|2&40960|4&13440|5&21760",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
+        "star": 2,
         "spine": 0
     },
     {
         "warId": 6120,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2015,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 14,
+        "outIndex": 10,
         "dirction": 1,
         "x": 16,
         "y": 4,
-        "var": 2015,
-        "lv": 98,
-        "hide": 1,
+        "var": 2011,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&79200|2&52000|4&19200|5&25600",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
-        "star": 3,
+        "star": 2,
         "spine": 0
     },
     {
         "warId": 6120,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2016,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 15,
+        "outIndex": 11,
         "dirction": 1,
         "x": 16,
         "y": 3,
-        "var": 2016,
-        "lv": 98,
-        "hide": 1,
+        "var": 2012,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&89600|2&52800|4&20000|5&18400",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
-        "star": 3,
+        "star": 2,
         "spine": 0
     },
     {
         "warId": 6120,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 19,
         "y": 10,
-        "var": 2017,
-        "lv": 98,
+        "var": 2013,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&115200|2&52800|4&30720|5&19200",
+        "attribute": "1&50400|2&23100|4&13440|5&8400",
         "skill": 0,
         "seid": 0,
-        "star": 3,
+        "star": 2,
         "spine": 0
     },
     {
         "warId": 6120,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 19,
         "y": 11,
-        "var": 2018,
-        "lv": 98,
+        "var": 2014,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&90240|2&66240|4&21120|5&28800",
+        "attribute": "1&39480|2&28980|4&9240|5&12600",
         "skill": 0,
         "seid": 0,
-        "star": 3,
+        "star": 2,
         "spine": 0
     },
     {
         "warId": 6120,
         "actorName": "步兵",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 20,
         "y": 10,
-        "var": 2019,
-        "lv": 98,
+        "var": 2015,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&76800|2&35200|4&20480|5&12800",
+        "attribute": "1&33600|2&15400|4&8960|5&5600",
         "skill": 0,
         "seid": 0,
-        "star": 3,
+        "star": 2,
         "spine": 0
     },
     {
         "warId": 6120,
         "actorName": "枪兵",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 20,
         "y": 11,
-        "var": 2020,
-        "lv": 98,
+        "var": 2016,
+        "lv": 90,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&67840|2&38400|4&18560|5&16640",
+        "attribute": "1&29680|2&16800|4&8120|5&7280",
         "skill": 0,
         "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6120,
-        "actorName": "游侠",
-        "actorId": 1005,
-        "dataId": 2021,
-        "relation": 2,
-        "outIndex": 20,
-        "dirction": 1,
-        "x": 21,
-        "y": 10,
-        "var": 2021,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&63360|2&41600|4&15360|5&20480",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6120,
-        "actorName": "医生",
-        "actorId": 1007,
-        "dataId": 2022,
-        "relation": 2,
-        "outIndex": 21,
-        "dirction": 1,
-        "x": 21,
-        "y": 11,
-        "var": 2022,
-        "lv": 98,
-        "hide": 0,
-        "initial_ai": 3,
-        "attribute": "1&61440|2&40960|4&13440|5&21760",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
+        "star": 2,
         "spine": 0
     },
     {
         "warId": 6120,
         "actorName": "黄巾力士",
         "actorId": 1015,
-        "dataId": 2023,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 22,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 12,
-        "var": 2023,
-        "lv": 98,
-        "hide": 1,
+        "var": 2017,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&79200|2&52000|4&19200|5&25600",
+        "attribute": "1&34650|2&22750|4&8400|5&11200",
         "skill": 0,
         "seid": 0,
-        "star": 3,
+        "star": 2,
         "spine": 0
     },
     {
         "warId": 6120,
         "actorName": "骑兵将领",
         "actorId": 1037,
-        "dataId": 2024,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 23,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 13,
-        "var": 2024,
-        "lv": 98,
-        "hide": 1,
+        "var": 2018,
+        "lv": 90,
+        "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&89600|2&52800|4&20000|5&18400",
+        "attribute": "1&39200|2&23100|4&8750|5&8050",
         "skill": 0,
         "seid": 0,
-        "star": 3,
+        "star": 2,
         "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6121.json b/shared/resource/warJsons/6121.json
index 72f0f7b58..cfbfab982 100644
--- a/shared/resource/warJsons/6121.json
+++ b/shared/resource/warJsons/6121.json
@@ -241,55 +241,15 @@
     },
     {
         "warId": 6121,
-        "actorName": "文官将领",
-        "actorId": 1015,
+        "actorName": "刘备",
+        "actorId": 320,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 14,
-        "y": 18,
-        "var": 2007,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6121,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 15,
-        "y": 18,
-        "var": 2008,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6121,
-        "actorName": "刘备",
-        "actorId": 320,
-        "dataId": 2009,
-        "relation": 2,
-        "outIndex": 8,
-        "dirction": 1,
         "x": 21,
         "y": 11,
-        "var": 2009,
+        "var": 2007,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -303,13 +263,13 @@
         "warId": 6121,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 21,
         "y": 10,
-        "var": 2010,
+        "var": 2008,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -323,13 +283,13 @@
         "warId": 6121,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 22,
         "y": 11,
-        "var": 2011,
+        "var": 2009,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -343,13 +303,13 @@
         "warId": 6121,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 22,
         "y": 10,
-        "var": 2012,
+        "var": 2010,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -363,13 +323,13 @@
         "warId": 6121,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2013,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 12,
+        "outIndex": 10,
         "dirction": 1,
         "x": 23,
         "y": 11,
-        "var": 2013,
+        "var": 2011,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -383,13 +343,13 @@
         "warId": 6121,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2014,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 11,
         "dirction": 1,
         "x": 23,
         "y": 10,
-        "var": 2014,
+        "var": 2012,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -399,57 +359,17 @@
         "star": 3,
         "spine": 0
     },
-    {
-        "warId": 6121,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 24,
-        "y": 11,
-        "var": 2015,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6121,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 24,
-        "y": 10,
-        "var": 2016,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
     {
         "warId": 6121,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 17,
         "y": 4,
-        "var": 2017,
+        "var": 2013,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -463,13 +383,13 @@
         "warId": 6121,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 17,
         "y": 3,
-        "var": 2018,
+        "var": 2014,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -483,13 +403,13 @@
         "warId": 6121,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 18,
         "y": 4,
-        "var": 2019,
+        "var": 2015,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -503,13 +423,13 @@
         "warId": 6121,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 18,
         "y": 3,
-        "var": 2020,
+        "var": 2016,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -523,13 +443,13 @@
         "warId": 6121,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2021,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 20,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 4,
-        "var": 2021,
+        "var": 2017,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -543,13 +463,13 @@
         "warId": 6121,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2022,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 3,
-        "var": 2022,
+        "var": 2018,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -558,45 +478,5 @@
         "seid": 0,
         "star": 3,
         "spine": 0
-    },
-    {
-        "warId": 6121,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 20,
-        "y": 4,
-        "var": 2023,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6121,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 3,
-        "var": 2024,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6122.json b/shared/resource/warJsons/6122.json
index ed6f26cce..05b318237 100644
--- a/shared/resource/warJsons/6122.json
+++ b/shared/resource/warJsons/6122.json
@@ -241,55 +241,15 @@
     },
     {
         "warId": 6122,
-        "actorName": "文官将领",
-        "actorId": 1015,
+        "actorName": "刘备",
+        "actorId": 320,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 14,
-        "y": 18,
-        "var": 2007,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6122,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 15,
-        "y": 18,
-        "var": 2008,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6122,
-        "actorName": "刘备",
-        "actorId": 320,
-        "dataId": 2009,
-        "relation": 2,
-        "outIndex": 8,
-        "dirction": 1,
         "x": 21,
         "y": 11,
-        "var": 2009,
+        "var": 2007,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -303,13 +263,13 @@
         "warId": 6122,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 21,
         "y": 10,
-        "var": 2010,
+        "var": 2008,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -323,13 +283,13 @@
         "warId": 6122,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 22,
         "y": 11,
-        "var": 2011,
+        "var": 2009,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -343,13 +303,13 @@
         "warId": 6122,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 22,
         "y": 10,
-        "var": 2012,
+        "var": 2010,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -363,13 +323,13 @@
         "warId": 6122,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2013,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 12,
+        "outIndex": 10,
         "dirction": 1,
         "x": 23,
         "y": 11,
-        "var": 2013,
+        "var": 2011,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -383,13 +343,13 @@
         "warId": 6122,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2014,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 11,
         "dirction": 1,
         "x": 23,
         "y": 10,
-        "var": 2014,
+        "var": 2012,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -399,57 +359,17 @@
         "star": 3,
         "spine": 0
     },
-    {
-        "warId": 6122,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 24,
-        "y": 11,
-        "var": 2015,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6122,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 24,
-        "y": 10,
-        "var": 2016,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
     {
         "warId": 6122,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 17,
         "y": 4,
-        "var": 2017,
+        "var": 2013,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -463,13 +383,13 @@
         "warId": 6122,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 17,
         "y": 3,
-        "var": 2018,
+        "var": 2014,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -483,13 +403,13 @@
         "warId": 6122,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 18,
         "y": 4,
-        "var": 2019,
+        "var": 2015,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -503,13 +423,13 @@
         "warId": 6122,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 18,
         "y": 3,
-        "var": 2020,
+        "var": 2016,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -523,13 +443,13 @@
         "warId": 6122,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2021,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 20,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 4,
-        "var": 2021,
+        "var": 2017,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -543,13 +463,13 @@
         "warId": 6122,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2022,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 3,
-        "var": 2022,
+        "var": 2018,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -558,45 +478,5 @@
         "seid": 0,
         "star": 3,
         "spine": 0
-    },
-    {
-        "warId": 6122,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 20,
-        "y": 4,
-        "var": 2023,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6122,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 3,
-        "var": 2024,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6123.json b/shared/resource/warJsons/6123.json
index faa2b988d..7c2513960 100644
--- a/shared/resource/warJsons/6123.json
+++ b/shared/resource/warJsons/6123.json
@@ -241,55 +241,15 @@
     },
     {
         "warId": 6123,
-        "actorName": "文官将领",
-        "actorId": 1015,
+        "actorName": "刘备",
+        "actorId": 320,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 14,
-        "y": 18,
-        "var": 2007,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6123,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 15,
-        "y": 18,
-        "var": 2008,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6123,
-        "actorName": "刘备",
-        "actorId": 320,
-        "dataId": 2009,
-        "relation": 2,
-        "outIndex": 8,
-        "dirction": 1,
         "x": 21,
         "y": 11,
-        "var": 2009,
+        "var": 2007,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -303,13 +263,13 @@
         "warId": 6123,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 21,
         "y": 10,
-        "var": 2010,
+        "var": 2008,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -323,13 +283,13 @@
         "warId": 6123,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 22,
         "y": 11,
-        "var": 2011,
+        "var": 2009,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -343,13 +303,13 @@
         "warId": 6123,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 22,
         "y": 10,
-        "var": 2012,
+        "var": 2010,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -363,13 +323,13 @@
         "warId": 6123,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2013,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 12,
+        "outIndex": 10,
         "dirction": 1,
         "x": 23,
         "y": 11,
-        "var": 2013,
+        "var": 2011,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -383,13 +343,13 @@
         "warId": 6123,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2014,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 11,
         "dirction": 1,
         "x": 23,
         "y": 10,
-        "var": 2014,
+        "var": 2012,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -399,57 +359,17 @@
         "star": 3,
         "spine": 0
     },
-    {
-        "warId": 6123,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 24,
-        "y": 11,
-        "var": 2015,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6123,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 24,
-        "y": 10,
-        "var": 2016,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
     {
         "warId": 6123,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 17,
         "y": 4,
-        "var": 2017,
+        "var": 2013,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -463,13 +383,13 @@
         "warId": 6123,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 17,
         "y": 3,
-        "var": 2018,
+        "var": 2014,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -483,13 +403,13 @@
         "warId": 6123,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 18,
         "y": 4,
-        "var": 2019,
+        "var": 2015,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -503,13 +423,13 @@
         "warId": 6123,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 18,
         "y": 3,
-        "var": 2020,
+        "var": 2016,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -523,13 +443,13 @@
         "warId": 6123,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2021,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 20,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 4,
-        "var": 2021,
+        "var": 2017,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -543,13 +463,13 @@
         "warId": 6123,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2022,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 3,
-        "var": 2022,
+        "var": 2018,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -558,45 +478,5 @@
         "seid": 0,
         "star": 3,
         "spine": 0
-    },
-    {
-        "warId": 6123,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 20,
-        "y": 4,
-        "var": 2023,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6123,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 3,
-        "var": 2024,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6124.json b/shared/resource/warJsons/6124.json
index 7b81b4e1c..f790e7a11 100644
--- a/shared/resource/warJsons/6124.json
+++ b/shared/resource/warJsons/6124.json
@@ -241,55 +241,15 @@
     },
     {
         "warId": 6124,
-        "actorName": "文官将领",
-        "actorId": 1015,
+        "actorName": "刘备",
+        "actorId": 320,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 14,
-        "y": 18,
-        "var": 2007,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6124,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 15,
-        "y": 18,
-        "var": 2008,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6124,
-        "actorName": "刘备",
-        "actorId": 320,
-        "dataId": 2009,
-        "relation": 2,
-        "outIndex": 8,
-        "dirction": 1,
         "x": 21,
         "y": 11,
-        "var": 2009,
+        "var": 2007,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -303,13 +263,13 @@
         "warId": 6124,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 21,
         "y": 10,
-        "var": 2010,
+        "var": 2008,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -323,13 +283,13 @@
         "warId": 6124,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 22,
         "y": 11,
-        "var": 2011,
+        "var": 2009,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -343,13 +303,13 @@
         "warId": 6124,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 22,
         "y": 10,
-        "var": 2012,
+        "var": 2010,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -363,13 +323,13 @@
         "warId": 6124,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2013,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 12,
+        "outIndex": 10,
         "dirction": 1,
         "x": 23,
         "y": 11,
-        "var": 2013,
+        "var": 2011,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -383,13 +343,13 @@
         "warId": 6124,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2014,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 11,
         "dirction": 1,
         "x": 23,
         "y": 10,
-        "var": 2014,
+        "var": 2012,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -399,57 +359,17 @@
         "star": 3,
         "spine": 0
     },
-    {
-        "warId": 6124,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 24,
-        "y": 11,
-        "var": 2015,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6124,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 24,
-        "y": 10,
-        "var": 2016,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
     {
         "warId": 6124,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 17,
         "y": 4,
-        "var": 2017,
+        "var": 2013,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -463,13 +383,13 @@
         "warId": 6124,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 17,
         "y": 3,
-        "var": 2018,
+        "var": 2014,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -483,13 +403,13 @@
         "warId": 6124,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 18,
         "y": 4,
-        "var": 2019,
+        "var": 2015,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -503,13 +423,13 @@
         "warId": 6124,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 18,
         "y": 3,
-        "var": 2020,
+        "var": 2016,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -523,13 +443,13 @@
         "warId": 6124,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2021,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 20,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 4,
-        "var": 2021,
+        "var": 2017,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -543,13 +463,13 @@
         "warId": 6124,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2022,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 3,
-        "var": 2022,
+        "var": 2018,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -558,45 +478,5 @@
         "seid": 0,
         "star": 3,
         "spine": 0
-    },
-    {
-        "warId": 6124,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 20,
-        "y": 4,
-        "var": 2023,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6124,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 3,
-        "var": 2024,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6125.json b/shared/resource/warJsons/6125.json
index d8b7d6be8..a7bb6783b 100644
--- a/shared/resource/warJsons/6125.json
+++ b/shared/resource/warJsons/6125.json
@@ -241,55 +241,15 @@
     },
     {
         "warId": 6125,
-        "actorName": "文官将领",
-        "actorId": 1015,
+        "actorName": "刘备",
+        "actorId": 320,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 14,
-        "y": 18,
-        "var": 2007,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6125,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 15,
-        "y": 18,
-        "var": 2008,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6125,
-        "actorName": "刘备",
-        "actorId": 320,
-        "dataId": 2009,
-        "relation": 2,
-        "outIndex": 8,
-        "dirction": 1,
         "x": 21,
         "y": 11,
-        "var": 2009,
+        "var": 2007,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -303,13 +263,13 @@
         "warId": 6125,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 21,
         "y": 10,
-        "var": 2010,
+        "var": 2008,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -323,13 +283,13 @@
         "warId": 6125,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 22,
         "y": 11,
-        "var": 2011,
+        "var": 2009,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -343,13 +303,13 @@
         "warId": 6125,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 22,
         "y": 10,
-        "var": 2012,
+        "var": 2010,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -363,13 +323,13 @@
         "warId": 6125,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2013,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 12,
+        "outIndex": 10,
         "dirction": 1,
         "x": 23,
         "y": 11,
-        "var": 2013,
+        "var": 2011,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -383,13 +343,13 @@
         "warId": 6125,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2014,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 11,
         "dirction": 1,
         "x": 23,
         "y": 10,
-        "var": 2014,
+        "var": 2012,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -399,57 +359,17 @@
         "star": 3,
         "spine": 0
     },
-    {
-        "warId": 6125,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 24,
-        "y": 11,
-        "var": 2015,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6125,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 24,
-        "y": 10,
-        "var": 2016,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
     {
         "warId": 6125,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 17,
         "y": 4,
-        "var": 2017,
+        "var": 2013,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -463,13 +383,13 @@
         "warId": 6125,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 17,
         "y": 3,
-        "var": 2018,
+        "var": 2014,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -483,13 +403,13 @@
         "warId": 6125,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 18,
         "y": 4,
-        "var": 2019,
+        "var": 2015,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -503,13 +423,13 @@
         "warId": 6125,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 18,
         "y": 3,
-        "var": 2020,
+        "var": 2016,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -523,13 +443,13 @@
         "warId": 6125,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2021,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 20,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 4,
-        "var": 2021,
+        "var": 2017,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -543,13 +463,13 @@
         "warId": 6125,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2022,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 3,
-        "var": 2022,
+        "var": 2018,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -558,45 +478,5 @@
         "seid": 0,
         "star": 3,
         "spine": 0
-    },
-    {
-        "warId": 6125,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 20,
-        "y": 4,
-        "var": 2023,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6125,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 3,
-        "var": 2024,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6126.json b/shared/resource/warJsons/6126.json
index a2ff2e79f..12d51a35b 100644
--- a/shared/resource/warJsons/6126.json
+++ b/shared/resource/warJsons/6126.json
@@ -241,55 +241,15 @@
     },
     {
         "warId": 6126,
-        "actorName": "文官将领",
-        "actorId": 1015,
+        "actorName": "刘备",
+        "actorId": 320,
         "dataId": 2007,
         "relation": 2,
         "outIndex": 6,
         "dirction": 1,
-        "x": 14,
-        "y": 18,
-        "var": 2007,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6126,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 15,
-        "y": 18,
-        "var": 2008,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6126,
-        "actorName": "刘备",
-        "actorId": 320,
-        "dataId": 2009,
-        "relation": 2,
-        "outIndex": 8,
-        "dirction": 1,
         "x": 21,
         "y": 11,
-        "var": 2009,
+        "var": 2007,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -303,13 +263,13 @@
         "warId": 6126,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 21,
         "y": 10,
-        "var": 2010,
+        "var": 2008,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -323,13 +283,13 @@
         "warId": 6126,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 22,
         "y": 11,
-        "var": 2011,
+        "var": 2009,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -343,13 +303,13 @@
         "warId": 6126,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 22,
         "y": 10,
-        "var": 2012,
+        "var": 2010,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -363,13 +323,13 @@
         "warId": 6126,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2013,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 12,
+        "outIndex": 10,
         "dirction": 1,
         "x": 23,
         "y": 11,
-        "var": 2013,
+        "var": 2011,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -383,13 +343,13 @@
         "warId": 6126,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2014,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 11,
         "dirction": 1,
         "x": 23,
         "y": 10,
-        "var": 2014,
+        "var": 2012,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -399,57 +359,17 @@
         "star": 3,
         "spine": 0
     },
-    {
-        "warId": 6126,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 24,
-        "y": 11,
-        "var": 2015,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6126,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 24,
-        "y": 10,
-        "var": 2016,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
     {
         "warId": 6126,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 17,
         "y": 4,
-        "var": 2017,
+        "var": 2013,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -463,13 +383,13 @@
         "warId": 6126,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 17,
         "y": 3,
-        "var": 2018,
+        "var": 2014,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -483,13 +403,13 @@
         "warId": 6126,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 18,
         "y": 4,
-        "var": 2019,
+        "var": 2015,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -503,13 +423,13 @@
         "warId": 6126,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 18,
         "y": 3,
-        "var": 2020,
+        "var": 2016,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -523,13 +443,13 @@
         "warId": 6126,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2021,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 20,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 4,
-        "var": 2021,
+        "var": 2017,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -543,13 +463,13 @@
         "warId": 6126,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2022,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 3,
-        "var": 2022,
+        "var": 2018,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
@@ -558,45 +478,5 @@
         "seid": 0,
         "star": 3,
         "spine": 0
-    },
-    {
-        "warId": 6126,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 20,
-        "y": 4,
-        "var": 2023,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6126,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 3,
-        "var": 2024,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&56400|2&41400|4&13200|5&18000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/warJsons/6127.json b/shared/resource/warJsons/6127.json
index 4600380f2..2260efeb4 100644
--- a/shared/resource/warJsons/6127.json
+++ b/shared/resource/warJsons/6127.json
@@ -133,7 +133,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&118800|2&54450|4&31680|5&19800",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -153,7 +153,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&93060|2&68310|4&21780|5&29700",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -173,7 +173,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -193,7 +193,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -213,7 +213,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -233,47 +233,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6127,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 1,
-        "x": 14,
-        "y": 18,
-        "var": 2007,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6127,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 15,
-        "y": 18,
-        "var": 2008,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -283,17 +243,17 @@
         "warId": 6127,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 21,
         "y": 11,
-        "var": 2009,
+        "var": 2007,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&110880|2&65340|4&24750|5&22770",
+        "attribute": "1&80640|2&47520|4&18000|5&16560",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -303,17 +263,17 @@
         "warId": 6127,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 21,
         "y": 10,
-        "var": 2010,
+        "var": 2008,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&93060|2&68310|4&21780|5&29700",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -323,17 +283,17 @@
         "warId": 6127,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 22,
         "y": 11,
-        "var": 2011,
+        "var": 2009,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -343,17 +303,17 @@
         "warId": 6127,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 22,
         "y": 10,
-        "var": 2012,
+        "var": 2010,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -363,17 +323,17 @@
         "warId": 6127,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2013,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 12,
+        "outIndex": 10,
         "dirction": 1,
         "x": 23,
         "y": 11,
-        "var": 2013,
+        "var": 2011,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -383,57 +343,17 @@
         "warId": 6127,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2014,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 11,
         "dirction": 1,
         "x": 23,
         "y": 10,
-        "var": 2014,
+        "var": 2012,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6127,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 24,
-        "y": 11,
-        "var": 2015,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6127,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 24,
-        "y": 10,
-        "var": 2016,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -443,17 +363,17 @@
         "warId": 6127,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 17,
         "y": 4,
-        "var": 2017,
+        "var": 2013,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&118800|2&54450|4&31680|5&19800",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -463,17 +383,17 @@
         "warId": 6127,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 17,
         "y": 3,
-        "var": 2018,
+        "var": 2014,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&93060|2&68310|4&21780|5&29700",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -483,17 +403,17 @@
         "warId": 6127,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 18,
         "y": 4,
-        "var": 2019,
+        "var": 2015,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -503,17 +423,17 @@
         "warId": 6127,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 18,
         "y": 3,
-        "var": 2020,
+        "var": 2016,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -523,17 +443,17 @@
         "warId": 6127,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2021,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 20,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 4,
-        "var": 2021,
+        "var": 2017,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -543,57 +463,17 @@
         "warId": 6127,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2022,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 3,
-        "var": 2022,
+        "var": 2018,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6127,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 20,
-        "y": 4,
-        "var": 2023,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6127,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 3,
-        "var": 2024,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
diff --git a/shared/resource/warJsons/6128.json b/shared/resource/warJsons/6128.json
index ff2431f5c..ce812ed1d 100644
--- a/shared/resource/warJsons/6128.json
+++ b/shared/resource/warJsons/6128.json
@@ -133,7 +133,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&118800|2&54450|4&31680|5&19800",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -153,7 +153,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&93060|2&68310|4&21780|5&29700",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -173,7 +173,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -193,7 +193,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -213,7 +213,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -233,47 +233,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6128,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 1,
-        "x": 14,
-        "y": 18,
-        "var": 2007,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6128,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 15,
-        "y": 18,
-        "var": 2008,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -283,17 +243,17 @@
         "warId": 6128,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 21,
         "y": 11,
-        "var": 2009,
+        "var": 2007,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&110880|2&65340|4&24750|5&22770",
+        "attribute": "1&80640|2&47520|4&18000|5&16560",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -303,17 +263,17 @@
         "warId": 6128,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 21,
         "y": 10,
-        "var": 2010,
+        "var": 2008,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&93060|2&68310|4&21780|5&29700",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -323,17 +283,17 @@
         "warId": 6128,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 22,
         "y": 11,
-        "var": 2011,
+        "var": 2009,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -343,17 +303,17 @@
         "warId": 6128,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 22,
         "y": 10,
-        "var": 2012,
+        "var": 2010,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -363,17 +323,17 @@
         "warId": 6128,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2013,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 12,
+        "outIndex": 10,
         "dirction": 1,
         "x": 23,
         "y": 11,
-        "var": 2013,
+        "var": 2011,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -383,57 +343,17 @@
         "warId": 6128,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2014,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 11,
         "dirction": 1,
         "x": 23,
         "y": 10,
-        "var": 2014,
+        "var": 2012,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6128,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 24,
-        "y": 11,
-        "var": 2015,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6128,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 24,
-        "y": 10,
-        "var": 2016,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -443,17 +363,17 @@
         "warId": 6128,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 17,
         "y": 4,
-        "var": 2017,
+        "var": 2013,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&118800|2&54450|4&31680|5&19800",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -463,17 +383,17 @@
         "warId": 6128,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 17,
         "y": 3,
-        "var": 2018,
+        "var": 2014,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&93060|2&68310|4&21780|5&29700",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -483,17 +403,17 @@
         "warId": 6128,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 18,
         "y": 4,
-        "var": 2019,
+        "var": 2015,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -503,17 +423,17 @@
         "warId": 6128,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 18,
         "y": 3,
-        "var": 2020,
+        "var": 2016,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -523,17 +443,17 @@
         "warId": 6128,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2021,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 20,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 4,
-        "var": 2021,
+        "var": 2017,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -543,57 +463,17 @@
         "warId": 6128,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2022,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 3,
-        "var": 2022,
+        "var": 2018,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6128,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 20,
-        "y": 4,
-        "var": 2023,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6128,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 3,
-        "var": 2024,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
diff --git a/shared/resource/warJsons/6129.json b/shared/resource/warJsons/6129.json
index 70d568b66..d602fc0fc 100644
--- a/shared/resource/warJsons/6129.json
+++ b/shared/resource/warJsons/6129.json
@@ -133,7 +133,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&118800|2&54450|4&31680|5&19800",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -153,7 +153,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&93060|2&68310|4&21780|5&29700",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -173,7 +173,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -193,7 +193,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -213,7 +213,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -233,47 +233,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6129,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 1,
-        "x": 14,
-        "y": 18,
-        "var": 2007,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6129,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 15,
-        "y": 18,
-        "var": 2008,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -283,17 +243,17 @@
         "warId": 6129,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 21,
         "y": 11,
-        "var": 2009,
+        "var": 2007,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&110880|2&65340|4&24750|5&22770",
+        "attribute": "1&80640|2&47520|4&18000|5&16560",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -303,17 +263,17 @@
         "warId": 6129,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 21,
         "y": 10,
-        "var": 2010,
+        "var": 2008,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&93060|2&68310|4&21780|5&29700",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -323,17 +283,17 @@
         "warId": 6129,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 22,
         "y": 11,
-        "var": 2011,
+        "var": 2009,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -343,17 +303,17 @@
         "warId": 6129,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 22,
         "y": 10,
-        "var": 2012,
+        "var": 2010,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -363,17 +323,17 @@
         "warId": 6129,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2013,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 12,
+        "outIndex": 10,
         "dirction": 1,
         "x": 23,
         "y": 11,
-        "var": 2013,
+        "var": 2011,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -383,57 +343,17 @@
         "warId": 6129,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2014,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 11,
         "dirction": 1,
         "x": 23,
         "y": 10,
-        "var": 2014,
+        "var": 2012,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6129,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 24,
-        "y": 11,
-        "var": 2015,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6129,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 24,
-        "y": 10,
-        "var": 2016,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -443,17 +363,17 @@
         "warId": 6129,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 17,
         "y": 4,
-        "var": 2017,
+        "var": 2013,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&118800|2&54450|4&31680|5&19800",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -463,17 +383,17 @@
         "warId": 6129,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 17,
         "y": 3,
-        "var": 2018,
+        "var": 2014,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&93060|2&68310|4&21780|5&29700",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -483,17 +403,17 @@
         "warId": 6129,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 18,
         "y": 4,
-        "var": 2019,
+        "var": 2015,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -503,17 +423,17 @@
         "warId": 6129,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 18,
         "y": 3,
-        "var": 2020,
+        "var": 2016,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -523,17 +443,17 @@
         "warId": 6129,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2021,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 20,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 4,
-        "var": 2021,
+        "var": 2017,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -543,57 +463,17 @@
         "warId": 6129,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2022,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 3,
-        "var": 2022,
+        "var": 2018,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6129,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 20,
-        "y": 4,
-        "var": 2023,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6129,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 3,
-        "var": 2024,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
diff --git a/shared/resource/warJsons/6130.json b/shared/resource/warJsons/6130.json
index 682225f46..60b115170 100644
--- a/shared/resource/warJsons/6130.json
+++ b/shared/resource/warJsons/6130.json
@@ -133,7 +133,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&118800|2&54450|4&31680|5&19800",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -153,7 +153,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&93060|2&68310|4&21780|5&29700",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -173,7 +173,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -193,7 +193,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -213,7 +213,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -233,47 +233,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6130,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 1,
-        "x": 14,
-        "y": 18,
-        "var": 2007,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6130,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 15,
-        "y": 18,
-        "var": 2008,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -283,17 +243,17 @@
         "warId": 6130,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 21,
         "y": 11,
-        "var": 2009,
+        "var": 2007,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&110880|2&65340|4&24750|5&22770",
+        "attribute": "1&80640|2&47520|4&18000|5&16560",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -303,17 +263,17 @@
         "warId": 6130,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 21,
         "y": 10,
-        "var": 2010,
+        "var": 2008,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&93060|2&68310|4&21780|5&29700",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -323,17 +283,17 @@
         "warId": 6130,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 22,
         "y": 11,
-        "var": 2011,
+        "var": 2009,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -343,17 +303,17 @@
         "warId": 6130,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 22,
         "y": 10,
-        "var": 2012,
+        "var": 2010,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -363,17 +323,17 @@
         "warId": 6130,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2013,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 12,
+        "outIndex": 10,
         "dirction": 1,
         "x": 23,
         "y": 11,
-        "var": 2013,
+        "var": 2011,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -383,57 +343,17 @@
         "warId": 6130,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2014,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 11,
         "dirction": 1,
         "x": 23,
         "y": 10,
-        "var": 2014,
+        "var": 2012,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6130,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 24,
-        "y": 11,
-        "var": 2015,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6130,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 24,
-        "y": 10,
-        "var": 2016,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -443,17 +363,17 @@
         "warId": 6130,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 17,
         "y": 4,
-        "var": 2017,
+        "var": 2013,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&118800|2&54450|4&31680|5&19800",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -463,17 +383,17 @@
         "warId": 6130,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 17,
         "y": 3,
-        "var": 2018,
+        "var": 2014,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&93060|2&68310|4&21780|5&29700",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -483,17 +403,17 @@
         "warId": 6130,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 18,
         "y": 4,
-        "var": 2019,
+        "var": 2015,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -503,17 +423,17 @@
         "warId": 6130,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 18,
         "y": 3,
-        "var": 2020,
+        "var": 2016,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -523,17 +443,17 @@
         "warId": 6130,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2021,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 20,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 4,
-        "var": 2021,
+        "var": 2017,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -543,57 +463,17 @@
         "warId": 6130,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2022,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 3,
-        "var": 2022,
+        "var": 2018,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6130,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 20,
-        "y": 4,
-        "var": 2023,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6130,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 3,
-        "var": 2024,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
diff --git a/shared/resource/warJsons/6131.json b/shared/resource/warJsons/6131.json
index 25a9d53bb..23c7b5256 100644
--- a/shared/resource/warJsons/6131.json
+++ b/shared/resource/warJsons/6131.json
@@ -133,7 +133,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&118800|2&54450|4&31680|5&19800",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -153,7 +153,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&93060|2&68310|4&21780|5&29700",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -173,7 +173,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -193,7 +193,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -213,7 +213,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -233,47 +233,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6131,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 1,
-        "x": 14,
-        "y": 18,
-        "var": 2007,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6131,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 15,
-        "y": 18,
-        "var": 2008,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -283,17 +243,17 @@
         "warId": 6131,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 21,
         "y": 11,
-        "var": 2009,
+        "var": 2007,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&110880|2&65340|4&24750|5&22770",
+        "attribute": "1&80640|2&47520|4&18000|5&16560",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -303,17 +263,17 @@
         "warId": 6131,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 21,
         "y": 10,
-        "var": 2010,
+        "var": 2008,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&93060|2&68310|4&21780|5&29700",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -323,17 +283,17 @@
         "warId": 6131,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 22,
         "y": 11,
-        "var": 2011,
+        "var": 2009,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -343,17 +303,17 @@
         "warId": 6131,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 22,
         "y": 10,
-        "var": 2012,
+        "var": 2010,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -363,17 +323,17 @@
         "warId": 6131,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2013,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 12,
+        "outIndex": 10,
         "dirction": 1,
         "x": 23,
         "y": 11,
-        "var": 2013,
+        "var": 2011,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -383,57 +343,17 @@
         "warId": 6131,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2014,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 11,
         "dirction": 1,
         "x": 23,
         "y": 10,
-        "var": 2014,
+        "var": 2012,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6131,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 24,
-        "y": 11,
-        "var": 2015,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6131,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 24,
-        "y": 10,
-        "var": 2016,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -443,17 +363,17 @@
         "warId": 6131,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 17,
         "y": 4,
-        "var": 2017,
+        "var": 2013,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&118800|2&54450|4&31680|5&19800",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -463,17 +383,17 @@
         "warId": 6131,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 17,
         "y": 3,
-        "var": 2018,
+        "var": 2014,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&93060|2&68310|4&21780|5&29700",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -483,17 +403,17 @@
         "warId": 6131,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 18,
         "y": 4,
-        "var": 2019,
+        "var": 2015,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -503,17 +423,17 @@
         "warId": 6131,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 18,
         "y": 3,
-        "var": 2020,
+        "var": 2016,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -523,17 +443,17 @@
         "warId": 6131,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2021,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 20,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 4,
-        "var": 2021,
+        "var": 2017,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -543,57 +463,17 @@
         "warId": 6131,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2022,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 3,
-        "var": 2022,
+        "var": 2018,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6131,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 20,
-        "y": 4,
-        "var": 2023,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6131,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 3,
-        "var": 2024,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
diff --git a/shared/resource/warJsons/6132.json b/shared/resource/warJsons/6132.json
index f99aa16ce..5c8d13f5b 100644
--- a/shared/resource/warJsons/6132.json
+++ b/shared/resource/warJsons/6132.json
@@ -133,7 +133,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&118800|2&54450|4&31680|5&19800",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -153,7 +153,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&93060|2&68310|4&21780|5&29700",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -173,7 +173,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -193,7 +193,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -213,7 +213,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -233,47 +233,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6132,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 1,
-        "x": 14,
-        "y": 18,
-        "var": 2007,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6132,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 15,
-        "y": 18,
-        "var": 2008,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -283,17 +243,17 @@
         "warId": 6132,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 21,
         "y": 11,
-        "var": 2009,
+        "var": 2007,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&110880|2&65340|4&24750|5&22770",
+        "attribute": "1&80640|2&47520|4&18000|5&16560",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -303,17 +263,17 @@
         "warId": 6132,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 21,
         "y": 10,
-        "var": 2010,
+        "var": 2008,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&93060|2&68310|4&21780|5&29700",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -323,17 +283,17 @@
         "warId": 6132,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 22,
         "y": 11,
-        "var": 2011,
+        "var": 2009,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -343,17 +303,17 @@
         "warId": 6132,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 22,
         "y": 10,
-        "var": 2012,
+        "var": 2010,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -363,17 +323,17 @@
         "warId": 6132,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2013,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 12,
+        "outIndex": 10,
         "dirction": 1,
         "x": 23,
         "y": 11,
-        "var": 2013,
+        "var": 2011,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -383,57 +343,17 @@
         "warId": 6132,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2014,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 11,
         "dirction": 1,
         "x": 23,
         "y": 10,
-        "var": 2014,
+        "var": 2012,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6132,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 24,
-        "y": 11,
-        "var": 2015,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6132,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 24,
-        "y": 10,
-        "var": 2016,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -443,17 +363,17 @@
         "warId": 6132,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 17,
         "y": 4,
-        "var": 2017,
+        "var": 2013,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&118800|2&54450|4&31680|5&19800",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -463,17 +383,17 @@
         "warId": 6132,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 17,
         "y": 3,
-        "var": 2018,
+        "var": 2014,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&93060|2&68310|4&21780|5&29700",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -483,17 +403,17 @@
         "warId": 6132,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 18,
         "y": 4,
-        "var": 2019,
+        "var": 2015,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -503,17 +423,17 @@
         "warId": 6132,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 18,
         "y": 3,
-        "var": 2020,
+        "var": 2016,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&99000|2&45375|4&26400|5&16500",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -523,17 +443,17 @@
         "warId": 6132,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2021,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 20,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 4,
-        "var": 2021,
+        "var": 2017,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -543,57 +463,17 @@
         "warId": 6132,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2022,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 3,
-        "var": 2022,
+        "var": 2018,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&87450|2&49500|4&23925|5&21450",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6132,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 20,
-        "y": 4,
-        "var": 2023,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6132,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 3,
-        "var": 2024,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&77550|2&56925|4&18150|5&24750",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
diff --git a/shared/resource/warJsons/6133.json b/shared/resource/warJsons/6133.json
index 851c6f847..e65c96c44 100644
--- a/shared/resource/warJsons/6133.json
+++ b/shared/resource/warJsons/6133.json
@@ -133,7 +133,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&158400|2&72600|4&42240|5&26400",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -153,7 +153,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&124080|2&91080|4&29040|5&39600",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -173,7 +173,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -193,7 +193,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -213,7 +213,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -233,47 +233,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6133,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 1,
-        "x": 14,
-        "y": 18,
-        "var": 2007,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6133,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 15,
-        "y": 18,
-        "var": 2008,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -283,17 +243,17 @@
         "warId": 6133,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 21,
         "y": 11,
-        "var": 2009,
+        "var": 2007,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&147840|2&87120|4&33000|5&30360",
+        "attribute": "1&80640|2&47520|4&18000|5&16560",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -303,17 +263,17 @@
         "warId": 6133,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 21,
         "y": 10,
-        "var": 2010,
+        "var": 2008,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&124080|2&91080|4&29040|5&39600",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -323,17 +283,17 @@
         "warId": 6133,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 22,
         "y": 11,
-        "var": 2011,
+        "var": 2009,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -343,17 +303,17 @@
         "warId": 6133,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 22,
         "y": 10,
-        "var": 2012,
+        "var": 2010,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -363,17 +323,17 @@
         "warId": 6133,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2013,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 12,
+        "outIndex": 10,
         "dirction": 1,
         "x": 23,
         "y": 11,
-        "var": 2013,
+        "var": 2011,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -383,57 +343,17 @@
         "warId": 6133,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2014,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 11,
         "dirction": 1,
         "x": 23,
         "y": 10,
-        "var": 2014,
+        "var": 2012,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6133,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 24,
-        "y": 11,
-        "var": 2015,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6133,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 24,
-        "y": 10,
-        "var": 2016,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -443,17 +363,17 @@
         "warId": 6133,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 17,
         "y": 4,
-        "var": 2017,
+        "var": 2013,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&158400|2&72600|4&42240|5&26400",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -463,17 +383,17 @@
         "warId": 6133,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 17,
         "y": 3,
-        "var": 2018,
+        "var": 2014,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&124080|2&91080|4&29040|5&39600",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -483,17 +403,17 @@
         "warId": 6133,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 18,
         "y": 4,
-        "var": 2019,
+        "var": 2015,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -503,17 +423,17 @@
         "warId": 6133,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 18,
         "y": 3,
-        "var": 2020,
+        "var": 2016,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -523,17 +443,17 @@
         "warId": 6133,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2021,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 20,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 4,
-        "var": 2021,
+        "var": 2017,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -543,57 +463,17 @@
         "warId": 6133,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2022,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 3,
-        "var": 2022,
+        "var": 2018,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6133,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 20,
-        "y": 4,
-        "var": 2023,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6133,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 3,
-        "var": 2024,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
diff --git a/shared/resource/warJsons/6134.json b/shared/resource/warJsons/6134.json
index 0742a7069..28fa0cf87 100644
--- a/shared/resource/warJsons/6134.json
+++ b/shared/resource/warJsons/6134.json
@@ -133,7 +133,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&158400|2&72600|4&42240|5&26400",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -153,7 +153,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&124080|2&91080|4&29040|5&39600",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -173,7 +173,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -193,7 +193,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -213,7 +213,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -233,47 +233,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6134,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 1,
-        "x": 14,
-        "y": 18,
-        "var": 2007,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6134,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 15,
-        "y": 18,
-        "var": 2008,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -283,17 +243,17 @@
         "warId": 6134,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 21,
         "y": 11,
-        "var": 2009,
+        "var": 2007,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&147840|2&87120|4&33000|5&30360",
+        "attribute": "1&80640|2&47520|4&18000|5&16560",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -303,17 +263,17 @@
         "warId": 6134,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 21,
         "y": 10,
-        "var": 2010,
+        "var": 2008,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&124080|2&91080|4&29040|5&39600",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -323,17 +283,17 @@
         "warId": 6134,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 22,
         "y": 11,
-        "var": 2011,
+        "var": 2009,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -343,17 +303,17 @@
         "warId": 6134,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 22,
         "y": 10,
-        "var": 2012,
+        "var": 2010,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -363,17 +323,17 @@
         "warId": 6134,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2013,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 12,
+        "outIndex": 10,
         "dirction": 1,
         "x": 23,
         "y": 11,
-        "var": 2013,
+        "var": 2011,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -383,57 +343,17 @@
         "warId": 6134,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2014,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 11,
         "dirction": 1,
         "x": 23,
         "y": 10,
-        "var": 2014,
+        "var": 2012,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6134,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 24,
-        "y": 11,
-        "var": 2015,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6134,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 24,
-        "y": 10,
-        "var": 2016,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -443,17 +363,17 @@
         "warId": 6134,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 17,
         "y": 4,
-        "var": 2017,
+        "var": 2013,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&158400|2&72600|4&42240|5&26400",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -463,17 +383,17 @@
         "warId": 6134,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 17,
         "y": 3,
-        "var": 2018,
+        "var": 2014,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&124080|2&91080|4&29040|5&39600",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -483,17 +403,17 @@
         "warId": 6134,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 18,
         "y": 4,
-        "var": 2019,
+        "var": 2015,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -503,17 +423,17 @@
         "warId": 6134,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 18,
         "y": 3,
-        "var": 2020,
+        "var": 2016,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -523,17 +443,17 @@
         "warId": 6134,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2021,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 20,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 4,
-        "var": 2021,
+        "var": 2017,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -543,57 +463,17 @@
         "warId": 6134,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2022,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 3,
-        "var": 2022,
+        "var": 2018,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6134,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 20,
-        "y": 4,
-        "var": 2023,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6134,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 3,
-        "var": 2024,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
diff --git a/shared/resource/warJsons/6135.json b/shared/resource/warJsons/6135.json
index b229746aa..53541055e 100644
--- a/shared/resource/warJsons/6135.json
+++ b/shared/resource/warJsons/6135.json
@@ -133,7 +133,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&158400|2&72600|4&42240|5&26400",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -153,7 +153,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&124080|2&91080|4&29040|5&39600",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -173,7 +173,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -193,7 +193,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -213,7 +213,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -233,47 +233,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6135,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 1,
-        "x": 14,
-        "y": 18,
-        "var": 2007,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6135,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 15,
-        "y": 18,
-        "var": 2008,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -283,17 +243,17 @@
         "warId": 6135,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 21,
         "y": 11,
-        "var": 2009,
+        "var": 2007,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&147840|2&87120|4&33000|5&30360",
+        "attribute": "1&80640|2&47520|4&18000|5&16560",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -303,17 +263,17 @@
         "warId": 6135,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 21,
         "y": 10,
-        "var": 2010,
+        "var": 2008,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&124080|2&91080|4&29040|5&39600",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -323,17 +283,17 @@
         "warId": 6135,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 22,
         "y": 11,
-        "var": 2011,
+        "var": 2009,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -343,17 +303,17 @@
         "warId": 6135,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 22,
         "y": 10,
-        "var": 2012,
+        "var": 2010,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -363,17 +323,17 @@
         "warId": 6135,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2013,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 12,
+        "outIndex": 10,
         "dirction": 1,
         "x": 23,
         "y": 11,
-        "var": 2013,
+        "var": 2011,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -383,57 +343,17 @@
         "warId": 6135,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2014,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 11,
         "dirction": 1,
         "x": 23,
         "y": 10,
-        "var": 2014,
+        "var": 2012,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6135,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 24,
-        "y": 11,
-        "var": 2015,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6135,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 24,
-        "y": 10,
-        "var": 2016,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -443,17 +363,17 @@
         "warId": 6135,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 17,
         "y": 4,
-        "var": 2017,
+        "var": 2013,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&158400|2&72600|4&42240|5&26400",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -463,17 +383,17 @@
         "warId": 6135,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 17,
         "y": 3,
-        "var": 2018,
+        "var": 2014,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&124080|2&91080|4&29040|5&39600",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -483,17 +403,17 @@
         "warId": 6135,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 18,
         "y": 4,
-        "var": 2019,
+        "var": 2015,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -503,17 +423,17 @@
         "warId": 6135,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 18,
         "y": 3,
-        "var": 2020,
+        "var": 2016,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -523,17 +443,17 @@
         "warId": 6135,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2021,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 20,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 4,
-        "var": 2021,
+        "var": 2017,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -543,57 +463,17 @@
         "warId": 6135,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2022,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 3,
-        "var": 2022,
+        "var": 2018,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6135,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 20,
-        "y": 4,
-        "var": 2023,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6135,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 3,
-        "var": 2024,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
diff --git a/shared/resource/warJsons/6136.json b/shared/resource/warJsons/6136.json
index da19a152a..b2281c471 100644
--- a/shared/resource/warJsons/6136.json
+++ b/shared/resource/warJsons/6136.json
@@ -133,7 +133,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&158400|2&72600|4&42240|5&26400",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -153,7 +153,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&124080|2&91080|4&29040|5&39600",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -173,7 +173,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -193,7 +193,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -213,7 +213,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -233,47 +233,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6136,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 1,
-        "x": 14,
-        "y": 18,
-        "var": 2007,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6136,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 15,
-        "y": 18,
-        "var": 2008,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -283,17 +243,17 @@
         "warId": 6136,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 21,
         "y": 11,
-        "var": 2009,
+        "var": 2007,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&147840|2&87120|4&33000|5&30360",
+        "attribute": "1&80640|2&47520|4&18000|5&16560",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -303,17 +263,17 @@
         "warId": 6136,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 21,
         "y": 10,
-        "var": 2010,
+        "var": 2008,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&124080|2&91080|4&29040|5&39600",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -323,17 +283,17 @@
         "warId": 6136,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 22,
         "y": 11,
-        "var": 2011,
+        "var": 2009,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -343,17 +303,17 @@
         "warId": 6136,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 22,
         "y": 10,
-        "var": 2012,
+        "var": 2010,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -363,17 +323,17 @@
         "warId": 6136,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2013,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 12,
+        "outIndex": 10,
         "dirction": 1,
         "x": 23,
         "y": 11,
-        "var": 2013,
+        "var": 2011,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -383,57 +343,17 @@
         "warId": 6136,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2014,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 11,
         "dirction": 1,
         "x": 23,
         "y": 10,
-        "var": 2014,
+        "var": 2012,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6136,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 24,
-        "y": 11,
-        "var": 2015,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6136,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 24,
-        "y": 10,
-        "var": 2016,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -443,17 +363,17 @@
         "warId": 6136,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 17,
         "y": 4,
-        "var": 2017,
+        "var": 2013,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&158400|2&72600|4&42240|5&26400",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -463,17 +383,17 @@
         "warId": 6136,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 17,
         "y": 3,
-        "var": 2018,
+        "var": 2014,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&124080|2&91080|4&29040|5&39600",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -483,17 +403,17 @@
         "warId": 6136,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 18,
         "y": 4,
-        "var": 2019,
+        "var": 2015,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -503,17 +423,17 @@
         "warId": 6136,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 18,
         "y": 3,
-        "var": 2020,
+        "var": 2016,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -523,17 +443,17 @@
         "warId": 6136,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2021,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 20,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 4,
-        "var": 2021,
+        "var": 2017,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -543,57 +463,17 @@
         "warId": 6136,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2022,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 3,
-        "var": 2022,
+        "var": 2018,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6136,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 20,
-        "y": 4,
-        "var": 2023,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6136,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 3,
-        "var": 2024,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
diff --git a/shared/resource/warJsons/6137.json b/shared/resource/warJsons/6137.json
index 6846479a8..395f8de1a 100644
--- a/shared/resource/warJsons/6137.json
+++ b/shared/resource/warJsons/6137.json
@@ -133,7 +133,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&158400|2&72600|4&42240|5&26400",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -153,7 +153,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&124080|2&91080|4&29040|5&39600",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -173,7 +173,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -193,7 +193,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -213,7 +213,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -233,47 +233,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6137,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 1,
-        "x": 14,
-        "y": 18,
-        "var": 2007,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6137,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 15,
-        "y": 18,
-        "var": 2008,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -283,17 +243,17 @@
         "warId": 6137,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 21,
         "y": 11,
-        "var": 2009,
+        "var": 2007,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&147840|2&87120|4&33000|5&30360",
+        "attribute": "1&80640|2&47520|4&18000|5&16560",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -303,17 +263,17 @@
         "warId": 6137,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 21,
         "y": 10,
-        "var": 2010,
+        "var": 2008,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&124080|2&91080|4&29040|5&39600",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -323,17 +283,17 @@
         "warId": 6137,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 22,
         "y": 11,
-        "var": 2011,
+        "var": 2009,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -343,17 +303,17 @@
         "warId": 6137,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 22,
         "y": 10,
-        "var": 2012,
+        "var": 2010,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -363,17 +323,17 @@
         "warId": 6137,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2013,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 12,
+        "outIndex": 10,
         "dirction": 1,
         "x": 23,
         "y": 11,
-        "var": 2013,
+        "var": 2011,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -383,57 +343,17 @@
         "warId": 6137,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2014,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 11,
         "dirction": 1,
         "x": 23,
         "y": 10,
-        "var": 2014,
+        "var": 2012,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6137,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 24,
-        "y": 11,
-        "var": 2015,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6137,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 24,
-        "y": 10,
-        "var": 2016,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -443,17 +363,17 @@
         "warId": 6137,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 17,
         "y": 4,
-        "var": 2017,
+        "var": 2013,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&158400|2&72600|4&42240|5&26400",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -463,17 +383,17 @@
         "warId": 6137,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 17,
         "y": 3,
-        "var": 2018,
+        "var": 2014,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&124080|2&91080|4&29040|5&39600",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -483,17 +403,17 @@
         "warId": 6137,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 18,
         "y": 4,
-        "var": 2019,
+        "var": 2015,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -503,17 +423,17 @@
         "warId": 6137,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 18,
         "y": 3,
-        "var": 2020,
+        "var": 2016,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -523,17 +443,17 @@
         "warId": 6137,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2021,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 20,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 4,
-        "var": 2021,
+        "var": 2017,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -543,57 +463,17 @@
         "warId": 6137,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2022,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 3,
-        "var": 2022,
+        "var": 2018,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6137,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 20,
-        "y": 4,
-        "var": 2023,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6137,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 3,
-        "var": 2024,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
diff --git a/shared/resource/warJsons/6138.json b/shared/resource/warJsons/6138.json
index 6354b3398..19e756158 100644
--- a/shared/resource/warJsons/6138.json
+++ b/shared/resource/warJsons/6138.json
@@ -133,7 +133,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&158400|2&72600|4&42240|5&26400",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -153,7 +153,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&124080|2&91080|4&29040|5&39600",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -173,7 +173,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -193,7 +193,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -213,7 +213,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -233,47 +233,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6138,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 1,
-        "x": 14,
-        "y": 18,
-        "var": 2007,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6138,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 15,
-        "y": 18,
-        "var": 2008,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -283,17 +243,17 @@
         "warId": 6138,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 21,
         "y": 11,
-        "var": 2009,
+        "var": 2007,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&147840|2&87120|4&33000|5&30360",
+        "attribute": "1&80640|2&47520|4&18000|5&16560",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -303,17 +263,17 @@
         "warId": 6138,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 21,
         "y": 10,
-        "var": 2010,
+        "var": 2008,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&124080|2&91080|4&29040|5&39600",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -323,17 +283,17 @@
         "warId": 6138,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 22,
         "y": 11,
-        "var": 2011,
+        "var": 2009,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -343,17 +303,17 @@
         "warId": 6138,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 22,
         "y": 10,
-        "var": 2012,
+        "var": 2010,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -363,17 +323,17 @@
         "warId": 6138,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2013,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 12,
+        "outIndex": 10,
         "dirction": 1,
         "x": 23,
         "y": 11,
-        "var": 2013,
+        "var": 2011,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -383,57 +343,17 @@
         "warId": 6138,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2014,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 11,
         "dirction": 1,
         "x": 23,
         "y": 10,
-        "var": 2014,
+        "var": 2012,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6138,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 24,
-        "y": 11,
-        "var": 2015,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6138,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 24,
-        "y": 10,
-        "var": 2016,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -443,17 +363,17 @@
         "warId": 6138,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 17,
         "y": 4,
-        "var": 2017,
+        "var": 2013,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&158400|2&72600|4&42240|5&26400",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -463,17 +383,17 @@
         "warId": 6138,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 17,
         "y": 3,
-        "var": 2018,
+        "var": 2014,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&124080|2&91080|4&29040|5&39600",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -483,17 +403,17 @@
         "warId": 6138,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 18,
         "y": 4,
-        "var": 2019,
+        "var": 2015,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -503,17 +423,17 @@
         "warId": 6138,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 18,
         "y": 3,
-        "var": 2020,
+        "var": 2016,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&132000|2&60500|4&35200|5&22000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -523,17 +443,17 @@
         "warId": 6138,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2021,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 20,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 4,
-        "var": 2021,
+        "var": 2017,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -543,57 +463,17 @@
         "warId": 6138,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2022,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 3,
-        "var": 2022,
+        "var": 2018,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&116600|2&66000|4&31900|5&28600",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6138,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 20,
-        "y": 4,
-        "var": 2023,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6138,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 3,
-        "var": 2024,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&103400|2&75900|4&24200|5&33000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
diff --git a/shared/resource/warJsons/6139.json b/shared/resource/warJsons/6139.json
index 9399f4795..19328bfee 100644
--- a/shared/resource/warJsons/6139.json
+++ b/shared/resource/warJsons/6139.json
@@ -133,7 +133,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&216000|2&99000|4&57600|5&36000",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -153,7 +153,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&169200|2&124200|4&39600|5&54000",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -173,7 +173,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -193,7 +193,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -213,7 +213,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -233,47 +233,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6139,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 1,
-        "x": 14,
-        "y": 18,
-        "var": 2007,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6139,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 15,
-        "y": 18,
-        "var": 2008,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -283,17 +243,17 @@
         "warId": 6139,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 21,
         "y": 11,
-        "var": 2009,
+        "var": 2007,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&201600|2&118800|4&45000|5&41400",
+        "attribute": "1&80640|2&47520|4&18000|5&16560",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -303,17 +263,17 @@
         "warId": 6139,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 21,
         "y": 10,
-        "var": 2010,
+        "var": 2008,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&169200|2&124200|4&39600|5&54000",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -323,17 +283,17 @@
         "warId": 6139,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 22,
         "y": 11,
-        "var": 2011,
+        "var": 2009,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -343,17 +303,17 @@
         "warId": 6139,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 22,
         "y": 10,
-        "var": 2012,
+        "var": 2010,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -363,17 +323,17 @@
         "warId": 6139,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2013,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 12,
+        "outIndex": 10,
         "dirction": 1,
         "x": 23,
         "y": 11,
-        "var": 2013,
+        "var": 2011,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -383,57 +343,17 @@
         "warId": 6139,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2014,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 11,
         "dirction": 1,
         "x": 23,
         "y": 10,
-        "var": 2014,
+        "var": 2012,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6139,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 24,
-        "y": 11,
-        "var": 2015,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6139,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 24,
-        "y": 10,
-        "var": 2016,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -443,17 +363,17 @@
         "warId": 6139,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 17,
         "y": 4,
-        "var": 2017,
+        "var": 2013,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&216000|2&99000|4&57600|5&36000",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -463,17 +383,17 @@
         "warId": 6139,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 17,
         "y": 3,
-        "var": 2018,
+        "var": 2014,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&169200|2&124200|4&39600|5&54000",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -483,17 +403,17 @@
         "warId": 6139,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 18,
         "y": 4,
-        "var": 2019,
+        "var": 2015,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -503,17 +423,17 @@
         "warId": 6139,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 18,
         "y": 3,
-        "var": 2020,
+        "var": 2016,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -523,17 +443,17 @@
         "warId": 6139,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2021,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 20,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 4,
-        "var": 2021,
+        "var": 2017,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -543,57 +463,17 @@
         "warId": 6139,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2022,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 3,
-        "var": 2022,
+        "var": 2018,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6139,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 20,
-        "y": 4,
-        "var": 2023,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6139,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 3,
-        "var": 2024,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
diff --git a/shared/resource/warJsons/6140.json b/shared/resource/warJsons/6140.json
index 527043e72..07b313ec4 100644
--- a/shared/resource/warJsons/6140.json
+++ b/shared/resource/warJsons/6140.json
@@ -133,7 +133,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&216000|2&99000|4&57600|5&36000",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -153,7 +153,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&169200|2&124200|4&39600|5&54000",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -173,7 +173,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -193,7 +193,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -213,7 +213,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -233,47 +233,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6140,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 1,
-        "x": 14,
-        "y": 18,
-        "var": 2007,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6140,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 15,
-        "y": 18,
-        "var": 2008,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -283,17 +243,17 @@
         "warId": 6140,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 21,
         "y": 11,
-        "var": 2009,
+        "var": 2007,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&201600|2&118800|4&45000|5&41400",
+        "attribute": "1&80640|2&47520|4&18000|5&16560",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -303,17 +263,17 @@
         "warId": 6140,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 21,
         "y": 10,
-        "var": 2010,
+        "var": 2008,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&169200|2&124200|4&39600|5&54000",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -323,17 +283,17 @@
         "warId": 6140,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 22,
         "y": 11,
-        "var": 2011,
+        "var": 2009,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -343,17 +303,17 @@
         "warId": 6140,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 22,
         "y": 10,
-        "var": 2012,
+        "var": 2010,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -363,17 +323,17 @@
         "warId": 6140,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2013,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 12,
+        "outIndex": 10,
         "dirction": 1,
         "x": 23,
         "y": 11,
-        "var": 2013,
+        "var": 2011,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -383,57 +343,17 @@
         "warId": 6140,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2014,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 11,
         "dirction": 1,
         "x": 23,
         "y": 10,
-        "var": 2014,
+        "var": 2012,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6140,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 24,
-        "y": 11,
-        "var": 2015,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6140,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 24,
-        "y": 10,
-        "var": 2016,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -443,17 +363,17 @@
         "warId": 6140,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 17,
         "y": 4,
-        "var": 2017,
+        "var": 2013,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&216000|2&99000|4&57600|5&36000",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -463,17 +383,17 @@
         "warId": 6140,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 17,
         "y": 3,
-        "var": 2018,
+        "var": 2014,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&169200|2&124200|4&39600|5&54000",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -483,17 +403,17 @@
         "warId": 6140,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 18,
         "y": 4,
-        "var": 2019,
+        "var": 2015,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -503,17 +423,17 @@
         "warId": 6140,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 18,
         "y": 3,
-        "var": 2020,
+        "var": 2016,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -523,17 +443,17 @@
         "warId": 6140,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2021,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 20,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 4,
-        "var": 2021,
+        "var": 2017,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -543,57 +463,17 @@
         "warId": 6140,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2022,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 3,
-        "var": 2022,
+        "var": 2018,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6140,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 20,
-        "y": 4,
-        "var": 2023,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6140,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 3,
-        "var": 2024,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
diff --git a/shared/resource/warJsons/6141.json b/shared/resource/warJsons/6141.json
index 14cf8fefa..4979493e3 100644
--- a/shared/resource/warJsons/6141.json
+++ b/shared/resource/warJsons/6141.json
@@ -133,7 +133,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&216000|2&99000|4&57600|5&36000",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -153,7 +153,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&169200|2&124200|4&39600|5&54000",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -173,7 +173,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -193,7 +193,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -213,7 +213,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -233,47 +233,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6141,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 1,
-        "x": 14,
-        "y": 18,
-        "var": 2007,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6141,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 15,
-        "y": 18,
-        "var": 2008,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -283,17 +243,17 @@
         "warId": 6141,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 21,
         "y": 11,
-        "var": 2009,
+        "var": 2007,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&201600|2&118800|4&45000|5&41400",
+        "attribute": "1&80640|2&47520|4&18000|5&16560",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -303,17 +263,17 @@
         "warId": 6141,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 21,
         "y": 10,
-        "var": 2010,
+        "var": 2008,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&169200|2&124200|4&39600|5&54000",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -323,17 +283,17 @@
         "warId": 6141,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 22,
         "y": 11,
-        "var": 2011,
+        "var": 2009,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -343,17 +303,17 @@
         "warId": 6141,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 22,
         "y": 10,
-        "var": 2012,
+        "var": 2010,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -363,17 +323,17 @@
         "warId": 6141,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2013,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 12,
+        "outIndex": 10,
         "dirction": 1,
         "x": 23,
         "y": 11,
-        "var": 2013,
+        "var": 2011,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -383,57 +343,17 @@
         "warId": 6141,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2014,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 11,
         "dirction": 1,
         "x": 23,
         "y": 10,
-        "var": 2014,
+        "var": 2012,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6141,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 24,
-        "y": 11,
-        "var": 2015,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6141,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 24,
-        "y": 10,
-        "var": 2016,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -443,17 +363,17 @@
         "warId": 6141,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 17,
         "y": 4,
-        "var": 2017,
+        "var": 2013,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&216000|2&99000|4&57600|5&36000",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -463,17 +383,17 @@
         "warId": 6141,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 17,
         "y": 3,
-        "var": 2018,
+        "var": 2014,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&169200|2&124200|4&39600|5&54000",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -483,17 +403,17 @@
         "warId": 6141,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 18,
         "y": 4,
-        "var": 2019,
+        "var": 2015,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -503,17 +423,17 @@
         "warId": 6141,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 18,
         "y": 3,
-        "var": 2020,
+        "var": 2016,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -523,17 +443,17 @@
         "warId": 6141,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2021,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 20,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 4,
-        "var": 2021,
+        "var": 2017,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -543,57 +463,17 @@
         "warId": 6141,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2022,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 3,
-        "var": 2022,
+        "var": 2018,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6141,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 20,
-        "y": 4,
-        "var": 2023,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6141,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 3,
-        "var": 2024,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
diff --git a/shared/resource/warJsons/6142.json b/shared/resource/warJsons/6142.json
index 8446bae09..0d7debfb7 100644
--- a/shared/resource/warJsons/6142.json
+++ b/shared/resource/warJsons/6142.json
@@ -133,7 +133,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&216000|2&99000|4&57600|5&36000",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -153,7 +153,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&169200|2&124200|4&39600|5&54000",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -173,7 +173,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -193,7 +193,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -213,7 +213,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -233,47 +233,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6142,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 1,
-        "x": 14,
-        "y": 18,
-        "var": 2007,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6142,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 15,
-        "y": 18,
-        "var": 2008,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -283,17 +243,17 @@
         "warId": 6142,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 21,
         "y": 11,
-        "var": 2009,
+        "var": 2007,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&201600|2&118800|4&45000|5&41400",
+        "attribute": "1&80640|2&47520|4&18000|5&16560",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -303,17 +263,17 @@
         "warId": 6142,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 21,
         "y": 10,
-        "var": 2010,
+        "var": 2008,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&169200|2&124200|4&39600|5&54000",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -323,17 +283,17 @@
         "warId": 6142,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 22,
         "y": 11,
-        "var": 2011,
+        "var": 2009,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -343,17 +303,17 @@
         "warId": 6142,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 22,
         "y": 10,
-        "var": 2012,
+        "var": 2010,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -363,17 +323,17 @@
         "warId": 6142,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2013,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 12,
+        "outIndex": 10,
         "dirction": 1,
         "x": 23,
         "y": 11,
-        "var": 2013,
+        "var": 2011,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -383,57 +343,17 @@
         "warId": 6142,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2014,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 11,
         "dirction": 1,
         "x": 23,
         "y": 10,
-        "var": 2014,
+        "var": 2012,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6142,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 24,
-        "y": 11,
-        "var": 2015,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6142,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 24,
-        "y": 10,
-        "var": 2016,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -443,17 +363,17 @@
         "warId": 6142,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 17,
         "y": 4,
-        "var": 2017,
+        "var": 2013,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&216000|2&99000|4&57600|5&36000",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -463,17 +383,17 @@
         "warId": 6142,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 17,
         "y": 3,
-        "var": 2018,
+        "var": 2014,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&169200|2&124200|4&39600|5&54000",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -483,17 +403,17 @@
         "warId": 6142,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 18,
         "y": 4,
-        "var": 2019,
+        "var": 2015,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -503,17 +423,17 @@
         "warId": 6142,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 18,
         "y": 3,
-        "var": 2020,
+        "var": 2016,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -523,17 +443,17 @@
         "warId": 6142,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2021,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 20,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 4,
-        "var": 2021,
+        "var": 2017,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -543,57 +463,17 @@
         "warId": 6142,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2022,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 3,
-        "var": 2022,
+        "var": 2018,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6142,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 20,
-        "y": 4,
-        "var": 2023,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6142,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 3,
-        "var": 2024,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
diff --git a/shared/resource/warJsons/6143.json b/shared/resource/warJsons/6143.json
index 01ea7dcbf..4c5cf036e 100644
--- a/shared/resource/warJsons/6143.json
+++ b/shared/resource/warJsons/6143.json
@@ -133,7 +133,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&216000|2&99000|4&57600|5&36000",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -153,7 +153,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&169200|2&124200|4&39600|5&54000",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -173,7 +173,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -193,7 +193,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -213,7 +213,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -233,47 +233,7 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6143,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 1,
-        "x": 14,
-        "y": 18,
-        "var": 2007,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6143,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 15,
-        "y": 18,
-        "var": 2008,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -283,17 +243,17 @@
         "warId": 6143,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 21,
         "y": 11,
-        "var": 2009,
+        "var": 2007,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&201600|2&118800|4&45000|5&41400",
+        "attribute": "1&80640|2&47520|4&18000|5&16560",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -303,17 +263,17 @@
         "warId": 6143,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 21,
         "y": 10,
-        "var": 2010,
+        "var": 2008,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&169200|2&124200|4&39600|5&54000",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -323,17 +283,17 @@
         "warId": 6143,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 22,
         "y": 11,
-        "var": 2011,
+        "var": 2009,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -343,17 +303,17 @@
         "warId": 6143,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 22,
         "y": 10,
-        "var": 2012,
+        "var": 2010,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -363,17 +323,17 @@
         "warId": 6143,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2013,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 12,
+        "outIndex": 10,
         "dirction": 1,
         "x": 23,
         "y": 11,
-        "var": 2013,
+        "var": 2011,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -383,57 +343,17 @@
         "warId": 6143,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2014,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 11,
         "dirction": 1,
         "x": 23,
         "y": 10,
-        "var": 2014,
+        "var": 2012,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6143,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 24,
-        "y": 11,
-        "var": 2015,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6143,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 24,
-        "y": 10,
-        "var": 2016,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -443,17 +363,17 @@
         "warId": 6143,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 17,
         "y": 4,
-        "var": 2017,
+        "var": 2013,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&216000|2&99000|4&57600|5&36000",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -463,17 +383,17 @@
         "warId": 6143,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 17,
         "y": 3,
-        "var": 2018,
+        "var": 2014,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&169200|2&124200|4&39600|5&54000",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -483,17 +403,17 @@
         "warId": 6143,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 18,
         "y": 4,
-        "var": 2019,
+        "var": 2015,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -503,17 +423,17 @@
         "warId": 6143,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 18,
         "y": 3,
-        "var": 2020,
+        "var": 2016,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -523,17 +443,17 @@
         "warId": 6143,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2021,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 20,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 4,
-        "var": 2021,
+        "var": 2017,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
@@ -543,57 +463,17 @@
         "warId": 6143,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2022,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 3,
-        "var": 2022,
+        "var": 2018,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6143,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 20,
-        "y": 4,
-        "var": 2023,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
-        "skill": 0,
-        "seid": 0,
-        "star": 3,
-        "spine": 0
-    },
-    {
-        "warId": 6143,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 3,
-        "var": 2024,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
         "star": 3,
diff --git a/shared/resource/warJsons/6144.json b/shared/resource/warJsons/6144.json
index 6ef54f51f..5ae971049 100644
--- a/shared/resource/warJsons/6144.json
+++ b/shared/resource/warJsons/6144.json
@@ -133,10 +133,10 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&216000|2&99000|4&57600|5&36000",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
-        "star": 2,
+        "star": 3,
         "spine": 0
     },
     {
@@ -153,10 +153,10 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&169200|2&124200|4&39600|5&54000",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
-        "star": 2,
+        "star": 3,
         "spine": 0
     },
     {
@@ -173,10 +173,10 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
-        "star": 2,
+        "star": 3,
         "spine": 0
     },
     {
@@ -193,10 +193,10 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
-        "star": 2,
+        "star": 3,
         "spine": 0
     },
     {
@@ -213,10 +213,10 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
-        "star": 2,
+        "star": 3,
         "spine": 0
     },
     {
@@ -233,370 +233,250 @@
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6144,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2007,
-        "relation": 2,
-        "outIndex": 6,
-        "dirction": 1,
-        "x": 14,
-        "y": 18,
-        "var": 2007,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6144,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2008,
-        "relation": 2,
-        "outIndex": 7,
-        "dirction": 1,
-        "x": 15,
-        "y": 18,
-        "var": 2008,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
+        "star": 3,
         "spine": 0
     },
     {
         "warId": 6144,
         "actorName": "刘备",
         "actorId": 320,
-        "dataId": 2009,
+        "dataId": 2007,
         "relation": 2,
-        "outIndex": 8,
+        "outIndex": 6,
         "dirction": 1,
         "x": 21,
         "y": 11,
-        "var": 2009,
+        "var": 2007,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&201600|2&118800|4&45000|5&41400",
+        "attribute": "1&80640|2&47520|4&18000|5&16560",
         "skill": 0,
         "seid": 0,
-        "star": 2,
+        "star": 3,
         "spine": 0
     },
     {
         "warId": 6144,
         "actorName": "诸葛亮",
         "actorId": 322,
-        "dataId": 2010,
+        "dataId": 2008,
         "relation": 2,
-        "outIndex": 9,
+        "outIndex": 7,
         "dirction": 1,
         "x": 21,
         "y": 10,
-        "var": 2010,
+        "var": 2008,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&169200|2&124200|4&39600|5&54000",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
-        "star": 2,
+        "star": 3,
         "spine": 0
     },
     {
         "warId": 6144,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2011,
+        "dataId": 2009,
         "relation": 2,
-        "outIndex": 10,
+        "outIndex": 8,
         "dirction": 1,
         "x": 22,
         "y": 11,
-        "var": 2011,
+        "var": 2009,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
-        "star": 2,
+        "star": 3,
         "spine": 0
     },
     {
         "warId": 6144,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2012,
+        "dataId": 2010,
         "relation": 2,
-        "outIndex": 11,
+        "outIndex": 9,
         "dirction": 1,
         "x": 22,
         "y": 10,
-        "var": 2012,
+        "var": 2010,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
-        "star": 2,
+        "star": 3,
         "spine": 0
     },
     {
         "warId": 6144,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2013,
+        "dataId": 2011,
         "relation": 2,
-        "outIndex": 12,
+        "outIndex": 10,
         "dirction": 1,
         "x": 23,
         "y": 11,
-        "var": 2013,
+        "var": 2011,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
-        "star": 2,
+        "star": 3,
         "spine": 0
     },
     {
         "warId": 6144,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2014,
+        "dataId": 2012,
         "relation": 2,
-        "outIndex": 13,
+        "outIndex": 11,
         "dirction": 1,
         "x": 23,
         "y": 10,
-        "var": 2014,
+        "var": 2012,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6144,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2015,
-        "relation": 2,
-        "outIndex": 14,
-        "dirction": 1,
-        "x": 24,
-        "y": 11,
-        "var": 2015,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6144,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2016,
-        "relation": 2,
-        "outIndex": 15,
-        "dirction": 1,
-        "x": 24,
-        "y": 10,
-        "var": 2016,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
+        "star": 3,
         "spine": 0
     },
     {
         "warId": 6144,
         "actorName": "孙权",
         "actorId": 336,
-        "dataId": 2017,
+        "dataId": 2013,
         "relation": 2,
-        "outIndex": 16,
+        "outIndex": 12,
         "dirction": 1,
         "x": 17,
         "y": 4,
-        "var": 2017,
+        "var": 2013,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&216000|2&99000|4&57600|5&36000",
+        "attribute": "1&86400|2&39600|4&23040|5&14400",
         "skill": 0,
         "seid": 0,
-        "star": 2,
+        "star": 3,
         "spine": 0
     },
     {
         "warId": 6144,
         "actorName": "周瑜",
         "actorId": 334,
-        "dataId": 2018,
+        "dataId": 2014,
         "relation": 2,
-        "outIndex": 17,
+        "outIndex": 13,
         "dirction": 1,
         "x": 17,
         "y": 3,
-        "var": 2018,
+        "var": 2014,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&169200|2&124200|4&39600|5&54000",
+        "attribute": "1&67680|2&49680|4&15840|5&21600",
         "skill": 0,
         "seid": 0,
-        "star": 2,
+        "star": 3,
         "spine": 0
     },
     {
         "warId": 6144,
         "actorName": "步兵将领",
         "actorId": 1001,
-        "dataId": 2019,
+        "dataId": 2015,
         "relation": 2,
-        "outIndex": 18,
+        "outIndex": 14,
         "dirction": 1,
         "x": 18,
         "y": 4,
-        "var": 2019,
+        "var": 2015,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
-        "star": 2,
+        "star": 3,
         "spine": 0
     },
     {
         "warId": 6144,
         "actorName": "步兵将领",
         "actorId": 1002,
-        "dataId": 2020,
+        "dataId": 2016,
         "relation": 2,
-        "outIndex": 19,
+        "outIndex": 15,
         "dirction": 1,
         "x": 18,
         "y": 3,
-        "var": 2020,
+        "var": 2016,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&180000|2&82500|4&48000|5&30000",
+        "attribute": "1&72000|2&33000|4&19200|5&12000",
         "skill": 0,
         "seid": 0,
-        "star": 2,
+        "star": 3,
         "spine": 0
     },
     {
         "warId": 6144,
         "actorName": "枪兵将领",
         "actorId": 1005,
-        "dataId": 2021,
+        "dataId": 2017,
         "relation": 2,
-        "outIndex": 20,
+        "outIndex": 16,
         "dirction": 1,
         "x": 19,
         "y": 4,
-        "var": 2021,
+        "var": 2017,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
-        "star": 2,
+        "star": 3,
         "spine": 0
     },
     {
         "warId": 6144,
         "actorName": "枪兵将领",
         "actorId": 1007,
-        "dataId": 2022,
+        "dataId": 2018,
         "relation": 2,
-        "outIndex": 21,
+        "outIndex": 17,
         "dirction": 1,
         "x": 19,
         "y": 3,
-        "var": 2022,
+        "var": 2018,
         "lv": 100,
         "hide": 0,
         "initial_ai": 3,
-        "attribute": "1&159000|2&90000|4&43500|5&39000",
+        "attribute": "1&63600|2&36000|4&17400|5&15600",
         "skill": 0,
         "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6144,
-        "actorName": "文官将领",
-        "actorId": 1015,
-        "dataId": 2023,
-        "relation": 2,
-        "outIndex": 22,
-        "dirction": 1,
-        "x": 20,
-        "y": 4,
-        "var": 2023,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
-        "spine": 0
-    },
-    {
-        "warId": 6144,
-        "actorName": "文官将领",
-        "actorId": 1037,
-        "dataId": 2024,
-        "relation": 2,
-        "outIndex": 23,
-        "dirction": 1,
-        "x": 20,
-        "y": 3,
-        "var": 2024,
-        "lv": 100,
-        "hide": 1,
-        "initial_ai": 3,
-        "attribute": "1&141000|2&103500|4&33000|5&45000",
-        "skill": 0,
-        "seid": 0,
-        "star": 2,
+        "star": 3,
         "spine": 0
     }
 ]
\ No newline at end of file