diff --git a/Paimon_Gacha_Log/__init__.py b/Paimon_Gacha_Log/__init__.py index ee31c62..7334e2e 100644 --- a/Paimon_Gacha_Log/__init__.py +++ b/Paimon_Gacha_Log/__init__.py @@ -108,7 +108,7 @@ async def update_ckjl(event: MessageEvent, msg: Message = CommandArg()): if apiRes != 'OK': await gacha_log_update.finish(apiRes, at_sender=True) await gacha_log_update.send('抽卡记录开始获取,请给派蒙一点时间...') - await get_data(url) + uid = await get_data(url) local_data = data_path / f'gachaData-{uid}.json' gacha_data = load_json(local_data) diff --git a/Paimon_Gacha_Log/gacha_logs.py b/Paimon_Gacha_Log/gacha_logs.py index 1bfeee2..2ca4ac8 100644 --- a/Paimon_Gacha_Log/gacha_logs.py +++ b/Paimon_Gacha_Log/gacha_logs.py @@ -1,4 +1,3 @@ -import json from pathlib import Path from asyncio import sleep @@ -89,3 +88,4 @@ async def get_data(url): save_json(UIGF_data, data_path / f"UIGF_gachaData-{uid}.json") # 写入xlsx writeXLSX(uid, mergeData['gachaLog'], gachaQueryTypeIds) + return uid diff --git a/Paimon_Info/__init__.py b/Paimon_Info/__init__.py index 183b35b..e1eeb13 100644 --- a/Paimon_Info/__init__.py +++ b/Paimon_Info/__init__.py @@ -411,7 +411,7 @@ async def _(event: MessageEvent, state: T_State): await ysc.finish(total_result) -cookie_error_msg = '这个cookie无效哦,请旅行者确认是否正确\n1.ck要登录mys帐号后获取,且不能退出登录\n\n获取cookie的教程:\ndocs.qq.com/doc/DQ3JLWk1vQVllZ2Z1\n' +cookie_error_msg = '这个cookie无效哦,请旅行者确认是否正确\n获取cookie的教程:\ndocs.qq.com/doc/DQ3JLWk1vQVllZ2Z1\n' @ysb.handle() @@ -444,6 +444,7 @@ async def ysb_handler(event: MessageEvent, msg: Message = CommandArg()): msg += '\n当前是在群聊里绑定,建议旅行者把cookie撤回哦!' await ysb.finish(MsgBd.Text(msg), at_sender=True) + @ysbjc.handle() @exception_handler() async def ysbjc_handler(event: MessageEvent, msg: Message = CommandArg()): diff --git a/README.md b/README.md index e62d7a0..63e5989 100644 --- a/README.md +++ b/README.md @@ -76,6 +76,9 @@ - 修改请求enka用的`User-Agent` - 修复`ysd`中优菈的`菈`不能显示的问题 - 补充WIKI的`help` ++ 8.4 + - 补充`斫峰之刃`抽卡资源 + - 修复`获取抽卡记录`可能出现的bug ## 丨功能列表 diff --git a/UPDATE_LOG.md b/UPDATE_LOG.md index 751472c..d3a363a 100644 --- a/UPDATE_LOG.md +++ b/UPDATE_LOG.md @@ -100,4 +100,7 @@ - 新增`ysbjc`查看自己绑定的私人ck [#153](https://github.com/CMHopeSunshine/LittlePaimon/pull/153) - 修改请求enka用的`User-Agent` - 修复`ysd`中优菈的`菈`不能显示的问题 - - 补充WIKI的`help` \ No newline at end of file + - 补充WIKI的`help` ++ 8.4 + - 补充`斫峰之刃`抽卡资源 + - 修复`获取抽卡记录`可能出现的bug \ No newline at end of file diff --git a/resource_list.json b/resource_list.json index b4dd35e..d602169 100644 --- a/resource_list.json +++ b/resource_list.json @@ -1296,7 +1296,7 @@ }, { "path": "LittlePaimon/gacha_res/type.json", - "hash": "95ec53c3f3ae22b20216fc2683686ce1", + "hash": "d715b36bd5754f2e5473a794f9f1e999", "lock": true }, { @@ -4633,5 +4633,10 @@ "path": "LittlePaimon/优设标题黑.ttf", "hash": "f78122875a8fe70ab9b577cfb80c685b", "lock": true + }, + { + "path": "LittlePaimon/gacha_res/武器/斫峰之刃.png", + "hash": "c85e4a37f277f828e60a520d6adf7150", + "lock": true } ] \ No newline at end of file