lyb-pixi-js 1.7.0 → 1.7.2

package/Components/Custom/LibPixiScrollContainer.d.ts

@@ -1,5 +1,5 @@
 import { Container } from "pixi.js";
-import { LibPixiContainer } from "../Base/LibPixiContainer";
+import { LibPixiContainer } from '../Base/LibPixiContainer';
 export interface LibPixiScrollContainerParams {
     /** 宽度 */
     width: number;
@@ -9,6 +9,8 @@ export interface LibPixiScrollContainerParams {
     scrollContent: Container;
     /** 底部内边距 */
     bottomMargin?: number;
+    /** 滚动方向，vertical | horizontal，默认vertical */
+    direction?: "vertical" | "horizontal";
 }
 /** @description 支持鼠标滚轮滚动、鼠标拖动、手指滑动，支持惯性滚动及回弹
  * @link 使用方法：https://www.npmjs.com/package/lyb-pixi-js#LibPixiScrollContainer-滚动容器
@@ -26,6 +28,8 @@ export declare class LibPixiScrollContainer extends LibPixiContainer {
     private _scrollSpeed;
     /** 是否处于拖动状态 */
     private _isDragging;
+    /** 滚动方向 */
+    private _direction;
     /** 滚动容器 */
     _scrollContent: Container;
     /** 遮罩 */

package/Components/Custom/LibPixiScrollContainer.js

@@ -1,11 +1,12 @@
 import { Container, Graphics, Sprite, } from "pixi.js";
 import { gsap } from "gsap";
-import { LibPixiContainer } from "../Base/LibPixiContainer";
+import { LibPixiContainer } from '../Base/LibPixiContainer';
 /** @description 支持鼠标滚轮滚动、鼠标拖动、手指滑动，支持惯性滚动及回弹
  * @link 使用方法：https://www.npmjs.com/package/lyb-pixi-js#LibPixiScrollContainer-滚动容器
  */
 export class LibPixiScrollContainer extends LibPixiContainer {
     constructor(params) {
+        var _a;
         const { width, height, scrollContent, bottomMargin = 50 } = params;
         super(width, height);
         /** 开始位置 */
@@ -20,7 +21,10 @@ export class LibPixiScrollContainer extends LibPixiContainer {
         this._scrollSpeed = 200;
         /** 是否处于拖动状态 */
         this._isDragging = false;
+        /** 滚动方向 */
+        this._direction = "vertical";
         this._scrollContent = scrollContent;
+        this._direction = (_a = params.direction) !== null && _a !== void 0 ? _a : "vertical";
         // 创建内容容器
         this._content = new Container();
         this.addChild(this._content);
@@ -73,7 +77,10 @@ export class LibPixiScrollContainer extends LibPixiContainer {
         if (this._content.height <= this._maskGraphics.height)
             return;
         const position = event.getLocalPosition(this);
-        this._startY = position.y - this._content.y;
+        this._startY =
+            this._direction === "vertical"
+                ? position.y - this._content.y
+                : position.x - this._content.x;
         this._isDragging = true;
         this._velocity = 0;
         this._startTime = Date.now();
@@ -84,8 +91,15 @@ export class LibPixiScrollContainer extends LibPixiContainer {
     _onDragMove(event) {
         if (this._isDragging) {
             const position = event.getLocalPosition(this);
-            const newPosition = position.y - this._startY;
-            this._content.y = newPosition;
+            const newPosition = this._direction === "vertical"
+                ? position.y - this._startY
+                : position.x - this._startY;
+            if (this._direction === "vertical") {
+                this._content.y = newPosition;
+            }
+            else {
+                this._content.x = newPosition;
+            }
         }
     }
     /** @description 拖动结束 */
@@ -106,61 +120,47 @@ export class LibPixiScrollContainer extends LibPixiContainer {
     }
     /** @description 滚轮滚动 */
     _onWheelScroll(event) {
-        // 如果内容高度小于遮罩高度，则不滚动
-        if (this._content.height <= this._maskGraphics.height)
-            return;
-        let y = this._content.y - event.deltaY * (this._scrollSpeed / 100);
-        //如果到达顶部，则不滚动
-        if (y > 0) {
-            y = 0;
+        if (this._direction === "vertical") {
+            if (this._content.height <= this._maskGraphics.height)
+                return;
+            let y = this._content.y - event.deltaY * (this._scrollSpeed / 100);
+            y = Math.min(0, Math.max(y, -(this._content.height - this._maskGraphics.height)));
+            gsap.to(this._content, { duration: 0.25, ease: "power1.out", y });
         }
-        //如果到达底部，则不滚动
-        else if (Math.abs(y) >= this._content.height - this._maskGraphics.height) {
-            y = -(this._content.height - this._maskGraphics.height);
+        else {
+            if (this._content.width <= this._maskGraphics.width)
+                return;
+            let x = this._content.x - event.deltaY * (this._scrollSpeed / 100);
+            x = Math.min(0, Math.max(x, -(this._content.width - this._maskGraphics.width)));
+            gsap.to(this._content, { duration: 0.25, ease: "power1.out", x });
         }
-        gsap.to(this._content, {
-            duration: 0.25,
-            ease: "power1.out",
-            y,
-        });
     }
     /** @description 惯性动画 */
     _applyInertia() {
-        gsap.to(this._content, {
-            y: this._content.y + this._velocity * 250,
-            duration: 0.5,
-            ease: "power1.out",
-            onUpdate: this._limitScrollRange.bind(this),
-        });
+        gsap.to(this._content, Object.assign({ duration: 0.5, ease: "power1.out", onUpdate: this._limitScrollRange.bind(this) }, (this._direction === "vertical"
+            ? { y: this._content.y + this._velocity * 250 }
+            : { x: this._content.x + this._velocity * 250 })));
     }
     /** @description 限制滚动范围 */
     _limitScrollRange() {
-        //如果内容顶部离开了滚动容器顶部，则归位
-        if (this._content.y > 0) {
-            gsap.to(this._content, {
-                duration: 0.75,
-                y: 0,
-                ease: "elastic.out",
-            });
-        }
-        // 如果滚动距离大于内容高度减去遮罩高度
-        else if (Math.abs(this._content.y) >=
-            this._content.height - this._maskGraphics.height) {
-            // 如果内容高度大于遮罩高度，则滚动到底部
-            if (this._content.height > this._maskGraphics.height) {
+        if (this._direction === "vertical") {
+            if (this._content.y > 0) {
+                gsap.to(this._content, { duration: 0.75, y: 0, ease: "elastic.out" });
+            }
+            else if (Math.abs(this._content.y) >=
+                this._content.height - this._maskGraphics.height) {
                 const y = -(this._content.height - this._maskGraphics.height);
-                gsap.to(this._content, {
-                    duration: 0.75,
-                    y,
-                    ease: "elastic.out",
-                });
+                gsap.to(this._content, { duration: 0.75, y, ease: "elastic.out" });
             }
-            // 否则静止不动
-            else {
-                gsap.to(this._content, {
-                    duration: 0.25,
-                    y: 0,
-                });
+        }
+        else {
+            if (this._content.x > 0) {
+                gsap.to(this._content, { duration: 0.75, x: 0, ease: "elastic.out" });
+            }
+            else if (Math.abs(this._content.x) >=
+                this._content.width - this._maskGraphics.width) {
+                const x = -(this._content.width - this._maskGraphics.width);
+                gsap.to(this._content, { duration: 0.75, x, ease: "elastic.out" });
             }
         }
     }

package/Components/Custom/LibPixiSlider.d.ts

@@ -7,6 +7,8 @@ interface LibPixiSliderParams {
     height: number;
     /** 滑动页列表 */
     slideList: Container[];
+    /** 是否启用循环滑动 */
+    loop?: boolean;
     /** 是否启用景深 */
     enableDepth?: boolean;
     /** 景深透明度 */
@@ -26,6 +28,8 @@ export declare class LibPixiSlider extends LibPixiContainer {
     private _slideWidth;
     /** 滑动区域高度 */
     private _slideHeight;
+    /** 是否启用循环 */
+    private _loop;
     /** 记录拖动开始时的X坐标 */
     private _startX;
     /** 偏移量 */

package/Components/Custom/LibPixiSlider.js

@@ -1,8 +1,9 @@
 import { Container } from "pixi.js";
 import gsap from "gsap";
+import { LibJsLerp } from "lyb-js/Math/LibJsLerp.js";
 import { libPixiOverflowHidden } from "../../Utils/LibPixiOverflowHidden";
 import { LibPixiContainer } from "../Base/LibPixiContainer";
-import { LibJsLerp } from 'lyb-js/Math/LibJsLerp';
+import { libPixiEvent } from "../../Utils/LibPixiEvent";
 /** @description 类似轮播图，但是不会自动轮播
  * @link 使用方法：https://www.npmjs.com/package/lyb-pixi-js#LibPixiSlider-横向滑动图
  */
@@ -14,7 +15,7 @@ export class LibPixiSlider extends LibPixiContainer {
      * @param slideCallback 滑动结束回调
      */
     constructor(params) {
-        const { width, height, slideList, slideCallback, enableDepth = false, depthAlpha = 0.5, depthScale = 0.5, } = params;
+        const { width, height, slideList, slideCallback, loop = false, enableDepth = false, depthAlpha = 0.5, depthScale = 0.5, } = params;
         super(width, height);
         /** 当前幻灯片索引 */
         this._currentIndex = 0;
@@ -22,6 +23,8 @@ export class LibPixiSlider extends LibPixiContainer {
         this._slideWidth = 0;
         /** 滑动区域高度 */
         this._slideHeight = 0;
+        /** 是否启用循环 */
+        this._loop = false;
         /** 记录拖动开始时的X坐标 */
         this._startX = 0;
         /** 偏移量 */
@@ -36,6 +39,7 @@ export class LibPixiSlider extends LibPixiContainer {
         this._slideArea = new Container();
         this._slideWidth = width;
         this._slideHeight = height;
+        this._loop = loop;
         this._slideList = slideList;
         this._enableDepth = enableDepth;
         this._depthAlpha = depthAlpha;
@@ -49,10 +53,7 @@ export class LibPixiSlider extends LibPixiContainer {
             item.pivot.set(this._slideWidth / 2, this._slideHeight / 2);
         });
         this.addChild(this._slideArea);
-        // 监听拖动事件
-        this.eventMode = "static";
-        this.cursor = "pointer";
-        this.on("pointerdown", this._onDragStart);
+        libPixiEvent(this, "pointerdown", this._onDragStart.bind(this));
         window.addEventListener("pointermove", this._onDragMove.bind(this));
         window.addEventListener("pointerup", this._onDragEnd.bind(this));
     }
@@ -68,39 +69,36 @@ export class LibPixiSlider extends LibPixiContainer {
      * @param index 索引
      */
     _slideTo(index) {
-        if (index < 0) {
-            // 回弹到第一张
-            gsap.to(this._slideArea, {
-                x: 0,
-                duration: 0.25,
-                onUpdate: () => {
-                    this._setDepth();
-                },
-            });
-            this._currentIndex = 0;
-        }
-        else if (index > this._pageNum) {
-            // 回弹到最后一张
-            gsap.to(this._slideArea, {
-                x: -this._pageNum * this._slideWidth,
-                duration: 0.5,
-                onUpdate: () => {
-                    this._setDepth();
-                },
-            });
-            this._currentIndex = this._pageNum;
+        let x = 0;
+        if (this._loop) {
+            this._currentIndex =
+                (index + this._slideList.length) % this._slideList.length;
+            x = -this._currentIndex * this._slideWidth;
         }
         else {
-            // 正常滑动
-            this._currentIndex = index;
-            gsap.to(this._slideArea, {
-                x: -this._currentIndex * this._slideWidth,
-                duration: 0.25,
-                onUpdate: () => {
-                    this._setDepth();
-                },
-            });
+            if (index < 0) {
+                // 回弹到第一张
+                x = 0;
+                this._currentIndex = 0;
+            }
+            else if (index > this._pageNum) {
+                // 回弹到最后一张
+                x = -this._pageNum * this._slideWidth;
+                this._currentIndex = this._pageNum;
+            }
+            else {
+                // 正常滑动
+                x = -index * this._slideWidth;
+                this._currentIndex = index;
+            }
         }
+        gsap.to(this._slideArea, {
+            x,
+            duration: 0.25,
+            onUpdate: () => {
+                this._setDepth();
+            },
+        });
         this.slideCallback(this._currentIndex, this._pageNum);
     }
     /** @description 开始拖动 */

package/README.md

@@ -146,8 +146,6 @@ app.stage.addChild(box);
 
 \- [LibPixiPolygonDrawTool-多边形绘制](#LibPixiPolygonDrawTool-多边形绘制)
 
-\- [LibPixiWatchProperty-对象属性监听](#LibPixiWatchProperty-对象属性监听)
-
 ## Base-基础
 
 ### LibPixiText-文本
@@ -1019,21 +1017,4 @@ $bus.on("play", () => {
 
 ```ts
 new LibPixiPolygonDrawTool(app);
-```
-
-### LibPixiWatchProperty-对象属性监听
-
-> 内部通过 Ticker 每秒调用10次循环判断被监听的属性是否发生改变，当元素被销毁时自动销毁 Ticker，取决于是否传递了元素
-
-```ts
-LibPixiWatchProperty(
-  gameStore,
-  ["a", "b"],
-  () => {
-    warningContainer.visible = a;
-    useBtn.eventMode = a || b ? "none" : "static";
-  },
-  this
-);
-```
-
+```

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 tag = 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$1 = Math.abs;
   var floor$1 = Math.floor;
-  var max$1 = Math.max;
+  var max$2 = Math.max;
   var min$1 = Math.min;
   var pow$1 = Math.pow;
   var round$2 = 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$1 = 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$1(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 = abs$1;
   var floor = floor$1;
-  var max = max$1;
+  var max = max$2;
   var min = min$1;
   var pow = pow$1;
   var round$1 = round$2;
@@ -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);
@@ -49124,7 +49100,9 @@ void main(void)\r
       this._startPosition = 0;
       this._scrollSpeed = 200;
       this._isDragging = false;
+      this._direction = "vertical";
       this._scrollContent = scrollContent;
+      this._direction = params.direction ?? "vertical";
       this._content = new Container();
       this.addChild(this._content);
       this._content.addChild(this._scrollContent);
@@ -49172,7 +49150,7 @@ void main(void)\r
       if (this._content.height <= this._maskGraphics.height)
         return;
       const position = event.getLocalPosition(this);
-      this._startY = position.y - this._content.y;
+      this._startY = this._direction === "vertical" ? position.y - this._content.y : position.x - this._content.x;
       this._isDragging = true;
       this._velocity = 0;
       this._startTime = Date.now();
@@ -49183,8 +49161,12 @@ void main(void)\r
     _onDragMove(event) {
       if (this._isDragging) {
         const position = event.getLocalPosition(this);
-        const newPosition = position.y - this._startY;
-        this._content.y = newPosition;
+        const newPosition = this._direction === "vertical" ? position.y - this._startY : position.x - this._startY;
+        if (this._direction === "vertical") {
+          this._content.y = newPosition;
+        } else {
+          this._content.x = newPosition;
+        }
       }
     }
     /** @description 拖动结束 */
@@ -49202,50 +49184,50 @@ void main(void)\r
     }
     /** @description 滚轮滚动 */
     _onWheelScroll(event) {
-      if (this._content.height <= this._maskGraphics.height)
-        return;
-      let y2 = this._content.y - event.deltaY * (this._scrollSpeed / 100);
-      if (y2 > 0) {
-        y2 = 0;
-      } else if (Math.abs(y2) >= this._content.height - this._maskGraphics.height) {
-        y2 = -(this._content.height - this._maskGraphics.height);
+      if (this._direction === "vertical") {
+        if (this._content.height <= this._maskGraphics.height)
+          return;
+        let y2 = this._content.y - event.deltaY * (this._scrollSpeed / 100);
+        y2 = Math.min(
+          0,
+          Math.max(y2, -(this._content.height - this._maskGraphics.height))
+        );
+        gsapWithCSS.to(this._content, { duration: 0.25, ease: "power1.out", y: y2 });
+      } else {
+        if (this._content.width <= this._maskGraphics.width)
+          return;
+        let x2 = this._content.x - event.deltaY * (this._scrollSpeed / 100);
+        x2 = Math.min(
+          0,
+          Math.max(x2, -(this._content.width - this._maskGraphics.width))
+        );
+        gsapWithCSS.to(this._content, { duration: 0.25, ease: "power1.out", x: x2 });
       }
-      gsapWithCSS.to(this._content, {
-        duration: 0.25,
-        ease: "power1.out",
-        y: y2
-      });
     }
     /** @description 惯性动画 */
     _applyInertia() {
       gsapWithCSS.to(this._content, {
-        y: this._content.y + this._velocity * 250,
         duration: 0.5,
         ease: "power1.out",
-        onUpdate: this._limitScrollRange.bind(this)
+        onUpdate: this._limitScrollRange.bind(this),
+        ...this._direction === "vertical" ? { y: this._content.y + this._velocity * 250 } : { x: this._content.x + this._velocity * 250 }
       });
     }
     /** @description 限制滚动范围 */
     _limitScrollRange() {
-      if (this._content.y > 0) {
-        gsapWithCSS.to(this._content, {
-          duration: 0.75,
-          y: 0,
-          ease: "elastic.out"
-        });
-      } else if (Math.abs(this._content.y) >= this._content.height - this._maskGraphics.height) {
-        if (this._content.height > this._maskGraphics.height) {
+      if (this._direction === "vertical") {
+        if (this._content.y > 0) {
+          gsapWithCSS.to(this._content, { duration: 0.75, y: 0, ease: "elastic.out" });
+        } else if (Math.abs(this._content.y) >= this._content.height - this._maskGraphics.height) {
           const y2 = -(this._content.height - this._maskGraphics.height);
-          gsapWithCSS.to(this._content, {
-            duration: 0.75,
-            y: y2,
-            ease: "elastic.out"
-          });
-        } else {
-          gsapWithCSS.to(this._content, {
-            duration: 0.25,
-            y: 0
-          });
+          gsapWithCSS.to(this._content, { duration: 0.75, y: y2, ease: "elastic.out" });
+        }
+      } else {
+        if (this._content.x > 0) {
+          gsapWithCSS.to(this._content, { duration: 0.75, x: 0, ease: "elastic.out" });
+        } else if (Math.abs(this._content.x) >= this._content.width - this._maskGraphics.width) {
+          const x2 = -(this._content.width - this._maskGraphics.width);
+          gsapWithCSS.to(this._content, { duration: 0.75, x: x2, ease: "elastic.out" });
         }
       }
     }
@@ -49438,6 +49420,7 @@ void main(void)\r
         height,
         slideList,
         slideCallback,
+        loop = false,
         enableDepth = false,
         depthAlpha = 0.5,
         depthScale = 0.5
@@ -49446,6 +49429,7 @@ void main(void)\r
       this._currentIndex = 0;
       this._slideWidth = 0;
       this._slideHeight = 0;
+      this._loop = false;
       this._startX = 0;
       this._offsetX = 0;
       this._pageNum = 0;
@@ -49455,6 +49439,7 @@ void main(void)\r
       this._slideArea = new Container();
       this._slideWidth = width;
       this._slideHeight = height;
+      this._loop = loop;
       this._slideList = slideList;
       this._enableDepth = enableDepth;
       this._depthAlpha = depthAlpha;
@@ -49468,9 +49453,7 @@ void main(void)\r
         item.pivot.set(this._slideWidth / 2, this._slideHeight / 2);
       });
       this.addChild(this._slideArea);
-      this.eventMode = "static";
-      this.cursor = "pointer";
-      this.on("pointerdown", this._onDragStart);
+      libPixiEvent(this, "pointerdown", this._onDragStart.bind(this));
       window.addEventListener("pointermove", this._onDragMove.bind(this));
       window.addEventListener("pointerup", this._onDragEnd.bind(this));
     }
@@ -49486,34 +49469,29 @@ void main(void)\r
      * @param index 索引
      */
     _slideTo(index) {
-      if (index < 0) {
-        gsapWithCSS.to(this._slideArea, {
-          x: 0,
-          duration: 0.25,
-          onUpdate: () => {
-            this._setDepth();
-          }
-        });
-        this._currentIndex = 0;
-      } else if (index > this._pageNum) {
-        gsapWithCSS.to(this._slideArea, {
-          x: -this._pageNum * this._slideWidth,
-          duration: 0.5,
-          onUpdate: () => {
-            this._setDepth();
-          }
-        });
-        this._currentIndex = this._pageNum;
+      let x2 = 0;
+      if (this._loop) {
+        this._currentIndex = (index + this._slideList.length) % this._slideList.length;
+        x2 = -this._currentIndex * this._slideWidth;
       } else {
-        this._currentIndex = index;
-        gsapWithCSS.to(this._slideArea, {
-          x: -this._currentIndex * this._slideWidth,
-          duration: 0.25,
-          onUpdate: () => {
-            this._setDepth();
-          }
-        });
+        if (index < 0) {
+          x2 = 0;
+          this._currentIndex = 0;
+        } else if (index > this._pageNum) {
+          x2 = -this._pageNum * this._slideWidth;
+          this._currentIndex = this._pageNum;
+        } else {
+          x2 = -index * this._slideWidth;
+          this._currentIndex = index;
+        }
       }
+      gsapWithCSS.to(this._slideArea, {
+        x: x2,
+        duration: 0.25,
+        onUpdate: () => {
+          this._setDepth();
+        }
+      });
       this.slideCallback(this._currentIndex, this._pageNum);
     }
     /** @description 开始拖动 */

package/package.json

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