全局：属性修改

shared/db/Hero.ts

@@ -1,5 +1,5 @@
 import BaseModel from './BaseModel';
-import { CeAttr } from '../domain/roleField/attribute';
+import { CeAttrData } from '../domain/roleField/attribute';
 import { index, getModelForClass, prop, Ref, mongoose, DocumentType } from '@typegoose/typegoose';
 import Equip, {  } from './Equip';
 import { CounterModel } from './Counter';
@@ -11,7 +11,7 @@ import { reduceCe } from '../pubUtils/util';
   * 英雄表
 */
 
-class Connect {
+export class Connect {
     @prop({ required: true })
     shipId: number;
     @prop({ required: true })
@@ -51,31 +51,6 @@ function getInitialEplace() {
     return ePlace;
 }
 
-interface heroUpdate {
-    exp?: number;						
-    lv?: number;							
-    ce?: number;	
-    star?: number;						
-    starStage?: number;		 
-    colorStar?: number;
-    colorStarStage?: number;
-    quality?: number;
-    job?:number;
-    jobStage?:number;
-    favour?:number;
-    favourLv?:number;
-    skins?: Skin[];
-    connections?: Connect[];
-    ePlace?:EPlace[];
-    _id?:number;
-    scrollActive?: boolean;
-    scrollId?: number;
-    scrollStar?: number;
-    scrollColorStar?: number;
-    scrollQuality?: number;
-    historyCe?: number;
-}
-
 @index({ roleId: 1, hid: 1 })
 @index({ roleId: 1, seqId: 1 })
 export default class Hero extends BaseModel {
@@ -102,8 +77,8 @@ export default class Hero extends BaseModel {
     ce: number;							// 武将战力
     @prop({ required: true, default: 0 })
     historyCe: number;			        // 武将历史最高战力
-    @prop({required: true, default: new CeAttr(), _id: false })
-    ceAttr: CeAttr;                     // 影响战力的属性
+    @prop({required: true, type: CeAttrData, default: [], _id: false })
+    attr: CeAttrData[];                     // 影响战力的属性
 
     @prop({ required: true, default: 1 })
     star: number;						// 星级
@@ -181,10 +156,21 @@ export default class Hero extends BaseModel {
     public static async addEquip(roleId: string, hid: number, ePlaceId: number, equipId: string, lean = true) {
         const hero: HeroType = await HeroModel.findOneAndUpdate(
             { roleId, hid, 'ePlace.id': ePlaceId }, 
-            {$set: {'ePlace.$.equip': equipId, 'ePlace.$.hid':hid, 'ePlace.$.ePlaceId':ePlaceId}}, 
+            {$set: { 'ePlace.$.equip': equipId }}, 
             {new: true}).populate('ePlace.equip').lean(lean);
         if (hero) {
-            await Equip.putOn(hero.hid, equipId);
+            await Equip.putOnOrOff( equipId, hero.hid );
+        }
+        return hero;
+    }
+
+    public static async removeEquip(roleId: string, hid: number, ePlaceId: number, equipId: string, lean = true) {
+        const hero: HeroType = await HeroModel.findOneAndUpdate(
+            { roleId, hid, 'ePlace.id': ePlaceId }, 
+            {$set: {'ePlace.$.equip': null}}, 
+            {new: true}).populate('ePlace.equip').lean(lean);
+        if (hero) {
+            await Equip.putOnOrOff( equipId, 0 );
         }
         return hero;
     }
@@ -238,7 +224,7 @@ export default class Hero extends BaseModel {
         return result;
     }
 
-    public static async updateHeroInfo(roleId: string, hid:number, heroUpdate:heroUpdate, select?: string, lean = true) {
+    public static async updateHeroInfo(roleId: string, hid:number, heroUpdate:HeroUpdate, select?: string, lean = true) {
         delete heroUpdate._id;
         let result: HeroType = await HeroModel.findOneAndUpdate({roleId, hid}, {$set:heroUpdate}, {new: true}).select(select).lean(lean);
         return result;
@@ -270,3 +256,4 @@ export default class Hero extends BaseModel {
 export const HeroModel = getModelForClass(Hero);
  
 export interface HeroType extends Pick<DocumentType<Hero>, keyof Hero>{};
+export type HeroUpdate = Partial<HeroType>; // 将所有字段变成可选项