活动:修改活动bug
This commit is contained in:
@@ -12,9 +12,19 @@ import { GrowthData, GrowthItem } from '../domain/activityField/growthField';
|
||||
* @param {string} roleId 角色Id
|
||||
*
|
||||
*/
|
||||
export async function getGrowthActivityData(serverId: number, roleId: string) {
|
||||
let activityData: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.TASK_GROWTH, new Date());
|
||||
return { data: activityData };
|
||||
export async function growthActivity(serverId: number, roleId: string) {
|
||||
let activityDataArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.TASK_GROWTH, new Date());
|
||||
if (activityDataArray.length === 0) {
|
||||
return null;
|
||||
}
|
||||
let activityData: ActivityModelType = activityDataArray[0];
|
||||
let playerRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(serverId, activityData.activityId, roleId);
|
||||
let playerPointRecord: ActivityGrowthPointModelType = await ActivityGrowthPointModel.findData(serverId, activityData.activityId, roleId);
|
||||
|
||||
let playerData = new GrowthData(activityData);
|
||||
await playerData.setPlayerRecords(playerRecords, roleId);
|
||||
playerData.setPlayerPointRecord(playerPointRecord);
|
||||
return playerData;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -26,14 +36,13 @@ export async function getGrowthActivityData(serverId: number, roleId: string) {
|
||||
*
|
||||
*/
|
||||
export async function getPlayerGrowthData(activityId: number, serverId: number, roleId: string) {
|
||||
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
|
||||
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
|
||||
let playerRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(serverId, activityId, roleId);
|
||||
let playerPointRecord: ActivityGrowthPointModelType = await ActivityGrowthPointModel.findData(serverId, activityId, roleId);
|
||||
|
||||
let playerData = new GrowthData(activityData);
|
||||
playerData.setPlayerRecords(playerRecords);
|
||||
await playerData.setPlayerRecords(playerRecords, roleId);
|
||||
playerData.setPlayerPointRecord(playerPointRecord);
|
||||
|
||||
return playerData;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user