From ca312c6509f1076d1df5d5ce3ff54648b53ed696 Mon Sep 17 00:00:00 2001 From: luying Date: Mon, 10 Oct 2022 17:50:28 +0800 Subject: [PATCH] =?UTF-8?q?pvp=EF=BC=9A=E6=B7=BB=E5=8A=A0=E7=88=B5?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shared/db/PvpDefense.ts | 8 ++++---- shared/db/PvpHistoryOpp.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/shared/db/PvpDefense.ts b/shared/db/PvpDefense.ts index 07cbcf333..715283cf4 100644 --- a/shared/db/PvpDefense.ts +++ b/shared/db/PvpDefense.ts @@ -73,7 +73,7 @@ export default class PvpDefense extends BaseModel { public static async findByScale(roleId: string, min: number, max: number) { const result: PvpDefenseType[] = await PvpDefenseModel.find({ roleId: { $ne: roleId }, defCe: { $lte: max, $gte: min } }) - .populate('role', 'head frame spine heads frames spines topLineupCe roleId roleName lv globalCeAttr') + .populate('role', 'head frame spine heads frames spines topLineupCe roleId roleName lv globalCeAttr title') .populate('heroes.hero') .sort({ updatedAt: -1 }).limit(100).lean({ getters: true, virtuals: true }); return result; @@ -121,7 +121,7 @@ export default class PvpDefense extends BaseModel { public static async findByRoleIdIncludeAll(roleId: string) { const result: PvpDefenseType = await PvpDefenseModel.findOne({ roleId }) - .populate('role', 'head frame spine topLineupCe roleId roleName lv globalCeAttr') + .populate('role', 'head frame spine topLineupCe roleId roleName lv globalCeAttr title') .populate('heroes.hero') .populate('oppPlayers.oppDef', 'oppRoleId pos roleName head frame spine heads frames spines rankLv title lv pLv defCe heroes warId buff') .populate('oppBeforePlayers.oppDef', 'oppRoleId pos roleName head frame spine heads frames spines rankLv title lv pLv defCe heroes warId buff').lean({ getters: true, virtuals: true }); @@ -130,7 +130,7 @@ export default class PvpDefense extends BaseModel { public static async findByTeamLv(seasonNum: number, min: number, max: number) { const result: PvpDefenseType[] = await PvpDefenseModel.find({ seasonNum, 'defense.pLv': { $gte: min, $lte: max } }) - .populate('role', '_id head frame spine heads frames spines topLineupCe roleId roleName lv globalCeAttr') + .populate('role', '_id head frame spine heads frames spines topLineupCe roleId roleName lv globalCeAttr title') .populate('heroes.hero') .populate('oppPlayers.oppDef', 'oppRoleId pos roleName head frame spine heads frames spines rankLv pLv title lv defCe heroes warId buff') .lean({ getters: true, virtuals: true }); @@ -140,7 +140,7 @@ export default class PvpDefense extends BaseModel { public static async updateInfoAndInclude(roleId: string, update: pvpUpdateInter) { delete update._id; let result: PvpDefenseType = await PvpDefenseModel.findOneAndUpdate({roleId}, {$set:update}, {new: true}) - .populate('role', 'head frame spine heads frames spines topLineupCe roleId roleName lv') + .populate('role', 'head frame spine heads frames spines topLineupCe roleId roleName lv title') .populate('oppPlayers.oppDef', 'oppRoleId pos roleName head frame spine heads frames spines rankLv pLv title lv defCe heroes warId buff').lean({ getters: true, virtuals: true }); return result; } diff --git a/shared/db/PvpHistoryOpp.ts b/shared/db/PvpHistoryOpp.ts index 1e9c2a893..6aed26228 100644 --- a/shared/db/PvpHistoryOpp.ts +++ b/shared/db/PvpHistoryOpp.ts @@ -60,7 +60,7 @@ export default class PvpHistoryOpp extends BaseModel { delete update._id; delete update.updatedAt; delete update.createdAt; - const defense: PvpHistoryOppType = await PvpHistoryOppModel.findOneAndUpdate({ roleId: params.roleId, pos: params.pos, status: 0 }, update, { upsert: true, new: true }).lean(); + const defense: PvpHistoryOppType = await PvpHistoryOppModel.findOneAndUpdate({ roleId: params.roleId, pos: params.pos, status: 0 }, { $set: update }, { upsert: true, new: true }).lean(); return defense; }