diff --git a/shared/resource/jsons/dic_zyz_gk_dungeon.json b/shared/resource/jsons/dic_zyz_gk_dungeon.json
index d395de432..3ea12ddab 100644
--- a/shared/resource/jsons/dic_zyz_gk_dungeon.json
+++ b/shared/resource/jsons/dic_zyz_gk_dungeon.json
@@ -84,7 +84,7 @@
         "recommendedPower": 945781,
         "previousGk": 5002,
         "lvLimted": 45,
-        "heroInUI": "3&2011",
+        "heroInUI": "3&2013",
         "detailUIBg": "DD1_1",
         "iconName": "怒狼洞穴",
         "iconInMap": "spine&map_nulangdongxue",
@@ -116,7 +116,7 @@
         "recommendedPower": 1777965,
         "previousGk": 5003,
         "lvLimted": 53,
-        "heroInUI": "3&2011",
+        "heroInUI": "3&2013",
         "detailUIBg": "DD1_1",
         "iconName": "怒狼洞穴",
         "iconInMap": "spine&map_nulangdongxue",
@@ -148,7 +148,7 @@
         "recommendedPower": 2895977,
         "previousGk": 5004,
         "lvLimted": 59,
-        "heroInUI": "3&2011",
+        "heroInUI": "3&2015",
         "detailUIBg": "DD1_1",
         "iconName": "怒狼洞穴",
         "iconInMap": "spine&map_nulangdongxue",
@@ -244,7 +244,7 @@
         "recommendedPower": 1250017,
         "previousGk": 5011,
         "lvLimted": 49,
-        "heroInUI": "3&2021",
+        "heroInUI": "3&2024",
         "detailUIBg": "1_1",
         "iconName": "虎牢关",
         "iconInMap": "spine&mj_hlg",
@@ -276,7 +276,7 @@
         "recommendedPower": 1958479,
         "previousGk": 5012,
         "lvLimted": 54,
-        "heroInUI": "3&2021",
+        "heroInUI": "3&2024",
         "detailUIBg": "1_1",
         "iconName": "虎牢关",
         "iconInMap": "spine&mj_hlg",
@@ -308,7 +308,7 @@
         "recommendedPower": 3014533,
         "previousGk": 5013,
         "lvLimted": 60,
-        "heroInUI": "3&2021",
+        "heroInUI": "3&2024",
         "detailUIBg": "1_1",
         "iconName": "虎牢关",
         "iconInMap": "spine&mj_hlg",
@@ -404,7 +404,7 @@
         "recommendedPower": 2296310,
         "previousGk": 5021,
         "lvLimted": 58,
-        "heroInUI": "3&2031",
+        "heroInUI": "3&2033",
         "detailUIBg": "1_1",
         "iconName": "徐州曹营",
         "iconInMap": "spine&mj_xzcy",
@@ -436,7 +436,7 @@
         "recommendedPower": 4223099,
         "previousGk": 5022,
         "lvLimted": 67,
-        "heroInUI": "3&2031",
+        "heroInUI": "3&2033",
         "detailUIBg": "1_1",
         "iconName": "徐州曹营",
         "iconInMap": "spine&mj_xzcy",
@@ -468,7 +468,7 @@
         "recommendedPower": 6269995,
         "previousGk": 5023,
         "lvLimted": 82,
-        "heroInUI": "3&2031",
+        "heroInUI": "3&2033",
         "detailUIBg": "1_1",
         "iconName": "徐州曹营",
         "iconInMap": "spine&mj_xzcy",
@@ -498,9 +498,9 @@
         "loseInfoInUI": "我方全部阵亡",
         "cost": 0,
         "recommendedPower": 1359643,
-        "previousGk": 220,
+        "previousGk": 420,
         "lvLimted": 50,
-        "heroInUI": "3&1051",
+        "heroInUI": "3&2041",
         "detailUIBg": "DD1_1",
         "iconName": "乌桓部落",
         "iconInMap": "spine&mj_whbl",
