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

活动：修改七天乐开启时间

Browse Source
This commit is contained in:
qiaoxin
2021-05-28 19:19:52 +08:00
parent 64e16935e1
commit 6adb33a41a
1 changed files with 72 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/activity/handler/activityHandler.ts
+72 -63
View File
@@ -32,79 +32,88 @@ export class ActivityHandler {
* @memberof ActivityHandler * @memberof ActivityHandler
*/ */
async getAllOpenActivity(msg: { hid: number, lv: number }, session: BackendSession) { async getAllOpenActivity(msg: { hid: number, lv: number }, session: BackendSession) {
const { hid, lv } = msg; const { } = msg;
const roleId = session.get('roleId'); const roleId = session.get('roleId');
const serverId = session.get('serverId'); const serverId = session.get('serverId');
let test = true;
let playerActivityArray = []; let playerActivityArray = [];
//七天乐活动-成长任务 1 2 3 //七天乐活动-成长任务 1 2 3
{ {
let sevenData = []; let endTime = moment(SERVER_OPEN_TIME).startOf('d').add(7, 'd').toDate();
let growthData = await growthActivity(serverId, roleId); if (new Date() < endTime || test) {//开启中，开服7天后过期
if (growthData) { let sevenData = [];
sevenData.push({ let growthData = await growthActivity(serverId, roleId);
type: ACTIVITY_TYPE.TASK_GROWTH, if (growthData) {
activityId: growthData.activityId, sevenData.push({
data: growthData, type: ACTIVITY_TYPE.TASK_GROWTH,
}); activityId: growthData.activityId,
} data: growthData,
let dailyChallengesData = await dailyChallengesActivity(serverId, roleId); });
if (dailyChallengesData) { }
sevenData.push({ let dailyChallengesData = await dailyChallengesActivity(serverId, roleId);
type: ACTIVITY_TYPE.TASK_DAILY_CHALLENGES, if (dailyChallengesData) {
activityId: dailyChallengesData.activityId, sevenData.push({
data: dailyChallengesData, type: ACTIVITY_TYPE.TASK_DAILY_CHALLENGES,
}); activityId: dailyChallengesData.activityId,
} data: dailyChallengesData,
let dailyGiftsData = await dailyGiftsActivity(serverId, roleId); });
if (dailyGiftsData) { }
sevenData.push({ let dailyGiftsData = await dailyGiftsActivity(serverId, roleId);
type: ACTIVITY_TYPE.DAILY_DISCOUNT_GIFT, if (dailyGiftsData) {
activityId: dailyGiftsData.activityId, sevenData.push({
data: dailyGiftsData, type: ACTIVITY_TYPE.DAILY_DISCOUNT_GIFT,
}); activityId: dailyGiftsData.activityId,
} data: dailyGiftsData,
if (sevenData.length > 0) { });
playerActivityArray.push({ }
type: ACTIVITY_TYPE.SEVEN_DAY, if (sevenData.length > 0) {
activityId: 0, playerActivityArray.push({
data: sevenData, type: ACTIVITY_TYPE.SEVEN_DAY,
}); activityId: 0,
data: sevenData,
});
}
} }
} }
//14天乐活动-成长任务 1 2 3 //14天乐活动-成长任务 1 2 3
{ {
let sevenData = []; let beginTime = moment(SERVER_OPEN_TIME).startOf('d').add(7, 'd').toDate();
let growthData = await growthActivity(serverId, roleId); let endTime = moment(SERVER_OPEN_TIME).startOf('d').add(7, 'd').toDate();
if (growthData) { let curDate = new Date()
sevenData.push({ if (curDate > beginTime && curDate < endTime) {//开启中，开服7天后开启，开服第21天结束
type: ACTIVITY_TYPE.TASK_GROWTH, let sevenData = [];
activityId: growthData.activityId, let growthData = await growthActivity(serverId, roleId);
data: growthData, if (growthData) {
}); sevenData.push({
} type: ACTIVITY_TYPE.TASK_GROWTH,
let dailyChallengesData = await dailyChallengesActivity(serverId, roleId); activityId: growthData.activityId,
if (dailyChallengesData) { data: growthData,
sevenData.push({ });
type: ACTIVITY_TYPE.TASK_DAILY_CHALLENGES, }
activityId: dailyChallengesData.activityId, let dailyChallengesData = await dailyChallengesActivity(serverId, roleId);
data: dailyChallengesData, if (dailyChallengesData) {
}); sevenData.push({
} type: ACTIVITY_TYPE.TASK_DAILY_CHALLENGES,
let dailyGiftsData = await dailyGiftsActivity(serverId, roleId); activityId: dailyChallengesData.activityId,
if (dailyGiftsData) { data: dailyChallengesData,
sevenData.push({ });
type: ACTIVITY_TYPE.DAILY_DISCOUNT_GIFT, }
activityId: dailyGiftsData.activityId, let dailyGiftsData = await dailyGiftsActivity(serverId, roleId);
data: dailyGiftsData, if (dailyGiftsData) {
}); sevenData.push({
} type: ACTIVITY_TYPE.DAILY_DISCOUNT_GIFT,
if (sevenData.length > 0) { activityId: dailyGiftsData.activityId,
playerActivityArray.push({ data: dailyGiftsData,
type: ACTIVITY_TYPE.FOURTEEN_DAY, });
activityId: 0, }
data: sevenData, if (sevenData.length > 0) {
}); playerActivityArray.push({
type: ACTIVITY_TYPE.FOURTEEN_DAY,
activityId: 0,
data: sevenData,
});
}
} }
} }
//签到 4 //签到 4