update v0.0.9.0

basic_plugins/shop/use/__init__.py

@@ -7,7 +7,7 @@ from models.bag_user import BagUser
 from nonebot.adapters.cqhttp.permission import GROUP
 from services.db_context import db
 from nonebot.plugin import export
-from .data_source import effect, registered_use
+from .data_source import effect, register_use, func_manager
 
 
 __zx_plugin_name__ = "商店 - 使用道具"
@@ -15,7 +15,7 @@ __plugin_usage__ = """
 usage：
     普通的使用道具
     指令：
-        使用道具 [序号或道具名称]
+        使用道具 [序号或道具名称] ?[数量]=1
     * 序号以 ”我的道具“ 为准 *
 """.strip()
 __plugin_des__ = "商店 - 使用道具"
@@ -32,7 +32,7 @@ __plugin_settings__ = {
 
 # 导出方法供其他插件使用
 export = export()
-export.registered_use = registered_use
+export.register_use = register_use
 
 use_props = on_command("使用道具", priority=5, block=True, permission=GROUP)
 
@@ -42,35 +42,40 @@ async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
     msg = get_message_text(event.json())
     if msg in ["", "帮助"]:
         await use_props.finish(__plugin_usage__)
-    props = await BagUser.get_props(event.user_id, event.group_id)
-    if props:
+    num = 1
+    msg_sp = msg.split()
+    if len(msg_sp) > 1 and is_number(msg_sp[-1]) and int(msg_sp[-1]) > 0:
+        num = int(msg.split()[-1])
+        msg = " ".join(msg.split()[:-1])
+    property_ = await BagUser.get_property(event.user_id, event.group_id)
+    if property_:
         async with db.transaction():
-            pname_list = []
-            props = props[:-1].split(",")
-            for p in props:
-                if p != "":
-                    if p not in pname_list:
-                        pname_list.append(p)
             if is_number(msg):
-                if 0 < int(msg) <= len(pname_list):
-                    name = pname_list[int(msg) - 1]
+                if 0 < int(msg) <= len(property_):
+                    name = list(property_.keys())[int(msg) - 1]
                 else:
                     await use_props.finish("仔细看看自己的道具仓库有没有这个道具？", at_sender=True)
             else:
-                if msg not in pname_list:
+                if msg not in property_.keys():
                     await use_props.finish("道具名称错误！", at_sender=True)
                 name = msg
-            if await BagUser.del_props(
-                event.user_id, event.group_id, name
-            ) and await effect(event.user_id, event.group_id, name):
-                await use_props.send(f"使用道具 {name} 成功！", at_sender=True)
+            _user_prop_count = property_[name]
+            if num > _user_prop_count:
+                await use_props.finish(f"道具数量不足，无法使用{num}次！")
+            if num > (n := func_manager.get_max_num_limit(name)):
+                await use_props.finish(f"该道具单次只能使用 {n} 个！")
+            if await BagUser.delete_property(
+                event.user_id, event.group_id, name, num
+            ) and await effect(bot, event, name, num):
+                if func_manager.check_send_success_message(name):
+                    await use_props.send(f"使用道具 {name} {num} 次成功！", at_sender=True)
                 logger.info(
-                    f"USER {event.user_id} GROUP {event.group_id} 使用道具 {name} 成功"
+                    f"USER {event.user_id} GROUP {event.group_id} 使用道具 {name} {num} 次成功"
                 )
             else:
-                await use_props.send(f"使用道具 {name} 失败！", at_sender=True)
+                await use_props.send(f"使用道具 {name} {num} 次失败！", at_sender=True)
                 logger.info(
-                    f"USER {event.user_id} GROUP {event.group_id} 使用道具 {name} 失败"
+                    f"USER {event.user_id} GROUP {event.group_id} 使用道具 {name} {num} 次失败"
                 )
     else:
-        await use_props.send("您的背包里没有任何的道具噢~", at_sender=True)
+        await use_props.send("您的背包里没有任何的道具噢", at_sender=True)

basic_plugins/shop/use/data_source.py

@@ -1,45 +1,119 @@
-import asyncio
+from nonebot.adapters.cqhttp import GroupMessageEvent
 from services.log import logger
-
-_use_func_data = {}
+from nonebot.adapters.cqhttp import Bot
+import asyncio
 
 
-async def effect(user_id: int, group_id: int, goods_name: str) -> bool:
+class GoodsUseFuncManager:
+    def __init__(self):
+        self._data = {}
+
+    def register_use(self, goods_name: str, **kwargs):
+        """
+        注册商品使用方法
+        :param goods_name: 商品名称
+        :param kwargs: kwargs
+        """
+        self._data[goods_name] = kwargs
+
+    def exists(self, goods_name: str) -> bool:
+        """
+        判断商品使用方法是否被注册
+        :param goods_name: 商品名称
+        """
+        return bool(self._data.get(goods_name))
+
+    def get_max_num_limit(self, goods_name: str) -> int:
+        """
+        获取单次商品使用数量
+        :param goods_name: 商品名称
+        """
+        if self.exists(goods_name):
+            return self._data[goods_name]["kwargs"]["_max_num_limit"]
+        return 1
+
+    async def use(self, **kwargs):
+        """
+        使用道具
+        :param kwargs: kwargs
+        """
+        goods_name = kwargs.get("goods_name")
+        if self.exists(goods_name):
+            if asyncio.iscoroutinefunction(self._data[goods_name]["func"]):
+                await self._data[goods_name]["func"](
+                    **kwargs,
+                )
+            else:
+                self._data[goods_name]["func"](
+                    **kwargs,
+                )
+
+    def check_send_success_message(self, goods_name: str) -> bool:
+        """
+        检查是否发送使用成功信息
+        :param goods_name: 商品名称
+        """
+        if self.exists(goods_name):
+            return bool(self._data[goods_name]["kwargs"]["send_success_msg"])
+        return False
+
+    def get_kwargs(self, goods_name: str) -> dict:
+        """
+        获取商品使用方法的kwargs
+        :param goods_name: 商品名称
+        """
+        if self.exists(goods_name):
+            return self._data[goods_name]["kwargs"]
+        return {}
+
+
+func_manager = GoodsUseFuncManager()
+
+
+async def effect(bot: Bot, event: GroupMessageEvent, goods_name: str, num: int) -> bool:
     """
     商品生效
-    :param user_id: 用户id
-    :param group_id: 群号
+    :param bot: Bot
+    :param event: GroupMessageEvent
     :param goods_name: 商品名称
+    :param num: 使用数量
     :return: 使用是否成功
     """
     # 优先使用注册的商品插件
     try:
-        if _use_func_data.get(goods_name):
-            _kwargs = _use_func_data[goods_name]["kwargs"]
-            _kwargs["goods_name"] = goods_name
-            _kwargs["user_id"] = user_id
-            _kwargs["group_id"] = group_id
-            if asyncio.iscoroutinefunction(_use_func_data[goods_name]["func"]):
-                await _use_func_data[goods_name]["func"](
+        if func_manager.exists(goods_name):
+            _kwargs = func_manager.get_kwargs(goods_name)
+            await func_manager.use(
+                **{
                     **_kwargs,
-                )
-            else:
-                _use_func_data[goods_name]["func"](
-                    **_kwargs,
-                )
+                    "_bot": bot,
+                    "event": event,
+                    "group_id": event.group_id,
+                    "user_id": event.user_id,
+                    "num": num,
+                    "goods_name": goods_name,
+                }
+            )
         return True
     except Exception as e:
         logger.error(f"use 商品生效函数effect 发生错误 {type(e)}：{e}")
     return False
 
 
-def registered_use(goods_name: str, func, **kwargs):
+def register_use(goods_name: str, func, **kwargs):
     """
     注册商品使用方法
     :param goods_name: 商品名称
     :param func: 使用函数
     :param kwargs: kwargs
     """
-    if goods_name in _use_func_data.keys():
+    if func_manager.exists(goods_name):
         raise ValueError("该商品使用函数已被注册！")
-    _use_func_data[goods_name] = {"func": func, "kwargs": kwargs}
+    # 发送使用成功信息
+    if kwargs.get("send_success_msg") is None:
+        kwargs["send_success_msg"] = True
+    kwargs["_max_num_limit"] = (
+        kwargs.get("_max_num_limit") if kwargs.get("_max_num_limit") else 1
+    )
+    func_manager.register_use(goods_name, **{"func": func, "kwargs": kwargs})
+    logger.info(f"register_use 成功注册商品：{goods_name} 的使用函数")