活动：修改获取活动逻辑，从serverlist上剥离

2022-04-07 11:38:33 +08:00
parent 0d7b435f1f
commit 765aff9cf0
31 changed files with 148 additions and 152 deletions
--- a/game-server/app/services/activity/activityService.ts
+++ b/game-server/app/services/activity/activityService.ts
@@ -283,7 +283,7 @@ export function _getActivitiesByType(serverId: number, type: number) {
    let result: ActivityInRemote[] = [];
    for(let activityId of activityByType) {
        let activity = activities.get(activityId);
-        if(activity && activity.beginTime <= Date.now()) {
+        if(activity && activity.beginTime <= Date.now() && activity.endTime >= Date.now()) {
            result.push(activity);
        }
    }