From 16a969cbf1ee49ad55d550aa13e0411758f5690d Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Mon, 8 Aug 2022 19:47:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=98=E5=8A=9B=EF=BC=9A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=85=AC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/role/calCe.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/game-server/app/services/role/calCe.ts b/game-server/app/services/role/calCe.ts
index f100ffd44..1954fb4e2 100644
--- a/game-server/app/services/role/calCe.ts
+++ b/game-server/app/services/role/calCe.ts
@@ -49,13 +49,13 @@ export class CalCe {
                 let { school = 0, teraph = 0, title = 0, scroll = 0, skin = 0 } = this.data.getGlobalAttrById(attrId)||{};
                 let val = 0, str = '';
                 if(ABI_TYPE_MAIN.indexOf(attrId) != -1) {
-                    //    {[hp1            + lv * hp2    ] * ( 1 + hp5                                              ) + [( hp6          + hp7           ) * ( 1 + hp8                      )] }         * ( 1 + hp9   )     + hp10  + hp11
-                    val = ((mainBase + job + lv * starUp ) * ( 1 + school/100 + talent/100 + skin/100 + connect/100 ) + (( equipQuality + equipStrength ) * ( 1 + ( equipStar/100 + equipSuit/100 ))) ) * ( 1 + jewel/100 ) + stone + teraph + title + scroll;
-                    str += `{[${mainBase}+${job}+${lv}*${starUp}+${connect}]*(1+${school}/100+${talent}/100)+[(${equipQuality}+${equipStrength})*(1+${equipStar}/100+${equipSuit}/100)]}*(1+${jewel}/100)+${stone}+${teraph}+${title}+${scroll}+${skin}`;
+                    //     {[ hp1               + lv * hp2     ] * ( 1 + hp5           ) + [( hp6          + hp7             ) * ( 1 + hp8                              )]} * ( 1 + hp9                                            )   + hp10   + hp11
+                    val =  (( mainBase + job    + lv * starUp  ) * ( 1 + connect/100   ) + (( equipQuality + equipStrength   ) * ( 1 + ( equipStar/100 + equipSuit/100 )))) * ( 1 + jewel/100 + school/100 + talent/100 + skin/100 )   + stone  + teraph + title + scroll;
+                    str += `{[${mainBase}+${job}+${lv}*${starUp}]* ( 1 + ${connect}/100) + [(${equipQuality}+${equipStrength}) * ( 1 + ${equipStar}/100+${equipSuit}/100)]} * (1+${jewel}/100+${school}/100+${talent}/100+${skin}/100 )+${stone}+${teraph}+${title}+${scroll}+${skin}`;
                 } else {
-                    //    attr1    + attr2 + attr3  + attr4  + attr5  + attr6 + attr7 + attr8 + attr9
-                    val = subBase  + job   + talent + teraph + school + title + jewel + skin  + equipStar;
-                    str += `${subBase}+${job}+${talent}+${teraph}+${school}+${title}+${jewel}+${skin}+${equipStar}`;
+                    //    attr1    + attr2 + attr4  + attr5  + attr6 + attr7 + attr9
+                    val = subBase  + job   + teraph + school + title + jewel + equipStar;
+                    str += `${subBase}+${job}+${teraph}+${school}+${title}+${jewel}+${equipStar}`;
                 }
                 if(!attrs.has(hid)) attrs.set(hid, []);
                 attrs.get(hid).push({ id: attrId, val, str });