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

军团：添加踢人解散退出，添加权限

Browse Source
This commit is contained in:
luying
2021-01-20 15:47:57 +08:00
parent ac081059c2
commit 9b6ca78d88
12 changed files with 396 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/db/Guild.ts
+28 -12
View File
@@ -66,7 +66,7 @@ export default class Guild extends BaseModel {
refTimeWeekly: Date;
@prop({ required: true, default: 0 })
ce: number; // 总战力
guildCe: number; // 总战力
@prop({ required: true, type: String, default: [], select: false })
members: string[]; // 军团成员的roleId，用于增加战力的时候加入总战力
@@ -77,9 +77,12 @@ export default class Guild extends BaseModel {
@prop({ required: true, default: GUILD_STATUS.RUNNING, enum: GUILD_STATUS })
status: number;
public static async createGuild(params: { name: string, icon: number, notice: string }, role: RoleType) {
@prop({ required: true, default: 1, select: false })
serverId: number; // 分服
public static async createGuild(params: { name: string, icon: number, notice: string }, role: RoleType, serverId: number) {
const doc = new GuildModel();
const update = Object.assign(doc.toJSON(), params, { leader: role._id, members: [role.roleId], ce: role.ce });
const update = Object.assign(doc.toJSON(), params, { leader: role._id, members: [role.roleId], guildCe: role.ce, serverId });
delete update._id;
const code = genCode(6);
const result: GuildType = await GuildModel.findOneAndUpdate({ code }, update, { upsert: true, new: true })
@@ -89,13 +92,13 @@ export default class Guild extends BaseModel {
return result;
}
public static async checkName(name: string) {
const result = await GuildModel.findOne({ name, status: GUILD_STATUS.RUNNING }).lean();
public static async checkName(name: string, serverId: number) {
const result = await GuildModel.findOne({ name, status: GUILD_STATUS.RUNNING, serverId }).lean();
return !!result;
}
public static async findByCondition(page: number, showPeopleMax: boolean, name: string) {
const condition = { status: GUILD_STATUS.RUNNING };
public static async findByCondition(page: number, showPeopleMax: boolean, name: string, serverId: number) {
const condition = { status: GUILD_STATUS.RUNNING, serverId };
if(!showPeopleMax) {
condition['isMemberMax'] = false;
}
@@ -103,7 +106,7 @@ export default class Guild extends BaseModel {
condition['name'] = { $regex: new RegExp(name, 'i') }
}
const guildList = await GuildModel.find(condition)
.sort({ lv: -1, ce: -1 })
.sort({ lv: -1, guildCe: -1 })
.limit(GUILD_PER_PAGE).skip((page - 1) * GUILD_PER_PAGE)
.select('code icon name lv memberCnt leader ceLimit isAuto')
.populate('leader', 'roleName', 'Role')
@@ -111,20 +114,33 @@ export default class Guild extends BaseModel {
return guildList;
}
public static async findByCode(code: string) {
const result = await GuildModel.findOne({ code, status: GUILD_STATUS.RUNNING })
public static async findByCode(code: string, serverId: number) {
const result = await GuildModel.findOne({ code, status: GUILD_STATUS.RUNNING, serverId })
.populate('leader', 'roleName sHid headHid lv loginTime ce', 'Role')
.lean();
return result;
}
public static async addGuild(code: string, roleId: string, maxMemberCnt: number) {
let result = await GuildModel.findOneAndUpdate({ code, memberCnt: {$lt: maxMemberCnt } }, { $inc: { memberCnt: 1 }, $push: { members: roleId } }, { new: true }).lean();
public static async addGuild(code: string, roleId: string, maxMemberCnt: number, serverId: number) {
let result = await GuildModel.findOneAndUpdate({ code, memberCnt: {$lt: maxMemberCnt }, serverId }, { $inc: { memberCnt: 1 }, $push: { members: roleId } }, { new: true }).lean();
if(result && result.memberCnt >= maxMemberCnt) {
result = await GuildModel.findOneAndUpdate({ code }, { $set: { isMemberMax: true } }).lean();
}
return result;
}
public static async dismiss(code: string, serverId: number) {
const result = await GuildModel.findOneAndUpdate({ code, status: GUILD_STATUS.RUNNING, serverId }, { status: GUILD_STATUS.DISMISSED }, { new: true })
.select('+members')
.lean();
return result;
}
public static async quit(code: string, roleId: string, serverId: number) {
const result = await GuildModel.findOneAndUpdate({ code, serverId }, { $inc: { memberCnt: -1}, $pull: { members: roleId }, isMemberMax: false }, { new: true })
.lean();
return result;
}
}
export const GuildModel = getModelForClass(Guild);