From 18f24e1d8e7a3e7394804cc1d7cb3c66e6e0d0bd Mon Sep 17 00:00:00 2001 From: luying Date: Fri, 15 Jan 2021 17:37:53 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=AF=B9=E6=89=8B=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B9=9F=E7=BC=A9=E5=B0=8F=E6=88=98=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/services/pvpService.ts | 2 +- shared/db/PvpDefense.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/game-server/app/services/pvpService.ts b/game-server/app/services/pvpService.ts index 8b3dcfc2f..d05b89c24 100644 --- a/game-server/app/services/pvpService.ts +++ b/game-server/app/services/pvpService.ts @@ -590,7 +590,7 @@ export async function generPVPOppRecInfo(isSuccess: boolean, curOpp: OppPlayers, sHid: oppRole.sHid, headHid: oppRole.headHid, title: oppRole.title, - ce: oppRole.defCe, + ce: reduceCe(oppRole.defCe), heroes: oppHeroRecords, isSuccess: !isSuccess, score: 0 diff --git a/shared/db/PvpDefense.ts b/shared/db/PvpDefense.ts index 83048949f..130d8dfb3 100644 --- a/shared/db/PvpDefense.ts +++ b/shared/db/PvpDefense.ts @@ -197,7 +197,7 @@ export default class PvpDefense extends BaseModel { const result: PvpDefenseType = await PvpDefenseModel.findOne({ roleId }) .populate('role', 'headHid sHid topFiveCe roleId roleName lv globalCeAttr') .populate('heroes.hero') - .populate('oppPlayers.oppDef', 'oppRoleId pos roleName headHid sHid rankLv title pLv defCe heroes').lean(); + .populate('oppPlayers.oppDef', 'oppRoleId pos roleName headHid sHid rankLv title lv pLv defCe heroes').lean(); return result; } @@ -205,7 +205,7 @@ export default class PvpDefense extends BaseModel { const result: PvpDefenseType[] = await PvpDefenseModel.find({ pLv: { $gte: min, $lte: max } }) .populate('role', 'headHid sHid topFiveCe roleId roleName lv globalCeAttr') .populate('heroes.hero') - .populate('oppPlayers.oppDef', 'oppRoleId pos roleName headHid sHid rankLv pLv title defCe heroes') + .populate('oppPlayers.oppDef', 'oppRoleId pos roleName headHid sHid rankLv pLv title lv defCe heroes') .lean(); return result; } @@ -214,7 +214,7 @@ export default class PvpDefense extends BaseModel { delete update._id; let result: PvpDefenseType = await PvpDefenseModel.findOneAndUpdate({roleId}, {$set:update}, {new: true}) .populate('role', 'headHid sHid topFiveCe roleId roleName lv') - .populate('oppPlayers.oppDef', 'oppRoleId pos roleName headHid sHid rankLv pLv title defCe heroes').lean(); + .populate('oppPlayers.oppDef', 'oppRoleId pos roleName headHid sHid rankLv pLv title lv defCe heroes').lean(); return result; } public static async updateInfo(roleId: string, update: pvpUpdateInter, lean = true) {