format 一下

This commit is contained in:
qwerdvd 2023-09-30 16:32:30 +08:00
parent e6a02824ac
commit a15dea8361
18 changed files with 3099 additions and 3011 deletions

View File

@ -1,60 +1,70 @@
# flake8: noqa # flake8: noqa
OLD_URL = "https://api-takumi.mihoyo.com" OLD_URL = "https://api-takumi.mihoyo.com"
OS_OLD_URL = "https://api-os-takumi.mihoyo.com" OS_OLD_URL = "https://api-os-takumi.mihoyo.com"
NEW_URL = 'https://api-takumi-record.mihoyo.com' NEW_URL = "https://api-takumi-record.mihoyo.com"
OS_URL = "https://sg-public-api.hoyolab.com" OS_URL = "https://sg-public-api.hoyolab.com"
OS_INFO_URL = "https://bbs-api-os.hoyolab.com" OS_INFO_URL = "https://bbs-api-os.hoyolab.com"
STAR_RAIL_SIGN_INFO_URL = f'{OLD_URL}/event/luna/info' STAR_RAIL_SIGN_INFO_URL = f"{OLD_URL}/event/luna/info"
STAR_RAIL_SIGN_INFO_URL_OS = f'{OS_URL}/event/luna/os/info' STAR_RAIL_SIGN_INFO_URL_OS = f"{OS_URL}/event/luna/os/info"
STAR_RAIL_SIGN_LIST_URL = f'{OLD_URL}/event/luna/home' STAR_RAIL_SIGN_LIST_URL = f"{OLD_URL}/event/luna/home"
STAR_RAIL_SIGN_LIST_URL_OS = f'{OS_URL}/event/luna/os/home' STAR_RAIL_SIGN_LIST_URL_OS = f"{OS_URL}/event/luna/os/home"
STAR_RAIL_SIGN_EXTRA_INFO_URL = f'{OLD_URL}/event/luna/extra_info' 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_EXTRA_REWARD_URL = f"{OLD_URL}/event/luna/extra_reward"
STAR_RAIL_SIGN_URL = f'{OLD_URL}/event/luna/sign' STAR_RAIL_SIGN_URL = f"{OLD_URL}/event/luna/sign"
STAR_RAIL_SIGN_URL_OS = f'{OS_URL}/event/luna/os/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 = ( STAR_RAIL_MONTH_DETAIL_URL = (
f'{OLD_URL}/event/srledger/month_detail' # 开拓阅历详情接口 f"{OLD_URL}/event/srledger/month_detail" # 开拓阅历详情接口
) )
STAR_RAIL_NOTE_URL = f'{NEW_URL}/game_record/app/hkrpg/api/note' # 实时便签接口 STAR_RAIL_NOTE_URL = (
STAR_RAIL_NOTE_URL_OS = f'{OS_INFO_URL}/game_record/hkrpg/api/note' # OS实时便签接口 f"{NEW_URL}/game_record/app/hkrpg/api/note"
STAR_RAIL_INDEX_URL = f'{NEW_URL}/game_record/app/hkrpg/api/index' # 角色橱窗接口 ) # 实时便签接口
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 = ( STAR_RAIL_INDEX_URL_OS = (
f'{OS_INFO_URL}/game_record/hkrpg/api/index' # OS角色橱窗接口 f"{OS_INFO_URL}/game_record/hkrpg/api/index" # OS角色橱窗接口
) )
STAR_RAIL_AVATAR_BASIC_URL = ( STAR_RAIL_AVATAR_BASIC_URL = (
f'{NEW_URL}/game_record/app/hkrpg/api/avatar/basic' # 全部角色接口 f"{NEW_URL}/game_record/app/hkrpg/api/avatar/basic" # 全部角色接口
) )
STAR_RAIL_ROLE_BASIC_INFO_URL = ( STAR_RAIL_ROLE_BASIC_INFO_URL = (
f'{NEW_URL}/game_record/app/hkrpg/api/role/basicInfo' # 角色基础信息接口 f"{NEW_URL}/game_record/app/hkrpg/api/role/basicInfo" # 角色基础信息接口
) )
STAR_RAIL_ROLE_BASIC_INFO_URL_OS = f'{OS_INFO_URL}/game_record/hkrpg/api/index' STAR_RAIL_ROLE_BASIC_INFO_URL_OS = f"{OS_INFO_URL}/game_record/hkrpg/api/index"
STAR_RAIL_AVATAR_INFO_URL = ( STAR_RAIL_AVATAR_INFO_URL = (
f'{NEW_URL}/game_record/app/hkrpg/api/avatar/info' # 角色详细信息接口 f"{NEW_URL}/game_record/app/hkrpg/api/avatar/info" # 角色详细信息接口
) )
STAR_RAIL_AVATAR_INFO_URL_OS = ( STAR_RAIL_AVATAR_INFO_URL_OS = (
f'{OS_INFO_URL}/game_record/hkrpg/api/avatar/info' # OS角色详细信息接口 f"{OS_INFO_URL}/game_record/hkrpg/api/avatar/info" # OS角色详细信息接口
) )
CHALLENGE_INFO_URL = f'{NEW_URL}/game_record/app/hkrpg/api/challenge' 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' 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 = ( ROGUE_LOCUST_INFO_URL = (
f'{NEW_URL}/game_record/app/hkrpg/api/rogue_locust' # 角色寰宇蝗灾信息接口 f"{NEW_URL}/game_record/app/hkrpg/api/rogue_locust" # 角色寰宇蝗灾信息接口
) )
STAR_RAIL_GACHA_LOG_URL = f'{OLD_URL}/common/gacha_record/api/getGachaLog' STAR_RAIL_GACHA_LOG_URL = f"{OLD_URL}/common/gacha_record/api/getGachaLog"
STAR_RAIL_GACHA_LOG_URL_OS = ( STAR_RAIL_GACHA_LOG_URL_OS = (
f'{OS_OLD_URL}/common/gacha_record/api/getGachaLog' f"{OS_OLD_URL}/common/gacha_record/api/getGachaLog"
) )
GET_FP_URL = 'https://public-data-api.mihoyo.com/device-fp/api/getFp' GET_FP_URL = "https://public-data-api.mihoyo.com/device-fp/api/getFp"
GET_FP_URL_OS = 'https://sg-public-data-api.hoyoverse.com/device-fp/api/getFp' GET_FP_URL_OS = "https://sg-public-data-api.hoyoverse.com/device-fp/api/getFp"
# CREATE_QRCODE = f'{OLD_URL}/event/bbs_sign_reward/gen_auth_code' # CREATE_QRCODE = f'{OLD_URL}/event/bbs_sign_reward/gen_auth_code'
STAR_RAIL_WIDGRT_URL = f'{NEW_URL}/game_record/app/hkrpg/aapi/widget' STAR_RAIL_WIDGRT_URL = f"{NEW_URL}/game_record/app/hkrpg/aapi/widget"
_API = locals() _API = locals()

