From c01eed2540c46b9cd8f3693212c7c6f0088295fc Mon Sep 17 00:00:00 2001 From: qwerdvd <2450899274@qq.com> Date: Sun, 14 May 2023 10:24:17 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=E4=BF=AE=E5=A4=8D=E9=81=97?= =?UTF-8?q?=E5=99=A8=E5=A5=97=E8=A3=85=E5=B1=9E=E6=80=A7=E6=9C=AA=E7=94=9F?= =?UTF-8?q?=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- StarRailUID/starrailuid_charinfo/draw_char_img.py | 4 ++-- StarRailUID/starrailuid_charinfo/mono/Character.py | 2 +- StarRailUID/utils/fonts/first_world.py | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/StarRailUID/starrailuid_charinfo/draw_char_img.py b/StarRailUID/starrailuid_charinfo/draw_char_img.py index c32ed1e..a8305a7 100644 --- a/StarRailUID/starrailuid_charinfo/draw_char_img.py +++ b/StarRailUID/starrailuid_charinfo/draw_char_img.py @@ -12,9 +12,9 @@ from gsuid_core.utils.image.convert import convert_img from gsuid_core.utils.image.image_tools import draw_text_by_line from .mono.Character import Character -from ..utils.fonts.first_world import fw_font_120 from ..utils.map.SR_MAP_PATH import RelicId2Rarity from ..utils.excel.read_excel import light_cone_ranks +from ..utils.fonts.first_world import fw_font_28, fw_font_120 from ..utils.map.name_covert import name_to_avatar_id, alias_to_char_name from ..utils.resource.RESOURCE_PATH import ( RELIC_PATH, @@ -121,7 +121,7 @@ async def draw_char_info_img(raw_mes: str, sr_uid: str, url: Optional[str]): # 放uid char_img_draw.text( - (995, 715), f'UID: {sr_uid}', white_color, sr_font_28, 'rm' + (995, 715), f'UID: {sr_uid}', white_color, fw_font_28, 'rm' ) # 放属性列表 diff --git a/StarRailUID/starrailuid_charinfo/mono/Character.py b/StarRailUID/starrailuid_charinfo/mono/Character.py index 021bb78..6984e95 100644 --- a/StarRailUID/starrailuid_charinfo/mono/Character.py +++ b/StarRailUID/starrailuid_charinfo/mono/Character.py @@ -111,7 +111,7 @@ class Character: set_property = '' set_id = item[0] count = item[1] - if count == 2 or count == 3: + if count >= 2: set_property = RelicSetSkill[str(set_id)]['2']['Property'] set_value = mp.mpf(RelicSetSkill[str(set_id)]['2']['Value']) if count == 4 and RelicSetSkill[str(set_id)]['4'] != {}: diff --git a/StarRailUID/utils/fonts/first_world.py b/StarRailUID/utils/fonts/first_world.py index b003dbd..c17cf57 100644 --- a/StarRailUID/utils/fonts/first_world.py +++ b/StarRailUID/utils/fonts/first_world.py @@ -10,4 +10,5 @@ def first_word_origin(size: int) -> ImageFont.FreeTypeFont: fw_font_12 = first_word_origin(12) +fw_font_28 = first_word_origin(28) fw_font_120 = first_word_origin(34)