From 7a7b5baf78c1727ea92e7004d6255dd34fbfb91c Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Mon, 15 Mar 2021 16:20:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=A2=E8=B1=A1=EF=BC=9A=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=98=B5=E5=AE=B9=E6=8E=92=E5=BA=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/servers/role/handler/friendHandler.ts | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/game-server/app/servers/role/handler/friendHandler.ts b/game-server/app/servers/role/handler/friendHandler.ts
index 3291d0a08..9ab190644 100644
--- a/game-server/app/servers/role/handler/friendHandler.ts
+++ b/game-server/app/servers/role/handler/friendHandler.ts
@@ -15,7 +15,7 @@ import { addItems, handleCost } from "../../../services/rewardService";
 import { getFriendPointObject } from "../../../pubUtils/itemUtils";
 import { RewardInter } from "../../../pubUtils/interface";
 import { FriendPresentLogModel } from '../../../db/FriendPresentLog';
-import { HeroModel } from "../../../db/Hero";
+import { HeroModel, HeroType } from "../../../db/Hero";
 import { EquipModel } from "../../../db/Equip";
 import { getPlayerMainAttribute } from "../../../services/pvpService";
 import { FRIEND } from "../../../pubUtils/dicParam";
@@ -650,18 +650,23 @@ export class FriendHandler {
         let { topLineup, topLineupCe, towerLv, showLineup } = role;
 
         let heroes = new Array<PlayerDetailHero>();
-        for(let {hid, lv, star, colorStar, quality } of dbHeroes) {
-            if(showLineup) { // 设置过展示阵容
-                let hasHero = showLineup.includes(hid);
-                if(hasHero) {
+
+        if(showLineup) { // 设置过展示阵容
+            for(let hid of showLineup) {
+                let curHero = dbHeroes.find(cur => cur.hid == hid);
+                if(curHero) {
+                    let { lv, star, colorStar, quality } = curHero;
                     heroes.push({
                         actorId: hid, lv, star, colorStar, quality,
                         score: 0
                     });
                 }
-            } else {
-                let hasHero = topLineup.find(cur => cur.hid == hid);
-                if(hasHero) {
+            }
+        } else {
+            for(let { hid } of topLineup) {
+                let curHero = dbHeroes.find(cur => cur.hid == hid);
+                if(curHero) {
+                    let { lv, star, colorStar, quality } = curHero;
                     heroes.push({
                         actorId: hid, lv, star, colorStar, quality,
                         score: 0
@@ -669,6 +674,7 @@ export class FriendHandler {
                 }
             }
         }
+
         let rank = await getMyRank(REDIS_KEY.PVP_RANK, 0, oppoRoleId);//去redis中获取排名
 
         result = new PlayerDetail({...role, defCe: topLineupCe, heroes});