diff --git a/game-server/app/servers/activity/handler/activityHandler.ts b/game-server/app/servers/activity/handler/activityHandler.ts index 691e3cd37..ed0de0d86 100644 --- a/game-server/app/servers/activity/handler/activityHandler.ts +++ b/game-server/app/servers/activity/handler/activityHandler.ts @@ -41,8 +41,9 @@ export class ActivityHandler { for (let activityId of groupData.activities) { let activityData = await getActivityById(activityId); if (activityData) { - let playerActivityData = await getActivity(serverId, roleId, activityId, activityData.type) - if(playerActivityData.beginTime <= Date.now() && playerActivityData.endTime >= Date.now()) { + let playerActivityData = await getActivity(serverId, roleId, activityId, activityData.type); + console.log('******', !!playerActivityData, activityId, activityData.type) + if(playerActivityData && playerActivityData.beginTime <= Date.now() && playerActivityData.endTime >= Date.now()) { if (playerActivityData) playerGroupActivityArray.push(playerActivityData); } }