From 930ff5b09da454e98e87ba72bf51bf7973f572d5 Mon Sep 17 00:00:00 2001 From: HibiKier <775757368@qq.com> Date: Wed, 31 Jul 2024 17:08:33 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20:=20=E4=BF=AE=E5=A4=8D=E5=BC=80?= =?UTF-8?q?=E7=AE=B1=E5=8A=9F=E8=83=BD=E4=B8=AD=E7=9A=84=E6=AD=A3=E5=88=99?= =?UTF-8?q?=E8=A1=A8=E8=BE=BE=E5=BC=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zhenxun/plugins/open_cases/__init__.py | 22 ---------------------- zhenxun/plugins/open_cases/command.py | 2 +- zhenxun/plugins/open_cases/open_cases_c.py | 2 +- 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/zhenxun/plugins/open_cases/__init__.py b/zhenxun/plugins/open_cases/__init__.py index e4ee738a..bac0bcc2 100644 --- a/zhenxun/plugins/open_cases/__init__.py +++ b/zhenxun/plugins/open_cases/__init__.py @@ -112,28 +112,6 @@ __plugin_meta__ = PluginMetadata( ) -# cases_matcher_group = MatcherGroup(priority=5, permission=GROUP, block=True) - - -# k_open_case = cases_matcher_group.on_command("开箱") -# reload_count = cases_matcher_group.on_command("重置开箱", permission=SUPERUSER) -# total_case_data = cases_matcher_group.on_command( -# "我的开箱", aliases={"开箱统计", "开箱查询", "查询开箱"} -# ) -# group_open_case_statistics = cases_matcher_group.on_command("群开箱统计") -# open_multiple = cases_matcher_group.on_regex("(.*)连开箱(.*)?") -# update_case = on_command( -# "更新武器箱", aliases={"更新皮肤"}, priority=1, permission=SUPERUSER, block=True -# ) -# update_case_image = on_command( -# "更新武器箱图片", priority=1, permission=SUPERUSER, block=True -# ) -# show_case = on_command("查看武器箱", priority=5, block=True) -# my_knifes = on_command("我的金色", priority=1, permission=GROUP, block=True) -# show_skin = on_command("查看皮肤", priority=5, block=True) -# price_trends = on_command("价格趋势", priority=5, block=True) - - @_price_matcher.handle() async def _( session: EventSession, diff --git a/zhenxun/plugins/open_cases/command.py b/zhenxun/plugins/open_cases/command.py index a2f85c38..ea86c2fc 100644 --- a/zhenxun/plugins/open_cases/command.py +++ b/zhenxun/plugins/open_cases/command.py @@ -31,7 +31,7 @@ _multiple_matcher = on_alconna( ) _multiple_matcher.shortcut( - r"(?P\d)连开箱(?P.*?)", + r"(?P\d+)连开箱(?P.*?)", command="multiple-open", arguments=["{num}", "{name}"], prefix=True, diff --git a/zhenxun/plugins/open_cases/open_cases_c.py b/zhenxun/plugins/open_cases/open_cases_c.py index 8cdd5b32..74f642aa 100644 --- a/zhenxun/plugins/open_cases/open_cases_c.py +++ b/zhenxun/plugins/open_cases/open_cases_c.py @@ -319,7 +319,7 @@ async def open_multiple_case( Text(f"开启{case_name}武器箱\n剩余开箱次数:{over_count}\n"), Image(mark_image.pic2bytes()), Text( - f"\nresult[:-1]\n箱子单价:{case_price}\n总获取金额:{total_price:.2f}\n总花费:{(17 + case_price) * num:.2f}" + f"\n{result[:-1]}\n箱子单价:{case_price}\n总获取金额:{total_price:.2f}\n总花费:{(17 + case_price) * num:.2f}" ), ] )