diff --git a/game-server/app/servers/activity/handler/activityHandler.ts b/game-server/app/servers/activity/handler/activityHandler.ts index 10e0667df..9e5075afa 100644 --- a/game-server/app/servers/activity/handler/activityHandler.ts +++ b/game-server/app/servers/activity/handler/activityHandler.ts @@ -49,7 +49,7 @@ export class ActivityHandler { type: groupData.type, activities: playerGroupActivityArray, }); - // console.log(`${roleId} 活动合集 groupId:${groupData.groupId}, 合集类型${groupData.type}, 一共${playerGroupActivityArray.length}个`) + console.log(`${roleId} 活动合集 groupId:${groupData.groupId}, 合集类型${groupData.type}, 一共${playerGroupActivityArray.length}个`) } return resResult(STATUS.SUCCESS, { playerActivityArray, playerGroupArray }); diff --git a/game-server/app/servers/activity/remote/activityRemote.ts b/game-server/app/servers/activity/remote/activityRemote.ts index 9095469b4..0aa9357de 100644 --- a/game-server/app/servers/activity/remote/activityRemote.ts +++ b/game-server/app/servers/activity/remote/activityRemote.ts @@ -77,6 +77,10 @@ export class ActivityRemote { this.activityByType.get(serverId).get(activity.type).push(activity.activityId); } } + + this.app.set('activityByServer', this.activityByServer); + this.app.set('activityByType', this.activityByType); + this.app.set('activities', this.activities); } public async updateActivities(activities: ActivityModelType[]) { @@ -86,6 +90,10 @@ export class ActivityRemote { activityIds.push(activity.activityId); } this.setActivityTypeAndServer(); + + this.app.set('activityByServer', this.activityByServer); + this.app.set('activityByType', this.activityByType); + this.app.set('activities', this.activities); } public async deleteActivities(activityIds: number[]) { @@ -93,11 +101,19 @@ export class ActivityRemote { this.activities.delete(activityId); } this.setActivityTypeAndServer(); + + this.app.set('activityByServer', this.activityByServer); + this.app.set('activityByType', this.activityByType); + this.app.set('activities', this.activities); } public async saveGroupToServer(groupId: number, serverIds: number[]) { this.groupToServer.set(groupId, serverIds); this.setActivityTypeAndServer(); + + this.app.set('activityByServer', this.activityByServer); + this.app.set('activityByType', this.activityByType); + this.app.set('activities', this.activities); } public async saveActivitiesToGroup(groupId: number, activities: number[]) { diff --git a/shared/domain/activityField/activityField.ts b/shared/domain/activityField/activityField.ts index 4591207c9..343df9b61 100644 --- a/shared/domain/activityField/activityField.ts +++ b/shared/domain/activityField/activityField.ts @@ -33,6 +33,7 @@ export abstract class ActivityBase { this.type = activityData.type; // console.log('今天是活动第几天', activityData.beginTime, new Date, this.todayIndex) + console.log('***** activityData', activityData.timeType) switch (activityData.timeType) { case ACTIVITY_TIME_TYPE.SERVER_OPEN_TIME: { this.beginTime = moment(SERVER_OPEN_TIME).add(this.delayDay, 'd').startOf('d').add(REFRESH_TIME, 'h').valueOf(); @@ -70,8 +71,8 @@ export abstract class ActivityBase { this.nextRefreshTime = moment(this.beginTime).add(activityData.interval * this.roundIndex, 'second').valueOf(); this.todayIndex = Math.ceil(((moment(new Date).valueOf() - this.beginTime) / (24 * 60 * 60 * 1000))); } - // console.log('活动时间数据...', '活动id:', activityData.activityId, '类型:', activityData.timeType, '开始时间:', this.beginTime, moment(this.beginTime).toDate(), - // '结束:', this.endTime, moment(this.endTime).toDate(), - // '今天第几天:', this.todayIndex, '回合:', this.roundIndex, '下次刷新:', this.nextRefreshTime, moment(this.nextRefreshTime).toDate()) + console.log('活动时间数据...', '活动id:', activityData.activityId, '类型:', activityData.timeType, '开始时间:', this.beginTime, moment(this.beginTime).toDate(), + '结束:', this.endTime, moment(this.endTime).toDate(), + '今天第几天:', this.todayIndex, '回合:', this.roundIndex, '下次刷新:', this.nextRefreshTime, moment(this.nextRefreshTime).toDate()) } }