From 223673d4019b4f40b63c4e41801308d912df1a4b Mon Sep 17 00:00:00 2001 From: luying Date: Tue, 23 Aug 2022 17:26:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=EF=BC=9A=E5=90=8D?= =?UTF-8?q?=E5=B0=86=E6=93=82=E5=8F=B0&=E5=86=9B=E5=9B=A2=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/services/rankService.ts | 2 +- shared/db/Guild.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/game-server/app/services/rankService.ts b/game-server/app/services/rankService.ts index fde97b76d..d3d1f2bae 100644 --- a/game-server/app/services/rankService.ts +++ b/game-server/app/services/rankService.ts @@ -1134,7 +1134,7 @@ export async function getGeneralRank(role: RoleType & { rankReceived: number[] } return dic && dic.rankId == id; }); let r = new Rank(redisKey, { serverId }, false, 1); - let ranks = await r.getRankByRange(); + let ranks = await r.getRankByRange('+inf', '-inf', id != RANK_TYPE.LADDER); // if (ranks.length > 0) { let param = new GeneralRankParam(id, ranks[0], general, received); result.push({...param, general}); diff --git a/shared/db/Guild.ts b/shared/db/Guild.ts index 1d709179a..302d98747 100644 --- a/shared/db/Guild.ts +++ b/shared/db/Guild.ts @@ -160,7 +160,7 @@ export default class Guild extends BaseModel { .sort(sort) .limit(100).skip((page - 1) * 100) .select(GUILD_SELECT.RANK) - .populate('leader', {roleId: 1, roleName: 1, title: 1, frame: 1, head: 1, spine: 1, lv: 1, _id: 0}, 'Role') + .populate('leader', {roleId: 1, roleName: 1, title: 1, frame: 1, head: 1, spine: 1, frames: 1, heads: 1, spines: 1, lv: 1, _id: 0}, 'Role') .lean({ virtuals: true }); return guildList; } @@ -175,7 +175,7 @@ export default class Guild extends BaseModel { if(serverId) condition.serverId = serverId; const result: GuildType = await GuildModel.findOne(condition) .select(select) - .populate('leader', {roleId: 1, roleName: 1, frame: 1, head: 1, spine: 1, lv: 1, quitTime: 1, ce: 1, title: 1, _id: 0}, 'Role') + .populate('leader', {roleId: 1, roleName: 1, frame: 1, head: 1, spine: 1, frames: 1, heads: 1, spines: 1, lv: 1, quitTime: 1, ce: 1, title: 1, _id: 0}, 'Role') .lean({ getters: true, virtuals: true }); return result; }