diff --git a/shared/resource/jsons/dic_zyz_mainTask.json b/shared/resource/jsons/dic_zyz_mainTask.json
index c4efd46ae..5490cd7bf 100644
--- a/shared/resource/jsons/dic_zyz_mainTask.json
+++ b/shared/resource/jsons/dic_zyz_mainTask.json
@@ -7,7 +7,7 @@
         "taskInfo": "主线通关第1-4关",
         "taskParam": "1&107",
         "taskStage": 1,
-        "taskReward": "11002&5",
+        "taskReward": "11002&10",
         "condition": 1,
         "skip": "115&"
     },
@@ -19,7 +19,7 @@
         "taskInfo": "事件触发1次",
         "taskParam": "0&1",
         "taskStage": 1,
-        "taskReward": "31001&5000",
+        "taskReward": "31001&20000",
         "condition": 1,
         "skip": "117&"
     },
@@ -43,7 +43,7 @@
         "taskInfo": "主线通关第1-8关",
         "taskParam": "1&112",
         "taskStage": 1,
-        "taskReward": "11002&5",
+        "taskReward": "11002&10",
         "condition": 1,
         "skip": "115&"
     },
@@ -79,7 +79,7 @@
         "taskInfo": "4名武将升至8级",
         "taskParam": "4&8",
         "taskStage": 1,
-        "taskReward": "11002&5",
+        "taskReward": "11002&10",
         "condition": 4,
         "skip": "132&"
     },
@@ -103,7 +103,7 @@
         "taskInfo": "将1件装备强化至8级",
         "taskParam": "1&8",
         "taskStage": 1,
-        "taskReward": "31001&20000",
+        "taskReward": "31001&50000",
         "condition": 1,
         "skip": "123&"
     },
@@ -127,7 +127,7 @@
         "taskInfo": "5名武将升至10级",
         "taskParam": "5&10",
         "taskStage": 2,
-        "taskReward": "11002&5",
+        "taskReward": "11002&10",
         "condition": 5,
         "skip": "132&"
     },
@@ -139,7 +139,7 @@
         "taskInfo": "主线通关第2-4关",
         "taskParam": "1&116",
         "taskStage": 2,
-        "taskReward": "11002&5",
+        "taskReward": "11002&10",
         "condition": 1,
         "skip": "115&"
     },
@@ -163,7 +163,7 @@
         "taskInfo": "6名武将升至12级",
         "taskParam": "6&12",
         "taskStage": 2,
-        "taskReward": "11002&5",
+        "taskReward": "11002&10",
         "condition": 6,
         "skip": "132&"
     },
@@ -175,7 +175,7 @@
         "taskInfo": "主线通关第2-8关",
         "taskParam": "1&120",
         "taskStage": 2,
-        "taskReward": "11002&5",
+        "taskReward": "11002&10",
         "condition": 1,
         "skip": "115&"
     },
@@ -223,7 +223,7 @@
         "taskInfo": "将4件装备强化至12级",
         "taskParam": "4&12",
         "taskStage": 2,
-        "taskReward": "31001&20000",
+        "taskReward": "31001&50000",
         "condition": 4,
         "skip": "123&"
     },
@@ -259,7 +259,7 @@
         "taskInfo": "6名武将升至15级",
         "taskParam": "6&15",
         "taskStage": 3,
-        "taskReward": "31001&30000",
+        "taskReward": "31001&80000",
         "condition": 6,
         "skip": "132&"
     },
@@ -295,7 +295,7 @@
         "taskInfo": "拥有5个好友",
         "taskParam": "5&",
         "taskStage": 3,
-        "taskReward": "11101&10",
+        "taskReward": "31001&50000",
         "condition": 5,
         "skip": "129&"
     },
@@ -307,7 +307,7 @@
         "taskInfo": "通关防守城池·难度一",
         "taskParam": "0&1&1&3100",
         "taskStage": 3,
-        "taskReward": "11002&10",
+        "taskReward": "11002&15",
         "condition": 1,
         "skip": "77&"
     },
@@ -367,7 +367,7 @@
         "taskInfo": "通关支线世外小村",
         "taskParam": "1&2511",
         "taskStage": 3,
-        "taskReward": "22001&1",
+        "taskReward": "31002&100",
         "condition": 1,
         "skip": "116&2511"
     },
@@ -379,7 +379,7 @@
         "taskInfo": "通关护送商人1次",
         "taskParam": "1&1",
         "taskStage": 3,
-        "taskReward": "31002&100",
+        "taskReward": "31001&50000",
         "condition": 1,
         "skip": "76&"
     },
@@ -391,7 +391,7 @@
         "taskInfo": "通关防守城池1次",
         "taskParam": "2&1",
         "taskStage": 3,
-        "taskReward": "31002&100",
+        "taskReward": "11002&15",
         "condition": 1,
         "skip": "77&"
     },
@@ -403,7 +403,7 @@
         "taskInfo": "队伍等级达17级",
         "taskParam": "17&",
         "taskStage": 3,
-        "taskReward": "11002&10",
+        "taskReward": "11002&15",
         "condition": 17,
         "skip": "115&"
     },
@@ -415,7 +415,7 @@
         "taskInfo": "6名武将升至17级",
         "taskParam": "6&17",
         "taskStage": 3,
-        "taskReward": "31001&30000",
+        "taskReward": "31001&100000",
         "condition": 6,
         "skip": "132&"
     },
@@ -427,7 +427,7 @@
         "taskInfo": "将8件装备强化至17级",
         "taskParam": "8&17",
         "taskStage": 3,
-        "taskReward": "31002&100",
+        "taskReward": "31002&200",
         "condition": 8,
         "skip": "123&"
     },
@@ -439,7 +439,7 @@
         "taskInfo": "武将招募20次",
         "taskParam": "20&",
         "taskStage": 3,
-        "taskReward": "31002&100",
+        "taskReward": "31002&200",
         "condition": 20,
         "skip": "13&"
     },
@@ -451,7 +451,7 @@
         "taskInfo": "主线通关第3-8关",
         "taskParam": "1&128",
         "taskStage": 3,
-        "taskReward": "31002&100",
+        "taskReward": "31002&500",
         "condition": 1,
         "skip": "115&"
     },
@@ -463,7 +463,7 @@
         "taskInfo": "队伍等级达20级",
         "taskParam": "20&",
         "taskStage": 4,
-        "taskReward": "11002&10",
+        "taskReward": "11002&15",
         "condition": 20,
         "skip": "115&"
     },
@@ -475,7 +475,7 @@
         "taskInfo": "6名武将升至20级",
         "taskParam": "6&20",
         "taskStage": 4,
-        "taskReward": "31001&50000",
+        "taskReward": "31001&120000",
         "condition": 6,
         "skip": "132&"
     },
@@ -559,7 +559,7 @@
         "taskInfo": "队伍等级达25级",
         "taskParam": "25&",
         "taskStage": 4,
-        "taskReward": "11002&15",
+        "taskReward": "11003&20",
         "condition": 25,
         "skip": "115&"
     },
@@ -571,7 +571,7 @@
         "taskInfo": "6名武将升至25级",
         "taskParam": "6&25",
         "taskStage": 4,
-        "taskReward": "31001&90000",
+        "taskReward": "31001&150000",
         "condition": 6,
         "skip": "132&"
     },
@@ -631,7 +631,7 @@
         "taskInfo": "名将谱激活25个武将",
         "taskParam": "25&",
         "taskStage": 5,
-        "taskReward": "31002&50",
+        "taskReward": "31002&300",
         "condition": 25,
         "skip": "56&"
     },
@@ -643,7 +643,7 @@
         "taskInfo": "拥有6名初始传奇武将",
         "taskParam": "6&3",
         "taskStage": 5,
-        "taskReward": "31002&100",
+        "taskReward": "22001&5",
         "condition": 6,
         "skip": "13&"
     },
