diff --git a/shared/resource/jsons/dic_zyz_gk_main.json b/shared/resource/jsons/dic_zyz_gk_main.json
index 7ff760284..fbf7a3850 100644
--- a/shared/resource/jsons/dic_zyz_gk_main.json
+++ b/shared/resource/jsons/dic_zyz_gk_main.json
@@ -26,17 +26,14 @@
         "recommendedPower": 0,
         "previousGk": 0,
         "relatedEliteGk": 0,
-        "movePoint": 0,
-        "needPrepare": 0
+        "movePoint": 1,
+        "needPrepare": 0,
+        "levelString": "序章1关"
     },
     {
         "war_id": 102,
         "dispatchJsonId": 102,
-<<<<<<< Updated upstream
         "bg_img_id": 601,
-=======
-        "bg_img_id": 603,
->>>>>>> Stashed changes
         "chapter": 0,
         "script_id": "R_102&S_102&RE_102",
         "fixReward": "31001&1001",
@@ -60,8 +57,9 @@
         "recommendedPower": 0,
         "previousGk": 101,
         "relatedEliteGk": 0,
-        "movePoint": 0,
-        "needPrepare": 1
+        "movePoint": 1,
+        "needPrepare": 1,
+        "levelString": "序章2关"
     },
     {
         "war_id": 103,
@@ -90,8 +88,9 @@
         "recommendedPower": 0,
         "previousGk": 102,
         "relatedEliteGk": 0,
-        "movePoint": 0,
-        "needPrepare": 0
+        "movePoint": 1,
+        "needPrepare": 0,
+        "levelString": "序章3关"
     },
     {
         "war_id": 104,
@@ -107,7 +106,7 @@
         "kingExp": 100,
         "lvLimted": 1,
         "turnLimted": 20,
-        "forcedCharactor": "&",
+        "forcedCharactor": "0&19|1&53",
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
@@ -121,14 +120,15 @@
         "previousGk": 103,
         "relatedEliteGk": 0,
         "movePoint": 4,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "一章1关"
     },
     {
         "war_id": 105,
         "dispatchJsonId": 105,
         "bg_img_id": 605,
         "chapter": 1,
-        "script_id": "&",
+        "script_id": "RE_105",
         "fixReward": "31001&1004",
         "conditionReward": "2&1&0|6004&1&0|31002&50&0|31002&100&1",
         "RandomReward": "17002&2&1",
@@ -151,7 +151,8 @@
         "previousGk": 104,
         "relatedEliteGk": 0,
         "movePoint": 8,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "一章2关"
     },
     {
         "war_id": 106,
@@ -181,7 +182,8 @@
         "previousGk": 105,
         "relatedEliteGk": 0,
         "movePoint": 11,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "一章3关"
     },
     {
         "war_id": 107,
@@ -211,7 +213,8 @@
         "previousGk": 106,
         "relatedEliteGk": 9001,
         "movePoint": 13,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "一章4关"
     },
     {
         "war_id": 108,
@@ -241,7 +244,8 @@
         "previousGk": 107,
         "relatedEliteGk": 0,
         "movePoint": 17,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "一章5关"
     },
     {
         "war_id": 109,
@@ -271,7 +275,8 @@
         "previousGk": 108,
         "relatedEliteGk": 0,
         "movePoint": 21,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "一章6关"
     },
     {
         "war_id": 110,
@@ -301,7 +306,8 @@
         "previousGk": 109,
         "relatedEliteGk": 0,
         "movePoint": 24,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "一章7关"
     },
     {
         "war_id": 112,
@@ -331,7 +337,8 @@
         "previousGk": 110,
         "relatedEliteGk": 9002,
         "movePoint": 30,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "一章8关"
     },
     {
         "war_id": 113,
@@ -361,7 +368,8 @@
         "previousGk": 112,
         "relatedEliteGk": 0,
         "movePoint": 34,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "一章9关"
     },
     {
         "war_id": 114,
@@ -391,7 +399,8 @@
         "previousGk": 113,
         "relatedEliteGk": 0,
         "movePoint": 37,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "一章10关"
     },
     {
         "war_id": 115,
@@ -421,7 +430,8 @@
         "previousGk": 114,
         "relatedEliteGk": 0,
         "movePoint": 40,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "一章11关"
     },
     {
         "war_id": 116,
@@ -451,7 +461,8 @@
         "previousGk": 115,
         "relatedEliteGk": 9003,
         "movePoint": 45,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "一章12关"
     },
     {
         "war_id": 117,
@@ -473,7 +484,7 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "无",
         "cost": 2,
-        "iconInMap": "spine&SL_qiangbing",
+        "iconInMap": "spine&SL_daobing",
         "iconName": "&",
         "heroInUI": "1&1001|1&1004|1&1041",
         "detailUIBg": "1_4",
@@ -481,7 +492,8 @@
         "previousGk": 116,
         "relatedEliteGk": 0,
         "movePoint": 49,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "一章13关"
     },
     {
         "war_id": 118,
@@ -511,7 +523,8 @@
         "previousGk": 117,
         "relatedEliteGk": 0,
         "movePoint": 51,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "一章14关"
     },
     {
         "war_id": 119,
@@ -541,7 +554,8 @@
         "previousGk": 118,
         "relatedEliteGk": 0,
         "movePoint": 54,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "一章15关"
     },
     {
         "war_id": 120,
@@ -571,7 +585,8 @@
         "previousGk": 119,
         "relatedEliteGk": 9004,
         "movePoint": 56,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "一章16关"
     },
     {
         "war_id": 121,
@@ -593,7 +608,7 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "无",
         "cost": 2,
-        "iconInMap": "spine&SL_gongbing",
+        "iconInMap": "spine&SL_daobing",
         "iconName": "&",
         "heroInUI": "1&1003|1&1002|1&1056",
         "detailUIBg": "1_5",
@@ -601,7 +616,8 @@
         "previousGk": 120,
         "relatedEliteGk": 0,
         "movePoint": 59,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "一章17关"
     },
     {
         "war_id": 122,
@@ -623,7 +639,7 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "无",
         "cost": 2,
-        "iconInMap": "spine&SL_qiangbing",
+        "iconInMap": "spine&SL_qibing",
         "iconName": "&",
         "heroInUI": "1&1004|1&1003|1&1041",
         "detailUIBg": "1_5",
@@ -631,7 +647,8 @@
         "previousGk": 121,
         "relatedEliteGk": 0,
         "movePoint": 64,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "一章18关"
     },
     {
         "war_id": 123,
@@ -661,12 +678,13 @@
         "previousGk": 122,
         "relatedEliteGk": 0,
         "movePoint": 66,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "一章19关"
     },
     {
         "war_id": 124,
         "dispatchJsonId": 124,
-        "bg_img_id": 124,
+        "bg_img_id": 123,
         "chapter": 1,
         "script_id": "R_124&S_124&RE_124",
         "fixReward": "31001&1022",
@@ -685,13 +703,14 @@
         "cost": 2,
         "iconInMap": "city&5",
         "iconName": "界 桥",
-        "heroInUI": "1&1001|1&1056|1&354",
+        "heroInUI": "1&1024|1&350|1&354",
         "detailUIBg": "1_5",
         "recommendedPower": 10025,
         "previousGk": 123,
         "relatedEliteGk": 9005,
         "movePoint": 69,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "一章20关"
     },
     {
         "war_id": 125,
@@ -721,7 +740,8 @@
         "previousGk": 124,
         "relatedEliteGk": 0,
         "movePoint": 72,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "一章21关"
     },
     {
         "war_id": 126,
@@ -751,7 +771,8 @@
         "previousGk": 125,
         "relatedEliteGk": 0,
         "movePoint": 74,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "一章22关"
     },
     {
         "war_id": 127,
@@ -773,7 +794,7 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "无",
         "cost": 2,
-        "iconInMap": "spine&SL_qibing",
+        "iconInMap": "spine&yanliang",
         "iconName": "&",
         "heroInUI": "1&1002|1&1056|1&1037",
         "detailUIBg": "1_6",
@@ -781,7 +802,8 @@
         "previousGk": 126,
         "relatedEliteGk": 0,
         "movePoint": 76,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "一章23关"
     },
     {
         "war_id": 128,
@@ -805,13 +827,14 @@
         "cost": 2,
         "iconInMap": "city&4",
         "iconName": "邺 城",
-        "heroInUI": "1&1039|1&355|1&1054",
+        "heroInUI": "1&1020|1&355|1&1054",
         "detailUIBg": "1_6",
         "recommendedPower": 10029,
         "previousGk": 127,
         "relatedEliteGk": 9006,
         "movePoint": 79,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "一章24关"
     },
     {
         "war_id": 201,
@@ -841,7 +864,8 @@
         "previousGk": 128,
         "relatedEliteGk": 0,
         "movePoint": 93,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "二章1关"
     },
     {
         "war_id": 202,
@@ -871,7 +895,8 @@
         "previousGk": 201,
         "relatedEliteGk": 0,
         "movePoint": 95,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "二章2关"
     },
     {
         "war_id": 203,
@@ -901,7 +926,8 @@
         "previousGk": 202,
         "relatedEliteGk": 0,
         "movePoint": 97,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "二章3关"
     },
     {
         "war_id": 204,
@@ -925,13 +951,14 @@
         "cost": 2,
         "iconInMap": "city&1",
         "iconName": "河内",
-        "heroInUI": "1&1001|1&1004|2&312",
-        "detailUIBg": "1_1",
+        "heroInUI": "1&1010|1&1024|2&1020",
+        "detailUIBg": "2_1",
         "recommendedPower": 10033,
         "previousGk": 203,
         "relatedEliteGk": 9204,
         "movePoint": 100,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "二章4关"
     },
     {
         "war_id": 205,
@@ -953,15 +980,16 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&xiliangbing",
         "iconName": "&",
         "heroInUI": "1&1001|1&1004",
-        "detailUIBg": "1_2",
+        "detailUIBg": "2_1",
         "recommendedPower": 10034,
         "previousGk": 204,
         "relatedEliteGk": 0,
         "movePoint": 103,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "二章5关"
     },
     {
         "war_id": 206,
@@ -983,15 +1011,16 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&xiliangbing",
         "iconName": "&",
         "heroInUI": "1&1001|1&1004",
-        "detailUIBg": "1_2",
+        "detailUIBg": "2_1",
         "recommendedPower": 10035,
         "previousGk": 205,
         "relatedEliteGk": 0,
         "movePoint": 109,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "二章6关"
     },
     {
         "war_id": 207,
@@ -1013,15 +1042,16 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&feixiongjun",
         "iconName": "&",
         "heroInUI": "1&1001|1&1004",
-        "detailUIBg": "1_2",
+        "detailUIBg": "2_1",
         "recommendedPower": 10036,
         "previousGk": 206,
         "relatedEliteGk": 0,
         "movePoint": 112,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "二章7关"
     },
     {
         "war_id": 208,
@@ -1045,13 +1075,14 @@
         "cost": 2,
         "iconInMap": "city&8",
         "iconName": "洛阳",
-        "heroInUI": "1&1001|1&1004|2&312",
-        "detailUIBg": "1_2",
+        "heroInUI": "1&1010|1&1023|2&1019",
+        "detailUIBg": "2_2",
         "recommendedPower": 10037,
         "previousGk": 207,
         "relatedEliteGk": 9208,
         "movePoint": 116,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "二章8关"
     },
     {
         "war_id": 209,
@@ -1073,15 +1104,16 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&xiliangbing",
         "iconName": "&",
         "heroInUI": "1&1001",
-        "detailUIBg": "1_3",
+        "detailUIBg": "2_2",
         "recommendedPower": 10038,
         "previousGk": 208,
         "relatedEliteGk": 0,
         "movePoint": 118,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "二章9关"
     },
     {
         "war_id": 210,
@@ -1103,15 +1135,16 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&SL_qibing",
         "iconName": "&",
         "heroInUI": "1&1001|1&1004",
-        "detailUIBg": "1_3",
+        "detailUIBg": "2_2",
         "recommendedPower": 10039,
         "previousGk": 209,
         "relatedEliteGk": 0,
         "movePoint": 120,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "二章10关"
     },
     {
         "war_id": 211,
@@ -1133,15 +1166,16 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&quanbing",
         "iconName": "&",
         "heroInUI": "1&1001|1&1004",
-        "detailUIBg": "1_3",
+        "detailUIBg": "2_2",
         "recommendedPower": 10040,
         "previousGk": 210,
         "relatedEliteGk": 0,
         "movePoint": 122,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "二章11关"
     },
     {
         "war_id": 212,
@@ -1166,12 +1200,13 @@
         "iconInMap": "city&1",
         "iconName": "弘农",
         "heroInUI": "1&1001|1&1004|2&312",
-        "detailUIBg": "1_3",
+        "detailUIBg": "2_3",
         "recommendedPower": 10041,
         "previousGk": 211,
         "relatedEliteGk": 9212,
         "movePoint": 124,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "二章12关"
     },
     {
         "war_id": 213,
@@ -1193,15 +1228,16 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&xiliangbing",
         "iconName": "&",
         "heroInUI": "1&1001|1&1004",
-        "detailUIBg": "1_4",
+        "detailUIBg": "2_3",
         "recommendedPower": 10042,
         "previousGk": 212,
         "relatedEliteGk": 0,
         "movePoint": 126,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "二章13关"
     },
     {
         "war_id": 214,
@@ -1223,15 +1259,16 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&xiliangbing",
         "iconName": "&",
         "heroInUI": "1&1001|1&1004",
-        "detailUIBg": "1_4",
+        "detailUIBg": "2_1",
         "recommendedPower": 10043,
         "previousGk": 213,
         "relatedEliteGk": 0,
         "movePoint": 128,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "二章14关"
     },
     {
         "war_id": 215,
@@ -1253,15 +1290,16 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&xiliangbing",
         "iconName": "&",
         "heroInUI": "1&1001|1&1004",
-        "detailUIBg": "1_4",
+        "detailUIBg": "2_1",
         "recommendedPower": 10044,
         "previousGk": 214,
         "relatedEliteGk": 0,
         "movePoint": 130,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "二章15关"
     },
     {
         "war_id": 216,
@@ -1285,13 +1323,14 @@
         "cost": 2,
         "iconInMap": "city&2",
         "iconName": "郿坞",
-        "heroInUI": "1&1001|1&1004|2&312",
-        "detailUIBg": "1_4",
+        "heroInUI": "1&1007|1&1022|2&303",
+        "detailUIBg": "2_4",
         "recommendedPower": 10045,
         "previousGk": 215,
         "relatedEliteGk": 9216,
         "movePoint": 133,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "二章16关"
     },
     {
         "war_id": 217,
@@ -1313,7 +1352,7 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&xiliangbing",
         "iconName": "&",
         "heroInUI": "1&1001",
         "detailUIBg": "1_5",
@@ -1321,7 +1360,8 @@
         "previousGk": 216,
         "relatedEliteGk": 0,
         "movePoint": 135,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "二章17关"
     },
     {
         "war_id": 218,
@@ -1343,7 +1383,7 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&SL_qibing",
         "iconName": "&",
         "heroInUI": "1&1001|1&1004",
         "detailUIBg": "1_5",
@@ -1351,7 +1391,8 @@
         "previousGk": 217,
         "relatedEliteGk": 0,
         "movePoint": 137,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "二章18关"
     },
     {
         "war_id": 219,
@@ -1373,7 +1414,7 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&quanbing",
         "iconName": "&",
         "heroInUI": "1&1001|1&1004",
         "detailUIBg": "1_5",
@@ -1381,7 +1422,8 @@
         "previousGk": 218,
         "relatedEliteGk": 0,
         "movePoint": 139,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "二章19关"
     },
     {
         "war_id": 220,
@@ -1405,13 +1447,14 @@
         "cost": 2,
         "iconInMap": "city&7",
         "iconName": "长安",
-        "heroInUI": "1&1001|1&1004|2&312",
-        "detailUIBg": "1_5",
+        "heroInUI": "1&351|1&344|2&358",
+        "detailUIBg": "2_5",
         "recommendedPower": 10049,
         "previousGk": 219,
         "relatedEliteGk": 9220,
         "movePoint": 141,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "二章20关"
     },
     {
         "war_id": 221,
@@ -1433,7 +1476,7 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&xiliangbing",
         "iconName": "&",
         "heroInUI": "1&1001|1&1004",
         "detailUIBg": "1_6",
@@ -1441,7 +1484,8 @@
         "previousGk": 220,
         "relatedEliteGk": 0,
         "movePoint": 143,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "二章21关"
     },
     {
         "war_id": 222,
@@ -1463,7 +1507,7 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&SL_qibing",
         "iconName": "&",
         "heroInUI": "1&1001|1&1004",
         "detailUIBg": "1_6",
@@ -1471,7 +1515,8 @@
         "previousGk": 221,
         "relatedEliteGk": 0,
         "movePoint": 146,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "二章22关"
     },
     {
         "war_id": 223,
@@ -1493,7 +1538,7 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&quanbing",
         "iconName": "&",
         "heroInUI": "1&1001|1&1004",
         "detailUIBg": "1_6",
@@ -1501,7 +1546,8 @@
         "previousGk": 222,
         "relatedEliteGk": 0,
         "movePoint": 148,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "二章23关"
     },
     {
         "war_id": 224,
@@ -1523,15 +1569,16 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "city&8",
+        "iconInMap": "city&9",
         "iconName": "受禅台",
         "heroInUI": "1&1001|1&1004|2&312",
-        "detailUIBg": "1_6",
+        "detailUIBg": "2_6",
         "recommendedPower": 10053,
         "previousGk": 223,
         "relatedEliteGk": 9224,
         "movePoint": 150,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "二章24关"
     },
     {
         "war_id": 301,
@@ -1553,7 +1600,7 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&SL_huangjindao",
         "iconName": "&",
         "heroInUI": "1&1001",
         "detailUIBg": "1_1",
@@ -1561,7 +1608,8 @@
         "previousGk": 224,
         "relatedEliteGk": 0,
         "movePoint": 155,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "三章1关"
     },
     {
         "war_id": 302,
@@ -1583,7 +1631,7 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&SL_huangjindao",
         "iconName": "&",
         "heroInUI": "1&1001|1&1004",
         "detailUIBg": "1_1",
@@ -1591,7 +1639,8 @@
         "previousGk": 301,
         "relatedEliteGk": 0,
         "movePoint": 159,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "三章2关"
     },
     {
         "war_id": 303,
@@ -1613,7 +1662,7 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&SL_huangjindao",
         "iconName": "&",
         "heroInUI": "1&1001|1&1004",
         "detailUIBg": "1_1",
@@ -1621,7 +1670,8 @@
         "previousGk": 302,
         "relatedEliteGk": 0,
         "movePoint": 162,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "三章3关"
     },
     {
         "war_id": 304,
@@ -1646,12 +1696,13 @@
         "iconInMap": "city&1",
         "iconName": "平原",
         "heroInUI": "1&1001|1&1004|2&312",
-        "detailUIBg": "1_1",
+        "detailUIBg": "3_1",
         "recommendedPower": 10057,
         "previousGk": 303,
         "relatedEliteGk": 9304,
         "movePoint": 166,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "三章4关"
     },
     {
         "war_id": 305,
@@ -1673,7 +1724,7 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&SL_huangjindao",
         "iconName": "&",
         "heroInUI": "1&1001|1&1004",
         "detailUIBg": "1_2",
@@ -1681,7 +1732,8 @@
         "previousGk": 304,
         "relatedEliteGk": 0,
         "movePoint": 169,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "三章5关"
     },
     {
         "war_id": 306,
@@ -1703,7 +1755,7 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&SL_huangjindao",
         "iconName": "&",
         "heroInUI": "1&1001|1&1004",
         "detailUIBg": "1_2",
@@ -1711,7 +1763,8 @@
         "previousGk": 305,
         "relatedEliteGk": 0,
         "movePoint": 173,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "三章6关"
     },
     {
         "war_id": 307,
@@ -1733,7 +1786,7 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&SL_huangjindao",
         "iconName": "&",
         "heroInUI": "1&1001|1&1004",
         "detailUIBg": "1_2",
@@ -1741,7 +1794,8 @@
         "previousGk": 306,
         "relatedEliteGk": 0,
         "movePoint": 176,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "三章7关"
     },
     {
         "war_id": 308,
@@ -1766,12 +1820,13 @@
         "iconInMap": "city&2",
         "iconName": "齐郡",
         "heroInUI": "1&1001|1&1004|2&312",
-        "detailUIBg": "1_2",
+        "detailUIBg": "3_2",
         "recommendedPower": 10061,
         "previousGk": 307,
         "relatedEliteGk": 9308,
         "movePoint": 180,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "三章8关"
     },
     {
         "war_id": 309,
@@ -1801,7 +1856,8 @@
         "previousGk": 308,
         "relatedEliteGk": 0,
         "movePoint": 184,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "三章9关"
     },
     {
         "war_id": 310,
@@ -1831,7 +1887,8 @@
         "previousGk": 309,
         "relatedEliteGk": 0,
         "movePoint": 186,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "三章10关"
     },
     {
         "war_id": 311,
@@ -1861,7 +1918,8 @@
         "previousGk": 310,
         "relatedEliteGk": 0,
         "movePoint": 188,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "三章11关"
     },
     {
         "war_id": 312,
@@ -1886,12 +1944,13 @@
         "iconInMap": "city&2",
         "iconName": "北海",
         "heroInUI": "1&1001|1&1004|2&312",
-        "detailUIBg": "1_3",
+        "detailUIBg": "3_3",
         "recommendedPower": 10065,
         "previousGk": 311,
         "relatedEliteGk": 9312,
         "movePoint": 190,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "三章12关"
     },
     {
         "war_id": 313,
@@ -1913,7 +1972,7 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&SL_huangjindao",
         "iconName": "&",
         "heroInUI": "1&1001|1&1004",
         "detailUIBg": "1_4",
@@ -1921,7 +1980,8 @@
         "previousGk": 312,
         "relatedEliteGk": 0,
         "movePoint": 195,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "三章13关"
     },
     {
         "war_id": 314,
@@ -1943,7 +2003,7 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&SL_huangjindao",
         "iconName": "&",
         "heroInUI": "1&1001|1&1004",
         "detailUIBg": "1_4",
@@ -1951,7 +2011,8 @@
         "previousGk": 313,
         "relatedEliteGk": 0,
         "movePoint": 197,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "三章14关"
     },
     {
         "war_id": 315,
@@ -1973,7 +2034,7 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&SL_huangjindao",
         "iconName": "&",
         "heroInUI": "1&1001|1&1004",
         "detailUIBg": "1_4",
@@ -1981,7 +2042,8 @@
         "previousGk": 314,
         "relatedEliteGk": 0,
         "movePoint": 201,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "三章15关"
     },
     {
         "war_id": 316,
@@ -2006,12 +2068,13 @@
         "iconInMap": "city&1",
         "iconName": "琅琊",
         "heroInUI": "1&1001|1&1004|2&312",
-        "detailUIBg": "1_4",
+        "detailUIBg": "3_4",
         "recommendedPower": 10069,
         "previousGk": 315,
         "relatedEliteGk": 9316,
         "movePoint": 204,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "三章16关"
     },
     {
         "war_id": 317,
@@ -2033,7 +2096,7 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&yuejin",
         "iconName": "&",
         "heroInUI": "1&1001",
         "detailUIBg": "1_5",
@@ -2041,7 +2104,8 @@
         "previousGk": 316,
         "relatedEliteGk": 0,
         "movePoint": 209,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "三章17关"
     },
     {
         "war_id": 318,
@@ -2063,7 +2127,7 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "spine&SL_daobing",
+        "iconInMap": "spine&caoren",
         "iconName": "&",
         "heroInUI": "1&1001|1&1004",
         "detailUIBg": "1_5",
@@ -2071,7 +2135,8 @@
         "previousGk": 317,
         "relatedEliteGk": 0,
         "movePoint": 212,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "三章18关"
     },
     {
         "war_id": 319,
@@ -2101,7 +2166,8 @@
         "previousGk": 318,
         "relatedEliteGk": 0,
         "movePoint": 215,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "三章19关"
     },
     {
         "war_id": 320,
@@ -2126,12 +2192,13 @@
         "iconInMap": "city&1",
         "iconName": "郯城",
         "heroInUI": "1&1001|1&1004|2&312",
-        "detailUIBg": "1_5",
+        "detailUIBg": "3_5",
         "recommendedPower": 10073,
         "previousGk": 319,
         "relatedEliteGk": 9320,
         "movePoint": 218,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "三章20关"
     },
     {
         "war_id": 321,
@@ -2161,7 +2228,8 @@
         "previousGk": 320,
         "relatedEliteGk": 0,
         "movePoint": 221,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "三章21关"
     },
     {
         "war_id": 322,
@@ -2191,7 +2259,8 @@
         "previousGk": 321,
         "relatedEliteGk": 0,
         "movePoint": 223,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "三章22关"
     },
     {
         "war_id": 323,
@@ -2221,7 +2290,8 @@
         "previousGk": 322,
         "relatedEliteGk": 0,
         "movePoint": 225,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "三章23关"
     },
     {
         "war_id": 324,
@@ -2246,12 +2316,13 @@
         "iconInMap": "city&3",
         "iconName": "徐州",
         "heroInUI": "1&1001|1&1004|2&312",
-        "detailUIBg": "1_6",
+        "detailUIBg": "3_6",
         "recommendedPower": 10077,
         "previousGk": 323,
         "relatedEliteGk": 9324,
         "movePoint": 227,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "三章24关"
     },
     {
         "war_id": 401,
@@ -2281,7 +2352,8 @@
         "previousGk": 324,
         "relatedEliteGk": 0,
         "movePoint": 230,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "四章1关"
     },
     {
         "war_id": 402,
@@ -2311,7 +2383,8 @@
         "previousGk": 401,
         "relatedEliteGk": 0,
         "movePoint": 234,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "四章2关"
     },
     {
         "war_id": 403,
@@ -2341,7 +2414,8 @@
         "previousGk": 402,
         "relatedEliteGk": 0,
         "movePoint": 236,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "四章3关"
     },
     {
         "war_id": 404,
@@ -2371,7 +2445,8 @@
         "previousGk": 403,
         "relatedEliteGk": 9404,
         "movePoint": 238,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "四章4关"
     },
     {
         "war_id": 405,
@@ -2401,7 +2476,8 @@
         "previousGk": 404,
         "relatedEliteGk": 0,
         "movePoint": 240,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "四章5关"
     },
     {
         "war_id": 406,
@@ -2431,7 +2507,8 @@
         "previousGk": 405,
         "relatedEliteGk": 0,
         "movePoint": 242,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "四章6关"
     },
     {
         "war_id": 407,
@@ -2461,7 +2538,8 @@
         "previousGk": 406,
         "relatedEliteGk": 0,
         "movePoint": 244,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "四章7关"
     },
     {
         "war_id": 408,
@@ -2491,7 +2569,8 @@
         "previousGk": 407,
         "relatedEliteGk": 9408,
         "movePoint": 246,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "四章8关"
     },
     {
         "war_id": 409,
@@ -2521,7 +2600,8 @@
         "previousGk": 408,
         "relatedEliteGk": 0,
         "movePoint": 250,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "四章9关"
     },
     {
         "war_id": 410,
@@ -2551,7 +2631,8 @@
         "previousGk": 409,
         "relatedEliteGk": 0,
         "movePoint": 252,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "四章10关"
     },
     {
         "war_id": 411,
@@ -2581,7 +2662,8 @@
         "previousGk": 410,
         "relatedEliteGk": 0,
         "movePoint": 255,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "四章11关"
     },
     {
         "war_id": 412,
@@ -2611,7 +2693,8 @@
         "previousGk": 411,
         "relatedEliteGk": 9412,
         "movePoint": 258,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "四章12关"
     },
     {
         "war_id": 413,
@@ -2641,7 +2724,8 @@
         "previousGk": 412,
         "relatedEliteGk": 0,
         "movePoint": 261,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "四章13关"
     },
     {
         "war_id": 414,
@@ -2671,7 +2755,8 @@
         "previousGk": 413,
         "relatedEliteGk": 0,
         "movePoint": 263,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "四章14关"
     },
     {
         "war_id": 415,
@@ -2701,7 +2786,8 @@
         "previousGk": 414,
         "relatedEliteGk": 0,
         "movePoint": 265,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "四章15关"
     },
     {
         "war_id": 416,
@@ -2731,7 +2817,8 @@
         "previousGk": 415,
         "relatedEliteGk": 9416,
         "movePoint": 268,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "四章16关"
     },
     {
         "war_id": 417,
@@ -2761,7 +2848,8 @@
         "previousGk": 416,
         "relatedEliteGk": 0,
         "movePoint": 272,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "四章17关"
     },
     {
         "war_id": 418,
@@ -2791,7 +2879,8 @@
         "previousGk": 417,
         "relatedEliteGk": 0,
         "movePoint": 274,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "四章18关"
     },
     {
         "war_id": 419,
@@ -2821,7 +2910,8 @@
         "previousGk": 418,
         "relatedEliteGk": 0,
         "movePoint": 276,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "四章19关"
     },
     {
         "war_id": 420,
@@ -2851,7 +2941,8 @@
         "previousGk": 419,
         "relatedEliteGk": 9420,
         "movePoint": 279,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "四章20关"
     },
     {
         "war_id": 421,
@@ -2881,7 +2972,8 @@
         "previousGk": 420,
         "relatedEliteGk": 0,
         "movePoint": 282,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "四章21关"
     },
     {
         "war_id": 422,
@@ -2911,7 +3003,8 @@
         "previousGk": 421,
         "relatedEliteGk": 0,
         "movePoint": 284,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "四章22关"
     },
     {
         "war_id": 423,
@@ -2941,7 +3034,8 @@
         "previousGk": 422,
         "relatedEliteGk": 0,
         "movePoint": 286,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "四章23关"
     },
     {
         "war_id": 424,
@@ -2971,7 +3065,8 @@
         "previousGk": 423,
         "relatedEliteGk": 9424,
         "movePoint": 288,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "四章24关"
     },
     {
         "war_id": 501,
@@ -3001,7 +3096,8 @@
         "previousGk": 424,
         "relatedEliteGk": 0,
         "movePoint": 291,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章1关"
     },
     {
         "war_id": 502,
@@ -3031,7 +3127,8 @@
         "previousGk": 501,
         "relatedEliteGk": 0,
         "movePoint": 293,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章2关"
     },
     {
         "war_id": 503,
@@ -3061,12 +3158,13 @@
         "previousGk": 502,
         "relatedEliteGk": 0,
         "movePoint": 295,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章3关"
     },
     {
         "war_id": 504,
         "dispatchJsonId": 504,
-        "bg_img_id": 605,
+        "bg_img_id": 5041,
         "chapter": 5,
         "script_id": "R_504&RE_504",
         "fixReward": "31001&1078",
@@ -3083,7 +3181,7 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
-        "iconInMap": "city&3",
+        "iconInMap": "city&17",
         "iconName": "官渡",
         "heroInUI": "1&1001|1&1004|2&312",
         "detailUIBg": "1_1",
@@ -3091,7 +3189,8 @@
         "previousGk": 503,
         "relatedEliteGk": 9504,
         "movePoint": 297,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章4关"
     },
     {
         "war_id": 505,
@@ -3121,7 +3220,8 @@
         "previousGk": 504,
         "relatedEliteGk": 0,
         "movePoint": 299,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章5关"
     },
     {
         "war_id": 506,
@@ -3151,7 +3251,8 @@
         "previousGk": 505,
         "relatedEliteGk": 0,
         "movePoint": 301,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章6关"
     },
     {
         "war_id": 507,
@@ -3181,7 +3282,8 @@
         "previousGk": 506,
         "relatedEliteGk": 0,
         "movePoint": 303,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章7关"
     },
     {
         "war_id": 508,
@@ -3211,7 +3313,8 @@
         "previousGk": 507,
         "relatedEliteGk": 9508,
         "movePoint": 305,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章8关"
     },
     {
         "war_id": 509,
@@ -3241,7 +3344,8 @@
         "previousGk": 508,
         "relatedEliteGk": 0,
         "movePoint": 308,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章9关"
     },
     {
         "war_id": 510,
@@ -3271,7 +3375,8 @@
         "previousGk": 509,
         "relatedEliteGk": 0,
         "movePoint": 311,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章10关"
     },
     {
         "war_id": 511,
@@ -3301,12 +3406,13 @@
         "previousGk": 510,
         "relatedEliteGk": 0,
         "movePoint": 314,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章11关"
     },
     {
         "war_id": 512,
         "dispatchJsonId": 512,
-        "bg_img_id": 605,
+        "bg_img_id": 512,
         "chapter": 5,
         "script_id": "R_512&RE_512",
         "fixReward": "31001&1086",
@@ -3331,7 +3437,8 @@
         "previousGk": 511,
         "relatedEliteGk": 9512,
         "movePoint": 316,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章12关"
     },
     {
         "war_id": 513,
@@ -3361,7 +3468,8 @@
         "previousGk": 512,
         "relatedEliteGk": 0,
         "movePoint": 318,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章13关"
     },
     {
         "war_id": 514,
@@ -3391,7 +3499,8 @@
         "previousGk": 513,
         "relatedEliteGk": 0,
         "movePoint": 321,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章14关"
     },
     {
         "war_id": 515,
@@ -3421,19 +3530,20 @@
         "previousGk": 514,
         "relatedEliteGk": 0,
         "movePoint": 325,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章15关"
     },
     {
         "war_id": 516,
         "dispatchJsonId": 516,
-        "bg_img_id": 606,
+        "bg_img_id": 516,
         "chapter": 5,
         "script_id": "R_516&RE_516",
         "fixReward": "31001&1090",
         "conditionReward": "17040&1&0|31002&50&0|31002&100&1",
         "RandomReward": "&",
         "warType": 1,
-        "gk_name": "第五章&白马寨之战",
+        "gk_name": "第五章&卧牛山之战",
         "kingExp": 100,
         "lvLimted": 1,
         "turnLimted": 20,
@@ -3444,14 +3554,15 @@
         "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
         "cost": 2,
         "iconInMap": "city&11",
-        "iconName": "白马寨",
+        "iconName": "卧牛山",
         "heroInUI": "1&1001|1&1004|2&312",
         "detailUIBg": "1_4",
         "recommendedPower": 10093,
         "previousGk": 515,
         "relatedEliteGk": 9516,
         "movePoint": 328,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章16关"
     },
     {
         "war_id": 517,
@@ -3481,7 +3592,8 @@
         "previousGk": 516,
         "relatedEliteGk": 0,
         "movePoint": 330,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章17关"
     },
     {
         "war_id": 518,
@@ -3511,7 +3623,8 @@
         "previousGk": 517,
         "relatedEliteGk": 0,
         "movePoint": 332,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章18关"
     },
     {
         "war_id": 519,
@@ -3541,12 +3654,13 @@
         "previousGk": 518,
         "relatedEliteGk": 0,
         "movePoint": 334,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章19关"
     },
     {
         "war_id": 520,
         "dispatchJsonId": 520,
-        "bg_img_id": 601,
+        "bg_img_id": 520,
         "chapter": 5,
         "script_id": "R_520&S_520&RE_520",
         "fixReward": "31001&1094",
@@ -3571,7 +3685,8 @@
         "previousGk": 519,
         "relatedEliteGk": 9520,
         "movePoint": 337,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章20关"
     },
     {
         "war_id": 521,
@@ -3601,7 +3716,8 @@
         "previousGk": 520,
         "relatedEliteGk": 0,
         "movePoint": 340,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章21关"
     },
     {
         "war_id": 522,
@@ -3631,7 +3747,8 @@
         "previousGk": 521,
         "relatedEliteGk": 0,
         "movePoint": 343,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章22关"
     },
     {
         "war_id": 523,
@@ -3661,12 +3778,13 @@
         "previousGk": 522,
         "relatedEliteGk": 0,
         "movePoint": 346,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章23关"
     },
     {
         "war_id": 524,
         "dispatchJsonId": 524,
-        "bg_img_id": 605,
+        "bg_img_id": 524,
         "chapter": 5,
         "script_id": "R_524&RE_524",
         "fixReward": "31001&1094",
@@ -3691,11 +3809,12 @@
         "previousGk": 523,
         "relatedEliteGk": 9524,
         "movePoint": 348,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章24关"
     },
     {
         "war_id": 525,
-        "dispatchJsonId": 605,
+        "dispatchJsonId": 525,
         "bg_img_id": 606,
         "chapter": 5,
         "script_id": "&",
@@ -3721,11 +3840,12 @@
         "previousGk": 524,
         "relatedEliteGk": 0,
         "movePoint": 351,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章25关"
     },
     {
         "war_id": 526,
-        "dispatchJsonId": 603,
+        "dispatchJsonId": 526,
         "bg_img_id": 604,
         "chapter": 5,
         "script_id": "&",
@@ -3751,11 +3871,12 @@
         "previousGk": 525,
         "relatedEliteGk": 0,
         "movePoint": 354,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章26关"
     },
     {
         "war_id": 527,
-        "dispatchJsonId": 601,
+        "dispatchJsonId": 527,
         "bg_img_id": 602,
         "chapter": 5,
         "script_id": "&",
@@ -3781,12 +3902,13 @@
         "previousGk": 526,
         "relatedEliteGk": 0,
         "movePoint": 357,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章27关"
     },
     {
         "war_id": 528,
-        "dispatchJsonId": 601,
-        "bg_img_id": 602,
+        "dispatchJsonId": 528,
+        "bg_img_id": 528,
         "chapter": 5,
         "script_id": "R_528&S_528&RE_528",
         "fixReward": "31001&1098",
@@ -3811,7 +3933,8 @@
         "previousGk": 527,
         "relatedEliteGk": 9528,
         "movePoint": 360,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "五章28关"
     },
     {
         "war_id": 601,
@@ -3841,7 +3964,8 @@
         "previousGk": 528,
         "relatedEliteGk": 0,
         "movePoint": 363,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章1关"
     },
     {
         "war_id": 602,
@@ -3871,7 +3995,8 @@
         "previousGk": 601,
         "relatedEliteGk": 0,
         "movePoint": 366,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章2关"
     },
     {
         "war_id": 603,
@@ -3901,7 +4026,8 @@
         "previousGk": 602,
         "relatedEliteGk": 0,
         "movePoint": 368,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章3关"
     },
     {
         "war_id": 604,
@@ -3931,7 +4057,8 @@
         "previousGk": 603,
         "relatedEliteGk": 9604,
         "movePoint": 371,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章4关"
     },
     {
         "war_id": 605,
@@ -3961,7 +4088,8 @@
         "previousGk": 604,
         "relatedEliteGk": 0,
         "movePoint": 375,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章5关"
     },
     {
         "war_id": 606,
@@ -3991,7 +4119,8 @@
         "previousGk": 605,
         "relatedEliteGk": 0,
         "movePoint": 378,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章6关"
     },
     {
         "war_id": 607,
@@ -4021,7 +4150,8 @@
         "previousGk": 606,
         "relatedEliteGk": 0,
         "movePoint": 382,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章7关"
     },
     {
         "war_id": 608,
@@ -4033,7 +4163,7 @@
         "conditionReward": "17040&1&0|31002&50&0|31002&100&1",
         "RandomReward": "&",
         "warType": 1,
-        "gk_name": "第六章&涿郡之战",
+        "gk_name": "第六章&樊城之战",
         "kingExp": 100,
         "lvLimted": 1,
         "turnLimted": 20,
@@ -4051,7 +4181,8 @@
         "previousGk": 607,
         "relatedEliteGk": 9608,
         "movePoint": 385,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章8关"
     },
     {
         "war_id": 609,
@@ -4081,7 +4212,8 @@
         "previousGk": 608,
         "relatedEliteGk": 0,
         "movePoint": 389,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章9关"
     },
     {
         "war_id": 610,
@@ -4111,7 +4243,8 @@
         "previousGk": 609,
         "relatedEliteGk": 0,
         "movePoint": 393,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章10关"
     },
     {
         "war_id": 611,
@@ -4141,7 +4274,8 @@
         "previousGk": 610,
         "relatedEliteGk": 0,
         "movePoint": 396,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章11关"
     },
     {
         "war_id": 612,
@@ -4171,7 +4305,8 @@
         "previousGk": 611,
         "relatedEliteGk": 9612,
         "movePoint": 399,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章12关"
     },
     {
         "war_id": 613,
@@ -4201,7 +4336,8 @@
         "previousGk": 612,
         "relatedEliteGk": 0,
         "movePoint": 403,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章13关"
     },
     {
         "war_id": 614,
@@ -4231,7 +4367,8 @@
         "previousGk": 613,
         "relatedEliteGk": 0,
         "movePoint": 405,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章14关"
     },
     {
         "war_id": 615,
@@ -4261,7 +4398,8 @@
         "previousGk": 614,
         "relatedEliteGk": 0,
         "movePoint": 408,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章15关"
     },
     {
         "war_id": 616,
@@ -4291,7 +4429,8 @@
         "previousGk": 615,
         "relatedEliteGk": 9616,
         "movePoint": 411,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章16关"
     },
     {
         "war_id": 617,
@@ -4321,7 +4460,8 @@
         "previousGk": 616,
         "relatedEliteGk": 0,
         "movePoint": 416,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章17关"
     },
     {
         "war_id": 618,
@@ -4351,7 +4491,8 @@
         "previousGk": 617,
         "relatedEliteGk": 0,
         "movePoint": 418,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章18关"
     },
     {
         "war_id": 619,
@@ -4381,7 +4522,8 @@
         "previousGk": 618,
         "relatedEliteGk": 0,
         "movePoint": 421,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章19关"
     },
     {
         "war_id": 620,
@@ -4411,7 +4553,8 @@
         "previousGk": 619,
         "relatedEliteGk": 9620,
         "movePoint": 425,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章20关"
     },
     {
         "war_id": 621,
@@ -4441,7 +4584,8 @@
         "previousGk": 620,
         "relatedEliteGk": 0,
         "movePoint": 428,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章21关"
     },
     {
         "war_id": 622,
@@ -4471,7 +4615,8 @@
         "previousGk": 621,
         "relatedEliteGk": 0,
         "movePoint": 431,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章22关"
     },
     {
         "war_id": 623,
@@ -4501,7 +4646,8 @@
         "previousGk": 622,
         "relatedEliteGk": 0,
         "movePoint": 434,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章23关"
     },
     {
         "war_id": 624,
@@ -4531,7 +4677,8 @@
         "previousGk": 623,
         "relatedEliteGk": 9624,
         "movePoint": 438,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章24关"
     },
     {
         "war_id": 625,
@@ -4561,7 +4708,8 @@
         "previousGk": 624,
         "relatedEliteGk": 0,
         "movePoint": 441,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章25关"
     },
     {
         "war_id": 626,
@@ -4591,7 +4739,8 @@
         "previousGk": 625,
         "relatedEliteGk": 0,
         "movePoint": 444,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章26关"
     },
     {
         "war_id": 627,
@@ -4621,7 +4770,8 @@
         "previousGk": 626,
         "relatedEliteGk": 0,
         "movePoint": 446,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章27关"
     },
     {
         "war_id": 628,
@@ -4651,7 +4801,8 @@
         "previousGk": 627,
         "relatedEliteGk": 9628,
         "movePoint": 450,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "六章28关"
     },
     {
         "war_id": 704,
@@ -4681,7 +4832,8 @@
         "previousGk": 628,
         "relatedEliteGk": 9704,
         "movePoint": 452,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "七章1关"
     },
     {
         "war_id": 705,
@@ -4711,7 +4863,8 @@
         "previousGk": 704,
         "relatedEliteGk": 0,
         "movePoint": 456,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "七章2关"
     },
     {
         "war_id": 706,
@@ -4741,7 +4894,8 @@
         "previousGk": 705,
         "relatedEliteGk": 0,
         "movePoint": 458,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "七章3关"
     },
     {
         "war_id": 707,
@@ -4771,7 +4925,8 @@
         "previousGk": 706,
         "relatedEliteGk": 0,
         "movePoint": 460,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "七章4关"
     },
     {
         "war_id": 708,
@@ -4801,7 +4956,8 @@
         "previousGk": 707,
         "relatedEliteGk": 9708,
         "movePoint": 463,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "七章5关"
     },
     {
         "war_id": 709,
@@ -4831,7 +4987,8 @@
         "previousGk": 708,
         "relatedEliteGk": 0,
         "movePoint": 466,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "七章6关"
     },
     {
         "war_id": 710,
@@ -4861,7 +5018,8 @@
         "previousGk": 709,
         "relatedEliteGk": 0,
         "movePoint": 468,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "七章7关"
     },
     {
         "war_id": 711,
@@ -4891,7 +5049,8 @@
         "previousGk": 710,
         "relatedEliteGk": 0,
         "movePoint": 470,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "七章8关"
     },
     {
         "war_id": 712,
@@ -4921,7 +5080,8 @@
         "previousGk": 711,
         "relatedEliteGk": 9712,
         "movePoint": 473,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "七章9关"
     },
     {
         "war_id": 713,
@@ -4951,7 +5111,8 @@
         "previousGk": 712,
         "relatedEliteGk": 0,
         "movePoint": 476,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "七章10关"
     },
     {
         "war_id": 714,
@@ -4981,7 +5142,8 @@
         "previousGk": 713,
         "relatedEliteGk": 0,
         "movePoint": 478,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "七章11关"
     },
     {
         "war_id": 715,
@@ -5011,7 +5173,8 @@
         "previousGk": 714,
         "relatedEliteGk": 0,
         "movePoint": 481,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "七章12关"
     },
     {
         "war_id": 716,
@@ -5041,7 +5204,8 @@
         "previousGk": 715,
         "relatedEliteGk": 9716,
         "movePoint": 484,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "七章13关"
     },
     {
         "war_id": 717,
@@ -5071,7 +5235,8 @@
         "previousGk": 716,
         "relatedEliteGk": 0,
         "movePoint": 486,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "七章14关"
     },
     {
         "war_id": 718,
@@ -5101,7 +5266,8 @@
         "previousGk": 717,
         "relatedEliteGk": 0,
         "movePoint": 489,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "七章15关"
     },
     {
         "war_id": 719,
@@ -5131,7 +5297,8 @@
         "previousGk": 718,
         "relatedEliteGk": 0,
         "movePoint": 491,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "七章16关"
     },
     {
         "war_id": 720,
@@ -5161,7 +5328,8 @@
         "previousGk": 719,
         "relatedEliteGk": 9720,
         "movePoint": 494,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "七章17关"
     },
     {
         "war_id": 721,
@@ -5191,7 +5359,8 @@
         "previousGk": 720,
         "relatedEliteGk": 0,
         "movePoint": 0,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "七章18关"
     },
     {
         "war_id": 722,
@@ -5221,7 +5390,8 @@
         "previousGk": 721,
         "relatedEliteGk": 0,
         "movePoint": 0,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "七章19关"
     },
     {
         "war_id": 723,
@@ -5251,7 +5421,8 @@
         "previousGk": 722,
         "relatedEliteGk": 0,
         "movePoint": 0,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "七章20关"
     },
     {
         "war_id": 724,
@@ -5281,7 +5452,8 @@
         "previousGk": 723,
         "relatedEliteGk": 9724,
         "movePoint": 0,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "七章21关"
     },
     {
         "war_id": 725,
@@ -5311,7 +5483,8 @@
         "previousGk": 724,
         "relatedEliteGk": 0,
         "movePoint": 0,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "七章22关"
     },
     {
         "war_id": 726,
@@ -5341,7 +5514,8 @@
         "previousGk": 725,
         "relatedEliteGk": 0,
         "movePoint": 0,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "七章23关"
     },
     {
         "war_id": 727,
@@ -5371,7 +5545,8 @@
         "previousGk": 726,
         "relatedEliteGk": 0,
         "movePoint": 0,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "七章24关"
     },
     {
         "war_id": 728,
@@ -5401,6 +5576,7 @@
         "previousGk": 727,
         "relatedEliteGk": 9728,
         "movePoint": 0,
-        "needPrepare": 1
+        "needPrepare": 1,
+        "levelString": "七章25关"
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/jsons/dic_zyz_hero.json b/shared/resource/jsons/dic_zyz_hero.json
index 426881024..a25ab226a 100644
--- a/shared/resource/jsons/dic_zyz_hero.json
+++ b/shared/resource/jsons/dic_zyz_hero.json
@@ -42,13 +42,8 @@
         "initialSkin": 41001,
         "gender": 1,
         "atkSpineEffect": "liqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 2,
@@ -93,13 +88,8 @@
         "initialSkin": 41003,
         "gender": 1,
         "atkSpineEffect": "liqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 3,
@@ -144,13 +134,8 @@
         "initialSkin": 41004,
         "gender": 1,
         "atkSpineEffect": "liqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 4,
@@ -195,13 +180,8 @@
         "initialSkin": 41005,
         "gender": 1,
         "atkSpineEffect": "gong",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 5,
@@ -246,13 +226,8 @@
         "initialSkin": 41006,
         "gender": 1,
         "atkSpineEffect": "faqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 6,
@@ -266,7 +241,7 @@
         "camp": 1,
         "area": 0,
         "cost": 0,
-        "jobid": 31,
+        "jobid": 26,
         "skill": 6,
         "pieceId": 21006,
         "hp": 980,
@@ -297,13 +272,8 @@
         "initialSkin": 41007,
         "gender": 1,
         "atkSpineEffect": "faqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 7,
@@ -348,13 +318,8 @@
         "initialSkin": 41008,
         "gender": 1,
         "atkSpineEffect": "liqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 8,
@@ -399,13 +364,8 @@
         "initialSkin": 41009,
         "gender": 1,
         "atkSpineEffect": "liqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 9,
@@ -450,13 +410,8 @@
         "initialSkin": 41010,
         "gender": 1,
         "atkSpineEffect": "liqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 10,
@@ -501,13 +456,8 @@
         "initialSkin": 41011,
         "gender": 1,
         "atkSpineEffect": "liqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 11,
@@ -552,13 +502,8 @@
         "initialSkin": 41012,
         "gender": 1,
         "atkSpineEffect": "liqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 12,
@@ -603,13 +548,8 @@
         "initialSkin": 41013,
         "gender": 1,
         "atkSpineEffect": "gong",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 13,
@@ -654,13 +594,8 @@
         "initialSkin": 41014,
         "gender": 2,
         "atkSpineEffect": "faqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 14,
@@ -674,7 +609,7 @@
         "camp": 1,
         "area": 0,
         "cost": 0,
-        "jobid": 31,
+        "jobid": 26,
         "skill": 14,
         "pieceId": 21014,
         "hp": 850,
@@ -705,13 +640,8 @@
         "initialSkin": 41015,
         "gender": 1,
         "atkSpineEffect": "faqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 15,
@@ -756,13 +686,8 @@
         "initialSkin": 41016,
         "gender": 1,
         "atkSpineEffect": "dunqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 16,
@@ -807,13 +732,8 @@
         "initialSkin": 41017,
         "gender": 1,
         "atkSpineEffect": "liqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 17,
@@ -858,13 +778,8 @@
         "initialSkin": 41018,
         "gender": 1,
         "atkSpineEffect": "liqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 18,
@@ -1001,13 +916,8 @@
         "initialSkin": 41021,
         "gender": 1,
         "atkSpineEffect": "liqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 21,
@@ -1052,13 +962,8 @@
         "initialSkin": 41022,
         "gender": 1,
         "atkSpineEffect": "gong",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 22,
@@ -1149,13 +1054,8 @@
         "initialSkin": 41024,
         "gender": 1,
         "atkSpineEffect": "faqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 24,
@@ -1200,13 +1100,8 @@
         "initialSkin": 41025,
         "gender": 1,
         "atkSpineEffect": "dunqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 25,
@@ -1251,13 +1146,8 @@
         "initialSkin": 41026,
         "gender": 1,
         "atkSpineEffect": "liqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 26,
@@ -1302,13 +1192,8 @@
         "initialSkin": 41027,
         "gender": 2,
         "atkSpineEffect": "liqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 27,
@@ -1353,13 +1238,8 @@
         "initialSkin": 41028,
         "gender": 2,
         "atkSpineEffect": "liqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 28,
@@ -1450,13 +1330,8 @@
         "initialSkin": 41030,
         "gender": 2,
         "atkSpineEffect": "faqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 30,
@@ -1501,13 +1376,8 @@
         "initialSkin": 41031,
         "gender": 1,
         "atkSpineEffect": "gong",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 31,
@@ -1552,13 +1422,8 @@
         "initialSkin": 41032,
         "gender": 1,
         "atkSpineEffect": "faqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 32,
@@ -1649,13 +1514,8 @@
         "initialSkin": 41034,
         "gender": 1,
         "atkSpineEffect": "liqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 34,
@@ -1700,13 +1560,8 @@
         "initialSkin": 41035,
         "gender": 1,
         "atkSpineEffect": "faqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 35,
@@ -1751,13 +1606,8 @@
         "initialSkin": 41036,
         "gender": 1,
         "atkSpineEffect": "liqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 36,
@@ -1802,13 +1652,8 @@
         "initialSkin": 41037,
         "gender": 1,
         "atkSpineEffect": "liqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 37,
@@ -1853,13 +1698,8 @@
         "initialSkin": 41038,
         "gender": 1,
         "atkSpineEffect": "liqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 38,
@@ -1904,13 +1744,8 @@
         "initialSkin": 41039,
         "gender": 2,
         "atkSpineEffect": "gong",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 39,
@@ -1955,13 +1790,8 @@
         "initialSkin": 41040,
         "gender": 1,
         "atkSpineEffect": "faqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 40,
@@ -2052,13 +1882,8 @@
         "initialSkin": 41042,
         "gender": 2,
         "atkSpineEffect": "faqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 42,
@@ -2103,13 +1928,8 @@
         "initialSkin": 41043,
         "gender": 2,
         "atkSpineEffect": "gong",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 43,
@@ -2154,13 +1974,8 @@
         "initialSkin": 41044,
         "gender": 1,
         "atkSpineEffect": "faqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 44,
@@ -2205,13 +2020,8 @@
         "initialSkin": 41045,
         "gender": 1,
         "atkSpineEffect": "liqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 45,
@@ -2256,13 +2066,8 @@
         "initialSkin": 41046,
         "gender": 1,
         "atkSpineEffect": "gong",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 46,
@@ -2322,7 +2127,7 @@
         "camp": 4,
         "area": 0,
         "cost": 0,
-        "jobid": 31,
+        "jobid": 26,
         "skill": 47,
         "pieceId": 21047,
         "hp": 920,
@@ -2353,13 +2158,8 @@
         "initialSkin": 41048,
         "gender": 1,
         "atkSpineEffect": "faqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 48,
@@ -2373,7 +2173,7 @@
         "camp": 4,
         "area": 0,
         "cost": 0,
-        "jobid": 31,
+        "jobid": 26,
         "skill": 48,
         "pieceId": 21048,
         "hp": 980,
@@ -2404,13 +2204,8 @@
         "initialSkin": 41049,
         "gender": 2,
         "atkSpineEffect": "faqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 49,
@@ -2455,13 +2250,8 @@
         "initialSkin": 41050,
         "gender": 1,
         "atkSpineEffect": "liqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 50,
@@ -2506,13 +2296,8 @@
         "initialSkin": 41051,
         "gender": 1,
         "atkSpineEffect": "gong",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 51,
@@ -2557,13 +2342,8 @@
         "initialSkin": 41052,
         "gender": 1,
         "atkSpineEffect": "faqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 52,
@@ -2608,13 +2388,8 @@
         "initialSkin": 41053,
         "gender": 2,
         "atkSpineEffect": "liqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 53,
@@ -2705,13 +2480,8 @@
         "initialSkin": 41055,
         "gender": 1,
         "atkSpineEffect": "liqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 55,
@@ -2756,13 +2526,8 @@
         "initialSkin": 41056,
         "gender": 1,
         "atkSpineEffect": "dunqi",
-<<<<<<< Updated upstream
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
-        "showinRecruit": "1&",
-        "recruit": "1&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 56,
@@ -2852,11 +2617,7 @@
         "position": "30&40&30",
         "initialSkin": 0,
         "gender": 1,
-<<<<<<< Updated upstream
         "atkSpineEffect": "liqi",
-=======
-        "atkSpineEffect": "dunqi",
->>>>>>> Stashed changes
         "showinRecruit": "0&",
         "recruit": "0&"
     },