@@ -532,14 +532,14 @@
         "recommendedPower": 2138992,
         "previousGk": 5030,
         "lvLimted": 55,
-        "heroInUI": "3&1051",
+        "heroInUI": "3&2041",
         "detailUIBg": "DD1_1",
         "iconName": "乌桓部落",
         "iconInMap": "spine&mj_whbl",
         "bossSkill": "18&19",
         "movePoint": 474,
         "needPrepare": 1,
-        "gkInfo": "猖狂一时的乌桓人已经被击败，乌桓大营也已经被公孙瓒烧成了一片灰烬，仅剩的乌桓俘虏躲在一边瑟瑟发抖，等待着公孙瓒最后的决断。\r\n“乌桓人，一个不留！”比隆冬大雪还要令乌桓人绝望的声音传来，剩下的乌桓人只能绝望得闭上眼，等待着那一刀的到来。\r\n“当——！”\r\n“公孙将军，无论是为了轻衣还是为了自己的本心，我都不能让您再滥杀下去了！”",
+        "gkInfo": "猖狂一时的乌桓人已经被击败，乌桓大营也已经被公孙瓒烧成了一片灰烬，仅剩的乌桓俘虏躲在一边瑟瑟发抖，等待着公孙瓒最后的决断。\n“乌桓人，一个不留！”比隆冬大雪还要令乌桓人绝望的声音传来，剩下的乌桓人只能绝望得闭上眼，等待着那一刀的到来。\n“当——！”\n“公孙将军，无论是为了轻衣还是为了自己的本心，我都不能让您再滥杀下去了！”",
         "HeroNum": "6&6",
         "difficult": "二"
     },
@@ -564,14 +564,14 @@
         "recommendedPower": 3497266,
         "previousGk": 5031,
         "lvLimted": 64,
-        "heroInUI": "3&1051",
+        "heroInUI": "3&2043",
         "detailUIBg": "DD1_1",
         "iconName": "乌桓部落",
         "iconInMap": "spine&mj_whbl",
         "bossSkill": "18&19",
         "movePoint": 474,
         "needPrepare": 1,
-        "gkInfo": "猖狂一时的乌桓人已经被击败，乌桓大营也已经被公孙瓒烧成了一片灰烬，仅剩的乌桓俘虏躲在一边瑟瑟发抖，等待着公孙瓒最后的决断。\r\n“乌桓人，一个不留！”比隆冬大雪还要令乌桓人绝望的声音传来，剩下的乌桓人只能绝望得闭上眼，等待着那一刀的到来。\r\n“当——！”\r\n“公孙将军，无论是为了轻衣还是为了自己的本心，我都不能让您再滥杀下去了！”",
+        "gkInfo": "猖狂一时的乌桓人已经被击败，乌桓大营也已经被公孙瓒烧成了一片灰烬，仅剩的乌桓俘虏躲在一边瑟瑟发抖，等待着公孙瓒最后的决断。\n“乌桓人，一个不留！”比隆冬大雪还要令乌桓人绝望的声音传来，剩下的乌桓人只能绝望得闭上眼，等待着那一刀的到来。\n“当——！”\n“公孙将军，无论是为了轻衣还是为了自己的本心，我都不能让您再滥杀下去了！”",
         "HeroNum": "6&6",
         "difficult": "三"
     },
@@ -596,14 +596,14 @@
         "recommendedPower": 5066167,
         "previousGk": 5032,
         "lvLimted": 76,
-        "heroInUI": "3&1051",
+        "heroInUI": "3&2043",
         "detailUIBg": "DD1_1",
         "iconName": "乌桓部落",
         "iconInMap": "spine&mj_whbl",
         "bossSkill": "18&19",
         "movePoint": 474,
         "needPrepare": 1,
