From 1978e56007f3a91a091b8e47a55ed05915673779 Mon Sep 17 00:00:00 2001 From: luying Date: Wed, 10 Mar 2021 18:15:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BB=E5=AE=9D=EF=BC=9A=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=88=98=E5=8A=9B=E6=98=BE=E7=A4=BA=E6=9C=AA=E7=BC=A9=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/servers/battle/handler/comBattleHandler.ts | 6 +++--- game-server/app/services/comBattleService.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/game-server/app/servers/battle/handler/comBattleHandler.ts b/game-server/app/servers/battle/handler/comBattleHandler.ts index b9840398f..aa250859c 100644 --- a/game-server/app/servers/battle/handler/comBattleHandler.ts +++ b/game-server/app/servers/battle/handler/comBattleHandler.ts @@ -52,7 +52,7 @@ export class ComBattleHandler { const enoughBlueprt = await hasEnoughBlueprt(roleId, blueprtId); if (!enoughBlueprt) return resResult(STATUS.COM_BATTLE_BLUEPRT_NOT_ENOUGH); - const roleInfo = await RoleModel.findByRoleId(roleId); + const roleInfo = await RoleModel.findByRoleId(roleId, null, true); const { lv } = roleInfo; if (lv < COM_BTL_CONST.ENABLE_LV) return resResult(STATUS.COM_BATTLE_LV_NOT_ENOUGH); @@ -93,7 +93,7 @@ export class ComBattleHandler { let roleId = session.get('roleId'); let sid = session.get('sid'); const { qualityArr, lvRange = 1 } = msg; - const roleInfo = await RoleModel.findByRoleId(roleId); + const roleInfo = await RoleModel.findByRoleId(roleId, null, true); const { lv } = roleInfo; let { topLineupCe = 1000 } = roleInfo; @@ -173,7 +173,7 @@ export class ComBattleHandler { if (!teamStatus || teamStatus.status !== COM_TEAM_STATUS.DEFAULT) return resResult(STATUS.COM_BATTLE_TEAM_INVALID); if (teamIsFullToStart(teamStatus)) return resResult(STATUS.COM_BATTLE_MEMBER_LIMIT); if (teamStatus.roleIds.indexOf(roleId) !== -1) return resResult(STATUS.COM_BATTLE_DUP_ENTER); - let { lv = 1, headHid = 19, topLineupCe = 0, sHid = 19 } = await Role.findByRoleId(roleId); + let { lv = 1, headHid = 19, topLineupCe = 0, sHid = 19 } = await Role.findByRoleId(roleId, null, true); let { quality } = getGoodById(teamStatus.blueprtId); if (lv < COM_BTL_CONST.ENABLE_LV) { diff --git a/game-server/app/services/comBattleService.ts b/game-server/app/services/comBattleService.ts index e8b42167b..0d31ffd12 100644 --- a/game-server/app/services/comBattleService.ts +++ b/game-server/app/services/comBattleService.ts @@ -489,7 +489,7 @@ async function teammateValid(roleInfo: Partial, roleId: string, roleId * @returns */ export async function getValidTeammateRoleSt(roleId: string, roleIds: string[], ceLimit: number, quality: number) { - let roleInfo = await RoleModel.findByRoleId(roleId); + let roleInfo = await RoleModel.findByRoleId(roleId, null, true); let { roleName, headHid = 19, sHid = 19, topLineupCe, lv } = roleInfo; const valid = await teammateValid(roleInfo, roleId, roleIds, ceLimit); if (!valid) return null;