View File

@ -46,7 +46,16 @@ TEXT_PATH = Path(__file__).parent / 'texture2D'
bg_img = Image.open(TEXT_PATH / 'bg.png') bg_img = Image.open(TEXT_PATH / 'bg.png')
white_color = (213, 213, 213) white_color = (213, 213, 213)
NUM_MAP = {0: '', 1: '', 2: '', 3: '', 4: '', 5: '', 6: '', 7: ''} NUM_MAP = {
0: '',
1: '',
2: '',
3: '',
4: '',
5: '',
6: '',
7: '',
}
RANK_MAP = { RANK_MAP = {
1: '_rank1.png', 1: '_rank1.png',

View File

@ -59,7 +59,9 @@ class JingYuan(BaseAvatar):
def extra_ability(self): def extra_ability(self):
logger.info('额外能力') logger.info('额外能力')
logger.info('【神君】下回合的攻击段数大于等于6段, 则其下回合的暴击伤害提高25%') logger.info(
'【神君】下回合的攻击段数大于等于6段, 则其下回合的暴击伤害提高25%'
)
self.extra_ability_attribute['CriticalDamageBase'] = 0.25 self.extra_ability_attribute['CriticalDamageBase'] = 0.25
logger.info('施放战技后, 暴击率提升10%') logger.info('施放战技后, 暴击率提升10%')
self.extra_ability_attribute['CriticalChanceBase'] = 0.1 self.extra_ability_attribute['CriticalChanceBase'] = 0.1
@ -118,7 +120,9 @@ class Danhengil(BaseAvatar):
def extra_ability(self): def extra_ability(self):
logger.info('额外能力') logger.info('额外能力')
logger.info('对拥有虚数属性弱点的敌方目标造成伤害时, 暴击伤害提高24%') logger.info(
'对拥有虚数属性弱点的敌方目标造成伤害时, 暴击伤害提高24%'
)
self.extra_ability_attribute['CriticalDamageBase'] = 0.24 self.extra_ability_attribute['CriticalDamageBase'] = 0.24
@ -316,7 +320,9 @@ class Welt(BaseAvatar):
def extra_ability(self): def extra_ability(self):
logger.info('额外能力') logger.info('额外能力')
logger.info('施放终结技时, 有100%基础概率使目标受到的伤害提高12%, 持续2回合。') logger.info(
'施放终结技时, 有100%基础概率使目标受到的伤害提高12%, 持续2回合。'
)
logger.info('对被弱点击破的敌方目标造成的伤害提高20') logger.info('对被弱点击破的敌方目标造成的伤害提高20')
self.extra_ability_attribute['AllDamageAddedRatio'] = 0.32 self.extra_ability_attribute['AllDamageAddedRatio'] = 0.32

View File

@ -295,7 +295,9 @@ class RoleInstance:
# 检查是否有某一属性的抗性穿透 # 检查是否有某一属性的抗性穿透
attr_name = attr.split('ResistancePenetration')[0] attr_name = attr.split('ResistancePenetration')[0]
if attr_name in (self.avatar.avatar_element, 'AllDamage'): 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] enemy_status_resistance += merged_attr[attr]
# 检查是否有某一技能属性的抗性穿透 # 检查是否有某一技能属性的抗性穿透
if attr_name.__contains__('_'): if attr_name.__contains__('_'):

View File

@ -269,16 +269,19 @@ class BeforeDawn(BaseWeapon):
attribute_bonus: Dict[str, float], attribute_bonus: Dict[str, float],
): ):
bp_skill_dmg_add = attribute_bonus.get('BPSkillDmgAdd', 0) bp_skill_dmg_add = attribute_bonus.get('BPSkillDmgAdd', 0)
attribute_bonus['BPSkillDmgAdd'] = bp_skill_dmg_add + ( attribute_bonus['BPSkillDmgAdd'] = (
weapon_effect['23010']['Param']['e_dmg'][self.weapon_rank - 1] bp_skill_dmg_add
+ (weapon_effect['23010']['Param']['e_dmg'][self.weapon_rank - 1])
) )
ultra_dmg_add = attribute_bonus.get('UltraDmgAdd', 0) ultra_dmg_add = attribute_bonus.get('UltraDmgAdd', 0)
attribute_bonus['UltraDmgAdd'] = ultra_dmg_add + ( attribute_bonus['UltraDmgAdd'] = (
weapon_effect['23010']['Param']['r_dmg'][self.weapon_rank - 1] ultra_dmg_add
+ (weapon_effect['23010']['Param']['r_dmg'][self.weapon_rank - 1])
) )
talent_dmg_add = attribute_bonus.get('TalentDmgAdd', 0) talent_dmg_add = attribute_bonus.get('TalentDmgAdd', 0)
attribute_bonus['TalentDmgAdd'] = talent_dmg_add + ( attribute_bonus['TalentDmgAdd'] = (
weapon_effect['23010']['Param']['t_dmg'][self.weapon_rank - 1] talent_dmg_add
+ (weapon_effect['23010']['Param']['t_dmg'][self.weapon_rank - 1])
) )
return attribute_bonus return attribute_bonus
@ -492,11 +495,14 @@ class GeniusesRepose(BaseWeapon):
): ):
if await self.check(): if await self.check():
critical_chance_base = attribute_bonus.get('CriticalDamageBase', 0) critical_chance_base = attribute_bonus.get('CriticalDamageBase', 0)
attribute_bonus['CriticalDamageBase'] = critical_chance_base + ( attribute_bonus['CriticalDamageBase'] = (
critical_chance_base
+ (
weapon_effect['21020']['Param']['CriticalDamageBase'][ weapon_effect['21020']['Param']['CriticalDamageBase'][
self.weapon_rank - 1 self.weapon_rank - 1
] ]
) )
)
return attribute_bonus return attribute_bonus
@ -518,8 +524,9 @@ class MaketheWorldClamor(BaseWeapon):
attribute_bonus: Dict[str, float], attribute_bonus: Dict[str, float],
): ):
ultra_dmg_add = attribute_bonus.get('UltraDmgAdd', 0) ultra_dmg_add = attribute_bonus.get('UltraDmgAdd', 0)
attribute_bonus['UltraDmgAdd'] = ultra_dmg_add + ( attribute_bonus['UltraDmgAdd'] = (
weapon_effect['21013']['Param']['r_dmg'][self.weapon_rank - 1] ultra_dmg_add
+ (weapon_effect['21013']['Param']['r_dmg'][self.weapon_rank - 1])
) )
return attribute_bonus return attribute_bonus
@ -544,8 +551,13 @@ class TheBirthoftheSelf(BaseWeapon):
): ):
if await self.check(): if await self.check():
talent_dmg_add = attribute_bonus.get('TalentDmgAdd', 0) talent_dmg_add = attribute_bonus.get('TalentDmgAdd', 0)
attribute_bonus['TalentDmgAdd'] = talent_dmg_add + ( attribute_bonus['TalentDmgAdd'] = (
weapon_effect['21006']['Param']['t_dmg'][self.weapon_rank - 1] talent_dmg_add
+ (
weapon_effect['21006']['Param']['t_dmg'][
self.weapon_rank - 1
]
)
) )
return attribute_bonus return attribute_bonus
return attribute_bonus return attribute_bonus
@ -1479,12 +1491,14 @@ class CollapsingSky(BaseWeapon):
attribute_bonus: Dict[str, float], attribute_bonus: Dict[str, float],
): ):
normal_dmg_add = attribute_bonus.get('NormalDmgAdd', 0) normal_dmg_add = attribute_bonus.get('NormalDmgAdd', 0)
attribute_bonus['NormalDmgAdd'] = normal_dmg_add + ( attribute_bonus['NormalDmgAdd'] = (
weapon_effect['20002']['Param']['a_dmg'][self.weapon_rank - 1] normal_dmg_add
+ (weapon_effect['20002']['Param']['a_dmg'][self.weapon_rank - 1])
) )
bp_skill_dmg_add = attribute_bonus.get('BPSkillDmgAdd', 0) bp_skill_dmg_add = attribute_bonus.get('BPSkillDmgAdd', 0)
attribute_bonus['BPSkillDmgAdd'] = bp_skill_dmg_add + ( attribute_bonus['BPSkillDmgAdd'] = (
weapon_effect['20002']['Param']['e_dmg'][self.weapon_rank - 1] bp_skill_dmg_add
+ (weapon_effect['20002']['Param']['e_dmg'][self.weapon_rank - 1])
) )
return attribute_bonus return attribute_bonus
@ -1637,8 +1651,9 @@ class DataBank(BaseWeapon):
attribute_bonus: Dict[str, float], attribute_bonus: Dict[str, float],
): ):
ultra_dmg_add = attribute_bonus.get('UltraDmgAdd', 0) ultra_dmg_add = attribute_bonus.get('UltraDmgAdd', 0)
attribute_bonus['UltraDmgAdd'] = ultra_dmg_add + ( attribute_bonus['UltraDmgAdd'] = (
weapon_effect['20006']['Param']['r_dmg'][self.weapon_rank - 1] ultra_dmg_add
+ (weapon_effect['20006']['Param']['r_dmg'][self.weapon_rank - 1])
) )
return attribute_bonus return attribute_bonus
@ -1676,13 +1691,14 @@ class Thisbodyisasword(BaseWeapon):
resistance_penetration = attribute_bonus.get( resistance_penetration = attribute_bonus.get(
'AllResistancePenetration', 0 'AllResistancePenetration', 0
) )
attribute_bonus[ attribute_bonus['AllResistancePenetration'] = (
'AllResistancePenetration' resistance_penetration
] = resistance_penetration + ( + (
weapon_effect['23014']['Param']['ResistancePenetration'][ weapon_effect['23014']['Param']['ResistancePenetration'][
self.weapon_rank - 1 self.weapon_rank - 1
] ]
) )
)
return attribute_bonus return attribute_bonus

