军团:添加邀请红点和演武台功能
This commit is contained in:
@@ -29,6 +29,9 @@ export default class BossInstance extends BaseModel {
|
||||
@prop({ required: true })
|
||||
bossHp: number;
|
||||
|
||||
@prop({ required: true })
|
||||
bossTotalHp: number;
|
||||
|
||||
@prop({ required: true })
|
||||
bossLv: number;
|
||||
|
||||
@@ -66,7 +69,7 @@ export default class BossInstance extends BaseModel {
|
||||
public static async openBossInstance(guildCode: string, bossHp: number, warId: number, bossLv: number) {
|
||||
let code = genCode(10);
|
||||
let doc = new BossInstanceModel();
|
||||
let update = Object.assign(doc.toJSON(), { guildCode, bossHp, bossLv, warId });
|
||||
let update = Object.assign(doc.toJSON(), { guildCode, bossHp, bossTotalHp: bossHp, bossLv, warId });
|
||||
const bossInstance: BossInstanceType = await BossInstanceModel.findOneAndUpdate({ code },{ $set: update }, {new: true, upsert: true}).lean();
|
||||
return bossInstance;
|
||||
}
|
||||
|
||||
@@ -28,7 +28,22 @@ export default class UserGuildApply extends BaseModel {
|
||||
// 创建申请或邀请
|
||||
public static async createUserGuildApply(role: RoleType, guild: GuildType, type: number) {
|
||||
const applyCode = genCode(10);
|
||||
const result: UserGuildApplyType = await UserGuildApplyModel.findOneAndUpdate({ roleId: role.roleId, guildCode: guild.code, type }, { $set: { roleId: role.roleId, role: role._id, guildCode: guild.code, guild: guild._id }, $setOnInsert: { applyCode }}, { upsert: true, new: true }).lean();
|
||||
const result: UserGuildApplyType = await UserGuildApplyModel.findOneAndUpdate(
|
||||
{ roleId: role.roleId, guildCode: guild.code, type },
|
||||
{ $set: { roleId: role.roleId, role: role._id, guildCode: guild.code, guild: guild._id }, $setOnInsert: { applyCode }
|
||||
}, { upsert: true, new: true })
|
||||
.select('applyCode guild')
|
||||
.populate({
|
||||
path: 'guild',
|
||||
select: 'code icon name lv memberCnt leader ceLimit',
|
||||
model: 'Guild',
|
||||
populate: {
|
||||
path: 'leader',
|
||||
select: 'roleName',
|
||||
model: 'Role'
|
||||
}
|
||||
})
|
||||
.lean();
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user