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-09-08 20:02:43 +08:00
parent a5241c9089
commit 0f2d247ee4
10 changed files with 152 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shared/db/GuildActivityCityDeclare.ts
View File

@@ -1,7 +1,7 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
@index({ serverId: 1, cityId: 1, createdAt: 1 })
@index({ serverId: 1, guildCode: 1, status: 1, declareIndex: 1 })
export default class GuildActivityCityDeclare extends BaseModel {
@prop({ required: true })
@@ -30,7 +30,7 @@ export default class GuildActivityCityDeclare extends BaseModel {
// 宣战
public static async declareIfNot(serverId: number, guildCode: string, cityId: number, roleId: string, declareTime: number, isAutoDeclare: boolean, declareIndex: number) {
let rec: GuildActivityCityDeclareType = await GuildActivityCityDeclareModel.findOneAndUpdate({ serverId, guildCode, cityId, status: 1, declareIndex }, { $setOnInsert: { declareMember: roleId, declareTime, isAutoDeclare } }, { new: true, upsert: true }).lean();
let rec: GuildActivityCityDeclareType = await GuildActivityCityDeclareModel.findOneAndUpdate({ serverId, guildCode, status: 1, declareIndex }, { $setOnInsert: { declareMember: roleId, declareTime, isAutoDeclare, cityId } }, { new: true, upsert: true }).lean();
return rec;
}

5
shared/db/ServerRecords.ts
View File

@@ -77,6 +77,11 @@ export default class ServerRecord extends BaseModel {
return rec;
}
public static async findTomorrowData(serverId: number) {
let tomorrow = getZeroPoint() + 86400;
let rec: ServerRecordType = await ServerRecordModel.findOne({ serverId, today: tomorrow }).lean();
return rec;
}
}
export const ServerRecordModel = getModelForClass(ServerRecord);