-        "gkInfo": "猖狂一时的乌桓人已经被击败，乌桓大营也已经被公孙瓒烧成了一片灰烬，仅剩的乌桓俘虏躲在一边瑟瑟发抖，等待着公孙瓒最后的决断。\r\n“乌桓人，一个不留！”比隆冬大雪还要令乌桓人绝望的声音传来，剩下的乌桓人只能绝望得闭上眼，等待着那一刀的到来。\r\n“当——！”\r\n“公孙将军，无论是为了轻衣还是为了自己的本心，我都不能让您再滥杀下去了！”",
+        "gkInfo": "猖狂一时的乌桓人已经被击败，乌桓大营也已经被公孙瓒烧成了一片灰烬，仅剩的乌桓俘虏躲在一边瑟瑟发抖，等待着公孙瓒最后的决断。\n“乌桓人，一个不留！”比隆冬大雪还要令乌桓人绝望的声音传来，剩下的乌桓人只能绝望得闭上眼，等待着那一刀的到来。\n“当——！”\n“公孙将军，无论是为了轻衣还是为了自己的本心，我都不能让您再滥杀下去了！”",
         "HeroNum": "6&6",
         "difficult": "四"
     },
@@ -628,14 +628,14 @@
         "recommendedPower": 7531195,
         "previousGk": 5033,
         "lvLimted": 91,
-        "heroInUI": "3&1051",
+        "heroInUI": "3&2044",
         "detailUIBg": "DD1_1",
         "iconName": "乌桓部落",
         "iconInMap": "spine&mj_whbl",
         "bossSkill": "18&19",
         "movePoint": 474,
         "needPrepare": 1,
-        "gkInfo": "猖狂一时的乌桓人已经被击败，乌桓大营也已经被公孙瓒烧成了一片灰烬，仅剩的乌桓俘虏躲在一边瑟瑟发抖，等待着公孙瓒最后的决断。\r\n“乌桓人，一个不留！”比隆冬大雪还要令乌桓人绝望的声音传来，剩下的乌桓人只能绝望得闭上眼，等待着那一刀的到来。\r\n“当——！”\r\n“公孙将军，无论是为了轻衣还是为了自己的本心，我都不能让您再滥杀下去了！”",
+        "gkInfo": "猖狂一时的乌桓人已经被击败，乌桓大营也已经被公孙瓒烧成了一片灰烬，仅剩的乌桓俘虏躲在一边瑟瑟发抖，等待着公孙瓒最后的决断。\n“乌桓人，一个不留！”比隆冬大雪还要令乌桓人绝望的声音传来，剩下的乌桓人只能绝望得闭上眼，等待着那一刀的到来。\n“当——！”\n“公孙将军，无论是为了轻衣还是为了自己的本心，我都不能让您再滥杀下去了！”",
         "HeroNum": "6&6",
         "difficult": "五"
     },
@@ -658,9 +658,9 @@
         "loseInfoInUI": "我方全部阵亡",
         "cost": 0,
         "recommendedPower": 2220584,
-        "previousGk": 304,
+        "previousGk": 514,
         "lvLimted": 57,
-        "heroInUI": "3&5",
+        "heroInUI": "3&2051",
         "detailUIBg": "dengeon1",
         "iconName": "颍川书院",
         "iconInMap": "spine&mj_ycsy",
@@ -692,7 +692,7 @@
         "recommendedPower": 3210668,
         "previousGk": 5040,
         "lvLimted": 63,
-        "heroInUI": "3&5",
+        "heroInUI": "3&2051",
         "detailUIBg": "dengeon1",
         "iconName": "颍川书院",
         "iconInMap": "spine&mj_ycsy",
@@ -724,7 +724,7 @@
         "recommendedPower": 4763623,
         "previousGk": 5041,
         "lvLimted": 69,
-        "heroInUI": "3&5",
+        "heroInUI": "3&2151",
         "detailUIBg": "dengeon1",
         "iconName": "颍川书院",
         "iconInMap": "spine&mj_ycsy",
@@ -756,7 +756,7 @@
         "recommendedPower": 6799660,
         "previousGk": 5042,
         "lvLimted": 88,
