军团表逻辑

This commit is contained in:
mamengke01
2021-01-22 21:28:35 +08:00
parent b5d84c03e4
commit 3e6ec77d56
30 changed files with 4838 additions and 1387 deletions

102
shared/db/BossInstance.ts Normal file
View File

@@ -0,0 +1,102 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
import { nowSeconds } from '../pubUtils/timeUtil';
class Rank {
@prop({ required: true })
roleId: string;
@prop({ required: true })
score: number;
@prop({ required: true })
time: number;
}
class LastRecord {
@prop({ required: true, default: 0 })
warId: number;
@prop({ required: true})
roleIds: Array<string>;
}
@index({ guildCode: 1 })
export default class BossInstance extends BaseModel {
@prop({ required: true })
guildCode: string;
@prop({ required: true })
warId: number;
@prop({ required: true })
bossHp: number;
@prop({ required: true, type: Rank, default:[]})
ranks:Array<Rank>;
@prop({ required: true })
startTime: number;
@prop({ required: true, default: 0})
num: number;
@prop({ required: true, default:[]})
roleIdRecords: Array<string>; //记录提示过胜利boss关的玩家
@prop({ required: true })
winWarId: number; //记录上一次通关的关卡
@prop({ required: true })
winTime: number; //记录上一次通关的时间
@prop({ required: true, default: 0})
winNum: number;
@prop({ required: true, type: Rank, default:[]})
recordRanks:Array<Rank>;
@prop({ required: true, default: false })
winSettled: boolean; //胜利是否结算过
public static async findBossInstance(guildCode: string, lean = true) {
const bossInstance: BossInstanceType = await BossInstanceModel.findOne({ guildCode }).lean(lean);
return bossInstance;
}
public static async openBossInstance(guildCode: string, bossHp: number, warId: number, lean = true) {
const bossInstance: BossInstanceType = await BossInstanceModel.findOneAndUpdate({ guildCode },{ranks:[], time: nowSeconds(), bossHp, warId, $inc: { recordNum: 1 }}, {new: true, upsert: true}).lean(lean);
return bossInstance;
}
//记录玩家boss通关后首次查看boss关卡
public static async recordRoleIdWhenCheck(guildCode: string, roleId: string, lean = true) {
const bossInstance: BossInstanceType = await BossInstanceModel.findOneAndUpdate({ guildCode }, { $push:{ roleIdRecords: roleId } }, { new: true }).lean(lean);
return bossInstance;
}
public static async pushRecordRanks(guildCode: string, recordRank: Rank, lean = true) {
const bossInstance: BossInstanceType = await BossInstanceModel.findOneAndUpdate({ guildCode }, { $push:{ recordRanks: recordRank } }, { new: true }).lean(lean);
return bossInstance;
}
public static async pushRanks(guildCode: string, rank: Rank, lean = true) {
const bossInstance: BossInstanceType = await BossInstanceModel.findOneAndUpdate({ guildCode }, { $push:{ ranks: rank } }, { new: true }).lean(lean);
return bossInstance;
}
public static async updateBossInstance(guildCode: string, update:BossInstanceTypeParam, lean = true) {
const bossInstance: BossInstanceType = await BossInstanceModel.findOneAndUpdate({ guildCode }, { $set:update }, { new: true }).lean(lean);
return bossInstance;
}
public static async updateBossHp(guildCode: string, hp: number, roleId: string, lean = true) {
const bossInstance: BossInstanceType = await BossInstanceModel.findOneAndUpdate({ guildCode, 'ranks.roleId': roleId, bossHp: { $gte: hp } }, { $inc: { bossHp: - hp ,'ranks.$.score': hp}, }, { new: true }).lean(lean);
return bossInstance;
}
public static async updateRank(guildCode: string, roleId: string, lean = true) {
const bossInstance: BossInstanceType = await BossInstanceModel.findOneAndUpdate({ guildCode, 'ranks.roleId': roleId }, { $set:{ 'ranks.$.time': nowSeconds() } }, { new: true }).lean(lean);
return bossInstance;
}
}
export const BossInstanceModel = getModelForClass(BossInstance);
export interface BossInstanceType extends Pick<DocumentType<BossInstance>, keyof BossInstance> {};
export type BossInstanceTypeParam = Partial<BossInstanceType>; // 将所有字段变成可选项

View File