@@ -679,7 +679,7 @@
         "taskInfo": "队伍等级达30级",
         "taskParam": "30&",
         "taskStage": 5,
-        "taskReward": "11003&10",
+        "taskReward": "11003&30",
         "condition": 30,
         "skip": "115&"
     },
@@ -691,7 +691,7 @@
         "taskInfo": "6名武将升至30级",
         "taskParam": "6&30",
         "taskStage": 5,
-        "taskReward": "31001&90000",
+        "taskReward": "31001&180000",
         "condition": 6,
         "skip": "132&"
     },
@@ -715,7 +715,7 @@
         "taskInfo": "4件装备精炼至1星",
         "taskParam": "4&1",
         "taskStage": 5,
-        "taskReward": "17054&6000",
+        "taskReward": "17055&1",
         "condition": 4,
         "skip": "125&"
     },
@@ -835,7 +835,7 @@
         "taskInfo": "队伍等级达35级",
         "taskParam": "35&",
         "taskStage": 6,
-        "taskReward": "11003&30",
+        "taskReward": "11003&40",
         "condition": 35,
         "skip": "115&"
     },
@@ -907,7 +907,7 @@
         "taskInfo": "爵位升至公士",
         "taskParam": "2&",
         "taskStage": 6,
-        "taskReward": "17046&1",
+        "taskReward": "40015&2000",
         "condition": 2,
         "skip": "55&"
     },
@@ -919,7 +919,7 @@
         "taskInfo": "军团捐献累计20次",
         "taskParam": "20&",
         "taskStage": 6,
-        "taskReward": "40005&1000",
+        "taskReward": "40005&3000",
         "condition": 20,
         "skip": "65&"
     },
@@ -931,7 +931,7 @@
         "taskInfo": "军团练兵场累计挑战4次",
         "taskParam": "4&",
         "taskStage": 6,
-        "taskReward": "40005&1000",
+        "taskReward": "40005&2000",
         "condition": 4,
         "skip": "68&"
     },
@@ -955,7 +955,7 @@
         "taskInfo": "圣兽青龙强化20次",
         "taskParam": "20&",
         "taskStage": 6,
-        "taskReward": "17053&10",
+        "taskReward": "17052&100",
         "condition": 20,
         "skip": "51&"
     },
@@ -1027,7 +1027,7 @@
         "taskInfo": "队伍等级达40级",
         "taskParam": "40&",
         "taskStage": 7,
-        "taskReward": "11003&30",
+        "taskReward": "11003&50",
         "condition": 40,
         "skip": "115&"
     },
@@ -1087,7 +1087,7 @@
         "taskInfo": "单个最高等级的羁绊达2级",
         "taskParam": "2&",
         "taskStage": 7,
-        "taskReward": "11014&1",
+        "taskReward": "11014&3",
         "condition": 2,
         "skip": "135&"
     },
@@ -1279,7 +1279,7 @@
         "taskInfo": "4件装备镶嵌天晶",
         "taskParam": "4&",
         "taskStage": 8,
-        "taskReward": "71009&1",
+        "taskReward": "40002&400",
         "condition": 4,
         "skip": "45&"
     },
@@ -1315,7 +1315,7 @@
         "taskInfo": "三星通关矿石争夺·难度一",
         "taskParam": "3&1&1&3200",
         "taskStage": 8,
-        "taskReward": "71009&20",
+        "taskReward": "71009&21",
         "condition": 1,
         "skip": "79&"
     },
@@ -1351,7 +1351,7 @@
         "taskInfo": "队伍等级达48级",
         "taskParam": "48&",
         "taskStage": 9,
-        "taskReward": "11003&70",
+        "taskReward": "11003&80",
         "condition": 48,
         "skip": "115&"
     },
@@ -1507,7 +1507,7 @@
         "taskInfo": "队伍等级达50级",
         "taskParam": "50&",
         "taskStage": 10,
-        "taskReward": "11003&70",
+        "taskReward": "11003&90",
         "condition": 50,
         "skip": "115&"
     },
@@ -1555,7 +1555,7 @@
         "taskInfo": "主线通关第7-20关",
         "taskParam": "1&320",
         "taskStage": 10,
-        "taskReward": "31002&100",
+        "taskReward": "31002&500",
         "condition": 1,
         "skip": "115&"
     },
@@ -1639,7 +1639,7 @@
         "taskInfo": "名将擂台进入前200名",
         "taskParam": "200&1",
         "taskStage": 10,
-        "taskReward": "40015&1000",
+        "taskReward": "40015&3000",
         "condition": 1,
         "skip": "159&"
     },
@@ -1663,7 +1663,7 @@
         "taskInfo": "单个最高等级的羁绊达7级",
         "taskParam": "7&",
         "taskStage": 10,
-        "taskReward": "11014&1",
+        "taskReward": "11014&5",
         "condition": 7,
         "skip": "135&"
     },
@@ -1687,7 +1687,7 @@
         "taskInfo": "队伍等级达52级",
         "taskParam": "52&",
         "taskStage": 11,
-        "taskReward": "11003&70",
+        "taskReward": "11003&100",
         "condition": 52,
         "skip": "115&"
     },
@@ -1879,7 +1879,7 @@
         "taskInfo": "队伍等级达54级",
         "taskParam": "54&",
         "taskStage": 12,
-        "taskReward": "11003&90",
+        "taskReward": "11003&110",
         "condition": 54,
         "skip": "115&"
     },
@@ -1951,7 +1951,7 @@
         "taskInfo": "1名初始传奇武将升至神话2星",
         "taskParam": "1&3&8",
         "taskStage": 12,
-        "taskReward": "17001&2",
+        "taskReward": "31002&500",
         "condition": 1,
         "skip": "133&"
     },
@@ -1975,7 +1975,7 @@
         "taskInfo": "队伍等级达56级",
         "taskParam": "56&",
         "taskStage": 13,
-        "taskReward": "11003&45",
+        "taskReward": "11003&120",
         "condition": 56,
         "skip": "115&"
     },
@@ -2059,7 +2059,7 @@
         "taskInfo": "2名武将觉醒至神话1星",
         "taskParam": "2&1&",
         "taskStage": 13,
-        "taskReward": "31002&100",
+        "taskReward": "31002&500",
         "condition": 2,
         "skip": "133&"
     },
@@ -2119,7 +2119,7 @@
         "taskInfo": "队伍等级达58级",
         "taskParam": "58&",
         "taskStage": 14,
-        "taskReward": "11003&50",
+        "taskReward": "11003&130",
         "condition": 58,
         "skip": "115&"
     },
@@ -2251,7 +2251,7 @@
         "taskInfo": "队伍等级达60级",
         "taskParam": "60&",
         "taskStage": 15,
-        "taskReward": "11003&70",
+        "taskReward": "11003&140",
         "condition": 60,
         "skip": "115&"
     },
@@ -2383,7 +2383,7 @@
         "taskInfo": "队伍等级达62级",
         "taskParam": "62&",
         "taskStage": 16,
-        "taskReward": "11003&80",
+        "taskReward": "11003&150",
         "condition": 62,
         "skip": "115&"
     },
@@ -2539,7 +2539,7 @@
         "taskInfo": "队伍等级达64级",
         "taskParam": "64&",
         "taskStage": 17,
-        "taskReward": "11003&100",
+        "taskReward": "11003&160",
         "condition": 64,
         "skip": "115&"
     },
diff --git a/shared/resource/jsons/dic_zyz_main_star_reward.json b/shared/resource/jsons/dic_zyz_main_star_reward.json
index 21e7459d6..deba738a7 100644
--- a/shared/resource/jsons/dic_zyz_main_star_reward.json
+++ b/shared/resource/jsons/dic_zyz_main_star_reward.json
@@ -10,306 +10,306 @@
         "id": 102,
         "chapter": 1,
         "star": 6,
