Genshin-bots/StarRailUID
1
0
Fork 0
mirror of https://github.com/baiqwerdvd/StarRailUID.git synced 2025-05-06 11:43:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改srmr错误显示，修改刷新重复角色 (#23)

Browse Source 
* 修改srmr错误显示，修改刷新重复角色

* 修改强制刷新同角色重复计算

* 🚨 `pre-commit-ci`修复格式错误

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
季落 2023-05-16 07:09:25 +08:00 committed by GitHub
parent 1a178c99c8
commit 260d4ba81a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
StarRailUID/starrailuid_charinfo/to_data.py
View File

@ -76,26 +76,31 @@ async def api_to_dict(
if 'PlayerDetailInfo' not in sr_data: if 'PlayerDetailInfo' not in sr_data:
return f'SR_UID{sr_uid}刷新失败！未打开角色展柜!' return f'SR_UID{sr_uid}刷新失败！未打开角色展柜!'
char_dict_list = [] char_name_list = []
char_id_list = []
im = f'UID: {sr_uid} 的角色展柜刷新成功\n' im = f'UID: {sr_uid} 的角色展柜刷新成功\n'
if PlayerDetailInfo.get('AssistAvatar'): if PlayerDetailInfo.get('AssistAvatar'):
char_dict, avatarName = await get_data( if PlayerDetailInfo['AssistAvatar']['AvatarID'] not in char_id_list:
PlayerDetailInfo['AssistAvatar'], sr_data, sr_uid char_dict, avatarName = await get_data(
) PlayerDetailInfo['AssistAvatar'], sr_data, sr_uid
im += f'支援角色 {avatarName}\n' )
char_dict_list.append(avatarName) im += f'支援角色 {avatarName}\n'
char_name_list.append(avatarName)
char_id_list.append(PlayerDetailInfo['AssistAvatar']['AvatarID'])
if PlayerDetailInfo.get('DisplayAvatarList'): if PlayerDetailInfo.get('DisplayAvatarList'):
im += '星海同行' im += '星海同行'
for char in PlayerDetailInfo['DisplayAvatarList']: for char in PlayerDetailInfo['DisplayAvatarList']:
char_dict, avatarName = await get_data(char, sr_data, sr_uid) if char['AvatarID'] not in char_id_list:
im += f' {avatarName}' char_dict, avatarName = await get_data(char, sr_data, sr_uid)
char_dict_list.append(avatarName) im += f' {avatarName}'
char_name_list.append(avatarName)
char_id_list.append(char['AvatarID'])
if not char_dict_list: if not char_name_list:
im = f'UID: {sr_uid} 的角色展柜刷新失败！\n请检查UID是否正确或者角色展柜是否打开！' im = f'UID: {sr_uid} 的角色展柜刷新失败！\n请检查UID是否正确或者角色展柜是否打开！'
return im return im
return char_dict_list return char_name_list
async def get_data(char: dict, sr_data: dict, sr_uid: str): async def get_data(char: dict, sr_data: dict, sr_uid: str):

20
StarRailUID/starrailuid_resin/draw_resin_card.py
View File

@ -9,6 +9,7 @@ from gsuid_core.logger import logger
from ..utils.api import get_sqla from ..utils.api import get_sqla
from ..utils.mys_api import mys_api from ..utils.mys_api import mys_api
from ..utils.error_reply import get_error
from ..utils.image.convert import convert_img from ..utils.image.convert import convert_img
from ..sruid_utils.api.mys.models import Expedition from ..sruid_utils.api.mys.models import Expedition
from ..utils.fonts.starrail_fonts import ( from ..utils.fonts.starrail_fonts import (
@ -147,24 +148,7 @@ async def draw_resin_img(sr_uid: str) -> Image.Image:
img = note_bg.copy() img = note_bg.copy()
if isinstance(daily_data, int): if isinstance(daily_data, int):
img_draw = ImageDraw.Draw(img) return get_error(daily_data)
# img.paste(warn_pic, (0, 0), warn_pic)
# 写UID
img_draw.text(
(250, 553),
f'UID{sr_uid}',
font=sr_font_36,
fill=first_color,
anchor='mm',
)
img_draw.text(
(250, 518),
f'错误码 {daily_data}',
font=sr_font_36,
fill=red_color,
anchor='mm',
)
return img
# nickname and level # nickname and level
role_basic_info = await mys_api.get_role_basic_info(sr_uid) role_basic_info = await mys_api.get_role_basic_info(sr_uid)