diff --git a/StarRailUID/sruid_utils/api/mys/api.py b/StarRailUID/sruid_utils/api/mys/api.py index 2799521..01a8177 100644 --- a/StarRailUID/sruid_utils/api/mys/api.py +++ b/StarRailUID/sruid_utils/api/mys/api.py @@ -13,22 +13,14 @@ STAR_RAIL_SIGN_EXTRA_INFO_URL = f"{OLD_URL}/event/luna/extra_info" STAR_RAIL_SIGN_EXTRA_REWARD_URL = f"{OLD_URL}/event/luna/extra_reward" STAR_RAIL_SIGN_URL = f"{OLD_URL}/event/luna/sign" STAR_RAIL_SIGN_URL_OS = f"{OS_URL}/event/luna/os/sign" -STAR_RAIL_MONTH_INFO_URL = ( - f"{OLD_URL}/event/srledger/month_info" -) # 开拓阅历接口 +STAR_RAIL_MONTH_INFO_URL = f"{OLD_URL}/event/srledger/month_info" # 开拓阅历接口 STAR_RAIL_MONTH_DETAIL_URL = ( f"{OLD_URL}/event/srledger/month_detail" # 开拓阅历详情接口 ) -STAR_RAIL_NOTE_URL = ( - f"{NEW_URL}/game_record/app/hkrpg/api/note" -) # 实时便签接口 -STAR_RAIL_NOTE_URL_OS = ( - f"{OS_INFO_URL}/game_record/hkrpg/api/note" -) # OS实时便签接口 -STAR_RAIL_INDEX_URL = ( - f"{NEW_URL}/game_record/app/hkrpg/api/index" -) # 角色橱窗接口 +STAR_RAIL_NOTE_URL = f"{NEW_URL}/game_record/app/hkrpg/api/note" # 实时便签接口 +STAR_RAIL_NOTE_URL_OS = f"{OS_INFO_URL}/game_record/hkrpg/api/note" # OS实时便签接口 +STAR_RAIL_INDEX_URL = f"{NEW_URL}/game_record/app/hkrpg/api/index" # 角色橱窗接口 STAR_RAIL_INDEX_URL_OS = ( f"{OS_INFO_URL}/game_record/hkrpg/api/index" # OS角色橱窗接口 ) @@ -49,9 +41,7 @@ STAR_RAIL_AVATAR_INFO_URL_OS = ( CHALLENGE_INFO_URL = f"{NEW_URL}/game_record/app/hkrpg/api/challenge" CHALLENGE_INFO_URL_OS = f"{OS_INFO_URL}/game_record/hkrpg/api/challenge" -ROGUE_INFO_URL = ( - f"{NEW_URL}/game_record/app/hkrpg/api/rogue" -) # 角色模拟宇宙信息接口 +ROGUE_INFO_URL = f"{NEW_URL}/game_record/app/hkrpg/api/rogue" # 角色模拟宇宙信息接口 ROGUE_LOCUST_INFO_URL = ( f"{NEW_URL}/game_record/app/hkrpg/api/rogue_locust" # 角色寰宇蝗灾信息接口 ) diff --git a/StarRailUID/starrailuid_charinfo/effect/Avatar/Avatar.py b/StarRailUID/starrailuid_charinfo/effect/Avatar/Avatar.py index b140c71..16a1f46 100644 --- a/StarRailUID/starrailuid_charinfo/effect/Avatar/Avatar.py +++ b/StarRailUID/starrailuid_charinfo/effect/Avatar/Avatar.py @@ -59,9 +59,7 @@ class JingYuan(BaseAvatar): def extra_ability(self): logger.info('额外能力') - logger.info( - '【神君】下回合的攻击段数大于等于6段, 则其下回合的暴击伤害提高25%。' - ) + logger.info('【神君】下回合的攻击段数大于等于6段, 则其下回合的暴击伤害提高25%。') self.extra_ability_attribute['CriticalDamageBase'] = 0.25 logger.info('施放战技后, 暴击率提升10%') self.extra_ability_attribute['CriticalChanceBase'] = 0.1 @@ -123,9 +121,7 @@ class Danhengil(BaseAvatar): def extra_ability(self): logger.info('额外能力') - logger.info( - '对拥有虚数属性弱点的敌方目标造成伤害时, 暴击伤害提高24%。' - ) + logger.info('对拥有虚数属性弱点的敌方目标造成伤害时, 暴击伤害提高24%。') self.extra_ability_attribute['CriticalDamageBase'] = 0.24 @@ -340,9 +336,7 @@ class Welt(BaseAvatar): def extra_ability(self): logger.info('额外能力') - logger.info( - '施放终结技时, 有100%基础概率使目标受到的伤害提高12%, 持续2回合。' - ) + logger.info('施放终结技时, 有100%基础概率使目标受到的伤害提高12%, 持续2回合。') logger.info('对被弱点击破的敌方目标造成的伤害提高20') self.extra_ability_attribute['AllDamageAddedRatio'] = 0.32 diff --git a/StarRailUID/starrailuid_charinfo/effect/Base/AvatarBase.py b/StarRailUID/starrailuid_charinfo/effect/Base/AvatarBase.py index 7505a9d..5841899 100644 --- a/StarRailUID/starrailuid_charinfo/effect/Base/AvatarBase.py +++ b/StarRailUID/starrailuid_charinfo/effect/Base/AvatarBase.py @@ -1,14 +1,14 @@ import json -from abc import abstractmethod from pathlib import Path +from abc import abstractmethod from typing import List, Union import msgspec from msgspec import Struct -from ....utils.excel.model import AvatarPromotionConfig -from .model import DamageInstanceAvatar, DamageInstanceSkill from .SkillBase import BaseSkills +from ....utils.excel.model import AvatarPromotionConfig +from .model import DamageInstanceSkill, DamageInstanceAvatar path = Path(__file__).parent.parent with Path.open(path / 'Excel' / 'SkillData.json', encoding='utf-8') as f: diff --git a/StarRailUID/starrailuid_charinfo/effect/Role.py b/StarRailUID/starrailuid_charinfo/effect/Role.py index f07726c..e096a61 100644 --- a/StarRailUID/starrailuid_charinfo/effect/Role.py +++ b/StarRailUID/starrailuid_charinfo/effect/Role.py @@ -261,9 +261,7 @@ class RoleInstance: # 检查是否有某一属性的抗性穿透 attr_name = attr.split('ResistancePenetration')[0] if attr_name in (self.avatar.avatar_element, 'AllDamage'): - logger.info( - f'{attr_name}属性有{merged_attr[attr]}穿透加成' - ) + logger.info(f'{attr_name}属性有{merged_attr[attr]}穿透加成') enemy_status_resistance += merged_attr[attr] # 检查是否有某一技能属性的抗性穿透 if attr_name.__contains__('_'): diff --git a/StarRailUID/starrailuid_charinfo/effect/Weapon/Weapon.py b/StarRailUID/starrailuid_charinfo/effect/Weapon/Weapon.py index 663f090..09be5e6 100644 --- a/StarRailUID/starrailuid_charinfo/effect/Weapon/Weapon.py +++ b/StarRailUID/starrailuid_charinfo/effect/Weapon/Weapon.py @@ -269,19 +269,16 @@ class BeforeDawn(BaseWeapon): attribute_bonus: Dict[str, float], ): bp_skill_dmg_add = attribute_bonus.get('BPSkillDmgAdd', 0) - attribute_bonus['BPSkillDmgAdd'] = ( - bp_skill_dmg_add - + (weapon_effect['23010']['Param']['e_dmg'][self.weapon_rank - 1]) + attribute_bonus['BPSkillDmgAdd'] = bp_skill_dmg_add + ( + weapon_effect['23010']['Param']['e_dmg'][self.weapon_rank - 1] ) ultra_dmg_add = attribute_bonus.get('UltraDmgAdd', 0) - attribute_bonus['UltraDmgAdd'] = ( - ultra_dmg_add - + (weapon_effect['23010']['Param']['r_dmg'][self.weapon_rank - 1]) + attribute_bonus['UltraDmgAdd'] = ultra_dmg_add + ( + weapon_effect['23010']['Param']['r_dmg'][self.weapon_rank - 1] ) talent_dmg_add = attribute_bonus.get('TalentDmgAdd', 0) - attribute_bonus['TalentDmgAdd'] = ( - talent_dmg_add - + (weapon_effect['23010']['Param']['t_dmg'][self.weapon_rank - 1]) + attribute_bonus['TalentDmgAdd'] = talent_dmg_add + ( + weapon_effect['23010']['Param']['t_dmg'][self.weapon_rank - 1] ) return attribute_bonus @@ -495,13 +492,10 @@ class GeniusesRepose(BaseWeapon): ): if await self.check(): critical_chance_base = attribute_bonus.get('CriticalDamageBase', 0) - attribute_bonus['CriticalDamageBase'] = ( - critical_chance_base - + ( - weapon_effect['21020']['Param']['CriticalDamageBase'][ - self.weapon_rank - 1 - ] - ) + attribute_bonus['CriticalDamageBase'] = critical_chance_base + ( + weapon_effect['21020']['Param']['CriticalDamageBase'][ + self.weapon_rank - 1 + ] ) return attribute_bonus @@ -524,9 +518,8 @@ class MaketheWorldClamor(BaseWeapon): attribute_bonus: Dict[str, float], ): ultra_dmg_add = attribute_bonus.get('UltraDmgAdd', 0) - attribute_bonus['UltraDmgAdd'] = ( - ultra_dmg_add - + (weapon_effect['21013']['Param']['r_dmg'][self.weapon_rank - 1]) + attribute_bonus['UltraDmgAdd'] = ultra_dmg_add + ( + weapon_effect['21013']['Param']['r_dmg'][self.weapon_rank - 1] ) return attribute_bonus @@ -551,13 +544,8 @@ class TheBirthoftheSelf(BaseWeapon): ): if await self.check(): talent_dmg_add = attribute_bonus.get('TalentDmgAdd', 0) - attribute_bonus['TalentDmgAdd'] = ( - talent_dmg_add - + ( - weapon_effect['21006']['Param']['t_dmg'][ - self.weapon_rank - 1 - ] - ) + attribute_bonus['TalentDmgAdd'] = talent_dmg_add + ( + weapon_effect['21006']['Param']['t_dmg'][self.weapon_rank - 1] ) return attribute_bonus return attribute_bonus @@ -1485,14 +1473,12 @@ class CollapsingSky(BaseWeapon): attribute_bonus: Dict[str, float], ): normal_dmg_add = attribute_bonus.get('NormalDmgAdd', 0) - attribute_bonus['NormalDmgAdd'] = ( - normal_dmg_add - + (weapon_effect['20002']['Param']['a_dmg'][self.weapon_rank - 1]) + attribute_bonus['NormalDmgAdd'] = normal_dmg_add + ( + weapon_effect['20002']['Param']['a_dmg'][self.weapon_rank - 1] ) bp_skill_dmg_add = attribute_bonus.get('BPSkillDmgAdd', 0) - attribute_bonus['BPSkillDmgAdd'] = ( - bp_skill_dmg_add - + (weapon_effect['20002']['Param']['e_dmg'][self.weapon_rank - 1]) + attribute_bonus['BPSkillDmgAdd'] = bp_skill_dmg_add + ( + weapon_effect['20002']['Param']['e_dmg'][self.weapon_rank - 1] ) return attribute_bonus @@ -1645,9 +1631,8 @@ class DataBank(BaseWeapon): attribute_bonus: Dict[str, float], ): ultra_dmg_add = attribute_bonus.get('UltraDmgAdd', 0) - attribute_bonus['UltraDmgAdd'] = ( - ultra_dmg_add - + (weapon_effect['20006']['Param']['r_dmg'][self.weapon_rank - 1]) + attribute_bonus['UltraDmgAdd'] = ultra_dmg_add + ( + weapon_effect['20006']['Param']['r_dmg'][self.weapon_rank - 1] ) return attribute_bonus @@ -1685,13 +1670,12 @@ class Thisbodyisasword(BaseWeapon): resistance_penetration = attribute_bonus.get( 'AllResistancePenetration', 0 ) - attribute_bonus['AllResistancePenetration'] = ( - resistance_penetration - + ( - weapon_effect['23014']['Param']['ResistancePenetration'][ - self.weapon_rank - 1 - ] - ) + attribute_bonus[ + 'AllResistancePenetration' + ] = resistance_penetration + ( + weapon_effect['23014']['Param']['ResistancePenetration'][ + self.weapon_rank - 1 + ] ) return attribute_bonus diff --git a/StarRailUID/starrailuid_charinfo/get_char_img.py b/StarRailUID/starrailuid_charinfo/get_char_img.py index 533cbca..4afebb2 100644 --- a/StarRailUID/starrailuid_charinfo/get_char_img.py +++ b/StarRailUID/starrailuid_charinfo/get_char_img.py @@ -130,9 +130,7 @@ async def get_char_args( if isinstance(char_data, str): return char_data else: - for i, s in enumerate( - ['头部', '手部', '躯干', '腿部', '位面球', '连结绳'] - ): + for i, s in enumerate(['头部', '手部', '躯干', '腿部', '位面球', '连结绳']): if '赤沙' in part: continue if part[-1] in PieceName_ilst[i]: diff --git a/StarRailUID/starrailuid_charinfo/mono/Character.py b/StarRailUID/starrailuid_charinfo/mono/Character.py index 782819e..0bad6ea 100644 --- a/StarRailUID/starrailuid_charinfo/mono/Character.py +++ b/StarRailUID/starrailuid_charinfo/mono/Character.py @@ -1,7 +1,6 @@ from typing import Dict, List from collections import Counter - from ...utils.map.SR_MAP_PATH import RelicSetSkill, EquipmentID2AbilityProperty @@ -97,18 +96,18 @@ class Character: set_property = status_add.Property set_value = status_add.Value if set_property != '': - self.add_attr[set_property] = ( - set_value + self.add_attr.get(set_property, 0) - ) + self.add_attr[ + set_property + ] = set_value + self.add_attr.get(set_property, 0) if count == 4: status_add = RelicSetSkill.RelicSet[str(set_id)]['4'] if status_add: set_property = status_add.Property set_value = status_add.Value if set_property != '': - self.add_attr[set_property] = ( - set_value + self.add_attr.get(set_property, 0) - ) + self.add_attr[ + set_property + ] = set_value + self.add_attr.get(set_property, 0) # logger.info(json.dumps(self.base_attributes)) # logger.info(json.dumps(self.add_attr)) diff --git a/StarRailUID/starrailuid_charinfo/to_card.py b/StarRailUID/starrailuid_charinfo/to_card.py index 13551d7..09eae2e 100644 --- a/StarRailUID/starrailuid_charinfo/to_card.py +++ b/StarRailUID/starrailuid_charinfo/to_card.py @@ -54,9 +54,7 @@ async def draw_enka_card(uid: str, char_list: List, showfrom: int = 0): return await convert_img(Image.new('RGBA', (0, 1), (255, 255, 255))) else: line1 = f'UID {uid} 刷新成功' - line2 = ( - f'可以使用 sr查询{char_data_list[0]["avatarName"]} 查询详情角色面板' - ) + line2 = f'可以使用 sr查询{char_data_list[0]["avatarName"]} 查询详情角色面板' char_num = len(char_data_list) if char_num <= 4: based_w, based_h = 1380, 926 diff --git a/StarRailUID/starrailuid_config/config_default.py b/StarRailUID/starrailuid_config/config_default.py index a025653..d0d4beb 100644 --- a/StarRailUID/starrailuid_config/config_default.py +++ b/StarRailUID/starrailuid_config/config_default.py @@ -8,9 +8,7 @@ from gsuid_core.utils.plugins_config.models import ( ) CONIFG_DEFAULT: Dict[str, GSC] = { - 'SignTime': GsListStrConfig( - '每晚签到时间设置', '每晚米游社签到时间设置(时,分)', ['0', '38'] - ), + 'SignTime': GsListStrConfig('每晚签到时间设置', '每晚米游社签到时间设置(时,分)', ['0', '38']), 'SignReportSimple': GsBoolConfig( '简洁签到报告', '开启后可以大大减少每日签到报告字数', diff --git a/StarRailUID/starrailuid_gachalog/__init__.py b/StarRailUID/starrailuid_gachalog/__init__.py index e852088..2c126c1 100644 --- a/StarRailUID/starrailuid_gachalog/__init__.py +++ b/StarRailUID/starrailuid_gachalog/__init__.py @@ -39,8 +39,6 @@ async def get_gachalog_by_link(bot: Bot, ev: Event): if ev.command.startswith('强制'): await bot.logger.info('[WARNING]本次为强制刷新') is_force = True - await bot.send( - f'UID{uid}开始执行[刷新抽卡记录],需要一定时间...请勿重复触发!' - ) + await bot.send(f'UID{uid}开始执行[刷新抽卡记录],需要一定时间...请勿重复触发!') im = await save_gachalogs(uid, gacha_url, None, is_force) return await bot.send(im) diff --git a/StarRailUID/starrailuid_resource/__init__.py b/StarRailUID/starrailuid_resource/__init__.py index dac9052..1fae1cd 100644 --- a/StarRailUID/starrailuid_resource/__init__.py +++ b/StarRailUID/starrailuid_resource/__init__.py @@ -17,7 +17,5 @@ async def send_download_resource_msg(bot: Bot, ev: Event): async def startup(): - logger.info( - '[sr资源文件下载] 正在检查与下载缺失的资源文件,可能需要较长时间,请稍等' - ) + logger.info('[sr资源文件下载] 正在检查与下载缺失的资源文件,可能需要较长时间,请稍等') logger.info(f'[sr资源文件下载] {await download_all_resource()}') diff --git a/StarRailUID/starrailuid_signin/__init__.py b/StarRailUID/starrailuid_signin/__init__.py index 466afc5..c3c7991 100644 --- a/StarRailUID/starrailuid_signin/__init__.py +++ b/StarRailUID/starrailuid_signin/__init__.py @@ -65,9 +65,7 @@ async def send_daily_sign(): single['msg'], 'direct', qid, single['bot_id'], '', '' ) except Exception as e: - logger.warning( - f'[SR每日全部签到] QQ {qid} 私聊推送失败!错误信息:{e}' - ) + logger.warning(f'[SR每日全部签到] QQ {qid} 私聊推送失败!错误信息:{e}') await asyncio.sleep(0.5) logger.info('[SR每日全部签到]私聊推送完成') @@ -76,9 +74,7 @@ async def send_daily_sign(): # 根据succee数判断是否为简洁推送 if group_msg_list[gid]['success'] >= 0: report = ( - '以下为签到失败报告:{}'.format( - group_msg_list[gid]['push_message'] - ) + '以下为签到失败报告:{}'.format(group_msg_list[gid]['push_message']) if group_msg_list[gid]['push_message'] != '' else '' ) diff --git a/StarRailUID/starrailuid_signin/sign.py b/StarRailUID/starrailuid_signin/sign.py index 16c92b4..c014b64 100644 --- a/StarRailUID/starrailuid_signin/sign.py +++ b/StarRailUID/starrailuid_signin/sign.py @@ -57,15 +57,11 @@ 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('配置文件暂未开启[跳过无感验证],结束本次任务...') @@ -74,9 +70,7 @@ 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.code == 'ok'): # 国际服签到无risk_code字段 @@ -109,9 +103,7 @@ async def sign_in(sr_uid: str) -> str: sign_missed -= 1 sign_missed = sign_info.sign_cnt_missed or sign_missed im = f'{mes_im}!\n{get_im}\n本月漏签次数:{sign_missed}' - logger.info( - f'[SR签到] {sr_uid} 签到完成, 结果: {mes_im}, 漏签次数: {sign_missed}' - ) + logger.info(f'[SR签到] {sr_uid} 签到完成, 结果: {mes_im}, 漏签次数: {sign_missed}') return im @@ -171,9 +163,7 @@ 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/resource/download_from_cos.py b/StarRailUID/utils/resource/download_from_cos.py index 841f70e..038e3b6 100644 --- a/StarRailUID/utils/resource/download_from_cos.py +++ b/StarRailUID/utils/resource/download_from_cos.py @@ -81,9 +81,7 @@ async def download_all_file_from_cos(): or not Path.stat(path).st_size or not is_diff ): - logger.info( - f'[cos]开始下载[{resource_type}]_[{name}]...' - ) + logger.info(f'[cos]开始下载[{resource_type}]_[{name}]...') temp_num += 1 if isinstance(url, int): logger.error( @@ -121,6 +119,4 @@ 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}个文件未下载,请使用命令 `下载全部资源` 重新下载')