From 974f8133ea331df2bd9bd740b97da7761ed02562 Mon Sep 17 00:00:00 2001 From: qwerdvd <2450899274@qq.com> Date: Sat, 13 May 2023 20:41:32 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=E4=BF=AE=E5=A4=8D=E5=85=89?= =?UTF-8?q?=E9=94=A5=E9=98=B6=E6=95=B0bug=20=E6=9B=B4=E6=96=B0=E4=BB=A5?= =?UTF-8?q?=E5=8F=8C=E7=88=86=E4=B8=BA=E8=AF=84=E4=BB=B7=E4=BD=93=E7=B3=BB?= =?UTF-8?q?=E7=9A=84=E9=81=97=E5=99=A8=E8=AF=84=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../starrailuid_charinfo/draw_char_img.py | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/StarRailUID/starrailuid_charinfo/draw_char_img.py b/StarRailUID/starrailuid_charinfo/draw_char_img.py index 7242b4e..45f6c4c 100644 --- a/StarRailUID/starrailuid_charinfo/draw_char_img.py +++ b/StarRailUID/starrailuid_charinfo/draw_char_img.py @@ -375,7 +375,7 @@ async def draw_char_info_img(raw_mes: str, sr_uid: str, url: Optional[str]): rank_img_draw = ImageDraw.Draw(rank_img) rank_img_draw.text( (70, 44), - f'{NUM_MAP[char.equipment["equipmentRarity"]]} 阶', + f'{NUM_MAP[char.equipment["equipmentRank"]]} 阶', white_color, sr_font_28, 'mm', @@ -422,6 +422,7 @@ async def draw_char_info_img(raw_mes: str, sr_uid: str, url: Optional[str]): if char.char_relic: weapon_rank_bg = Image.open(TEXT_PATH / 'rank_bg.png') char_info.paste(weapon_rank_bg, (690, 880), weapon_rank_bg) + relic_score = 0 for relic in char.char_relic: rarity = RelicId2Rarity[str(relic["relicId"])] @@ -496,10 +497,14 @@ async def draw_char_info_img(raw_mes: str, sr_uid: str, url: Optional[str]): anchor='mm', ) - # relicScore = 0 for index, i in enumerate(relic['SubAffixList']): subName: str = i['Name'] subValue = mp.mpf(i['Value']) + subProperty = i['Property'] + if subProperty == 'CriticalDamageBase': + relic_score += subValue + if subProperty == 'CriticalChanceBase': + relic_score += subValue * 2 if subName in ['攻击力', '生命值', '防御力', '速度']: subValueStr = nstr(subValue, 3) else: @@ -526,6 +531,19 @@ async def draw_char_info_img(raw_mes: str, sr_uid: str, url: Optional[str]): char_info.paste( relic_img, RELIC_POS[str(relic["Type"])], relic_img ) + if relic_score > 1: + relic_value_level = Image.open(TEXT_PATH / 'CommonIconS.png') + char_info.paste(relic_value_level, (778, 963), relic_value_level) + elif relic_score > 0.6: + relic_value_level = Image.open(TEXT_PATH / 'CommonIconA.png') + char_info.paste(relic_value_level, (778, 963), relic_value_level) + elif relic_score > 0.3: + relic_value_level = Image.open(TEXT_PATH / 'CommonIconB.png') + char_info.paste(relic_value_level, (778, 963), relic_value_level) + elif relic_score > 0: + relic_value_level = Image.open(TEXT_PATH / 'CommonIconC.png') + char_info.paste(relic_value_level, (778, 963), relic_value_level) + else: char_img_draw.text( (525, 1565),