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

活动：游戏开始获得30天目标和每日特惠活动的数据

Browse Source
This commit is contained in:
qiaoxin
2021-05-31 14:20:27 +08:00
parent 564f2742a4
commit cb7c930d46
3 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,8 @@ import { monthlyTicketActivity } from '../../../services/monthlyTicketService';
import { rechargeMoneyActivity } from '../../../services/rechargeMoneyService';
import moment = require('moment');
import { RoleModel } from '../../../db/Role';
import { playerThirtyDaysActivityDays, thirtyDaysActivity } from '../../../services/thirtyDaysService';
import { dailyRMBGiftsActivity } from '../../../services/dailyRMBGiftsService';
// import { ActivityDailyChallengesModel } from '../../../db/ActivityDailyChallenges';
// import { isComplete } from '../../../pubUtils/taskUtil';
@@ -206,6 +208,19 @@ export class ActivityHandler {
}
}
//30天目标活动 12
{
let data = await thirtyDaysActivity(ACTIVITY_TYPE.THIRTY_DAYS, serverId, roleId);
if (data) {
let todayIndex = await playerThirtyDaysActivityDays(roleId);
playerActivityArray.push({
type: ACTIVITY_TYPE.THIRTY_DAYS,
activityId: data.activityId,
data: { playerData: data, todayIndex },
});
}
}
//首冲礼包活动 14
{
@@ -305,6 +320,17 @@ export class ActivityHandler {
});
}
}
//每日特惠RMB购买，一次性购买7天礼包 22
{
let data = await dailyRMBGiftsActivity(serverId, roleId);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.DAILY_RMB_GIFTS,
activityId: data.activityId,
data,
});
}
}
return resResult(STATUS.SUCCESS, { playerActivityArray });
}

16
game-server/app/services/dailyRMBGiftsService.ts
View File

@@ -18,18 +18,16 @@ import { ServerlistModel } from '../db/Serverlist';
*
*/
export async function dailyGiftsActivity(type: number, serverId: number, roleId: string) {
export async function dailyRMBGiftsActivity(serverId: number, roleId: string) {
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(activityGroupId, type, 1)
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.DAILY_RMB_GIFTS, new Date())
let allPlayerActivity = [];
for (let i = 0; i < activityArray.length; i++) {
let activityData = activityArray[i];
let playerData = await getPlayerDailyGiftsData(activityData.activityId, serverId, roleId);
allPlayerActivity.push(playerData)
if (activityArray.length == 0) {
return null;
}
return allPlayerActivity
let activityData = activityArray[0];
let playerData = await getPlayerDailyGiftsData(activityData.activityId, serverId, roleId);
return playerData
}
/**

14
game-server/app/services/thirtyDaysService.ts
View File

@@ -20,16 +20,14 @@ import { ServerlistModel } from '../db/Serverlist';
export async function thirtyDaysActivity(type: number, serverId: number, roleId: string) {
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(activityGroupId, type, 1)
let allPlayerActivity = [];
for (let i = 0; i < activityArray.length; i++) {
let activityData = activityArray[i];
let playerData = await getPlayerThirtyDaysData(activityData.activityId, serverId, roleId);
allPlayerActivity.push(playerData)
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, type, new Date())
if (activityArray.length == 0) {
return null;
}
let activityData = activityArray[0];
let playerData = await getPlayerThirtyDaysData(activityData.activityId, serverId, roleId);
return allPlayerActivity
return playerData
}
/**