diff --git a/game-server/test/comBattle.test.ts b/game-server/test/comBattle.test.ts
index 68dfbafba..9d8d56fb7 100644
--- a/game-server/test/comBattle.test.ts
+++ b/game-server/test/comBattle.test.ts
@@ -177,7 +177,7 @@ describe('寻宝创建队伍', function() {
       expect(teamCode).to.be.a('string');
       expect(res.data.roleStatus).to.be.an('array');
       res.data.roleStatus.forEach(roleSt => {
-        expect(roleSt).to.have.all.keys('roleId', 'roleName', 'isCap', 'isFrd', 'headHid', 'sHid', 'topLineupCe', 'lv', 'isRobot', 'heroes', 'killed', 'totalDmg', 'frdRatio');
+        expect(roleSt).to.have.all.keys('roleId', 'roleName', 'isCap', 'isFrd', 'head', 'frame', 'spine', 'topLineupCe', 'lv', 'isRobot', 'heroes', 'killed', 'totalDmg', 'frdRatio');
       });
       pinusClient.request('battle.comBattleHandler.autoInvite', {teamCode}, (inviteRes) => {
         checkSuccessResponse(inviteRes, false);
diff --git a/shared/domain/gameField/serverlist.ts b/shared/domain/gameField/serverlist.ts
index 6abd1b354..b2ddde656 100644
--- a/shared/domain/gameField/serverlist.ts
+++ b/shared/domain/gameField/serverlist.ts
@@ -55,9 +55,6 @@ export class ServerParamWithRole extends ServerParam {
     lv: number;              // 等级
     updatedAt: Date;
 
-    headHid: number = 19;    // TODO，等客户端完成后删除这个字段
-    sHid: number = 19;       
-
     constructor(role: RoleType, server: ServerInfo) {
         super(server);
         this.groupId = server.groupId;
diff --git a/shared/domain/rank.ts b/shared/domain/rank.ts
index d492f62ad..008767cb3 100644
--- a/shared/domain/rank.ts
+++ b/shared/domain/rank.ts
@@ -11,9 +11,6 @@ export class RankParam {
     spine: number = EXTERIOR.EXTERIOR_APPEARANCE;
     title: number;
 
-    headHid: number = 19; // TODO 等客户端接完将这些删除
-    sHid: number = 19;
-
     constructor(roleName: string, lv: number, vLv: number, head: number, frame: number, spine: number, title: number) {
         this.roleName = roleName;
         this.lv = lv;
@@ -38,9 +35,6 @@ export class GuildRankParam {
         frame: number;
         spine: number;
 
-
-        headHid: number;
-        sHid: number;
     }
 
     constructor(icon: number, name: string, lv: number, leader: {roleName: string, title: number, lv: number, head: number, frame: number, spine: number}) {
@@ -60,9 +54,6 @@ export class GuildLeader {
     frame: number;
     spine: number;
 
-    headHid: number = 19;
-    sHid: number = 19;
-
     constructor(leader: {roleName: string, title: number, lv: number, head: number, frame: number, spine: number}) {
         this.roleName = leader.roleName;
         this.title = leader.title;
diff --git a/shared/resource/jsons/dic_goods.json b/shared/resource/jsons/dic_goods.json
index 3457f51e9..4218c54f0 100644
--- a/shared/resource/jsons/dic_goods.json
+++ b/shared/resource/jsons/dic_goods.json
@@ -91559,7 +91559,7 @@
         "quality": 1,
         "image_id": 11201,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -91600,7 +91600,7 @@
         "quality": 1,
         "image_id": 11202,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -91641,7 +91641,7 @@
         "quality": 1,
         "image_id": 11203,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -91682,7 +91682,7 @@
         "quality": 1,
         "image_id": 11204,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -91723,7 +91723,7 @@
         "quality": 1,
         "image_id": 11205,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -91764,7 +91764,7 @@
         "quality": 1,
         "image_id": 11206,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -91805,7 +91805,7 @@
         "quality": 1,
         "image_id": 11207,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -91846,7 +91846,7 @@
         "quality": 1,
         "image_id": 11208,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -91887,7 +91887,7 @@
         "quality": 1,
         "image_id": 11209,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -91928,7 +91928,7 @@
         "quality": 1,
         "image_id": 11210,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -91969,7 +91969,7 @@
         "quality": 1,
         "image_id": 11211,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -92010,7 +92010,7 @@
         "quality": 1,
         "image_id": 11212,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -92051,7 +92051,7 @@
         "quality": 1,
         "image_id": 11213,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -92092,7 +92092,7 @@
         "quality": 1,
         "image_id": 11214,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -92133,7 +92133,7 @@
         "quality": 1,
         "image_id": 11215,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -92174,7 +92174,7 @@
         "quality": 1,
         "image_id": 11216,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -92215,7 +92215,7 @@
         "quality": 1,
         "image_id": 11217,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -92256,7 +92256,7 @@
         "quality": 1,
         "image_id": 11218,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -92297,7 +92297,7 @@
         "quality": 1,
         "image_id": 11219,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -92338,7 +92338,7 @@
         "quality": 1,
         "image_id": 11220,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -92379,7 +92379,7 @@
         "quality": 1,
         "image_id": 11221,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -92420,7 +92420,7 @@
         "quality": 1,
         "image_id": 11222,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -92461,7 +92461,7 @@
         "quality": 1,
         "image_id": 11223,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -92502,7 +92502,7 @@
         "quality": 1,
         "image_id": 11224,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -92543,7 +92543,7 @@
         "quality": 1,
         "image_id": 11225,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -92584,7 +92584,7 @@
         "quality": 1,
         "image_id": 11226,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -92625,7 +92625,7 @@
         "quality": 1,
         "image_id": 11227,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -92666,7 +92666,7 @@
         "quality": 1,
         "image_id": 11228,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -92707,7 +92707,7 @@
         "quality": 1,
         "image_id": 11229,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -92748,7 +92748,7 @@
         "quality": 1,
         "image_id": 11230,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -92789,7 +92789,7 @@
         "quality": 1,
         "image_id": 11231,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -92830,7 +92830,7 @@
         "quality": 1,
         "image_id": 11232,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -92871,7 +92871,7 @@
         "quality": 1,
         "image_id": 11233,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -92912,7 +92912,7 @@
         "quality": 1,
         "image_id": 11234,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -92953,7 +92953,7 @@
         "quality": 1,
         "image_id": 11235,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -92994,7 +92994,7 @@
         "quality": 1,
         "image_id": 11236,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -93035,7 +93035,7 @@
         "quality": 1,
         "image_id": 11237,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -93076,7 +93076,7 @@
         "quality": 1,
         "image_id": 11238,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -93117,7 +93117,7 @@
         "quality": 1,
         "image_id": 11239,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -93158,7 +93158,7 @@
         "quality": 1,
         "image_id": 11240,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -93199,7 +93199,7 @@
         "quality": 1,
         "image_id": 11241,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -93240,7 +93240,7 @@
         "quality": 1,
         "image_id": 11242,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -93281,7 +93281,7 @@
         "quality": 1,
         "image_id": 11243,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -93322,7 +93322,7 @@
         "quality": 1,
         "image_id": 11244,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -93363,7 +93363,7 @@
         "quality": 1,
         "image_id": 11245,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -93404,7 +93404,7 @@
         "quality": 1,
         "image_id": 11246,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -93445,7 +93445,7 @@
         "quality": 1,
         "image_id": 11247,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -93486,7 +93486,7 @@
         "quality": 1,
         "image_id": 11248,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -93527,7 +93527,7 @@
         "quality": 1,
         "image_id": 11249,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -93568,7 +93568,7 @@
         "quality": 1,
         "image_id": 11250,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -93609,7 +93609,7 @@
         "quality": 1,
         "image_id": 11251,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -93650,7 +93650,7 @@
         "quality": 1,
         "image_id": 11252,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -93691,7 +93691,7 @@
         "quality": 1,
         "image_id": 11253,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -93732,7 +93732,7 @@
         "quality": 1,
         "image_id": 11254,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -93773,7 +93773,7 @@
         "quality": 1,
         "image_id": 11255,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -93814,7 +93814,7 @@
         "quality": 1,
         "image_id": 11256,
         "itid": 50,
-        "goodType": 9,
+        "goodType": 6,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -93855,7 +93855,7 @@
         "quality": 1,
         "image_id": 12530,
         "itid": 51,
-        "goodType": 10,
+        "goodType": 7,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -93896,7 +93896,7 @@
         "quality": 1,
         "image_id": 12531,
         "itid": 51,
-        "goodType": 10,
+        "goodType": 7,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -93937,7 +93937,7 @@
         "quality": 1,
         "image_id": 12532,
         "itid": 51,
-        "goodType": 10,
+        "goodType": 7,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -93978,7 +93978,7 @@
         "quality": 1,
         "image_id": 12533,
         "itid": 51,
-        "goodType": 10,
+        "goodType": 7,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -94019,7 +94019,7 @@
         "quality": 1,
         "image_id": 12530,
         "itid": 51,
-        "goodType": 10,
+        "goodType": 7,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -94060,7 +94060,7 @@
         "quality": 1,
         "image_id": 12531,
         "itid": 51,
-        "goodType": 10,
+        "goodType": 7,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -94101,7 +94101,7 @@
         "quality": 1,
         "image_id": 12532,
         "itid": 51,
-        "goodType": 10,
+        "goodType": 7,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -94142,7 +94142,7 @@
         "quality": 1,
         "image_id": 12533,
         "itid": 51,
-        "goodType": 10,
+        "goodType": 7,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -94183,7 +94183,7 @@
         "quality": 1,
         "image_id": 12530,
         "itid": 51,
-        "goodType": 10,
+        "goodType": 7,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -94224,7 +94224,7 @@
         "quality": 1,
         "image_id": 12531,
         "itid": 51,
-        "goodType": 10,
+        "goodType": 7,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -94265,7 +94265,7 @@
         "quality": 1,
         "image_id": 12532,
         "itid": 51,
-        "goodType": 10,
+        "goodType": 7,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -94306,7 +94306,7 @@
         "quality": 1,
         "image_id": 12533,
         "itid": 51,
-        "goodType": 10,
+        "goodType": 7,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -94347,7 +94347,7 @@
         "quality": 1,
         "image_id": 12530,
         "itid": 51,
-        "goodType": 10,
+        "goodType": 7,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -94388,7 +94388,7 @@
         "quality": 1,
         "image_id": 12531,
         "itid": 51,
-        "goodType": 10,
+        "goodType": 7,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -94429,7 +94429,7 @@
         "quality": 1,
         "image_id": 12532,
         "itid": 51,
-        "goodType": 10,
+        "goodType": 7,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -94470,7 +94470,7 @@
         "quality": 1,
         "image_id": 12533,
         "itid": 51,
-        "goodType": 10,
+        "goodType": 7,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -94511,7 +94511,7 @@
         "quality": 1,
         "image_id": 12530,
         "itid": 51,
-        "goodType": 10,
+        "goodType": 7,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -94552,7 +94552,7 @@
         "quality": 1,
         "image_id": 12531,
         "itid": 51,
-        "goodType": 10,
+        "goodType": 7,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -94593,7 +94593,7 @@
         "quality": 1,
         "image_id": 12532,
         "itid": 51,
-        "goodType": 10,
+        "goodType": 7,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -94634,7 +94634,7 @@
         "quality": 1,
         "image_id": 12533,
         "itid": 51,
-        "goodType": 10,
+        "goodType": 7,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -94675,7 +94675,7 @@
         "quality": 1,
         "image_id": 11401,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -94716,7 +94716,7 @@
         "quality": 1,
         "image_id": 11402,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -94757,7 +94757,7 @@
         "quality": 1,
         "image_id": 11403,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -94798,7 +94798,7 @@
         "quality": 1,
         "image_id": 11404,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -94839,7 +94839,7 @@
         "quality": 1,
         "image_id": 11405,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -94880,7 +94880,7 @@
         "quality": 1,
         "image_id": 11406,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -94921,7 +94921,7 @@
         "quality": 1,
         "image_id": 11407,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -94962,7 +94962,7 @@
         "quality": 1,
         "image_id": 11408,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -95003,7 +95003,7 @@
         "quality": 1,
         "image_id": 11409,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -95044,7 +95044,7 @@
         "quality": 1,
         "image_id": 11410,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -95085,7 +95085,7 @@
         "quality": 1,
         "image_id": 11411,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -95126,7 +95126,7 @@
         "quality": 1,
         "image_id": 11412,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -95167,7 +95167,7 @@
         "quality": 1,
         "image_id": 11413,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -95208,7 +95208,7 @@
         "quality": 1,
         "image_id": 11414,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -95249,7 +95249,7 @@
         "quality": 1,
         "image_id": 11415,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -95290,7 +95290,7 @@
         "quality": 1,
         "image_id": 11416,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -95331,7 +95331,7 @@
         "quality": 1,
         "image_id": 11417,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -95372,7 +95372,7 @@
         "quality": 1,
         "image_id": 11418,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -95413,7 +95413,7 @@
         "quality": 1,
         "image_id": 11419,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -95454,7 +95454,7 @@
         "quality": 1,
         "image_id": 11420,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -95495,7 +95495,7 @@
         "quality": 1,
         "image_id": 11421,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -95536,7 +95536,7 @@
         "quality": 1,
         "image_id": 11422,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -95577,7 +95577,7 @@
         "quality": 1,
         "image_id": 11423,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -95618,7 +95618,7 @@
         "quality": 1,
         "image_id": 11424,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -95659,7 +95659,7 @@
         "quality": 1,
         "image_id": 11425,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -95700,7 +95700,7 @@
         "quality": 1,
         "image_id": 11426,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -95741,7 +95741,7 @@
         "quality": 1,
         "image_id": 11427,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -95782,7 +95782,7 @@
         "quality": 1,
         "image_id": 11428,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -95823,7 +95823,7 @@
         "quality": 1,
         "image_id": 11429,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -95864,7 +95864,7 @@
         "quality": 1,
         "image_id": 11430,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -95905,7 +95905,7 @@
         "quality": 1,
         "image_id": 11431,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -95946,7 +95946,7 @@
         "quality": 1,
         "image_id": 11432,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -95987,7 +95987,7 @@
         "quality": 1,
         "image_id": 11433,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -96028,7 +96028,7 @@
         "quality": 1,
         "image_id": 11434,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -96069,7 +96069,7 @@
         "quality": 1,
         "image_id": 11435,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -96110,7 +96110,7 @@
         "quality": 1,
         "image_id": 11436,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -96151,7 +96151,7 @@
         "quality": 1,
         "image_id": 11437,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -96192,7 +96192,7 @@
         "quality": 1,
         "image_id": 11438,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -96233,7 +96233,7 @@
         "quality": 1,
         "image_id": 11439,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -96274,7 +96274,7 @@
         "quality": 1,
         "image_id": 11440,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -96315,7 +96315,7 @@
         "quality": 1,
         "image_id": 11441,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -96356,7 +96356,7 @@
         "quality": 1,
         "image_id": 11442,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -96397,7 +96397,7 @@
         "quality": 1,
         "image_id": 11443,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -96438,7 +96438,7 @@
         "quality": 1,
         "image_id": 11444,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -96479,7 +96479,7 @@
         "quality": 1,
         "image_id": 11445,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -96520,7 +96520,7 @@
         "quality": 1,
         "image_id": 11446,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -96561,7 +96561,7 @@
         "quality": 1,
         "image_id": 11447,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -96602,7 +96602,7 @@
         "quality": 1,
         "image_id": 11448,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -96643,7 +96643,7 @@
         "quality": 1,
         "image_id": 11449,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -96684,7 +96684,7 @@
         "quality": 1,
         "image_id": 11450,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -96725,7 +96725,7 @@
         "quality": 1,
         "image_id": 11451,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -96766,7 +96766,7 @@
         "quality": 1,
         "image_id": 11452,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -96807,7 +96807,7 @@
         "quality": 1,
         "image_id": 11453,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -96848,7 +96848,7 @@
         "quality": 1,
         "image_id": 11454,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -96889,7 +96889,7 @@
         "quality": 1,
         "image_id": 11455,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
@@ -96930,7 +96930,7 @@
         "quality": 1,
         "image_id": 11456,
         "itid": 52,
-        "goodType": 11,
+        "goodType": 8,
         "pieces": 0,
         "pieceId": 0,
         "composeMaterial": "&",
diff --git a/shared/resource/warJsons/4001.json b/shared/resource/warJsons/4001.json
index 994c061bf..7d9f1d8db 100644
--- a/shared/resource/warJsons/4001.json
+++ b/shared/resource/warJsons/4001.json
@@ -127,8 +127,8 @@
     },
     {
         "warId": 4001,
-        "actorName": "贾诩",
-        "actorId": 314,
+        "actorName": "赵云",
+        "actorId": 319,
         "dataId": 2002,
         "relation": 2,
         "outIndex": 1,
diff --git a/shared/resource/warJsons/4002.json b/shared/resource/warJsons/4002.json
index 6c8084fc7..98203e973 100644
--- a/shared/resource/warJsons/4002.json
+++ b/shared/resource/warJsons/4002.json
@@ -101,8 +101,8 @@
     },
     {
         "warId": 4002,
-        "actorName": "贾诩",
-        "actorId": 314,
+        "actorName": "赵云",
+        "actorId": 319,
         "dataId": 2001,
         "relation": 2,
         "outIndex": 0,
diff --git a/shared/resource/warJsons/4003.json b/shared/resource/warJsons/4003.json
index 2db240088..6e681ea54 100644
--- a/shared/resource/warJsons/4003.json
+++ b/shared/resource/warJsons/4003.json
@@ -141,8 +141,8 @@
     },
     {
         "warId": 4003,
-        "actorName": "贾诩",
-        "actorId": 314,
+        "actorName": "赵云",
+        "actorId": 319,
         "dataId": 2003,
         "relation": 2,
         "outIndex": 2,
diff --git a/shared/resource/warJsons/4004.json b/shared/resource/warJsons/4004.json
index b015cd538..df13391bc 100644
--- a/shared/resource/warJsons/4004.json
+++ b/shared/resource/warJsons/4004.json
@@ -101,8 +101,8 @@
     },
     {
         "warId": 4004,
-        "actorName": "贾诩",
-        "actorId": 314,
+        "actorName": "赵云",
+        "actorId": 319,
         "dataId": 2001,
         "relation": 2,
         "outIndex": 0,
diff --git a/shared/resource/warJsons/4005.json b/shared/resource/warJsons/4005.json
index e902e6a4d..683874970 100644
--- a/shared/resource/warJsons/4005.json
+++ b/shared/resource/warJsons/4005.json
@@ -101,8 +101,8 @@
     },
     {
         "warId": 4005,
-        "actorName": "贾诩",
-        "actorId": 314,
+        "actorName": "赵云",
+        "actorId": 319,
         "dataId": 2001,
         "relation": 2,
         "outIndex": 0,
diff --git a/shared/resource/warJsons/4006.json b/shared/resource/warJsons/4006.json
index 47b4043fa..b031cf3b8 100644
--- a/shared/resource/warJsons/4006.json
+++ b/shared/resource/warJsons/4006.json
@@ -101,8 +101,8 @@
     },
     {
         "warId": 4006,
-        "actorName": "贾诩",
-        "actorId": 314,
+        "actorName": "赵云",
+        "actorId": 319,
         "dataId": 2001,
         "relation": 2,
         "outIndex": 0,
diff --git a/shared/resource/warJsons/4007.json b/shared/resource/warJsons/4007.json
index 2953ea27a..9ddbe48b1 100644
--- a/shared/resource/warJsons/4007.json
+++ b/shared/resource/warJsons/4007.json
@@ -181,8 +181,8 @@
     },
     {
         "warId": 4007,
-        "actorName": "贾诩",
-        "actorId": 314,
+        "actorName": "赵云",
+        "actorId": 319,
         "dataId": 2005,
         "relation": 2,
         "outIndex": 4,
diff --git a/shared/resource/warJsons/4008.json b/shared/resource/warJsons/4008.json
index bebb48df3..08dbc9fb8 100644
--- a/shared/resource/warJsons/4008.json
+++ b/shared/resource/warJsons/4008.json
@@ -121,8 +121,8 @@
     },
     {
         "warId": 4008,
-        "actorName": "贾诩",
-        "actorId": 314,
+        "actorName": "赵云",
+        "actorId": 319,
         "dataId": 2002,
         "relation": 2,
         "outIndex": 1,
diff --git a/shared/resource/warJsons/4009.json b/shared/resource/warJsons/4009.json
index c0ff6214a..ff01c8db1 100644
--- a/shared/resource/warJsons/4009.json
+++ b/shared/resource/warJsons/4009.json
@@ -121,8 +121,8 @@
     },
     {
         "warId": 4009,
-        "actorName": "李典",
-        "actorId": 312,
+        "actorName": "赵云",
+        "actorId": 319,
         "dataId": 2002,
         "relation": 2,
         "outIndex": 1,
@@ -141,8 +141,8 @@
     },
     {
         "warId": 4009,
-        "actorName": "贾诩",
-        "actorId": 314,
+        "actorName": "李典",
+        "actorId": 312,
         "dataId": 2003,
         "relation": 2,
         "outIndex": 2,
diff --git a/shared/resource/warJsons/4501.json b/shared/resource/warJsons/4501.json
index 3633995f2..da940e527 100644
--- a/shared/resource/warJsons/4501.json
+++ b/shared/resource/warJsons/4501.json
@@ -201,8 +201,8 @@
     },
     {
         "warId": 4501,
-        "actorName": "贾诩",
-        "actorId": 314,
+        "actorName": "赵云",
+        "actorId": 319,
         "dataId": 2002,
         "relation": 2,
         "outIndex": 1,
diff --git a/shared/resource/warJsons/4502.json b/shared/resource/warJsons/4502.json
index cbd7c6281..6ce6ca76e 100644
--- a/shared/resource/warJsons/4502.json
+++ b/shared/resource/warJsons/4502.json
@@ -201,8 +201,8 @@
     },
     {
         "warId": 4502,
-        "actorName": "贾诩",
-        "actorId": 314,
+        "actorName": "赵云",
+        "actorId": 319,
         "dataId": 2002,
         "relation": 2,
         "outIndex": 1,
diff --git a/shared/resource/warJsons/4503.json b/shared/resource/warJsons/4503.json
index 7d85dbab4..0903a7a86 100644
--- a/shared/resource/warJsons/4503.json
+++ b/shared/resource/warJsons/4503.json
@@ -201,8 +201,8 @@
     },
     {
         "warId": 4503,
-        "actorName": "贾诩",
-        "actorId": 314,
+        "actorName": "赵云",
+        "actorId": 319,
         "dataId": 2002,
         "relation": 2,
         "outIndex": 1,
diff --git a/shared/resource/warJsons/4504.json b/shared/resource/warJsons/4504.json
index 821124c66..2b828288d 100644
--- a/shared/resource/warJsons/4504.json
+++ b/shared/resource/warJsons/4504.json
@@ -201,8 +201,8 @@
     },
     {
         "warId": 4504,
-        "actorName": "贾诩",
-        "actorId": 314,
+        "actorName": "赵云",
+        "actorId": 319,
         "dataId": 2002,
         "relation": 2,
         "outIndex": 1,
diff --git a/shared/resource/warJsons/4505.json b/shared/resource/warJsons/4505.json
index 27ca6be66..ada33ed91 100644
--- a/shared/resource/warJsons/4505.json
+++ b/shared/resource/warJsons/4505.json
@@ -201,8 +201,8 @@
     },
     {
         "warId": 4505,
-        "actorName": "贾诩",
-        "actorId": 314,
+        "actorName": "赵云",
+        "actorId": 319,
         "dataId": 2002,
         "relation": 2,
         "outIndex": 1,