diff --git a/shared/resource/jsons/dic_zyz_gk_newhero.json b/shared/resource/jsons/dic_zyz_gk_newhero.json
index 5d304d5cd..bfe6174a3 100644
--- a/shared/resource/jsons/dic_zyz_gk_newhero.json
+++ b/shared/resource/jsons/dic_zyz_gk_newhero.json
@@ -1,352 +1,247 @@
 [
     {
-        "Index": 1,
-        "war_id": 61001,
-        "dispatchJsonId": 61001,
-        "bg_img_id": 541,
-        "script_id": 0,
-        "fixReward": "42002&10|40009&200|17047&1",
-        "jackpotReward": "50001&1|50007&1|50013&1|50019&1|50025&1|50031&1|50037&1|50043&2",
+        "war_id": 52001,
+        "dispatchJsonId": 52001,
+        "bg_img": 52001,
+        "mapid": 52001,
+        "script_id": "S_52001",
+        "fixReward": "&",
+        "conditionReward": "&",
+        "RandomReward": "&",
         "warType": 18,
-        "gk_name": "武将一关卡1",
-        "lvLimted": 1,
-        "victoryInfoInUI": "消灭所有敌军",
-        "loseInfoInUI": "\r\n我方全部阵亡",
-        "cost": 0,
-        "iconInMap": "zixunbao1&",
-        "iconName": "新将活动",
-        "detailUIBg": "&",
+        "gk_name": "新将&月夜除贼",
         "kingExp": 0,
-        "recommendedPower": 0,
-        "previousGk": 0,
-        "movePoint": "&",
-        "heroInUI": "1&1001|1&1004|1&312|1&1041|1&1039",
-        "needPrepare": 1,
-        "turnLimted": 20
+        "turnLimted": 20,
+        "forcedCharactor": "&",
+        "fobiddenCharactor": "&",
+        "victoryInfoInUI": "消灭所有敌军",
+        "loseInfoInUI": "我方全部阵亡",
+        "cost": 0,
+        "recommendedPower": 71700,
+        "previousGk": 104,
+        "lvLimted": "city&12",
+        "heroInUI": "3&27",
+        "detailUIBg": "&",
+        "iconName": "&",
+        "iconInMap": "city&12",
+        "bossSkill": 0,
+        "movePoint": 0,
+        "needPrepare": 0,
+        "gkInfo": "马超和马云禄初次登场，消灭盘踞陇西商道的马贼",
+        "HeroNum": "1&10",
+        "difficult": "一",
+        "__EMPTY": 0,
+        "__EMPTY_1": 0,
+        "__EMPTY_2": 0
     },
     {
-        "Index": 2,
-        "war_id": 61002,
-        "dispatchJsonId": 61002,
-        "bg_img_id": 541,
-        "script_id": 0,
-        "fixReward": "42002&10|40009&200|17047&1",
-        "jackpotReward": "50001&1|50007&1|50013&1|50019&1|50025&1|50031&1|50037&1|50043&2",
+        "war_id": 52002,
+        "dispatchJsonId": 52002,
+        "bg_img": 52002,
+        "mapid": 52002,
+        "script_id": "S_52002",
+        "fixReward": "&",
+        "conditionReward": "&",
+        "RandomReward": "&",
         "warType": 18,
-        "gk_name": "武将一关卡2",
-        "lvLimted": 1,
-        "victoryInfoInUI": "消灭所有敌军",
-        "loseInfoInUI": "\r\n我方全部阵亡",
-        "cost": 0,
-        "iconInMap": "zixunbao1&",
-        "iconName": "新将活动",
-        "detailUIBg": "&",
+        "gk_name": "新将&幼虎初阵",
         "kingExp": 0,
-        "recommendedPower": 0,
-        "previousGk": 0,
-        "movePoint": "&",
-        "heroInUI": "1&1001|1&1004|1&312|1&1041|1&1039",
-        "needPrepare": 1,
-        "turnLimted": 20
+        "turnLimted": 20,
+        "forcedCharactor": "&",
+        "fobiddenCharactor": "&",
+        "victoryInfoInUI": "安全撤退",
+        "loseInfoInUI": "马腾或韩遂阵亡",
+        "cost": 0,
+        "recommendedPower": 74100,
+        "previousGk": 52001,
+        "lvLimted": "city&11",
+        "heroInUI": "3&1180",
+        "detailUIBg": "&",
+        "iconName": "&",
+        "iconInMap": "city&11",
+        "bossSkill": 0,
+        "movePoint": 0,
+        "needPrepare": 0,
+        "gkInfo": "马超第一次上阵，与父亲一起讨伐李傕",
+        "HeroNum": "1&10",
+        "difficult": "二",
+        "__EMPTY": 0,
+        "__EMPTY_1": 0,
+        "__EMPTY_2": 0
     },
     {
-        "Index": 3,
-        "war_id": 61003,
-        "dispatchJsonId": 61003,
-        "bg_img_id": 541,
-        "script_id": 0,
-        "fixReward": "42002&10|40009&200|17047&1",
-        "jackpotReward": "50001&1|50007&1|50013&1|50019&1|50025&1|50031&1|50037&1|50043&2",
+        "war_id": 52003,
+        "dispatchJsonId": 52003,
+        "bg_img": 52003,
+        "mapid": 52003,
+        "script_id": "S_52003",
+        "fixReward": "&",
+        "conditionReward": "&",
+        "RandomReward": "&",
         "warType": 18,
-        "gk_name": "武将一关卡3",
-        "lvLimted": 1,
-        "victoryInfoInUI": "消灭所有敌军",
-        "loseInfoInUI": "\r\n我方全部阵亡",
-        "cost": 0,
-        "iconInMap": "zixunbao1&",
-        "iconName": "新将活动",
-        "detailUIBg": "&",
+        "gk_name": "新将&计下长安",
         "kingExp": 0,
-        "recommendedPower": 0,
-        "previousGk": 0,
-        "movePoint": "&",
-        "heroInUI": "1&1001|1&1004|1&312|1&1041|1&1039",
-        "needPrepare": 1,
-        "turnLimted": 20
+        "turnLimted": 20,
+        "forcedCharactor": "&",
+        "fobiddenCharactor": "&",
+        "victoryInfoInUI": "击破钟繇",
+        "loseInfoInUI": "我方全部阵亡&蔡琰阵亡",
+        "cost": 0,
+        "recommendedPower": 76600,
+        "previousGk": 52002,
+        "lvLimted": "city&3",
+        "heroInUI": "3&8",
+        "detailUIBg": "&",
+        "iconName": "&",
+        "iconInMap": "city&3",
+        "bossSkill": 0,
+        "movePoint": 0,
+        "needPrepare": 0,
+        "gkInfo": "为报父仇，马超从西凉起兵，和叔父韩遂一道讨伐曹操，面前的是坚城长安",
+        "HeroNum": "1&10",
+        "difficult": "三",
+        "__EMPTY": 0,
+        "__EMPTY_1": 0,
+        "__EMPTY_2": 0
     },
     {
-        "Index": 4,
-        "war_id": 61004,
-        "dispatchJsonId": 61004,
-        "bg_img_id": 541,
-        "script_id": 0,
-        "fixReward": "42002&10|40009&200|17047&1",
-        "jackpotReward": "50001&1|50007&1|50013&1|50019&1|50025&1|50031&1|50037&1|50043&2",
+        "war_id": 52004,
+        "dispatchJsonId": 52004,
+        "bg_img": 52004,
+        "mapid": 52004,
+        "script_id": "S_52004",
+        "fixReward": "&",
+        "conditionReward": "&",
+        "RandomReward": "&",
         "warType": 18,
-        "gk_name": "武将一关卡4",
-        "lvLimted": 1,
-        "victoryInfoInUI": "消灭所有敌军",
-        "loseInfoInUI": "\r\n我方全部阵亡",
-        "cost": 0,
-        "iconInMap": "zixunbao1&",
-        "iconName": "新将活动",
-        "detailUIBg": "&",
+        "gk_name": "新将&夺取潼关",
         "kingExp": 0,
-        "recommendedPower": 0,
-        "previousGk": 0,
-        "movePoint": "&",
-        "heroInUI": "1&1001|1&1004|1&312|1&1041|1&1039",
-        "needPrepare": 1,
-        "turnLimted": 20
+        "turnLimted": 20,
+        "forcedCharactor": "&",
+        "fobiddenCharactor": "&",
+        "victoryInfoInUI": "消灭所有敌军",
+        "loseInfoInUI": "我方全部阵亡&山贼攻破真定城",
+        "cost": 0,
+        "recommendedPower": 81500,
+        "previousGk": 52003,
+        "lvLimted": "city&52",
+        "heroInUI": "3&1188",
+        "detailUIBg": "&",
+        "iconName": "&",
+        "iconInMap": "city&52",
+        "bossSkill": 0,
+        "movePoint": 0,
+        "needPrepare": 0,
+        "gkInfo": "横亘在面前的是潼关，潼关守将曹洪和徐晃",
+        "HeroNum": "1&10",
+        "difficult": "四",
+        "__EMPTY": 0,
+        "__EMPTY_1": 0,
+        "__EMPTY_2": 0
     },
     {
-        "Index": 5,
-        "war_id": 61005,
-        "dispatchJsonId": 61005,
-        "bg_img_id": 541,
-        "script_id": 0,
-        "fixReward": "42002&10|40009&200|17047&1",
-        "jackpotReward": "50001&1|50007&1|50013&1|50019&1|50025&1|50031&1|50037&1|50043&2",
+        "war_id": 52005,
+        "dispatchJsonId": 52005,
+        "bg_img": 52005,
+        "mapid": 52005,
+        "script_id": "S_52005",
+        "fixReward": "&",
+        "conditionReward": "&",
+        "RandomReward": "&",
         "warType": 18,
-        "gk_name": "武将一关卡5",
-        "lvLimted": 1,
-        "victoryInfoInUI": "消灭所有敌军",
-        "loseInfoInUI": "\r\n我方全部阵亡",
-        "cost": 0,
-        "iconInMap": "zixunbao1&",
-        "iconName": "新将活动",
-        "detailUIBg": "&",
+        "gk_name": "新将&割须弃袍",
         "kingExp": 0,
-        "recommendedPower": 0,
-        "previousGk": 0,
-        "movePoint": "&",
-        "heroInUI": "1&1001|1&1004|1&312|1&1041|1&1039",
-        "needPrepare": 1,
-        "turnLimted": 20
+        "turnLimted": 20,
+        "forcedCharactor": "&",
+        "fobiddenCharactor": "&",
+        "victoryInfoInUI": "击破曹操",
+        "loseInfoInUI": "我方全部阵亡&马超阵亡",
+        "cost": 0,
+        "recommendedPower": 131500,
+        "previousGk": 52004,
+        "lvLimted": "city&53",
+        "heroInUI": "3&1",
+        "detailUIBg": "&",
+        "iconName": "&",
+        "iconInMap": "city&53",
+        "bossSkill": 0,
+        "movePoint": 0,
+        "needPrepare": 0,
+        "gkInfo": "横亘在面前的是潼关，潼关守将曹洪和徐晃",
+        "HeroNum": "1&10",
+        "difficult": "五",
+        "__EMPTY": 0,
+        "__EMPTY_1": 0,
+        "__EMPTY_2": 0
     },
     {
-        "Index": 6,
-        "war_id": 61006,
-        "dispatchJsonId": 61006,
-        "bg_img_id": 541,
-        "script_id": 0,
-        "fixReward": "42002&10|40009&200|17047&1",
-        "jackpotReward": "50001&1|50007&1|50013&1|50019&1|50025&1|50031&1|50037&1|50043&2",
+        "war_id": 52006,
+        "dispatchJsonId": 52006,
+        "bg_img": 52006,
+        "mapid": 52006,
+        "script_id": "S_52006",
+        "fixReward": "&",
+        "conditionReward": "&",
+        "RandomReward": "&",
         "warType": 18,
-        "gk_name": "武将一关卡6",
-        "lvLimted": 1,
-        "victoryInfoInUI": "消灭所有敌军",
-        "loseInfoInUI": "\r\n我方全部阵亡",
-        "cost": 0,
-        "iconInMap": "zixunbao1&",
-        "iconName": "新将活动",
-        "detailUIBg": "&",
+        "gk_name": "新将&夺船避乱",
         "kingExp": 0,
-        "recommendedPower": 0,
-        "previousGk": 0,
-        "movePoint": "&",
-        "heroInUI": "1&1001|1&1004|1&312|1&1041|1&1039",
-        "needPrepare": 1,
-        "turnLimted": 20
+        "turnLimted": 20,
+        "forcedCharactor": "&",
+        "fobiddenCharactor": "&",
+        "victoryInfoInUI": "击破曹操",
+        "loseInfoInUI": "我方全部阵亡&马超阵亡",
+        "cost": 0,
+        "recommendedPower": 135300,
+        "previousGk": 52005,
+        "lvLimted": "city&17",
+        "heroInUI": "3&1",
+        "detailUIBg": "&",
+        "iconName": "&",
+        "iconInMap": "city&17",
+        "bossSkill": 0,
+        "movePoint": 0,
+        "needPrepare": 0,
+        "gkInfo": "横亘在面前的是潼关，潼关守将曹洪和徐晃",
+        "HeroNum": "1&10",
+        "difficult": "六",
+        "__EMPTY": 0,
+        "__EMPTY_1": 0,
+        "__EMPTY_2": 0
     },
     {
-        "Index": 7,
-        "war_id": 61007,
-        "dispatchJsonId": 61007,
-        "bg_img_id": 541,
-        "script_id": 0,
-        "fixReward": "42002&10|40009&200|17047&1",
-        "jackpotReward": "50001&1|50007&1|50013&1|50019&1|50025&1|50031&1|50037&1|50043&2",
+        "war_id": 52007,
+        "dispatchJsonId": 52007,
+        "bg_img": 52007,
+        "mapid": 52007,
+        "script_id": "S_52007",
+        "fixReward": "&",
+        "conditionReward": "&",
+        "RandomReward": "&",
         "warType": 18,
-        "gk_name": "武将一关卡7",
-        "lvLimted": 1,
-        "victoryInfoInUI": "消灭所有敌军",
-        "loseInfoInUI": "\r\n我方全部阵亡",
-        "cost": 0,
-        "iconInMap": "zixunbao1&",
-        "iconName": "新将活动",
-        "detailUIBg": "&",
+        "gk_name": "新将&渭水鏖战",
         "kingExp": 0,
-        "recommendedPower": 0,
-        "previousGk": 0,
-        "movePoint": "&",
-        "heroInUI": "1&1001|1&1004|1&312|1&1041|1&1039",
-        "needPrepare": 1,
-        "turnLimted": 20
-    },
-    {
-        "Index": 8,
-        "war_id": 62001,
-        "dispatchJsonId": 62001,
-        "bg_img_id": 541,
-        "script_id": 0,
-        "fixReward": "42002&10|40009&200|17047&1",
-        "jackpotReward": "50001&1|50007&1|50013&1|50019&1|50025&1|50031&1|50037&1|50043&2",
-        "warType": 18,
-        "gk_name": "武将二关卡1",
-        "lvLimted": 1,
+        "turnLimted": 20,
+        "forcedCharactor": "&",
+        "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
-        "loseInfoInUI": "\r\n我方全部阵亡",
+        "loseInfoInUI": "我方全部阵亡&马超阵亡",
         "cost": 0,
-        "iconInMap": "zixunbao1&",
-        "iconName": "新将活动",
+        "recommendedPower": 139100,
+        "previousGk": 52006,
+        "lvLimted": "city&53",
+        "heroInUI": "3&1189",
         "detailUIBg": "&",
-        "kingExp": 0,
-        "recommendedPower": 0,
-        "previousGk": 0,
-        "movePoint": "&",
-        "heroInUI": "1&1001|1&1004|1&312|1&1041|1&1039",
-        "needPrepare": 1,
-        "turnLimted": 20
-    },
-    {
-        "Index": 9,
-        "war_id": 62002,
-        "dispatchJsonId": 62002,
-        "bg_img_id": 541,
-        "script_id": 0,
-        "fixReward": "42002&10|40009&200|17047&1",
-        "jackpotReward": "50001&1|50007&1|50013&1|50019&1|50025&1|50031&1|50037&1|50043&2",
-        "warType": 18,
-        "gk_name": "武将二关卡2",
-        "lvLimted": 1,
-        "victoryInfoInUI": "消灭所有敌军",
-        "loseInfoInUI": "\r\n我方全部阵亡",
-        "cost": 0,
-        "iconInMap": "zixunbao1&",
-        "iconName": "新将活动",
-        "detailUIBg": "&",
-        "kingExp": 0,
-        "recommendedPower": 0,
-        "previousGk": 0,
-        "movePoint": "&",
-        "heroInUI": "1&1001|1&1004|1&312|1&1041|1&1039",
-        "needPrepare": 1,
-        "turnLimted": 20
-    },
-    {
-        "Index": 10,
-        "war_id": 62003,
-        "dispatchJsonId": 62003,
-        "bg_img_id": 541,
-        "script_id": 0,
-        "fixReward": "42002&10|40009&200|17047&1",
-        "jackpotReward": "50001&1|50007&1|50013&1|50019&1|50025&1|50031&1|50037&1|50043&2",
-        "warType": 18,
-        "gk_name": "武将二关卡3",
-        "lvLimted": 1,
-        "victoryInfoInUI": "消灭所有敌军",
-        "loseInfoInUI": "\r\n我方全部阵亡",
-        "cost": 0,
-        "iconInMap": "zixunbao1&",
-        "iconName": "新将活动",
-        "detailUIBg": "&",
-        "kingExp": 0,
-        "recommendedPower": 0,
-        "previousGk": 0,
-        "movePoint": "&",
-        "heroInUI": "1&1001|1&1004|1&312|1&1041|1&1039",
-        "needPrepare": 1,
-        "turnLimted": 20
-    },
-    {
-        "Index": 11,
-        "war_id": 62004,
-        "dispatchJsonId": 62004,
-        "bg_img_id": 541,
-        "script_id": 0,
-        "fixReward": "42002&10|40009&200|17047&1",
-        "jackpotReward": "50001&1|50007&1|50013&1|50019&1|50025&1|50031&1|50037&1|50043&2",
-        "warType": 18,
-        "gk_name": "武将二关卡4",
-        "lvLimted": 1,
-        "victoryInfoInUI": "消灭所有敌军",
-        "loseInfoInUI": "\r\n我方全部阵亡",
-        "cost": 0,
-        "iconInMap": "zixunbao1&",
-        "iconName": "新将活动",
-        "detailUIBg": "&",
-        "kingExp": 0,
-        "recommendedPower": 0,
-        "previousGk": 0,
-        "movePoint": "&",
-        "heroInUI": "1&1001|1&1004|1&312|1&1041|1&1039",
-        "needPrepare": 1,
-        "turnLimted": 20
-    },
-    {
-        "Index": 12,
-        "war_id": 62005,
-        "dispatchJsonId": 62005,
-        "bg_img_id": 541,
-        "script_id": 0,
-        "fixReward": "42002&10|40009&200|17047&1",
-        "jackpotReward": "50001&1|50007&1|50013&1|50019&1|50025&1|50031&1|50037&1|50043&2",
-        "warType": 18,
-        "gk_name": "武将二关卡5",
-        "lvLimted": 1,
-        "victoryInfoInUI": "消灭所有敌军",
-        "loseInfoInUI": "\r\n我方全部阵亡",
-        "cost": 0,
-        "iconInMap": "zixunbao1&",
-        "iconName": "新将活动",
-        "detailUIBg": "&",
-        "kingExp": 0,
-        "recommendedPower": 0,
-        "previousGk": 0,
-        "movePoint": "&",
-        "heroInUI": "1&1001|1&1004|1&312|1&1041|1&1039",
-        "needPrepare": 1,
-        "turnLimted": 20
-    },
-    {
-        "Index": 13,
-        "war_id": 62006,
-        "dispatchJsonId": 62006,
-        "bg_img_id": 541,
-        "script_id": 0,
-        "fixReward": "42002&10|40009&200|17047&1",
-        "jackpotReward": "50001&1|50007&1|50013&1|50019&1|50025&1|50031&1|50037&1|50043&2",
-        "warType": 18,
-        "gk_name": "武将二关卡6",
-        "lvLimted": 1,
-        "victoryInfoInUI": "消灭所有敌军",
-        "loseInfoInUI": "\r\n我方全部阵亡",
-        "cost": 0,
-        "iconInMap": "zixunbao1&",
-        "iconName": "新将活动",
-        "detailUIBg": "&",
-        "kingExp": 0,
-        "recommendedPower": 0,
-        "previousGk": 0,
-        "movePoint": "&",
-        "heroInUI": "1&1001|1&1004|1&312|1&1041|1&1039",
-        "needPrepare": 1,
-        "turnLimted": 20
-    },
-    {
-        "Index": 14,
-        "war_id": 62007,
-        "dispatchJsonId": 62007,
-        "bg_img_id": 541,
-        "script_id": 0,
-        "fixReward": "42002&10|40009&200|17047&1",
-        "jackpotReward": "50001&1|50007&1|50013&1|50019&1|50025&1|50031&1|50037&1|50043&2",
-        "warType": 18,
-        "gk_name": "武将二关卡7",
-        "lvLimted": 1,
-        "victoryInfoInUI": "消灭所有敌军",
-        "loseInfoInUI": "\r\n我方全部阵亡",
-        "cost": 0,
-        "iconInMap": "zixunbao1&",
-        "iconName": "新将活动",
-        "detailUIBg": "&",
-        "kingExp": 0,
-        "recommendedPower": 0,
-        "previousGk": 0,
-        "movePoint": "&",
-        "heroInUI": "1&1001|1&1004|1&312|1&1041|1&1039",
-        "needPrepare": 1,
-        "turnLimted": 20
+        "iconName": "&",
+        "iconInMap": "city&53",
+        "bossSkill": 0,
+        "movePoint": 0,
+        "needPrepare": 0,
+        "gkInfo": "横亘在面前的是潼关，潼关守将曹洪和徐晃",
+        "HeroNum": "1&10",
+        "difficult": "七",
+        "__EMPTY": 0,
+        "__EMPTY_1": 0,
+        "__EMPTY_2": 0
     }
 ]
\ No newline at end of file