diff --git a/game-server/app/services/timeTaskService.ts b/game-server/app/services/timeTaskService.ts index fc67647ac..ee24dcb25 100644 --- a/game-server/app/services/timeTaskService.ts +++ b/game-server/app/services/timeTaskService.ts @@ -142,7 +142,7 @@ export async function setPvpDefResult(pvpDefense: PvpDefenseType, seasonNum: num let resultMaxRank = getResultMaxRank(); let rankLv = resultMaxRank.min; let {score, pLv, heroScores, challengeCnt, challengeRefTime, goods } = await checkResult(pvpDefense, seasonNum, oldSeasonEndTime, rankLv); - pvpDefense = await PvpDefenseModel.updateInfo(pvpDefense.roleId, {score, pLv, heroScores, seasonNum, challengeCnt, challengeRefTime}); + pvpDefense = await PvpDefenseModel.updateInfoAndInclude(pvpDefense.roleId, {score, pLv, heroScores, seasonNum, challengeCnt, challengeRefTime}); let { roleName, lv, vLv, headHid, sHid, title , roleId } = role; let params = new RankParam(roleName, lv, vLv, headHid, sHid, title); setRank(REDIS_KEY.PVP_RANK, 0, pvpDefense.roleId, pvpDefense.score, pvpDefense.updatedAt.getTime(), params); diff --git a/shared/db/PvpDefense.ts b/shared/db/PvpDefense.ts index 97a520e9e..83048949f 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 pLv defCe heroes').lean(); + .populate('oppPlayers.oppDef', 'oppRoleId pos roleName headHid sHid rankLv title 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 defCe heroes') + .populate('oppPlayers.oppDef', 'oppRoleId pos roleName headHid sHid rankLv pLv title 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 defCe heroes').lean(); + .populate('oppPlayers.oppDef', 'oppRoleId pos roleName headHid sHid rankLv pLv title defCe heroes').lean(); return result; } public static async updateInfo(roleId: string, update: pvpUpdateInter, lean = true) {