战力：替换新方法

game-server/app/servers/battle/handler/expeditionBattleHandler.ts

@@ -4,7 +4,7 @@ import { ExpeditionRecordModel } from '../../../db/ExpeditionRecord';
 import { ExpeditionWarRecordModel } from '../../../db/ExpeditionWarRecord';
 import { ExpeditionPointModel } from '../../../db/ExpeditionPoint';
 import { RoleModel } from '../../../db/Role';
-import { calculateSumCE, genCode, getWarTypeName } from '../../../pubUtils/util';
+import { genCode, getWarTypeName } from '../../../pubUtils/util';
 import { getPointRewardStatus, getResetRemainCnt, findOrCreateEnemies, getExpeditionStatus } from '../../../services/expeditionService';
 import { DEBUG_MAGIC_WORD, EXPEDITION_WAR_RECORD_STATUS, ITEM_CHANGE_REASON, KING_EXP_RATIO_TYPE, LINEUP_NUM, TASK_TYPE, TA_EVENT } from '../../../consts';
 import { WarReward } from '../../../services/warRewardService';
@@ -18,6 +18,7 @@ import { gameData } from '../../../pubUtils/data';
 import * as dicParam from '../../../pubUtils/dicParam';
 import { getSeconds, nowSeconds } from '../../../pubUtils/timeUtil';
 import { reportTAEvent } from '../../../services/sdkService';
+import { getSumCe } from '../../../services/playerCeService';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -58,8 +59,8 @@ export class ExpeditionBattleHandler {
 
         await ExpeditionRecordModel.hideRecord(roleId); // 刷掉旧关卡
 
-        // 我方战力（暂定）
-        let myCe = await calculateSumCE(roleId, 1, { num: LINEUP_NUM });
+        // 我方战力
+        let myCe = await getSumCe(roleId, LINEUP_NUM);
         // 每一关的挑战状态
         let { expeditionCode, heroes } = await ExpeditionRecordModel.createRecord({
             roleId, roleName, heroes: [], myCe