diff --git a/game-server/app/services/timeTaskService.ts b/game-server/app/services/timeTaskService.ts index b963116f3..856c9ad2a 100644 --- a/game-server/app/services/timeTaskService.ts +++ b/game-server/app/services/timeTaskService.ts @@ -863,10 +863,10 @@ export async function initHiddenData(data?: HiddenDataModelType, nextData?: Hidd setHiddenData(data?.heroes, data?.goods, nextData?.refTime); } -export async function initHiddenDataSchedule(isInit: boolean, data?: HiddenDataModelType) { +export async function initHiddenDataSchedule(isInit: boolean) { if(hiddenDataJob) hiddenDataJob.cancel(); let now = nowSeconds(); - if(!data) data = await HiddenDataModel.findCurData(now); + let data = await HiddenDataModel.findCurData(now); let nextData = await HiddenDataModel.findNextData(data?.refTime??now); if(isInit) { @@ -876,10 +876,11 @@ export async function initHiddenDataSchedule(isInit: boolean, data?: HiddenDataM } console.log('######## initHiddenDataSchedule', nextData); if(nextData) { + if(scheduledJobs['hiddenData']) scheduledJobs['hiddenData'].cancel(); scheduleJob(`hiddenData`, nextData.refTime * 1000, async () => { console.log('######## hiddenDataSchedule', nextData); - await initHiddenDataSchedule(false, nextData); + await initHiddenDataSchedule(false); }); } }