-        "reward": "31002&200",
-        "maintype": 1
-    },
-    {
-        "id": 103,
-        "chapter": 1,
-        "star": 9,
-        "reward": "31002&400",
-        "maintype": 1
-    },
-    {
-        "id": 104,
-        "chapter": 1,
-        "star": 12,
-        "reward": "31002&400",
-        "maintype": 1
-    },
-    {
-        "id": 105,
-        "chapter": 1,
-        "star": 15,
         "reward": "31002&600",
         "maintype": 1
     },
+    {
+        "id": 103,
+        "chapter": 2,
+        "star": 3,
+        "reward": "31002&200",
+        "maintype": 1
+    },
+    {
+        "id": 104,
+        "chapter": 2,
+        "star": 6,
+        "reward": "31002&600",
+        "maintype": 1
+    },
+    {
+        "id": 105,
+        "chapter": 3,
+        "star": 3,
+        "reward": "31002&200",
+        "maintype": 1
+    },
     {
         "id": 106,
-        "chapter": 1,
-        "star": 18,
+        "chapter": 3,
+        "star": 6,
         "reward": "31002&600",
         "maintype": 1
     },
     {
         "id": 201,
-        "chapter": 2,
+        "chapter": 4,
         "star": 3,
         "reward": "31002&200",
         "maintype": 1
     },
     {
         "id": 202,
-        "chapter": 2,
+        "chapter": 4,
         "star": 6,
-        "reward": "31002&200",
+        "reward": "31002&400",
         "maintype": 1
     },
     {
         "id": 203,
-        "chapter": 2,
+        "chapter": 4,
         "star": 9,
-        "reward": "31002&400",
-        "maintype": 1
-    },
-    {
-        "id": 204,
-        "chapter": 2,
-        "star": 12,
-        "reward": "31002&400",
-        "maintype": 1
-    },
-    {
-        "id": 205,
-        "chapter": 2,
-        "star": 15,
         "reward": "31002&600",
         "maintype": 1
     },
+    {
+        "id": 204,
+        "chapter": 5,
+        "star": 12,
+        "reward": "31002&200",
+        "maintype": 1
+    },
+    {
+        "id": 205,
+        "chapter": 5,
+        "star": 15,
+        "reward": "31002&400",
+        "maintype": 1
+    },
     {
         "id": 206,
-        "chapter": 2,
+        "chapter": 5,
         "star": 18,
         "reward": "31002&600",
         "maintype": 1
     },
     {
         "id": 301,
-        "chapter": 3,
+        "chapter": 6,
         "star": 3,
         "reward": "31002&200",
         "maintype": 1
     },
     {
         "id": 302,
-        "chapter": 3,
+        "chapter": 6,
         "star": 6,
         "reward": "31002&200",
         "maintype": 1
     },
     {
         "id": 303,
-        "chapter": 3,
+        "chapter": 6,
         "star": 9,
         "reward": "31002&400",
         "maintype": 1
     },
     {
         "id": 304,
-        "chapter": 3,
+        "chapter": 6,
         "star": 12,
         "reward": "31002&400",
         "maintype": 1
     },
     {
         "id": 305,
-        "chapter": 3,
+        "chapter": 6,
         "star": 15,
         "reward": "31002&600",
         "maintype": 1
     },
     {
         "id": 306,
-        "chapter": 3,
+        "chapter": 6,
         "star": 18,
         "reward": "31002&600",
         "maintype": 1
     },
     {
         "id": 401,
-        "chapter": 4,
+        "chapter": 7,
         "star": 3,
         "reward": "31002&200",
         "maintype": 1
     },
     {
         "id": 402,
-        "chapter": 4,
+        "chapter": 7,
         "star": 6,
         "reward": "31002&200",
         "maintype": 1
     },
     {
         "id": 403,
-        "chapter": 4,
+        "chapter": 7,
         "star": 9,
         "reward": "31002&400",
         "maintype": 1
     },
     {
         "id": 404,
-        "chapter": 4,
+        "chapter": 7,
         "star": 12,
         "reward": "31002&400",
         "maintype": 1
     },
     {
         "id": 405,
-        "chapter": 4,
+        "chapter": 7,
         "star": 15,
         "reward": "31002&600",
         "maintype": 1
     },
     {
         "id": 406,
-        "chapter": 4,
+        "chapter": 7,
         "star": 18,
         "reward": "31002&600",
         "maintype": 1
     },
     {
         "id": 501,
-        "chapter": 5,
+        "chapter": 8,
         "star": 3,
         "reward": "31002&200",
         "maintype": 1
     },
     {
         "id": 502,
-        "chapter": 5,
+        "chapter": 8,
         "star": 6,
         "reward": "31002&200",
         "maintype": 1
     },
     {
         "id": 503,
-        "chapter": 5,
+        "chapter": 8,
         "star": 9,
         "reward": "31002&400",
         "maintype": 1
     },
     {
         "id": 504,
-        "chapter": 5,
+        "chapter": 8,
         "star": 12,
         "reward": "31002&400",
         "maintype": 1
     },
     {
         "id": 505,
-        "chapter": 5,
+        "chapter": 8,
         "star": 15,
         "reward": "31002&600",
         "maintype": 1
     },
     {
         "id": 506,
-        "chapter": 5,
+        "chapter": 8,
         "star": 18,
         "reward": "31002&600",
         "maintype": 1
     },
     {
         "id": 507,
-        "chapter": 5,
+        "chapter": 8,
         "star": 21,
         "reward": "31002&800",
         "maintype": 1
     },
     {
         "id": 601,
-        "chapter": 6,
+        "chapter": 9,
         "star": 3,
         "reward": "31002&200",
         "maintype": 1
     },
     {
         "id": 602,
-        "chapter": 6,
+        "chapter": 9,
         "star": 6,
         "reward": "31002&200",
         "maintype": 1
     },
     {
         "id": 603,
-        "chapter": 6,
+        "chapter": 9,
         "star": 9,
         "reward": "31002&400",
         "maintype": 1
     },
     {
         "id": 604,
-        "chapter": 6,
+        "chapter": 9,
         "star": 12,
         "reward": "31002&400",
         "maintype": 1
     },
     {
         "id": 605,
-        "chapter": 6,
+        "chapter": 9,
         "star": 15,
         "reward": "31002&600",
         "maintype": 1
     },
     {
         "id": 606,
-        "chapter": 6,
+        "chapter": 9,
         "star": 18,
         "reward": "31002&600",
         "maintype": 1
     },
     {
         "id": 607,
-        "chapter": 6,
+        "chapter": 9,
         "star": 21,
         "reward": "31002&800",
         "maintype": 1
     },
     {
         "id": 701,
-        "chapter": 7,
+        "chapter": 10,
         "star": 3,
         "reward": "31002&200",
         "maintype": 1
     },
     {
         "id": 702,
-        "chapter": 7,
+        "chapter": 10,
         "star": 6,
         "reward": "31002&200",
         "maintype": 1
     },
     {
         "id": 703,
-        "chapter": 7,
+        "chapter": 10,
         "star": 9,
         "reward": "31002&400",
         "maintype": 1
     },
     {
         "id": 704,
-        "chapter": 7,
+        "chapter": 10,
         "star": 12,
         "reward": "31002&400",
         "maintype": 1
     },
     {
         "id": 705,
-        "chapter": 7,
+        "chapter": 10,
         "star": 15,
         "reward": "31002&600",
         "maintype": 1
     },
     {
         "id": 706,
-        "chapter": 7,
+        "chapter": 10,
         "star": 18,
         "reward": "31002&600",
         "maintype": 1
     },
     {
         "id": 707,
-        "chapter": 7,
+        "chapter": 10,
         "star": 21,
         "reward": "31002&800",
         "maintype": 1
@@ -325,306 +325,306 @@
         "id": 1102,
         "chapter": 1,
         "star": 6,
-        "reward": "31002&200",
-        "maintype": 12
-    },
-    {
-        "id": 1103,
-        "chapter": 1,
-        "star": 9,
-        "reward": "31002&400",
-        "maintype": 12
-    },
-    {
-        "id": 1104,
-        "chapter": 1,
-        "star": 12,
-        "reward": "31002&400",
-        "maintype": 12
-    },
-    {
-        "id": 1105,
-        "chapter": 1,
-        "star": 15,
         "reward": "31002&600",
         "maintype": 12
     },
