From 1b08ac2977504e5b788764c771f3a7f0fa5af4e5 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Sun, 24 Apr 2022 14:47:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=98=E5=8A=9B=EF=BC=9A=E9=9A=8F=E6=9C=BA?=
 =?UTF-8?q?=E6=B1=A0=E5=B1=9E=E6=80=A7=E8=AE=A1=E7=AE=97=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/game-server/app/services/role/calCe.ts b/game-server/app/services/role/calCe.ts
index 7a8a8746c..77bbd9a75 100644
--- a/game-server/app/services/role/calCe.ts
+++ b/game-server/app/services/role/calCe.ts
@@ -43,8 +43,8 @@ export class CalCe {
                 let val = 0, str = '';
                 if(ABI_TYPE_MAIN.indexOf(attrId) != -1) {
                     //    {[hp1            + lv * hp2    +  hp3    * ( 1 + hp4    )] * (1 + hp5              ) + [( hp6          + hp7           ) * ( 1 + hp8                      )] } * ( 1 + hp9   ) + hp10  + hp11
-                    val = ((mainBase + job + lv * starUp + connect * ( 1 + favour/100 )) * ( 1 + school + talent ) + (( equipQuality + equipStrength ) * ( 1 + ( equipStar/100 + equipSuit/100 ))) ) * ( 1 + jewel ) + stone + teraph + title + scroll + skin;
-                    str += `{[${mainBase}+${job}+${lv}*${starUp}+${connect}*(1+${favour}/100)]*(1+${school}+${talent})+[(${equipQuality}+${equipStrength})*(1+${equipStar}/100+${equipSuit}/100)]}*(1+${jewel})+${stone}+${teraph}+${title}+${scroll}+${skin}`;
+                    val = ((mainBase + job + lv * starUp + connect * ( 1 + favour/100 )) * ( 1 + school + talent/100 ) + (( equipQuality + equipStrength ) * ( 1 + ( equipStar/100 + equipSuit/100 ))) ) * ( 1 + jewel/100 ) + stone + teraph + title + scroll + skin;
+                    str += `{[${mainBase}+${job}+${lv}*${starUp}+${connect}*(1+${favour}/100)]*(1+${school}+${talent}/100)+[(${equipQuality}+${equipStrength})*(1+${equipStar}/100+${equipSuit}/100)]}*(1+${jewel}/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;
@@ -453,7 +453,7 @@ export class CalCe {
                 addToMap(fixUp, ability, value);
             } else if (type == SEID_TYPE.MAIN_RATIO||type == SEID_TYPE.MAIN_RATIO_2) { // 主属性加百分比
                 if(ABI_TYPE_MAIN.includes(ability)) {
-                    addToMap(ratioUp, ability, value / 1000);
+                    addToMap(ratioUp, ability, value);
                 }
             } else if (type == SEID_TYPE.SUB_RATIO||type == SEID_TYPE.SUB_RATIO_2) { // 次级属性加百分比
                 if(!ABI_TYPE_MAIN.includes(ability)) {