战力：获取显示数据

game-server/app/services/pvpService.ts

@@ -1,7 +1,7 @@
 
 import { PvpDefenseModel, PvpDefenseType, pvpUpdateInter } from '../db/PvpDefense';
 import { Defense, Attack, LineupCe, OppPlayer, HeroScore, HeroReward, OppPlayerReturn, AttackHero, DefenseHero } from '../domain/battleField/pvp';
-import { RoleType, CeAttrDataRole } from '../db/Role';
+import { RoleType } from '../db/Role';
 import { PVP_HERO_POS, REDIS_KEY, PVP_CONST, COUNTER, TASK_TYPE, MAIL_TYPE, TA_EVENT } from '../consts';
 import { dicPvpOpponent, DicPvpOpponent } from "../pubUtils/dictionary/DicPvpOpponent";
 import { getRandSingleIndex, genCode, shouldRefresh, getChineseName, makeRobotId, robotIdComBack, getRandSingleEelm } from '../pubUtils/util';
@@ -11,7 +11,7 @@ import { PVP } from '../pubUtils/dicParam';
 import { PVPConfigModel, PVPConfigType } from '../db/SystemConfig'
 import { nowSeconds, getTimeFun } from '../pubUtils/timeUtil';
 import { HeroesRecord, PvpRecordPlayerInfo } from '../db/PvpRecord';
-import { HeroModel, CeAttrData, HeroType } from '../db/Hero';
+import { HeroModel, HeroType } from '../db/Hero';
 import { AttributeCal } from '../domain/roleField/attribute';
 import { PvpEnemies, PvpHeroInfo, PvpOtherHeroes } from '../domain/dbGeneral';
 import { DicWarJson } from '../pubUtils/dictionary/DicWarJson';
@@ -27,6 +27,7 @@ import { sendMailByContent } from './mailService';
 import { RoleRankInfo } from '../domain/rank';
 import { reportTAEvent } from './sdkService';
 import { getVipPvpChallengeMaxCnt } from './activity/monthlyTicketService';
+import { getHeroesAttributes } from './playerCeService';
 
 /**
  * 返回对手三人信息
@@ -203,6 +204,7 @@ async function generPlayerOppHis(pvpdefense: PvpDefenseType, roleId: string, pos
     let heroes = new Array<PvpEnemies>();
     let otherHeroes = new Array<PvpOtherHeroes>(); // 阵容外的所有武将信息
     let defCe = 0;
+    let attrByHid = await getHeroesAttributes(role.roleId);
     for (let dbHero of dbHeroes) {
         let h = defenseHeroes.find(cur => cur.actorId == dbHero.hid); // 阵容里是否有这个武将
         let hs = heroScores.find(cur => cur.hid == dbHero.hid); // 这个武将是否有这个得分
@@ -213,7 +215,10 @@ async function generPlayerOppHis(pvpdefense: PvpDefenseType, roleId: string, pos
                 let heroInfo = new PvpHeroInfo();
                 heroInfo.setHeroInfo(dbHero);
                 // heroInfo.setOutIndex(h.order);
-                let { attribute, ce } = getPlayerAttribute(dbHero.lv, dbHero.attr, role.attr);
+                let attr = attrByHid.get(h.actorId);
+                if(!attr) continue;
+                let attribute = attr.getAttributesToString();
+                let ce = attr.calCe();
                 heroInfo.setAttribute(attribute);
                 let enemy = new PvpEnemies(warJson, heroInfo, hs ? hs.score : 0, ce);
                 enemy.setOutIndex(h.order);
@@ -372,37 +377,11 @@ export function getRobotAttribute(hid: number, posRatio: number, score: number)
     let newAttribute = new AttributeCal();
     newAttribute.setLv(difficultRatio.enemyLv);
     newAttribute.setByMap(dicHero.baseAbilityArr, difficultRatio.value / 10000 * posRatio);
-    let attrArr = newAttribute.getReduceAttributesToString();
-    let newCe = newAttribute.calCelAndReduce();
+    let attrArr = newAttribute.getAttributesToString();
+    let newCe = newAttribute.calCe();
     return { attribute: attrArr, ce: newCe, lv: difficultRatio.enemyLv };
 }
 
-/**
- * @description 根据玩家数据获取到他的属性
- * @param ceAttr hero表的ceAttr
- * @param globalCeAttr role表中的globalCeAttr
- */
-export function getPlayerAttribute(lv: number, heroAttrs: CeAttrData[] = [], roleAttrs: CeAttrDataRole[] = []) {
-    let newAttribute = new AttributeCal();
-    newAttribute.setLv(lv);
-    newAttribute.setByDbData(roleAttrs, heroAttrs);
-    let attribute = newAttribute.getReduceAttributesToString();
-    let ce = newAttribute.calCelAndReduce();
-    return { attribute, ce };
-}
-
-/**
- * @description 根据玩家数据获取到他的主属性
- * @param ceAttr 
- * @param globalCeAttr 
- */
-export function getPlayerMainAttribute(heroAttrs: CeAttrData[], roleAttrs: CeAttrDataRole[]) {
-    let newAttribute = new AttributeCal();
-    newAttribute.setByDbData(roleAttrs, heroAttrs);
-    let mainAttributes = newAttribute.getReduceMainAttributes();
-    return mainAttributes;
-}
-
 // 获取我方战报记录
 export async function generMyRecInfo(pvpDefense: PvpDefenseType, role: RoleType, isSuccess: boolean, pos: number, myHeroes: pvpEndParamInter[]) {
     let { attack, defense, heroScores, winStreakNum, hisWinStreakNum = 0, score, hisScore } = pvpDefense;