diff --git a/game-server/app/util/gamedata.ts b/game-server/app/util/gamedata.ts
index 4ca9239ce..6a8836400 100644
--- a/game-server/app/util/gamedata.ts
+++ b/game-server/app/util/gamedata.ts
@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 
-var gamedata = {};
+let gamedata = {};
 const wars = ['dic_zyz_gk_main', 'dic_zyz_gk_mainElite', 'dic_zyz_gk_daily', 'dic_zyz_gk_event', 'dic_zyz_gk_tower']; // 关卡相关的表
 const allWarInfos = new Map<number, any>();
 const towerInfos = new Map<number, any>();
@@ -9,7 +9,7 @@ const towerInfos = new Map<number, any>();
 function parseWarData() {
     let result = null;
     for (let filename of wars) {
-        let warInfo = gamedata[filename]||[];
+        let warInfo = gamedata['jsons'][filename]||[];
         for(let war of warInfo) {
             if(war.war_id) {
                 allWarInfos.set(war.war_id, war);
@@ -21,7 +21,7 @@ function parseWarData() {
 
 function parseTowerData() {
     const towerFile = 'dic_zyz_tower';
-    const towerData = gamedata[towerFile] || [];
+    const towerData = gamedata['jsons'][towerFile] || [];
     towerData.forEach(elem => {
         if (elem.towerFloor) {
             towerInfos.set(elem.towerFloor, elem);
@@ -29,8 +29,12 @@ function parseTowerData() {
     });
 }
 
-function initData () {
-    fs.readdirSync(__dirname + '/../resource')
+function initData (folder) {
+    console.log('加载文件夹：', folder);
+    if(!gamedata.hasOwnProperty(folder)) {
+        gamedata[folder] = {};
+    }
+    fs.readdirSync(__dirname + '/../resource/' + folder)
     .filter(function(file) {
         return (file.indexOf(".") !== 0) && (file !== "index.js");
     })
@@ -38,12 +42,12 @@ function initData () {
     .forEach(function(file) {
         var name = file.split('.')[0];
         try {
-            gamedata[name] = JSON.parse(
-                fs.readFileSync(path.resolve(__dirname, "../resource/" + file))
+            gamedata[folder][name] = JSON.parse(
+                fs.readFileSync(path.resolve(__dirname, "../resource/" + folder + "/" + file))
             );
         } catch(e) {
             console.error('【文件缺少】：' + file);
-            gamedata[name] = [];
+            gamedata[folder][name] = [];
         }
 
     });
@@ -54,11 +58,17 @@ function parseData() {
     parseTowerData();
 }
 
-initData();
+initData('jsons'); // 加载一般json
+initData('warJsons'); // 加载出兵表
 parseData();
 
 export function getGamedata(key) {
-    return gamedata[key];
+    return gamedata['jsons'][key];
+}
+
+// 获取出兵表
+export function getWarJsons(key: string) {
+    return gamedata['warJsons'][key];
 }
 
 export function getWarById(warid: number) {
@@ -66,8 +76,7 @@ export function getWarById(warid: number) {
 }
 
 export function getGoodById(gid) {
-    console.log(gid)
-    let goodsInfo = gamedata['dic_goods']||[];
+    let goodsInfo = gamedata['jsons']['dic_goods']||[];
     return goodsInfo.find(cur => {
         return cur.good_id == gid
     });
diff --git a/gm-server/app/service/Utils.ts b/gm-server/app/service/Utils.ts
index 7ecbe0498..1e8fb968e 100644
--- a/gm-server/app/service/Utils.ts
+++ b/gm-server/app/service/Utils.ts
@@ -6,7 +6,7 @@ const path = require('path');
 var gamedata = {};
 
 function initData () {
-    fs.readdirSync(__dirname + '/../resource')
+    fs.readdirSync(__dirname + '/../resource/jsons')
     .filter(function(file) {
         return (file.indexOf(".") !== 0) && (file !== "index.js");
     })
@@ -15,7 +15,7 @@ function initData () {
         var name = file.split('.')[0];
         try {
             gamedata[name] = JSON.parse(
-                fs.readFileSync(path.resolve(__dirname, "../resource/" + file))
+                fs.readFileSync(path.resolve(__dirname, "../resource/jsons/" + file))
             );
         } catch(e) {
             console.error('【文件缺少】：' + file);
diff --git a/shared/resource/const.json b/shared/resource/jsons/const.json
similarity index 100%
rename from shared/resource/const.json
rename to shared/resource/jsons/const.json
diff --git a/shared/resource/jsons/dic_expedition.json b/shared/resource/jsons/dic_expedition.json
new file mode 100644
index 000000000..b4c64a269
--- /dev/null
+++ b/shared/resource/jsons/dic_expedition.json
@@ -0,0 +1 @@
+[{"id":"远征本身的序号","warId":"对应远征关卡表的id","reward":"战斗后可得的宝箱（id&count|id&count）","CEScale":"战力系数比，1 为玩家基础战力","CERange":"步长，敌军战力系数范围，单位%：[CEScale - CERange, CEScale + CERange]","CEScaleNew":"新手期战力系数比","CERangeNew":"新手期步长，单位%","json":"对应的出兵表，默认和warId一致，但支持填多个表id，如果填了多个就在其中随机一个，用&连接","ce":"标准战力，用于计算玩家和机器人战力比"},{"id":1,"warId":4001,"reward":"&","CEScale":0.5,"CERange":5,"CEScaleNew":0.3,"CERangeNew":5,"json":4001,"ce":10000},{"id":2,"warId":4002,"reward":"&","CEScale":0.6,"CERange":5,"CEScaleNew":0.35,"CERangeNew":5,"json":4002,"ce":10000},{"id":3,"warId":4003,"reward":"&","CEScale":0.7,"CERange":5,"CEScaleNew":0.4,"CERangeNew":5,"json":4003,"ce":10000},{"id":4,"warId":4004,"reward":"&","CEScale":0.8,"CERange":5,"CEScaleNew":0.45,"CERangeNew":5,"json":4004,"ce":10000},{"id":5,"warId":4005,"reward":"&","CEScale":1,"CERange":5,"CEScaleNew":0.5,"CERangeNew":5,"json":4005,"ce":10000},{"id":6,"warId":4006,"reward":"&","CEScale":1.05,"CERange":5,"CEScaleNew":0.55,"CERangeNew":5,"json":4006,"ce":10000},{"id":7,"warId":4007,"reward":"&","CEScale":1.1,"CERange":5,"CEScaleNew":0.6,"CERangeNew":5,"json":4007,"ce":10000},{"id":8,"warId":4008,"reward":"&","CEScale":1.15,"CERange":5,"CEScaleNew":0.7,"CERangeNew":5,"json":4008,"ce":10000},{"id":9,"warId":4009,"reward":"&","CEScale":1.3,"CERange":5,"CEScaleNew":0.8,"CERangeNew":5,"json":4009,"ce":10000}]
\ No newline at end of file
diff --git a/shared/resource/jsons/dic_expedition_point.json b/shared/resource/jsons/dic_expedition_point.json
new file mode 100644
index 000000000..a690bde95
--- /dev/null
+++ b/shared/resource/jsons/dic_expedition_point.json
@@ -0,0 +1 @@
+[{"point":"点数","reward":"宝箱奖励（id&count|id&count）","__EMPTY":0,"__EMPTY_1":0},{"point":6,"reward":"&","__EMPTY":0,"__EMPTY_1":0},{"point":12,"reward":"&","__EMPTY":0,"__EMPTY_1":0},{"point":18,"reward":"&","__EMPTY":0,"__EMPTY_1":0}]
\ No newline at end of file
diff --git a/shared/resource/dic_goods.json b/shared/resource/jsons/dic_goods.json
similarity index 100%
rename from shared/resource/dic_goods.json
rename to shared/resource/jsons/dic_goods.json
diff --git a/shared/resource/dic_job.json b/shared/resource/jsons/dic_job.json
similarity index 100%
rename from shared/resource/dic_job.json
rename to shared/resource/jsons/dic_job.json
diff --git a/shared/resource/dic_star_ratio.json b/shared/resource/jsons/dic_star_ratio.json
similarity index 100%
rename from shared/resource/dic_star_ratio.json
rename to shared/resource/jsons/dic_star_ratio.json
diff --git a/shared/resource/dic_war_info.json b/shared/resource/jsons/dic_war_info.json
similarity index 100%
rename from shared/resource/dic_war_info.json
rename to shared/resource/jsons/dic_war_info.json
diff --git a/shared/resource/dic_zyz_atk_area.json b/shared/resource/jsons/dic_zyz_atk_area.json
similarity index 100%
rename from shared/resource/dic_zyz_atk_area.json
rename to shared/resource/jsons/dic_zyz_atk_area.json
diff --git a/shared/resource/dic_zyz_camp.json b/shared/resource/jsons/dic_zyz_camp.json
similarity index 100%
rename from shared/resource/dic_zyz_camp.json
rename to shared/resource/jsons/dic_zyz_camp.json
diff --git a/shared/resource/dic_zyz_daily.json b/shared/resource/jsons/dic_zyz_daily.json
similarity index 100%
rename from shared/resource/dic_zyz_daily.json
rename to shared/resource/jsons/dic_zyz_daily.json
diff --git a/shared/resource/dic_zyz_eff_area.json b/shared/resource/jsons/dic_zyz_eff_area.json
similarity index 100%
rename from shared/resource/dic_zyz_eff_area.json
rename to shared/resource/jsons/dic_zyz_eff_area.json
diff --git a/shared/resource/dic_zyz_event.json b/shared/resource/jsons/dic_zyz_event.json
similarity index 100%
rename from shared/resource/dic_zyz_event.json
rename to shared/resource/jsons/dic_zyz_event.json
diff --git a/shared/resource/dic_zyz_gk.json b/shared/resource/jsons/dic_zyz_gk.json
similarity index 100%
rename from shared/resource/dic_zyz_gk.json
rename to shared/resource/jsons/dic_zyz_gk.json
diff --git a/shared/resource/dic_zyz_gk_daily.json b/shared/resource/jsons/dic_zyz_gk_daily.json
similarity index 100%
rename from shared/resource/dic_zyz_gk_daily.json
rename to shared/resource/jsons/dic_zyz_gk_daily.json
diff --git a/shared/resource/dic_zyz_gk_event.json b/shared/resource/jsons/dic_zyz_gk_event.json
similarity index 100%
rename from shared/resource/dic_zyz_gk_event.json
rename to shared/resource/jsons/dic_zyz_gk_event.json
diff --git a/shared/resource/dic_zyz_gk_main.json b/shared/resource/jsons/dic_zyz_gk_main.json
similarity index 100%
rename from shared/resource/dic_zyz_gk_main.json
rename to shared/resource/jsons/dic_zyz_gk_main.json
diff --git a/shared/resource/dic_zyz_gk_mainElite.json b/shared/resource/jsons/dic_zyz_gk_mainElite.json
similarity index 100%
rename from shared/resource/dic_zyz_gk_mainElite.json
rename to shared/resource/jsons/dic_zyz_gk_mainElite.json
diff --git a/shared/resource/dic_zyz_gk_tower.json b/shared/resource/jsons/dic_zyz_gk_tower.json
similarity index 100%
rename from shared/resource/dic_zyz_gk_tower.json
rename to shared/resource/jsons/dic_zyz_gk_tower.json
diff --git a/shared/resource/dic_zyz_hero.json b/shared/resource/jsons/dic_zyz_hero.json
similarity index 100%
rename from shared/resource/dic_zyz_hero.json
rename to shared/resource/jsons/dic_zyz_hero.json
diff --git a/shared/resource/dic_zyz_heroskill.json b/shared/resource/jsons/dic_zyz_heroskill.json
similarity index 100%
rename from shared/resource/dic_zyz_heroskill.json
rename to shared/resource/jsons/dic_zyz_heroskill.json
diff --git a/shared/resource/dic_zyz_job.json b/shared/resource/jsons/dic_zyz_job.json
similarity index 100%
rename from shared/resource/dic_zyz_job.json
rename to shared/resource/jsons/dic_zyz_job.json
diff --git a/shared/resource/dic_zyz_job_walk.json b/shared/resource/jsons/dic_zyz_job_walk.json
similarity index 100%
rename from shared/resource/dic_zyz_job_walk.json
rename to shared/resource/jsons/dic_zyz_job_walk.json
diff --git a/shared/resource/dic_zyz_map_terrain.json b/shared/resource/jsons/dic_zyz_map_terrain.json
similarity index 100%
rename from shared/resource/dic_zyz_map_terrain.json
rename to shared/resource/jsons/dic_zyz_map_terrain.json
diff --git a/shared/resource/dic_zyz_se.json b/shared/resource/jsons/dic_zyz_se.json
similarity index 100%
rename from shared/resource/dic_zyz_se.json
rename to shared/resource/jsons/dic_zyz_se.json
diff --git a/shared/resource/dic_zyz_se_add.json b/shared/resource/jsons/dic_zyz_se_add.json
similarity index 100%
rename from shared/resource/dic_zyz_se_add.json
rename to shared/resource/jsons/dic_zyz_se_add.json
diff --git a/shared/resource/dic_zyz_skill.json b/shared/resource/jsons/dic_zyz_skill.json
similarity index 100%
rename from shared/resource/dic_zyz_skill.json
rename to shared/resource/jsons/dic_zyz_skill.json
diff --git a/shared/resource/dic_zyz_state.json b/shared/resource/jsons/dic_zyz_state.json
similarity index 100%
rename from shared/resource/dic_zyz_state.json
rename to shared/resource/jsons/dic_zyz_state.json
diff --git a/shared/resource/dic_zyz_superiority.json b/shared/resource/jsons/dic_zyz_superiority.json
similarity index 100%
rename from shared/resource/dic_zyz_superiority.json
rename to shared/resource/jsons/dic_zyz_superiority.json
diff --git a/shared/resource/dic_zyz_terrain_eff.json b/shared/resource/jsons/dic_zyz_terrain_eff.json
similarity index 100%
rename from shared/resource/dic_zyz_terrain_eff.json
rename to shared/resource/jsons/dic_zyz_terrain_eff.json
diff --git a/shared/resource/goods.json b/shared/resource/jsons/goods.json
similarity index 100%
rename from shared/resource/goods.json
rename to shared/resource/jsons/goods.json
diff --git a/shared/resource/warJsons/4001.json b/shared/resource/warJsons/4001.json
new file mode 100644
index 000000000..33c1318d2
--- /dev/null
+++ b/shared/resource/warJsons/4001.json
@@ -0,0 +1,101 @@
+[{
+	"warId": 1502,
+	"actorName": "李典",
+	"actorId": 312,
+	"dataId": 2001,
+	"relation": 2,
+	"outIndex": 0,
+	"dirction": 1,
+	"x": 11,
+	"y": 7,
+	"var": 1501,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "吕布",
+	"actorId": 344,
+	"dataId": 2002,
+	"relation": 2,
+	"outIndex": 1,
+	"dirction": 1,
+	"x": 10,
+	"y": 6,
+	"var": 1502,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "贾诩",
+	"actorId": 314,
+	"dataId": 2003,
+	"relation": 2,
+	"outIndex": 2,
+	"dirction": 1,
+	"x": 11,
+	"y": 6,
+	"var": 1503,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "许褚",
+	"actorId": 315,
+	"dataId": 2004,
+	"relation": 2,
+	"outIndex": 3,
+	"dirction": 1,
+	"x": 10,
+	"y": 5,
+	"var": 1504,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "邓艾",
+	"actorId": 309,
+	"dataId": 2005,
+	"relation": 2,
+	"outIndex": 4,
+	"dirction": 1,
+	"x": 11,
+	"y": 5,
+	"var": 1505,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}]
\ No newline at end of file
diff --git a/shared/resource/warJsons/4002.json b/shared/resource/warJsons/4002.json
new file mode 100644
index 000000000..33c1318d2
--- /dev/null
+++ b/shared/resource/warJsons/4002.json
@@ -0,0 +1,101 @@
+[{
+	"warId": 1502,
+	"actorName": "李典",
+	"actorId": 312,
+	"dataId": 2001,
+	"relation": 2,
+	"outIndex": 0,
+	"dirction": 1,
+	"x": 11,
+	"y": 7,
+	"var": 1501,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "吕布",
+	"actorId": 344,
+	"dataId": 2002,
+	"relation": 2,
+	"outIndex": 1,
+	"dirction": 1,
+	"x": 10,
+	"y": 6,
+	"var": 1502,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "贾诩",
+	"actorId": 314,
+	"dataId": 2003,
+	"relation": 2,
+	"outIndex": 2,
+	"dirction": 1,
+	"x": 11,
+	"y": 6,
+	"var": 1503,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "许褚",
+	"actorId": 315,
+	"dataId": 2004,
+	"relation": 2,
+	"outIndex": 3,
+	"dirction": 1,
+	"x": 10,
+	"y": 5,
+	"var": 1504,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "邓艾",
+	"actorId": 309,
+	"dataId": 2005,
+	"relation": 2,
+	"outIndex": 4,
+	"dirction": 1,
+	"x": 11,
+	"y": 5,
+	"var": 1505,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}]
\ No newline at end of file
diff --git a/shared/resource/warJsons/4003.json b/shared/resource/warJsons/4003.json
new file mode 100644
index 000000000..33c1318d2
--- /dev/null
+++ b/shared/resource/warJsons/4003.json
@@ -0,0 +1,101 @@
+[{
+	"warId": 1502,
+	"actorName": "李典",
+	"actorId": 312,
+	"dataId": 2001,
+	"relation": 2,
+	"outIndex": 0,
+	"dirction": 1,
+	"x": 11,
+	"y": 7,
+	"var": 1501,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "吕布",
+	"actorId": 344,
+	"dataId": 2002,
+	"relation": 2,
+	"outIndex": 1,
+	"dirction": 1,
+	"x": 10,
+	"y": 6,
+	"var": 1502,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "贾诩",
+	"actorId": 314,
+	"dataId": 2003,
+	"relation": 2,
+	"outIndex": 2,
+	"dirction": 1,
+	"x": 11,
+	"y": 6,
+	"var": 1503,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "许褚",
+	"actorId": 315,
+	"dataId": 2004,
+	"relation": 2,
+	"outIndex": 3,
+	"dirction": 1,
+	"x": 10,
+	"y": 5,
+	"var": 1504,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "邓艾",
+	"actorId": 309,
+	"dataId": 2005,
+	"relation": 2,
+	"outIndex": 4,
+	"dirction": 1,
+	"x": 11,
+	"y": 5,
+	"var": 1505,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}]
\ No newline at end of file
diff --git a/shared/resource/warJsons/4004.json b/shared/resource/warJsons/4004.json
new file mode 100644
index 000000000..33c1318d2
--- /dev/null
+++ b/shared/resource/warJsons/4004.json
@@ -0,0 +1,101 @@
+[{
+	"warId": 1502,
+	"actorName": "李典",
+	"actorId": 312,
+	"dataId": 2001,
+	"relation": 2,
+	"outIndex": 0,
+	"dirction": 1,
+	"x": 11,
+	"y": 7,
+	"var": 1501,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "吕布",
+	"actorId": 344,
+	"dataId": 2002,
+	"relation": 2,
+	"outIndex": 1,
+	"dirction": 1,
+	"x": 10,
+	"y": 6,
+	"var": 1502,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "贾诩",
+	"actorId": 314,
+	"dataId": 2003,
+	"relation": 2,
+	"outIndex": 2,
+	"dirction": 1,
+	"x": 11,
+	"y": 6,
+	"var": 1503,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "许褚",
+	"actorId": 315,
+	"dataId": 2004,
+	"relation": 2,
+	"outIndex": 3,
+	"dirction": 1,
+	"x": 10,
+	"y": 5,
+	"var": 1504,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "邓艾",
+	"actorId": 309,
+	"dataId": 2005,
+	"relation": 2,
+	"outIndex": 4,
+	"dirction": 1,
+	"x": 11,
+	"y": 5,
+	"var": 1505,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}]
\ No newline at end of file
diff --git a/shared/resource/warJsons/4005.json b/shared/resource/warJsons/4005.json
new file mode 100644
index 000000000..33c1318d2
--- /dev/null
+++ b/shared/resource/warJsons/4005.json
@@ -0,0 +1,101 @@
+[{
+	"warId": 1502,
+	"actorName": "李典",
+	"actorId": 312,
+	"dataId": 2001,
+	"relation": 2,
+	"outIndex": 0,
+	"dirction": 1,
+	"x": 11,
+	"y": 7,
+	"var": 1501,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "吕布",
+	"actorId": 344,
+	"dataId": 2002,
+	"relation": 2,
+	"outIndex": 1,
+	"dirction": 1,
+	"x": 10,
+	"y": 6,
+	"var": 1502,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "贾诩",
+	"actorId": 314,
+	"dataId": 2003,
+	"relation": 2,
+	"outIndex": 2,
+	"dirction": 1,
+	"x": 11,
+	"y": 6,
+	"var": 1503,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "许褚",
+	"actorId": 315,
+	"dataId": 2004,
+	"relation": 2,
+	"outIndex": 3,
+	"dirction": 1,
+	"x": 10,
+	"y": 5,
+	"var": 1504,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "邓艾",
+	"actorId": 309,
+	"dataId": 2005,
+	"relation": 2,
+	"outIndex": 4,
+	"dirction": 1,
+	"x": 11,
+	"y": 5,
+	"var": 1505,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}]
\ No newline at end of file
diff --git a/shared/resource/warJsons/4006.json b/shared/resource/warJsons/4006.json
new file mode 100644
index 000000000..33c1318d2
--- /dev/null
+++ b/shared/resource/warJsons/4006.json
@@ -0,0 +1,101 @@
+[{
+	"warId": 1502,
+	"actorName": "李典",
+	"actorId": 312,
+	"dataId": 2001,
+	"relation": 2,
+	"outIndex": 0,
+	"dirction": 1,
+	"x": 11,
+	"y": 7,
+	"var": 1501,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "吕布",
+	"actorId": 344,
+	"dataId": 2002,
+	"relation": 2,
+	"outIndex": 1,
+	"dirction": 1,
+	"x": 10,
+	"y": 6,
+	"var": 1502,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "贾诩",
+	"actorId": 314,
+	"dataId": 2003,
+	"relation": 2,
+	"outIndex": 2,
+	"dirction": 1,
+	"x": 11,
+	"y": 6,
+	"var": 1503,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "许褚",
+	"actorId": 315,
+	"dataId": 2004,
+	"relation": 2,
+	"outIndex": 3,
+	"dirction": 1,
+	"x": 10,
+	"y": 5,
+	"var": 1504,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "邓艾",
+	"actorId": 309,
+	"dataId": 2005,
+	"relation": 2,
+	"outIndex": 4,
+	"dirction": 1,
+	"x": 11,
+	"y": 5,
+	"var": 1505,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}]
\ No newline at end of file
diff --git a/shared/resource/warJsons/4007.json b/shared/resource/warJsons/4007.json
new file mode 100644
index 000000000..33c1318d2
--- /dev/null
+++ b/shared/resource/warJsons/4007.json
@@ -0,0 +1,101 @@
+[{
+	"warId": 1502,
+	"actorName": "李典",
+	"actorId": 312,
+	"dataId": 2001,
+	"relation": 2,
+	"outIndex": 0,
+	"dirction": 1,
+	"x": 11,
+	"y": 7,
+	"var": 1501,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "吕布",
+	"actorId": 344,
+	"dataId": 2002,
+	"relation": 2,
+	"outIndex": 1,
+	"dirction": 1,
+	"x": 10,
+	"y": 6,
+	"var": 1502,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "贾诩",
+	"actorId": 314,
+	"dataId": 2003,
+	"relation": 2,
+	"outIndex": 2,
+	"dirction": 1,
+	"x": 11,
+	"y": 6,
+	"var": 1503,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "许褚",
+	"actorId": 315,
+	"dataId": 2004,
+	"relation": 2,
+	"outIndex": 3,
+	"dirction": 1,
+	"x": 10,
+	"y": 5,
+	"var": 1504,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "邓艾",
+	"actorId": 309,
+	"dataId": 2005,
+	"relation": 2,
+	"outIndex": 4,
+	"dirction": 1,
+	"x": 11,
+	"y": 5,
+	"var": 1505,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}]
\ No newline at end of file
diff --git a/shared/resource/warJsons/4008.json b/shared/resource/warJsons/4008.json
new file mode 100644
index 000000000..33c1318d2
--- /dev/null
+++ b/shared/resource/warJsons/4008.json
@@ -0,0 +1,101 @@
+[{
+	"warId": 1502,
+	"actorName": "李典",
+	"actorId": 312,
+	"dataId": 2001,
+	"relation": 2,
+	"outIndex": 0,
+	"dirction": 1,
+	"x": 11,
+	"y": 7,
+	"var": 1501,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "吕布",
+	"actorId": 344,
+	"dataId": 2002,
+	"relation": 2,
+	"outIndex": 1,
+	"dirction": 1,
+	"x": 10,
+	"y": 6,
+	"var": 1502,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "贾诩",
+	"actorId": 314,
+	"dataId": 2003,
+	"relation": 2,
+	"outIndex": 2,
+	"dirction": 1,
+	"x": 11,
+	"y": 6,
+	"var": 1503,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "许褚",
+	"actorId": 315,
+	"dataId": 2004,
+	"relation": 2,
+	"outIndex": 3,
+	"dirction": 1,
+	"x": 10,
+	"y": 5,
+	"var": 1504,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "邓艾",
+	"actorId": 309,
+	"dataId": 2005,
+	"relation": 2,
+	"outIndex": 4,
+	"dirction": 1,
+	"x": 11,
+	"y": 5,
+	"var": 1505,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}]
\ No newline at end of file
diff --git a/shared/resource/warJsons/4009.json b/shared/resource/warJsons/4009.json
new file mode 100644
index 000000000..33c1318d2
--- /dev/null
+++ b/shared/resource/warJsons/4009.json
@@ -0,0 +1,101 @@
+[{
+	"warId": 1502,
+	"actorName": "李典",
+	"actorId": 312,
+	"dataId": 2001,
+	"relation": 2,
+	"outIndex": 0,
+	"dirction": 1,
+	"x": 11,
+	"y": 7,
+	"var": 1501,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "吕布",
+	"actorId": 344,
+	"dataId": 2002,
+	"relation": 2,
+	"outIndex": 1,
+	"dirction": 1,
+	"x": 10,
+	"y": 6,
+	"var": 1502,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "贾诩",
+	"actorId": 314,
+	"dataId": 2003,
+	"relation": 2,
+	"outIndex": 2,
+	"dirction": 1,
+	"x": 11,
+	"y": 6,
+	"var": 1503,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "许褚",
+	"actorId": 315,
+	"dataId": 2004,
+	"relation": 2,
+	"outIndex": 3,
+	"dirction": 1,
+	"x": 10,
+	"y": 5,
+	"var": 1504,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}, {
+	"warId": 1502,
+	"actorName": "邓艾",
+	"actorId": 309,
+	"dataId": 2005,
+	"relation": 2,
+	"outIndex": 4,
+	"dirction": 1,
+	"x": 11,
+	"y": 5,
+	"var": 1505,
+	"lv": 30,
+	"hide": 0,
+	"initial_ai": 1,
+	"bossid": 0,
+	"attribute": "&",
+	"skill": "&",
+	"seid": "&",
+	"star": 0,
+	"spine": 0
+}]
\ No newline at end of file