形象：解锁头像相框形象

shared/domain/dbGeneral.ts

@@ -208,46 +208,24 @@ export class Figure {
     id: number;						// 头像id
     @prop({ required: true, default: false })
     enable: boolean = false;				// 是否启用
-    @prop({ required: false, default: 0 })
+    @prop({ required: false })
     time?: number;					        // 到期时间
     @prop({ required: true, default: [] })
     unlockedType: number[] = [];			// 当前已经解锁了的type
+    @prop({ required: true, default: false })
+    unlocked: boolean = false;			// 是否已解锁
 
     public get status () {           // 虚拟字段status，当前头像是否已经解锁
-        let dicGoods = gameData.goods.get(this.id);
-        if(!dicGoods) return false;
-
-        let hasUnlockedAll = true;
-        for(let {type} of dicGoods.condition) {
-            if(!this.unlockedType.includes(type)) {
-                hasUnlockedAll = false; break;
-            }
-        }
-        if(!hasUnlockedAll) return true;
-
-        if(dicGoods.timeLimit) { // 超时
-            if(this.time < nowSeconds()) return false;
-        }
+        if(!this.unlocked) return this.unlocked; // 未解锁
+        if(this.time && this.time < nowSeconds()) return false; // 已解锁过时
         return true;
     }
 
-    constructor(id: number, unlockedType?: number[]) {
-        let dicGoods = gameData.goods.get(id);
-        if(dicGoods) {
-            this.id = id;
-            if(!unlockedType) unlockedType = dicGoods.condition.map(cur => cur.type);
-            this.unlockedType = unlockedType;
-
-            let hasUnlockedAll = true;
-            for(let {type} of dicGoods.condition) {
-                if(!this.unlockedType.includes(type)) {
-                    hasUnlockedAll = false; break;
-                }
-            }
-            if(hasUnlockedAll && dicGoods.timeLimit) {
-                this.time = getBeforeDaySeconds(-1 * dicGoods.timeLimit); // timeLimit天以后 
-            }
-        }
+    constructor(id: number, unlocked: boolean, time?: number, enable = false) {
+        this.id = id;
+        this.unlocked = unlocked;
+        if(time) this.time = time;
+        this.enable = enable;
     }
 
 }

shared/domain/rank.ts

@@ -11,6 +11,9 @@ export class RankParam {
     spine: number = FIGURE.DEFAULT_SPINE;
     title: number;
 
+    headHid: number = 19; // TODO 等客户端接完将这些删除
+    sHid: number = 19;
+
     constructor(roleName: string, lv: number, vLv: number, head: number, frame: number, spine: number, title: number) {
         this.roleName = roleName;
         this.lv = lv;
@@ -34,6 +37,10 @@ export class GuildRankParam {
         head: number;
         frame: number;
         spine: 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}) {
@@ -53,6 +60,9 @@ export class GuildLeader {
     frame: number;
     spine: number;
 
+    headHid: number = 19;
+    sHid: number = 19;
+
     constructor(leader: {roleName: string, title: number, lv: number, head: number, frame: number, spine: number}) {
         this.roleName = leader.roleName;
         this.title = leader.title;