lyb-pixi-js 1.12.14 → 1.12.16

package/Components/Custom/LibPixiScrollContainerY.d.ts

@@ -7,6 +7,8 @@ export interface LibPixiScrollContainerYParams {
     height: number;
     /** 滚动内容 */
     scrollContent: Container;
+    /** 顶部边距 */
+    topMargin?: number;
     /** 底部边距 */
     bottomMargin?: number;
     /** 背景色，用于定位 */
@@ -61,6 +63,8 @@ export declare class LibPixiScrollContainerY extends LibPixiContainer {
     /** 滚动触发 */
     private _onScroll?;
     constructor(params: LibPixiScrollContainerYParams);
+    /** @description 添加边距 */
+    addMargin(topMargin: number, bottomMargin: number): void;
     /** @description 设置滚动容器可视区宽高
      * @param width 宽度
      * @param height 高度

package/Components/Custom/LibPixiScrollContainerY.js

@@ -8,7 +8,7 @@ import { LibPixiRectangle } from "../Base/LibPixiRectangle";
  */
 export class LibPixiScrollContainerY extends LibPixiContainer {
     constructor(params) {
-        const { width, height, scrollbar = false, scrollContent, scrollbarRgiht = 0, scrollbarWidth = 10, scrollbarColor = "#ffffff", onScroll, bgColor, bottomMargin = 0, } = params;
+        const { width, height, scrollbar = false, scrollContent, scrollbarRgiht = 0, scrollbarWidth = 10, scrollbarColor = "#ffffff", onScroll, bgColor, } = params;
         super(width, height, bgColor);
         /** 开始位置 */
         this._startY = 0;
@@ -36,10 +36,6 @@ export class LibPixiScrollContainerY extends LibPixiContainer {
         this._content = new Container();
         this.addChild(this._content);
         this._content.addChild(this._scrollContent);
-        //创建底部边距
-        const bottomMarginBox = new Sprite();
-        this._content.addChild(bottomMarginBox);
-        bottomMarginBox.height = this._content.height + bottomMargin;
         // 创建遮罩
         this._maskGraphics = new LibPixiRectangle(width, height, "#000");
         this.addChild(this._maskGraphics);
@@ -88,6 +84,21 @@ export class LibPixiScrollContainerY extends LibPixiContainer {
             this._onDragEnd();
         });
     }
+    /** @description 添加边距 */
+    addMargin(topMargin, bottomMargin) {
+        if (topMargin) {
+            const topMarginBox = new Sprite();
+            this._content.addChild(topMarginBox);
+            topMarginBox.height = topMargin;
+            this._scrollContent.y += topMargin;
+        }
+        if (bottomMargin) {
+            const bottomMarginBox = new Sprite();
+            this._content.addChild(bottomMarginBox);
+            bottomMarginBox.height = bottomMargin;
+            bottomMarginBox.y = topMargin + this._scrollContent.height;
+        }
+    }
     /** @description 设置滚动容器可视区宽高
      * @param width 宽度
      * @param height 高度

package/Utils/LibPixiDialogManager/ui/LibPixiDialog.d.ts

@@ -25,13 +25,13 @@ export declare class LibPixiDialog extends LibPixiBaseContainer {
     private _size;
     /** 竖版初始大小 */
     private _initialSize;
-    /** 窗口变化 */
-    private _resize?;
     /** 停止监听窗口 */
     private _offResize?;
     constructor(params?: Params);
     /** @description 设置弹窗内容 */
     setDialogContent(content: Container): void;
+    /** @description 重绘弹窗 */
+    redraw(w: number, h: number): void;
     /** @description 关闭 */
     close(): Promise<void>;
 }

package/Utils/LibPixiDialogManager/ui/LibPixiDialog.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { Container } from "pixi.js";
 import gsap from "gsap";
 import { LibJsResizeWatcher } from "lyb-js/Base/LibJsResizeWatcher.js";
-import { LibPixiRectBgColor } from "../../../Components/Base/LibPixiRectBgColor";
+import { LibPixiRectangle } from "../../../Components/Base/LibPixiRectangle";
 import { libPixiEvent } from "../../LibPixiEvent";
 import { LibPixiBaseContainer } from "./LibPixiBaseContainer";
 /** @description 弹窗组件 */
@@ -22,11 +22,7 @@ export class LibPixiDialog extends LibPixiBaseContainer {
         const { size = 1, onClickMask, needBg = true } = params || {};
         this._initialSize = size;
         //蒙版
-        this._maskUI = new LibPixiRectBgColor({
-            width: 2700,
-            height: 1080,
-            bgColor: "#000",
-        });
+        this._maskUI = new LibPixiRectangle(2700, 1080, "#000");
         this.addChild(this._maskUI);
         this._maskUI.alpha = 0;
         this._maskUI.eventMode = "static";
@@ -44,10 +40,11 @@ export class LibPixiDialog extends LibPixiBaseContainer {
         this._dialogContainer = new Container();
         this.addChild(this._dialogContainer);
         this._dialogContainer.eventMode = "static";
+        const resize = new LibJsResizeWatcher(LibPixiDialog.adaptation);
+        this._offResize = resize.on(this.redraw.bind(this));
     }
     /** @description 设置弹窗内容 */
     setDialogContent(content) {
-        var _a, _b;
         this._dialogContainer.addChild(content);
         const w = this._dialogContainer.width / 2;
         const h = this._dialogContainer.height / 2;
@@ -62,36 +59,36 @@ export class LibPixiDialog extends LibPixiBaseContainer {
             duration: LibPixiDialog.durationIn,
             alpha: 1,
         });
-        //部分场景需要重复调用此方法来重新更新布局重新监听尺寸变化，所以需要判断一下
-        (_a = this._resize) !== null && _a !== void 0 ? _a : (this._resize = new LibJsResizeWatcher(LibPixiDialog.adaptation));
-        (_b = this._offResize) === null || _b === void 0 ? void 0 : _b.call(this);
-        this._offResize = this._resize.on((w, h) => {
-            const halfW = 1920 / 2;
-            const halfH = 1080 / 2;
-            if (w > h) {
-                this._maskUI.renderBg(2700, 1080);
-                this._maskUI.x = -(2700 - 1920) / 2;
-                this._dialogContainer.position.set(halfW, halfH);
-                this._size = 1;
-                if (this._dialogContainer.scale.x === this._initialSize) {
-                    this._dialogContainer.scale.set(1);
-                }
+    }
+    /** @description 重绘弹窗 */
+    redraw(w, h) {
+        const halfW = 1920 / 2;
+        const halfH = 1080 / 2;
+        if (w > h) {
+            this._maskUI.width = 2700;
+            this._maskUI.height = 1080;
+            this._maskUI.x = -(2700 - 1920) / 2;
+            this._dialogContainer.position.set(halfW, halfH);
+            this._size = 1;
+            if (this._dialogContainer.scale.x === this._initialSize) {
+                this._dialogContainer.scale.set(1);
             }
-            else {
-                this._maskUI.renderBg(1080, 2700);
-                this._maskUI.x = 0;
-                this._dialogContainer.position.set(halfH, halfW);
-                this._size = this._initialSize;
-                if (this._dialogContainer.scale.x === 1) {
-                    this._dialogContainer.scale.set(this._initialSize);
-                }
+        }
+        else {
+            this._maskUI.width = 1080;
+            this._maskUI.height = 2700;
+            this._maskUI.x = 0;
+            this._dialogContainer.position.set(halfH, halfW);
+            this._size = this._initialSize;
+            if (this._dialogContainer.scale.x === 1) {
+                this._dialogContainer.scale.set(this._initialSize);
             }
-            gsap.to(this._dialogContainer.scale, {
-                duration: LibPixiDialog.durationIn,
-                ease: "back.out",
-                x: this._size,
-                y: this._size,
-            });
+        }
+        gsap.to(this._dialogContainer.scale, {
+            duration: LibPixiDialog.durationIn,
+            ease: "back.out",
+            x: this._size,
+            y: this._size,
         });
     }
     /** @description 关闭 */

package/lyb-pixi.js

@@ -1315,7 +1315,7 @@
       var ys = arrObjKeys(obj, inspect2);
       var isPlainObject = gPO ? gPO(obj) === Object.prototype : obj instanceof Object || obj.constructor === Object;
       var protoTag = obj instanceof Object ? "" : "null prototype";
-      var stringTag = !isPlainObject && toStringTag && Object(obj) === obj && toStringTag in obj ? $slice.call(toStr(obj), 8, -1) : protoTag ? "Object" : "";
+      var stringTag = !isPlainObject && toStringTag && Object(obj) === obj && toStringTag in obj ? $slice.call(toStr$1(obj), 8, -1) : protoTag ? "Object" : "";
       var constructorTag = isPlainObject || typeof obj.constructor !== "function" ? "" : obj.constructor.name ? obj.constructor.name + " " : "";
       var tag2 = constructorTag + (stringTag || protoTag ? "[" + $join.call($concat$1.call([], stringTag || [], protoTag || []), ": ") + "] " : "");
       if (ys.length === 0) {
@@ -1337,25 +1337,25 @@
     return $replace$1.call(String(s2), /"/g, """);
   }
   function isArray$3(obj) {
-    return toStr(obj) === "[object Array]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
+    return toStr$1(obj) === "[object Array]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
   }
   function isDate(obj) {
-    return toStr(obj) === "[object Date]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
+    return toStr$1(obj) === "[object Date]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
   }
   function isRegExp$1(obj) {
-    return toStr(obj) === "[object RegExp]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
+    return toStr$1(obj) === "[object RegExp]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
   }
   function isError(obj) {
-    return toStr(obj) === "[object Error]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
+    return toStr$1(obj) === "[object Error]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
   }
   function isString(obj) {
-    return toStr(obj) === "[object String]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
+    return toStr$1(obj) === "[object String]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
   }
   function isNumber(obj) {
-    return toStr(obj) === "[object Number]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
+    return toStr$1(obj) === "[object Number]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
   }
   function isBoolean(obj) {
-    return toStr(obj) === "[object Boolean]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
+    return toStr$1(obj) === "[object Boolean]" && (!toStringTag || !(typeof obj === "object" && toStringTag in obj));
   }
   function isSymbol(obj) {
     if (hasShammedSymbols) {
@@ -1391,7 +1391,7 @@
   function has$3(obj, key) {
     return hasOwn$1.call(obj, key);
   }
-  function toStr(obj) {
+  function toStr$1(obj) {
     return objectToString.call(obj);
   }
   function nameOf(f2) {
@@ -1700,7 +1700,7 @@
   var uri = URIError;
   var abs$2 = Math.abs;
   var floor$2 = Math.floor;
-  var max$2 = Math.max;
+  var max$3 = Math.max;
   var min$2 = Math.min;
   var pow$2 = Math.pow;
   var round$3 = Math.round;
@@ -1833,102 +1833,78 @@
     Object_getPrototypeOf = $Object2.getPrototypeOf || null;
     return Object_getPrototypeOf;
   }
-  var implementation;
-  var hasRequiredImplementation;
-  function requireImplementation() {
-    if (hasRequiredImplementation)
-      return implementation;
-    hasRequiredImplementation = 1;
-    var ERROR_MESSAGE = "Function.prototype.bind called on incompatible ";
-    var toStr2 = Object.prototype.toString;
-    var max2 = Math.max;
-    var funcType = "[object Function]";
-    var concatty = function concatty2(a2, b2) {
-      var arr = [];
-      for (var i2 = 0; i2 < a2.length; i2 += 1) {
-        arr[i2] = a2[i2];
-      }
-      for (var j2 = 0; j2 < b2.length; j2 += 1) {
-        arr[j2 + a2.length] = b2[j2];
-      }
-      return arr;
-    };
-    var slicy = function slicy2(arrLike, offset) {
-      var arr = [];
-      for (var i2 = offset || 0, j2 = 0; i2 < arrLike.length; i2 += 1, j2 += 1) {
-        arr[j2] = arrLike[i2];
-      }
-      return arr;
-    };
-    var joiny = function(arr, joiner) {
-      var str = "";
-      for (var i2 = 0; i2 < arr.length; i2 += 1) {
-        str += arr[i2];
-        if (i2 + 1 < arr.length) {
-          str += joiner;
-        }
+  var ERROR_MESSAGE = "Function.prototype.bind called on incompatible ";
+  var toStr = Object.prototype.toString;
+  var max$2 = Math.max;
+  var funcType = "[object Function]";
+  var concatty = function concatty2(a2, b2) {
+    var arr = [];
+    for (var i2 = 0; i2 < a2.length; i2 += 1) {
+      arr[i2] = a2[i2];
+    }
+    for (var j2 = 0; j2 < b2.length; j2 += 1) {
+      arr[j2 + a2.length] = b2[j2];
+    }
+    return arr;
+  };
+  var slicy = function slicy2(arrLike, offset) {
+    var arr = [];
+    for (var i2 = offset || 0, j2 = 0; i2 < arrLike.length; i2 += 1, j2 += 1) {
+      arr[j2] = arrLike[i2];
+    }
+    return arr;
+  };
+  var joiny = function(arr, joiner) {
+    var str = "";
+    for (var i2 = 0; i2 < arr.length; i2 += 1) {
+      str += arr[i2];
+      if (i2 + 1 < arr.length) {
+        str += joiner;
       }
-      return str;
-    };
-    implementation = function bind2(that) {
-      var target = this;
-      if (typeof target !== "function" || toStr2.apply(target) !== funcType) {
-        throw new TypeError(ERROR_MESSAGE + target);
-      }
-      var args = slicy(arguments, 1);
-      var bound;
-      var binder = function() {
-        if (this instanceof bound) {
-          var result = target.apply(
-            this,
-            concatty(args, arguments)
-          );
-          if (Object(result) === result) {
-            return result;
-          }
-          return this;
-        }
-        return target.apply(
-          that,
+    }
+    return str;
+  };
+  var implementation$1 = function bind2(that) {
+    var target = this;
+    if (typeof target !== "function" || toStr.apply(target) !== funcType) {
+      throw new TypeError(ERROR_MESSAGE + target);
+    }
+    var args = slicy(arguments, 1);
+    var bound;
+    var binder = function() {
+      if (this instanceof bound) {
+        var result = target.apply(
+          this,
           concatty(args, arguments)
         );
-      };
-      var boundLength = max2(0, target.length - args.length);
-      var boundArgs = [];
-      for (var i2 = 0; i2 < boundLength; i2++) {
-        boundArgs[i2] = "$" + i2;
-      }
-      bound = Function("binder", "return function (" + joiny(boundArgs, ",") + "){ return binder.apply(this,arguments); }")(binder);
-      if (target.prototype) {
-        var Empty = function Empty2() {
-        };
-        Empty.prototype = target.prototype;
-        bound.prototype = new Empty();
-        Empty.prototype = null;
+        if (Object(result) === result) {
+          return result;
+        }
+        return this;
       }
-      return bound;
+      return target.apply(
+        that,
+        concatty(args, arguments)
+      );
     };
-    return implementation;
-  }
-  var functionBind;
-  var hasRequiredFunctionBind;
-  function requireFunctionBind() {
-    if (hasRequiredFunctionBind)
-      return functionBind;
-    hasRequiredFunctionBind = 1;
-    var implementation2 = requireImplementation();
-    functionBind = Function.prototype.bind || implementation2;
-    return functionBind;
-  }
-  var functionCall;
-  var hasRequiredFunctionCall;
-  function requireFunctionCall() {
-    if (hasRequiredFunctionCall)
-      return functionCall;
-    hasRequiredFunctionCall = 1;
-    functionCall = Function.prototype.call;
-    return functionCall;
-  }
+    var boundLength = max$2(0, target.length - args.length);
+    var boundArgs = [];
+    for (var i2 = 0; i2 < boundLength; i2++) {
+      boundArgs[i2] = "$" + i2;
+    }
+    bound = Function("binder", "return function (" + joiny(boundArgs, ",") + "){ return binder.apply(this,arguments); }")(binder);
+    if (target.prototype) {
+      var Empty = function Empty2() {
+      };
+      Empty.prototype = target.prototype;
+      bound.prototype = new Empty();
+      Empty.prototype = null;
+    }
+    return bound;
+  };
+  var implementation = implementation$1;
+  var functionBind = Function.prototype.bind || implementation;
+  var functionCall = Function.prototype.call;
   var functionApply;
   var hasRequiredFunctionApply;
   function requireFunctionApply() {
@@ -1939,14 +1915,14 @@
     return functionApply;
   }
   var reflectApply = typeof Reflect !== "undefined" && Reflect && Reflect.apply;
-  var bind$2 = requireFunctionBind();
+  var bind$2 = functionBind;
   var $apply$1 = requireFunctionApply();
-  var $call$2 = requireFunctionCall();
+  var $call$2 = functionCall;
   var $reflectApply = reflectApply;
   var actualApply = $reflectApply || bind$2.call($call$2, $apply$1);
-  var bind$1 = requireFunctionBind();
+  var bind$1 = functionBind;
   var $TypeError$4 = type;
-  var $call$1 = requireFunctionCall();
+  var $call$1 = functionCall;
   var $actualApply = actualApply;
   var callBindApplyHelpers = function callBindBasic2(args) {
     if (args.length < 1 || typeof args[0] !== "function") {
@@ -2015,7 +1991,7 @@
     hasRequiredHasown = 1;
     var call = Function.prototype.call;
     var $hasOwn = Object.prototype.hasOwnProperty;
-    var bind2 = requireFunctionBind();
+    var bind2 = functionBind;
     hasown = bind2.call(call, $hasOwn);
     return hasown;
   }
@@ -2030,7 +2006,7 @@
   var $URIError = uri;
   var abs$1 = abs$2;
   var floor$1 = floor$2;
-  var max$1 = max$2;
+  var max$1 = max$3;
   var min$1 = min$2;
   var pow$1 = pow$2;
   var round$2 = round$3;
@@ -2064,7 +2040,7 @@
   var $ObjectGPO = requireObject_getPrototypeOf();
   var $ReflectGPO = requireReflect_getPrototypeOf();
   var $apply = requireFunctionApply();
-  var $call = requireFunctionCall();
+  var $call = functionCall;
   var needsEval = {};
   var TypedArray = typeof Uint8Array === "undefined" || !getProto ? undefined$1 : getProto(Uint8Array);
   var INTRINSICS = {
@@ -2234,7 +2210,7 @@
     "%WeakMapPrototype%": ["WeakMap", "prototype"],
     "%WeakSetPrototype%": ["WeakSet", "prototype"]
   };
-  var bind = requireFunctionBind();
+  var bind = functionBind;
   var hasOwn = requireHasown();
   var $concat = bind.call($call, Array.prototype.concat);
   var $spliceApply = bind.call($apply, Array.prototype.splice);
@@ -49359,8 +49335,7 @@ void main(void)\r
         scrollbarWidth = 10,
         scrollbarColor = "#ffffff",
         onScroll,
-        bgColor,
-        bottomMargin = 0
+        bgColor
       } = params;
       super(width, height, bgColor);
       this._startY = 0;
@@ -49380,9 +49355,6 @@ void main(void)\r
       this._content = new Container();
       this.addChild(this._content);
       this._content.addChild(this._scrollContent);
-      const bottomMarginBox = new Sprite();
-      this._content.addChild(bottomMarginBox);
-      bottomMarginBox.height = this._content.height + bottomMargin;
       this._maskGraphics = new LibPixiRectangle(width, height, "#000");
       this.addChild(this._maskGraphics);
       this.mask = this._maskGraphics;
@@ -49435,6 +49407,21 @@ void main(void)\r
         this._onDragEnd();
       });
     }
+    /** @description 添加边距 */
+    addMargin(topMargin, bottomMargin) {
+      if (topMargin) {
+        const topMarginBox = new Sprite();
+        this._content.addChild(topMarginBox);
+        topMarginBox.height = topMargin;
+        this._scrollContent.y += topMargin;
+      }
+      if (bottomMargin) {
+        const bottomMarginBox = new Sprite();
+        this._content.addChild(bottomMarginBox);
+        bottomMarginBox.height = bottomMargin;
+        bottomMarginBox.y = topMargin + this._scrollContent.height;
+      }
+    }
     /** @description 设置滚动容器可视区宽高
      * @param width 宽度
      * @param height 高度

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lyb-pixi-js",
-  "version": "1.12.14",
+  "version": "1.12.16",
   "description": "自用Pixi.JS方法库",
   "license": "ISC",
   "exports": {