活动:修改结构
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
import { ACTIVITY_TYPE } from '../../consts';
|
||||
import { ActivityModel, ActivityModelType } from '../../db/Activity';
|
||||
import { ActivityDailyGKModel, ActivityDailyGKModelType } from '../../db/ActivityDailyGK';
|
||||
import { RoleModel } from '../../db/Role';
|
||||
import { ServerlistModel } from '../../db/Serverlist';
|
||||
import { DailyGKData, DailyGKItem } from '../../domain/activityField/dailyGKField';
|
||||
|
||||
@@ -21,7 +22,8 @@ export async function dailyGKActivity(serverId: number, roleId: string) {
|
||||
}
|
||||
let activityData: ActivityModelType = activityDataArray[0];
|
||||
let playerRecord: ActivityDailyGKModelType = await ActivityDailyGKModel.findData(serverId, activityData.activityId, roleId);
|
||||
let playerData = new DailyGKData(activityData);
|
||||
let { createTime } = await RoleModel.findByRoleId(roleId);
|
||||
let playerData = new DailyGKData(activityData, createTime);
|
||||
playerData.setPlayerRecords(playerRecord);
|
||||
return playerData;
|
||||
}
|
||||
@@ -38,8 +40,8 @@ export async function dailyGKActivity(serverId: number, roleId: string) {
|
||||
export async function getPlayerDailyGKData(activityId: number, serverId: number, roleId: string) {
|
||||
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
|
||||
let playerRecord: ActivityDailyGKModelType = await ActivityDailyGKModel.findData(serverId, activityId, roleId);
|
||||
|
||||
let playerData = new DailyGKData(activityData);
|
||||
let { createTime } = await RoleModel.findByRoleId(roleId);
|
||||
let playerData = new DailyGKData(activityData, createTime);
|
||||
playerData.setPlayerRecords(playerRecord);
|
||||
|
||||
return playerData;
|
||||
@@ -55,7 +57,8 @@ export async function getPlayerDailyGKData(activityId: number, serverId: number,
|
||||
export async function challengeDailyGK(serverId: number, roleId: string, activityId: number, gk: number) {
|
||||
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
|
||||
|
||||
let playerData = new DailyGKData(activityData);
|
||||
let { createTime } = await RoleModel.findByRoleId(roleId);
|
||||
let playerData = new DailyGKData(activityData, createTime);
|
||||
let item = playerData.findItemByGK(gk);
|
||||
if (item) {
|
||||
let dayIndex = item.dayIndex;
|
||||
|
||||
Reference in New Issue
Block a user