-        "heroInUI": "3&5",
+        "heroInUI": "3&2151",
         "detailUIBg": "dengeon1",
         "iconName": "颍川书院",
         "iconInMap": "spine&mj_ycsy",
@@ -788,7 +788,7 @@
         "recommendedPower": 8982076,
         "previousGk": 5043,
         "lvLimted": 100,
-        "heroInUI": "3&5",
+        "heroInUI": "3&2151",
         "detailUIBg": "dengeon1",
         "iconName": "颍川书院",
         "iconInMap": "spine&mj_ycsy",
@@ -818,7 +818,7 @@
         "loseInfoInUI": "我方全部阵亡",
         "cost": 0,
         "recommendedPower": 2847048,
-        "previousGk": 310,
+        "previousGk": 606,
         "lvLimted": 61,
         "heroInUI": "3&2061",
         "detailUIBg": "dengeon1",
@@ -884,7 +884,7 @@
         "recommendedPower": 5961801,
         "previousGk": 5051,
         "lvLimted": 79,
-        "heroInUI": "3&2061",
+        "heroInUI": "3&2161",
         "detailUIBg": "dengeon1",
         "iconName": "卧龙岗",
         "iconInMap": "spine&mj_wlg",
@@ -916,7 +916,7 @@
         "recommendedPower": 8244752,
         "previousGk": 5052,
         "lvLimted": 94,
-        "heroInUI": "3&2061",
+        "heroInUI": "3&2161",
         "detailUIBg": "dengeon1",
         "iconName": "卧龙岗",
         "iconInMap": "spine&mj_wlg",
@@ -948,7 +948,7 @@
         "recommendedPower": 9331370,
         "previousGk": 5053,
         "lvLimted": 100,
-        "heroInUI": "3&2061",
+        "heroInUI": "3&2161",
         "detailUIBg": "dengeon1",
         "iconName": "卧龙岗",
         "iconInMap": "spine&mj_wlg",
@@ -978,7 +978,7 @@
         "loseInfoInUI": "我方全部阵亡",
         "cost": 0,
         "recommendedPower": 5443864,
-        "previousGk": 320,
+        "previousGk": 721,
         "lvLimted": 71,
         "heroInUI": "3&2071",
         "detailUIBg": "dengeon1",
@@ -1044,7 +1044,7 @@
         "recommendedPower": 8115084,
         "previousGk": 5061,
         "lvLimted": 85,
-        "heroInUI": "3&2071",
+        "heroInUI": "3&2073",
         "detailUIBg": "dengeon1",
         "iconName": "樊楼倩影",
         "iconInMap": "spine&mj_fjz",
@@ -1076,7 +1076,7 @@
         "recommendedPower": 8595950,
         "previousGk": 5062,
         "lvLimted": 97,
-        "heroInUI": "3&2071",
+        "heroInUI": "3&2073",
         "detailUIBg": "dengeon1",
         "iconName": "樊楼倩影",
         "iconInMap": "spine&mj_fjz",
@@ -1108,7 +1108,7 @@
         "recommendedPower": 9830275,
         "previousGk": 5063,
         "lvLimted": 100,
-        "heroInUI": "3&2071",
+        "heroInUI": "3&2075",
         "detailUIBg": "dengeon1",
         "iconName": "樊楼倩影",
         "iconInMap": "spine&mj_fjz",
diff --git a/shared/resource/jsons/dic_zyz_gk_guildActivity.json b/shared/resource/jsons/dic_zyz_gk_guildActivity.json
index 7ef4a8453..18f321691 100644
--- a/shared/resource/jsons/dic_zyz_gk_guildActivity.json
+++ b/shared/resource/jsons/dic_zyz_gk_guildActivity.json
@@ -4,7 +4,7 @@
         "dispatchJsonId": 7001,
         "script_id": "S_7001",
         "warType": 10,
-        "gk_name": "蛮夷入侵",
+        "gk_name": "军团活动&蛮夷入侵",
         "bg_img": 7001,
         "mapid": 7001,
         "lvLimted": 25,
