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

活动：添加开服内多少天隐藏某活动

Browse Source
This commit is contained in:
luying
2022-04-01 20:36:14 +08:00
parent a99bdae492
commit 0bb5fad55b
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/gm/handler/gmHandler.ts
+3 -3
View File
@@ -153,8 +153,8 @@ export class GmHandler {
}
}
async updateActivity(msg: { activityId: number|string, groupId: number, beginTime: number, endTime: number, type: number, data: string, timeType: number, days: number, delayDay: number, interval: number, name: string }, session: BackendSession) {
const { activityId, groupId, beginTime, endTime, type, data, timeType = 3, days = 0, delayDay = 0, interval = 0, name = '' } = msg;
async updateActivity(msg: { activityId: number|string, groupId: number, beginTime: number, endTime: number, type: number, data: string, timeType: number, days: number, delayDay: number, interval: number, name: string, hideDayByServer: number }, session: BackendSession) {
const { activityId, groupId, beginTime, endTime, type, data, timeType = 3, days = 0, delayDay = 0, interval = 0, name = '', hideDayByServer = 0 } = msg;
const uid = session.get('uid');
if (!type || !data) {
return resResult(STATUS.WRONG_PARMS);
@@ -173,7 +173,7 @@ export class GmHandler {
let checkGroup = await checkActivityGroupTypeWithId(groupId, activities);
if(!checkGroup) return resResult(STATUS.GM_ACTIVITY_NOT_FIT_GROUP_TYPE);
activities = await ActivityModel.addActivity(aids, groupId, beginTime ? new Date(beginTime) : undefined, endTime ? new Date(endTime) : undefined, type, data, timeType, days, delayDay, interval, name, uid);
activities = await ActivityModel.addActivity(aids, groupId, beginTime ? new Date(beginTime) : undefined, endTime ? new Date(endTime) : undefined, type, data, timeType, days, delayDay, interval, name, hideDayByServer, uid);
let activityServers = pinus.app.getServersByType('activity');
game-server/app/services/activity/activityService.ts
+3
View File
@@ -217,6 +217,9 @@ export async function getActivity(serverId: number, roleId: string, guildCode: s
break;
}
}
if(activityData && activityData.canShow && !activityData.canShow()) {
return null
}
return activityData;
}