From 7a67d5ee1c0bc5c2e22735264feb6be3ae2ec519 Mon Sep 17 00:00:00 2001 From: luying Date: Thu, 25 Aug 2022 13:46:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9C=E5=BE=81=EF=BC=9A=E7=A2=BE=E5=8E=8B?= =?UTF-8?q?=E5=89=8D=E7=BD=AE=E5=85=B3=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/servers/battle/handler/expeditionBattleHandler.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game-server/app/servers/battle/handler/expeditionBattleHandler.ts b/game-server/app/servers/battle/handler/expeditionBattleHandler.ts index ad483c989..254c5d2d0 100644 --- a/game-server/app/servers/battle/handler/expeditionBattleHandler.ts +++ b/game-server/app/servers/battle/handler/expeditionBattleHandler.ts @@ -133,7 +133,7 @@ export class ExpeditionBattleHandler { return resResult(STATUS.BATTLE_MISS_INFO); } - let role = await RoleModel.findByRoleId(roleId, 'lv'); + let role = await RoleModel.findByRoleId(roleId, 'lv warStar'); let apJson = await getAp(roleId, ip, role.lv); let { ap } = apJson; if (ap < warInfo.cost) { @@ -143,8 +143,8 @@ export class ExpeditionBattleHandler { // 前置关卡是否挑战过 let previousGk = warInfo.previousGk; if (previousGk) { - let preBattle = await BattleRecordModel.getBattleRecordByIdAndStatus(roleId, previousGk, 1); - if (!preBattle) return resResult(STATUS.BATTLE_NEED_PREVIOUS_GK); + let preBattle = role.warStar.findIndex(cur => cur.id == previousGk); + if (preBattle == -1) return resResult(STATUS.BATTLE_NEED_PREVIOUS_GK); } let { isOK, hids } = await checkBattleHeroes(roleId, seqIds);