@safe-engine/cocos 1.2.2 → 1.3.4

package/@types/index.d.ts

@@ -1,5 +1,7 @@
 type Float = number
 type Integer = number
+declare var dragonBones: any;
+declare var PIXI: any;
 
 declare namespace cc {
   declare let v2: (x?: number | any, y?: number) => Vec2

package/@types/safex.d.ts

@@ -2,11 +2,9 @@ import { Color4B, NodeComp } from '../src'
 
 type ColorSource = ReturnType<typeof Color4B>
 
-interface RefComp<T> {
+interface BaseComponentProps<T> {
   $ref?: T
   $push?: T[]
-}
-interface BaseComponentProps extends RefComp<unknown> {
   $refNode?: NodeComp
   $pushNode?: NodeComp[]
   node?: Partial<NodeComp>

package/dist/dragonbones/PixiDragonBonesSprite.d.ts

@@ -0,0 +1,9 @@
+export declare const SharedDragonBonesManager: {
+    isLoaded: boolean;
+    factory: any;
+    assets: {};
+    loadAssetsOnce: (key: any, texJsonUrl: any, texPngUrl: any) => void;
+    buildArmatureDisplay: (key: any) => any;
+};
+export declare const PixiDragonBonesSprite: any;
+//# sourceMappingURL=PixiDragonBonesSprite.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"PixiDragonBonesSprite.d.ts","sourceRoot":"","sources":["../../src/dragonbones/PixiDragonBonesSprite.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,wBAAwB;;;;;;CAkCpC,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,GA+DlC,CAAC"}

package/dist/dragonbones/PixiDragonBonesSprite.js

@@ -0,0 +1,86 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PixiDragonBonesSprite = exports.SharedDragonBonesManager = void 0;
+exports.SharedDragonBonesManager = {
+    isLoaded: false,
+    factory: dragonBones.PixiFactory.factory,
+    assets: {},
+    loadAssetsOnce: function (key, texJsonUrl, texPngUrl) {
+        var _this = this;
+        if (this.assets[key]) {
+            return;
+        }
+        var loader = new PIXI.Loader();
+        loader
+            .add("ske" + key, key)
+            .add("texJson" + key, texJsonUrl)
+            .add("texPng" + key, texPngUrl)
+            .load(function (loader, resources) {
+            var dragonData = _this.factory.parseDragonBonesData(resources["ske" + key].data, key);
+            _this.factory.parseTextureAtlasData(resources["texJson" + key].data, resources["texPng" + key].texture, key);
+            _this.assets[key] = {
+                dragonData: dragonData,
+                texture: resources["texPng" + key].texture
+            };
+        });
+    },
+    buildArmatureDisplay: function (key) {
+        // console.log(this.assets[key])
+        var armatureNames = this.assets[key].dragonData.armatureNames;
+        var armatureName = armatureNames[0];
+        return this.factory.buildArmatureDisplay(armatureName, key);
+    }
+};
+exports.PixiDragonBonesSprite = cc.Sprite.extend({
+    ctor: function (config) {
+        this._super();
+        this._canvas = document.createElement("canvas");
+        this._canvas.width = config.width || 1024;
+        this._canvas.height = config.height || 1024;
+        this._pixiApp = new PIXI.Application({
+            view: this._canvas,
+            width: this._canvas.width,
+            height: this._canvas.height,
+            backgroundAlpha: 0, // nền trong suốt
+            transparent: true, // bắt buộc để alpha hoạt động
+            clearBeforeRender: true, // xoá trước khi vẽ frame mới
+            preserveDrawingBuffer: true, // giúp lấy ảnh từ canvas
+            antialias: true
+        });
+        this._texture = new cc.Texture2D();
+        this._texture.initWithElement(this._canvas);
+        this._texture.handleLoadedTexture();
+        this.initWithTexture(this._texture);
+        this._config = config;
+        this._armatureDisplay = null;
+        this._setupArmature();
+        // this.schedule(this.updateTexture, 1 / 30);
+    },
+    _setupArmature: function () {
+        var display = exports.SharedDragonBonesManager.buildArmatureDisplay(this._config.ske);
+        if (!display) {
+            console.error("Không thể build armature:", this._config.armatureName);
+            return;
+        }
+        display.animation.play(this._config.animationName, 0, this._config.playTimes);
+        display.x = this._canvas.width / 2;
+        display.y = this._canvas.height / 2;
+        display.scale.set(this._config.scale || 1);
+        this._pixiApp.stage.addChild(display);
+        this._armatureDisplay = display;
+    },
+    updateTexture: function () {
+        if (this._armatureDisplay) {
+            this._pixiApp.renderer.render(this._pixiApp.stage);
+            this._texture.initWithElement(this._canvas);
+            this._texture.handleLoadedTexture();
+            this.setTexture(this._texture);
+        }
+    },
+    onExit: function () {
+        // this.unschedule(this.updateTexture);
+        this._pixiApp.destroy(true, { children: true });
+        this._canvas.remove();
+        this._super();
+    }
+});

package/dist/dragonbones/index.d.ts

@@ -1,7 +1,9 @@
-import { EntityManager, EventManager, EventReceive, System } from 'entityx-ts';
-import { RefComp } from '../../@types/safex';
+import { EntityManager, EventManager, System } from 'entityx-ts';
+import { BaseComponentProps } from '../../@types/safex';
 import { ComponentX } from '../gworld/core/decorator';
-import { CocosArmatureDisplay } from './cocos/CocosArmatureDisplay';
+export type DragonBonesEventData = {
+    name: string;
+};
 export interface DragonBonesData {
     atlas: string;
     skeleton: string;
@@ -11,24 +13,36 @@ interface DragonBonesProps {
     data: DragonBonesData;
     skin?: string;
     animation?: string;
-    playTimes?: number;
-    timeScale?: number;
-    onAnimationStart?: (event: {
-        name: string;
-    }) => void;
-    onAnimationEnd?: (event: {
-        name: string;
-    }) => void;
-    onAnimationComplete?: (event: {
-        name: string;
-    }) => void;
+    playTimes?: Integer;
+    timeScale?: Float;
+    onAnimationStart?: () => void;
+    onAnimationEnd?: () => void;
+    onAnimationComplete?: () => void;
 }
-export declare class DragonBonesComp extends ComponentX<DragonBonesProps & RefComp<DragonBonesComp>, CocosArmatureDisplay> {
+interface PixiDragonBonesAnimation {
+    lastAnimationName: string;
+    gotoAndPlayByTime: (name: string, index?: number, playTimes?: number) => void;
+    play: (name: string, index?: number, playTimes?: number) => void;
+    timeScale: Float;
+}
+interface PixiDragonBonesArmature {
+    animation: PixiDragonBonesAnimation;
+    _armature: {
+        flipX: boolean;
+    };
+    removeDBEventListener: () => void;
+    addDBEventListener: (name: string, cb: (event: any) => void, target: any) => void;
+}
+export declare class DragonBonesComp extends ComponentX<DragonBonesProps & BaseComponentProps<DragonBonesComp>, cc.Node> {
+    armature: PixiDragonBonesArmature;
+    dragon: any;
     setAnimation(name: string, playTimes?: number): void;
+    getAnimationName(): string;
+    setFLipX(isFlipX: boolean): void;
+    setTimeScale(timeScale: Float): void;
 }
 export declare class DragonBonesSystem implements System {
     configure(event_manager: EventManager): void;
-    receive(type: string, event: EventReceive): void;
     update(entities: EntityManager, events: EventManager, dt: number): void;
 }
 export declare function setupDragonBones(): void;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/dragonbones/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,MAAM,EACP,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAG7C,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAGpE,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,gBAAgB;IACxB,IAAI,EAAE,eAAe,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACrD,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACnD,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CACzD;AACD,qBAAa,eAAgB,SAAQ,UAAU,CAAC,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC,EAAE,oBAAoB,CAAC;IAChH,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,SAAI;CAgBzC;AAED,qBAAa,iBAAkB,YAAW,MAAM;IAC9C,SAAS,CAAC,aAAa,EAAE,YAAY;IAMrC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY;IAoDzC,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;CAKjE;AAED,wBAAgB,gBAAgB,SAI/B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/dragonbones/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,YAAY,EAEZ,MAAM,EACP,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAGxD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAGtD,MAAM,MAAM,oBAAoB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAA;AACnD,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,gBAAgB;IACxB,IAAI,EAAE,eAAe,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,KAAK,CAAC;IAElB,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAC;CAClC;AACD,UAAU,wBAAwB;IAChC,iBAAiB,EAAE,MAAM,CAAA;IACzB,iBAAiB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;IAC7E,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;IAChE,SAAS,EAAE,KAAK,CAAA;CACjB;AACD,UAAU,uBAAuB;IAC/B,SAAS,EAAE,wBAAwB,CAAA;IACnC,SAAS,EAAE;QACT,KAAK,EAAE,OAAO,CAAA;KACf,CAAA;IACD,qBAAqB,EAAE,MAAM,IAAI,CAAA;IACjC,kBAAkB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,EAAE,MAAM,EAAE,GAAG,KAAK,IAAI,CAAA;CAClF;AACD,qBAAa,eAAgB,SAAQ,UAAU,CAAC,gBAAgB,GAAG,kBAAkB,CAAC,eAAe,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC;IAC9G,QAAQ,EAAE,uBAAuB,CAAA;IACjC,MAAM,EAAE,GAAG,CAAA;IACX,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,SAAI;IAWxC,gBAAgB;IAShB,QAAQ,CAAC,OAAO,EAAE,OAAO;IAIzB,YAAY,CAAC,SAAS,EAAE,KAAK;CAG9B;AAED,qBAAa,iBAAkB,YAAW,MAAM;IAC9C,SAAS,CAAC,aAAa,EAAE,YAAY;IA+CrC,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;CAWjE;AAED,wBAAgB,gBAAgB,SAI/B"}

package/dist/dragonbones/index.js

@@ -18,11 +18,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DragonBonesSystem = exports.DragonBonesComp = void 0;
 exports.setupDragonBones = setupDragonBones;
 var entityx_ts_1 = require("entityx-ts");
-var dragonbones_js_1 = require("@cocos/dragonbones-js");
 var gworld_1 = require("../gworld");
 var NodeComp_1 = require("../gworld/components/NodeComp");
 var decorator_1 = require("../gworld/core/decorator");
-var CocosFactory_1 = require("./cocos/CocosFactory");
+var PixiDragonBonesSprite_1 = require("./PixiDragonBonesSprite");
 var DragonBonesComp = /** @class */ (function (_super) {
     __extends(DragonBonesComp, _super);
     function DragonBonesComp() {
@@ -30,11 +29,26 @@ var DragonBonesComp = /** @class */ (function (_super) {
     }
     DragonBonesComp.prototype.setAnimation = function (name, playTimes) {
         if (playTimes === void 0) { playTimes = 0; }
-        var skel = this.node.instance;
-        if (skel.armature) {
-            skel.armature.animation.gotoAndPlayByTime(name, 0, playTimes);
+        if (this.armature) {
+            if (this.armature.animation.lastAnimationName === name)
+                return;
+            this.armature.animation.gotoAndPlayByTime(name, 0, playTimes);
         }
     };
+    DragonBonesComp.prototype.getAnimationName = function () {
+        return this.armature.animation.lastAnimationName;
+    };
+    // setSkeletonData(data: string) {
+    //   const skel = this.node.instance as CocosArmatureDisplay;
+    //   const atlas = data.replace('.json', '.atlas');
+    //   skel.armature.armatureData(data, atlas, this.node.scale);
+    // }
+    DragonBonesComp.prototype.setFLipX = function (isFlipX) {
+        this.armature._armature.flipX = isFlipX;
+    };
+    DragonBonesComp.prototype.setTimeScale = function (timeScale) {
+        this.armature.animation.timeScale = timeScale;
+    };
     return DragonBonesComp;
 }(decorator_1.ComponentX));
 exports.DragonBonesComp = DragonBonesComp;
@@ -42,58 +56,63 @@ var DragonBonesSystem = /** @class */ (function () {
     function DragonBonesSystem() {
     }
     DragonBonesSystem.prototype.configure = function (event_manager) {
-        event_manager.subscribe((0, entityx_ts_1.ComponentAddedEvent)(DragonBonesComp), this);
-        event_manager.subscribe((0, entityx_ts_1.ComponentRemovedEvent)(DragonBonesComp), this);
-        CocosFactory_1.CocosFactory.newInstance();
-    };
-    DragonBonesSystem.prototype.receive = function (type, event) {
-        switch (type) {
-            case (0, entityx_ts_1.ComponentAddedEvent)(DragonBonesComp): {
-                console.log('DragonBonesComp', event);
-                var ett = event.entity;
-                var dbComp = event.entity.getComponent(DragonBonesComp);
-                var _a = dbComp.props, data = _a.data, animation = _a.animation, _b = _a.playTimes, playTimes = _b === void 0 ? 0 : _b;
-                // const texturePath = atlas.replace('.json', '.png')
-                var atlas = data.atlas, skeleton = data.skeleton, texture = data.texture;
-                // cc.textureCache.addImage(texture)
-                var factory = CocosFactory_1.CocosFactory.factory;
-                var dataSkel = cc.loader.getRes(skeleton);
-                var dataAtlas = cc.loader.getRes(atlas);
-                var textureCache = cc.textureCache.getTextureForKey(texture);
-                // texture.initWithFile(texturePath)
-                factory.parseDragonBonesData(dataSkel);
-                factory.parseTextureAtlasData(dataAtlas, textureCache);
-                // factory.loadDragonBonesData(skel)
-                // console.log(skeleton, dataSkel)
-                var node = factory.buildArmatureDisplay(dataSkel.armature[0].name, dataSkel.name);
-                // node.armature.eventDispatcher.addDBEventListener(EventObject.COMPLETE, dbComp.props.onAnimationEnd, dbComp)
-                node.armature.eventDispatcher.addDBEventListener(dragonbones_js_1.EventObject.LOOP_COMPLETE, dbComp.props.onAnimationComplete, dbComp);
-                // console.log('armature', armature)
-                console.log('node', node);
-                // armature.animation.gotoAndPlay('run', 0.2)
-                var state = node.armature.animation.gotoAndPlayByTime(animation, 0, playTimes);
-                console.log('state', state);
-                // if (skin) {
-                //   node.setSkin(skin)
-                // }
-                // if (animation) {
-                //   dbComp.setAnimation(animation, playTimes)
-                // }
-                dbComp.node = ett.assign(new NodeComp_1.NodeComp(node, ett));
-                break;
-            }
-            case (0, entityx_ts_1.ComponentRemovedEvent)(DragonBonesComp): {
-                // const { component } = event
-                break;
-            }
-            default:
-                break;
-        }
+        event_manager.subscribe(entityx_ts_1.EventTypes.ComponentAdded, DragonBonesComp, function (_a) {
+            var entity = _a.entity;
+            var dbComp = entity.getComponent(DragonBonesComp);
+            var _b = dbComp.props, data = _b.data, animation = _b.animation, _c = _b.playTimes, playTimes = _c === void 0 ? 0 : _c, _d = _b.timeScale, timeScale = _d === void 0 ? 1 : _d;
+            var atlas = data.atlas, skeleton = data.skeleton, texture = data.texture;
+            var dragon = new PixiDragonBonesSprite_1.PixiDragonBonesSprite({
+                ske: skeleton,
+                texJson: atlas,
+                texPng: texture,
+                animationName: animation,
+                playTimes: playTimes,
+                // width: dataSkel.armature[0].aabb.width,
+                // height: dataSkel.armature[0].aabb.height,
+            });
+            dbComp.dragon = dragon;
+            dbComp.armature = dragon._armatureDisplay;
+            var node = new cc.Node();
+            node.addChild(dragon);
+            // console.log('armature', dbComp.armature)
+            dbComp.armature.animation.timeScale = timeScale;
+            // if (skin) {
+            //   node.setSkin(skin)
+            // }
+            dbComp.node = entity.assign(new NodeComp_1.NodeComp(node, entity));
+            if (dbComp.props.onAnimationStart)
+                dbComp.armature.addDBEventListener(dragonBones.EventObject.START, function (event) {
+                    if (dbComp.node.active && dbComp.enabled)
+                        dbComp.props.onAnimationStart();
+                }, dbComp);
+            if (dbComp.props.onAnimationEnd)
+                dbComp.armature.addDBEventListener(dragonBones.EventObject.COMPLETE, function (event) {
+                    if (dbComp.node.active && dbComp.enabled)
+                        dbComp.props.onAnimationEnd();
+                }, dbComp);
+            if (dbComp.props.onAnimationComplete)
+                dbComp.armature.addDBEventListener(dragonBones.EventObject.LOOP_COMPLETE, function (event) {
+                    if (dbComp.node.active && dbComp.enabled)
+                        dbComp.props.onAnimationComplete();
+                }, dbComp);
+        });
+        event_manager.subscribe(entityx_ts_1.EventTypes.ComponentRemoved, DragonBonesComp, function (_a) {
+            var component = _a.component;
+            var dbComp = component;
+            dbComp.armature.removeDBEventListener();
+            dbComp.node.removeAllChildren();
+        });
     };
     DragonBonesSystem.prototype.update = function (entities, events, dt) {
-        // throw new Error('Method not implemented.')
         // console.log('update', dt)
-        CocosFactory_1.CocosFactory.advanceTime(dt);
+        var animations = entities.entities_with_components(DragonBonesComp);
+        // cc.log(animations);
+        animations.forEach(function (ett) {
+            var dbComp = ett.getComponent(DragonBonesComp);
+            if (dbComp.node && dbComp.node.active) {
+                dbComp.dragon.updateTexture();
+            }
+        });
     };
     return DragonBonesSystem;
 }());

package/dist/gworld/components/CollideComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CollideComponent.d.ts","sourceRoot":"","sources":["../../../src/gworld/components/CollideComponent.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAYtD,UAAU,aAAa;IACrB,MAAM,CAAC,EAAE,IAAI,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,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,kBAAkB,CAAC,CAAC,CAAC;IACpE,YAAY,EAAE,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,CAAK;IACzC,cAAc,EAAE,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,KAAK,CAAA;IAClC,YAAY,MAAA;IACZ,KAAK,EAAE,EAAE,CAAC,IAAI,CAAsB;IACpC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAsB;IAGvC,OAAO;IAGP,IAAI,KAAK;;;MAKR;CACF;AAED,UAAU,gBAAiB,SAAQ,aAAa;IAC9C,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AACD,qBAAa,WAAY,SAAQ,QAAQ,CAAC,gBAAgB,CAAC;IACzD,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;CA4B7B;AAED,UAAU,mBAAoB,SAAQ,aAAa;IACjD,MAAM,EAAE,MAAM,CAAA;CACf;AACD,qBAAa,cAAe,SAAQ,QAAQ,CAAC,mBAAmB,CAAC;IAC/D,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ;CAqB7B;AAED,UAAU,oBAAqB,SAAQ,aAAa;IAClD,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;CACpB;AAED,qBAAa,eAAgB,SAAQ,QAAQ,CAAC,oBAAoB,CAAC;IACjE,IAAI,MAAM,IAAI,IAAI,EAAE,CAInB;IAED,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,EAExB;IAED,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ;CAqB7B;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/gworld/components/CollideComponent.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAYtD,UAAU,aAAa;IACrB,MAAM,CAAC,EAAE,IAAI,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,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,kBAAkB,CAAC,CAAC,CAAC;IACpE,YAAY,EAAE,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,CAAK;IACzC,cAAc,EAAE,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,KAAK,CAAA;IAClC,YAAY,MAAA;IACZ,KAAK,EAAE,EAAE,CAAC,IAAI,CAAsB;IACpC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAsB;IAGvC,OAAO;IAMP,IAAI,KAAK;;;MAKR;CACF;AAED,UAAU,gBAAiB,SAAQ,aAAa;IAC9C,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AACD,qBAAa,WAAY,SAAQ,QAAQ,CAAC,gBAAgB,CAAC;IACzD,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;CA4B7B;AAED,UAAU,mBAAoB,SAAQ,aAAa;IACjD,MAAM,EAAE,MAAM,CAAA;CACf;AACD,qBAAa,cAAe,SAAQ,QAAQ,CAAC,mBAAmB,CAAC;IAC/D,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ;CAqB7B;AAED,UAAU,oBAAqB,SAAQ,aAAa;IAClD,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;CACpB;AAED,qBAAa,eAAgB,SAAQ,QAAQ,CAAC,oBAAoB,CAAC;IACjE,IAAI,MAAM,IAAI,IAAI,EAAE,CAInB;IAED,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,EAExB;IAED,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ;CAqB7B;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/gworld/components/CollideComponent.js

@@ -43,6 +43,9 @@ var Collider = /** @class */ (function (_super) {
     }
     // update(dt: number, draw?: cc.DrawNode) {}
     Collider.prototype.getAABB = function () {
+        var collider = this.getComponent(Collider);
+        if (collider)
+            return collider._AABB;
         return this._AABB;
     };
     Object.defineProperty(Collider.prototype, "world", {

package/dist/gworld/components/EnhancedComponent.d.ts

@@ -6,7 +6,7 @@ export declare class EnhancedComponent<Props = object, N extends NodeComp<any> =
     props: Props;
     node: N;
     enabled: boolean;
-    constructor(data?: BaseComponentProps & Props);
+    constructor(data?: BaseComponentProps<EnhancedComponent> & Props);
     init(data?: Props): void;
     addComponent<T extends EnhancedComponent>(instance: T): T;
     getComponent<T extends EnhancedComponent>(component: Constructor<T>): T;

package/dist/gworld/components/EnhancedComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EnhancedComponent.d.ts","sourceRoot":"","sources":["../../../src/gworld/components/EnhancedComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,qBAAa,iBAAiB,CAAC,KAAK,GAAG,MAAM,EAAE,CAAC,SAAS,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC;IACpF,MAAM,CAAC,SAAS,UAAO;IACvB,KAAK,EAAE,KAAK,CAAY;IACxB,IAAI,EAAE,CAAC,CAAA;IACP,OAAO,EAAE,OAAO,CAAO;gBACX,IAAI,CAAC,EAAE,kBAAkB,GAAG,KAAK;IAG7C,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK;IASjB,YAAY,CAAC,CAAC,SAAS,iBAAiB,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC;IAGzD,YAAY,CAAC,CAAC,SAAS,iBAAiB,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;IAGvE,QAAQ,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAE,MAAgC,EAAE,KAAK,SAAI;IAG5G,UAAU,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI;IAGvC,sBAAsB;IAGtB,YAAY,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;IAGtE,uBAAuB,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE;IAGhF,sBAAsB,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;IAG7E,OAAO,CAAC,KAAK,EAAE,iBAAiB;CAGjC;AAED,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAAG,QAAQ,CAAA"}
+{"version":3,"file":"EnhancedComponent.d.ts","sourceRoot":"","sources":["../../../src/gworld/components/EnhancedComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,qBAAa,iBAAiB,CAAC,KAAK,GAAG,MAAM,EAAE,CAAC,SAAS,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC;IACpF,MAAM,CAAC,SAAS,UAAO;IACvB,KAAK,EAAE,KAAK,CAAY;IACxB,IAAI,EAAE,CAAC,CAAA;IACP,OAAO,EAAE,OAAO,CAAO;gBACX,IAAI,CAAC,EAAE,kBAAkB,CAAC,iBAAiB,CAAC,GAAG,KAAK;IAGhE,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK;IASjB,YAAY,CAAC,CAAC,SAAS,iBAAiB,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC;IAGzD,YAAY,CAAC,CAAC,SAAS,iBAAiB,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;IAGvE,QAAQ,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAE,MAAgC,EAAE,KAAK,SAAI;IAG5G,UAAU,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI;IAGvC,sBAAsB;IAGtB,YAAY,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;IAGtE,uBAAuB,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE;IAGhF,sBAAsB,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;IAG7E,OAAO,CAAC,KAAK,EAAE,iBAAiB;CAGjC;AAED,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAAG,QAAQ,CAAA"}

package/dist/gworld/components/GUIComponent.d.ts

@@ -1,4 +1,4 @@
-import { LabelCompProps, LabelOutlineCompProps, LabelShadowCompProps, ProgressTimerProps, RefComp } from '../../../@types/safex';
+import { BaseComponentProps, LabelCompProps, LabelOutlineCompProps, LabelShadowCompProps, ProgressTimerProps } from '../../../@types/safex';
 import { Color4B, Size, Vec2 } from '../../polyfills';
 import { ComponentX, NoRenderComponentX } from '../core/decorator';
 export declare const FillType: {
@@ -20,7 +20,7 @@ export declare class ButtonComp extends NoRenderComponentX<ButtonCompProps> {
     clickEvents: any[];
     setOnPress(cb: (target: ButtonComp) => void): void;
 }
-export declare class ProgressTimerComp extends ComponentX<ProgressTimerProps & RefComp<ProgressTimerComp>> {
+export declare class ProgressTimerComp extends ComponentX<ProgressTimerProps & BaseComponentProps<ProgressTimerComp>, cc.ProgressTimer & cc.Node> {
     spriteFrame: string;
     fillType: Values;
     fillRange: number;
@@ -30,11 +30,11 @@ export declare class ProgressTimerComp extends ComponentX<ProgressTimerProps & R
     setFillStart(val: number): void;
     setFillRange(val: number): void;
 }
-export declare class LabelComp extends ComponentX<LabelCompProps & RefComp<LabelComp>, ccui.Text> {
+export declare class LabelComp extends ComponentX<LabelCompProps & BaseComponentProps<LabelComp>, ccui.Text> {
     getString(): string;
     setString(val: string): void;
 }
-export declare class RichTextComp extends ComponentX<LabelCompProps & RefComp<RichTextComp>, ccui.RichText> {
+export declare class RichTextComp extends ComponentX<LabelCompProps & BaseComponentProps<RichTextComp>, ccui.RichText> {
     get string(): string;
     set string(val: string);
 }
@@ -58,7 +58,7 @@ interface ScrollViewProps {
     contentSize: Size;
     direction?: ScrollViewDirection;
 }
-export declare class ScrollViewComp extends ComponentX<ScrollViewProps & RefComp<ScrollViewComp>, cc.ScrollView> {
+export declare class ScrollViewComp extends ComponentX<ScrollViewProps & BaseComponentProps<ScrollViewComp>, cc.ScrollView> {
     zoom(scale: number): void;
 }
 export declare class BlockInputEventsComp extends NoRenderComponentX {

package/dist/gworld/components/GUIComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GUIComponent.d.ts","sourceRoot":"","sources":["../../../src/gworld/components/GUIComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAEhI,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAElE,eAAO,MAAM,QAAQ;;;;CAIpB,CAAA;AACD,KAAK,IAAI,GAAG,MAAM,OAAO,QAAQ,CAAA;AACjC,KAAK,MAAM,GAAG,CAAC,OAAO,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAA;AAGrC,UAAU,eAAe;IACvB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;CACvC;AACD,qBAAa,UAAW,SAAQ,kBAAkB,CAAC,eAAe,CAAC;IACjE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAA;IAChC,WAAW,QAAK;IAEhB,UAAU,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI;CAO5C;AAED,qBAAa,iBAAkB,SAAQ,UAAU,CAAC,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAChG,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,IAAI,CAAA;IAChB,SAAS,EAAE,OAAO,CAAA;IAElB,YAAY;IAMZ,YAAY,CAAC,GAAG,EAAE,MAAM;IAMxB,YAAY,CAAC,GAAG,EAAE,MAAM;CAKzB;AAED,qBAAa,SAAU,SAAQ,UAAU,CAAC,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC;IAKvF,SAAS;IAIT,SAAS,CAAC,GAAG,EAAE,MAAM;CAMtB;AAED,qBAAa,YAAa,SAAQ,UAAU,CAAC,cAAc,GAAG,OAAO,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;IACjG,IAAI,MAAM,IAIM,MAAM,CAFrB;IAED,IAAI,MAAM,CAAC,GAAG,EAAE,MAAM,EAoBrB;CACF;AAED,qBAAa,gBAAiB,SAAQ,kBAAkB,CAAC,qBAAqB,CAAC;IAC7E,KAAK,EAAE,OAAO,OAAO,CAAA;IACrB,KAAK,EAAE,KAAK,CAAA;CACb;AAED,qBAAa,eAAgB,SAAQ,kBAAkB,CAAC,oBAAoB,CAAC;IAC3E,KAAK,EAAE,OAAO,OAAO,CAAA;IACrB,IAAI,EAAE,KAAK,CAAA;IACX,MAAM,EAAE,IAAI,CAAA;CACb;AAED,oBAAY,mBAAmB;IAC7B,IAAmC;IACnC,UAA+C;IAC/C,QAA2C;IAC3C,IAAmC;CACpC;AACD,UAAU,eAAe;IACvB,QAAQ,EAAE,IAAI,CAAA;IACd,WAAW,EAAE,IAAI,CAAA;IACjB,SAAS,CAAC,EAAE,mBAAmB,CAAA;CAChC;AACD,qBAAa,cAAe,SAAQ,UAAU,CAAC,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC;IACtG,IAAI,CAAC,KAAK,EAAE,MAAM;CAKnB;AAED,qBAAa,oBAAqB,SAAQ,kBAAkB;CAAI"}
+{"version":3,"file":"GUIComponent.d.ts","sourceRoot":"","sources":["../../../src/gworld/components/GUIComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAE3I,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAElE,eAAO,MAAM,QAAQ;;;;CAIpB,CAAA;AACD,KAAK,IAAI,GAAG,MAAM,OAAO,QAAQ,CAAA;AACjC,KAAK,MAAM,GAAG,CAAC,OAAO,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAA;AAGrC,UAAU,eAAe;IACvB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;CACvC;AACD,qBAAa,UAAW,SAAQ,kBAAkB,CAAC,eAAe,CAAC;IACjE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAA;IAChC,WAAW,QAAK;IAEhB,UAAU,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI;CAO5C;AAED,qBAAa,iBAAkB,SAAQ,UAAU,CAAC,kBAAkB,GAAG,kBAAkB,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC,aAAa,GAAG,EAAE,CAAC,IAAI,CAAC;IACvI,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,IAAI,CAAA;IAChB,SAAS,EAAE,OAAO,CAAA;IAElB,YAAY;IAMZ,YAAY,CAAC,GAAG,EAAE,MAAM;IAMxB,YAAY,CAAC,GAAG,EAAE,MAAM;CAKzB;AAED,qBAAa,SAAU,SAAQ,UAAU,CAAC,cAAc,GAAG,kBAAkB,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC;IAKlG,SAAS;IAIT,SAAS,CAAC,GAAG,EAAE,MAAM;CAMtB;AAED,qBAAa,YAAa,SAAQ,UAAU,CAAC,cAAc,GAAG,kBAAkB,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;IAC5G,IAAI,MAAM,IAIM,MAAM,CAFrB;IAED,IAAI,MAAM,CAAC,GAAG,EAAE,MAAM,EAoBrB;CACF;AAED,qBAAa,gBAAiB,SAAQ,kBAAkB,CAAC,qBAAqB,CAAC;IAC7E,KAAK,EAAE,OAAO,OAAO,CAAA;IACrB,KAAK,EAAE,KAAK,CAAA;CACb;AAED,qBAAa,eAAgB,SAAQ,kBAAkB,CAAC,oBAAoB,CAAC;IAC3E,KAAK,EAAE,OAAO,OAAO,CAAA;IACrB,IAAI,EAAE,KAAK,CAAA;IACX,MAAM,EAAE,IAAI,CAAA;CACb;AAED,oBAAY,mBAAmB;IAC7B,IAAmC;IACnC,UAA+C;IAC/C,QAA2C;IAC3C,IAAmC;CACpC;AACD,UAAU,eAAe;IACvB,QAAQ,EAAE,IAAI,CAAA;IACd,WAAW,EAAE,IAAI,CAAA;IACjB,SAAS,CAAC,EAAE,mBAAmB,CAAA;CAChC;AACD,qBAAa,cAAe,SAAQ,UAAU,CAAC,eAAe,GAAG,kBAAkB,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC;IACjH,IAAI,CAAC,KAAK,EAAE,MAAM;CAKnB;AAED,qBAAa,oBAAqB,SAAQ,kBAAkB;CAAI"}

package/dist/gworld/components/NoRenderComponent.d.ts

@@ -20,6 +20,7 @@ interface TouchEventProps {
 export declare class TouchEventRegister extends NoRenderComponentX<TouchEventProps> {
     listener: cc.EventListener;
     touch: cc.Touch;
+    setEnabled(enabled: boolean): void;
 }
 interface ExtraDataProps {
     key: string;
@@ -31,6 +32,7 @@ export declare class ExtraDataComp extends NoRenderComponentX<ExtraDataProps> {
     };
     getData<T>(key: string): T;
     setData<T>(key: string, val: T): void;
+    removeData(key: string): void;
 }
 export {};
 //# sourceMappingURL=NoRenderComponent.d.ts.map

package/dist/gworld/components/NoRenderComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NoRenderComponent.d.ts","sourceRoot":"","sources":["../../../src/gworld/components/NoRenderComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAExD,KAAK,kBAAkB,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,QAAQ,KAAK,IAAI,CAAA;AAElE,MAAM,WAAW,QAAQ;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,iBAAiB,CAAC,CAAA;CACnC;AAED,qBAAa,aAAc,SAAQ,kBAAkB;IACnD,MAAM,EAAE,QAAQ,CAAK;IAErB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,GAAG;IAS1D,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,GAAG;IAK5D,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG;CAKlC;AAED,UAAU,eAAe;IACvB,YAAY,CAAC,EAAE,kBAAkB,CAAA;IACjC,WAAW,CAAC,EAAE,kBAAkB,CAAA;IAChC,UAAU,CAAC,EAAE,kBAAkB,CAAA;IAC/B,aAAa,CAAC,EAAE,kBAAkB,CAAA;CACnC;AACD,qBAAa,kBAAmB,SAAQ,kBAAkB,CAAC,eAAe,CAAC;IACzE,QAAQ,EAAE,EAAE,CAAC,aAAa,CAAA;IAC1B,KAAK,EAAE,EAAE,CAAC,KAAK,CAAA;CAChB;AAED,UAAU,cAAc;IACtB,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,OAAO,GAAG,KAAK,GAAG,MAAM,CAAA;CAChC;AACD,qBAAa,aAAc,SAAQ,kBAAkB,CAAC,cAAc,CAAC;IACnE,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAK;IACjC,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC;IAG1B,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;CAG/B"}
+{"version":3,"file":"NoRenderComponent.d.ts","sourceRoot":"","sources":["../../../src/gworld/components/NoRenderComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAExD,KAAK,kBAAkB,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,QAAQ,KAAK,IAAI,CAAA;AAElE,MAAM,WAAW,QAAQ;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,iBAAiB,CAAC,CAAA;CACnC;AAED,qBAAa,aAAc,SAAQ,kBAAkB;IACnD,MAAM,EAAE,QAAQ,CAAK;IAErB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,GAAG;IAS1D,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,GAAG;IAK5D,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG;CAMlC;AAED,UAAU,eAAe;IACvB,YAAY,CAAC,EAAE,kBAAkB,CAAA;IACjC,WAAW,CAAC,EAAE,kBAAkB,CAAA;IAChC,UAAU,CAAC,EAAE,kBAAkB,CAAA;IAC/B,aAAa,CAAC,EAAE,kBAAkB,CAAA;CACnC;AACD,qBAAa,kBAAmB,SAAQ,kBAAkB,CAAC,eAAe,CAAC;IACzE,QAAQ,EAAE,EAAE,CAAC,aAAa,CAAA;IAC1B,KAAK,EAAE,EAAE,CAAC,KAAK,CAAA;IACf,UAAU,CAAC,OAAO,EAAE,OAAO;CAG5B;AAED,UAAU,cAAc;IACtB,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,OAAO,GAAG,KAAK,GAAG,MAAM,CAAA;CAChC;AACD,qBAAa,aAAc,SAAQ,kBAAkB,CAAC,cAAc,CAAC;IACnE,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAK;IACjC,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC;IAG1B,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IAG9B,UAAU,CAAC,GAAG,EAAE,MAAM;CAGvB"}

package/dist/gworld/components/NoRenderComponent.js

@@ -41,6 +41,7 @@ var EventRegister = /** @class */ (function (_super) {
         for (var _i = 1; _i < arguments.length; _i++) {
             params[_i - 1] = arguments[_i];
         }
+        // if (!this.node || !this.node.active || !this.enabled) return
         if (this.events[name]) {
             this.events[name].forEach(function (fc) { return fc.apply(void 0, params); });
         }
@@ -53,6 +54,9 @@ var TouchEventRegister = /** @class */ (function (_super) {
     function TouchEventRegister() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
+    TouchEventRegister.prototype.setEnabled = function (enabled) {
+        this.listener.setEnabled(enabled);
+    };
     return TouchEventRegister;
 }(decorator_1.NoRenderComponentX));
 exports.TouchEventRegister = TouchEventRegister;
@@ -69,6 +73,9 @@ var ExtraDataComp = /** @class */ (function (_super) {
     ExtraDataComp.prototype.setData = function (key, val) {
         this.data[key] = val;
     };
+    ExtraDataComp.prototype.removeData = function (key) {
+        delete this.data[key];
+    };
     return ExtraDataComp;
 }(decorator_1.NoRenderComponentX));
 exports.ExtraDataComp = ExtraDataComp;