远征：修改碾压判断条件

2022-08-24 13:36:06 +08:00
parent a97dda900d
commit 41d84a96e2
7 changed files with 17 additions and 17 deletions
@@ -205,11 +205,6 @@ export class ExpeditionBattleHandler {
            if (preBattle == -1) return resResult(STATUS.BATTLE_NEED_PREVIOUS_GK);
        }

-        // 检查战力是否足够
-        if(!vipCanSkipExpedition(dicWar.recommendedPower, topLineupCe, vipStartTime)) {
-            return resResult(STATUS.EXPEDITION_SKIP_POWER_NOT_ENOUGH)
-        }
-
        // 检查record
        let expeditionRecord = await ExpeditionRecordModel.getExpeditionRecordByCode(expeditionCode);
        let expeditionWarRecord = await ExpeditionWarRecordModel.getRecordByCodeAndId(expeditionCode, expeditionId);
@@ -220,6 +215,11 @@ export class ExpeditionBattleHandler {
            return resResult(STATUS.EXPEDITION_DUPLICATE_CHALLENGE);
        }

+        // 检查战力是否足够
+        if(!vipCanSkipExpedition(expeditionWarRecord.ce, topLineupCe, vipStartTime)) {
+            return resResult(STATUS.EXPEDITION_SKIP_POWER_NOT_ENOUGH)
+        }
+
        // 更新敌人剩余状态及战斗状态
        expeditionWarRecord = await ExpeditionWarRecordModel.updateEnemiesStatus(expeditionCode, expeditionId, EXPEDITION_WAR_RECORD_STATUS.SUCCESS, []);
        // 更新点数