diff --git a/shared/resource/jsons/dic_zyz_gk_main.json b/shared/resource/jsons/dic_zyz_gk_main.json
index a54c81efd..13d7680da 100644
--- a/shared/resource/jsons/dic_zyz_gk_main.json
+++ b/shared/resource/jsons/dic_zyz_gk_main.json
@@ -3,7 +3,7 @@
         "war_id": 101,
         "dispatchJsonId": 101,
         "bg_img_id": 101,
-        "chapter": 1,
+        "chapter": 0,
         "script_id": "R_101&S_101&RE_101",
         "fixReward": "31001&1000",
         "conditionReward": "1&1&0|31002&50&0|31002&100&1",
@@ -21,8 +21,8 @@
         "cost": 0,
         "iconInMap": "&",
         "iconName": "&",
-        "heroInUI": "1&1008",
-        "detailUIBg": "1_1",
+        "heroInUI": "1&19",
+        "detailUIBg": "0_1",
         "recommendedPower": 0,
         "previousGk": 0,
         "relatedEliteGk": 0,
@@ -32,7 +32,7 @@
         "war_id": 102,
         "dispatchJsonId": 102,
         "bg_img_id": 603,
-        "chapter": 1,
+        "chapter": 0,
         "script_id": "R_102&S_102&RE_102",
         "fixReward": "31001&1001",
         "conditionReward": "1&1&0|31002&50&0|31002&100&1",
@@ -50,8 +50,8 @@
         "cost": 0,
         "iconInMap": "&",
         "iconName": "&",
-        "heroInUI": "1&1008",
-        "detailUIBg": "1_1",
+        "heroInUI": "1&19",
+        "detailUIBg": "0_1",
         "recommendedPower": 0,
         "previousGk": 101,
         "relatedEliteGk": 0,
@@ -61,7 +61,7 @@
         "war_id": 103,
         "dispatchJsonId": 103,
         "bg_img_id": 101,
-        "chapter": 1,
+        "chapter": 0,
         "script_id": "R_103&S_103&RE_103",
         "fixReward": "31001&1002",
         "conditionReward": "1&1&0|31002&50&0|31002&100&1",
@@ -79,8 +79,8 @@
         "cost": 0,
         "iconInMap": "&",
         "iconName": "&",
-        "heroInUI": "1&1008",
-        "detailUIBg": "1_1",
+        "heroInUI": "1&19",
+        "detailUIBg": "0_1",
         "recommendedPower": 0,
         "previousGk": 102,
         "relatedEliteGk": 0,
diff --git a/shared/resource/jsons/dic_zyz_hero.json b/shared/resource/jsons/dic_zyz_hero.json
index 140cf5257..187571d08 100644
--- a/shared/resource/jsons/dic_zyz_hero.json
+++ b/shared/resource/jsons/dic_zyz_hero.json
@@ -2669,17 +2669,28 @@
     },
     {
         "heroId": 59,
+<<<<<<< Updated upstream
         "spineName": "wangyue",
         "rSpineName": "&",
         "name": "童渊",
         "face_id": "wangyue",
+=======
+        "spineName": "tongyuan",
+        "rSpineName": "&",
+        "name": "童渊",
+        "face_id": "tongyuan",
+>>>>>>> Stashed changes
         "quality": 3,
         "initialStars": 3,
         "pieceCount": 100,
         "camp": 4,
         "area": 0,
         "cost": 0,
+<<<<<<< Updated upstream
         "jobid": 1,
+=======
+        "jobid": 6,
+>>>>>>> Stashed changes
         "skill": 0,
         "pieceId": 21057,
         "hp": 100,
@@ -2712,6 +2723,101 @@
         "atkSpineEffect": "dunqi",
         "showinRecruit": "0&",
         "recruit": "0&"
+<<<<<<< Updated upstream
+=======
+    },
+    {
+        "heroId": 60,
+        "spineName": "shaonainzhaoyun",
+        "rSpineName": "&",
+        "name": "少年赵云",
+        "face_id": "shaonainzhaoyun",
+        "quality": 3,
+        "initialStars": 3,
+        "pieceCount": 100,
+        "camp": 4,
+        "area": 0,
+        "cost": 0,
+        "jobid": 6,
+        "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",
+        "skillScroll": "&",
+        "position": "30&40&30",
+        "initialSkin": 0,
+        "gender": 1,
+        "atkSpineEffect": "dunqi",
+        "showinRecruit": "0&",
+        "recruit": "0&"
+    },
+    {
+        "heroId": 61,
+        "spineName": "shaonianxiahouqingyi",
+        "rSpineName": "&",
+        "name": "少年夏侯轻衣",
+        "face_id": "shaonianxiahouqingyi",
+        "quality": 3,
+        "initialStars": 3,
+        "pieceCount": 100,
+        "camp": 4,
+        "area": 0,
+        "cost": 0,
+        "jobid": 21,
+        "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,
+        "killid": 0,
+        "sound_click": 57,
+        "sound_fight": 57,
+        "kill": "看看我长枪的威力！",
+        "retreat": "大丈夫死于乱世。",
+        "info": "我是高玩",
+        "actorinfo": "远程职业的法师，菜的一笔。",
+        "imgPosofDialog": "864&209",
+        "imgPosofInfoUI": "-702&-189",
+        "imgPosofInfoMVP": "-702&-189",
+        "skillScroll": "&",
+        "position": "30&40&30",
+        "initialSkin": 0,
+        "gender": 1,
+        "atkSpineEffect": "dunqi",
+        "showinRecruit": "0&",
+        "recruit": "0&"
+>>>>>>> Stashed changes
     },
     {
         "heroId": 301,