From c83f4737e63ed95d951048f5661167ca17bbb97c Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Mon, 9 May 2022 18:50:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=EF=BC=9A=E8=A3=85=E5=A4=87?=
 =?UTF-8?q?=E7=B2=BE=E7=82=BC=E8=AF=BB=E5=8F=96=E6=95=B0=E6=8D=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/playerCeService.ts | 4 +++-
 shared/pubUtils/data.ts                     | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/game-server/app/services/playerCeService.ts b/game-server/app/services/playerCeService.ts
index fd6281317..b5d34d0ee 100644
--- a/game-server/app/services/playerCeService.ts
+++ b/game-server/app/services/playerCeService.ts
@@ -403,9 +403,11 @@ export async function getSumCe(roleId: string, num: number) {
 export async function getHeroesAttributes(roleId: string) {
     let roleCe = await RoleCeModel.findByRoleId(roleId);
     let attrByHid = new Map<number, AttributeCal>();
+    let heroAttrs = roleCe?.heroAttrs??[];
     for(let { hid, attrs } of roleCe?.attributes??[]) {
         let cal = new AttributeCal();
-        cal.setLv(roleCe.roleLv);
+        let heroAttr = heroAttrs.find(cur => cur.hid == hid);
+        if(heroAttr) cal.setLv(heroAttr.lv);
         cal.setByWarJson(attrs);
         attrByHid.set(hid, cal);
     }
diff --git a/shared/pubUtils/data.ts b/shared/pubUtils/data.ts
index bae979533..c2c5535fb 100644
--- a/shared/pubUtils/data.ts
+++ b/shared/pubUtils/data.ts
@@ -852,10 +852,11 @@ export function getEquipStarAttrByStage(equipId: number, star: number, starStage
             }
         }
     } else {
+        let preEquipStar = getPreEquipStar(equipId, star);
         let equipStar = getEquipStarIdByEquipId(equipId, star);
         return {
             mainAttr: equipStar.mainAttr.get(starStage),
-            subAttr: equipStar.subAttr,
+            subAttr: preEquipStar?.subAttr||[],
         }
     }
 }