diff --git a/game-server/app/services/guildActivityService.ts b/game-server/app/services/guildActivityService.ts index a94b75335..396153d1d 100644 --- a/game-server/app/services/guildActivityService.ts +++ b/game-server/app/services/guildActivityService.ts @@ -82,7 +82,7 @@ export function getGuildActivityStatus(id: number) { export function getGuildActivityByDic(dicGuildActivity: DicGuildActivity) { - let startTime = getCurHourPoint(dicGuildActivity.startTime); + let startTime = getCurHourPoint(dicGuildActivity.startTime, dicGuildActivity.startMinute); let countdownTime = getCurHourPoint(dicGuildActivity.countDown); let { duringTime, openDay } = dicGuildActivity; let endTime = startTime + duringTime; diff --git a/game-server/app/services/timeTaskService.ts b/game-server/app/services/timeTaskService.ts index 8b0c413aa..6141fba15 100644 --- a/game-server/app/services/timeTaskService.ts +++ b/game-server/app/services/timeTaskService.ts @@ -343,7 +343,7 @@ async function guildActivitySchedule() { /***********guildActivitySchedule***********/ let dicGuildActivity = getTodayGuildActivity(); - scheduleJob('guildActivityStart', `0 0 ${dicGuildActivity.startTime} * * ?`, guildActivityStartSchedule); + scheduleJob('guildActivityStart', `0 ${dicGuildActivity.startMinute} ${dicGuildActivity.startTime} * * ?`, guildActivityStartSchedule); let statusResult = getGuildActivityByDic(dicGuildActivity); if(!statusResult) return; diff --git a/shared/pubUtils/dictionary/DicGuildActivity.ts b/shared/pubUtils/dictionary/DicGuildActivity.ts index 97143babf..24743b255 100644 --- a/shared/pubUtils/dictionary/DicGuildActivity.ts +++ b/shared/pubUtils/dictionary/DicGuildActivity.ts @@ -12,6 +12,8 @@ export interface DicGuildActivity { readonly duringTime: number; // 开启时间 几点 readonly startTime: number; + // 开启时间 几点 + readonly startMinute: number; // 开始倒计时 几点 readonly countDown: number; // 对应关卡id diff --git a/shared/pubUtils/timeUtil.ts b/shared/pubUtils/timeUtil.ts index 8a695e34d..91e8d0738 100644 --- a/shared/pubUtils/timeUtil.ts +++ b/shared/pubUtils/timeUtil.ts @@ -84,10 +84,10 @@ export function getHourPoint(hour: number) { return time; } -export function getCurHourPoint(hour: number) { +export function getCurHourPoint(hour: number, minute: number = 0) { var date = new Date(); date.setHours(hour); - date.setMinutes(0); + date.setMinutes(minute); date.setSeconds(0); var time = Math.floor(date.getTime() / PER_SECOND); return time; diff --git a/shared/resource/jsons/dic_zyz_guildActivity.json b/shared/resource/jsons/dic_zyz_guildActivity.json index 3f0a01b25..25937b959 100644 --- a/shared/resource/jsons/dic_zyz_guildActivity.json +++ b/shared/resource/jsons/dic_zyz_guildActivity.json @@ -5,6 +5,7 @@ "openDay": "3&0", "duringTime": 900, "startTime": 20, + "startMinute": 0, "countDown": 5, "warid": 7001, "honour": 500 @@ -15,6 +16,7 @@ "openDay": "2&4&6", "duringTime": 900, "startTime": 20, + "startMinute": 0, "countDown": 5, "warid": 7002, "honour": 500 @@ -25,6 +27,7 @@ "openDay": "1&5", "duringTime": 600, "startTime": 20, + "startMinute": 0, "countDown": 5, "warid": 0, "honour": 200