diff --git a/game-server/app/services/activity/activityService.ts b/game-server/app/services/activity/activityService.ts index 567008b9e..5dffc605a 100644 --- a/game-server/app/services/activity/activityService.ts +++ b/game-server/app/services/activity/activityService.ts @@ -252,12 +252,17 @@ export function _getActivitiesByType(serverId: number, type: number) { } export function _getActivities() { - let activities = pinus.app.get('activities'); - let result: ActivityInRemote[] = []; - for(let [_, activity] of activities) { - result.push(activity); + try { + let activities = pinus.app.get('activities'); + console.log('***** activities', activities); + let result: ActivityInRemote[] = []; + for(let [_, activity] of activities) { + result.push(activity); + } + return result; + } catch(e) { + console.log('******** activity e', e) } - return result; } diff --git a/game-server/app/services/timeTaskService.ts b/game-server/app/services/timeTaskService.ts index 1b21c061f..4b772dbcc 100644 --- a/game-server/app/services/timeTaskService.ts +++ b/game-server/app/services/timeTaskService.ts @@ -446,8 +446,8 @@ async function setMaintenance(batchCode: string) { if(now > maintenance.startTime - 5 * 60) { maintenanceNotifySchedule(batchCode); } else { + if(scheduledJobs[`maintenNotify${batchCode}`]) scheduledJobs[`maintenNotify${batchCode}`].cancel(); scheduleJob(`maintenNotify${batchCode}`, (maintenance.startTime - 5 * 60) * 1000, () => { - console.log('******* 通知') maintenanceNotifySchedule(batchCode); }) } diff --git a/game-server/config/servers.ts b/game-server/config/servers.ts index b071a3210..c8e3677d3 100644 --- a/game-server/config/servers.ts +++ b/game-server/config/servers.ts @@ -304,8 +304,5 @@ module.exports = { 'guild': [ { 'id': 'guild-server-3', 'host': '172.16.4.106', 'port': 6071 }, ], - 'activity': [ - { 'id': 'activity-server-2', 'host': '172.16.4.106', 'port': 6072 }, - ], }, };