View File

@ -130,7 +130,9 @@ async def get_char_args(
if isinstance(char_data, str): if isinstance(char_data, str):
return char_data return char_data
else: else:
for i, s in enumerate(['头部', '手部', '躯干', '腿部', '位面球', '连结绳']): for i, s in enumerate(
['头部', '手部', '躯干', '腿部', '位面球', '连结绳']
):
if '赤沙' in part: if '赤沙' in part:
continue continue
if part[-1] in PieceName_ilst[i]: if part[-1] in PieceName_ilst[i]:

View File

@ -54,7 +54,9 @@ 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))) return await convert_img(Image.new('RGBA', (0, 1), (255, 255, 255)))
else: else:
line1 = f'UID {uid} 刷新成功' 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) char_num = len(char_data_list)
if char_num <= 4: if char_num <= 4:
based_w, based_h = 1380, 926 based_w, based_h = 1380, 926

View File

@ -8,7 +8,9 @@ from gsuid_core.utils.plugins_config.models import (
) )
CONIFG_DEFAULT: Dict[str, GSC] = { CONIFG_DEFAULT: Dict[str, GSC] = {
'SignTime': GsListStrConfig('每晚签到时间设置', '每晚米游社签到时间设置(时,分)', ['0', '38']), 'SignTime': GsListStrConfig(
'每晚签到时间设置', '每晚米游社签到时间设置(时,分)', ['0', '38']
),
'SignReportSimple': GsBoolConfig( 'SignReportSimple': GsBoolConfig(
'简洁签到报告', '简洁签到报告',
'开启后可以大大减少每日签到报告字数', '开启后可以大大减少每日签到报告字数',

View File

@ -39,6 +39,8 @@ async def get_gachalog_by_link(bot: Bot, ev: Event):
if ev.command.startswith('强制'): if ev.command.startswith('强制'):
await bot.logger.info('[WARNING]本次为强制刷新') await bot.logger.info('[WARNING]本次为强制刷新')
is_force = True 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) im = await save_gachalogs(uid, gacha_url, None, is_force)
return await bot.send(im) return await bot.send(im)

View File

@ -112,7 +112,12 @@ async def save_gachalogs(
uid, gacha_url, gachalogs_history, is_force uid, gacha_url, gachalogs_history, is_force
) )
else: else:
new_data = {'始发跃迁': [], '群星跃迁': [], '角色跃迁': [], '光锥跃迁': []} new_data = {
'始发跃迁': [],
'群星跃迁': [],
'角色跃迁': [],
'光锥跃迁': [],
}
if gachalogs_history: if gachalogs_history:
for i in ['始发跃迁', '群星跃迁', '角色跃迁', '光锥跃迁']: for i in ['始发跃迁', '群星跃迁', '角色跃迁', '光锥跃迁']:
for item in raw_data[i]: for item in raw_data[i]:
@ -128,7 +133,12 @@ async def save_gachalogs(
if raw_data == {} or not raw_data: if raw_data == {} or not raw_data:
return '请给出正确的抽卡记录链接或链接已失效' return '请给出正确的抽卡记录链接或链接已失效'
temp_data = {'始发跃迁': [], '群星跃迁': [], '角色跃迁': [], '光锥跃迁': []} temp_data = {
'始发跃迁': [],
'群星跃迁': [],
'角色跃迁': [],
'光锥跃迁': [],
}
for i in ['始发跃迁', '群星跃迁', '角色跃迁', '光锥跃迁']: for i in ['始发跃迁', '群星跃迁', '角色跃迁', '光锥跃迁']:
for item in raw_data[i]: for item in raw_data[i]:
if item not in temp_data[i]: if item not in temp_data[i]:

View File

@ -124,7 +124,8 @@ async def draw_note_img(sr_uid: str) -> Union[bytes, str]:
img = monthly_bg.copy() img = monthly_bg.copy()
avatar_img = avatar_default.copy() avatar_img = avatar_default.copy()
char_pic = avatar_img.convert('RGBA').resize( char_pic = avatar_img.convert('RGBA').resize(
(125, 125), Image.Resampling.LANCZOS # type: ignore (125, 125),
Image.Resampling.LANCZOS, # type: ignore
) )
img.paste(char_pic, (115, 133), char_pic) img.paste(char_pic, (115, 133), char_pic)
img_draw = ImageDraw.Draw(img) img_draw = ImageDraw.Draw(img)

View File

@ -17,5 +17,7 @@ async def send_download_resource_msg(bot: Bot, ev: Event):
async def startup(): async def startup():
logger.info('[sr资源文件下载] 正在检查与下载缺失的资源文件,可能需要较长时间,请稍等') logger.info(
'[sr资源文件下载] 正在检查与下载缺失的资源文件,可能需要较长时间,请稍等'
)
logger.info(f'[sr资源文件下载] {await download_all_resource()}') logger.info(f'[sr资源文件下载] {await download_all_resource()}')

View File

@ -65,7 +65,9 @@ async def send_daily_sign():
single['msg'], 'direct', qid, single['bot_id'], '', '' single['msg'], 'direct', qid, single['bot_id'], '', ''
) )
except Exception as e: except Exception as e:
logger.warning(f'[SR每日全部签到] QQ {qid} 私聊推送失败!错误信息:{e}') logger.warning(
f'[SR每日全部签到] QQ {qid} 私聊推送失败!错误信息:{e}'
)
await asyncio.sleep(0.5) await asyncio.sleep(0.5)
logger.info('[SR每日全部签到]私聊推送完成') logger.info('[SR每日全部签到]私聊推送完成')
@ -74,7 +76,9 @@ async def send_daily_sign():
# 根据succee数判断是否为简洁推送 # 根据succee数判断是否为简洁推送
if group_msg_list[gid]['success'] >= 0: if group_msg_list[gid]['success'] >= 0:
report = ( report = (
'以下为签到失败报告:{}'.format(group_msg_list[gid]['push_message']) '以下为签到失败报告:{}'.format(
group_msg_list[gid]['push_message']
)
if group_msg_list[gid]['push_message'] != '' if group_msg_list[gid]['push_message'] != ''
else '' else ''
) )

View File

@ -57,11 +57,15 @@ async def sign_in(sr_uid: str) -> str:
Header['x-rpc-challenge'] = ch Header['x-rpc-challenge'] = ch
Header['x-rpc-validate'] = vl Header['x-rpc-validate'] = vl
Header['x-rpc-seccode'] = f'{vl}|jordan' 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) await asyncio.sleep(delay)
else: else:
delay = 605 + random.randint(1, 120) delay = 605 + random.randint(1, 120)
logger.info(f'[SR签到] {sr_uid} 未获取验证码,等待{delay}秒后重试...') logger.info(
f'[SR签到] {sr_uid} 未获取验证码,等待{delay}秒后重试...'
)
await asyncio.sleep(delay) await asyncio.sleep(delay)
continue continue
logger.info('配置文件暂未开启[跳过无感验证],结束本次任务...') logger.info('配置文件暂未开启[跳过无感验证],结束本次任务...')
@ -70,7 +74,9 @@ async def sign_in(sr_uid: str) -> str:
if index == 0: if index == 0:
logger.info(f'[SR签到] {sr_uid} 该用户无校验码!') logger.info(f'[SR签到] {sr_uid} 该用户无校验码!')
else: else:
logger.info(f'[SR签到] [无感验证] {sr_uid} 该用户重试 {index} 次验证成功!') logger.info(
f'[SR签到] [无感验证] {sr_uid} 该用户重试 {index} 次验证成功!'
)
break break
if (int(str(sr_uid)[0]) > 5) and (sign_data.code == 'ok'): if (int(str(sr_uid)[0]) > 5) and (sign_data.code == 'ok'):
# 国际服签到无risk_code字段 # 国际服签到无risk_code字段
@ -103,7 +109,9 @@ async def sign_in(sr_uid: str) -> str:
sign_missed -= 1 sign_missed -= 1
sign_missed = sign_info.sign_cnt_missed or sign_missed sign_missed = sign_info.sign_cnt_missed or sign_missed
im = f'{mes_im}!\n{get_im}\n本月漏签次数:{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 return im
@ -163,7 +171,9 @@ async def daily_sign():
delay = 1 delay = 1
else: else:
delay = 50 + random.randint(3, 45) delay = 50 + random.randint(3, 45)
logger.info(f'[SR签到] 已签到{len(tasks)}个用户, 等待{delay}秒进行下一次签到') logger.info(
f'[SR签到] 已签到{len(tasks)}个用户, 等待{delay}秒进行下一次签到'
)
tasks.clear() tasks.clear()
already = 0 already = 0
await asyncio.sleep(delay) await asyncio.sleep(delay)

