From 24611c63e9b94e60ce63e737cb0e64d85420f1c1 Mon Sep 17 00:00:00 2001
From: KimgiaiiWuyi <444835641@qq.com>
Date: Sun, 19 Jun 2022 21:02:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E4=BC=A4=E5=AE=B3?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 enkaToData/drawCharCard.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/enkaToData/drawCharCard.py b/enkaToData/drawCharCard.py
index b3589976..f51eb4af 100644
--- a/enkaToData/drawCharCard.py
+++ b/enkaToData/drawCharCard.py
@@ -163,6 +163,8 @@ async def get_char_percent(raw_data: dict) -> str:
             effect_prop = attack
         
         dmgBonus_value_cal = 0
+        dmgBonus_cal = dmgBonus
+
         if '夜兰' in char_name:
             effect_prop = hp
         elif '胡桃' in char_name:
@@ -202,22 +204,20 @@ async def get_char_percent(raw_data: dict) -> str:
             add_dmg = 1
         
         if equipSets['type'] in ['2','','22']:
-            dmgBonus_cal = dmgBonus
+            pass
         else:
             if '追忆' in equipSets['set']:
-                dmgBonus_cal = dmgBonus + 0.5
+                dmgBonus_cal += 0.5
             elif '绝缘' in equipSets['set']:
                 Bouns = ce * 0.25 if ce * 0.25 <= 0.75 else 0.75
-                dmgBonus_cal = dmgBonus + Bouns
+                dmgBonus_cal += Bouns
             elif '乐团' in equipSets['set']:
                 if weaponType in ['法器', '弓']:
-                    dmgBonus_cal = dmgBonus + 0.35
+                    dmgBonus_cal += 0.35
             elif '华馆' in equipSets['set']:
                 if raw_data['avatarElement'] == 'Geo':
                     effect_prop += 0.24 * defense
                     dmgBonus_cal += 0.24
-            else:
-                dmgBonus_cal = dmgBonus
 
         critdmg_cal = critdmg
         healBouns_cal = healBouns