更新json

2021-03-12 14:16:32 +08:00
parent 7a71603db6
commit df5d6ba92e
18 changed files with 163 additions and 175 deletions
--- 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);
--- 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;
--- 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;
--- a/shared/resource/jsons/dic_goods.json
+++ b/shared/resource/jsons/dic_goods.json
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,