fix: 战力缩放

shared/db/PvpDefense.ts

@@ -4,26 +4,7 @@ import Hero, { } from './Hero';
 import Role, { } from './Role';
 import { PVP_PLAYER_POS, PVP_HERO_POS } from '../consts';
 import PvpHistoryOpp from './PvpHistoryOpp';
-
-export interface pvpUpdateInter {
-    _id?: string;
-    oppPlayers?: OppPlayers[];
-    hisScore?: number;
-    score?: number;
-    pLv?:number;
-    heroScores?: HeroScores[];
-    winStreakNum?: number;
-    defCe?:number;
-    heroes?: Array<Heroes>;
-    seasonNum?: number;
-    refOppCnt?:number;
-    refOppTime?: Date;
-    challengeCnt?:number;
-    challengeRefTime?:number;
-    isFirstEntry?:boolean;
-    receivedBox?: Array<number>;
-    isDefaultHero?:boolean;
-}
+import { reduceCe } from '../pubUtils/util';
 
 export class Heroes {
     @prop({ required: true })
@@ -61,31 +42,6 @@ function getInitialOppHeros() {
     return heros;
 }
 
-export class Robot {
-    @prop({ required: true })
-    roleId: string;					// 角色 id
-    @prop({ required: true })
-    roleName: string;				// 角色名称
-    @prop({ required: true, default: 19 })
-    headHid: number;    
-    @prop({ required: true, default: 19 })
-    sHid: number;
-    @prop({ required: true })
-    defCe: number;
-    @prop({ required: true })
-    pLv: number;
-    @prop({ required: true })
-    warId: number;                   // 模板的warId
-    
-    constructor(roleId: string, roleName: string, defCe: number, pLv: number, warId: number) {
-        this.roleId = roleId;
-        this.roleName = roleName;
-        this.defCe = defCe;
-        this.pLv = pLv;
-        this.warId = warId;
-    }
-}
-
 export class OppPlayers {
     @prop({ required: true })
     roleId: string;
@@ -122,7 +78,7 @@ export default class PvpDefense extends BaseModel {
     hisScore: number;              //历史最高积分
     @prop({ required: true, default: 0 })
     winStreakNum: number;          //连胜次数
-    @prop({ required: true, default: 0 })
+    @prop({ required: true, default: 0, get: (val: number) => reduceCe(val), set: (val: number) => val })
     defCe: number;                 //防守ce
     @prop({ required: true, type: OppPlayers, default: getInitialOppPlayers(), _id: false })
     oppPlayers: Array<OppPlayers>;
@@ -149,11 +105,11 @@ export default class PvpDefense extends BaseModel {
         return result;
     }
     
-    public static async findByScale(roleId: string, min: number, max: number, lean = true) {
+    public static async findByScale(roleId: string, min: number, max: number) {
         const result: PvpDefenseType[] = await PvpDefenseModel.find({ roleId: { $ne: roleId }, defCe: { $lte: max, $gte: min } })
         .populate('role', 'headHid sHid topFiveCe roleId roleName lv globalCeAttr')
         .populate('heroes.hero')
-        .sort({ updatedAt: -1 }).limit(100).lean(lean);
+        .sort({ updatedAt: -1 }).limit(100).lean({ getters: true });
         return result;
     }
 
@@ -197,7 +153,7 @@ export default class PvpDefense extends BaseModel {
         const result: PvpDefenseType = await PvpDefenseModel.findOne({ roleId })
         .populate('role', 'headHid sHid topFiveCe roleId roleName lv globalCeAttr')
         .populate('heroes.hero')
-        .populate('oppPlayers.oppDef', 'oppRoleId pos roleName headHid sHid rankLv title lv pLv defCe heroes').lean();
+        .populate('oppPlayers.oppDef', 'oppRoleId pos roleName headHid sHid rankLv title lv pLv defCe heroes').lean({ getters: true });
         return result;
     }
 
@@ -206,7 +162,7 @@ export default class PvpDefense extends BaseModel {
         .populate('role', 'headHid sHid topFiveCe roleId roleName lv globalCeAttr')
         .populate('heroes.hero')
         .populate('oppPlayers.oppDef', 'oppRoleId pos roleName headHid sHid rankLv pLv title lv defCe heroes')
-        .lean();
+        .lean({ getters: true });
         return result;
     }
 
@@ -214,7 +170,7 @@ export default class PvpDefense extends BaseModel {
         delete update._id;
         let result: PvpDefenseType = await PvpDefenseModel.findOneAndUpdate({roleId}, {$set:update}, {new: true})
         .populate('role', 'headHid sHid topFiveCe roleId roleName lv')
-        .populate('oppPlayers.oppDef', 'oppRoleId pos roleName headHid sHid rankLv pLv title lv defCe heroes').lean();
+        .populate('oppPlayers.oppDef', 'oppRoleId pos roleName headHid sHid rankLv pLv title lv defCe heroes').lean({ getters: true });
         return result;
     }
     public static async updateInfo(roleId: string, update: pvpUpdateInter, lean = true) {
@@ -227,11 +183,11 @@ export default class PvpDefense extends BaseModel {
         return result;
     }
 
-    public static async getRank(seasonNum: number, page = 1, limit = 1000, lean = true) {
+    public static async getRank(seasonNum: number, page = 1, limit = 1000) {
         let sortBy = { score: -1, updatedAt: 1 };
         const ranks: PvpDefenseType[] = await PvpDefenseModel.find({seasonNum}).select('roleId role score updatedAt')
         .populate('role', 'roleId roleName headHid sHid title lv vLv')
-        .sort(sortBy).limit(limit).skip((page - 1) * limit).lean(lean);
+        .sort(sortBy).limit(limit).skip((page - 1) * limit).lean({ getters: true });
         return ranks;
     }
 
@@ -243,4 +199,5 @@ export default class PvpDefense extends BaseModel {
 
 export const PvpDefenseModel = getModelForClass(PvpDefense);
 
-export interface PvpDefenseType extends Pick<DocumentType<PvpDefense>, keyof PvpDefense> { };
+export interface PvpDefenseType extends Pick<DocumentType<PvpDefense>, keyof PvpDefense> { };
+export type pvpUpdateInter = Partial<PvpDefenseType>;