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-03-15 18:20:29 +08:00
parent 8a6627ea13
commit 319d4cf454
14 changed files with 887 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/gmService.ts
+21 -20
View File
@@ -251,10 +251,11 @@ export function getActivityProducts(activity: ActivityModelType) {
case ACTIVITY_TYPE.POP_UP_SHOP://弹出礼包
{
let products: { label: string, value: string }[] = [];
let allTaskData: any[] = JSON.parse(activity.data);
for(let task of allTaskData) {
let data = new PopUpShopData(task, activity.activityId);
products.push(getDicRMB(data.productID))
let data = new PopUpShopData(activity);
for(let { items } of data.packages) {
for(let item of items) {
products.push(getDicRMB(item.productID));
}
}
return products;
}
@@ -299,23 +300,23 @@ export async function getParamStr(activity: ActivityModelType, productID: string
let task = allTaskData.find(cur => cur.productID == productID);
if(!task) break;
let playerRecords = await ActivityPopUpShopModel.findAllOpenData(role.serverId, activity.activityId, role.roleId);
let playerRecord: ActivityPopUpShopModelType;
for(let record of playerRecords) {
let playerData = new PopUpShopData(task, activity.activityId);
playerData.setPlayerRecords(record);
if (record && playerData.buyCount < task.count) {
playerRecord = record; break;
}
}
console.log('####', playerRecord, task)
if(!playerRecord) {
let beginTime = new Date();
let endTime = moment(new Date()).add(task.duration, 'h').toDate();
playerRecord = await ActivityPopUpShopModel.addTaskPushMessage(role.serverId, activity.activityId, role.roleId, task.id, task.taskType, task.condition, beginTime, endTime);
}
// let playerRecords = await ActivityPopUpShopModel.findAllOpenData(role.serverId, activity.activityId, role.roleId);
// let playerRecord: ActivityPopUpShopModelType;
// for(let record of playerRecords) {
// let playerData = new PopUpShopData(task, activity.activityId);
// playerData.setPlayerRecords(record);
// if (record && playerData.buyCount < task.count) {
// playerRecord = record; break;
// }
// }
// console.log('####', playerRecord, task)
// if(!playerRecord) {
// let beginTime = new Date();
// let endTime = moment(new Date()).add(task.duration, 'h').toDate();
// playerRecord = await ActivityPopUpShopModel.addTaskPushMessage(role.serverId, activity.activityId, role.roleId, task.id, task.taskType, task.condition, beginTime, endTime);
// }
param['beginTimeStamp'] = playerRecord.beginTime.getTime();
// param['beginTimeStamp'] = playerRecord.beginTime.getTime();
break;
case ACTIVITY_TYPE.REFRESH_SHOP:
let { activityGroupId } = await ServerlistModel.findByServerId(role.serverId);