@safe-engine/cocos 2.5.11 → 2.5.13

package/dist/collider/CollideComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CollideComponent.d.ts","sourceRoot":"","sources":["../../src/collider/CollideComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAanC,UAAU,aAAc,SAAQ,kBAAkB,CAAC,QAAQ,CAAC;IAC1D,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACzB,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAA;IAC5C,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAA;IAC3C,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAA;CAC5C;AACD,qBAAa,QAAQ,CAAC,CAAC,GAAG,aAAa,CAAE,SAAQ,UAAU,CAAC,CAAC,CAAC;IAC5D,YAAY,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,CAAK;IACtC,cAAc,EAAE,IAAI,GAAG,EAAE,CAAC,KAAK,CAAA;IAC/B,YAAY,MAAA;IACZ,KAAK,EAAE,EAAE,CAAC,IAAI,CAAsB;IACpC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAsB;IAGvC,OAAO;IAKP,IAAI,KAAK;;;;;;;;;;;;;;;;;;;;;MAKR;CACF;AAED,UAAU,gBAAiB,SAAQ,kBAAkB,CAAC,WAAW,CAAC;IAChE,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AACD,qBAAa,WAAY,SAAQ,QAAQ,CAAC,aAAa,GAAG,gBAAgB,CAAC;IACzE,IAAI,IAAI,IAII,EAAE,CAAC,IAAI,CAFlB;IAED,IAAI,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,EAGlB;IAED,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ;CA6B7B;AAED,UAAU,mBAAoB,SAAQ,kBAAkB,CAAC,cAAc,CAAC;IACtE,MAAM,EAAE,MAAM,CAAA;CACf;AACD,qBAAa,cAAe,SAAQ,QAAQ,CAAC,aAAa,GAAG,mBAAmB,CAAC;IAC/E,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ;CAuB7B;AAED,UAAU,oBAAqB,SAAQ,kBAAkB,CAAC,eAAe,CAAC;IACxE,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;CACzC;AAED,qBAAa,eAAgB,SAAQ,QAAQ,CAAC,aAAa,GAAG,oBAAoB,CAAC;IACjF,IAAI,MAAM,IAAI,IAAI,EAAE,CAUnB;IAED,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,EAExB;IAED,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ;CAoB7B;AAED,oBAAY,aAAa;IACvB,IAAI,IAAA;IACJ,KAAK,IAAA;IACL,IAAI,IAAA;IACJ,IAAI,IAAA;CACL;AASD,qBAAa,QAAQ;IACnB,UAAU,EAAE,QAAQ,CAAA;IACpB,UAAU,EAAE,QAAQ,CAAA;IACpB,SAAS,EAAE,OAAO,CAAA;IAClB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,eAAe,EAAE,OAAO,CAAA;IACxB,gBAAgB,EAAE,OAAO,CAAA;gBAEb,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ;IAsBpD,WAAW;IAeX,IAAI;CAyBL"}
+{"version":3,"file":"CollideComponent.d.ts","sourceRoot":"","sources":["../../src/collider/CollideComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAanC,UAAU,aAAc,SAAQ,kBAAkB,CAAC,QAAQ,CAAC;IAC1D,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACzB,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAA;IAC5C,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAA;IAC3C,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAA;CAC5C;AACD,qBAAa,QAAQ,CAAC,CAAC,GAAG,aAAa,CAAE,SAAQ,UAAU,CAAC,CAAC,CAAC;IAC5D,YAAY,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,CAAK;IACtC,cAAc,EAAE,IAAI,GAAG,EAAE,CAAC,KAAK,CAAA;IAC/B,YAAY,MAAA;IACZ,KAAK,EAAE,EAAE,CAAC,IAAI,CAAsB;IACpC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAsB;IAGvC,OAAO;IAKP,IAAI,KAAK;;;;;;;;;;;;;;;;;;;;;MAKR;CACF;AAED,UAAU,gBAAiB,SAAQ,kBAAkB,CAAC,WAAW,CAAC;IAChE,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AACD,qBAAa,WAAY,SAAQ,QAAQ,CAAC,aAAa,GAAG,gBAAgB,CAAC;IACzE,IAAI,IAAI,IAII,EAAE,CAAC,IAAI,CAFlB;IAED,IAAI,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,EAGlB;IAED,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ;CA8B7B;AAED,UAAU,mBAAoB,SAAQ,kBAAkB,CAAC,cAAc,CAAC;IACtE,MAAM,EAAE,MAAM,CAAA;CACf;AACD,qBAAa,cAAe,SAAQ,QAAQ,CAAC,aAAa,GAAG,mBAAmB,CAAC;IAC/E,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ;CAuB7B;AAED,UAAU,oBAAqB,SAAQ,kBAAkB,CAAC,eAAe,CAAC;IACxE,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;CACzC;AAED,qBAAa,eAAgB,SAAQ,QAAQ,CAAC,aAAa,GAAG,oBAAoB,CAAC;IACjF,IAAI,MAAM,IAAI,IAAI,EAAE,CAUnB;IAED,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,EAExB;IAED,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ;CAoB7B;AAED,oBAAY,aAAa;IACvB,IAAI,IAAA;IACJ,KAAK,IAAA;IACL,IAAI,IAAA;IACJ,IAAI,IAAA;CACL;AASD,qBAAa,QAAQ;IACnB,UAAU,EAAE,QAAQ,CAAA;IACpB,UAAU,EAAE,QAAQ,CAAA;IACpB,SAAS,EAAE,OAAO,CAAA;IAClB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,eAAe,EAAE,OAAO,CAAA;IACxB,gBAAgB,EAAE,OAAO,CAAA;gBAEb,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ;IAsBpD,WAAW;IAeX,IAAI;CAyBL"}

package/dist/collider/CollideComponent.js

@@ -50,12 +50,13 @@ export class BoxCollider extends Collider {
         const hh = height * 0.5;
         const transform = getNodeToWorldTransformAR(this.node);
         const rect = cc.rect(x - hw, y - hh, width, height);
-        const rectTrs = cc.rectApplyAffineTransform(rect, transform);
-        // cc.log(rectTrs);
-        this._worldPoints[0] = Vec2(rectTrs.x, rectTrs.y);
-        this._worldPoints[1] = Vec2(rectTrs.x, rectTrs.y + rectTrs.height);
-        this._worldPoints[2] = Vec2(rectTrs.x + rectTrs.width, rectTrs.y + rectTrs.height);
-        this._worldPoints[3] = Vec2(rectTrs.x + rectTrs.width, rectTrs.y);
+        const tempPoints = [
+            Vec2(rect.x, rect.y),
+            Vec2(rect.x, rect.y + rect.height),
+            Vec2(rect.x + rect.width, rect.y + rect.height),
+            Vec2(rect.x + rect.width, rect.y),
+        ];
+        this._worldPoints = tempPoints.map((p) => cc.pointApplyAffineTransform(p, transform));
         const listX = this._worldPoints.map(({ x }) => x);
         const listY = this._worldPoints.map(({ y }) => y);
         this._preAabb = cloneRect(this._AABB);

package/dist/dragonbones/DragonBonesComp.d.ts

@@ -12,9 +12,9 @@ interface DragonBonesProps {
     animation?: string;
     playTimes?: Integer;
     timeScale?: Float;
-    onAnimationStart?: () => void;
-    onAnimationEnd?: () => void;
-    onAnimationComplete?: () => void;
+    onAnimationStart?: (animationName?: string) => void;
+    onAnimationEnd?: (animationName?: string) => void;
+    onAnimationComplete?: (animationName?: string, loopCount?: number) => void;
 }
 export declare class DragonBonesComp extends ComponentX<DragonBonesProps & BaseComponentProps<DragonBonesComp>, CocosArmatureDisplay> {
     setAnimation(name: string, playTimes?: number): void;

package/dist/dragonbones/DragonBonesComp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DragonBonesComp.d.ts","sourceRoot":"","sources":["../../src/dragonbones/DragonBonesComp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAA;AACvC,OAAO,EAAE,UAAU,EAAU,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAA;AAEtE,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,UAAU,gBAAgB;IACxB,IAAI,EAAE,eAAe,CAAA;IACrB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,SAAS,CAAC,EAAE,KAAK,CAAA;IAEjB,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAA;IAC7B,cAAc,CAAC,EAAE,MAAM,IAAI,CAAA;IAC3B,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAA;CACjC;AAED,qBAAa,eAAgB,SAAQ,UAAU,CAAC,gBAAgB,GAAG,kBAAkB,CAAC,eAAe,CAAC,EAAE,oBAAoB,CAAC;IAC3H,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,SAAI;IAQxC,gBAAgB;IAKhB,eAAe,CAAC,IAAI,EAAE,MAAM;IAM5B,QAAQ,CAAC,OAAO,EAAE,OAAO;IAKzB,YAAY,CAAC,SAAS,EAAE,KAAK;CAI9B"}
+{"version":3,"file":"DragonBonesComp.d.ts","sourceRoot":"","sources":["../../src/dragonbones/DragonBonesComp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAA;AACvC,OAAO,EAAE,UAAU,EAAU,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAA;AAEtE,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,UAAU,gBAAgB;IACxB,IAAI,EAAE,eAAe,CAAA;IACrB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,SAAS,CAAC,EAAE,KAAK,CAAA;IAEjB,gBAAgB,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;IACnD,cAAc,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;IACjD,mBAAmB,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;CAC3E;AAED,qBAAa,eAAgB,SAAQ,UAAU,CAAC,gBAAgB,GAAG,kBAAkB,CAAC,eAAe,CAAC,EAAE,oBAAoB,CAAC;IAC3H,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,SAAI;IAQxC,gBAAgB;IAKhB,eAAe,CAAC,IAAI,EAAE,MAAM;IAM5B,QAAQ,CAAC,OAAO,EAAE,OAAO;IAKzB,YAAY,CAAC,SAAS,EAAE,KAAK;CAI9B"}

package/dist/dragonbones/DragonBonesSystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DragonBonesSystem.d.ts","sourceRoot":"","sources":["../../src/dragonbones/DragonBonesSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAO5E,MAAM,MAAM,oBAAoB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAA;AAEnD,qBAAa,iBAAkB,YAAW,MAAM;IAC9C,SAAS,CAAC,aAAa,EAAE,YAAY;IA4DrC,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;CAYjE"}
+{"version":3,"file":"DragonBonesSystem.d.ts","sourceRoot":"","sources":["../../src/dragonbones/DragonBonesSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAO5E,MAAM,MAAM,oBAAoB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAA;AAEnD,qBAAa,iBAAkB,YAAW,MAAM;IAC9C,SAAS,CAAC,aAAa,EAAE,YAAY;IA6DrC,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;CAYjE"}

package/dist/dragonbones/DragonBonesSystem.js

@@ -25,7 +25,7 @@ export class DragonBonesSystem {
             // armature.animation.gotoAndPlay('run', 0.2)
             node.armature.animation.timeScale = timeScale;
             if (animation) {
-                const state = node.armature.animation.gotoAndPlayByTime(animation, 0, playTimes);
+                node.armature.animation.gotoAndPlayByTime(animation, 0, playTimes);
             }
             // console.log('state', state);
             // if (skin) {
@@ -35,17 +35,17 @@ export class DragonBonesSystem {
             if (dbComp.props.onAnimationStart)
                 node.armature.eventDispatcher.addDBEventListener(EventObject.START, (event) => {
                     if (dbComp.node.active && dbComp.enabled)
-                        dbComp.props.onAnimationStart();
+                        dbComp.props.onAnimationStart(event.animationState.name);
                 }, dbComp);
             if (dbComp.props.onAnimationEnd)
                 node.armature.eventDispatcher.addDBEventListener(EventObject.COMPLETE, (event) => {
                     if (dbComp.node.active && dbComp.enabled)
-                        dbComp.props.onAnimationEnd();
+                        dbComp.props.onAnimationEnd(event.animationState.name);
                 }, dbComp);
             if (dbComp.props.onAnimationComplete)
                 node.armature.eventDispatcher.addDBEventListener(EventObject.LOOP_COMPLETE, (event) => {
                     if (dbComp.node.active && dbComp.enabled)
-                        dbComp.props.onAnimationComplete();
+                        dbComp.props.onAnimationComplete(event.animationState.name, event.animationState.currentPlayTimes);
                 }, dbComp);
         });
         event_manager.subscribe(EventTypes.ComponentRemoved, DragonBonesComp, ({ component }) => {

package/dist/gui/GUIComponent.d.ts

@@ -10,6 +10,7 @@ interface ButtonCompProps {
     normalImage?: string;
     selectedImage?: string;
     disableImage?: string;
+    param?: string;
     zoomScale?: number;
     onPress?: (target: ButtonComp) => void;
 }
@@ -72,5 +73,16 @@ interface WidgetCompProps {
 }
 export declare class WidgetComp extends ComponentX<WidgetCompProps & BaseComponentProps<WidgetComp>, cc.Node> {
 }
+interface GridLayoutCompProps {
+    top?: Integer;
+    left?: Integer;
+    spaceX?: Integer;
+    spaceY?: Integer;
+    columns?: Integer;
+}
+export declare class GridLayoutComp extends ComponentX<GridLayoutCompProps & BaseComponentProps<GridLayoutComp>, cc.Node> {
+    start(): void;
+    doLayout(): void;
+}
 export {};
 //# sourceMappingURL=GUIComponent.d.ts.map

package/dist/gui/GUIComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GUIComponent.d.ts","sourceRoot":"","sources":["../../src/gui/GUIComponent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GUIComponent.d.ts","sourceRoot":"","sources":["../../src/gui/GUIComponent.ts"],"names":[],"mappings":"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"}

package/dist/gui/GUIComponent.js

@@ -56,6 +56,22 @@ export class InputComp extends ComponentX {
 }
 export class WidgetComp extends ComponentX {
 }
+export class GridLayoutComp extends ComponentX {
+    start() {
+        this.doLayout();
+    }
+    doLayout() {
+        const { columns = 5, spaceX = 0, spaceY = 0, left = 0, top = 0 } = this.props;
+        const children = this.node.instance.children;
+        children.forEach((child, index) => {
+            const row = Math.floor(index / columns);
+            const column = index % columns;
+            const x = left + column * (child.width + spaceX) + child.width / 2;
+            const y = -top - row * (child.height + spaceY) - child.height / 2;
+            child.setPosition(x, y);
+        });
+    }
+}
 Object.defineProperty(ProgressTimerComp.prototype, 'render', { value: render });
 Object.defineProperty(LabelComp.prototype, 'render', { value: render });
 Object.defineProperty(ScrollViewComp.prototype, 'render', { value: render });

package/dist/gui/GUISystem.d.ts

@@ -8,5 +8,6 @@ export declare class GUISystem implements System {
     private onAddScrollViewComp;
     private onAddInputComp;
     private onAddWidgetComp;
+    private onAddGridLayoutComp;
 }
 //# sourceMappingURL=GUISystem.d.ts.map

package/dist/gui/GUISystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GUISystem.d.ts","sourceRoot":"","sources":["../../src/gui/GUISystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAoC,MAAM,EAAE,MAAM,YAAY,CAAA;AAMnF,qBAAa,SAAU,YAAW,MAAM;IACtC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAA;IAC1B,SAAS,CAAC,aAAa,EAAE,YAAY;IASrC,OAAO,CAAC,eAAe,CAuBtB;IAED,OAAO,CAAC,sBAAsB,CAc7B;IAED,OAAO,CAAC,cAAc,CAerB;IAED,OAAO,CAAC,mBAAmB,CAU1B;IAED,OAAO,CAAC,cAAc,CAWrB;IAED,OAAO,CAAC,eAAe,CAetB;CAKF"}
+{"version":3,"file":"GUISystem.d.ts","sourceRoot":"","sources":["../../src/gui/GUISystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAoC,MAAM,EAAE,MAAM,YAAY,CAAA;AAMnF,qBAAa,SAAU,YAAW,MAAM;IACtC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAA;IAC1B,SAAS,CAAC,aAAa,EAAE,YAAY;IAUrC,OAAO,CAAC,eAAe,CAuBtB;IAED,OAAO,CAAC,sBAAsB,CAc7B;IAED,OAAO,CAAC,cAAc,CAerB;IAED,OAAO,CAAC,mBAAmB,CAU1B;IAED,OAAO,CAAC,cAAc,CAWrB;IAED,OAAO,CAAC,eAAe,CAetB;IAED,OAAO,CAAC,mBAAmB,CAG1B;CAKF"}

package/dist/gui/GUISystem.js

@@ -2,7 +2,7 @@ import { EventTypes } from 'entityx-ts';
 import { NodeComp } from '../core/NodeComp';
 import { TouchEventRegister } from '../norender';
 import { Vec2 } from '../polyfills';
-import { ButtonComp, FillType, InputComp, LabelComp, ProgressTimerComp, ScrollViewComp, WidgetComp } from './GUIComponent';
+import { ButtonComp, FillType, GridLayoutComp, InputComp, LabelComp, ProgressTimerComp, ScrollViewComp, WidgetComp } from './GUIComponent';
 export class GUISystem {
     static defaultFont;
     configure(event_manager) {
@@ -12,6 +12,7 @@ export class GUISystem {
         event_manager.subscribe(EventTypes.ComponentAdded, ScrollViewComp, this.onAddScrollViewComp);
         event_manager.subscribe(EventTypes.ComponentAdded, InputComp, this.onAddInputComp);
         event_manager.subscribe(EventTypes.ComponentAdded, WidgetComp, this.onAddWidgetComp);
+        event_manager.subscribe(EventTypes.ComponentAdded, GridLayoutComp, this.onAddGridLayoutComp);
     }
     onAddButtonComp = ({ entity, component: button }) => {
         const nodeComp = entity.getComponent(NodeComp);
@@ -108,4 +109,8 @@ export class GUISystem {
             nodeComp.instance.x = left + nodeComp.instance.width * nodeComp.instance.anchorX;
         }
     };
+    onAddGridLayoutComp = ({ entity, component }) => {
+        component.node = entity.getComponent(NodeComp);
+        component.doLayout();
+    };
 }

package/dist/helper/action.d.ts

@@ -5,6 +5,7 @@ export declare function scaleTo(t: number, x: number, y?: number): cc.ScaleTo;
 export declare function scaleBy(t: number, x: number, y?: number): cc.ScaleBy;
 export declare function rotateBy(t: number, x: number, y?: number): cc.RotateBy;
 export declare function rotateTo(t: number, x: number, y?: number): cc.RotateTo;
+export declare function progressTo(t: number, p: number): any;
 export declare function callFunc(cb: () => void, target?: any, data?: any): cc.CallFunc;
 export declare function sequence(...actions: cc.FiniteTimeAction[]): cc.Sequence;
 export declare function repeatForever(action: cc.FiniteTimeAction): cc.RepeatForever;

package/dist/helper/action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"action.d.ts","sourceRoot":"","sources":["../../src/helper/action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAEnC,wBAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,aAEzC;AACD,wBAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,aAEzC;AAED,wBAAgB,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,cAEvD;AAED,wBAAgB,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,cAEvD;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,eAExD;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,eAExD;AAED,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,IAAI,EAAE,MAAM,CAAC,KAAA,EAAE,IAAI,CAAC,KAAA,eAEtD;AAED,wBAAgB,QAAQ,CAAC,GAAG,OAAO,EAAE,EAAE,CAAC,gBAAgB,EAAE,eAEzD;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,EAAE,CAAC,gBAAgB,oBAExD;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,gBAAgB,EAAE,KAAK,EAAE,OAAO,aAEjE;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,KAAK,gBAEpC;AAED,wBAAgB,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,YAEjD;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,aAEnD;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,KAAK,aAEjC;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,KAAK,cAElC;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC,cAAc,qBAEpD"}
+{"version":3,"file":"action.d.ts","sourceRoot":"","sources":["../../src/helper/action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAEnC,wBAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,aAEzC;AACD,wBAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,aAEzC;AAED,wBAAgB,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,cAEvD;AAED,wBAAgB,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,cAEvD;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,eAExD;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,eAExD;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,OAE9C;AAED,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,IAAI,EAAE,MAAM,CAAC,KAAA,EAAE,IAAI,CAAC,KAAA,eAEtD;AAED,wBAAgB,QAAQ,CAAC,GAAG,OAAO,EAAE,EAAE,CAAC,gBAAgB,EAAE,eAEzD;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,EAAE,CAAC,gBAAgB,oBAExD;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,gBAAgB,EAAE,KAAK,EAAE,OAAO,aAEjE;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,KAAK,gBAEpC;AAED,wBAAgB,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,YAEjD;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,aAEnD;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,KAAK,aAEjC;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,KAAK,cAElC;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC,cAAc,qBAEpD"}

package/dist/helper/action.js

@@ -16,6 +16,9 @@ export function rotateBy(t, x, y) {
 export function rotateTo(t, x, y) {
     return cc.rotateTo(t, x, y);
 }
+export function progressTo(t, p) {
+    return cc.progressTo(t, p);
+}
 export function callFunc(cb, target, data) {
     return cc.callFunc(cb, target, data);
 }

package/dist/render/TiledSprite.d.ts

@@ -3,10 +3,12 @@ export declare class TiledSpriteNode extends cc.Sprite {
     _tileScaleLoc: WebGLUniformLocation;
     _texSizeLoc: WebGLUniformLocation;
     _texLoc: WebGLUniformLocation;
+    _scaleLoc: WebGLUniformLocation;
+    _sizeLoc: WebGLUniformLocation;
     constructor(file: any);
     initShader(): void;
     updateShaderUniforms(): void;
     setContentSize(w: any, h: any): void;
 }
-export declare function createTiledSprite(src: string, totalW: number, totalH: number): cc.Sprite;
+export declare function createTiledSprite(src: string, totalW: number, totalH: number): TiledSpriteNode;
 //# sourceMappingURL=TiledSprite.d.ts.map

package/dist/render/TiledSprite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TiledSprite.d.ts","sourceRoot":"","sources":["../../src/render/TiledSprite.ts"],"names":[],"mappings":"AAEA,qBAAa,eAAgB,SAAQ,EAAE,CAAC,MAAM;IAC5C,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAA;IACtB,aAAa,EAAE,oBAAoB,CAAA;IACnC,WAAW,EAAE,oBAAoB,CAAA;IACjC,OAAO,EAAE,oBAAoB,CAAA;gBAEjB,IAAI,KAAA;IAMhB,UAAU;IAqBV,oBAAoB;IAgBpB,cAAc,CAAC,CAAC,KAAA,EAAE,CAAC,KAAA;CAIpB;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,aAmC5E"}
+{"version":3,"file":"TiledSprite.d.ts","sourceRoot":"","sources":["../../src/render/TiledSprite.ts"],"names":[],"mappings":"AAEA,qBAAa,eAAgB,SAAQ,EAAE,CAAC,MAAM;IAC5C,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAA;IACtB,aAAa,EAAE,oBAAoB,CAAA;IACnC,WAAW,EAAE,oBAAoB,CAAA;IACjC,OAAO,EAAE,oBAAoB,CAAA;IAC7B,SAAS,EAAE,oBAAoB,CAAA;IAC/B,QAAQ,EAAE,oBAAoB,CAAA;gBAElB,IAAI,KAAA;IAMhB,UAAU;IAuBV,oBAAoB;IAkBpB,cAAc,CAAC,CAAC,KAAA,EAAE,CAAC,KAAA;CAIpB;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,mBAS5E"}

package/dist/render/TiledSprite.js

@@ -4,9 +4,11 @@ export class TiledSpriteNode extends cc.Sprite {
     _tileScaleLoc;
     _texSizeLoc;
     _texLoc;
+    _scaleLoc;
+    _sizeLoc;
     constructor(file) {
-        super(file);
-        this.ctor();
+        super();
+        super.ctor(file);
         this.initShader();
     }
     initShader() {
@@ -24,6 +26,8 @@ export class TiledSpriteNode extends cc.Sprite {
         this._tileScaleLoc = program.getUniformLocationForName('u_tileScale');
         this._texSizeLoc = program.getUniformLocationForName('u_texSize');
         this._texLoc = program.getUniformLocationForName('u_texture');
+        this._scaleLoc = program.getUniformLocationForName('u_scale');
+        this._sizeLoc = program.getUniformLocationForName('u_size');
         this.scheduleUpdate();
     }
     updateShaderUniforms() {
@@ -32,12 +36,15 @@ export class TiledSpriteNode extends cc.Sprite {
         const texW = this.texture.width;
         const texH = this.texture.height;
         const size = this.getContentSize();
+        console.log('TiledSprite updateShaderUniforms', size, texW, texH);
         const scaleX = size.width / texW;
         const scaleY = size.height / texH;
         this._program.use();
         this._program.setUniformLocationWith2f(this._tileScaleLoc, scaleX, scaleY);
         this._program.setUniformLocationWith2f(this._texSizeLoc, texW, texH);
         this._program.setUniformLocationWith1i(this._texLoc, 0);
+        this._program.setUniformLocationWith2f(this._scaleLoc, scaleX, scaleY);
+        this._program.setUniformLocationWith2f(this._sizeLoc, size.width, size.height);
     }
     setContentSize(w, h) {
         super.setContentSize(w, h);
@@ -45,39 +52,14 @@ export class TiledSpriteNode extends cc.Sprite {
     }
 }
 export function createTiledSprite(src, totalW, totalH) {
-    // tạo sprite từ input
-    const tileSprite = new cc.Sprite(src);
-    // lấy kích thước gốc của texture
-    const tileW = tileSprite.texture.width;
-    const tileH = tileSprite.texture.height;
-    const program = new cc.GLProgram();
-    program.initWithString(tiledVsh, tieldFsh);
-    // program.initWithVertexShaderByteArray(vert, frag);
-    program.addAttribute(cc.ATTRIBUTE_NAME_POSITION, cc.VERTEX_ATTRIB_POSITION);
-    program.addAttribute(cc.ATTRIBUTE_NAME_COLOR, cc.VERTEX_ATTRIB_COLOR);
-    program.addAttribute(cc.ATTRIBUTE_NAME_TEX_COORD, cc.VERTEX_ATTRIB_TEX_COORDS);
-    if (!program.link()) {
-        console.error('Failed to link shader program');
-        return;
+    const tileSprite = new TiledSpriteNode(src);
+    function afterLoaded() {
+        tileSprite.setContentSize(totalW, totalH);
+        console.log('createTiledSprite', src, totalW, totalH, tileSprite);
     }
-    program.updateUniforms();
-    program.setUniformLocationWith1i(program.getUniformLocationForName('u_texture'), 0);
-    const tileScaleLoc = program.getUniformLocationForName('u_tileScale');
-    const texSizeLoc = program.getUniformLocationForName('u_texSize');
-    const scaleX = totalW / tileW;
-    const scaleY = totalH / tileH;
     if (tileSprite.texture._textureLoaded)
         afterLoaded();
     else
         tileSprite.texture.addLoadedEventListener(afterLoaded);
-    function afterLoaded() {
-        // program.use()
-        program.setUniformLocationWith2f(texSizeLoc, tileW, tileH);
-        program.setUniformLocationWith2f(tileScaleLoc, scaleX, scaleY);
-        tileSprite.setShaderProgram(program);
-        // nếu dùng batch node hoặc spriteframe atlas, đảm bảo texture unit đúng
-    }
-    // tileSprite.setContentSize(totalW, totalH)
-    tileSprite.setScale(scaleX, scaleY);
     return tileSprite;
 }

package/dist/render/shader.d.ts

@@ -1,3 +1,3 @@
 export declare const tieldFsh = "\n#ifdef GL_ES\nprecision mediump float;\n#endif\n\nvarying vec2 v_texCoord;\nvarying vec4 v_fragmentColor;\n\nuniform sampler2D u_texture;\nuniform vec2 u_tileScale;\nuniform vec2 u_texSize;\n\nvoid main()\n{\n    // scale UV to tile space\n    vec2 uv = v_texCoord * u_tileScale;\n\n    // wrap using fract\n    vec2 uvw = fract(uv);\n\n    // avoid linear-filter seams: push UVs slightly away from exact 0.0/1.0 edges\n    // compute texel size in uv-space\n    vec2 texel = 1.0 / u_texSize;\n\n    // shrink usable range slightly to avoid sampling border when linear filter is used\n    // the factor 1.0 - 2.0*texel moves the uv into [texel, 1-texel]\n    uvw = uvw * (1.0 - 2.0 * texel) + texel;\n\n    vec4 color = texture2D(u_texture, uvw);\n\n    gl_FragColor = color * v_fragmentColor;\n}\n";
-export declare const tiledVsh = "\nattribute vec4 a_position;\nattribute vec2 a_texCoord;\nattribute vec4 a_color;\n\n#ifdef GL_ES\nvarying mediump vec2 v_texCoord;\nvarying lowp vec4 v_fragmentColor;\n#else\nvarying vec2 v_texCoord;\nvarying vec4 v_fragmentColor;\n#endif\n\nvoid main() {\n    gl_Position = CC_PMatrix * a_position;\n    v_texCoord = a_texCoord;\n    v_fragmentColor = a_color;\n}\n";
+export declare const tiledVsh = "\nattribute vec4 a_position;\nattribute vec2 a_texCoord;\nattribute vec4 a_color;\n\n#ifdef GL_ES\nvarying mediump vec2 v_texCoord;\nvarying lowp vec4 v_fragmentColor;\n#else\nvarying vec2 v_texCoord;\nvarying vec4 v_fragmentColor;\n#endif\nuniform vec2 u_scale;\nuniform vec2 u_size;\n\nvoid main() {\n    vec2 pivot = u_size * 0.5;\n    vec4 pos = a_position;\n    // pos.xy *= u_scale;   // scale h\u00ECnh \u1EA3nh\n    pos.xy = (pos.xy - pivot) * u_scale + pivot;\n    gl_Position = CC_PMatrix * pos;\n    v_texCoord = a_texCoord;\n    v_fragmentColor = a_color;\n}\n";
 //# sourceMappingURL=shader.d.ts.map

package/dist/render/shader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader.d.ts","sourceRoot":"","sources":["../../src/render/shader.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,QAAQ,qyBAgCpB,CAAA;AACD,eAAO,MAAM,QAAQ,oXAkBpB,CAAA"}
+{"version":3,"file":"shader.d.ts","sourceRoot":"","sources":["../../src/render/shader.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,QAAQ,qyBAgCpB,CAAA;AACD,eAAO,MAAM,QAAQ,ikBAwBpB,CAAA"}

package/dist/render/shader.js

@@ -43,9 +43,15 @@ varying lowp vec4 v_fragmentColor;
 varying vec2 v_texCoord;
 varying vec4 v_fragmentColor;
 #endif
+uniform vec2 u_scale;
+uniform vec2 u_size;
 
 void main() {
-    gl_Position = CC_PMatrix * a_position;
+    vec2 pivot = u_size * 0.5;
+    vec4 pos = a_position;
+    // pos.xy *= u_scale;   // scale hình ảnh
+    pos.xy = (pos.xy - pivot) * u_scale + pivot;
+    gl_Position = CC_PMatrix * pos;
     v_texCoord = a_texCoord;
     v_fragmentColor = a_color;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@safe-engine/cocos",
-  "version": "2.5.11",
+  "version": "2.5.13",
   "description": "safe-engine with cocos renderer support",
   "type": "module",
   "main": "dist/index.js",