diff --git a/shared/resource/jsons/dic_army_bossBase.json b/shared/resource/jsons/dic_army_bossBase.json
index 124094e49..c3963a22b 100644
--- a/shared/resource/jsons/dic_army_bossBase.json
+++ b/shared/resource/jsons/dic_army_bossBase.json
@@ -22,7 +22,7 @@
         "structureId": 3,
         "level": 2,
         "bossLevel": 20,
-        "warIdHP": "8005&20000000&20|8006&20000000&20",
+        "warIdHP": "8001&20000000&20|8002&20000000&20",
         "rewards": 1,
         "consume": 125000,
         "buildWords": "&",
@@ -40,7 +40,7 @@
         "structureId": 3,
         "level": 3,
         "bossLevel": 30,
-        "warIdHP": "8009&30000000&30|8010&30000000&30",
+        "warIdHP": "8001&30000000&30|8002&30000000&30",
         "rewards": 2,
         "consume": 350000,
         "buildWords": "&",
@@ -58,7 +58,7 @@
         "structureId": 3,
         "level": 4,
         "bossLevel": 40,
-        "warIdHP": "8013&40000000&40|8014&40000000&40",
+        "warIdHP": "8001&40000000&40|8002&40000000&40",
         "rewards": 2,
         "consume": 800000,
         "buildWords": "&",
@@ -76,7 +76,7 @@
         "structureId": 3,
         "level": 5,
         "bossLevel": 50,
-        "warIdHP": "8017&50000000&50|8018&50000000&50",
+        "warIdHP": "8001&50000000&50|8002&50000000&50",
         "rewards": 2,
         "consume": 1700000,
         "buildWords": "&",
@@ -94,7 +94,7 @@
         "structureId": 3,
         "level": 6,
         "bossLevel": 60,
-        "warIdHP": "8021&60000000&60|8022&60000000&60",
+        "warIdHP": "8001&60000000&60|8002&60000000&60",
         "rewards": 2,
         "consume": 3500000,
         "buildWords": "&",
@@ -112,7 +112,7 @@
         "structureId": 3,
         "level": 7,
         "bossLevel": 70,
-        "warIdHP": "8025&70000000&65|8026&70000000&65",
+        "warIdHP": "8001&70000000&65|8002&70000000&65",
         "rewards": 3,
         "consume": 6125000,
         "buildWords": "&",
@@ -130,7 +130,7 @@
         "structureId": 3,
         "level": 8,
         "bossLevel": 80,
-        "warIdHP": "8029&80000000&70|8030&80000000&70",
+        "warIdHP": "8001&80000000&70|8002&80000000&70",
         "rewards": 3,
         "consume": 9125000,
         "buildWords": "&",
@@ -148,7 +148,7 @@
         "structureId": 3,
         "level": 9,
         "bossLevel": 90,
-        "warIdHP": "8033&90000000&75|8034&90000000&75",
+        "warIdHP": "8001&90000000&75|8002&90000000&75",
         "rewards": 3,
         "consume": 13625000,
         "buildWords": "&",
@@ -166,7 +166,7 @@
         "structureId": 3,
         "level": 10,
         "bossLevel": 100,
-        "warIdHP": "8037&100000000&80|8038&100000000&80",
+        "warIdHP": "8001&100000000&80|8002&100000000&80",
         "rewards": 3,
         "consume": 99999999,
         "buildWords": "&",
diff --git a/shared/resource/jsons/dic_zyz_gk_branch.json b/shared/resource/jsons/dic_zyz_gk_branch.json
index b040cfcc0..872709128 100644
--- a/shared/resource/jsons/dic_zyz_gk_branch.json
+++ b/shared/resource/jsons/dic_zyz_gk_branch.json
@@ -6,7 +6,7 @@
         "mapid": 2511,
         "script_id": "R_2511&S_2511&RE_2511",
         "fixReward": "&",
-        "conditionReward": "31001&5000&0|31002&100&0|11002&10&0|22001&2&0",
+        "conditionReward": "31001&25000&0|31002&100&0|11002&10&0|22001&5&0",
         "RandomReward": "&",
         "warType": 2,
         "gk_name": "支线&世外小村",
