xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

名将擂台：修复多处bug

Browse Source
This commit is contained in:
luying
2022-07-19 09:58:31 +08:00
parent d72f6ef080
commit 05d8449ca3
10 changed files with 10325 additions and 6837 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
shared/db/LadderMatch.ts
View File

@@ -41,15 +41,10 @@ export default class LadderMatch extends BaseModel {
return result;
}
public static async checkByRank(rank: number) {
const result = await LadderMatchModel.exists({ rank });
return result;
}
public static async findByRoleIdAndInclude(roleId: string) {
const result: LadderMatchType = await LadderMatchModel.findOne({ roleId })
.populate('role', 'roleId roleName head frame spine heads frames spines title lv updatedAt')
.populate('defense.heroes', 'hid skinId quality star colorStar lv')
.populate('defense.heroes.hero', 'hid skinId quality star colorStar lv')
.lean();
return result;
}
@@ -71,7 +66,7 @@ export default class LadderMatch extends BaseModel {
public static async updateByRoleIdAndInclude(roleId: string, params: LadderUpdateInter) {
const defense: LadderMatchType = await LadderMatchModel.findOneAndUpdate({ roleId }, { $set: params}, { new: true })
.populate('role', 'roleId roleName head frame spine heads frames spines title lv updatedAt')
.populate('defense.heroes', 'hid skinId quality star colorStar lv')
.populate('defense.heroes.hero', 'hid skinId quality star colorStar lv')
.lean();
return defense;
}
@@ -89,7 +84,15 @@ export default class LadderMatch extends BaseModel {
}
public static async lock(roleId: string, rank: number) {
const defense: LadderMatchType = await LadderMatchModel.findOneAndUpdate({ roleId, rank, locked: 0 }, { $set: { locked: 1 }}, { new: true }).lean();
const defense: LadderMatchType = await LadderMatchModel.findOneAndUpdate({ roleId, rank, locked: 0 }, { $set: { locked: 1 }}, { new: true })
.populate('role', 'roleId roleName head frame spine heads frames spines title lv updatedAt')
.populate('defense.heroes.hero', 'hid skinId quality star colorStar lv')
.lean();
return defense;
}
public static async unlock(roleId: string) {
const defense: LadderMatchType = await LadderMatchModel.findOneAndUpdate({ roleId }, { $set: { locked: 0 }}, { new: true }).lean();
return defense;
}
@@ -132,6 +135,10 @@ export default class LadderMatch extends BaseModel {
{ arrayFilters: [{"t.actorId": hid}] }).lean();
return rec
}
public static async clearLock() {
await LadderMatchModel.updateMany({ locked: 1 }, { $set: { locked: 0 } })
}
}
export const LadderMatchModel = getModelForClass(LadderMatch);

15
shared/db/LadderMatchRec.ts
View File

@@ -4,6 +4,7 @@ import { LADDER_STATUS } from '../consts';
import { LadderDefense, LadderOppPlayerInfo, LadderOppPlayerHeroInfo } from '../domain/battleField/ladder';
import { genCode } from '../pubUtils/util';
import { nowSeconds } from '../pubUtils/timeUtil';
import { LADDER } from '../pubUtils/dicParam';
@index({ battleCode: 1 })
export default class LadderMatchRec extends BaseModel {
@@ -96,6 +97,20 @@ export default class LadderMatchRec extends BaseModel {
}).select({ battleCode: 1, roleId1: 1, roleId2: 1, _id: -1, endTime: 1, attackInfo: 1, defenseInfo: 1 }).limit(1000).lean();
return recs;
}
public static async checkByRank(roleId2: string) {
const result = await LadderMatchRecModel.exists({ roleId2, status: { $in: [LADDER_STATUS.BATTLE, LADDER_STATUS.CHECK] } });
return result;
}
public static async clearLock() {
await LadderMatchRecModel.updateMany({
$or: [
{ status: LADDER_STATUS.CHECK, checkTime: { $lt: nowSeconds() - LADDER.LADDER_BATTLE_PREPARE_COUNTDOWN } },
{ status: LADDER_STATUS.BATTLE, checkTime: { $lt: nowSeconds() - LADDER.LADDER_BATTLE_COUNTDOWN } }
]
}, { $set: { status: LADDER_STATUS.COMPLETE, timeout: true } })
}
}
export const LadderMatchRecModel = getModelForClass(LadderMatchRec);