@@ -2909,11 +2670,7 @@
     {
         "heroId": 59,
         "spineName": "tongyuan",
-<<<<<<< Updated upstream
         "rSpineName": "LH_tongyuan",
-=======
-        "rSpineName": "&",
->>>>>>> Stashed changes
         "name": "童渊",
         "face_id": "tongyuan",
         "quality": 3,
@@ -2922,7 +2679,6 @@
         "camp": 4,
         "area": 0,
         "cost": 0,
-<<<<<<< Updated upstream
         "jobid": 10,
         "skill": 59,
         "pieceId": 21057,
@@ -2939,24 +2695,6 @@
         "mdef_up": 1000,
         "agi_up": 1000,
         "luk_up": 1000,
-=======
-        "jobid": 6,
-        "skill": 0,
-        "pieceId": 21057,
-        "hp": 100,
-        "atk": 20,
-        "def": 20,
-        "mdef": 20,
-        "agi": 20,
-        "luk": 20,
-        "hp_up": 10,
-        "atk_up": 1,
-        "matk_up": 1,
-        "def_up": 1,
-        "mdef_up": 1,
-        "agi_up": 1,
-        "luk_up": 1,
->>>>>>> Stashed changes
         "killid": 0,
         "sound_click": 57,
         "sound_fight": 57,
@@ -2964,40 +2702,23 @@
         "retreat": "大丈夫死于乱世。",
         "info": "我是高玩",
         "actorinfo": "远程职业的法师，菜的一笔。",
-<<<<<<< Updated upstream
         "imgPosofDialog": "518&-160",
         "imgPosofInfoUI": "-343&-159",
         "imgPosofInfoMVP": "-493&-36",
-=======
-        "imgPosofDialog": "864&208",
-        "imgPosofInfoUI": "-702&-188",
-        "imgPosofInfoMVP": "-702&-188",
->>>>>>> Stashed changes
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
         "gender": 1,
-<<<<<<< Updated upstream
         "atkSpineEffect": "liqi",
-=======
-        "atkSpineEffect": "dunqi",
->>>>>>> Stashed changes
         "showinRecruit": "0&",
         "recruit": "0&"
     },
     {
         "heroId": 60,
-<<<<<<< Updated upstream
         "spineName": "shaonianzhaoyun",
         "rSpineName": "LH_shaonianzhaoyun",
         "name": "赵云",
         "face_id": "shaonianzhaoyun",
-=======
-        "spineName": "shaonainzhaoyun",
-        "rSpineName": "&",
-        "name": "少年赵云",
-        "face_id": "shaonainzhaoyun",
->>>>>>> Stashed changes
         "quality": 3,
         "initialStars": 3,
         "pieceCount": 100,
@@ -3005,7 +2726,6 @@
         "area": 0,
         "cost": 0,
         "jobid": 6,
-<<<<<<< Updated upstream
         "skill": 60,
         "pieceId": 21058,
         "hp": 1000,
@@ -3031,55 +2751,19 @@
         "imgPosofDialog": "500&-110",
         "imgPosofInfoUI": "-325&-116",
         "imgPosofInfoMVP": "-475&14",
-=======
-        "skill": 0,
-        "pieceId": 21056,
-        "hp": 100,
-        "atk": 20,
-        "def": 20,
-        "mdef": 20,
-        "agi": 20,
-        "luk": 20,
-        "hp_up": 10,
-        "atk_up": 1,
-        "matk_up": 1,
-        "def_up": 1,
-        "mdef_up": 1,
-        "agi_up": 1,
-        "luk_up": 1,
-        "killid": 0,
-        "sound_click": 57,
-        "sound_fight": 57,
-        "kill": "看看我长枪的威力！",
-        "retreat": "大丈夫死于乱世。",
-        "info": "我是高玩",
-        "actorinfo": "物理职业的步兵，强的一笔。",
-        "imgPosofDialog": "588&-221",
-        "imgPosofInfoUI": "-471&-162",
-        "imgPosofInfoMVP": "-471&-162",
->>>>>>> Stashed changes
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
         "gender": 1,
-<<<<<<< Updated upstream
         "atkSpineEffect": "liqi",
-=======
-        "atkSpineEffect": "dunqi",
->>>>>>> Stashed changes
         "showinRecruit": "0&",
         "recruit": "0&"
     },
     {
         "heroId": 61,
         "spineName": "shaonianxiahouqingyi",
-<<<<<<< Updated upstream
         "rSpineName": "LH_shaonianxiahouqingyi",
         "name": "夏侯轻衣",
-=======
-        "rSpineName": "&",
-        "name": "少年夏侯轻衣",
->>>>>>> Stashed changes
         "face_id": "shaonianxiahouqingyi",
         "quality": 3,
         "initialStars": 3,
@@ -3088,7 +2772,6 @@
         "area": 0,
         "cost": 0,
         "jobid": 21,
-<<<<<<< Updated upstream
         "skill": 61,
         "pieceId": 21059,
         "hp": 1000,
@@ -3104,23 +2787,6 @@
         "mdef_up": 500,
         "agi_up": 500,
         "luk_up": 500,
-=======
-        "skill": 0,
-        "pieceId": 21055,
-        "hp": 100,
-        "atk": 20,
-        "def": 20,
-        "mdef": 20,
-        "agi": 20,
-        "luk": 20,
-        "hp_up": 10,
-        "atk_up": 1,
-        "matk_up": 1,
-        "def_up": 1,
-        "mdef_up": 1,
-        "agi_up": 1,
-        "luk_up": 1,
->>>>>>> Stashed changes
         "killid": 0,
         "sound_click": 57,
         "sound_fight": 57,
@@ -3128,15 +2794,9 @@
         "retreat": "大丈夫死于乱世。",
         "info": "我是高玩",
         "actorinfo": "远程职业的法师，菜的一笔。",
-<<<<<<< Updated upstream
         "imgPosofDialog": "518&-178",
         "imgPosofInfoUI": "-343&-184",
         "imgPosofInfoMVP": "-493&-54",
-=======
-        "imgPosofDialog": "864&209",
-        "imgPosofInfoUI": "-702&-189",
-        "imgPosofInfoMVP": "-702&-189",
->>>>>>> Stashed changes
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
@@ -3144,7 +2804,6 @@
         "atkSpineEffect": "dunqi",
         "showinRecruit": "0&",
         "recruit": "0&"
-<<<<<<< Updated upstream
     },
     {
         "heroId": 62,
@@ -3283,8 +2942,6 @@
         "atkSpineEffect": "liqi",
         "showinRecruit": "0&",
         "recruit": "0&"
-=======
->>>>>>> Stashed changes
     },
     {
         "heroId": 301,
@@ -3528,7 +3185,7 @@
         "camp": 1,
         "area": 0,
         "cost": 0,
-        "jobid": 31,
+        "jobid": 26,
         "skill": 6,
         "pieceId": 0,
         "hp": 60,
@@ -3879,11 +3536,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 2,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "faqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -3900,7 +3553,7 @@
         "camp": 1,
         "area": 0,
         "cost": 0,
-        "jobid": 31,
+        "jobid": 26,
         "skill": 14,
         "pieceId": 0,
         "hp": 60,
@@ -4481,11 +4134,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 2,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "liqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -4531,11 +4180,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 2,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "liqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -4627,11 +4272,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 2,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "faqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -5045,11 +4686,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 2,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "gong",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -5141,11 +4778,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 2,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "faqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -5191,11 +4824,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 2,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "faqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -5241,11 +4870,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 2,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "gong",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -5446,7 +5071,7 @@
         "camp": 4,
         "area": 0,
         "cost": 0,
-        "jobid": 31,
+        "jobid": 26,
         "skill": 47,
         "pieceId": 0,
         "hp": 60,
@@ -5492,7 +5117,7 @@
         "camp": 4,
         "area": 0,
         "cost": 0,
-        "jobid": 31,
+        "jobid": 26,
         "skill": 48,
         "pieceId": 0,
         "hp": 60,
@@ -5521,11 +5146,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 2,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "faqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -5709,11 +5330,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 2,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "liqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -5759,11 +5376,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 2,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "dunqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -5901,11 +5514,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 2,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "faqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -6182,11 +5791,7 @@
         "position": "30&40&30",
         "initialSkin": 0,
         "gender": 1,
-<<<<<<< Updated upstream
         "atkSpineEffect": "liqi",
-=======
-        "atkSpineEffect": "dunqi",
->>>>>>> Stashed changes
         "showinRecruit": "0&",
         "recruit": "0&"
     },
