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-04-27 12:11:59 +08:00
parent a7fff6bc3c
commit ed4df6fc3e
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/activity/sevenDaysService.ts
+12 -8
View File
@@ -24,8 +24,9 @@ export async function sevenDaysActivity(serverId: number, roleId: string, type:
return null; return null;
} }
let activityData: ActivityModelType = activityDataArray[0]; let activityData: ActivityModelType = activityDataArray[0];
let { createTime } = await RoleModel.findByRoleId(roleId); let createTime = await getRoleCreateTime(roleId);
let playerData = new SevenDaysData(activityData, createTime) let serverTime = await getServerCreateTime(serverId);
let playerData = new SevenDaysData(activityData, createTime, serverTime);
//成长数据 //成长数据
let playerGrowthRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(serverId, activityData.activityId, roleId); let playerGrowthRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(serverId, activityData.activityId, roleId);
let playerPointRecord: ActivityGrowthPointModelType = await ActivityGrowthPointModel.findData(serverId, activityData.activityId, roleId); let playerPointRecord: ActivityGrowthPointModelType = await ActivityGrowthPointModel.findData(serverId, activityData.activityId, roleId);
@@ -81,8 +82,9 @@ export async function getPlayerSevenDaysData(activityId: number, serverId: numbe
*/ */
export async function getPlayerSevenDaysGrowthData(activityId: number, serverId: number, roleId: string) { export async function getPlayerSevenDaysGrowthData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await getActivityById(activityId); let activityData: ActivityModelType = await getActivityById(activityId);
let { createTime } = await RoleModel.findByRoleId(roleId); let createTime = await getRoleCreateTime(roleId);
let playerData = new SevenDaysData(activityData, createTime) let serverTime = await getServerCreateTime(serverId);
let playerData = new SevenDaysData(activityData, createTime, serverTime);
//成长数据 //成长数据
let playerGrowthRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(serverId, activityId, roleId); let playerGrowthRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(serverId, activityId, roleId);
let playerPointRecord: ActivityGrowthPointModelType = await ActivityGrowthPointModel.findData(serverId, activityId, roleId); let playerPointRecord: ActivityGrowthPointModelType = await ActivityGrowthPointModel.findData(serverId, activityId, roleId);
@@ -103,8 +105,9 @@ export async function getPlayerSevenDaysGrowthData(activityId: number, serverId:
*/ */
export async function getPlayerSevenDaysDailyChallengesData(activityId: number, serverId: number, roleId: string) { export async function getPlayerSevenDaysDailyChallengesData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await getActivityById(activityId); let activityData: ActivityModelType = await getActivityById(activityId);
let { createTime } = await RoleModel.findByRoleId(roleId); let createTime = await getRoleCreateTime(roleId);
let playerData = new SevenDaysData(activityData, createTime) let serverTime = await getServerCreateTime(serverId);
let playerData = new SevenDaysData(activityData, createTime, serverTime);
//今日挑战 //今日挑战
let playerDailyChallengeRecords: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.findData(serverId, activityId, roleId); let playerDailyChallengeRecords: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.findData(serverId, activityId, roleId);
playerData.dailyChallenge.setPlayerRecords(playerDailyChallengeRecords); playerData.dailyChallenge.setPlayerRecords(playerDailyChallengeRecords);
@@ -122,8 +125,9 @@ export async function getPlayerSevenDaysDailyChallengesData(activityId: number,
export async function getPlayerSevenDaysDailyGiftsData(activityId: number, serverId: number, roleId: string) { export async function getPlayerSevenDaysDailyGiftsData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await getActivityById(activityId); let activityData: ActivityModelType = await getActivityById(activityId);
let { createTime } = await RoleModel.findByRoleId(roleId); let createTime = await getRoleCreateTime(roleId);
let playerData = new SevenDaysData(activityData, createTime) let serverTime = await getServerCreateTime(serverId);
let playerData = new SevenDaysData(activityData, createTime, serverTime);
//每日特惠礼包 //每日特惠礼包
let playerRecords: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.findData(serverId, activityId, roleId); let playerRecords: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.findData(serverId, activityId, roleId);
playerData.dailyGift.setPlayerRecords(playerRecords); playerData.dailyGift.setPlayerRecords(playerRecords);
shared/domain/activityField/sevenDaysField.ts
+1 -1
View File
@@ -326,7 +326,7 @@ export class SevenDaysData extends ActivityBase {
this.dailyChallenge = new SevenDaysDailyChallengesData(objData.dailyChallenge) this.dailyChallenge = new SevenDaysDailyChallengesData(objData.dailyChallenge)
} }
constructor(activityData: ActivityModelType, createTime: number, serverCreateTime?: number) { constructor(activityData: ActivityModelType, createTime: number, serverCreateTime: number) {
super(activityData, createTime, serverCreateTime) super(activityData, createTime, serverCreateTime)
this.initData(activityData.data) this.initData(activityData.data)
} }