@@ -1,97 +0,0 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
import { nowSeconds } from '../pubUtils/timeUtil';
class Rank {
@prop({ required: true })
roleId: string;
@prop({ required: true })
score: number;
@prop({ required: true })
time: number;
}
class LastRecord {
@prop({ required: true, default: 0 })
warId: number;
@prop({ required: true})
roleIds: Array<string>;
}
@index({ guildCode: 1 })
export default class BossScript extends BaseModel {
@prop({ required: true })
guildCode: string;
@prop({ required: true })
warId: number;
@prop({ required: true })
bossHp: number;
@prop({ required: true, type: Rank, default:[]})
ranks:Array<Rank>;
@prop({ required: true })
time: number;
@prop({ required: true, default: 0})
num: number;
@prop({ required: true, default:[]})
roleIdRecords: Array<string>; //记录提示过胜利boss关的玩家
@prop({ required: true })
winWarId: number; //记录上一次通关的关卡
@prop({ required: true })
winTime: number; //记录上一次通关的时间
@prop({ required: true, default: 0})
winNum: number;
@prop({ required: true, type: Rank, default:[]})
recordRanks:Array<Rank>;
@prop({ required: true, default: false })
winSettled: boolean; //胜利是否结算过
public static async findBossScript(guildCode: string, lean = true) {
const bossScript: BossScriptType = await BossScriptModel.findOne({ guildCode }).lean(lean);
return bossScript;
}
public static async openBossScript(guildCode: string, bossHp: number, warId: number, lean = true) {
const bossScript: BossScriptType = await BossScriptModel.findOneAndUpdate({ guildCode },{ranks:[], time: nowSeconds(), bossHp, warId, $inc: { recordNum: 1 }}, {new: true, upsert: true}).lean(lean);
return bossScript;
}
//记录玩家boss通关后首次查看boss关卡
public static async recordRoleIdWhenCheck(guildCode: string, roleId: string, lean = true) {
const bossScript: BossScriptType = await BossScriptModel.findOneAndUpdate({ guildCode }, { $push:{ roleIdRecords: roleId } }).lean(lean);
return bossScript;
}
public static async pushRecordRanks(guildCode: string, recordRank: Rank, lean = true) {
const bossScript: BossScriptType = await BossScriptModel.findOneAndUpdate({ guildCode }, { $push:{ recordRanks: recordRank } }).lean(lean);
return bossScript;
}
public static async pushRanks(guildCode: string, rank: Rank, lean = true) {
const bossScript: BossScriptType = await BossScriptModel.findOneAndUpdate({ guildCode }, { $push:{ recordRanks: rank } }).lean(lean);
return bossScript;
}
public static async updateBossScript(guildCode: string, update:BossScriptTypeParam, lean = true) {
const bossScript: BossScriptType = await BossScriptModel.findOneAndUpdate({ guildCode }, { $set:update }).lean(lean);
return bossScript;
}
public static async updateBossHp(guildCode: string, hp: number, roleId: string, lean = true) {
const bossScript: BossScriptType = await BossScriptModel.findOneAndUpdate({ guildCode, 'ranks.roleId': roleId, bossHp: { $gt: 0 } }, { $inc: { bossHp: - hp ,'ranks.$.score': hp}, }).lean(lean);
return bossScript;
}
}
export const BossScriptModel = getModelForClass(BossScript);
export interface BossScriptType extends Pick<DocumentType<BossScript>, keyof BossScript> {};
export type BossScriptTypeParam = Partial<BossScriptType>; // 将所有字段变成可选项

View File

@@ -8,7 +8,7 @@ class Structure {
@prop({ required: true })
id: number;
@prop({ required: true })
lv: number;
lv: number;
}
@index({ code: 1 })
@@ -77,6 +77,8 @@ export default class Guild extends BaseModel {
@prop({ required: true, default: 1, select: false })
serverId: number; // 分服
@prop({ required: true, default: 1 })
trainId: number; // 试炼id
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], guildCe: role.ce, serverId });
@@ -143,7 +145,7 @@ export default class Guild extends BaseModel {
return result;
}
public static async updateInfo(code: string, update: GuildUpdateParam, incParam: { managerCnt?: number }, select?: string) {
public static async updateInfo(code: string, update: GuildUpdateParam, incParam?: { managerCnt?: number }, select?: string) {
const result: GuildType = await GuildModel.findOneAndUpdate({ code }, { $set: update, $inc: incParam }, { new: true }).select(select).lean();
return result;
}
@@ -162,6 +164,11 @@ export default class Guild extends BaseModel {
const result: GuildType = await GuildModel.findOneAndUpdate({ code, fund: {$gte: cost}}, { $inc: { fund: -1 * cost } }, {new: true}).lean();
return result;
}
public static async findGuild(code: string, serverId: number, select?: string, lean = true) {
const result = await GuildModel.findOne({ code, status: GUILD_STATUS.RUNNING, serverId }).select(select).lean(lean);
return result;
}
}
export const GuildModel = getModelForClass(Guild);

