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-06-04 11:54:47 +08:00
parent f77de8eb78
commit d6134ce67e
12 changed files with 852 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
game-server/app/servers/activity/handler/activityHandler.ts
View File

@@ -17,6 +17,7 @@ import { playerThirtyDaysActivityDays, thirtyDaysActivity } from '../../../servi
import { dailyRMBGiftsActivity } from '../../../services/dailyRMBGiftsService';
import { popUpShopActivity } from '../../../services/popUpShopService';
import { vipRechargeMoneyActivity } from '../../../services/vipRechargeMoneyService';
import { sevenDaysActivity } from '../../../services/sevenDaysService';
// import { ActivityDailyChallengesModel } from '../../../db/ActivityDailyChallenges';
// import { isComplete } from '../../../pubUtils/taskUtil';
@@ -42,44 +43,44 @@ export class ActivityHandler {
let test = true;
let playerActivityArray = [];
//七天乐活动-成长任务 1 2 3
{
let endTime = moment(SERVER_OPEN_TIME).startOf('d').add(7, 'd').toDate();
if (new Date() < endTime || test) {//开启中，开服7天后过期
let sevenData = [];
let growthData = await growthActivity(serverId, roleId);
if (growthData) {
sevenData.push({
type: ACTIVITY_TYPE.TASK_GROWTH,
activityId: growthData.activityId,
data: growthData,
});
}
let dailyChallengesData = await dailyChallengesActivity(serverId, roleId);
if (dailyChallengesData) {
sevenData.push({
type: ACTIVITY_TYPE.TASK_DAILY_CHALLENGES,
activityId: dailyChallengesData.activityId,
data: dailyChallengesData,
});
}
let dailyGiftsData = await dailyGiftsActivity(serverId, roleId);
if (dailyGiftsData) {
sevenData.push({
type: ACTIVITY_TYPE.DAILY_DISCOUNT_GIFT,
activityId: dailyGiftsData.activityId,
data: dailyGiftsData,
});
}
if (sevenData.length > 0) {
playerActivityArray.push({
type: ACTIVITY_TYPE.SEVEN_DAY,
activityId: 0,
data: sevenData,
});
}
}
}
// //七天乐活动-成长任务 1 2 3
// {
// let endTime = moment(SERVER_OPEN_TIME).startOf('d').add(7, 'd').toDate();
// if (new Date() < endTime || test) {//开启中，开服7天后过期
// let sevenData = [];
// let growthData = await growthActivity(serverId, roleId);
// if (growthData) {
// sevenData.push({
// type: ACTIVITY_TYPE.TASK_GROWTH,
// activityId: growthData.activityId,
// data: growthData,
// });
// }
// let dailyChallengesData = await dailyChallengesActivity(serverId, roleId);
// if (dailyChallengesData) {
// sevenData.push({
// type: ACTIVITY_TYPE.TASK_DAILY_CHALLENGES,
// activityId: dailyChallengesData.activityId,
// data: dailyChallengesData,
// });
// }
// let dailyGiftsData = await dailyGiftsActivity(serverId, roleId);
// if (dailyGiftsData) {
// sevenData.push({
// type: ACTIVITY_TYPE.DAILY_DISCOUNT_GIFT,
// activityId: dailyGiftsData.activityId,
// data: dailyGiftsData,
// });
// }
// if (sevenData.length > 0) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.SEVEN_DAY,
// activityId: 0,
// data: sevenData,
// });
// }
// }
// }
//14天乐活动-成长任务 1 2 3
// {
// let beginTime = moment(SERVER_OPEN_TIME).startOf('d').add(7, 'd').toDate();
@@ -383,6 +384,42 @@ export class ActivityHandler {
});
}
}
//七天乐活动 27
{
let data = await sevenDaysActivity(serverId, roleId, ACTIVITY_TYPE.SEVEN_DAY);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.SEVEN_DAY,
activityId: data.activityId,
data,
});
}
}
//十四天乐活动 28
{
let data = await sevenDaysActivity(serverId, roleId, ACTIVITY_TYPE.FOURTEEN_DAY);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.FOURTEEN_DAY,
activityId: data.activityId,
data,
});
}
}
//通用七天乐活动 29
{
let data = await sevenDaysActivity(serverId, roleId, ACTIVITY_TYPE.COMMON_SEVEN_DAY);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.COMMON_SEVEN_DAY,
activityId: data.activityId,
data,
});
}
}
return resResult(STATUS.SUCCESS, { playerActivityArray });
}