From 15ce9c91fb9b22a9526631bb508e30aa91a97f39 Mon Sep 17 00:00:00 2001 From: po-lan <42771836+po-lan@users.noreply.github.com> Date: Thu, 16 Jun 2022 14:25:22 +0800 Subject: [PATCH 1/6] Update __init__.py --- configs/utils/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/utils/__init__.py b/configs/utils/__init__.py index 611fc9f7..b134a31b 100644 --- a/configs/utils/__init__.py +++ b/configs/utils/__init__.py @@ -94,7 +94,7 @@ class ConfigsManager: del self._data[module] self.save() - def set_config(self, module: str, key: str, value: str): + def set_config(self, module: str, key: str, value: Any): """ 设置配置值 :param module: 模块名 @@ -122,7 +122,7 @@ class ConfigsManager: self._data[module][key]["help"] = help_ self.save() - def set_default_value(self, module: str, key: str, value: str): + def set_default_value(self, module: str, key: str, value: Any): """ 设置配置默认值 :param module: 模块名 From 3a43ed69192aa7b035f87fa9f0a757bd8c62c699 Mon Sep 17 00:00:00 2001 From: po-lan <42771836+po-lan@users.noreply.github.com> Date: Thu, 16 Jun 2022 14:38:41 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E9=9C=80=E8=A6=81=20?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=88=B0=20config=20=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E5=B0=91=E8=B0=83=E7=94=A8=E4=B8=80=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configs/utils/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/utils/__init__.py b/configs/utils/__init__.py index b134a31b..6bd86bba 100644 --- a/configs/utils/__init__.py +++ b/configs/utils/__init__.py @@ -94,12 +94,13 @@ class ConfigsManager: del self._data[module] self.save() - def set_config(self, module: str, key: str, value: Any): + def set_config(self, module: str, key: str, value: Any , save_simple_data: bool = False): """ 设置配置值 :param module: 模块名 :param key: 配置名称 :param value: 值 + :param save_simple_data: 同时保存至config.yaml """ if module in self._data.keys(): if ( @@ -108,7 +109,7 @@ class ConfigsManager: ): self._data[module][key]["value"] = value self._simple_data[module][key] = value - self.save() + self.save(save_simple_data = save_simple_data) def set_help(self, module: str, key: str, help_: str): """ From b11590ec3c48c14c5984c2fde33e98761f790c41 Mon Sep 17 00:00:00 2001 From: po-lan <42771836+po-lan@users.noreply.github.com> Date: Thu, 16 Jun 2022 15:38:20 +0800 Subject: [PATCH 3/6] =?UTF-8?q?ban=E6=8E=89=E8=A2=AB=E5=87=BB=E6=AF=99?= =?UTF-8?q?=E7=9A=84=E4=BA=BA=E4=B8=80=E6=AE=B5=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/russian/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/russian/__init__.py b/plugins/russian/__init__.py index c10ea1e6..c6fd50f2 100755 --- a/plugins/russian/__init__.py +++ b/plugins/russian/__init__.py @@ -6,6 +6,7 @@ from nonebot.params import CommandArg, Command, ArgStr from models.group_member_info import GroupInfoUser from utils.message_builder import at, image from .model import RussianUser +from models.ban_user import BanUser from models.bag_user import BagUser from services.log import logger from .data_source import rank @@ -442,6 +443,8 @@ async def end_game(bot: Bot, event: GroupMessageEvent): await BagUser.spend_gold(lose_user_id, event.group_id, money) win_user = await RussianUser.ensure(win_user_id, event.group_id) lose_user = await RussianUser.ensure(lose_user_id, event.group_id) + #ban掉被击毙的人一段时间 + BanUser.ban(lose_user_id,2,1800) bullet_str = "" for x in rs_player[event.group_id]["bullet"]: bullet_str += "__ " if x == 0 else "| " From 63e6ca3e99509f64b6a60e3c217a48a2198de528 Mon Sep 17 00:00:00 2001 From: po-lan <42771836+po-lan@users.noreply.github.com> Date: Thu, 16 Jun 2022 15:40:46 +0800 Subject: [PATCH 4/6] Update __init__.py --- plugins/russian/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/russian/__init__.py b/plugins/russian/__init__.py index c6fd50f2..e4ebe05c 100755 --- a/plugins/russian/__init__.py +++ b/plugins/russian/__init__.py @@ -32,7 +32,7 @@ usage： 示例：装弹 3 100 @sdd * 注：同一时间群内只能有一场对决 * """.strip() -__plugin_des__ = "虽然是运气游戏，但这可是战场啊少年" +__plugin_des__ = "虽然是运气游戏，但这可是战场啊少年\n败者会被{NICKNAME}ban掉一会" __plugin_cmd__ = [ "装弹 [子弹数] ?[金额=200] ?[at]", "接受对决", From 5d97e3f95f9e564cac5cbfc2936f3f3301fbd657 Mon Sep 17 00:00:00 2001 From: po-lan <42771836+po-lan@users.noreply.github.com> Date: Thu, 16 Jun 2022 16:15:39 +0800 Subject: [PATCH 5/6] Update __init__.py --- plugins/russian/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/russian/__init__.py b/plugins/russian/__init__.py index e4ebe05c..7d751a4d 100755 --- a/plugins/russian/__init__.py +++ b/plugins/russian/__init__.py @@ -444,7 +444,7 @@ async def end_game(bot: Bot, event: GroupMessageEvent): win_user = await RussianUser.ensure(win_user_id, event.group_id) lose_user = await RussianUser.ensure(lose_user_id, event.group_id) #ban掉被击毙的人一段时间 - BanUser.ban(lose_user_id,2,1800) + await BanUser.ban(lose_user_id,2,1800) bullet_str = "" for x in rs_player[event.group_id]["bullet"]: bullet_str += "__ " if x == 0 else "| " From dd7280cd0d4c5bc924fb26677722c310f7b9a0d0 Mon Sep 17 00:00:00 2001 From: po-lan <42771836+po-lan@users.noreply.github.com> Date: Sat, 18 Jun 2022 14:08:59 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=81=A2=E5=A4=8D=20=E5=8E=9F=E5=85=88?= =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/russian/__init__.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/plugins/russian/__init__.py b/plugins/russian/__init__.py index 7d751a4d..c10ea1e6 100755 --- a/plugins/russian/__init__.py +++ b/plugins/russian/__init__.py @@ -6,7 +6,6 @@ from nonebot.params import CommandArg, Command, ArgStr from models.group_member_info import GroupInfoUser from utils.message_builder import at, image from .model import RussianUser -from models.ban_user import BanUser from models.bag_user import BagUser from services.log import logger from .data_source import rank @@ -32,7 +31,7 @@ usage： 示例：装弹 3 100 @sdd * 注：同一时间群内只能有一场对决 * """.strip() -__plugin_des__ = "虽然是运气游戏，但这可是战场啊少年\n败者会被{NICKNAME}ban掉一会" +__plugin_des__ = "虽然是运气游戏，但这可是战场啊少年" __plugin_cmd__ = [ "装弹 [子弹数] ?[金额=200] ?[at]", "接受对决", @@ -443,8 +442,6 @@ async def end_game(bot: Bot, event: GroupMessageEvent): await BagUser.spend_gold(lose_user_id, event.group_id, money) win_user = await RussianUser.ensure(win_user_id, event.group_id) lose_user = await RussianUser.ensure(lose_user_id, event.group_id) - #ban掉被击毙的人一段时间 - await BanUser.ban(lose_user_id,2,1800) bullet_str = "" for x in rs_player[event.group_id]["bullet"]: bullet_str += "__ " if x == 0 else "| "