From 44a55c0866b80d42a239fef8bf739f14c99ddb51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E8=90=BD?= <34079036+jiluoQAQ@users.noreply.github.com> Date: Fri, 9 Jun 2023 17:04:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=BA=E5=88=B6=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E4=B8=BB=E8=A7=92=E6=80=A7=E5=88=ABbug=20(#61)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 修复强制刷新主角性别bug * 🚨 `pre-commit-ci`修复格式错误 * 修复强制刷新主角性别bug * 🚨 `pre-commit-ci`修复格式错误 --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- StarRailUID/starrailuid_charinfo/draw_char_img.py | 14 ++++++++++---- StarRailUID/starrailuid_charinfo/to_card.py | 12 +++++++----- StarRailUID/starrailuid_charinfo/to_data.py | 2 +- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/StarRailUID/starrailuid_charinfo/draw_char_img.py b/StarRailUID/starrailuid_charinfo/draw_char_img.py index 15b344e..46a8b95 100644 --- a/StarRailUID/starrailuid_charinfo/draw_char_img.py +++ b/StarRailUID/starrailuid_charinfo/draw_char_img.py @@ -14,8 +14,8 @@ from .to_data import api_to_dict from .mono.Character import Character from ..utils.error_reply import CHAR_HINT from ..utils.fonts.first_world import fw_font_28 -from ..utils.map.SR_MAP_PATH import RelicId2Rarity from ..utils.excel.read_excel import light_cone_ranks +from ..utils.map.SR_MAP_PATH import RelicId2Rarity, avatarId2Name from ..utils.map.name_covert import name_to_avatar_id, alias_to_char_name from ..utils.resource.RESOURCE_PATH import ( RELIC_PATH, @@ -571,9 +571,15 @@ async def get_char_data( elif enable_self and char_self_path.exists(): path = char_self_path else: - im = await api_to_dict(sr_uid) - print(str(im)) - if str(char_name) in im: + char_data_list = await api_to_dict(sr_uid) + charname_list = [] + if isinstance(char_data_list, str): + return char_data_list + else: + for char in char_data_list: + charname = avatarId2Name[str(char)] + charname_list.append(charname) + if str(char_name) in charname_list: if char_path.exists(): path = char_path elif enable_self and char_self_path.exists(): diff --git a/StarRailUID/starrailuid_charinfo/to_card.py b/StarRailUID/starrailuid_charinfo/to_card.py index 7934f5b..82c2c54 100644 --- a/StarRailUID/starrailuid_charinfo/to_card.py +++ b/StarRailUID/starrailuid_charinfo/to_card.py @@ -8,9 +8,10 @@ from gsuid_core.utils.api.enka.models import EnkaData from .to_data import api_to_dict from ..utils.image.convert import convert_img from ..utils.fonts.first_world import fw_font_28 +from ..utils.map.SR_MAP_PATH import avatarId2Name +from ..utils.map.name_covert import avatar_id_to_char_star from ..utils.fonts.starrail_fonts import sr_font_24, sr_font_30, sr_font_58 from ..utils.resource.RESOURCE_PATH import CHAR_ICON_PATH, CHAR_PREVIEW_PATH -from ..utils.map.name_covert import name_to_avatar_id, avatar_id_to_char_star half_color = (255, 255, 255, 120) first_color = (29, 29, 29) @@ -49,12 +50,13 @@ async def draw_enka_card( uid: str, char_list: Optional[List] = None, showfrom: int = 0 ): char_data_list = [] - if '希儿' in char_list: - char_list.remove('希儿') - char_list.append('希儿') + if 1102 in char_list: + char_list.remove(1102) + char_list.append(1102) for char in char_list: + avatarName = avatarId2Name[str(char)] char_data_list.append( - {'avatarName': char, 'avatarId': await name_to_avatar_id(char)} + {'avatarName': avatarName, 'avatarId': str(char)} ) if showfrom == 0: line1 = f'展柜内有 {len(char_data_list)} 个角色!' diff --git a/StarRailUID/starrailuid_charinfo/to_data.py b/StarRailUID/starrailuid_charinfo/to_data.py index debcbdd..1e45131 100644 --- a/StarRailUID/starrailuid_charinfo/to_data.py +++ b/StarRailUID/starrailuid_charinfo/to_data.py @@ -106,7 +106,7 @@ async def api_to_dict( im = f'UID: {sr_uid} 的角色展柜刷新失败！\n请检查UID是否正确或者角色展柜是否打开！' return im - return char_name_list + return char_id_list async def get_data(char: dict, sr_data: dict, sr_uid: str):