活动:时间

This commit is contained in:
陆莹
2022-03-23 13:54:04 +08:00
parent 29c5ae8a0a
commit 7bb8250060
70 changed files with 456 additions and 342 deletions
@@ -4,6 +4,7 @@ import { ActivityDailyGKModel, ActivityDailyGKModelType } from '../../db/Activit
import { RoleModel } from '../../db/Role';
import { ServerlistModel } from '../../db/Serverlist';
import { DailyGKData } from '../../domain/activityField/dailyGKField';
import { getRoleCreateTime, getServerCreateTime } from '../redisService';
import { getActivityById } from './activityService';
@@ -23,8 +24,9 @@ export async function dailyGKActivity(serverId: number, roleId: string) {
}
let activityData: ActivityModelType = activityDataArray[0];
let playerRecord: ActivityDailyGKModelType = await ActivityDailyGKModel.findData(serverId, activityData.activityId, roleId);
let { createTime } = await RoleModel.findByRoleId(roleId);
let playerData = new DailyGKData(activityData, createTime);
let createTime = await getRoleCreateTime(roleId);
let serverTime = await getServerCreateTime(serverId);
let playerData = new DailyGKData(activityData, createTime, serverTime);
playerData.setPlayerRecords(playerRecord);
return playerData;
}
@@ -41,8 +43,9 @@ export async function dailyGKActivity(serverId: number, roleId: string) {
export async function getPlayerDailyGKData(activityId: number, serverId: number, roleId: string) {
let activityData = await getActivityById(activityId);
let playerRecord: ActivityDailyGKModelType = await ActivityDailyGKModel.findData(serverId, activityId, roleId);
let { createTime } = await RoleModel.findByRoleId(roleId);
let playerData = new DailyGKData(activityData, createTime);
let createTime = await getRoleCreateTime(roleId);
let serverTime = await getServerCreateTime(serverId);
let playerData = new DailyGKData(activityData, createTime, serverTime);
playerData.setPlayerRecords(playerRecord);
return playerData;
@@ -58,8 +61,9 @@ export async function getPlayerDailyGKData(activityId: number, serverId: number,
export async function challengeDailyGK(serverId: number, roleId: string, activityId: number, gk: number) {
let activityData: ActivityModelType = await getActivityById(activityId);
let { createTime } = await RoleModel.findByRoleId(roleId);
let playerData = new DailyGKData(activityData, createTime);
let createTime = await getRoleCreateTime(roleId);
let serverTime = await getServerCreateTime(serverId);
let playerData = new DailyGKData(activityData, createTime, serverTime);
let item = playerData.findItemByGK(gk);
if (item) {
let dayIndex = item.dayIndex;