活动:修复七天乐任务
This commit is contained in:
@@ -1,12 +1,9 @@
|
||||
import { ActivityModel, ActivityModelType } from '../../db/Activity';
|
||||
import { ActivityGrowthModel, ActivityGrowthModelType } from '../../db/ActivityGrowth';
|
||||
import { ActivityGrowthPointModel, ActivityGrowthPointModelType } from '../../db/ActivityGrowthPoint';
|
||||
import { HeroModel } from '../../db/Hero';
|
||||
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';
|
||||
import { getActivitiesByType, getActivityById } from './activityService';
|
||||
import { getRoleCreateTime, getServerCreateTime } from '../redisService';
|
||||
|
||||
@@ -30,8 +27,7 @@ export async function sevenDaysActivity(serverId: number, roleId: string, type:
|
||||
//成长数据
|
||||
let playerGrowthRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(serverId, activityData.activityId, roleId);
|
||||
let playerPointRecord: ActivityGrowthPointModelType = await ActivityGrowthPointModel.findData(serverId, activityData.activityId, roleId);
|
||||
let userHeroes = await HeroModel.findByRole(roleId);
|
||||
await playerData.growth.setPlayerRecords(playerGrowthRecords, roleId, userHeroes);
|
||||
playerData.growth.setPlayerRecords(playerGrowthRecords);
|
||||
playerData.growth.setPlayerPointRecord(playerPointRecord);
|
||||
//今日挑战
|
||||
let playerDailyChallengeRecords: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.findData(serverId, activityData.activityId, roleId);
|
||||
@@ -59,8 +55,7 @@ export async function getPlayerSevenDaysData(activityId: number, serverId: numbe
|
||||
//成长数据
|
||||
let playerGrowthRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(serverId, activityId, roleId);
|
||||
let playerPointRecord: ActivityGrowthPointModelType = await ActivityGrowthPointModel.findData(serverId, activityId, roleId);
|
||||
let userHeroes = await HeroModel.findByRole(roleId);
|
||||
await playerData.growth.setPlayerRecords(playerGrowthRecords, roleId, userHeroes);
|
||||
playerData.growth.setPlayerRecords(playerGrowthRecords);
|
||||
playerData.growth.setPlayerPointRecord(playerPointRecord);
|
||||
//今日挑战
|
||||
let playerDailyChallengeRecords: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.findData(serverId, activityId, roleId);
|
||||
@@ -88,8 +83,7 @@ export async function getPlayerSevenDaysGrowthData(activityId: number, serverId:
|
||||
//成长数据
|
||||
let playerGrowthRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(serverId, activityId, roleId);
|
||||
let playerPointRecord: ActivityGrowthPointModelType = await ActivityGrowthPointModel.findData(serverId, activityId, roleId);
|
||||
let userHeroes = await HeroModel.findByRole(roleId);
|
||||
await playerData.growth.setPlayerRecords(playerGrowthRecords, roleId, userHeroes);
|
||||
playerData.growth.setPlayerRecords(playerGrowthRecords);
|
||||
playerData.growth.setPlayerPointRecord(playerPointRecord);
|
||||
return playerData;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user