xuthus/LittlePaimon
1
0
Fork 0
mirror of https://github.com/xuthus83/LittlePaimon.git synced 2024-12-16 13:40:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Bot' into Bot

Browse Source
This commit is contained in:
CMHopeSunshine 2022-12-28 22:42:02 +08:00
commit b614a284d0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LittlePaimon/plugins/Paimon_DailyNote/draw.py
View File

@ -85,7 +85,7 @@ async def draw_daily_note_card(data, uid):
left_day = (abyss_new - now).days left_day = (abyss_new - now).days
total_day = (abyss_new - abyss_now).days total_day = (abyss_new - abyss_now).days
await bg_img.text(f"{left_day}/{total_day}", 337, 1358, fm.get('number.ttf', 48), 'white') await bg_img.text(f"{left_day}/{total_day}", 337, 1358, fm.get('number.ttf', 48), 'white')
await bg_img.text(f"本期深渊还有{total_day}天结束", await bg_img.text(f"本期深渊还有{left_day}天结束",
745, 1358, fm.get('优设标题黑.ttf', 40), 'white') 745, 1358, fm.get('优设标题黑.ttf', 40), 'white')
await bg_img.draw_ring(percent=left_day / total_day, pos=(100, 1249), size=(266, 266), width=0.18, await bg_img.draw_ring(percent=left_day / total_day, pos=(100, 1249), size=(266, 266), width=0.18,
colors=['#507bd0', '#FFFFFF']) colors=['#507bd0', '#FFFFFF'])

4
LittlePaimon/utils/api.py
View File

@ -293,7 +293,7 @@ async def get_mihoyo_private_data(
server_id = 'cn_qd01' if uid[0] == '5' else 'cn_gf01' server_id = 'cn_qd01' if uid[0] == '5' else 'cn_gf01'
cookie_info, _ = await get_cookie(user_id, uid, True, True) cookie_info, _ = await get_cookie(user_id, uid, True, True)
if not cookie_info: if not cookie_info:
return '未绑定私人cookie，获取cookie的教程：\ndocs.qq.com/doc/DQ3JLWk1vQVllZ2Z1\n获取后，使用[ysb cookie]指令绑定' \ return '未绑定私人cookie，绑定方法二选一：\n1.通过米游社扫码绑定：\n请发送指令[原神扫码绑定]\n2.获取cookie的教程：\ndocs.qq.com/doc/DQ3JLWk1vQVllZ2Z1\n获取后，使用[ysb cookie]指令绑定' \
+ (f'或前往{config.CookieWeb_url}网页添加绑定' if config.CookieWeb_enable else '') + (f'或前往{config.CookieWeb_url}网页添加绑定' if config.CookieWeb_enable else '')
if mode == 'role_skill': if mode == 'role_skill':
data = await aiorequests.get(url=CHARACTER_SKILL_API, data = await aiorequests.get(url=CHARACTER_SKILL_API,
@ -422,7 +422,7 @@ async def get_authkey_by_stoken(user_id: str, uid: str) -> Tuple[Optional[str],
server_id = 'cn_qd01' if uid[0] == '5' else 'cn_gf01' server_id = 'cn_qd01' if uid[0] == '5' else 'cn_gf01'
cookie_info, _ = await get_cookie(user_id, uid, True, True) cookie_info, _ = await get_cookie(user_id, uid, True, True)
if not cookie_info: if not cookie_info:
return '未绑定私人cookie，获取cookie的教程：\ndocs.qq.com/doc/DQ3JLWk1vQVllZ2Z1\n获取后，使用[ysb cookie]指令绑定' \ return '未绑定私人cookie，绑定方法二选一：\n1.通过米游社扫码绑定：\n请发送指令[原神扫码绑定]\n2.获取cookie的教程：\ndocs.qq.com/doc/DQ3JLWk1vQVllZ2Z1\n获取后，使用[ysb cookie]指令绑定' \
+ (f'或前往{config.CookieWeb_url}网页添加绑定' if config.CookieWeb_enable else ''), False, cookie_info + (f'或前往{config.CookieWeb_url}网页添加绑定' if config.CookieWeb_enable else ''), False, cookie_info
if not cookie_info.stoken: if not cookie_info.stoken:
return 'cookie中没有stoken字段，请重新绑定', False, cookie_info return 'cookie中没有stoken字段，请重新绑定', False, cookie_info