秘境：首通信息

shared/db/BattleRecord.ts

@@ -1,5 +1,6 @@
 import BaseModel from './BaseModel';
 import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
+import { LineupParam } from '../domain/rank';
 
 /**
   * 战斗记录接口
@@ -12,6 +13,8 @@ class Record {
     heroes: Array<number>; // 武将id
     @prop({ required: true, type: Number })
     seqIds: Array<number>; // 武将seqid
+    @prop({ required: true, type: () => LineupParam, _id: false })
+    lineup: Array<LineupParam>; // 武将详细信息
     @prop({ required: false })
     oppRoleId?: string; // pvp对手
     @prop({ required: false })

shared/db/DungeonFirst.ts

@@ -0,0 +1,45 @@
+/**
+ * 秘境首通
+ */
+import BaseModel from './BaseModel';
+import { getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
+import { RankParam, LineupParam } from '../domain/rank';
+
+export default class DungeonFirst extends BaseModel {
+    
+    @prop({ required: true })
+    serverId: number;                    // 服务器id
+
+    @prop({ required: true, default: 0})
+    movePoint: number;                    // 秘境的类型
+    
+    @prop({ required: true, default: 0})
+    warId: number;                        // 关卡id
+
+    @prop({ required: true })
+    time: number;                         // 首通时间
+
+    @prop({ required: true })
+    roleId: string;                         // 玩家id
+    
+    @prop({ required: true, type: () => RankParam, _id: false })
+    userInfo: RankParam;                         // 玩家信息
+
+    @prop({ required: true, type: () => LineupParam, _id: false })
+    lineup: LineupParam[];                         // 玩家信息
+
+    public static async createDungeonFirst(serverId: number, movePoint: number, warId: number, update: DungeonFirstUpdateParam) {
+        const rec: DungeonFirstType = await DungeonFirstModel.findOneAndUpdate({ serverId, movePoint, warId}, { $setOnInsert: update }, { new: true, upsert: true }).lean();
+        return rec;
+    }
+
+    public static async findByMovePoint(serverId: number, movePoint: number) {
+        const rec: DungeonFirstType[] = await DungeonFirstModel.find({ serverId, movePoint}).lean();
+        return rec;
+    }
+}
+
+export const DungeonFirstModel = getModelForClass(DungeonFirst);
+
+export interface DungeonFirstType extends Pick<DocumentType<DungeonFirst>, keyof DungeonFirst>{}
+export type DungeonFirstUpdateParam = Partial<DungeonFirstType>; // 将所有字段变成可选项

shared/domain/battleField/dungeon.ts

@@ -0,0 +1,24 @@
+import { RankParam, LineupParam } from '../rank';
+import { DungeonFirstType } from '../../db/DungeonFirst';
+
+class DungeonUserInfo extends RankParam {
+    roleId: string;
+    constructor(roleId: string, userInfo: RankParam) {
+        super(userInfo, false);
+        this.roleId = roleId;
+    }
+}
+
+export class DungeonResultParam {
+    warId: number;
+    time: number;
+    userInfo: DungeonUserInfo;
+    lineup: LineupParam[];
+
+    constructor(dungeon: DungeonFirstType) {
+        this.warId = dungeon.warId;
+        this.time = dungeon.time;
+        this.userInfo = new DungeonUserInfo(dungeon.roleId, dungeon.userInfo);
+        this.lineup = dungeon.lineup;
+    }
+}

shared/domain/rank.ts

@@ -5,21 +5,41 @@ import { reduceCe } from "../pubUtils/util";
 import { GuildUpdateParam } from "../db/Guild";
 import { HeroType, HeroUpdate } from "../db/Hero";
 import { getSeconds } from "../pubUtils/timeUtil";
+import { prop } from "@typegoose/typegoose";
 
 // 排行榜返回玩家值
 export class RankParam {
+    @prop({ required: true })
     roleName: string = "";
+
+    @prop({ required: true })
     lv: number = 0;
+
+    @prop({ required: true })
     vLv: number = 0;
+
+    @prop({ required: true })
     guildName: string = "";
+
+    @prop({ required: true })
     head: number = EXTERIOR.EXTERIOR_FACE;
+
+    @prop({ required: true })
     frame: number = EXTERIOR.EXTERIOR_FACECASE;
+
+    @prop({ required: true })
     spine: number = EXTERIOR.EXTERIOR_APPEARANCE;
+
+    @prop({ required: true })
     title: number = 1;
+
+    @prop({ required: true })
     ce: number = 0;
+
+    @prop({ required: true })
     updatedAt: number = 0;
 
-    constructor(role: RoleUpdate, fromDb: boolean) {
+    constructor(role: RoleUpdate|RankParam, fromDb: boolean) {
         if(role.roleName) this.roleName = role.roleName;
         if(role.lv) this.lv = role.lv;
         if(role.vLv) this.vLv = role.vLv;
@@ -29,7 +49,7 @@ export class RankParam {
         if(role.title) this.title = role.title;
         if(role.guildName) this.guildName = role.guildName||"";
         if(role.ce) {
-            if(fromDb && !role.isReducedCe) {
+            if(fromDb && !(<RoleUpdate>role).isReducedCe) {
                 this.ce = reduceCe(role.ce);
             } else {
                 this.ce = role.ce;
@@ -141,11 +161,22 @@ export class GuildLeader {
 
 // 排行榜返回玩家值
 export class LineupParam {
+    @prop({ required: true })
     hid: number;
+
+    @prop({ required: true })
     star: number;
+
+    @prop({ required: true })
     colorStar: number;
+
+    @prop({ required: true })
     lv: number;
+
+    @prop({ required: true })
     quality: number;
+
+    @prop({ required: true })
     job: number;
 
     constructor(hero: HeroType) {

shared/pubUtils/dictionary/DicWar.ts

@@ -38,6 +38,8 @@ export interface DicWar {
     readonly fobiddenCharactor: Array<{type: number, id: number}>;
     // 远征随机buff
     readonly mapseid: number[];
+    // 秘境类型
+    readonly movePoint: number;
 }
 
 export const dicWar = new Map<number, DicWar>();