全局：属性修改

shared/db/Role.ts

@@ -1,6 +1,6 @@
-import { HANG_UP_CONSTS, ROLE_TERAPH, ROLE_SELECT } from './../consts';
+import { HANG_UP_CONSTS, ROLE_TERAPH, ROLE_SELECT, ABI_TYPE } from './../consts';
 import BaseModel  from './BaseModel';
-import { CeAttrRole } from '../domain/roleField/attribute';
+import { CeAttrDataRole } from '../domain/roleField/attribute';
 import { index, getModelForClass, prop, DocumentType, Ref, mongoose } from '@typegoose/typegoose';
 import User from './User';
 import { shouldRefresh, reduceCe } from '../pubUtils/util';
@@ -41,37 +41,47 @@ export class WarStar {
     star: number;					// 星级
 }
 
-class Teraph{
+export class Teraph{
     @prop({ required: true, default: 1 })
     id: number;						// 神像的id
     @prop({ required: true, default: 1 })
-    grade: number;                  // 等级
+    grade: number = 1;                  // 等级
     @prop({ required: true, default: 0 })
-    hp: number;
+    hp: number = 0;
     @prop({ required: true, default: 0 })
-    atk: number;
+    atk: number = 0;
     @prop({ required: true, default: 0 })
-    def: number;
+    def: number = 0;
     @prop({ required: true, default: 0 })
-    mdef: number;
-    @prop({ required: true, default: 0 })
-    agi: number;
-    @prop({ required: true, default: 0 })
-    luk: number;
+    mdef: number = 0;
+
+    constructor(id: number) {
+        this.id = id;
+    }
+
+    public get attr() {
+        let map = new Map<number, number>();
+        map.set(ABI_TYPE.ABI_HP, this.hp);
+        map.set(ABI_TYPE.ABI_ATK, this.atk);
+        map.set(ABI_TYPE.ABI_DEF, this.def);
+        map.set(ABI_TYPE.ABI_MDEF, this.mdef);
+        return map
+    }
+
+    public set attr(value: Map<number, number>) {
+        value.forEach((val, id) => {
+            if(id == ABI_TYPE.ABI_HP) this.hp = val;
+            if(id == ABI_TYPE.ABI_ATK) this.atk = val;
+            if(id == ABI_TYPE.ABI_DEF) this.def = val;
+            if(id == ABI_TYPE.ABI_MDEF) this.mdef = val;
+        });
+    }
 }
 // 初始化
 function getInitialTeraph() {
     let teraphs = new Array<Teraph>();
     for(let i = ROLE_TERAPH.START; i <= ROLE_TERAPH.END; i++) {
-        let p = new Teraph();
-        p.id = i;
-        p.grade = 1;
-        p.hp = 0;
-        p.atk = 0;
-        p.def = 0;
-        p.mdef = 0;
-        p.agi = 0;
-        p.luk = 0;
+        let p = new Teraph(i);
         teraphs.push(p);
     }
     return teraphs;
@@ -114,8 +124,8 @@ export default class Role extends BaseModel {
     lv: number;							// 主公等级
     @prop({ required: true, default: 0, set: (val: number) => val, get: (val: number) => reduceCe(val) })
     ce: number;							// 总战力
-    @prop({ required: true, default: new CeAttrRole(), _id: false })
-    globalCeAttr: CeAttrRole;							// 总战力
+    @prop({ required: true, type: CeAttrDataRole, default: [], _id: false })
+    attr: CeAttrDataRole[];					// 总战力
     @prop({ required: true, default: 0, set: (val: number) => val, get: (val: number) => reduceCe(val) })
     topLineupCe: number;			// 最强x人战力
     @prop({ required: true, type: TopHero, default: [], _id: false })
@@ -242,8 +252,8 @@ export default class Role extends BaseModel {
      * @param select 选取字段，来自 selectConst/ROLE
      * @param getters 是否使用get方法，如ce使用了自动缩小1w倍
      */
-    public static async findByRoleId(roleId: string, select?: string, getters = false) {
-        const role: RoleType = await RoleModel.findOne({ roleId }).select(select).lean({getters});
+    public static async findByRoleId(roleId: string, select?: string, getters = false, virtuals = true) {
+        const role: RoleType = await RoleModel.findOne({ roleId }).select(select).lean({getters, virtuals});
         return role;
     }
 
@@ -252,9 +262,8 @@ export default class Role extends BaseModel {
         if (!user) return null;
         const doc = new RoleModel();
         const update = Object.assign(doc.toJSON(), roleInfo, { userInfo: user, serverType: user.serverType, serverId });
-        initRoleAtrr(update);
         const role: RoleType = await RoleModel.findOneAndUpdate({ 'userInfo.uid': uid, serverId }, update, { upsert: true, new: true }).lean(lean);
-        
+        initRoleAtrr(role);
         return role;
     }
 
@@ -427,7 +436,7 @@ export default class Role extends BaseModel {
         return recs
     }
 
-    public static async updateRoleInfo(roleId: string, roleUpdate:roleUpdate, lean = true) {
+    public static async updateRoleInfo(roleId: string, roleUpdate:RoleUpdate, lean = true) {
         delete roleUpdate._id;
         let result: RoleType = await RoleModel.findOneAndUpdate({roleId}, {$set:roleUpdate}, {new: true}).lean(lean);
         return result;
@@ -519,4 +528,4 @@ export default class Role extends BaseModel {
 export const RoleModel = getModelForClass(Role);
 
 export interface RoleType extends Pick<DocumentType<Role>, keyof Role>{};
-type roleUpdate = Partial<RoleType>; // 将所有字段变成可选项
+export type RoleUpdate = Partial<RoleType>; // 将所有字段变成可选项