From 86b71f21bf6df04c8e5d5e9f1bf64ec081cbca08 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Tue, 19 Oct 2021 15:56:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9A=AE=E8=82=A4=EF=BC=9A=E6=8E=92=E8=A1=8C?=
 =?UTF-8?q?=E6=A6=9C=E7=AD=89=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/servers/role/handler/friendHandler.ts | 7 +++----
 shared/consts/constModules/selectConst.ts             | 4 ++--
 shared/domain/rank.ts                                 | 4 ++++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/game-server/app/servers/role/handler/friendHandler.ts b/game-server/app/servers/role/handler/friendHandler.ts
index 3d7f8a704..86b8ffa17 100644
--- a/game-server/app/servers/role/handler/friendHandler.ts
+++ b/game-server/app/servers/role/handler/friendHandler.ts
@@ -711,16 +711,15 @@ export class FriendHandler {
         if (heroList.length <= 0) return resResult(STATUS.HERO_NOT_FIND);
 
         let list = new Array();
-        for (let { roleId, roleName, hid, hName, ce, lv, star, colorStar, quality, job, skins, attr: heroAttrs, ePlace } of heroList) {
+        for (let { roleId, roleName, hid, hName, ce, lv, star, colorStar, quality, job, skinId, attr: heroAttrs, ePlace } of heroList) {
 
-            let curSkin = skins.find(cur => cur.enable);
             let equips = await EquipModel.findListByHidAndRole(hisRoleId, hid, EQUIP_SELECT.HERO_DETAIL);
 
             let attributes = getPlayerMainAttribute(heroAttrs, role.attr);
 
             list.push({
-                roleId, roleName, hid, hName, ce, lv, star, colorStar, quality, job,
-                skin: curSkin ? curSkin.id : 0, equips: equips.map(cur => {
+                roleId, roleName, hid, hName, ce, lv, star, colorStar, quality, job, skinId,
+                equips: equips.map(cur => {
                     let curEplace = ePlace.find(ccur => cur.ePlaceId == ccur.id) || new EPlace();
                     let { lv = 0, refineLv = 0 } = curEplace;
                     return { ...cur, lv, refineLv }
diff --git a/shared/consts/constModules/selectConst.ts b/shared/consts/constModules/selectConst.ts
index 6c8501c97..c2445a9df 100644
--- a/shared/consts/constModules/selectConst.ts
+++ b/shared/consts/constModules/selectConst.ts
@@ -19,9 +19,9 @@ export enum ROLE_SELECT {
 
 export enum HERO_SELECT {
    ENTRY = '-attr',
-   HERO_DETAIL = 'roleId roleName hid hName ce isReducedCe lv star colorStar quality job skins attr ePlace',
+   HERO_DETAIL = 'roleId roleName hid hName ce isReducedCe lv star colorStar quality job skins attr ePlace skinId',
    // 排行榜中lineup字段
-   RANK_LINEUP = 'seqId roleId hid star colorStar lv quality job ce isReducedCe updatedAt'
+   RANK_LINEUP = 'seqId roleId hid star colorStar lv quality job ce isReducedCe updatedAt skinId'
 }
 
 export enum EQUIP_SELECT {
diff --git a/shared/domain/rank.ts b/shared/domain/rank.ts
index 7fe793584..6919cb7e3 100644
--- a/shared/domain/rank.ts
+++ b/shared/domain/rank.ts
@@ -104,6 +104,9 @@ export class LineupParam {
     @prop({ required: true })
     hid: number;
 
+    @prop({ required: true })
+    skinId: number;
+
     @prop({ required: true })
     star: number;
 
@@ -121,6 +124,7 @@ export class LineupParam {
 
     constructor(hero: HeroType) {
         this.hid = hero.hid;
+        this.skinId = hero.skinId;
         this.star = hero.star;
         this.colorStar = hero.colorStar;
         this.lv = hero.lv;