diff --git a/game-server/app/servers/role/handler/friendHandler.ts b/game-server/app/servers/role/handler/friendHandler.ts index 18db9381f..04723ca36 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, EPlace } from "../../../db/Hero"; import { EquipModel } from "../../../db/Equip"; import { getPlayerMainAttribute } from "../../../services/pvpService"; import { FRIEND } from "../../../pubUtils/dicParam"; @@ -666,7 +666,7 @@ 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 } of heroList) { + for (let { roleId, roleName, hid, hName, ce, lv, star, colorStar, quality, job, skins, attr: heroAttrs, ePlace } of heroList) { let curSkin = skins.find(cur => cur.enable); let equips = await EquipModel.findListByHidAndRole(hisRoleId, hid, EQUIP_SELECT.HERO_DETAIL); @@ -675,7 +675,11 @@ export class FriendHandler { list.push({ roleId, roleName, hid, hName, ce, lv, star, colorStar, quality, job, - skin: curSkin ? curSkin.id : 0, equips, attributes + skin: curSkin ? curSkin.id : 0, 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} + }), attributes }); } diff --git a/shared/consts/constModules/selectConst.ts b/shared/consts/constModules/selectConst.ts index c0d6fc007..ac5c693bf 100644 --- a/shared/consts/constModules/selectConst.ts +++ b/shared/consts/constModules/selectConst.ts @@ -19,7 +19,7 @@ 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', + HERO_DETAIL = 'roleId roleName hid hName ce isReducedCe lv star colorStar quality job skins attr ePlace', // 排行榜中lineup字段 RANK_LINEUP = 'seqId roleId hid star colorStar lv quality job ce isReducedCe updatedAt' }