From b9e08a6ad43a29197c0685a6063bb0eb6c2509fa Mon Sep 17 00:00:00 2001 From: HibiKier <775757368@qq.com> Date: Sat, 5 Apr 2025 23:16:38 +0800 Subject: [PATCH] =?UTF-8?q?:ambulance:=20=E4=BF=AE=E5=A4=8Dpydantic2?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E7=9A=84=E5=95=86=E5=BA=97=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E6=9E=84=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zhenxun/builtin_plugins/shop/_data_source.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/zhenxun/builtin_plugins/shop/_data_source.py b/zhenxun/builtin_plugins/shop/_data_source.py index 2160238d..0fdd4e53 100644 --- a/zhenxun/builtin_plugins/shop/_data_source.py +++ b/zhenxun/builtin_plugins/shop/_data_source.py @@ -4,7 +4,7 @@ from datetime import datetime, timedelta import inspect import time from types import MappingProxyType -from typing import Any, ClassVar, Literal +from typing import Any, Literal from nonebot.adapters import Bot, Event from nonebot.compat import model_dump @@ -65,15 +65,15 @@ class ShopParam(BaseModel): """道具单次使用数量""" text: str """text""" - send_success_msg: ClassVar[bool] = True + send_success_msg: bool = True """是否发送使用成功信息""" - max_num_limit: ClassVar[int] = 1 + max_num_limit: int = 1 """单次使用最大次数""" session: Uninfo | None = None """Uninfo""" message: UniMsg """UniMessage""" - extra_data: ClassVar[dict[str, Any]] = {} + extra_data: dict[str, Any] = Field(default_factory=dict) """额外数据""" class Config: @@ -384,10 +384,10 @@ class ShopManage: cls.uuid2goods[uuid] = Goods( model=create_model( f"{uuid}_model", - send_success_msg=send_success_msg, - max_num_limit=max_num_limit, __base__=ShopParam, - extra_data=kwargs, + send_success_msg=(bool, Field(default=send_success_msg)), + max_num_limit=(int, Field(default=max_num_limit)), + extra_data=(dict[str, Any], Field(default=kwargs)), ), params=kwargs, before_handle=before_handle,