fix bug

utils/decorator/limit.py

@@ -0,0 +1,6 @@
+
+
+
+
+
+

utils/decorator/shop.py

@@ -17,13 +17,15 @@ class ShopRegister(dict):
         name: Tuple[str, ...],
         price: Tuple[float, ...],
         des: Tuple[str, ...],
+        discount: Tuple[float, ...],
+        limit_time: Tuple[int, ...],
         load_status: Tuple[bool, ...],
         **kwargs,
     ):
         def add_register_item(func: Callable):
             if name in self._data.keys():
                 raise ValueError("该商品已注册，请替换其他名称！")
-            for n, p, d, s in zip(name, price, des, load_status):
+            for n, p, d, dd, l, s in zip(name, price, des, discount, limit_time, load_status):
                 if s:
                     _temp_kwargs = {}
                     for key, value in kwargs.items():
@@ -32,6 +34,8 @@ class ShopRegister(dict):
                     self._data[n] = {
                         "price": p,
                         "des": d,
+                        "discount": dd,
+                        "limit_time": l,
                         "func": func,
                         "kwargs": _temp_kwargs,
                     }
@@ -46,7 +50,7 @@ class ShopRegister(dict):
             self._flag = False
             for name in self._data.keys():
                 await shop.register_goods(
-                    name, self._data[name]["price"], self._data[name]["des"]
+                    name, self._data[name]["price"], self._data[name]["des"], self._data[name]["discount"], self._data[name]["limit_time"]
                 )
                 use.register_use(
                     name, self._data[name]["func"], **self._data[name]["kwargs"]
@@ -57,24 +61,36 @@ class ShopRegister(dict):
         name: Union[str, Tuple[str, ...]],
         price: Union[float, Tuple[float, ...]],
         des: Union[str, Tuple[str, ...]],
+        discount: Union[float, Tuple[float, ...]] = 1,
+        limit_time: Union[int, Tuple[int, ...]] = 0,
         load_status: Union[bool, Tuple[bool, ...]] = True,
         **kwargs,
     ):
         _tuple_list = []
         _current_len = -1
-        for x in [name, price, des, load_status]:
+        for x in [name, price, des, discount, limit_time, load_status]:
             if isinstance(x, tuple):
                 if _current_len == -1:
                     _current_len = len(x)
                 if _current_len != len(x):
-                    raise ValueError(f"注册商品 {name} 中 name，price，des，load_status 数量不符！")
+                    raise ValueError(f"注册商品 {name} 中 name，price，des，discount，limit_time，load_status 数量不符！")
         _current_len = _current_len if _current_len > -1 else 1
-        _name = name if isinstance(name, tuple) else tuple(name)
+        _name = name if isinstance(name, tuple) else (name,)
         _price = (
             price
             if isinstance(price, tuple)
             else tuple([price for _ in range(_current_len)])
         )
+        _discount = (
+            discount
+            if isinstance(discount, tuple)
+            else tuple([discount for _ in range(_current_len)])
+        )
+        _limit_time = (
+            limit_time
+            if isinstance(limit_time, tuple)
+            else tuple([limit_time for _ in range(_current_len)])
+        )
         _des = (
             des if isinstance(des, tuple) else tuple([des for _ in range(_current_len)])
         )
@@ -83,7 +99,7 @@ class ShopRegister(dict):
             if isinstance(load_status, tuple)
             else tuple([load_status for _ in range(_current_len)])
         )
-        return self.register(_name, _price, _des, _load_status, **kwargs)
+        return self.register(_name, _price, _des, _discount, _limit_time, _load_status, **kwargs)
 
     def __setitem__(self, key, value):
         self._data[key] = value