diff --git a/game-server/app/services/role/rewardService.ts b/game-server/app/services/role/rewardService.ts index 93e0c698d..d9a3e814c 100644 --- a/game-server/app/services/role/rewardService.ts +++ b/game-server/app/services/role/rewardService.ts @@ -479,9 +479,9 @@ export async function addActivityItem(serverId: number, roleId: string, roleName let { id, count } = data; let { name: itemName, activityType } = gameData.goods.get(id); let activities = await getActivitiesByType(serverId, activityType); - if(activities.length > 0) { - let activityData = getActivityData(activities[0], createTime, serverTime); - if(!activityData || !activityData.canShow()) return null; + for(let activity of activities) { + let activityData = getActivityData(activity, createTime, serverTime); + if(!activityData || !activityData.canShow()) continue; let item = await ActivityItemModel.increaseActivityItem(roleId, id, count, { roleId, roleName, itemName, id, expireTime: Math.floor(activityData.nextRefreshTime/1000) }); return { id: item.id, count: item.count, inc: count, expireTime: item.expireTime, reason }; }