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

修改远征创建记录逻辑

Browse Source
This commit is contained in:
luying
2020-11-17 10:07:59 +08:00
parent d5a5cfc270
commit 0e2f043f93
26 changed files with 2147 additions and 1150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
shared/db/BattleRecord.ts
View File

@@ -51,26 +51,6 @@ export default class BattleRecord extends BaseModel {
return result;
}
public static async getBattleList( roleId: string, warType: number, lean = true) {
const searchObj = { roleId, warType, status: 1 };
const count = await BattleRecordModel.countDocuments(searchObj);
const limit = 1000;
const page = Math.ceil(count/limit);
let result = new Array();
for(let i = 0; i < page; i++) {
const battleRecords = await BattleRecordModel.find(searchObj)
.select('battleId battleCode warType star status')
.limit(1000)
.skip(1000 * i)
.sort({battleId: 1, star: -1, createdAt: -1})
.lean(lean);
for(let battleRecord of battleRecords) {
result.push(battleRecord);
}
}
return result;
}
public static async deleteAccount(roleId: string, lean = true) {
let result = await BattleRecordModel.deleteMany({roleId}).lean(lean);
return result||{};

19
shared/db/ExpeditionWarRecord.ts
View File

@@ -56,32 +56,30 @@ export default class ExpeditionWarRecord extends BaseModel {
@prop({ required: true, default: '' })
battleCode: string; // 关联关卡唯一值
@prop({ required: true, default: 0 })
battleStatus: number; // 是否通过, 0-挑战中 1-成功 2-挑战失败
@prop({ required: true, default: false })
received: boolean; // 本关战胜后宝箱是否领取
@prop({ required: true, default: false })
reward: string; // 领取的宝箱奖励
battleStatus: number; // 是否通过, 0-可挑战 1-成功 2-挑战失败
@prop({ required: true, default: 0 })
enemyFrom: number; // 敌军数据来源：1-配表的敌军队，2-玩家
@prop({ required: true, default: '' })
enemyId: string; // 敌军队伍id或玩家id
@prop({ required: true, type: Enemies, default: [] })
enemies: Array<Enemies>; // 敌军数据
@prop({ required: true, default: 0 })
ce: number; // 敌军战力
public static async getRecordByCode(expeditionCode: string, lean = true) {
const result = await ExpeditionWarRecordModel.find({ expeditionCode }).select('expeditionId battleId battleCode battleStatus received').sort({expeditionId: 1}).lean(lean);
const result = await ExpeditionWarRecordModel.find({ expeditionCode }).select('expeditionId battleId battleCode battleStatus ce').sort({expeditionId: 1}).lean(lean);
return result;
}
public static async getRecordByCodeAndId(expeditionCode: string, expeditionId: number, lean = true) {
const result = await ExpeditionWarRecordModel.findOne({ expeditionCode, expeditionId }).select('expeditionId battleId battleCode battleStatus received enemyFrom enemies').lean(lean);
const result = await ExpeditionWarRecordModel.findOne({ expeditionCode, expeditionId }).select('expeditionId battleId battleCode battleStatus enemyFrom enemies ce').lean(lean);
return result;
}
public static async saveRecord(expeditionCode: string, expeditionId: number, params: {roleId: string, battleId: number, enemyFrom: number, enemyId: string, enemies: Array<any>}, lean = true) {
const doc = new ExpeditionWarRecordModel();
const update = Object.assign(doc.toJSON(), params, {expeditionCode, expeditionId});
const result = await ExpeditionWarRecordModel.findOneAndUpdate({ expeditionCode, expeditionId }, update, {new: true, upsert: true}).select('expeditionId battleId battleCode battleStatus received enemyFrom enemies').lean(lean);
const result = await ExpeditionWarRecordModel.findOneAndUpdate({ expeditionCode, expeditionId }, update, {new: true, upsert: true}).select('expeditionId battleId battleCode battleStatus enemyFrom enemies ce').lean(lean);
return result;
}
@@ -106,11 +104,6 @@ export default class ExpeditionWarRecord extends BaseModel {
return result;
}
public static async updateBoxStatus(expeditionCode: string, expeditionId: number, received: boolean, reward: string, lean = true) {
const result = await ExpeditionWarRecordModel.findOneAndUpdate({ expeditionCode, expeditionId }, {received, reward}, {new: true}).lean(lean);
return result;
}
public static async deleteAccount(roleId: string, lean = true) {
let result = await ExpeditionWarRecordModel.deleteMany({roleId}).lean(lean);
return result||{};