diff --git a/shared/resource/jsons/dic_zyz_hero.json b/shared/resource/jsons/dic_zyz_hero.json
index fb2d9827f..523f5653a 100644
--- a/shared/resource/jsons/dic_zyz_hero.json
+++ b/shared/resource/jsons/dic_zyz_hero.json
@@ -12231,8 +12231,8 @@
         "skillScroll": 0,
         "position": "&",
         "initialSkin": 0,
-        "gender": 0,
-        "atkSpineEffect": 0,
+        "gender": 2,
+        "atkSpineEffect": "faqi",
         "probation": 0,
         "center_y": 0,
         "show_animation": 0,
@@ -12271,8 +12271,8 @@
         "skillScroll": 0,
         "position": "&",
         "initialSkin": 0,
-        "gender": 0,
-        "atkSpineEffect": 0,
+        "gender": 2,
+        "atkSpineEffect": "faqi",
         "probation": 0,
         "center_y": 0,
         "show_animation": 0,
@@ -12311,8 +12311,8 @@
         "skillScroll": 0,
         "position": "&",
         "initialSkin": 0,
-        "gender": 0,
-        "atkSpineEffect": 0,
+        "gender": 1,
+        "atkSpineEffect": "liqi",
         "probation": 0,
         "center_y": 0,
         "show_animation": 0,
@@ -12351,8 +12351,8 @@
         "skillScroll": 0,
         "position": "&",
         "initialSkin": 0,
-        "gender": 0,
-        "atkSpineEffect": 0,
+        "gender": 1,
+        "atkSpineEffect": "liqi",
         "probation": 0,
         "center_y": 0,
         "show_animation": 0,
@@ -12372,13 +12372,8 @@
         "camp": 0,
         "area": "1009&1009",
         "cost": 0,
-<<<<<<< Updated upstream
-        "jobid": 600,
-        "jobClass": 6,
-=======
         "jobid": 4,
         "jobClass": 10,
->>>>>>> Stashed changes
         "skill": 0,
         "pieceId": 0,
         "hp": 1000,
@@ -12396,8 +12391,8 @@
         "skillScroll": 0,
         "position": "&",
         "initialSkin": 0,
-        "gender": 0,
-        "atkSpineEffect": 0,
+        "gender": 2,
+        "atkSpineEffect": "faqi",
         "probation": 0,
         "center_y": 0,
         "show_animation": 0,
@@ -12409,11 +12404,7 @@
         "spineName": "gongnv",
         "rSpineName": "&",
         "name": "宫女亡魂",
-<<<<<<< Updated upstream
-        "actorId": 3202,
-=======
         "actorId": 3206,
->>>>>>> Stashed changes
         "face_id": 0,
         "quality": 3,
         "initialStars": 3,
@@ -12440,8 +12431,8 @@
         "skillScroll": 0,
         "position": "&",
         "initialSkin": 0,
-        "gender": 0,
-        "atkSpineEffect": 0,
+        "gender": 2,
+        "atkSpineEffect": "faqi",
         "probation": 0,
         "center_y": 0,
         "show_animation": 0,
@@ -12461,13 +12452,8 @@
         "camp": 0,
         "area": 0,
         "cost": 0,
-<<<<<<< Updated upstream
-        "jobid": 100,
-        "jobClass": 1,
-=======
         "jobid": 200,
         "jobClass": 2,
->>>>>>> Stashed changes
         "skill": 0,
         "pieceId": 0,
         "hp": 1000,
@@ -12485,8 +12471,8 @@
         "skillScroll": 0,
         "position": "&",
         "initialSkin": 0,
-        "gender": 0,
-        "atkSpineEffect": 0,
+        "gender": 1,
+        "atkSpineEffect": "liqi",
         "probation": 0,
         "center_y": 0,
         "show_animation": 0,
@@ -12497,13 +12483,8 @@
         "heroId": 3208,
         "spineName": "daobing",
         "rSpineName": "&",
