远征：重置使用历史最高战力

game-server/app/services/playerCeService.ts

@@ -10,7 +10,7 @@ import { HERO_SYSTEM_TYPE, PUSH_ROUTE, REDIS_KEY } from '../consts';
 import { updateUserInfo } from './redisService';
 import { GuildModel, GuildType } from '../db/Guild';
 import { CalCe } from './role/calCe';
-import { RoleCeModel } from '../db/RoleCe';
+import { RoleCeModel, RoleCeUpdate } from '../db/RoleCe';
 import { PvpDefenseModel } from '../db/PvpDefense';
 import { saveCeChangeLog } from '../pubUtils/logUtil';
 import { JewelType } from '../db/Jewel';
@@ -360,7 +360,10 @@ export async function calculateCes(type: HERO_SYSTEM_TYPE, roleId: string, serve
     }
     
     let { topLineup, topLineupCe } = calCe.getTopLineup();
-    let roleCeUpdate = calCe.getRoleCeTable();
+    let roleCeUpdate: RoleCeUpdate = calCe.getRoleCeTable();
+    if(topLineupCe > roleCe.historyLineupCe) {
+        roleCeUpdate = { ...roleCeUpdate, historyLineupCe: topLineupCe };
+    }
     roleCe = await RoleCeModel.updateRoleCe(roleId, roleCeUpdate);
     let role = await RoleModel.incRoleInfo(roleId, { ...roleIncUpdate, ce: roleInc }, { ...roleUpdate, topLineup, topLineupCe });
     let guild = await GuildModel.updateCe(roleId, roleInc); // 公会更新战力
@@ -416,18 +419,9 @@ async function updateRank(roleId: string, serverId: number, topLineupCe: number,
     await r6.setRankWithRoleInfo(roleId, role.heroNum, role.heroNumUpdatedAt, role);    
 }
 
-export async function getSumCe(roleId: string, num: number) {
+export async function getSumCe(roleId: string) {
     let roleCe = await RoleCeModel.findByRoleId(roleId);
-    let calCe = new CalCe(roleId);
-    calCe.setRoleCe(roleCe);
-    let arr = calCe.getResultCeArr();
-    let ce = 0;
-    for(let i = 0; i < num; i++) {
-        if(arr[i]) {
-            ce += arr[i].ce;
-        }
-    }
-    return ce;
+    return roleCe.historyLineupCe;
 }
 
 export async function getHeroesAttributes(roleId: string) {