形象：头像相框形象字段

shared/domain/battleField/guild.ts

@@ -1,8 +1,9 @@
-import { PvpEnemies, PvpOtherHeroes } from "../../domain/dbGeneral";
+import { PvpEnemies, PvpOtherHeroes, WarStar } from "../../domain/dbGeneral";
 import { GuildType } from "../../db/Guild";
-import { RoleType, WarStar } from "../../db/Role";
+import { RoleType } from "../../db/Role";
 import { WAR_TYPE } from "../../consts/consts";
 import { gameData } from "../../pubUtils/data";
+import { FIGURE } from "../../pubUtils/dicParam";
 
 export class PlayerDetailHero {
     actorId: number;
@@ -49,8 +50,9 @@ export class PlayerDetail {
     roleName: string;
     lv: number;
     title?: number = 1;
-    sHid?: number = 19;
-    headHid?: number = 19;
+    head?: number = FIGURE.DEFAULT_HEAD;
+    frame?: number = FIGURE.DEFAULT_FRAME;
+    spine?: number = FIGURE.DEFAULT_SPINE;
 
     score?: number = 0;
     pLv?: number = 1;
@@ -66,8 +68,9 @@ export class PlayerDetail {
         if(detail.roleName) this.roleName = detail.roleName;
         if(detail.lv) this.lv = detail.lv;
         if(detail.title) this.title = detail.title;
-        if(detail.sHid) this.sHid = detail.sHid;
-        if(detail.headHid) this.headHid = detail.headHid;
+        if(detail.head) this.head = detail.head;
+        if(detail.frame) this.frame = detail.frame;
+        if(detail.spine) this.spine = detail.spine;
         if(detail.score) this.score = detail.score;
         if(detail.pLv) this.pLv = detail.pLv;
         if(detail.defCe) this.defCe = detail.defCe;

shared/domain/dbGeneral.ts

@@ -1,7 +1,8 @@
-import { prop } from '@typegoose/typegoose';
+import { prop, mongoose, Ref } from '@typegoose/typegoose';
 import { DicWarJson } from '../pubUtils/dictionary/DicWarJson';
-import { HeroType } from '../db/Hero';
 import { Attribute } from './roleField/attribute';
+import Hero, { HeroType } from '../db/Hero';
+import { FIGURE } from '../pubUtils/dicParam';
 
 // 从玩家数据中覆盖warjson的部分字段
 export class PvpHeroInfo {
@@ -146,4 +147,75 @@ export class ItemReward {
     id: number;
     @prop({ required: true })
     count: number;
+}
+
+
+export class TopHero {
+    @prop({ required: true })
+    hid: number; // 武将id
+    @prop({ required: true })
+    ce: number; // 战力
+    @prop({ ref: Hero, type: mongoose.Schema.Types.ObjectId })
+    hero: Ref<Hero>;
+}
+
+
+export class DungeonHero {
+    @prop({ required: true })
+    battleId: number; // 关卡id
+    @prop({ required: true, type: Number, default: [] })
+    heroes: Array<number>; // 武将id
+}
+
+export class PayRecord {
+    @prop({ required: true })
+    id: string;						// 购买项 product id
+    @prop({ required: true })
+    cnt: number;					// 购买次数
+}
+
+export class WarStar {
+    @prop({ required: true })
+    id: number;						// 关卡 id
+    @prop({ required: true })
+    warType: number;      // 关卡类型
+    @prop({ required: true })
+    star: number;					// 星级
+}
+
+export class Teraph {
+    @prop({ required: true, default: 1 })
+    id: number;						// 神像的id
+    @prop({ required: true, default: 1 })
+    grade: number;                  // 等级
+    @prop({ required: true, default: 0 })
+    hp: number;
+    @prop({ required: true, default: 0 })
+    atk: number;
+    @prop({ required: true, default: 0 })
+    def: number;
+    @prop({ required: true, default: 0 })
+    mdef: number;
+    @prop({ required: true, default: 0 })
+    agi: number;
+    @prop({ required: true, default: 0 })
+    luk: number;
+}
+
+export class Head {
+    @prop({ required: true, default: FIGURE.DEFAULT_HEAD })
+    id: number;						// 头像id
+    @prop({ required: true, default: false })
+    enable: boolean;				// 是否启用
+    @prop({ required: true })
+    time: number;					// 到期时间
+}
+
+export class Frame {
+    @prop({ required: true, default: FIGURE.DEFAULT_FRAME })
+    id: number;						// 相框id
+    @prop({ required: true, default: false })
+    enable: boolean;				// 是否启用
+    @prop({ required: true })
+    time: number;					// 到期时间
 }

shared/domain/rank.ts

@@ -1,20 +1,23 @@
+import { FIGURE } from "../pubUtils/dicParam";
+
 // 排行榜返回玩家值
 export class RankParam {
     roleName: string;
     lv: number;
     vLv: number;
     guildName: string = "";
-    head: string = 'zhaoyun';
-    headHid: number = 19;
-    sHid: number = 19;
+    head: number = FIGURE.DEFAULT_HEAD;
+    frame: number = FIGURE.DEFAULT_FRAME;
+    spine: number = FIGURE.DEFAULT_SPINE;
     title: number;
 
-    constructor(roleName: string, lv: number, vLv: number, headHid: number, sHid: number, title: number) {
+    constructor(roleName: string, lv: number, vLv: number, head: number, frame: number, spine: number, title: number) {
         this.roleName = roleName;
         this.lv = lv;
         this.vLv = vLv;
-        this.headHid = headHid;
-        this.sHid = sHid;
+        this.head = head;
+        this.frame = frame;
+        this.spine = spine;
         this.title = title;
     }
 }
@@ -28,11 +31,12 @@ export class GuildRankParam {
         roleName: string;
         title: number;
         lv: number;
-        headHid: number;
-        sHid: number;
+        head: number;
+        frame: number;
+        spine: number;
     }
 
-    constructor(icon: number, name: string, lv: number, leader: {roleName: string, title: number, lv: number, headHid: number, sHid: number}) {
+    constructor(icon: number, name: string, lv: number, leader: {roleName: string, title: number, lv: number, head: number, frame: number, spine: number}) {
         this.icon = icon;
         this.name = name;
         this.lv = lv;
@@ -45,14 +49,16 @@ export class GuildLeader {
     roleName: string;
     title: number;
     lv: number;
-    headHid: number;
-    sHid: number;
+    head: number;
+    frame: number;
+    spine: number;
 
-    constructor(leader: {roleName: string, title: number, lv: number, headHid: number, sHid: number}) {
+    constructor(leader: {roleName: string, title: number, lv: number, head: number, frame: number, spine: number}) {
         this.roleName = leader.roleName;
         this.title = leader.title;
         this.lv = leader.lv;
-        this.headHid = leader.headHid;
-        this.sHid = leader.sHid;
+        this.head = leader.head;
+        this.frame = leader.frame;
+        this.spine = leader.spine;
     }
 }

shared/domain/roleField/friend.ts

@@ -6,8 +6,9 @@ export class FriendParams {
     roleId: string;
     roleName: string;
     lv: number;
-    headHid: number;
-    sHid: number;
+    head: number;
+    frame: number;
+    spine: number;
     ce: number;
     title: number;
     serverId: number;
@@ -18,8 +19,9 @@ export class FriendParams {
         this.roleId = role.roleId;
         this.roleName = role.roleName;
         this.lv = role.lv;
-        this.headHid = role.headHid;
-        this.sHid = role.sHid;
+        this.head = role.head;
+        this.frame = role.frame;
+        this.spine = role.spine;
         this.ce = role.ce;
         this.title = role.title;
     }