lyb-pixi-js 1.11.0 → 1.11.2

package/Utils/LibPixiDialogManager/index.d.ts

@@ -9,13 +9,9 @@ interface IViewCtor {
 export declare class LibPixiDialogManager {
     /** 视图表 */
     private views;
-    /** 上一次方向 */
-    private lastOrientation;
     /** open时显示的元素的父容器 */
     private _openContainer;
-    /** 是否适配横竖屏 */
-    private _hv;
-    constructor(parent: Container, hv?: boolean);
+    constructor(parent: Container);
     /**
      * 打开界面
      * @param View 实例类型或构造方法
@@ -25,6 +21,5 @@ export declare class LibPixiDialogManager {
     /** @description 关闭页面，会调用页面的 onBeforeUnmount 事件，里面会做关闭动画，动画结束后会自动销毁
      * @param id 页面名称
      */
-    close(id: string): void;
-    private resize;
+    close(id: string): Promise<void>;
 }

package/Utils/LibPixiDialogManager/index.js

@@ -1,28 +1,20 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 export { LibPixiBaseContainer } from "./ui/LibPixiBaseContainer";
 export { LibPixiDialog } from "./ui/LibPixiDialog";
 /** @description 弹窗管理器 */
 export class LibPixiDialogManager {
-    constructor(parent, hv = false) {
+    constructor(parent) {
         /** 视图表 */
         this.views = {};
-        /** 上一次方向 */
-        this.lastOrientation = "h";
-        /** 是否适配横竖屏 */
-        this._hv = false;
         this._openContainer = parent;
-        this._hv = hv;
-        if (hv) {
-            window.addEventListener("resize", () => {
-                var _a;
-                const w = window.innerWidth;
-                const h = window.innerHeight;
-                const orientation = w > h ? "h" : "v";
-                if (orientation !== this.lastOrientation) {
-                    (_a = this.resize) === null || _a === void 0 ? void 0 : _a.call(this, window.innerWidth, window.innerHeight);
-                    this.lastOrientation = orientation;
-                }
-            });
-        }
     }
     /**
      * 打开界面
@@ -30,15 +22,8 @@ export class LibPixiDialogManager {
      * @param args 实例参数
      */
     open(View, id, ...args) {
-        var _a, _b;
         const view = new View(...args);
         this._openContainer.addChild(view);
-        if (this._hv) {
-            (_a = view.resize) === null || _a === void 0 ? void 0 : _a.call(view, window.innerWidth, window.innerHeight);
-        }
-        else {
-            (_b = view.resize) === null || _b === void 0 ? void 0 : _b.call(view, 1920, 1080);
-        }
         this.views[id] = view;
         return view;
     }
@@ -46,27 +31,13 @@ export class LibPixiDialogManager {
      * @param id 页面名称
      */
     close(id) {
-        const view = this.views[id];
-        if (view) {
-            if (view.beforeUnmount) {
-                view.beforeUnmount(() => {
-                    requestAnimationFrame(() => {
-                        view.destroy({ children: true });
-                    });
-                });
-            }
-            else {
-                requestAnimationFrame(() => {
-                    view.destroy({ children: true });
-                });
-            }
-            delete this.views[id];
-        }
-    }
-    resize(w, h) {
-        Object.values(this.views).forEach((view) => {
+        return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            (_a = view.resize) === null || _a === void 0 ? void 0 : _a.call(view, w, h);
+            const view = this.views[id];
+            if (view) {
+                yield ((_a = view.destroy) === null || _a === void 0 ? void 0 : _a.call(view));
+                delete this.views[id];
+            }
         });
     }
 }

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

@@ -1,13 +1,11 @@
 import { Container } from "pixi.js";
-/** @description 基础容器，所有弹窗或页面都基于此视图来管理视图生命周期 */
+/** @description  */
 export declare class LibPixiBaseContainer extends Container {
-    /** 调用 GameDialogManager.close 时调用 */
-    beforeUnmount?: (destroy: () => void) => void;
-    /** 窗口大小发生改变后调用 */
-    resize?: (w: number, h: number) => void;
+    /** 销毁之前 */
+    protected _onBeforeDestroy?: () => void | Promise<void>;
+    /** 已销毁 */
+    protected _onDestroyed?: () => void;
     constructor();
-    /** @description 卸载前回调，需要调用回调参数进行手动销毁 */
-    protected _onBeforeUnmount(beforeUnmount: (destroy: () => void) => void): void;
-    /** @description 窗口大小发生改变后回调 */
-    protected _onResize(resize: (w: number, h: number) => void): void;
+    /** @description 销毁 */
+    destroy(): Promise<void>;
 }

package/Utils/LibPixiDialogManager/ui/LibPixiBaseContainer.js

@@ -1,15 +1,31 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import { Container } from "pixi.js";
-/** @description 基础容器，所有弹窗或页面都基于此视图来管理视图生命周期 */
+/** @description  */
 export class LibPixiBaseContainer extends Container {
     constructor() {
         super();
     }
-    /** @description 卸载前回调，需要调用回调参数进行手动销毁 */
-    _onBeforeUnmount(beforeUnmount) {
-        this.beforeUnmount = beforeUnmount;
-    }
-    /** @description 窗口大小发生改变后回调 */
-    _onResize(resize) {
-        this.resize = resize;
+    /** @description 销毁 */
+    destroy() {
+        const _super = Object.create(null, {
+            destroy: { get: () => super.destroy }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            yield ((_a = this._onBeforeDestroy) === null || _a === void 0 ? void 0 : _a.call(this));
+            requestAnimationFrame(() => {
+                var _a;
+                _super.destroy.call(this, { children: true });
+                (_a = this._onDestroyed) === null || _a === void 0 ? void 0 : _a.call(this);
+            });
+        });
     }
 }

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

@@ -25,6 +25,8 @@ export declare class LibPixiDialog extends LibPixiBaseContainer {
     private _initialSize;
     /** 是否处于关闭动画状态 */
     private _isCloseAnimating;
+    /** 停止监听窗口 */
+    private _offResize?;
     constructor(params?: Params);
     /** @description 设置弹窗内容 */
     setDialogContent(content: Container): void;

package/Utils/LibPixiDialogManager/ui/LibPixiDialog.js

@@ -12,6 +12,7 @@ import gsap from "gsap";
 import { LibPixiRectBgColor } from "../../../Components/Base/LibPixiRectBgColor";
 import { libPixiEvent } from "../../LibPixiEvent";
 import { LibPixiBaseContainer } from "./LibPixiBaseContainer";
+import { LibJsResizeWatcher } from "lyb-js/Base/LibJsResizeWatcher";
 /** @description 弹窗组件 */
 export class LibPixiDialog extends LibPixiBaseContainer {
     constructor(params) {
@@ -34,9 +35,11 @@ export class LibPixiDialog extends LibPixiBaseContainer {
         this._maskUI.visible = needBg;
         if (onClickMask) {
             libPixiEvent(this._maskUI, "pointertap", () => {
+                var _a;
                 if (this._isCloseAnimating)
                     return;
                 onClickMask === null || onClickMask === void 0 ? void 0 : onClickMask();
+                (_a = this._offResize) === null || _a === void 0 ? void 0 : _a.call(this);
             });
         }
         //弹窗内容容器
@@ -60,7 +63,8 @@ export class LibPixiDialog extends LibPixiBaseContainer {
             duration: LibPixiDialog.durationIn,
             alpha: 1,
         });
-        this._onResize((w, h) => {
+        const resize = new LibJsResizeWatcher();
+        this._offResize = resize.on((w, h) => {
             const halfW = 1920 / 2;
             const halfH = 1080 / 2;
             if (w > h) {
@@ -92,8 +96,10 @@ export class LibPixiDialog extends LibPixiBaseContainer {
     /** @description 关闭 */
     close() {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             if (this._isCloseAnimating)
                 return;
+            (_a = this._offResize) === null || _a === void 0 ? void 0 : _a.call(this);
             this._isCloseAnimating = true;
             gsap.to(this._dialogContainer.scale, {
                 duration: LibPixiDialog.durationOut,

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) {
@@ -1340,25 +1340,25 @@
     return !toStringTag || !(typeof obj === "object" && (toStringTag in obj || typeof obj[toStringTag] !== "undefined"));
   }
   function isArray$3(obj) {
-    return toStr(obj) === "[object Array]" && canTrustToString(obj);
+    return toStr$1(obj) === "[object Array]" && canTrustToString(obj);
   }
   function isDate(obj) {
-    return toStr(obj) === "[object Date]" && canTrustToString(obj);
+    return toStr$1(obj) === "[object Date]" && canTrustToString(obj);
   }
   function isRegExp$1(obj) {
-    return toStr(obj) === "[object RegExp]" && canTrustToString(obj);
+    return toStr$1(obj) === "[object RegExp]" && canTrustToString(obj);
   }
   function isError(obj) {
-    return toStr(obj) === "[object Error]" && canTrustToString(obj);
+    return toStr$1(obj) === "[object Error]" && canTrustToString(obj);
   }
   function isString(obj) {
-    return toStr(obj) === "[object String]" && canTrustToString(obj);
+    return toStr$1(obj) === "[object String]" && canTrustToString(obj);
   }
   function isNumber(obj) {
-    return toStr(obj) === "[object Number]" && canTrustToString(obj);
+    return toStr$1(obj) === "[object Number]" && canTrustToString(obj);
   }
   function isBoolean(obj) {
-    return toStr(obj) === "[object Boolean]" && canTrustToString(obj);
+    return toStr$1(obj) === "[object Boolean]" && canTrustToString(obj);
   }
   function isSymbol(obj) {
     if (hasShammedSymbols) {
@@ -1394,7 +1394,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) {
@@ -1703,7 +1703,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;
@@ -1836,102 +1836,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() {
@@ -1942,14 +1918,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") {
@@ -2018,7 +1994,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;
   }
@@ -2033,7 +2009,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;
@@ -2067,7 +2043,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 = {
@@ -2238,7 +2214,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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lyb-pixi-js",
-  "version": "1.11.0",
+  "version": "1.11.2",
   "description": "自用Pixi.JS方法库",
   "license": "ISC",
   "exports": {
@@ -22,22 +22,5 @@
     "lengyibai",
     "lyb",
     "lyb-pixi-js"
-  ],
-  "devDependencies": {
-    "@types/howler": "^2.2.12"
-  },
-  "dependencies": {
-    "@pixi-spine/runtime-3.8": "^4.0.3",
-    "@pixi/filter-drop-shadow": "^5.2.0",
-    "@pixi/particle-emitter": "^5.0.8",
-    "@pixi/sound": "^5.2.3",
-    "dayjs": "^1.11.13",
-    "decimal.js": "^10.4.3",
-    "gsap": "^3.12.5",
-    "howler": "^2.2.4",
-    "lyb-js": "^1.4.1",
-    "pixi-spine": "^4.0.4",
-    "pixi.js": "^7.4.2",
-    "vite": "^4.5.5"
-  }
+  ]
 }