diff --git a/StarRailUID/starrailuid_charinfo/mono/Character.py b/StarRailUID/starrailuid_charinfo/mono/Character.py index b94e094..5d8adc8 100644 --- a/StarRailUID/starrailuid_charinfo/mono/Character.py +++ b/StarRailUID/starrailuid_charinfo/mono/Character.py @@ -9,9 +9,6 @@ from ...utils.map.SR_MAP_PATH import EquipmentID2AbilityProperty, RelicSetSkill class Character: def __init__(self, card_prop: Dict): - # 面板数据 - self.card_prop: Dict = card_prop - self.char_level: int = int(card_prop['avatarLevel']) self.char_id: str = card_prop['avatarId'] self.char_name: str = card_prop['avatarName'] diff --git a/StarRailUID/starrailuid_charinfo/to_data.py b/StarRailUID/starrailuid_charinfo/to_data.py index 47e14fd..906e2fe 100644 --- a/StarRailUID/starrailuid_charinfo/to_data.py +++ b/StarRailUID/starrailuid_charinfo/to_data.py @@ -56,7 +56,8 @@ async def api_to_dict( return [] if isinstance(sr_data, Dict): if 'detailInfo' not in sr_data: - return '服务器正在维护或者关闭中...\n检查Mihomo.me是否可以访问\n如可以访问,尝试上报Bug!' + return '服务器正在维护或者关闭中...\n' \ + '检查Mihomo.me是否可以访问\n如可以访问,尝试上报Bug!' elif sr_data is None: return [] @@ -98,7 +99,8 @@ async def api_to_dict( char_id_list.append(char['avatarId']) if not char_name_list: - return f'UID: {sr_uid} 的角色展柜刷新失败!\n请检查UID是否正确或者角色展柜是否打开!' + return f'UID: {sr_uid} 的角色展柜刷新失败!\n' \ + '请检查UID是否正确或者角色展柜是否打开!' return char_id_list diff --git a/StarRailUID/starrailuid_config/config_default.py b/StarRailUID/starrailuid_config/config_default.py index d0d4beb..26efeb7 100644 --- a/StarRailUID/starrailuid_config/config_default.py +++ b/StarRailUID/starrailuid_config/config_default.py @@ -2,13 +2,17 @@ from typing import Dict from gsuid_core.utils.plugins_config.models import ( GSC, - GsStrConfig, GsBoolConfig, GsListStrConfig, + GsStrConfig, ) CONIFG_DEFAULT: Dict[str, GSC] = { - 'SignTime': GsListStrConfig('每晚签到时间设置', '每晚米游社签到时间设置(时,分)', ['0', '38']), + 'SignTime': GsListStrConfig( + '每晚签到时间设置', + '每晚米游社签到时间设置(时,分)', + ['0', '38'] + ), 'SignReportSimple': GsBoolConfig( '简洁签到报告', '开启后可以大大减少每日签到报告字数', diff --git a/StarRailUID/starrailuid_rogue/draw_rogue_card.py b/StarRailUID/starrailuid_rogue/draw_rogue_card.py index 3acee34..e2c8796 100644 --- a/StarRailUID/starrailuid_rogue/draw_rogue_card.py +++ b/StarRailUID/starrailuid_rogue/draw_rogue_card.py @@ -1,30 +1,31 @@ import math from pathlib import Path -from typing import List, Union, Optional +from typing import List, Optional, Union from PIL import Image, ImageDraw + from gsuid_core.logger import logger from gsuid_core.utils.error_reply import get_error from gsuid_core.utils.image.image_tools import ( - get_qq_avatar, draw_pic_with_ring, + get_qq_avatar, ) -from .utils import get_icon +from ..sruid_utils.api.mys.models import ( + LocustBlocks, + RogueAvatar, + RogueBuffitems, + RogueMiracles, +) from ..utils.convert import GsCookie -from ..utils.image.convert import convert_img from ..utils.fonts.starrail_fonts import ( sr_font_22, sr_font_28, sr_font_34, sr_font_42, ) -from ..sruid_utils.api.mys.models import ( - RogueAvatar, - LocustBlocks, - RogueMiracles, - RogueBuffitems, -) +from ..utils.image.convert import convert_img +from .utils import get_icon TEXT_PATH = Path(__file__).parent / 'texture2D' white_color = (255, 255, 255) @@ -307,10 +308,12 @@ async def draw_rogue_img( else: if schedule_type == '3': if raw_rogue_data['current_record']['basic']['finish_cnt'] == 0: - return '你还没有挑战本期模拟宇宙!\n可以使用[sr上期模拟宇宙]命令查询上期~' + return '你还没有挑战本期模拟宇宙!\n' \ + '可以使用[sr上期模拟宇宙]命令查询上期~' else: if raw_rogue_data['last_record']['basic']['finish_cnt'] == 0: - return '你还没有挑战上期模拟宇宙!\n可以使用[sr模拟宇宙]命令查询本期~' + return '你还没有挑战上期模拟宇宙!\n' \ + '可以使用[sr模拟宇宙]命令查询本期~' # 获取背景图片各项参数 based_w = 900 @@ -555,7 +558,7 @@ async def draw_rogue_locust_img( rogue_detail = raw_rogue_data['detail']['records'] # 记录打的宇宙列表 - detail_list = [] + # detail_list = [] based_h = 700 for index_floor, detail in enumerate(rogue_detail): # 100+70+170 diff --git a/StarRailUID/starrailuid_signin/__init__.py b/StarRailUID/starrailuid_signin/__init__.py index 2dad25d..52e3e0b 100644 --- a/StarRailUID/starrailuid_signin/__init__.py +++ b/StarRailUID/starrailuid_signin/__init__.py @@ -1,18 +1,18 @@ -import random import asyncio +import random -from gsuid_core.sv import SV +from gsuid_core.aps import scheduler from gsuid_core.bot import Bot from gsuid_core.gss import gss -from gsuid_core.models import Event -from gsuid_core.aps import scheduler from gsuid_core.logger import logger +from gsuid_core.models import Event +from gsuid_core.sv import SV -from ..utils.api import get_sqla -from ..utils.sr_prefix import PREFIX -from .sign import sign_in, daily_sign -from ..utils.error_reply import UID_HINT from ..starrailuid_config.sr_config import srconfig +from ..utils.api import get_sqla +from ..utils.error_reply import UID_HINT +from ..utils.sr_prefix import PREFIX +from .sign import daily_sign, sign_in SIGN_TIME = srconfig.get_config('SignTime').data @@ -78,11 +78,8 @@ async def send_daily_sign(): if group_msg_list[gid]['push_message'] != '' else '' ) - msg_title = '星穹铁道今日自动签到已完成!\n本群共签到成功{}人,共签到失败{}人。{}'.format( - group_msg_list[gid]['success'], - group_msg_list[gid]['failed'], - report, - ) + msg_title = f"星穹铁道今日自动签到已完成!\n" \ + f"本群共签到成功{group_msg_list[gid]['success']}人,共签到失败{group_msg_list[gid]['failed']}人。{report}" else: msg_title = group_msg_list[gid]['push_message'] # 发送群消息 diff --git a/StarRailUID/starrailuid_signin/sign.py b/StarRailUID/starrailuid_signin/sign.py index 1a1f611..0200516 100644 --- a/StarRailUID/starrailuid_signin/sign.py +++ b/StarRailUID/starrailuid_signin/sign.py @@ -1,14 +1,14 @@ -import random import asyncio +import random from copy import deepcopy from gsuid_core.gss import gss from gsuid_core.logger import logger from gsuid_core.utils.plugins_config.gs_config import core_plugins_config +from ..starrailuid_config.sr_config import srconfig from ..utils.api import get_sqla from ..utils.mys_api import mys_api -from ..starrailuid_config.sr_config import srconfig private_msg_list = {} group_msg_list = {} @@ -57,11 +57,15 @@ async def sign_in(sr_uid: str) -> str: Header['x-rpc-challenge'] = ch Header['x-rpc-validate'] = vl Header['x-rpc-seccode'] = f'{vl}|jordan' - logger.info(f'[SR签到] {sr_uid} 已获取验证码, 等待时间{delay}秒') + logger.info( + f'[SR签到] {sr_uid} 已获取验证码, 等待时间{delay}秒' + ) await asyncio.sleep(delay) else: delay = 605 + random.randint(1, 120) - logger.info(f'[SR签到] {sr_uid} 未获取验证码,等待{delay}秒后重试...') + logger.info( + f'[SR签到] {sr_uid} 未获取验证码,等待{delay}秒后重试...' + ) await asyncio.sleep(delay) continue logger.info('配置文件暂未开启[跳过无感验证],结束本次任务...') @@ -70,7 +74,9 @@ async def sign_in(sr_uid: str) -> str: if index == 0: logger.info(f'[SR签到] {sr_uid} 该用户无校验码!') else: - logger.info(f'[SR签到] [无感验证] {sr_uid} 该用户重试 {index} 次验证成功!') + logger.info( + f'[SR签到] [无感验证] {sr_uid} 该用户重试 {index} 次验证成功!' + ) break if (int(str(sr_uid)[0]) > 5) and (sign_data['data']['code'] == 'ok'): # 国际服签到无risk_code字段 @@ -78,7 +84,8 @@ async def sign_in(sr_uid: str) -> str: break # 重试超过阈值 logger.warning('[SR签到] 超过请求阈值...') - return 'sr签到失败...出现验证码!\n请过段时间使用[签到]或由管理员[全部重签]或手动至米游社进行签到!' + return 'sr签到失败...出现验证码!\n' \ + '请过段时间使用[签到]或由管理员[全部重签]或手动至米游社进行签到!' # 签到失败 else: im = 'sr签到失败!' @@ -163,7 +170,9 @@ async def daily_sign(): delay = 1 else: delay = 50 + random.randint(3, 45) - logger.info(f'[SR签到] 已签到{len(tasks)}个用户, 等待{delay}秒进行下一次签到') + logger.info( + f'[SR签到] 已签到{len(tasks)}个用户, 等待{delay}秒进行下一次签到' + ) tasks.clear() already = 0 await asyncio.sleep(delay) diff --git a/StarRailUID/utils/error_reply.py b/StarRailUID/utils/error_reply.py index 61deeb8..9f3d40b 100644 --- a/StarRailUID/utils/error_reply.py +++ b/StarRailUID/utils/error_reply.py @@ -4,13 +4,15 @@ UID_HINT = '你还没有绑定过uid哦!\n请使用[sr绑定uid123456]命令绑 MYS_HINT = '你还没有绑定过mysid哦!\n请使用[绑定mys1234]命令绑定!' CK_HINT = """你还没有绑定过Cookie哦!发送【ck帮助】获取帮助! 警告:绑定Cookie可能会带来未知的账号风险,请确保信任机器人管理员""" -CHAR_HINT = '您的支援/星海同行角色没有{}的数据哦!\n请先把{}放入支援/星海同行中再使用【sr强制刷新】命令来缓存数据进行查询! !' +CHAR_HINT = '您的支援/星海同行角色没有{}的数据哦!\n请先把{}' \ +'放入支援/星海同行中再使用【sr强制刷新】命令来缓存数据进行查询! !' VERIFY_HINT = '''出现验证码! 如已绑定CK: 请至米游社软件->我的->我的角色处解锁验证码 (可使用[gs关闭推送]命令关闭体力推送以减少出现验证码风险) 如未绑定CK: 可联系管理员使用[gs清除缓存]命令 ''' -SK_HINT = '你还没有绑定过Stoken或者Stoken已失效~\n请群聊发送 [扫码登陆] 或加好友私聊Bot [添加]后跟SK格式 以绑定SK' +SK_HINT = '你还没有绑定过Stoken或者Stoken已失效~\n' \ +'请群聊发送 [扫码登陆] 或加好友私聊Bot [添加]后跟SK格式 以绑定SK' UPDATE_HINT = '''更新失败!更多错误信息请查看控制台... >> 可以尝试使用 >> [gs强制更新](危险) diff --git a/StarRailUID/utils/resource/download_from_cos.py b/StarRailUID/utils/resource/download_from_cos.py index 038e3b6..c7dc32c 100644 --- a/StarRailUID/utils/resource/download_from_cos.py +++ b/StarRailUID/utils/resource/download_from_cos.py @@ -2,12 +2,13 @@ import asyncio from pathlib import Path from typing import Dict, List, Tuple, Union -from msgspec import json as msgjson -from gsuid_core.logger import logger from aiohttp.client import ClientSession +from msgspec import json as msgjson + +from gsuid_core.logger import logger from .download_url import download_file -from .RESOURCE_PATH import WIKI_PATH, GUIDE_PATH, RESOURCE_PATH +from .RESOURCE_PATH import GUIDE_PATH, RESOURCE_PATH, WIKI_PATH with Path.open( Path(__file__).parent / 'resource_map.json', encoding='UTF-8' @@ -119,4 +120,6 @@ async def download_all_file_from_cos(): await _download(TASKS) await _download(TASKS) if count := len(failed_list): - logger.error(f'[cos]仍有{count}个文件未下载,请使用命令 `下载全部资源` 重新下载') + logger.error( + f'[cos]仍有{count}个文件未下载,请使用命令 `下载全部资源` 重新下载' + )