寻宝:修改数组声明风格

This commit is contained in:
liangtongchuan
2021-02-20 14:28:55 +08:00
parent 4bbdcf18b2
commit 87049d9f46
3 changed files with 34 additions and 34 deletions
+13 -13
View File
@@ -18,10 +18,10 @@ export class RoleStatus {
battleCode: string;
// 玩家所用阵容
@prop({ required: false, type: Number, default: [] })
heroes: Array<number>;
heroes: number[];
// 阵亡武将
@prop({ required: false, type: Number, default: [] })
killed: Array<number>;
killed: number[];
// 是否情谊助阵
@prop({ required: false, default: false })
isFrd: boolean;
@@ -99,7 +99,7 @@ export default class ComBattleTeam extends BaseModel {
teamCode: string;
@prop({ required: true, type: String, default: [], _id: false })
roleIds: Array<string>
roleIds: string[];
// 队伍是否开放加入
@prop({ required: true, default: true })
@@ -118,7 +118,7 @@ export default class ComBattleTeam extends BaseModel {
status: number;
@prop({ required: true, type: RoleStatus, default: [] })
roleStatus: Array<RoleStatus>;
roleStatus: RoleStatus[];
// 队长 roleId
@prop({ required: true })
@@ -138,7 +138,7 @@ export default class ComBattleTeam extends BaseModel {
// 单个 boss 血量状态
@prop({ required: false, type: BossHp, default: [] })
bossHpArr: Array<BossHp>;
bossHpArr: BossHp[];
// 队伍是否开放加入
@prop({ required: true, default: false })
@@ -169,12 +169,12 @@ export default class ComBattleTeam extends BaseModel {
return team;
}
public static async updateHeroes(teamCode: string, roleId: string, heroes: Array<number>, lean = true) {
public static async updateHeroes(teamCode: string, roleId: string, heroes: number[], lean = true) {
const team: ComBattleTeamType = await ComBattleTeamModel.findOneAndUpdate({ teamCode, 'roleStatus.roleId': roleId}, {$set: {'roleStatus.$.heroes': heroes}}, {new: true}).lean(lean);
return team;
}
public static async setupBattleInfo(teamCode: string, roleId: string, heroes: Array<number>, battleCode: string, lean = true) {
public static async setupBattleInfo(teamCode: string, roleId: string, heroes: number[], battleCode: string, lean = true) {
const team: ComBattleTeamType = await ComBattleTeamModel.findOneAndUpdate({ teamCode, 'roleStatus.roleId': roleId}, {$set: {'roleStatus.$.heroes': heroes, 'roleStatus.$.battleCode': battleCode}}, {new: true}).lean(lean);
return team;
}
@@ -184,7 +184,7 @@ export default class ComBattleTeam extends BaseModel {
return team;
}
public static async syncTeamData(teamData: {teamCode: string, status: number, roleStatus: Array<RoleStatus>, bossHpArr: Array<BossHp>}, timeout = false, lean = true) {
public static async syncTeamData(teamData: {teamCode: string, status: number, roleStatus: RoleStatus[], bossHpArr: BossHp[]}, timeout = false, lean = true) {
console.log('syncTeamData bossHpArr: ', teamData.bossHpArr);
const team: ComBattleTeamType = await ComBattleTeamModel.findOneAndUpdate({ teamCode: teamData.teamCode }, {$set :{...teamData, roleCnt: teamData.roleStatus.length, timeout}}, {new: true}).lean(lean);
return team;
@@ -232,23 +232,23 @@ export default class ComBattleTeam extends BaseModel {
return teams;
}
public static async getTeamByBlueprt(blueprtIds: Array<number>, status: number, pub = true, limit = 50, lean = true) {
public static async getTeamByBlueprt(blueprtIds: number[], status: number, pub = true, limit = 50, lean = true) {
const teams: ComBattleTeamType[] = await ComBattleTeamModel.find({blueprtId: {$in: blueprtIds}, status, pub}).limit(limit).lean(lean);
return teams;
}
public static async getOneTeamByQualityAndSt(qualityArr: Array<number>, status: number, ce = 0, pub = true, cntLmt = 2, lean = true) {
public static async getOneTeamByQualityAndSt(qualityArr: number[], status: number, ce = 0, pub = true, cntLmt = 2, lean = true) {
const team: ComBattleTeamType = await ComBattleTeamModel.findOne({quality: {$in: qualityArr}, status, ceLimit: {$lte: ce}, pub, roleCnt: {$lte: cntLmt}}).lean(lean);
return team;
}
public static async getOtherTeamByQualityAndSt(roleId: string, qualityArr: Array<number>, status: number, lvRange: number, ce = 0, pub = true, cntLmt = 2, lean = true) {
public static async getOtherTeamByQualityAndSt(roleId: string, qualityArr: number[], status: number, lvRange: number, ce = 0, pub = true, cntLmt = 2, lean = true) {
const curTime = new Date(Date.now() - 10 * 60 * 1000); // 10分钟之前
const team: ComBattleTeamType[] = await ComBattleTeamModel.find({quality: {$in: qualityArr}, status, lvRange, ceLimit: {$lte: ce}, pub, roleCnt: {$lte: cntLmt}, roleIds: {$nin: [roleId]}, updatedAt: {$gte: curTime}}).lean(lean);
return team;
}
public static async getTeamByRoleAndTime(roleId: string, qualityArr?: Array<number>, time?: Date, isAssist?: boolean, limitCnt = 50, lean = true) {
public static async getTeamByRoleAndTime(roleId: string, qualityArr?: number[], time?: Date, isAssist?: boolean, limitCnt = 50, lean = true) {
let query = {roleIds: roleId};
if (qualityArr) {
query = Object.assign(query, {quality: {$in: qualityArr}});
@@ -263,7 +263,7 @@ export default class ComBattleTeam extends BaseModel {
return teams;
}
public static async getAssistTeamsByTime(roleId: string, qualityArr?: Array<number>, time?: Date, isAssist?: boolean, lean = true) {
public static async getAssistTeamsByTime(roleId: string, qualityArr?: number[], time?: Date, isAssist?: boolean, lean = true) {
let query = {roleIds: roleId, status: {$in: [0, 1, 2]}}; // 失败不计入助战
if (qualityArr) {
query = Object.assign(query, {quality: {$in: qualityArr}});