+    {
+        "id": 1103,
+        "chapter": 2,
+        "star": 9,
+        "reward": "31002&200",
+        "maintype": 12
+    },
+    {
+        "id": 1104,
+        "chapter": 2,
+        "star": 12,
+        "reward": "31002&600",
+        "maintype": 12
+    },
+    {
+        "id": 1105,
+        "chapter": 3,
+        "star": 15,
+        "reward": "31002&200",
+        "maintype": 12
+    },
     {
         "id": 1106,
-        "chapter": 1,
+        "chapter": 3,
         "star": 18,
         "reward": "31002&600",
         "maintype": 12
     },
     {
         "id": 1201,
-        "chapter": 2,
+        "chapter": 4,
         "star": 3,
         "reward": "31002&200",
         "maintype": 12
     },
     {
         "id": 1202,
-        "chapter": 2,
+        "chapter": 4,
         "star": 6,
-        "reward": "31002&200",
+        "reward": "31002&400",
         "maintype": 12
     },
     {
         "id": 1203,
-        "chapter": 2,
+        "chapter": 4,
         "star": 9,
-        "reward": "31002&400",
-        "maintype": 12
-    },
-    {
-        "id": 1204,
-        "chapter": 2,
-        "star": 12,
-        "reward": "31002&400",
-        "maintype": 12
-    },
-    {
-        "id": 1205,
-        "chapter": 2,
-        "star": 15,
         "reward": "31002&600",
         "maintype": 12
     },