@@ -15,8 +15,8 @@
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
-        "victoryInfoInUI": "1.消灭所有敌军\n2.死亡的村民数量≤2\n3.剩下的村民都到达洞口",
-        "loseInfoInUI": "1.我方全部阵亡\n2.死亡的村民数量≥3\n3.20回合内未能胜利",
+        "victoryInfoInUI": "1.消灭所有敌军\r\n 2.死亡的村民数量≤2\r\n 3.剩下的村民都到达洞口",
+        "loseInfoInUI": "1.我方全部阵亡\r\n 2.死亡的村民数量≥3\r\n 3.20回合内未能胜利",
         "starInfoInUI": "1.在20回合内获得胜利",
         "cost": 10,
         "iconInMap": "spine&qingnian",
@@ -26,15 +26,16 @@
         "recommendedPower": 139718,
         "previousGk": 126,
         "relatedGk": 1000128,
-        "movePoint": 496,
+        "movePoint": 505,
         "needPrepare": 1,
         "spineInBigMap": "&",
         "HeroNum": "6&6",
-        "gkInfo": "    循着不详的气息，赵云一行人来到了一座神秘的小村庄。老人们说，他们是为了躲避连年战乱才来此地。\n    想不到即使是在这里，也藏着不为人知的阴谋……\n    这些阴兵，究竟由谁招来？山林里还有恶兽蠢蠢欲动……\n",
+        "gkInfo": " 循着不详的气息，赵云一行人来到了一座神秘的小村庄。老人们说，他们是为了躲避连年战乱才来此地。\r\n  想不到即使是在这里，也藏着不为人知的阴谋……\r\n  这些阴兵，究竟由谁招来？山林里还有恶兽蠢蠢欲动……\r\n ",
         "HeroNum_1": "1&6",
         "progress": "1&0|2&0",
         "progressDesc": "已逃走的百姓数量&被击杀的百姓数量",
