pvp: 修复可能重复结算赛季问题

This commit is contained in:
luying
2021-11-08 18:07:30 +08:00
parent fb6a5a785e
commit 6854e82169
2 changed files with 9 additions and 6 deletions

View File

@@ -103,7 +103,7 @@ async function setPvpSeason(isForce?: boolean, hour?: number) {
console.log(`******** setPvpSeason2 during-${during}, seasonEndTime-${pvpConfig?.seasonEndTime}, now-${nowSeconds()}`)
if(!pvpConfig || pvpConfig.seasonEndTime <= nowSeconds() || isForce) {
if(pvpConfig && !pvpConfig.hasSettleReward) {
await pvpSeasonEnd(pvpConfig);
await pvpSeasonEnd(pvpConfig.seasonNum);
}
let lastSeasonNum = pvpConfig? pvpConfig.seasonNum: 0;
@@ -153,10 +153,10 @@ async function setPvpSeasonMakeRewardJob(pvpConfig: PVPConfigType) {
}
if(!pvpConfig) return;
if(pvpConfig.seasonRewardTime < nowSeconds() && !pvpConfig.hasSettleReward) { // 未发奖励
await pvpSeasonEnd(pvpConfig);
await pvpSeasonEnd(pvpConfig.seasonNum);
} else {
seasonMakeRewardTimJobId = scheduleJob('seasonMakeRewardTimJobId', pvpConfig.seasonRewardTime, async () => {
await pvpSeasonEnd(pvpConfig);
await pvpSeasonEnd(pvpConfig.seasonNum);
});
}
}