活动:修改结构

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
@@ -2,6 +2,7 @@ import { ACTIVITY_TYPE } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityMonopolyModel, ActivityMonopolyModelType } from '../../db/ActivityMonopoly';
import { ActivityMonopolyLandModel, ActivityMonopolyLandModelType } from '../../db/ActivityMonopolyLand';
import { RoleModel } from '../../db/Role';
import { ServerlistModel } from '../../db/Serverlist';
import { MonopolyData, LandItem } from '../../domain/activityField/monopolyField';
@@ -23,7 +24,8 @@ export async function getMonopolyActivity(serverId: number, roleId: string) {
let activityData: ActivityModelType = activityDataArray[0];
let playerMonopolyData: ActivityMonopolyModelType = await ActivityMonopolyModel.findData(serverId, activityData.activityId, roleId);
let playerLandData: ActivityMonopolyLandModelType[] = await ActivityMonopolyLandModel.findData(serverId, activityData.activityId, roleId);
let playerData = new MonopolyData(activityData);
let { createTime } = await RoleModel.findByRoleId(roleId);
let playerData = new MonopolyData(activityData, createTime);
playerData.setPlayerRecords(playerMonopolyData, playerLandData);
return playerData;
}
@@ -44,7 +46,8 @@ export async function getPlayerMonopolyData(activityId: number, serverId: number
}
let playerMonopolyData: ActivityMonopolyModelType = await ActivityMonopolyModel.findData(serverId, activityData.activityId, roleId);
let playerLandData: ActivityMonopolyLandModelType[] = await ActivityMonopolyLandModel.findData(serverId, activityData.activityId, roleId);
let playerData = new MonopolyData(activityData);
let { createTime } = await RoleModel.findByRoleId(roleId);
let playerData = new MonopolyData(activityData, createTime);
playerData.setPlayerRecords(playerMonopolyData, playerLandData);
return playerData;
}