+    {
+        "id": 1204,
+        "chapter": 5,
+        "star": 12,
+        "reward": "31002&200",
+        "maintype": 12
+    },
+    {
+        "id": 1205,
+        "chapter": 5,
+        "star": 15,
+        "reward": "31002&400",
+        "maintype": 12
+    },
     {
         "id": 1206,
-        "chapter": 2,
+        "chapter": 5,
         "star": 18,
         "reward": "31002&600",
         "maintype": 12
     },
     {
         "id": 1301,
-        "chapter": 3,
+        "chapter": 6,
         "star": 3,
         "reward": "31002&200",
         "maintype": 12
     },
     {
         "id": 1302,
-        "chapter": 3,
+        "chapter": 6,
         "star": 6,
         "reward": "31002&200",
         "maintype": 12
     },
     {
         "id": 1303,
-        "chapter": 3,
+        "chapter": 6,
         "star": 9,
         "reward": "31002&400",
         "maintype": 12
     },
     {
         "id": 1304,
-        "chapter": 3,
+        "chapter": 6,
         "star": 12,
         "reward": "31002&400",
         "maintype": 12
     },
     {
         "id": 1305,
-        "chapter": 3,
+        "chapter": 6,
         "star": 15,
         "reward": "31002&600",
         "maintype": 12
     },
     {
         "id": 1306,
-        "chapter": 3,
+        "chapter": 6,
         "star": 18,
         "reward": "31002&600",
         "maintype": 12
     },
     {
         "id": 1401,
-        "chapter": 4,
+        "chapter": 7,
         "star": 3,
         "reward": "31002&200",
         "maintype": 12
     },
     {
         "id": 1402,
-        "chapter": 4,
+        "chapter": 7,
         "star": 6,
         "reward": "31002&200",
         "maintype": 12
     },
     {
         "id": 1403,
-        "chapter": 4,
+        "chapter": 7,
         "star": 9,
         "reward": "31002&400",
         "maintype": 12
     },
     {
         "id": 1404,
-        "chapter": 4,
+        "chapter": 7,
         "star": 12,
         "reward": "31002&400",
         "maintype": 12
     },
     {
         "id": 1405,
-        "chapter": 4,
+        "chapter": 7,
         "star": 15,
         "reward": "31002&600",
         "maintype": 12
     },
     {
         "id": 1406,
-        "chapter": 4,
+        "chapter": 7,
         "star": 18,
         "reward": "31002&600",
         "maintype": 12
     },
     {
         "id": 1501,
-        "chapter": 5,
+        "chapter": 8,
         "star": 3,
         "reward": "31002&200",
         "maintype": 12
     },
     {
         "id": 1502,
-        "chapter": 5,
+        "chapter": 8,
         "star": 6,
         "reward": "31002&200",
         "maintype": 12
     },
     {
         "id": 1503,
-        "chapter": 5,
+        "chapter": 8,
         "star": 9,
         "reward": "31002&400",
         "maintype": 12
     },
     {
         "id": 1504,
-        "chapter": 5,
+        "chapter": 8,
         "star": 12,
         "reward": "31002&400",
         "maintype": 12
     },
     {
         "id": 1505,
-        "chapter": 5,
+        "chapter": 8,
         "star": 15,
         "reward": "31002&600",
         "maintype": 12
     },
     {
         "id": 1506,
-        "chapter": 5,
+        "chapter": 8,
         "star": 18,
         "reward": "31002&600",
         "maintype": 12
     },
     {
         "id": 1507,
-        "chapter": 5,
+        "chapter": 8,
         "star": 21,
         "reward": "31002&800",
         "maintype": 12
     },
     {
         "id": 1601,
-        "chapter": 6,
+        "chapter": 9,
         "star": 3,
         "reward": "31002&200",
         "maintype": 12
     },
     {
         "id": 1602,
-        "chapter": 6,
+        "chapter": 9,
         "star": 6,
         "reward": "31002&200",
         "maintype": 12
     },
     {
         "id": 1603,
-        "chapter": 6,
+        "chapter": 9,
         "star": 9,
         "reward": "31002&400",
         "maintype": 12
     },
     {
         "id": 1604,
-        "chapter": 6,
+        "chapter": 9,
         "star": 12,
         "reward": "31002&400",
         "maintype": 12
     },
     {
         "id": 1605,
-        "chapter": 6,
+        "chapter": 9,
         "star": 15,
         "reward": "31002&600",
         "maintype": 12
     },
     {
         "id": 1606,
-        "chapter": 6,
+        "chapter": 9,
         "star": 18,
         "reward": "31002&600",
         "maintype": 12
     },
     {
         "id": 1607,
-        "chapter": 6,
+        "chapter": 9,
         "star": 21,
         "reward": "31002&800",
         "maintype": 12
     },
     {
         "id": 1701,
-        "chapter": 7,
+        "chapter": 10,
         "star": 3,
         "reward": "31002&200",
         "maintype": 12
     },
     {
         "id": 1702,
-        "chapter": 7,
+        "chapter": 10,
         "star": 6,
         "reward": "31002&200",
         "maintype": 12
     },
     {
         "id": 1703,
-        "chapter": 7,
+        "chapter": 10,
         "star": 9,
         "reward": "31002&400",
         "maintype": 12
     },
     {
         "id": 1704,
-        "chapter": 7,
+        "chapter": 10,
         "star": 12,
         "reward": "31002&400",
         "maintype": 12
     },
     {
         "id": 1705,
-        "chapter": 7,
+        "chapter": 10,
         "star": 15,
         "reward": "31002&600",
         "maintype": 12
     },
     {
         "id": 1706,
-        "chapter": 7,
+        "chapter": 10,
         "star": 18,
         "reward": "31002&600",
         "maintype": 12
     },
     {
         "id": 1707,
-        "chapter": 7,
+        "chapter": 10,
         "star": 21,
         "reward": "31002&800",
         "maintype": 12
diff --git a/shared/resource/warJsons/4001.json b/shared/resource/warJsons/4001.json
index 7140f6799..2c48512f3 100644
--- a/shared/resource/warJsons/4001.json
+++ b/shared/resource/warJsons/4001.json
@@ -7,7 +7,7 @@
         "relation": 0,
         "outIndex": 0,
         "dirction": 1,
-        "x": 6,
+        "x": 3,
         "y": 2,
         "var": 501,
         "lv": 20,
@@ -27,8 +27,8 @@
         "relation": 0,
         "outIndex": 1,
         "dirction": 1,
-        "x": 7,
-        "y": 2,
+        "x": 5,
+        "y": 3,
         "var": 502,
         "lv": 20,
         "hide": 0,
@@ -47,8 +47,8 @@
         "relation": 0,
         "outIndex": 2,
         "dirction": 1,
-        "x": 8,
-        "y": 2,
+        "x": 3,
+        "y": 4,
         "var": 503,
         "lv": 20,
         "hide": 0,
@@ -67,8 +67,8 @@
         "relation": 0,
         "outIndex": 3,
         "dirction": 1,
-        "x": 5,
-        "y": 1,
+        "x": 4,
+        "y": 2,
         "var": 504,
         "lv": 20,
         "hide": 0,
@@ -87,8 +87,8 @@
         "relation": 0,
         "outIndex": 4,
         "dirction": 1,
-        "x": 6,
-        "y": 1,
+        "x": 4,
+        "y": 3,
         "var": 505,
         "lv": 20,
         "hide": 0,
@@ -107,8 +107,8 @@
         "relation": 0,
         "outIndex": 5,
         "dirction": 1,
-        "x": 7,
-        "y": 1,
+        "x": 4,
+        "y": 4,
         "var": 506,
         "lv": 20,
         "hide": 0,
@@ -127,13 +127,13 @@
         "relation": 2,
         "outIndex": 0,
         "dirction": 0,
-        "x": 7,
-        "y": 6,
+        "x": 6,
+        "y": 7,
         "var": 2001,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&3202|2&1100|4&520|5&440",
+        "attribute": "1&3045|2&960|4&570|5&630",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -147,13 +147,13 @@
         "relation": 2,
         "outIndex": 1,
         "dirction": 0,
-        "x": 10,
-        "y": 6,
+        "x": 6,
+        "y": 8,
         "var": 2002,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2806|2&1350|4&440|5&390",
+        "attribute": "1&3240|2&945|4&600|5&555",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -168,12 +168,12 @@
         "outIndex": 2,
         "dirction": 0,
         "x": 9,
-        "y": 6,
+        "y": 8,
         "var": 2003,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2080|2&1620|4&400|5&380",
+        "attribute": "1&3150|2&1005|4&585|5&540",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -188,12 +188,12 @@
         "outIndex": 3,
         "dirction": 0,
         "x": 10,
-        "y": 8,
+        "y": 7,
         "var": 2004,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&1915|2&1630|4&310|5&510",
+        "attribute": "1&2805|2&1035|4&525|5&675",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -207,13 +207,13 @@
         "relation": 2,
         "outIndex": 4,
         "dirction": 0,
-        "x": 9,
-        "y": 7,
+        "x": 10,
+        "y": 8,
         "var": 2005,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2146|2&1450|4&310|5&620",
+        "attribute": "1&2895|2&975|4&540|5&690",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -227,13 +227,13 @@
         "relation": 2,
         "outIndex": 5,
         "dirction": 0,
-        "x": 10,
+        "x": 12,
         "y": 7,
         "var": 2006,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2245|2&1550|4&330|5&470",
+        "attribute": "1&3105|2&1020|4&555|5&570",
         "skill": 0,
         "seid": "&",
         "star": 0,
diff --git a/shared/resource/warJsons/4002.json b/shared/resource/warJsons/4002.json
index f3945c180..2f0d0e7dd 100644
--- a/shared/resource/warJsons/4002.json
+++ b/shared/resource/warJsons/4002.json
@@ -28,7 +28,7 @@
         "outIndex": 1,
         "dirction": 0,
         "x": 13,
-        "y": 7,
+        "y": 8,
         "var": 502,
         "lv": 20,
         "hide": 0,
@@ -48,7 +48,7 @@
         "outIndex": 2,
         "dirction": 0,
         "x": 14,
-        "y": 7,
+        "y": 6,
         "var": 503,
         "lv": 20,
         "hide": 0,
@@ -67,8 +67,8 @@
         "relation": 0,
         "outIndex": 3,
         "dirction": 0,
-        "x": 12,
-        "y": 6,
+        "x": 14,
+        "y": 7,
         "var": 504,
         "lv": 20,
         "hide": 0,
@@ -87,8 +87,8 @@
         "relation": 0,
         "outIndex": 4,
         "dirction": 0,
-        "x": 13,
-        "y": 6,
+        "x": 15,
+        "y": 5,
         "var": 505,
         "lv": 20,
         "hide": 0,
@@ -107,8 +107,8 @@
         "relation": 0,
         "outIndex": 5,
         "dirction": 0,
-        "x": 14,
-        "y": 6,
+        "x": 15,
+        "y": 8,
         "var": 506,
         "lv": 20,
         "hide": 0,
@@ -127,13 +127,13 @@
         "relation": 2,
         "outIndex": 0,
         "dirction": 1,
-        "x": 7,
-        "y": 6,
+        "x": 4,
+        "y": 4,
         "var": 2001,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2806|2&1350|4&440|5&390",
+        "attribute": "1&3240|2&945|4&600|5&555",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -147,13 +147,13 @@
         "relation": 2,
         "outIndex": 1,
         "dirction": 1,
-        "x": 6,
-        "y": 8,
+        "x": 4,
+        "y": 5,
         "var": 2002,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&3202|2&1100|4&520|5&440",
+        "attribute": "1&3390|2&900|4&645|5&510",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -168,12 +168,12 @@
         "outIndex": 2,
         "dirction": 1,
         "x": 5,
-        "y": 6,
+        "y": 7,
         "var": 2003,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2080|2&1620|4&400|5&380",
+        "attribute": "1&3150|2&1005|4&585|5&540",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -187,13 +187,13 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 1,
-        "x": 7,
+        "x": 5,
         "y": 8,
         "var": 2004,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&1915|2&1630|4&310|5&510",
+        "attribute": "1&2805|2&1035|4&525|5&675",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -208,12 +208,12 @@
         "outIndex": 4,
         "dirction": 1,
         "x": 6,
-        "y": 7,
+        "y": 3,
         "var": 2005,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2806|2&1350|4&440|5&390",
+        "attribute": "1&3390|2&900|4&645|5&510",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -227,13 +227,13 @@
         "relation": 2,
         "outIndex": 5,
         "dirction": 1,
-        "x": 5,
-        "y": 7,
+        "x": 6,
+        "y": 8,
         "var": 2006,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2245|2&1550|4&330|5&470",
+        "attribute": "1&3105|2&1020|4&555|5&570",
         "skill": 0,
         "seid": "&",
         "star": 0,
diff --git a/shared/resource/warJsons/4003.json b/shared/resource/warJsons/4003.json
index ec40abef5..2ea946d3a 100644
--- a/shared/resource/warJsons/4003.json
+++ b/shared/resource/warJsons/4003.json
@@ -28,7 +28,7 @@
         "outIndex": 1,
         "dirction": 0,
         "x": 13,
-        "y": 7,
+        "y": 8,
         "var": 502,
         "lv": 20,
         "hide": 0,
@@ -47,8 +47,8 @@
         "relation": 0,
         "outIndex": 2,
         "dirction": 0,
-        "x": 12,
-        "y": 7,
+        "x": 14,
+        "y": 6,
         "var": 503,
         "lv": 20,
         "hide": 0,
@@ -67,8 +67,8 @@
         "relation": 0,
         "outIndex": 3,
         "dirction": 0,
-        "x": 12,
-        "y": 6,
+        "x": 14,
+        "y": 7,
         "var": 504,
         "lv": 20,
         "hide": 0,
@@ -87,8 +87,8 @@
         "relation": 0,
         "outIndex": 4,
         "dirction": 0,
-        "x": 13,
-        "y": 6,
+        "x": 15,
+        "y": 5,
         "var": 505,
         "lv": 20,
         "hide": 0,
@@ -107,8 +107,8 @@
         "relation": 0,
         "outIndex": 5,
         "dirction": 0,
-        "x": 14,
-        "y": 6,
+        "x": 15,
+        "y": 8,
         "var": 506,
         "lv": 20,
         "hide": 0,
@@ -127,13 +127,13 @@
         "relation": 2,
         "outIndex": 0,
         "dirction": 1,
-        "x": 7,
-        "y": 6,
+        "x": 4,
+        "y": 4,
         "var": 2001,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2641|2&1320|4&410|5&500",
+        "attribute": "1&3045|2&960|4&570|5&630",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -147,13 +147,13 @@
         "relation": 2,
         "outIndex": 1,
         "dirction": 1,
-        "x": 6,
-        "y": 8,
+        "x": 4,
+        "y": 5,
         "var": 2002,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2080|2&1620|4&400|5&380",
+        "attribute": "1&3240|2&945|4&600|5&555",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -168,12 +168,12 @@
         "outIndex": 2,
         "dirction": 1,
         "x": 5,
-        "y": 6,
+        "y": 7,
         "var": 2003,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2080|2&1620|4&400|5&380",
+        "attribute": "1&3150|2&1005|4&585|5&540",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -187,13 +187,13 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 1,
-        "x": 7,
+        "x": 5,
         "y": 8,
         "var": 2004,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&1915|2&1630|4&310|5&510",
+        "attribute": "1&2805|2&1035|4&525|5&675",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -208,12 +208,12 @@
         "outIndex": 4,
         "dirction": 1,
         "x": 6,
-        "y": 7,
+        "y": 3,
         "var": 2005,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2806|2&1350|4&440|5&390",
+        "attribute": "1&3390|2&900|4&645|5&510",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -227,13 +227,13 @@
         "relation": 2,
         "outIndex": 5,
         "dirction": 1,
-        "x": 5,
-        "y": 7,
+        "x": 6,
+        "y": 8,
         "var": 2006,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2641|2&1320|4&410|5&500",
+        "attribute": "1&3045|2&960|4&570|5&630",
         "skill": 0,
         "seid": "&",
         "star": 0,
diff --git a/shared/resource/warJsons/4004.json b/shared/resource/warJsons/4004.json
index 8c47b5e0c..415b30db4 100644
--- a/shared/resource/warJsons/4004.json
+++ b/shared/resource/warJsons/4004.json
@@ -7,8 +7,8 @@
         "relation": 0,
         "outIndex": 0,
         "dirction": 1,
-        "x": 7,
-        "y": 3,
+        "x": 3,
+        "y": 2,
         "var": 501,
         "lv": 20,
         "hide": 0,
@@ -27,7 +27,7 @@
         "relation": 0,
         "outIndex": 1,
         "dirction": 1,
-        "x": 8,
+        "x": 5,
         "y": 3,
         "var": 502,
         "lv": 20,
@@ -47,8 +47,8 @@
         "relation": 0,
         "outIndex": 2,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 3,
+        "y": 4,
         "var": 503,
         "lv": 20,
         "hide": 0,
@@ -67,7 +67,7 @@
         "relation": 0,
         "outIndex": 3,
         "dirction": 1,
-        "x": 7,
+        "x": 4,
         "y": 2,
         "var": 504,
         "lv": 20,
@@ -87,7 +87,7 @@
         "relation": 0,
         "outIndex": 4,
         "dirction": 1,
-        "x": 6,
+        "x": 4,
         "y": 3,
         "var": 505,
         "lv": 20,
@@ -107,7 +107,7 @@
         "relation": 0,
         "outIndex": 5,
         "dirction": 1,
-        "x": 5,
+        "x": 4,
         "y": 4,
         "var": 506,
         "lv": 20,
@@ -127,13 +127,13 @@
         "relation": 2,
         "outIndex": 0,
         "dirction": 1,
-        "x": 7,
-        "y": 6,
+        "x": 6,
+        "y": 7,
         "var": 2001,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&1915|2&1630|4&310|5&510",
+        "attribute": "1&2805|2&1035|4&525|5&675",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -148,12 +148,12 @@
         "outIndex": 1,
         "dirction": 1,
         "x": 6,
-        "y": 6,
+        "y": 8,
         "var": 2002,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2080|2&1620|4&400|5&380",
+        "attribute": "1&3150|2&1005|4&585|5&540",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -167,13 +167,13 @@
         "relation": 2,
         "outIndex": 2,
         "dirction": 1,
-        "x": 8,
-        "y": 7,
+        "x": 9,
+        "y": 8,
         "var": 2003,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&3202|2&1100|4&520|5&440",
+        "attribute": "1&3390|2&900|4&645|5&510",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -187,13 +187,13 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 1,
-        "x": 6,
-        "y": 8,
+        "x": 10,
+        "y": 7,
         "var": 2004,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2806|2&1350|4&440|5&390",
+        "attribute": "1&3240|2&945|4&600|5&555",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -207,13 +207,13 @@
         "relation": 2,
         "outIndex": 4,
         "dirction": 1,
-        "x": 7,
-        "y": 7,
+        "x": 10,
+        "y": 8,
         "var": 2005,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2080|2&1620|4&400|5&380",
+        "attribute": "1&3150|2&1005|4&585|5&540",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -227,13 +227,13 @@
         "relation": 2,
         "outIndex": 5,
         "dirction": 1,
-        "x": 9,
+        "x": 12,
         "y": 7,
         "var": 2006,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2146|2&1450|4&310|5&620",
+        "attribute": "1&2895|2&975|4&540|5&690",
         "skill": 0,
         "seid": "&",
         "star": 0,
diff --git a/shared/resource/warJsons/4005.json b/shared/resource/warJsons/4005.json
index 9152a5045..07b5bab30 100644
--- a/shared/resource/warJsons/4005.json
+++ b/shared/resource/warJsons/4005.json
@@ -28,7 +28,7 @@
         "outIndex": 1,
         "dirction": 0,
         "x": 13,
-        "y": 7,
+        "y": 8,
         "var": 502,
         "lv": 20,
         "hide": 0,
@@ -47,8 +47,8 @@
         "relation": 0,
         "outIndex": 2,
         "dirction": 0,
-        "x": 12,
-        "y": 7,
+        "x": 14,
+        "y": 6,
         "var": 503,
         "lv": 20,
         "hide": 0,
@@ -67,8 +67,8 @@
         "relation": 0,
         "outIndex": 3,
         "dirction": 0,
-        "x": 12,
-        "y": 6,
+        "x": 14,
+        "y": 7,
         "var": 504,
         "lv": 20,
         "hide": 0,
@@ -87,8 +87,8 @@
         "relation": 0,
         "outIndex": 4,
         "dirction": 0,
-        "x": 13,
-        "y": 6,
+        "x": 15,
+        "y": 5,
         "var": 505,
         "lv": 20,
         "hide": 0,
@@ -107,8 +107,8 @@
         "relation": 0,
         "outIndex": 5,
         "dirction": 0,
-        "x": 14,
-        "y": 6,
+        "x": 15,
+        "y": 8,
         "var": 506,
         "lv": 20,
         "hide": 0,
@@ -127,13 +127,13 @@
         "relation": 2,
         "outIndex": 0,
         "dirction": 1,
-        "x": 7,
-        "y": 6,
+        "x": 4,
+        "y": 4,
         "var": 2001,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2641|2&1320|4&410|5&500",
+        "attribute": "1&3045|2&960|4&570|5&630",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -147,13 +147,13 @@
         "relation": 2,
         "outIndex": 1,
         "dirction": 1,
-        "x": 6,
-        "y": 8,
+        "x": 4,
+        "y": 5,
         "var": 2002,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2080|2&1620|4&400|5&380",
+        "attribute": "1&3240|2&945|4&600|5&555",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -168,12 +168,12 @@
         "outIndex": 2,
         "dirction": 1,
         "x": 5,
-        "y": 6,
+        "y": 7,
         "var": 2003,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2080|2&1620|4&400|5&380",
+        "attribute": "1&3150|2&1005|4&585|5&540",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -187,13 +187,13 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 1,
-        "x": 7,
+        "x": 5,
         "y": 8,
         "var": 2004,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&1915|2&1630|4&310|5&510",
+        "attribute": "1&2805|2&1035|4&525|5&675",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -208,12 +208,12 @@
         "outIndex": 4,
         "dirction": 1,
         "x": 6,
-        "y": 7,
+        "y": 3,
         "var": 2005,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2146|2&1450|4&310|5&620",
+        "attribute": "1&2895|2&975|4&540|5&690",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -227,13 +227,13 @@
         "relation": 2,
         "outIndex": 5,
         "dirction": 1,
-        "x": 5,
-        "y": 7,
+        "x": 6,
+        "y": 8,
         "var": 2006,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2245|2&1550|4&330|5&470",
+        "attribute": "1&3105|2&1020|4&555|5&570",
         "skill": 0,
         "seid": "&",
         "star": 0,
diff --git a/shared/resource/warJsons/4006.json b/shared/resource/warJsons/4006.json
index 70326a27e..70c9233db 100644
--- a/shared/resource/warJsons/4006.json
+++ b/shared/resource/warJsons/4006.json
@@ -28,7 +28,7 @@
         "outIndex": 1,
         "dirction": 0,
         "x": 13,
-        "y": 7,
+        "y": 8,
         "var": 502,
         "lv": 20,
         "hide": 0,
@@ -48,7 +48,7 @@
         "outIndex": 2,
         "dirction": 0,
         "x": 14,
-        "y": 7,
+        "y": 6,
         "var": 503,
         "lv": 20,
         "hide": 0,
@@ -67,8 +67,8 @@
         "relation": 0,
         "outIndex": 3,
         "dirction": 0,
-        "x": 12,
-        "y": 6,
+        "x": 14,
+        "y": 7,
         "var": 504,
         "lv": 20,
         "hide": 0,
@@ -87,8 +87,8 @@
         "relation": 0,
         "outIndex": 4,
         "dirction": 0,
-        "x": 13,
-        "y": 6,
+        "x": 15,
+        "y": 5,
         "var": 505,
         "lv": 20,
         "hide": 0,
@@ -107,8 +107,8 @@
         "relation": 0,
         "outIndex": 5,
         "dirction": 0,
-        "x": 14,
-        "y": 6,
+        "x": 15,
+        "y": 8,
         "var": 506,
         "lv": 20,
         "hide": 0,
@@ -127,13 +127,13 @@
         "relation": 2,
         "outIndex": 0,
         "dirction": 1,
-        "x": 7,
-        "y": 6,
+        "x": 4,
+        "y": 4,
         "var": 2001,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2641|2&1320|4&410|5&500",
+        "attribute": "1&3045|2&960|4&570|5&630",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -147,13 +147,13 @@
         "relation": 2,
         "outIndex": 1,
         "dirction": 1,
-        "x": 6,
-        "y": 8,
+        "x": 4,
+        "y": 5,
         "var": 2002,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&3202|2&1100|4&520|5&440",
+        "attribute": "1&3390|2&900|4&645|5&510",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -168,12 +168,12 @@
         "outIndex": 2,
         "dirction": 1,
         "x": 5,
-        "y": 6,
+        "y": 7,
         "var": 2003,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2080|2&1620|4&400|5&380",
+        "attribute": "1&3150|2&1005|4&585|5&540",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -187,13 +187,13 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 1,
-        "x": 7,
+        "x": 5,
         "y": 8,
         "var": 2004,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&1915|2&1630|4&310|5&510",
+        "attribute": "1&2805|2&1035|4&525|5&675",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -208,12 +208,12 @@
         "outIndex": 4,
         "dirction": 1,
         "x": 6,
-        "y": 7,
+        "y": 3,
         "var": 2005,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2146|2&1450|4&310|5&620",
+        "attribute": "1&2895|2&975|4&540|5&690",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -227,13 +227,13 @@
         "relation": 2,
         "outIndex": 5,
         "dirction": 1,
-        "x": 5,
-        "y": 7,
+        "x": 6,
+        "y": 8,
         "var": 2006,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2245|2&1550|4&330|5&470",
+        "attribute": "1&3105|2&1020|4&555|5&570",
         "skill": 0,
         "seid": "&",
         "star": 0,
diff --git a/shared/resource/warJsons/4007.json b/shared/resource/warJsons/4007.json
index b663fd731..3a58877d2 100644
--- a/shared/resource/warJsons/4007.json
+++ b/shared/resource/warJsons/4007.json
@@ -28,7 +28,7 @@
         "outIndex": 1,
         "dirction": 0,
         "x": 13,
-        "y": 7,
+        "y": 8,
         "var": 502,
         "lv": 20,
         "hide": 0,
@@ -47,8 +47,8 @@
         "relation": 0,
         "outIndex": 2,
         "dirction": 0,
-        "x": 12,
-        "y": 7,
+        "x": 14,
+        "y": 6,
         "var": 503,
         "lv": 20,
         "hide": 0,
@@ -67,8 +67,8 @@
         "relation": 0,
         "outIndex": 3,
         "dirction": 0,
-        "x": 12,
-        "y": 6,
+        "x": 14,
+        "y": 7,
         "var": 504,
         "lv": 20,
         "hide": 0,
@@ -87,8 +87,8 @@
         "relation": 0,
         "outIndex": 4,
         "dirction": 0,
-        "x": 13,
-        "y": 6,
+        "x": 15,
+        "y": 5,
         "var": 505,
         "lv": 20,
         "hide": 0,
@@ -107,8 +107,8 @@
         "relation": 0,
         "outIndex": 5,
         "dirction": 0,
-        "x": 14,
-        "y": 6,
+        "x": 15,
+        "y": 8,
         "var": 506,
         "lv": 20,
         "hide": 0,
@@ -127,13 +127,13 @@
         "relation": 2,
         "outIndex": 0,
         "dirction": 1,
-        "x": 7,
-        "y": 6,
+        "x": 4,
+        "y": 4,
         "var": 1501,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&1915|2&1630|4&310|5&510",
+        "attribute": "1&2805|2&1035|4&525|5&675",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -147,13 +147,13 @@
         "relation": 2,
         "outIndex": 1,
         "dirction": 1,
-        "x": 6,
-        "y": 8,
+        "x": 4,
+        "y": 5,
         "var": 1502,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2641|2&1320|4&410|5&500",
+        "attribute": "1&3045|2&960|4&570|5&630",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -168,12 +168,12 @@
         "outIndex": 2,
         "dirction": 1,
         "x": 5,
-        "y": 6,
+        "y": 7,
         "var": 1503,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2806|2&1350|4&440|5&390",
+        "attribute": "1&3150|2&1005|4&585|5&540",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -187,13 +187,13 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 1,
-        "x": 7,
+        "x": 5,
         "y": 8,
         "var": 1504,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&1915|2&1630|4&310|5&510",
+        "attribute": "1&2805|2&1035|4&525|5&675",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -208,12 +208,12 @@
         "outIndex": 4,
         "dirction": 1,
         "x": 6,
-        "y": 7,
+        "y": 3,
         "var": 1505,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2146|2&1450|4&310|5&620",
+        "attribute": "1&2895|2&975|4&540|5&690",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -227,13 +227,13 @@
         "relation": 2,
         "outIndex": 5,
         "dirction": 1,
-        "x": 5,
-        "y": 7,
+        "x": 6,
+        "y": 8,
         "var": 1506,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2245|2&1550|4&330|5&470",
+        "attribute": "1&3105|2&1020|4&555|5&570",
         "skill": 0,
         "seid": "&",
         "star": 0,
diff --git a/shared/resource/warJsons/4008.json b/shared/resource/warJsons/4008.json
index fcaab8d16..be8a3c0b0 100644
--- a/shared/resource/warJsons/4008.json
+++ b/shared/resource/warJsons/4008.json
@@ -7,8 +7,8 @@
         "relation": 0,
         "outIndex": 0,
         "dirction": 1,
-        "x": 7,
-        "y": 3,
+        "x": 3,
+        "y": 2,
         "var": 501,
         "lv": 20,
         "hide": 0,
@@ -27,7 +27,7 @@
         "relation": 0,
         "outIndex": 1,
         "dirction": 1,
-        "x": 8,
+        "x": 5,
         "y": 3,
         "var": 502,
         "lv": 20,
@@ -47,8 +47,8 @@
         "relation": 0,
         "outIndex": 2,
         "dirction": 1,
-        "x": 6,
-        "y": 2,
+        "x": 3,
+        "y": 4,
         "var": 503,
         "lv": 20,
         "hide": 0,
@@ -67,7 +67,7 @@
         "relation": 0,
         "outIndex": 3,
         "dirction": 1,
-        "x": 7,
+        "x": 4,
         "y": 2,
         "var": 504,
         "lv": 20,
@@ -87,7 +87,7 @@
         "relation": 0,
         "outIndex": 4,
         "dirction": 1,
-        "x": 6,
+        "x": 4,
         "y": 3,
         "var": 505,
         "lv": 20,
@@ -107,7 +107,7 @@
         "relation": 0,
         "outIndex": 5,
         "dirction": 1,
-        "x": 5,
+        "x": 4,
         "y": 4,
         "var": 506,
         "lv": 20,
@@ -127,13 +127,13 @@
         "relation": 2,
         "outIndex": 0,
         "dirction": 1,
-        "x": 7,
-        "y": 6,
+        "x": 6,
+        "y": 7,
         "var": 2001,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2641|2&1320|4&410|5&500",
+        "attribute": "1&3045|2&960|4&570|5&630",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -148,12 +148,12 @@
         "outIndex": 1,
         "dirction": 1,
         "x": 6,
-        "y": 6,
+        "y": 8,
         "var": 2002,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2806|2&1350|4&440|5&390",
+        "attribute": "1&3240|2&945|4&600|5&555",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -167,13 +167,13 @@
         "relation": 2,
         "outIndex": 2,
         "dirction": 1,
-        "x": 8,
-        "y": 7,
+        "x": 9,
+        "y": 8,
         "var": 2003,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2080|2&1620|4&400|5&380",
+        "attribute": "1&2895|2&975|4&540|5&690",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -187,13 +187,13 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 1,
-        "x": 6,
-        "y": 8,
+        "x": 10,
+        "y": 7,
         "var": 2004,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&1915|2&1630|4&310|5&510",
+        "attribute": "1&2805|2&1035|4&525|5&675",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -207,13 +207,13 @@
         "relation": 2,
         "outIndex": 4,
         "dirction": 1,
-        "x": 7,
-        "y": 7,
+        "x": 10,
+        "y": 8,
         "var": 2005,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2146|2&1450|4&310|5&620",
+        "attribute": "1&2895|2&975|4&540|5&690",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -227,13 +227,13 @@
         "relation": 2,
         "outIndex": 5,
         "dirction": 1,
-        "x": 9,
+        "x": 12,
         "y": 7,
         "var": 2006,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2245|2&1550|4&330|5&470",
+        "attribute": "1&3105|2&1020|4&555|5&570",
         "skill": 0,
         "seid": "&",
         "star": 0,
diff --git a/shared/resource/warJsons/4009.json b/shared/resource/warJsons/4009.json
index d738f7d58..8e540b302 100644
--- a/shared/resource/warJsons/4009.json
+++ b/shared/resource/warJsons/4009.json
@@ -7,8 +7,8 @@
         "relation": 0,
         "outIndex": 0,
         "dirction": 1,
-        "x": 3,
-        "y": 9,
+        "x": 2,
+        "y": 5,
         "var": 501,
         "lv": 20,
         "hide": 0,
@@ -28,7 +28,7 @@
         "outIndex": 1,
         "dirction": 1,
         "x": 2,
-        "y": 9,
+        "y": 6,
         "var": 502,
         "lv": 20,
         "hide": 0,
@@ -47,8 +47,8 @@
         "relation": 0,
         "outIndex": 2,
         "dirction": 1,
-        "x": 2,
-        "y": 7,
+        "x": 3,
+        "y": 4,
         "var": 503,
         "lv": 20,
         "hide": 0,
@@ -68,7 +68,7 @@
         "outIndex": 3,
         "dirction": 1,
         "x": 3,
-        "y": 6,
+        "y": 7,
         "var": 504,
         "lv": 20,
         "hide": 0,
@@ -87,8 +87,8 @@
         "relation": 0,
         "outIndex": 4,
         "dirction": 1,
-        "x": 2,
-        "y": 6,
+        "x": 4,
+        "y": 5,
         "var": 505,
         "lv": 20,
         "hide": 0,
@@ -107,8 +107,8 @@
         "relation": 0,
         "outIndex": 5,
         "dirction": 1,
-        "x": 3,
-        "y": 4,
+        "x": 4,
+        "y": 6,
         "var": 506,
         "lv": 20,
         "hide": 0,
@@ -127,13 +127,13 @@
         "relation": 2,
         "outIndex": 0,
         "dirction": 0,
-        "x": 7,
-        "y": 6,
+        "x": 13,
+        "y": 3,
         "var": 2001,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&3202|2&1100|4&520|5&440",
+        "attribute": "1&3150|2&1005|4&585|5&540",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -147,13 +147,13 @@
         "relation": 2,
         "outIndex": 1,
         "dirction": 0,
-        "x": 10,
-        "y": 6,
+        "x": 13,
+        "y": 5,
         "var": 2002,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2806|2&1350|4&440|5&390",
+        "attribute": "1&3150|2&1005|4&585|5&540",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -167,13 +167,13 @@
         "relation": 2,
         "outIndex": 2,
         "dirction": 0,
-        "x": 9,
+        "x": 13,
         "y": 6,
         "var": 2003,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2080|2&1620|4&400|5&380",
+        "attribute": "1&3105|2&1020|4&555|5&570",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -187,13 +187,13 @@
         "relation": 2,
         "outIndex": 3,
         "dirction": 0,
-        "x": 9,
-        "y": 4,
+        "x": 13,
+        "y": 8,
         "var": 2004,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&1915|2&1630|4&310|5&510",
+        "attribute": "1&3045|2&960|4&570|5&630",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -207,13 +207,13 @@
         "relation": 2,
         "outIndex": 4,
         "dirction": 0,
-        "x": 9,
-        "y": 7,
+        "x": 14,
+        "y": 4,
         "var": 2005,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2146|2&1450|4&310|5&620",
+        "attribute": "1&2895|2&975|4&540|5&690",
         "skill": 0,
         "seid": "&",
         "star": 0,
@@ -227,13 +227,13 @@
         "relation": 2,
         "outIndex": 5,
         "dirction": 0,
-        "x": 11,
+        "x": 14,
         "y": 7,
         "var": 2006,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
-        "attribute": "1&2245|2&1550|4&330|5&470",
+        "attribute": "1&2805|2&1035|4&525|5&675",
         "skill": 0,
         "seid": "&",
         "star": 0,