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-30 11:41:38 +08:00
parent 550ec29842
commit 3cff8acf3a
60 changed files with 260 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/activity/sevenDaysService.ts
+11 -9
View File
@@ -6,6 +6,7 @@ import { ServerlistModel } from '../../db/Serverlist';
import { SevenDaysData } from '../../domain/activityField/sevenDaysField';
import { ActivityDailyChallengesModel, ActivityDailyChallengesModelType } from '../../db/ActivityDailyChallenges';
import { ActivityDailyGiftsModel, ActivityDailyGiftsModelType } from '../../db/ActivityDailyGifts';
import { RoleModel } from '../../db/Role';
/**
* 获取活动数据
@@ -22,8 +23,8 @@ export async function sevenDaysActivity(serverId: number, roleId: string, type:
return null;
}
let activityData: ActivityModelType = activityDataArray[0];
let playerData = new SevenDaysData(activityData)
let { createTime } = await RoleModel.findByRoleId(roleId);
let playerData = new SevenDaysData(activityData, createTime)
//成长数据
let playerGrowthRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(serverId, activityData.activityId, roleId);
let playerPointRecord: ActivityGrowthPointModelType = await ActivityGrowthPointModel.findData(serverId, activityData.activityId, roleId);
@@ -50,8 +51,8 @@ export async function sevenDaysActivity(serverId: number, roleId: string, type:
*/
export async function getPlayerSevenDaysData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
let playerData = new SevenDaysData(activityData)
let { createTime } = await RoleModel.findByRoleId(roleId);
let playerData = new SevenDaysData(activityData, createTime)
//成长数据
let playerGrowthRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(serverId, activityId, roleId);
let playerPointRecord: ActivityGrowthPointModelType = await ActivityGrowthPointModel.findData(serverId, activityId, roleId);
@@ -78,8 +79,8 @@ export async function getPlayerSevenDaysData(activityId: number, serverId: numbe
*/
export async function getPlayerSevenDaysGrowthData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
let playerData = new SevenDaysData(activityData)
let { createTime } = await RoleModel.findByRoleId(roleId);
let playerData = new SevenDaysData(activityData, createTime)
//成长数据
let playerGrowthRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(serverId, activityId, roleId);
let playerPointRecord: ActivityGrowthPointModelType = await ActivityGrowthPointModel.findData(serverId, activityId, roleId);
@@ -100,8 +101,8 @@ export async function getPlayerSevenDaysGrowthData(activityId: number, serverId:
*/
export async function getPlayerSevenDaysDailyChallengesData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
let playerData = new SevenDaysData(activityData)
let { createTime } = await RoleModel.findByRoleId(roleId);
let playerData = new SevenDaysData(activityData, createTime)
//今日挑战
let playerDailyChallengeRecords: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.findData(serverId, activityId, roleId);
playerData.dailyChallenge.setPlayerRecords(playerDailyChallengeRecords);
@@ -119,7 +120,8 @@ export async function getPlayerSevenDaysDailyChallengesData(activityId: number,
export async function getPlayerSevenDaysDailyGiftsData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
let playerData = new SevenDaysData(activityData)
let { createTime } = await RoleModel.findByRoleId(roleId);
let playerData = new SevenDaysData(activityData, createTime)
//每日特惠礼包
let playerRecords: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.findData(serverId, activityId, roleId);
playerData.dailyGift.setPlayerRecords(playerRecords);