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

军团优化：军团上次排行榜

Browse Source
This commit is contained in:
luying
2022-07-22 09:42:07 +08:00
parent 1f045bd11d
commit a3af186161
17 changed files with 259 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/db/GuildActivityCity.ts
+14 -23
View File
@@ -10,6 +10,9 @@ export default class GuildActivityCity extends BaseModel {
@prop({ required: true })
cityId: number; // 城池id
@prop({ required: true })
declareIndex: number; // 城池id
@prop({ required: true, type: String, default: [] })
declareGuilds: string[]; // 宣战的公会的code
@@ -29,28 +32,27 @@ export default class GuildActivityCity extends BaseModel {
status: number; // 0-过去的 1-现在的 2-未来的
// 每天宣战一次
public static async getAllCities(serverId: number) {
let rec: GuildActivityCityType[] = await GuildActivityCityModel.find({ serverId, status: 1 }).lean();
public static async getAllCities(serverId: number, declareIndex: number) {
let rec: GuildActivityCityType[] = await GuildActivityCityModel.find({ serverId, status: 1, declareIndex }).lean();
return rec;
}
public static async findMinDeclareCountCity(serverId: number, cityIds: number[]) {
let rec: GuildActivityCityType[] = await GuildActivityCityModel.find({ serverId, cityId: { $in: cityIds }, status: 1 }).sort({ declareCount: 1 }).lean();
public static async findMinDeclareCountCity(serverId: number, cityIds: number[], declareIndex: number) {
let rec: GuildActivityCityType[] = await GuildActivityCityModel.find({ serverId, cityId: { $in: cityIds }, status: 1, declareIndex }).sort({ declareCount: 1 }).lean();
return rec;
}
public static async getCity(serverId: number, cityId: number) {
let rec: GuildActivityCityType = await GuildActivityCityModel.findOne({ serverId, cityId, status: 1}).lean();
public static async getCity(serverId: number, cityId: number, declareIndex: number) {
let rec: GuildActivityCityType = await GuildActivityCityModel.findOne({ serverId, cityId, status: 1, declareIndex }).lean();
return rec;
}
// 宣言
public static async declare(serverId: number, cityId: number, guildCode: string) {
public static async declare(serverId: number, cityId: number, guildCode: string, declareIndex: number) {
let rec: GuildActivityCityType = await GuildActivityCityModel.findOneAndUpdate(
{ serverId, cityId, status: 1 },
{ serverId, cityId, status: 1, declareIndex },
{ $push: { declareGuilds: guildCode }, $inc: {declareCount: 1 } },
{new: true, upsert: true}).lean();
@@ -58,24 +60,13 @@ export default class GuildActivityCity extends BaseModel {
}
// 占领
public static async guard(serverId: number, cityId: number, guildCode: string, guildName: string) {
public static async guard(serverId: number, cityId: number, guildCode: string, guildName: string, declareIndex: number) {
let rec: GuildActivityCityType = await GuildActivityCityModel.findOneAndUpdate(
{ serverId, cityId, status: 1 },
{ serverId, cityId, status: 1, declareIndex },
{ $set: { guardGuildCode: guildCode, guardGuildName: guildName, guardTime: new Date()} },
{ new: true }).lean();
{ new: true, upsert: true }).lean();
return rec;
}
// 活动结束后需要清空占领情况
public static async clearGuardAndStartNext(serverId?: number) {
if(serverId) {
await GuildActivityCityModel.updateMany({ serverId, status: 1 }, { $set: { status: 0 } });
await GuildActivityCityModel.updateMany({ serverId, status: 2 }, { $set: { status: 1 } });
} else {
await GuildActivityCityModel.updateMany({ status: 1 }, { $set: { status: 0 } });
await GuildActivityCityModel.updateMany({ status: 2 }, { $set: { status: 1 } });
}
}
}
export const GuildActivityCityModel = getModelForClass(GuildActivityCity);