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:41:54 +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

43
shared/db/GuildActivityRec.ts
View File

@@ -1,7 +1,6 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
import { ItemReward } from '../domain/dbGeneral';
import { getZeroPointD } from '../pubUtils/timeUtil';
import { genCode } from '../pubUtils/util';
import { Member, WoodenHorse, Event } from '../domain/battleField/guildActivity'
@@ -11,7 +10,7 @@ export default class GuildActivityRecord extends BaseModel {
@prop({ required: true })
code: string; // 本次记录唯一值
@prop({ required: true })
guildCode: string; // 军团code
@@ -24,6 +23,9 @@ export default class GuildActivityRecord extends BaseModel {
@prop({ required: true })
aid: number; // 军团活动id
@prop({ required: true })
index: number; // 第几次这个类型的军团活动
@prop({ required: true })
auctionType: number; // 转为拍卖行的类型
@@ -51,6 +53,9 @@ export default class GuildActivityRecord extends BaseModel {
@prop({ required: true })
remainGateHp: number; // 城门剩余血量
@prop({ required: true })
challengeCityId: number; // 诸侯混战占领了的城池
@prop({ required: true })
cityId: number; // 诸侯混战占领了的城池
@@ -64,42 +69,30 @@ export default class GuildActivityRecord extends BaseModel {
events: Event[]; // 粮草先行木马
// 每天一条记录
public static async getRecord(guildCode: string, serverId: number, aid: number, events?: Event[]) {
let today = getZeroPointD();
public static async getRecord(guildCode: string, serverId: number, aid: number, index: number, events?: Event[], cityId?: number) {
let docs = new GuildActivityRecordModel();
let code = genCode(10);
let update = Object.assign(docs, { code, guildCode, serverId, aid, createdAt: new Date(), auctionType: aid + 1 });
if(events) update = Object.assign(update, { events });
let insert = Object.assign(docs, { code, guildCode, serverId, aid, createdAt: new Date(), auctionType: aid + 1 });
if(events) insert = Object.assign(insert, { events });
let update: GuildActivityRecordUpdateParam = {};
if(cityId) update = Object.assign(update, { challengeCityId: cityId });
let rec: GuildActivityRecordType = await GuildActivityRecordModel.findOneAndUpdate(
{ aid, guildCode, createdAt: { $gte: today }, status: 1},
{ $setOnInsert: update },
{ aid, guildCode, index, status: 1},
{ $setOnInsert: insert, $set: update },
{new: true, upsert: true}).lean();
return rec;
}
public static async updateInfo(guildCode: string, aid: number, update: GuildActivityRecordUpdateParam) {
let today = getZeroPointD();
public static async updateInfo(guildCode: string, aid: number, index: number, update: GuildActivityRecordUpdateParam) {
let rec: GuildActivityRecordType = await GuildActivityRecordModel.findOneAndUpdate(
{ guildCode, aid, createdAt: { $gte: today }, status: 1 },
{ guildCode, aid, index, status: 1 },
{ $set: update }, { new: true }).lean();
return rec;
}
public static async updateTodayInfo(update: GuildActivityRecordUpdateParam) {
let today = getZeroPointD();
let rec = await GuildActivityRecordModel.updateMany(
{ createdAt: { $gte: today } },
{ $set: update }, { new: true }).lean();
return rec;
}
public static async pushEvent(guildCode: string, aid: number, event: Event) {
let today = getZeroPointD();
public static async pushEvent(guildCode: string, aid: number, index: number, event: Event) {
let rec: GuildActivityRecordType = await GuildActivityRecordModel.findOneAndUpdate(
{ guildCode, createdAt: { $gte: today }, aid, status: 1 },
{ guildCode, index, aid, status: 1 },
{ $push: { events: event } }, { new: true }).lean();
return rec;
}