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);