@@ -6783,11 +6388,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 0,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "liqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -6833,11 +6434,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 0,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "liqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -7389,11 +6986,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 0,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "liqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -7439,11 +7032,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 0,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "liqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -7489,11 +7078,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 0,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "liqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -7539,11 +7124,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 0,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "liqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -7819,11 +7400,7 @@
         "skillScroll": "1&18|2&19",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 0,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "liqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -8375,11 +7952,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 0,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "liqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -8425,11 +7998,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 2,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "liqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -8659,11 +8228,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 2,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "liqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -8847,11 +8412,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 0,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "liqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -9311,11 +8872,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 0,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "liqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -9361,11 +8918,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 0,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "liqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -9641,11 +9194,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 0,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "liqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -9783,11 +9332,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 2,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "liqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -9925,11 +9470,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 2,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "liqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -10113,11 +9654,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 2,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "liqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -10163,11 +9700,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 2,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "liqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -10351,11 +9884,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 2,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "liqi",
         "showinRecruit": "0&",
         "recruit": "0&"
@@ -10539,11 +10068,7 @@
         "skillScroll": "&",
         "position": "30&40&30",
         "initialSkin": 0,
-<<<<<<< Updated upstream
         "gender": 0,
-=======
-        "gender": 1,
->>>>>>> Stashed changes
         "atkSpineEffect": "liqi",
         "showinRecruit": "0&",
         "recruit": "0&"