lyb-pixi-js 1.12.13 → 1.12.15

package/Components/Custom/LibPixiScrollContainerY.d.ts

@@ -7,6 +7,8 @@ export interface LibPixiScrollContainerYParams {
     height: number;
     /** 滚动内容 */
     scrollContent: Container;
+    /** 顶部边距 */
+    topMargin?: number;
     /** 底部边距 */
     bottomMargin?: number;
     /** 背景色，用于定位 */

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, topMargin = 0, bottomMargin = 0, } = params;
         super(width, height, bgColor);
         /** 开始位置 */
         this._startY = 0;
@@ -36,10 +36,24 @@ 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;
+        if (topMargin) {
+            //创建底部边距
+            const topMarginBox = new Sprite();
+            this._content.addChild(topMarginBox);
+            topMarginBox.height = topMargin;
+            requestAnimationFrame(() => {
+                this._scrollContent.y += topMargin;
+            });
+        }
+        if (bottomMargin) {
+            //创建底部边距
+            const bottomMarginBox = new Sprite();
+            this._content.addChild(bottomMarginBox);
+            bottomMarginBox.height = bottomMargin;
+            requestAnimationFrame(() => {
+                bottomMarginBox.y = topMargin + this._scrollContent.height;
+            });
+        }
         // 创建遮罩
         this._maskGraphics = new LibPixiRectangle(width, height, "#000");
         this.addChild(this._maskGraphics);

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

@@ -25,6 +25,8 @@ export declare class LibPixiDialog extends LibPixiBaseContainer {
     private _size;
     /** 竖版初始大小 */
     private _initialSize;
+    /** 窗口变化 */
+    private _resize?;
     /** 停止监听窗口 */
     private _offResize?;
     constructor(params?: Params);

package/Utils/LibPixiDialogManager/ui/LibPixiDialog.js

@@ -9,10 +9,10 @@ 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 { libPixiEvent } from "../../LibPixiEvent";
 import { LibPixiBaseContainer } from "./LibPixiBaseContainer";
-import { LibJsResizeWatcher } from "lyb-js/Base/LibJsResizeWatcher.js";
 /** @description 弹窗组件 */
 export class LibPixiDialog extends LibPixiBaseContainer {
     constructor(params) {
@@ -47,6 +47,7 @@ export class LibPixiDialog extends LibPixiBaseContainer {
     }
     /** @description 设置弹窗内容 */
     setDialogContent(content) {
+        var _a, _b;
         this._dialogContainer.addChild(content);
         const w = this._dialogContainer.width / 2;
         const h = this._dialogContainer.height / 2;
@@ -61,8 +62,10 @@ export class LibPixiDialog extends LibPixiBaseContainer {
             duration: LibPixiDialog.durationIn,
             alpha: 1,
         });
-        const resize = new LibJsResizeWatcher(LibPixiDialog.adaptation);
-        this._offResize = resize.on((w, h) => {
+        //部分场景需要重复调用此方法来重新更新布局重新监听尺寸变化，所以需要判断一下
+        (_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) {

package/lyb-pixi.js

@@ -49360,6 +49360,7 @@ void main(void)\r
         scrollbarColor = "#ffffff",
         onScroll,
         bgColor,
+        topMargin = 0,
         bottomMargin = 0
       } = params;
       super(width, height, bgColor);
@@ -49380,9 +49381,22 @@ 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;
+      if (topMargin) {
+        const topMarginBox = new Sprite();
+        this._content.addChild(topMarginBox);
+        topMarginBox.height = topMargin;
+        requestAnimationFrame(() => {
+          this._scrollContent.y += topMargin;
+        });
+      }
+      if (bottomMargin) {
+        const bottomMarginBox = new Sprite();
+        this._content.addChild(bottomMarginBox);
+        bottomMarginBox.height = bottomMargin;
+        requestAnimationFrame(() => {
+          bottomMarginBox.y = topMargin + this._scrollContent.height;
+        });
+      }
       this._maskGraphics = new LibPixiRectangle(width, height, "#000");
       this.addChild(this._maskGraphics);
       this.mask = this._maskGraphics;

package/package.json

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