-        "branchSpine": "&"
+        "branchSpine": "&",
+        "branchSpine_1": "&"
     },
     {
         "war_id": 2512,
@@ -43,7 +44,7 @@
         "mapid": 2512,
         "script_id": "R_2512&S_2512&RE_2512",
         "fixReward": "&",
-        "conditionReward": "31001&5000&0|31002&100&0|11002&10&0|22001&2&0",
+        "conditionReward": "31001&25000&0|31002&100&0|11002&10&0|22001&5&0",
         "RandomReward": "&",
         "warType": 2,
         "gk_name": "支线&迷雾洞窟",
@@ -52,8 +53,8 @@
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
-        "victoryInfoInUI": "1.消灭所有敌军\n2.解救所有被绑架的村民\n",
-        "loseInfoInUI": "1.我方全部阵亡\n2.20回合内未能胜利",
+        "victoryInfoInUI": "1.消灭所有敌军\r\n 2.解救所有被绑架的村民\r\n ",
+        "loseInfoInUI": "1.我方全部阵亡\r\n 2.20回合内未能胜利",
         "starInfoInUI": "1.在20回合内获得胜利",
         "cost": 10,
         "iconInMap": "spine&yinbingdao&1",
@@ -63,15 +64,16 @@
         "recommendedPower": 157183,
         "previousGk": 2511,
         "relatedGk": 1000224,
-        "movePoint": 503,
+        "movePoint": 512,
         "needPrepare": 1,
         "spineInBigMap": "&",
         "HeroNum": "6&6",
-        "gkInfo": "    赵云一行人刚将村中的百姓带入山洞避难，一位急急忙忙寻找妻子的青年便找上门来。\n    洞内仍有不少以往百姓为了躲避战乱设下的陷阱，可务必要当心！\n    也许在这昏暗的洞穴里，点燃火炬一路小心前行，才是上策。",
+        "gkInfo": " 赵云一行人刚将村中的百姓带入山洞避难，一位急急忙忙寻找妻子的青年便找上门来。\r\n  洞内仍有不少以往百姓为了躲避战乱设下的陷阱，可务必要当心！\r\n  也许在这昏暗的洞穴里，点燃火炬一路小心前行，才是上策。",
         "HeroNum_1": "1&6",
         "progress": "1&0|6&0",
         "progressDesc": "已解救的百姓数量&待解救的百姓数量",
-        "branchSpine": "&"
+        "branchSpine": "&",
+        "branchSpine_1": "&"
     },
     {
         "war_id": 2513,
@@ -80,7 +82,7 @@
         "mapid": 2513,
         "script_id": "R_2513&S_2513&RE_2513",
         "fixReward": "&",
-        "conditionReward": "31001&5000&0|31002&100&0|11002&10&0|22001&2&0",
+        "conditionReward": "31001&50000&0|31002&300&0|11002&10&0|21047&80&0",
         "RandomReward": "&",
         "warType": 2,
         "gk_name": "支线&黄天祭坛",
@@ -100,15 +102,16 @@
         "recommendedPower": 174648,
         "previousGk": 2512,
         "relatedGk": 1000324,
-        "movePoint": 507,
+        "movePoint": 516,
         "needPrepare": 1,
         "spineInBigMap": "&",
         "HeroNum": "6&6",
-        "gkInfo": "    诡异的阴兵，神秘的阴珠，残忍的血法……从巨鹿废墟到山林小村，一个巨大的阴谋似乎一直笼罩在冀州的上空。\n    现在赵云一行人终于来到了最后的祭坛，即将揭开这一切的始作俑者……",
+        "gkInfo": " 诡异的阴兵，神秘的阴珠，残忍的血法……从巨鹿废墟到山林小村，一个巨大的阴谋似乎一直笼罩在冀州的上空。\r\n  现在赵云一行人终于来到了最后的祭坛，即将揭开这一切的始作俑者……",
         "HeroNum_1": "1&6",
         "progress": "&",
         "progressDesc": "&",
-        "branchSpine": "chapter1_yiji"
+        "branchSpine": "chapter1_yiji",
+        "branchSpine_1": "chapter1_yiji"
     },
     {
         "war_id": 2521,
@@ -117,7 +120,7 @@
         "mapid": 2521,
         "script_id": "R_2521&S_2521&RE_2521",
         "fixReward": "&",
-        "conditionReward": "31001&6000&0|31002&100&0|11002&10&0|22001&2&0",
+        "conditionReward": "31001&50000&0|31002&150&0|11002&10&0|22001&5&0",
         "RandomReward": "&",
         "warType": 2,
         "gk_name": "支线&井底世界",
@@ -128,9 +131,9 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "\n1.在20回合内获得胜利",
+        "starInfoInUI": "1.在20回合内获得胜利",
         "cost": 10,
-        "iconInMap": "spine&qingnian",
+        "iconInMap": "spine&tangji",
         "iconName": "井底世界",
         "heroInUI": "3&3201",
         "detailUIBg": "1000_4",
@@ -141,11 +144,12 @@
         "needPrepare": 1,
         "spineInBigMap": "&",
         "HeroNum": "6&6",
-        "gkInfo": "    在枯井的周围，一群宫女装扮的幽鬼盘亘。\n    原来，这些是洛阳被焚毁时，惨死于皇宫中的宫女，因为长久以来的怨气而化为幽鬼，她们憎恨一切活着的人类。\n    小心！她们来了！",
+        "gkInfo": " 在枯井的周围，一群宫女装扮的幽鬼盘亘。\r\n  原来，这些是洛阳被焚毁时，惨死于皇宫中的宫女，因为长久以来的怨气而化为幽鬼，她们憎恨一切活着的人类。\r\n  小心！她们来了！",
         "HeroNum_1": "1&6",
         "progress": "&",
         "progressDesc": "&",
-        "branchSpine": "&"
+        "branchSpine": "&",
+        "branchSpine_1": "&"
     },
     {
         "war_id": 2522,
@@ -154,7 +158,7 @@
         "mapid": 2522,
         "script_id": "R_2522&S_2522&RE_2522",
         "fixReward": "&",
-        "conditionReward": "31001&6000&0|31002&100&0|11002&10&0|22001&2&0",
+        "conditionReward": "31001&50000&0|31002&150&0|11002&10&0|22001&5&0",
         "RandomReward": "&",
         "warType": 2,
         "gk_name": "支线&甬道屠夫",
@@ -167,7 +171,7 @@
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.在20回合内获得胜利",
         "cost": 10,
-        "iconInMap": "spine&yinbingdao",
+        "iconInMap": "spine&hejin",
         "iconName": "甬道屠夫",
         "heroInUI": "3&3203",
         "detailUIBg": "1000_5",
@@ -178,11 +182,12 @@
         "needPrepare": 1,
         "spineInBigMap": "&",
         "HeroNum": "6&6",
-        "gkInfo": "    枯井的尽头是一条大门，出于好奇，赵云一行人穿越幽暗的隧道，来到大门前。\n    吱呀——推开大门，原来这里是一片墓室。\n    在昏黄的烛火中，他们看到了一群没有意识的侍卫，还有一个没有头颅的巨大身影……",
+        "gkInfo": " 枯井的尽头是一条大门，出于好奇，赵云一行人穿越幽暗的隧道，来到大门前。\r\n  吱呀——推开大门，原来这里是一片墓室。\r\n  在昏黄的烛火中，他们看到了一群没有意识的侍卫，还有一个没有头颅的巨大身影……",
         "HeroNum_1": "1&6",
         "progress": "&",
         "progressDesc": "&",
-        "branchSpine": "&"
+        "branchSpine": "&",
+        "branchSpine_1": "&"
     },
     {
         "war_id": 2523,
@@ -191,7 +196,7 @@
         "mapid": 2523,
         "script_id": "R_2523&S_2523&RE_2523",
         "fixReward": "&",
-        "conditionReward": "31001&6000&0|31002&100&0|11002&10&0|22001&2&0",
+        "conditionReward": "31001&100000&0|31002&450&0|11002&10&0|71002&80&0",
         "RandomReward": "&",
         "warType": 2,
         "gk_name": "支线&何后废陵",
@@ -202,9 +207,9 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.我方无人阵亡；\n2.在30回合内获得胜利",
+        "starInfoInUI": "1.我方无人阵亡；\r\n 2.在30回合内获得胜利",
         "cost": 30,
-        "iconInMap": "spine&zhangjiao",
+        "iconInMap": "spine&bianhua_red",
         "iconName": "何后废陵",
         "heroInUI": "3&3613",
         "detailUIBg": "1000_6",
@@ -215,20 +220,21 @@
         "needPrepare": 1,
         "spineInBigMap": "&",
         "HeroNum": "6&6",
-        "gkInfo": "    何太后身材窈窕，风流妩媚，进宫之后更是凭借自身的心计一步步征服了汉灵帝的心。然其天性善妒，刘协出生后，感到自身地位动摇的何太后用鸩酒毒杀了王美人。\n    天道有轮回，外戚与宦官相争，何进身死，董卓进京，何太后也被逼饮下毒酒。\n    陵墓尽头，彼岸花开，何太后已超脱生死，可千万别停留在这里！",
+        "gkInfo": " 何太后身材窈窕，风流妩媚，进宫之后更是凭借自身的心计一步步征服了汉灵帝的心。然其天性善妒，刘协出生后，感到自身地位动摇的何太后用鸩酒毒杀了王美人。\r\n  天道有轮回，外戚与宦官相争，何进身死，董卓进京，何太后也被逼饮下毒酒。\r\n  陵墓尽头，彼岸花开，何太后已超脱生死，可千万别停留在这里！",
         "HeroNum_1": "1&6",
         "progress": "&",
         "progressDesc": "&",
-        "branchSpine": "chapter2_yiji"
+        "branchSpine": "chapter2_yiji",
+        "branchSpine_1": "chapter2_yiji"
     },
     {
         "war_id": 2531,
         "dispatchJsonId": 2531,
         "bg_img": 2531,
         "mapid": 2531,
-        "script_id": "R_9301&S_9301&RE_9301",
+        "script_id": "R_2531&S_2531&RE_2531",
         "fixReward": "&",
-        "conditionReward": "31001&7000&0|31002&150&0|11002&12&0|22001&2&0",
+        "conditionReward": "31001&75000&0|31002&200&0|11002&12&0|22001&5&0",
         "RandomReward": "&",
         "warType": 2,
         "gk_name": "支线&泰山小城",
@@ -239,7 +245,7 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
+        "starInfoInUI": "1.我方无人阵亡；\r\n 2.在5回合内获得胜利",
         "cost": 10,
         "iconInMap": "spine&guanhai",
         "iconName": 0,
@@ -256,16 +262,17 @@
         "HeroNum_1": "1&6",
         "progress": "&",
         "progressDesc": "&",
-        "branchSpine": "&"
+        "branchSpine": "&",
+        "branchSpine_1": "&"
     },
     {
         "war_id": 2532,
         "dispatchJsonId": 2532,
         "bg_img": 2532,
         "mapid": 2532,
-        "script_id": "R_9302&S_9302&RE_9302",
+        "script_id": "R_2532&S_2532&RE_2532",
         "fixReward": "&",
-        "conditionReward": "31001&7000&0|31002&150&0|11002&12&0|22001&2&0",
+        "conditionReward": "31001&75000&0|31002&200&0|11002&12&0|22001&5&0",
         "RandomReward": "&",
         "warType": 2,
         "gk_name": "支线&山亭故人",
@@ -276,7 +283,7 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
+        "starInfoInUI": "1.我方无人阵亡；\r\n 2.在5回合内获得胜利",
         "cost": 10,
         "iconInMap": "spine&caosong",
         "iconName": 0,
@@ -293,7 +300,8 @@
         "HeroNum_1": "1&6",
         "progress": "&",
         "progressDesc": "&",
-        "branchSpine": "&"
+        "branchSpine": "&",
+        "branchSpine_1": "&"
     },
     {
         "war_id": 2533,
@@ -302,7 +310,7 @@
         "mapid": 2533,
         "script_id": "R_2533&S_2533&RE_2533",
         "fixReward": "&",
-        "conditionReward": "31001&7000&0|31002&150&0|11002&12&0|22001&2&0",
+        "conditionReward": "31001&150000&0|31002&600&0|11002&12&0|71002&80&0",
         "RandomReward": "&",
         "warType": 2,
         "gk_name": "支线&东岳帝庙",
@@ -313,7 +321,7 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
+        "starInfoInUI": "1.我方无人阵亡；\r\n 2.在5回合内获得胜利",
         "cost": 30,
         "iconInMap": "spine&zhangrang",
         "iconName": 0,
@@ -330,16 +338,17 @@
         "HeroNum_1": "1&6",
         "progress": "&",
         "progressDesc": "&",
-        "branchSpine": "chapter3_yiji"
+        "branchSpine": "chapter3_yiji",
+        "branchSpine_1": "chapter3_yiji"
     },
     {
         "war_id": 2541,
         "dispatchJsonId": 2541,
-        "bg_img": 9241,
-        "mapid": 9241,
-        "script_id": "R_9401&S_9401&RE_9401",
+        "bg_img": 2541,
+        "mapid": 2541,
+        "script_id": "R_2541&S_2541&RE_2541",
         "fixReward": "&",
-        "conditionReward": "31001&8000&0|31002&150&0|11002&12&0|22001&2&0",
+        "conditionReward": "31001&100000&0|31002&250&0|11002&12&0|22001&5&0",
         "RandomReward": "&",
         "warType": 2,
         "gk_name": "支线&鲜卑小落",
@@ -350,7 +359,7 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
+        "starInfoInUI": "1.我方无人阵亡；\r\n 2.在5回合内获得胜利",
         "cost": 10,
         "iconInMap": "spine&qingnian",
         "iconName": 0,
@@ -367,16 +376,17 @@
         "HeroNum_1": "1&6",
         "progress": "&",
         "progressDesc": "&",
-        "branchSpine": "&"
+        "branchSpine": "&",
+        "branchSpine_1": "&"
     },
     {
         "war_id": 2542,
         "dispatchJsonId": 2542,
-        "bg_img": 9242,
-        "mapid": 9242,
-        "script_id": "R_9402&S_9402&RE_9402",
+        "bg_img": 2542,
+        "mapid": 2542,
+        "script_id": "R_2542&S_2542&RE_2542",
         "fixReward": "&",
-        "conditionReward": "31001&8000&0|31002&150&0|11002&12&0|22001&2&0",
+        "conditionReward": "31001&100000&0|31002&250&0|11002&12&0|22001&5&0",
         "RandomReward": "&",
         "warType": 2,
         "gk_name": "支线&万夫之勇",
@@ -387,7 +397,7 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
+        "starInfoInUI": "1.我方无人阵亡；\r\n 2.在5回合内获得胜利",
         "cost": 10,
         "iconInMap": "spine&yinbingdao",
         "iconName": 0,
@@ -396,7 +406,7 @@
         "recommendedPower": 90000,
         "previousGk": 2541,
         "relatedGk": 1000424,
-        "movePoint": 573,
+        "movePoint": 574,
         "needPrepare": 1,
         "spineInBigMap": "&",
         "HeroNum": "6&6",
@@ -404,16 +414,17 @@
         "HeroNum_1": "1&6",
         "progress": "&",
         "progressDesc": "&",
-        "branchSpine": "&"
+        "branchSpine": "&",
+        "branchSpine_1": "&"
     },
     {
         "war_id": 2543,
         "dispatchJsonId": 2543,
-        "bg_img": 9243,
-        "mapid": 9243,
-        "script_id": "R_9403&S_9403&RE_9403",
+        "bg_img": 2543,
+        "mapid": 2543,
+        "script_id": "R_2543&S_2543&RE_2543",
         "fixReward": "&",
-        "conditionReward": "31001&8000&0|31002&150&0|11002&12&0|22001&2&0",
+        "conditionReward": "31001&200000&0|31002&750&0|11002&12&0|71002&80&0",
         "RandomReward": "&",
         "warType": 2,
         "gk_name": "支线&白狼凶灵",
@@ -424,7 +435,7 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
+        "starInfoInUI": "1.我方无人阵亡；\r\n 2.在5回合内获得胜利",
         "cost": 30,
         "iconInMap": "spine&zhangjiao",
         "iconName": 0,
@@ -441,19 +452,20 @@
         "HeroNum_1": "1&6",
         "progress": "&",
         "progressDesc": "&",
-        "branchSpine": "chapter4_yiji"
+        "branchSpine": "chapter4_yiji",
+        "branchSpine_1": "chapter4_yiji"
     },
     {
         "war_id": 2551,
         "dispatchJsonId": 2551,
-        "bg_img": 9251,
-        "mapid": 9251,
-        "script_id": "R_9501&S_9501&RE_9501",
+        "bg_img": 2551,
+        "mapid": 2551,
+        "script_id": "&",
         "fixReward": "&",
-        "conditionReward": "31001&9000&0|31002&200&0|11002&14&0|22001&2&0",
+        "conditionReward": "31001&125000&0|31002&300&0|11002&14&0|22001&5&0",
         "RandomReward": "&",
         "warType": 2,
-        "gk_name": "支线&",
+        "gk_name": "支线&凶恶山贼",
         "kingExp": 0,
         "lvLimted": 1,
         "turnLimted": 20,
@@ -461,16 +473,16 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
+        "starInfoInUI": "1.我方无人阵亡；\r\n 2.在5回合内获得胜利",
         "cost": 10,
-        "iconInMap": "spine&qingnian",
+        "iconInMap": "spine&leixu",
         "iconName": 0,
         "heroInUI": "3&1535",
         "detailUIBg": "1000_13",
         "recommendedPower": 110000,
-        "previousGk": 512,
+        "previousGk": 517,
         "relatedGk": 1000628,
-        "movePoint": 583,
+        "movePoint": 585,
         "needPrepare": 1,
         "spineInBigMap": "&",
         "HeroNum": "6&6",
@@ -478,19 +490,20 @@
         "HeroNum_1": "1&6",
         "progress": "&",
         "progressDesc": "&",
-        "branchSpine": "&"
+        "branchSpine": "&",
+        "branchSpine_1": "&"
     },
     {
         "war_id": 2552,
         "dispatchJsonId": 2552,
-        "bg_img": 9252,
-        "mapid": 9252,
-        "script_id": "R_9502&S_9502&RE_9502",
+        "bg_img": 2552,
+        "mapid": 2552,
+        "script_id": "&",
         "fixReward": "&",
-        "conditionReward": "31001&9000&0|31002&200&0|11002&14&0|22001&2&0",
+        "conditionReward": "31001&125000&0|31002&300&0|11002&14&0|22001&5&0",
         "RandomReward": "&",
         "warType": 2,
-        "gk_name": "支线&",
+        "gk_name": "支线&仲家遗将",
         "kingExp": 0,
         "lvLimted": 1,
         "turnLimted": 20,
@@ -498,9 +511,9 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
+        "starInfoInUI": "1.我方无人阵亡；\r\n 2.在5回合内获得胜利",
         "cost": 10,
-        "iconInMap": "spine&yinbingdao",
+        "iconInMap": "spine&chenlan",
         "iconName": 0,
         "heroInUI": "3&3601",
         "detailUIBg": "1000_14",
@@ -515,16 +528,17 @@
         "HeroNum_1": "1&6",
         "progress": "&",
         "progressDesc": "&",
-        "branchSpine": "&"
+        "branchSpine": "&",
+        "branchSpine_1": "&"
     },
     {
         "war_id": 2553,
         "dispatchJsonId": 2553,
-        "bg_img": 9253,
-        "mapid": 9253,
-        "script_id": "R_9503&S_9503&RE_9503",
+        "bg_img": 2553,
+        "mapid": 2553,
+        "script_id": "&",
         "fixReward": "&",
-        "conditionReward": "31001&9000&0|31002&200&0|11002&14&0|22001&2&0",
+        "conditionReward": "31001&250000&0|31002&900&0|11002&14&0|71002&80&0",
         "RandomReward": "&",
         "warType": 2,
         "gk_name": "支线&仲帝遗怨",
@@ -535,9 +549,9 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
+        "starInfoInUI": "1.我方无人阵亡；\r\n 2.在5回合内获得胜利",
         "cost": 30,
-        "iconInMap": "spine&zhangjiao",
+        "iconInMap": "spine&chenlan",
         "iconName": 0,
         "heroInUI": "3&1540",
         "detailUIBg": "1000_15",
@@ -552,16 +566,17 @@
         "HeroNum_1": "1&6",
         "progress": "&",
         "progressDesc": "&",
-        "branchSpine": "chapter5_yiji"
+        "branchSpine": "chapter5_yiji",
+        "branchSpine_1": "chapter5_yiji"
     },
     {
         "war_id": 2561,
         "dispatchJsonId": 2561,
-        "bg_img": 9261,
-        "mapid": 9261,
-        "script_id": "R_9601&S_9601&RE_9601",
+        "bg_img": 2561,
+        "mapid": 2561,
+        "script_id": "R_2561&S_2561&RE_2561",
         "fixReward": "&",
-        "conditionReward": "31001&10000&0|31002&200&0|11002&14&0|22001&2&0",
+        "conditionReward": "31001&150000&0|31002&350&0|11002&14&0|22001&5&0",
         "RandomReward": "&",
         "warType": 2,
         "gk_name": "支线&百家之传",
@@ -572,7 +587,7 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
+        "starInfoInUI": "1.我方无人阵亡；\r\n 2.在5回合内获得胜利",
         "cost": 10,
         "iconInMap": "spine&wangcan",
         "iconName": 0,
@@ -589,16 +604,17 @@
         "HeroNum_1": "1&6",
         "progress": "&",
         "progressDesc": "&",
-        "branchSpine": "&"
+        "branchSpine": "&",
+        "branchSpine_1": "&"
     },
     {
         "war_id": 2562,
         "dispatchJsonId": 2562,
-        "bg_img": 9262,
-        "mapid": 9262,
-        "script_id": "R_9602&S_9602&RE_9602",
+        "bg_img": 2562,
+        "mapid": 2562,
+        "script_id": "R_2562&S_2562&RE_2562",
         "fixReward": "&",
-        "conditionReward": "31001&10000&0|31002&200&0|11002&14&0|22001&2&0",
+        "conditionReward": "31001&150000&0|31002&350&0|11002&14&0|22001&5&0",
         "RandomReward": "&",
         "warType": 2,
         "gk_name": "支线&鹿门墨术",
@@ -609,7 +625,7 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
+        "starInfoInUI": "1.我方无人阵亡；\r\n 2.在5回合内获得胜利",
         "cost": 10,
         "iconInMap": "spine&yanshi",
         "iconName": 0,
@@ -626,16 +642,17 @@
         "HeroNum_1": "1&6",
         "progress": "&",
         "progressDesc": "&",
-        "branchSpine": "&"
+        "branchSpine": "&",
+        "branchSpine_1": "&"
     },
     {
         "war_id": 2563,
         "dispatchJsonId": 2563,
-        "bg_img": 9263,
-        "mapid": 9263,
-        "script_id": "R_9603&S_9603&RE_9603",
+        "bg_img": 2563,
+        "mapid": 2563,
+        "script_id": "R_2563&S_2563&RE_2563",
         "fixReward": "&",
-        "conditionReward": "31001&10000&0|31002&200&0|11002&14&0|22001&2&0",
+        "conditionReward": "31001&300000&0|31002&1050&0|11002&14&0|71002&80&0",
         "RandomReward": "&",
         "warType": 2,
         "gk_name": "支线&西方真言",
@@ -646,7 +663,7 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
+        "starInfoInUI": "1.我方无人阵亡；\r\n 2.在5回合内获得胜利",
         "cost": 30,
         "iconInMap": "spine&sengren",
         "iconName": 0,
@@ -663,7 +680,8 @@
         "HeroNum_1": "1&6",
         "progress": "&",
         "progressDesc": "&",
-        "branchSpine": "chapter6_yiji"
+        "branchSpine": "chapter6_yiji",
+        "branchSpine_1": "chapter6_yiji"
     },
     {
         "war_id": 2571,
@@ -672,7 +690,7 @@
         "mapid": 2571,
         "script_id": "R_2571&S_2571&RE_2571",
         "fixReward": "&",
-        "conditionReward": "31001&11000&0|31002&250&0|11002&16&0|22001&2&0",
+        "conditionReward": "31001&175000&0|31002&400&0|11002&16&0|22001&5&0",
         "RandomReward": "&",
         "warType": 2,
         "gk_name": "支线&武陵顽猴",
@@ -683,14 +701,14 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
+        "starInfoInUI": "1.我方无人阵亡；\r\n 2.在5回合内获得胜利",
         "cost": 10,
         "iconInMap": "spine&qingnian",
         "iconName": "武陵顽猴",
         "heroInUI": "3&3605",
         "detailUIBg": "1000_19",
         "recommendedPower": 170000,
-        "previousGk": 716,
+        "previousGk": 712,
         "relatedGk": 1000528,
         "movePoint": 608,
         "needPrepare": 1,
@@ -700,7 +718,8 @@
         "HeroNum_1": "1&6",
         "progress": "&",
         "progressDesc": "&",
-        "branchSpine": "&"
+        "branchSpine": "&",
+        "branchSpine_1": "&"
     },
     {
         "war_id": 2572,
@@ -709,7 +728,7 @@
         "mapid": 2572,
         "script_id": "R_2572&S_2572&RE_2572",
         "fixReward": "&",
-        "conditionReward": "31001&11000&0|31002&250&0|11002&16&0|22001&2&0",
+        "conditionReward": "31001&175000&0|31002&400&0|11002&16&0|22001&5&0",
         "RandomReward": "&",
         "warType": 2,
         "gk_name": "支线&桃源疫民",
@@ -720,7 +739,7 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
+        "starInfoInUI": "1.我方无人阵亡；\r\n 2.在5回合内获得胜利",
         "cost": 10,
         "iconInMap": "spine&yinbingdao",
         "iconName": "桃源疫民",
@@ -737,7 +756,8 @@
         "HeroNum_1": "1&6",
         "progress": "&",
         "progressDesc": "&",
-        "branchSpine": "&"
+        "branchSpine": "&",
+        "branchSpine_1": "&"
     },
     {
         "war_id": 2573,
@@ -746,7 +766,7 @@
         "mapid": 2573,
         "script_id": "R_2573&S_2573&RE_2573",
         "fixReward": "&",
-        "conditionReward": "31001&11000&0|31002&250&0|11002&16&0|22001&2&0",
+        "conditionReward": "31001&350000&0|31002&1200&0|11002&16&0|71002&80&0",
         "RandomReward": "&",
         "warType": 2,
         "gk_name": "支线&西夷疫魔",
@@ -757,7 +777,7 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.我方无人阵亡；\n2.在5回合内获得胜利",
+        "starInfoInUI": "1.我方无人阵亡；\r\n 2.在5回合内获得胜利",
         "cost": 30,
         "iconInMap": "spine&zhangjiao",
         "iconName": "西夷疫魔",
@@ -774,6 +794,7 @@
         "HeroNum_1": "1&6",
         "progress": "&",
         "progressDesc": "&",
-        "branchSpine": "chapter7_yiji"
+        "branchSpine": "chapter7_yiji",
+        "branchSpine_1": "chapter7_yiji"
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/jsons/dic_zyz_shop.json b/shared/resource/jsons/dic_zyz_shop.json
index 4d7b35922..43ecd7eea 100644
--- a/shared/resource/jsons/dic_zyz_shop.json
+++ b/shared/resource/jsons/dic_zyz_shop.json
@@ -1349,21 +1349,6 @@
         "chosen": 0,
         "indirectId": 0
     },
-    {
-        "id": 99,
-        "goodid": 17052,
-        "goodname": "玉石",
-        "shop": 8,
-        "type": 10,
-        "guildlvlimit": "&",
-        "lvlimit": 0,
-        "purchaselimit": 1,
-        "refreshType": 1,
-        "money": 40011,
-        "price": 150000,
-        "chosen": 0,
-        "indirectId": 0
-    },
     {
         "id": 99,
         "goodid": 17052,