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-01 15:01:00 +08:00
parent a7c964916c
commit c49e861209
4 changed files with 64 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/activity/handler/activityHandler.ts
+47 -45
View File
@@ -80,45 +80,45 @@ export class ActivityHandler {
} }
} }
//14天乐活动-成长任务 1 2 3 //14天乐活动-成长任务 1 2 3
{ // {
let beginTime = moment(SERVER_OPEN_TIME).startOf('d').add(7, 'd').toDate(); // let beginTime = moment(SERVER_OPEN_TIME).startOf('d').add(7, 'd').toDate();
let endTime = moment(SERVER_OPEN_TIME).startOf('d').add(7, 'd').toDate(); // let endTime = moment(SERVER_OPEN_TIME).startOf('d').add(7, 'd').toDate();
let curDate = new Date() // let curDate = new Date()
if (curDate > beginTime && curDate < endTime) {//开启中，开服7天后开启，开服第21天结束 // if (curDate > beginTime && curDate < endTime) {//开启中，开服7天后开启，开服第21天结束
let sevenData = []; // let sevenData = [];
let growthData = await growthActivity(serverId, roleId); // let growthData = await growthActivity(serverId, roleId);
if (growthData) { // if (growthData) {
sevenData.push({ // sevenData.push({
type: ACTIVITY_TYPE.TASK_GROWTH, // type: ACTIVITY_TYPE.TASK_GROWTH,
activityId: growthData.activityId, // activityId: growthData.activityId,
data: growthData, // data: growthData,
}); // });
} // }
let dailyChallengesData = await dailyChallengesActivity(serverId, roleId); // let dailyChallengesData = await dailyChallengesActivity(serverId, roleId);
if (dailyChallengesData) { // if (dailyChallengesData) {
sevenData.push({ // sevenData.push({
type: ACTIVITY_TYPE.TASK_DAILY_CHALLENGES, // type: ACTIVITY_TYPE.TASK_DAILY_CHALLENGES,
activityId: dailyChallengesData.activityId, // activityId: dailyChallengesData.activityId,
data: dailyChallengesData, // data: dailyChallengesData,
}); // });
} // }
let dailyGiftsData = await dailyGiftsActivity(serverId, roleId); // let dailyGiftsData = await dailyGiftsActivity(serverId, roleId);
if (dailyGiftsData) { // if (dailyGiftsData) {
sevenData.push({ // sevenData.push({
type: ACTIVITY_TYPE.DAILY_DISCOUNT_GIFT, // type: ACTIVITY_TYPE.DAILY_DISCOUNT_GIFT,
activityId: dailyGiftsData.activityId, // activityId: dailyGiftsData.activityId,
data: dailyGiftsData, // data: dailyGiftsData,
}); // });
} // }
if (sevenData.length > 0) { // if (sevenData.length > 0) {
playerActivityArray.push({ // playerActivityArray.push({
type: ACTIVITY_TYPE.FOURTEEN_DAY, // type: ACTIVITY_TYPE.FOURTEEN_DAY,
activityId: 0, // activityId: 0,
data: sevenData, // data: sevenData,
}); // });
} // }
} // }
} // }
//签到 4 //签到 4
{ {
let data = await signInActivity(serverId, roleId); let data = await signInActivity(serverId, roleId);
@@ -336,12 +336,14 @@ export class ActivityHandler {
//弹出商店 24 //弹出商店 24
{ {
let data = await popUpShopActivity(serverId, roleId); let data = await popUpShopActivity(serverId, roleId);
if (data) { if (data && data.length > 0) {
playerActivityArray.push({ for (let obj of data) {
type: ACTIVITY_TYPE.POP_UP_SHOP, playerActivityArray.push({
activityId: 0, type: ACTIVITY_TYPE.POP_UP_SHOP,
data, activityId: obj.activityId,
}); data: obj,
});
}
} }
} }
shared/consts/constModules/activityConst.ts
+4 -4
View File
@@ -30,10 +30,10 @@ export enum ACTIVITY_TYPE {
DAILY_RMB_GIFTS = 22, // 每日特惠RMB购买，一次性购买7天礼包 DAILY_RMB_GIFTS = 22, // 每日特惠RMB购买，一次性购买7天礼包
TREASURE_HUNT = 23, // 寻宝骑兵活动 TREASURE_HUNT = 23, // 寻宝骑兵活动
POP_UP_SHOP = 24, // 弹出商店 POP_UP_SHOP = 24, // 弹出商店
FOURTEEN_DAY = 25, // 14天乐活动(虚) // FOURTEEN_DAY = 25, // 14天乐活动(虚)
FOURTEEN_DAILY_DISCOUNT_GIFT = 26, // 14天乐活动,每日特惠礼包 // FOURTEEN_DAILY_DISCOUNT_GIFT = 26, // 14天乐活动,每日特惠礼包
FOURTEEN_TASK_GROWTH = 27, // 14天乐成长任务活动 // FOURTEEN_TASK_GROWTH = 27, // 14天乐成长任务活动
FOURTEEN_TASK_DAILY_CHALLENGES = 28, // 14天乐今日挑战活动 // FOURTEEN_TASK_DAILY_CHALLENGES = 28, // 14天乐今日挑战活动
} }
/** /**
shared/domain/activityField/popUpShopField.ts
+1 -1
View File
@@ -22,7 +22,7 @@ export class PopUpShopData {
beginTime: Date = null;//开始时间 beginTime: Date = null;//开始时间
endTime: Date = null;//结束时间 endTime: Date = null;//结束时间
//解析玩家购买记录 //解析玩家开启的商店记录
public setPlayerRecords(data: ActivityPopUpShopModelType) { public setPlayerRecords(data: ActivityPopUpShopModelType) {
if (!data) { if (!data) {
return; return;
shared/pubUtils/taskUtil.ts
+12 -2
View File
@@ -583,9 +583,19 @@ export async function accomplishTask(serverId: number, roleId: string, taskType:
let { addCount, record } = isComplete(roleId, task.taskType, task.taskParam, count, parma, recordData); let { addCount, record } = isComplete(roleId, task.taskType, task.taskParam, count, parma, recordData);
if (addCount) { if (addCount) {
if (taskType == TASK_TYPE.ROLE_LV || taskType == TASK_TYPE.ROLE_TITLE) { if (taskType == TASK_TYPE.ROLE_LV || taskType == TASK_TYPE.ROLE_TITLE) {
await ActivityPopUpShopModel.addTaskCount(serverId, activity.activityId, roleId, task.id, task.taskType, addCount); let playerRecord = await ActivityPopUpShopModel.addTaskCount(serverId, activity.activityId, roleId, task.id, task.taskType, addCount);
//推送
if (task.condition < playerRecord.totalCount) {
popShopData.setPlayerRecords(playerRecord)
pushMessage = pushMessage.concat(popShopData);
}
} else { } else {
await ActivityPopUpShopModel.addTaskCount(serverId, activity.activityId, roleId, task.id, task.taskType, addCount); let playerRecord = await ActivityPopUpShopModel.addTaskCount(serverId, activity.activityId, roleId, task.id, task.taskType, addCount);
//推送
if (task.condition < playerRecord.totalCount) {
popShopData.setPlayerRecords(playerRecord)
pushMessage = pushMessage.concat(popShopData);
}
} }
} }
if (record) { if (record) {