@@ -20,7 +20,7 @@
         "dispatchJsonId": 7002,
         "script_id": "S_7002",
         "warType": 10,
-        "gk_name": "诸侯混战（小）",
+        "gk_name": "军团活动&诸侯混战（小）",
         "bg_img": 7002,
         "mapid": 7002,
         "lvLimted": 25,
@@ -36,7 +36,7 @@
         "dispatchJsonId": 7003,
         "script_id": "S_7003",
         "warType": 10,
-        "gk_name": "诸侯混战（中）",
+        "gk_name": "军团活动&诸侯混战（中）",
         "bg_img": 7003,
         "mapid": 7003,
         "lvLimted": 25,
@@ -52,7 +52,7 @@
         "dispatchJsonId": 7004,
         "script_id": "S_7004",
         "warType": 10,
-        "gk_name": "诸侯混战（大）",
+        "gk_name": "军团活动&诸侯混战（大）",
         "bg_img": 7004,
         "mapid": 7004,
         "lvLimted": 25,
diff --git a/shared/resource/warJsons/4001.json b/shared/resource/warJsons/4001.json
index 7186598b5..f912a5438 100644
--- a/shared/resource/warJsons/4001.json
+++ b/shared/resource/warJsons/4001.json
@@ -6,7 +6,7 @@
         "dataId": 0,
         "relation": 0,
         "outIndex": 0,
-        "dirction": 2,
+        "dirction": 1,
         "x": 7,
         "y": 3,
         "var": 501,
@@ -27,7 +27,7 @@
         "dataId": 0,
         "relation": 0,
         "outIndex": 1,
-        "dirction": 2,
+        "dirction": 1,
         "x": 8,
         "y": 3,
         "var": 502,
@@ -48,7 +48,7 @@
         "dataId": 0,
         "relation": 0,
         "outIndex": 2,
-        "dirction": 2,
+        "dirction": 1,
         "x": 6,
         "y": 2,
         "var": 503,
@@ -69,7 +69,7 @@
         "dataId": 0,
         "relation": 0,
         "outIndex": 3,
-        "dirction": 2,
+        "dirction": 1,
         "x": 7,
         "y": 2,
         "var": 504,
@@ -90,7 +90,7 @@
         "dataId": 0,
         "relation": 0,
         "outIndex": 4,
-        "dirction": 2,
+        "dirction": 1,
         "x": 6,
         "y": 3,
         "var": 505,
@@ -111,7 +111,7 @@
         "dataId": 0,
         "relation": 0,
         "outIndex": 5,
-        "dirction": 2,
+        "dirction": 1,
         "x": 5,
         "y": 4,
         "var": 506,
@@ -128,14 +128,14 @@
     {
         "warId": 4001,
         "actorName": "典韦",
-        "actorId": 307,
+        "actorId": 335,
         "dataId": 2001,
         "relation": 2,
         "outIndex": 0,
         "dirction": 1,
         "x": 7,
         "y": 6,
-        "var": 1501,
+        "var": 2001,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
@@ -156,7 +156,7 @@
         "dirction": 1,
         "x": 6,
         "y": 6,
-        "var": 1502,
+        "var": 2002,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
@@ -177,7 +177,7 @@
         "dirction": 1,
         "x": 8,
         "y": 7,
-        "var": 1503,
+        "var": 2003,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
@@ -198,7 +198,7 @@
         "dirction": 1,
         "x": 6,
         "y": 8,
-        "var": 1504,
+        "var": 2004,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
@@ -219,7 +219,7 @@
         "dirction": 1,
         "x": 7,
         "y": 7,
-        "var": 1505,
+        "var": 2005,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,
@@ -240,7 +240,7 @@
         "dirction": 1,
         "x": 9,
         "y": 7,
-        "var": 1506,
+        "var": 2006,
         "lv": 20,
         "hide": 0,
         "initial_ai": 1,