diff --git a/game-server/app/services/timeTaskService.ts b/game-server/app/services/timeTaskService.ts index 31257a3db..abb252d22 100644 --- a/game-server/app/services/timeTaskService.ts +++ b/game-server/app/services/timeTaskService.ts @@ -196,16 +196,15 @@ export async function setPvpSeasonNumToRemote(pvpConfig: PVPConfigType) { export async function setPvpSeasonNum(pvpConfig?: PVPConfigType) { if(!pvpConfig) { pvpConfig = await PVPConfigModel.findCurPVPConfig(); - if(!pvpConfig) return; } let now = nowSeconds(); - pinus.app.set('pvpSeasonNum', pvpConfig.seasonNum); - pinus.app.set('pvpSeasonStartTime', pvpConfig.seasonStartTime); - pinus.app.set('pvpSeasonEndTime', pvpConfig.seasonEndTime); - pinus.app.set('pvpSeasonRewardTime', pvpConfig.seasonRewardTime); - if(pvpConfig.seasonEndTime <= now) { // 赛季结束,需要显示下一赛季的倒计时 - let nextPvpConfig = await PVPConfigModel.findPVPConfig(pvpConfig.seasonNum + 1); + pinus.app.set('pvpSeasonNum', pvpConfig?.seasonNum||0); + pinus.app.set('pvpSeasonStartTime', pvpConfig?.seasonStartTime||0); + pinus.app.set('pvpSeasonEndTime', pvpConfig?.seasonEndTime||0); + pinus.app.set('pvpSeasonRewardTime', pvpConfig?.seasonRewardTime||0); + if(!pvpConfig || pvpConfig.seasonEndTime <= now) { // 赛季结束,需要显示下一赛季的倒计时 + let nextPvpConfig = await PVPConfigModel.findPVPConfig(pvpConfig? pvpConfig.seasonNum + 1: 1); if(nextPvpConfig) { pinus.app.set('pvpSeasonStartTime', nextPvpConfig.seasonStartTime); }