View File

@ -69,7 +69,8 @@ async def _draw_task_img(
avatar_url = char.avatars[i] avatar_url = char.avatars[i]
image = await download_image(avatar_url) image = await download_image(avatar_url)
char_pic = image.convert('RGBA').resize( char_pic = image.convert('RGBA').resize(
(40, 40), Image.Resampling.LANCZOS # type: ignore (40, 40),
Image.Resampling.LANCZOS, # type: ignore
) )
note_travel_img.paste(char_pic, (495 + 68 * i, 20), char_pic) note_travel_img.paste(char_pic, (495 + 68 * i, 20), char_pic)
img.paste(note_travel_img, (0, 790 + index * 80), note_travel_img) img.paste(note_travel_img, (0, 790 + index * 80), note_travel_img)

View File

@ -27,7 +27,12 @@ async def send_bind_card(bot: Bot, ev: Event):
@sv_user_info.on_command( @sv_user_info.on_command(
(f'{PREFIX}绑定uid', f'{PREFIX}切换uid', f'{PREFIX}删除uid', f'{PREFIX}解绑uid') (
f'{PREFIX}绑定uid',
f'{PREFIX}切换uid',
f'{PREFIX}删除uid',
f'{PREFIX}解绑uid',
)
) )
async def send_link_uid_msg(bot: Bot, ev: Event): async def send_link_uid_msg(bot: Bot, ev: Event):
await bot.logger.info('sr开始执行[绑定/解绑用户信息]') await bot.logger.info('sr开始执行[绑定/解绑用户信息]')

View File

@ -81,7 +81,9 @@ async def download_all_file_from_cos():
or not Path.stat(path).st_size or not Path.stat(path).st_size
or not is_diff or not is_diff
): ):
logger.info(f'[cos]开始下载[{resource_type}]_[{name}]...') logger.info(
f'[cos]开始下载[{resource_type}]_[{name}]...'
)
temp_num += 1 temp_num += 1
if isinstance(url, int): if isinstance(url, int):
logger.error( logger.error(
@ -119,4 +121,6 @@ async def download_all_file_from_cos():
await _download(TASKS) await _download(TASKS)
await _download(TASKS) await _download(TASKS)
if count := len(failed_list): if count := len(failed_list):
logger.error(f'[cos]仍有{count}个文件未下载,请使用命令 `下载全部资源` 重新下载') logger.error(
f'[cos]仍有{count}个文件未下载,请使用命令 `下载全部资源` 重新下载'
)