View File

@@ -1,8 +1,19 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop, DocumentType, Ref } from '@typegoose/typegoose';
class Reward {
@prop({ required: true })
id: number;
@prop({ required: true })
count: number;
}
class TrainBox {
@prop({ required: true })
roleId: string;
@prop({ required: true, type: Reward })
good: Reward;
@prop({ required: true })
index: number;
}
class TrainScript {
@@ -56,16 +67,21 @@ export default class GuildTrain extends BaseModel {
@prop({ required: true, default: false})
locked: boolean;
public static async findGuildTrain(guildCode: string, locked = false, lean = true) {
const guildTrain: GuildTrainType[] = await GuildTrainModel.findOne({ guildCode, locked }).lean(lean);
public static async findGuildTrain(guildCode: string, select?: string, locked = false, lean = true) {
const guildTrains: GuildTrainType[] = await GuildTrainModel.find({ guildCode, locked }).select(select).lean(lean);
return guildTrains;
}
public static async findGuildTrainByTrainIds(guildCode: string, trainIds:Array<number>, locked = false, lean = true) {
const guildTrains: GuildTrainType[] = await GuildTrainModel.find({ trainId:{ $in:trainIds}, guildCode, locked }).lean(lean);
return guildTrains;
}
public static async findTrainByTrainIdNotLock(guildCode: string, trainId: number, select?: string, locked = false, lean = true) {
const guildTrain: GuildTrainType = await GuildTrainModel.findOne({ guildCode, trainId, locked }).select(select).lean(lean);
return guildTrain;
}
public static async findTrainByTrainIdNotLock(guildCode: string, trainId: number, locked = false, lean = true) {
const guildTrain: GuildTrainType = await GuildTrainModel.findOne({ guildCode, trainId, locked }).lean(lean);
return guildTrain;
}
public static async updateGuildTrain(guildCode: string, trainId: number, update: GuildTrainTypeParam, lean = true) {
const guildTrain: GuildTrainType = await GuildTrainModel.findOneAndUpdate({ guildCode, trainId}, { $set: update }).lean(lean);
return guildTrain;
@@ -77,10 +93,22 @@ export default class GuildTrain extends BaseModel {
return guildTrain;
}
public static async openGuildTrain() {
// const bossScript: BossScriptType = await BossScriptModel.findOneAndUpdate({ guildCode },{ranks:[], time: nowSeconds(), bossHp, warId, $inc: { recordNum: 1 }}, {new: true, upsert: true}).lean(lean);
public static async openGuildTrain(guildCode: string, trainId: number, trainScripts: Array<TrainScript>, lean = true) {
const guildTrain: GuildTrainType = await GuildTrainModel.findOneAndUpdate({ guildCode, trainId },{ trainId, reports: [], locked: false, ranks: [], trainScripts, isComplete: false, guildCode}, {new: true, upsert: true}).lean(lean);
return guildTrain;
}
public static async findTrainScriptBoxByIndex(guildCode: string, roleId: string, trainId: number, hid: number, index: number, progress: number, time, locked = false, lean = true) {
const guildTrain: GuildTrainType = await GuildTrainModel.findOne({ guildCode, trainId, locked, 'trainScripts.hid': hid,
'trainScripts.index':{$ne:index },'trainScripts.roleId':{$ne:roleId }, progress: {$gte: progress}, time:{$gte: time}}).lean(lean);
return guildTrain;
}
public static async receiveBoxByIndex(guildCode: string, roleId: string, trainId: number, hid: number, index: number, good: Reward, locked = false, lean = true) {
const guildTrain: GuildTrainType = await GuildTrainModel.findOneAndUpdate({ guildCode, trainId, locked, 'trainScripts.hid': hid, },
{ $push:{ 'trainScripts.$.trainBoxs': {roleId, index, good} }} ).lean(lean);
return guildTrain;
}
}

View File

@@ -128,6 +128,12 @@ export default class UserGuild extends BaseModel {
const result = await UserGuildModel.findOneAndUpdate({ roleId, status: USER_GUILD_STATUS.ON }, { $inc: { honourWeekly: inc } }, { new: true }).select(select).lean();
return result;
}
public static async receiveTrainRewards(roleId: string, trainId: number, lean = true) {
const result = await UserGuildModel.findOneAndUpdate({ roleId, status: USER_GUILD_STATUS.ON, 'trainRewards':{$ne: trainId }},
{$push:{trainRewards: trainId} }).lean(lean);
return result;
}
}
export const UserGuildModel = getModelForClass(UserGuild);