From 872d39dbf528c066d34c530febbd56371ae0944e Mon Sep 17 00:00:00 2001 From: KimgiaiiWuyi <444835641@qq.com> Date: Sun, 19 Jun 2022 14:46:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=96=87=E6=A1=88=E9=87=8D=E5=8F=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- enkaToData/drawCharCard.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/enkaToData/drawCharCard.py b/enkaToData/drawCharCard.py index 1938d3dd..ac1fa0ff 100644 --- a/enkaToData/drawCharCard.py +++ b/enkaToData/drawCharCard.py @@ -267,7 +267,7 @@ async def get_char_percent(raw_data: dict) -> str: power = cal['power'].split('+') dmg = (effect_prop * float(power[0]) / 100 + float(power[1])) * (1 + healBouns_cal) elif '心海' in char_name and cal['action'] == '开Q普攻': - dmg = (attack * cal['power'] + hp*(0.0971 + 0.15 * healBouns_cal)) * (1 + critdmg_cal) * (1 + dmgBonus_cal) * 0.5 * 0.9 * add_dmg + dmg = (attack * cal['power'] + hp*(0.0971 + 0.15 * healBouns_cal)) * (1 + dmgBonus_cal) * 0.5 * 0.9 * add_dmg elif '心海' in char_name and cal['action'] == '水母回血': dmg = (862 + 0.0748 * hp) * (1 + healBouns_cal) elif char_name in ['芭芭拉', '早柚', '琴', '七七']: @@ -446,6 +446,9 @@ async def draw_char_card(raw_data: dict, charUrl: str = None) -> bytes: mainValueStr = str(mainValue) else: mainValueStr = str(mainValue) + '%' + + if '伤害加成' in mainName: + mainName = mainName.replace('伤害加成', '伤加成').replace('元素', '').replace('理', '') mainNameNew = mainName.replace('百分比', '') @@ -462,6 +465,7 @@ async def draw_char_card(raw_data: dict, charUrl: str = None) -> bytes: subValueStr = str(subValue) else: subValueStr = str(subValue) + '%' + subValueStr = subValueStr.replace('百分比', '') artifactsScore += await get_artifacts_score(subName, subValue) artifacts_text.text((20, 263 + index * 30), '·{}+{}'.format(subName, subValueStr), (255, 255, 255), genshin_font_origin(25), anchor='lm')