xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

活动：修复更新

Browse Source
This commit is contained in:
luying
2021-12-24 10:56:40 +08:00
parent 680f5d2cef
commit 7110b6c3a1
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/activity/handler/activityHandler.ts
+1 -1
View File
@@ -49,7 +49,7 @@ export class ActivityHandler {
type: groupData.type, type: groupData.type,
activities: playerGroupActivityArray, 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 }); return resResult(STATUS.SUCCESS, { playerActivityArray, playerGroupArray });
game-server/app/servers/activity/remote/activityRemote.ts
+16
View File
@@ -77,6 +77,10 @@ export class ActivityRemote {
this.activityByType.get(serverId).get(activity.type).push(activity.activityId); 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[]) { public async updateActivities(activities: ActivityModelType[]) {
@@ -86,6 +90,10 @@ export class ActivityRemote {
activityIds.push(activity.activityId); activityIds.push(activity.activityId);
} }
this.setActivityTypeAndServer(); 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[]) { public async deleteActivities(activityIds: number[]) {
@@ -93,11 +101,19 @@ export class ActivityRemote {
this.activities.delete(activityId); this.activities.delete(activityId);
} }
this.setActivityTypeAndServer(); 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[]) { public async saveGroupToServer(groupId: number, serverIds: number[]) {
this.groupToServer.set(groupId, serverIds); this.groupToServer.set(groupId, serverIds);
this.setActivityTypeAndServer(); 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[]) { public async saveActivitiesToGroup(groupId: number, activities: number[]) {
shared/domain/activityField/activityField.ts
+4 -3
View File
@@ -33,6 +33,7 @@ export abstract class ActivityBase {
this.type = activityData.type; this.type = activityData.type;
// console.log('今天是活动第几天', activityData.beginTime, new Date, this.todayIndex) // console.log('今天是活动第几天', activityData.beginTime, new Date, this.todayIndex)
console.log('***** activityData', activityData.timeType)
switch (activityData.timeType) { switch (activityData.timeType) {
case ACTIVITY_TIME_TYPE.SERVER_OPEN_TIME: { case ACTIVITY_TIME_TYPE.SERVER_OPEN_TIME: {
this.beginTime = moment(SERVER_OPEN_TIME).add(this.delayDay, 'd').startOf('d').add(REFRESH_TIME, 'h').valueOf(); 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.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))); 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(), console.log('活动时间数据...', '活动id:', activityData.activityId, '类型:', activityData.timeType, '开始时间:', this.beginTime, moment(this.beginTime).toDate(),
// '结束:', this.endTime, moment(this.endTime).toDate(), '结束:', this.endTime, moment(this.endTime).toDate(),
// '今天第几天:', this.todayIndex, '回合:', this.roundIndex, '下次刷新:', this.nextRefreshTime, moment(this.nextRefreshTime).toDate()) '今天第几天:', this.todayIndex, '回合:', this.roundIndex, '下次刷新:', this.nextRefreshTime, moment(this.nextRefreshTime).toDate())
} }
} }