-<<<<<<< Updated upstream
-        "name": "皇宫禁卫鬼侍",
-        "actorId": 3204,
-=======
         "name": "白色彼岸花",
         "actorId": 3208,
->>>>>>> Stashed changes
         "face_id": 0,
         "quality": 3,
         "initialStars": 3,
@@ -12511,13 +12492,8 @@
         "camp": 0,
         "area": 0,
         "cost": 0,
-<<<<<<< Updated upstream
-        "jobid": 200,
-        "jobClass": 2,
-=======
         "jobid": 600,
         "jobClass": 6,
->>>>>>> Stashed changes
         "skill": 0,
         "pieceId": 0,
         "hp": 1000,
@@ -12536,7 +12512,7 @@
         "position": "&",
         "initialSkin": 0,
         "gender": 0,
-        "atkSpineEffect": 0,
+        "atkSpineEffect": "faqi",
         "probation": 0,
         "center_y": 0,
         "show_animation": 0,
@@ -12552,56 +12528,12 @@
         "face_id": 0,
         "quality": 3,
         "initialStars": 3,
-<<<<<<< Updated upstream
-        "pieceCount": 0,
-        "camp": 0,
-        "area": "1009&1009",
-        "cost": 0,
-        "jobid": 4,
-        "jobClass": 10,
-        "skill": 0,
-        "pieceId": 0,
-        "hp": 1000,
-        "atk": 20,
-        "def": 20,
-        "mdef": 20,
-        "hp_up": 5,
-        "atk_up": 1,
-        "def_up": 1,
-        "mdef_up": 1,
-        "sound_click": 1,
-        "sound_fight": 0,
-        "info": 0,
-        "actorinfo": 0,
-        "skillScroll": 0,
-        "position": "&",
-        "initialSkin": 0,
-        "gender": 0,
-        "atkSpineEffect": 0,
-        "probation": 0,
-        "center_y": 0,
-        "show_animation": 0,
-        "isdeath": 1,
-        "__EMPTY": 0
-    },
-    {
-        "heroId": 3206,
-        "spineName": "gongnv",
-        "rSpineName": "&",
-        "name": "宫女亡魂",
-        "actorId": 3206,
-        "face_id": 0,
-        "quality": 3,
-        "initialStars": 3,
-=======
->>>>>>> Stashed changes
         "pieceCount": 0,
         "camp": 0,
         "area": 0,
         "cost": 0,
         "jobid": 600,
         "jobClass": 6,
-<<<<<<< Updated upstream
         "skill": 0,
         "pieceId": 0,
         "hp": 1000,
@@ -12620,49 +12552,7 @@
         "position": "&",
         "initialSkin": 0,
         "gender": 0,
-        "atkSpineEffect": 0,
-        "probation": 0,
-        "center_y": 0,
-        "show_animation": 0,
-        "isdeath": 1,
-        "__EMPTY": 0
-    },
-    {
-        "heroId": 3207,
-        "spineName": "yulinguijun",
-        "rSpineName": "&",
-        "name": "皇宫禁卫鬼侍",
-        "actorId": 3207,
-        "face_id": 0,
-        "quality": 3,
-        "initialStars": 3,
-        "pieceCount": 0,
-        "camp": 0,
-        "area": 0,
-        "cost": 0,
-        "jobid": 200,
-        "jobClass": 2,
-=======
->>>>>>> Stashed changes
-        "skill": 0,
-        "pieceId": 0,
-        "hp": 1000,
-        "atk": 20,
-        "def": 20,
-        "mdef": 20,
-        "hp_up": 5,
-        "atk_up": 1,
-        "def_up": 1,
-        "mdef_up": 1,
-        "sound_click": 1,
-        "sound_fight": 0,
-        "info": 0,
-        "actorinfo": 0,
-        "skillScroll": 0,
-        "position": "&",
-        "initialSkin": 0,
-        "gender": 0,
-        "atkSpineEffect": 0,
+        "atkSpineEffect": "faqi",
         "probation": 0,
         "center_y": 0,
         "show_animation": 0,