Genshin-bots/GenshinUID
1
0
Fork 0
mirror of https://github.com/KimigaiiWuyi/GenshinUID.git synced 2025-06-01 13:09:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复：当前信息补空格 & 给谁用

Browse Source
This commit is contained in:
Wuyi无疑 2022-04-08 22:29:00 +08:00
parent a0874f0077
commit 2a864fb118
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mihoyo_libs/get_image.py
View File

@ -1623,7 +1623,7 @@ async def draw_info_pic(uid: str, image: Optional[Match] = None) -> str:
daily_data['resin_recovery_time']))) daily_data['resin_recovery_time'])))
text_draw.text((268, 305), f' {next_resin_rec_time}', text_color, genshin_font(18), anchor='lm') text_draw.text((268, 305), f' {next_resin_rec_time}', text_color, genshin_font(18), anchor='lm')
text_draw.text((170, 331), f'预计 后全部恢复', text_color, genshin_font(18), anchor='lm') text_draw.text((170, 331), f'预计 后全部恢复', text_color, genshin_font(18), anchor='lm')
text_draw.text((208, 331), f'{resin_recovery_time}', highlight_color, genshin_font(18), anchor='lm') text_draw.text((208, 331), f'{resin_recovery_time}', highlight_color, genshin_font(18), anchor='lm')
# 洞天宝钱时间计算 # 洞天宝钱时间计算

18
mihoyo_libs/get_mihoyo_bbs_data.py
View File

@ -160,24 +160,26 @@ char_adv_im = """【{}】
async def weapon_adv(name): async def weapon_adv(name):
char_adv_path = os.path.join(FILE_PATH, 'Genshin All Char.xlsx') char_adv_path = os.path.join(FILE_PATH, 'mihoyo_libs/Genshin All Char.xlsx')
# char_adv_path = FILE_PATH
wb = load_workbook(char_adv_path) wb = load_workbook(char_adv_path)
ws = wb.active ws = wb.active
weapon_name = '' weapons={}
char_list = []
for c in range(2, 5): for c in range(2, 5):
for r in range(2, 300): for r in range(2, 300):
if ws.cell(r, c).value: if ws.cell(r, c).value:
# if all(i in ws.cell(r,c).value for i in name): # if all(i in ws.cell(r,c).value for i in name):
if name in ws.cell(r, c).value: if name in ws.cell(r, c).value:
weapon_name = ws.cell(r, c).value weapon_name = ws.cell(r, c).value
char_list.append(ws.cell(2 + ((r - 2) // 5) * 5, 1).value) weapon=weapons.get(weapon_name,[])
weapon.append(ws.cell(2 + ((r - 2) // 5) * 5, 1).value)
weapons[weapon_name]=weapon
if char_list: if weapons:
im = ','.join(char_list) im = []
im = im + '可能会用到【{}】'.format(weapon_name) for k, v in weapons.items():
im.append(f'{"、".join(v)}可能会用到【{k}】')
im = '\n'.join(im)
else: else:
im = '没有角色能使用【{}】'.format(weapon_name) im = '没有角色能使用【{}】'.format(weapon_name)
return im return im