update v0.0.9.0

basic_plugins/shop/shop_handle/__init__.py

@@ -3,7 +3,7 @@ from nonebot.adapters.cqhttp import Bot, GroupMessageEvent, MessageEvent
 from nonebot.typing import T_State
 from configs.path_config import IMAGE_PATH
 from utils.message_builder import image
-from .data_source import create_shop_help, delete_goods, update_goods, registered_goods, parse_goods_info
+from .data_source import create_shop_help, delete_goods, update_goods, register_goods, parse_goods_info
 from nonebot.permission import SUPERUSER
 from utils.utils import get_message_text, is_number
 from nonebot.plugin import export
@@ -53,7 +53,7 @@ __plugin_block_limit__ = {
 
 # 导出方法供其他插件使用
 export = export()
-export.registered_goods = registered_goods
+export.register_goods = register_goods
 export.delete_goods = delete_goods
 export.update_goods = update_goods
 
@@ -80,7 +80,7 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
             await shop_add_goods.finish(data)
         if not data.get("name") or not data.get("price") or not data.get("des"):
             await shop_add_goods.finish("name:price:des 参数不可缺少！")
-        if await registered_goods(**data):
+        if await register_goods(**data):
             await shop_add_goods.send(f"添加商品 {data['name']} 成功！\n"
                                       f"名称：{data['name']}\n"
                                       f"价格：{data['price']}金币\n"

basic_plugins/shop/shop_handle/data_source.py

@@ -20,36 +20,24 @@ async def init_default_shop_goods():
     """
     导入内置的三个商品
     """
-
-    async def sign_card_1(**kwargs):
+    async def sign_card(**kwargs):
         user_id = kwargs['user_id']
         group_id = kwargs['group_id']
+        prob = kwargs["prob"]
         user = await SignGroupUser.ensure(user_id, group_id)
-        await user.update(add_probability=0.1).apply()
-
-    async def sign_card_2(**kwargs):
-        user_id = kwargs['user_id']
-        group_id = kwargs['group_id']
-        user = await SignGroupUser.ensure(user_id, group_id)
-        await user.update(add_probability=0.2).apply()
-
-    async def sign_card_3(**kwargs):
-        user_id = kwargs['user_id']
-        group_id = kwargs['group_id']
-        user = await SignGroupUser.ensure(user_id, group_id)
-        await user.update(add_probability=0.3).apply()
+        await user.update(add_probability=prob).apply()
 
     if Config.get_config("shop", "IMPORT_DEFAULT_SHOP_GOODS"):
-        await registered_goods(
+        await register_goods(
             "好感度双倍加持卡Ⅰ", 30, "下次签到双倍好感度概率 + 10%（谁才是真命天子？）（同类商品将覆盖）"
         )
-        use.registered_use("好感度双倍加持卡Ⅰ", sign_card_1)
-        await registered_goods("好感度双倍加持卡Ⅱ", 150, "下次签到双倍好感度概率 + 20%（平平庸庸）（同类商品将覆盖）")
-        use.registered_use("好感度双倍加持卡Ⅱ", sign_card_2)
-        await registered_goods(
+        use.register_use("好感度双倍加持卡Ⅰ", sign_card, **{"prob": 0.1})
+        await register_goods("好感度双倍加持卡Ⅱ", 150, "下次签到双倍好感度概率 + 20%（平平庸庸）（同类商品将覆盖）")
+        use.register_use("好感度双倍加持卡Ⅱ", sign_card, **{"prob": 0.2})
+        await register_goods(
             "好感度双倍加持卡Ⅲ", 250, "下次签到双倍好感度概率 + 30%（金币才是真命天子！）（同类商品将覆盖）"
         )
-        use.registered_use("好感度双倍加持卡Ⅲ", sign_card_3)
+        use.register_use("好感度双倍加持卡Ⅲ", sign_card, **{"prob": 0.3})
 
 
 # 创建商店界面
@@ -136,7 +124,7 @@ async def create_shop_help() -> str:
     return shop.pic2bs4()
 
 
-async def registered_goods(
+async def register_goods(
         name: str,
         price: int,
         des: str,