Merge branch 'master' of gitlab.trgame.cn:zyztech/zyz_server

shared/db/Equip.ts

@@ -3,7 +3,6 @@ import { index, getModelForClass, prop, DocumentType, modelOptions } from '@type
 import { COUNTER } from '../consts';
 import { CounterModel } from './Counter';
 import { HeroModel } from './Hero';
-import { CeAttrNumber } from './generalField';
 
 export class RandSe {
     @prop({ required: true })
@@ -70,9 +69,6 @@ export default class Equip extends BaseModel {
     @prop({ required: true, type: Holes, default: [] })
     holes: Holes[];
 
-    @prop({required: true, default: new CeAttrNumber() })
-    ceAttr: CeAttrNumber;                     // 影响战力的属性
-
     public static async findbyRole(roleId: string, lean = true) {
         const equips: EquipType[] = await EquipModel.find({ roleId }).lean(lean);
         return equips;

shared/db/generalField.ts

@@ -7,6 +7,8 @@ export class CeAttrData {
     ratioUp: number = 0;
     @prop({ required: true })
     fixUp: number = 0;
+    @prop({ required: true })
+    equipUp: number = 0;
 }
 
 export class CeAttr {