远征:删除跳关的一部分返回,skip之后改调用getStatus
This commit is contained in:
@@ -19,7 +19,6 @@ import * as dicParam from '../../../pubUtils/dicParam';
|
|||||||
import { getSeconds, nowSeconds } from '../../../pubUtils/timeUtil';
|
import { getSeconds, nowSeconds } from '../../../pubUtils/timeUtil';
|
||||||
import { reportTAEvent } from '../../../services/sdkService';
|
import { reportTAEvent } from '../../../services/sdkService';
|
||||||
import { getSumCe } from '../../../services/playerCeService';
|
import { getSumCe } from '../../../services/playerCeService';
|
||||||
import { HeroModel } from '../../../db/Hero';
|
|
||||||
import { vipCanSkipExpedition } from '../../../services/activity/monthlyTicketService';
|
import { vipCanSkipExpedition } from '../../../services/activity/monthlyTicketService';
|
||||||
|
|
||||||
export default function (app: Application) {
|
export default function (app: Application) {
|
||||||
@@ -240,13 +239,6 @@ export class ExpeditionBattleHandler {
|
|||||||
if (gameData.expedition.has(expeditionId + 1)) {
|
if (gameData.expedition.has(expeditionId + 1)) {
|
||||||
await findOrCreateEnemies(roleId, expeditionRecord.myCe, expeditionCode, expeditionId + 1, EXPEDITION_WAR_RECORD_STATUS.WAITING);
|
await findOrCreateEnemies(roleId, expeditionRecord.myCe, expeditionCode, expeditionId + 1, EXPEDITION_WAR_RECORD_STATUS.WAITING);
|
||||||
}
|
}
|
||||||
|
|
||||||
let expeditionWarRecords = await ExpeditionWarRecordModel.getRecordByCode(expeditionCode);
|
|
||||||
let curLv = 0;
|
|
||||||
if (expeditionWarRecords.length > 0) {
|
|
||||||
curLv = expeditionWarRecords[expeditionWarRecords.length - 1].expeditionId;
|
|
||||||
}
|
|
||||||
|
|
||||||
await checkTaskInSkipExpedition(serverId, roleId, sid, battleId);
|
await checkTaskInSkipExpedition(serverId, roleId, sid, battleId);
|
||||||
|
|
||||||
return resResult(STATUS.SUCCESS, {
|
return resResult(STATUS.SUCCESS, {
|
||||||
@@ -254,9 +246,7 @@ export class ExpeditionBattleHandler {
|
|||||||
expeditionId,
|
expeditionId,
|
||||||
battleId,
|
battleId,
|
||||||
goods: reward,
|
goods: reward,
|
||||||
expeditionPoint: role.expeditionPoint,
|
expeditionPoint: role.expeditionPoint
|
||||||
expeditionWarRecord: expeditionWarRecords,
|
|
||||||
curLv
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user