@safe-engine/cocos 1.1.0 → 1.2.1

package/dist/dragonbones/cocos/CocosArmatureDisplay.d.ts

@@ -20,7 +20,7 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-import { Armature, EventObject, EventStringType, IArmatureProxy } from '@cocos/dragonbones-js';
+import { Animation, Armature, EventObject, EventStringType, IArmatureProxy } from '@cocos/dragonbones-js';
 export declare class CocosArmatureDisplay extends cc.Sprite implements IArmatureProxy {
     /**
      * @private
@@ -29,6 +29,12 @@ export declare class CocosArmatureDisplay extends cc.Sprite implements IArmature
     private _debugDraw;
     private _armature;
     private _debugDrawer;
+    eventDispatcher: cc.EventManager;
+    listenerCount: {};
+    constructor();
+    hasEvent(type: EventStringType): boolean;
+    addEvent(type: EventStringType, listener: Function, thisObject: any): void;
+    removeEvent(type: EventStringType, listener: Function, thisObject: any): void;
     /**
      * @inheritDoc
      */

package/dist/dragonbones/cocos/CocosArmatureDisplay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CocosArmatureDisplay.d.ts","sourceRoot":"","sources":["../../../src/dragonbones/cocos/CocosArmatureDisplay.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EACL,QAAQ,EAGR,WAAW,EACX,eAAe,EACf,cAAc,EAEf,MAAM,uBAAuB,CAAC;AAE/B,qBAAa,oBAAqB,SAAQ,EAAE,CAAC,MAAO,YAAW,cAAc;IAC3E;;OAEG;IACI,SAAS,UAAS;IACzB,OAAO,CAAC,UAAU,CAAS;IAE3B,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,YAAY,CAA0B;IAC9C;;OAEG;IACI,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAGvC;;OAEG;IACI,OAAO,IAAI,IAAI;IAUtB;;OAEG;IACI,QAAQ,IAAI,IAAI;IAyHvB;;OAEG;IACI,OAAO,CAAC,YAAY,UAAO,GAAG,IAAI;IAQzC;;OAEG;IACI,OAAO,IAAI,IAAI;IAGtB;;OAEG;IACI,eAAe,CACpB,IAAI,EAAE,eAAe,EACrB,WAAW,EAAE,WAAW,GACvB,IAAI;IAGP;;OAEG;IACI,kBAAkB,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO;IAIzD;;OAEG;IACI,kBAAkB,CACvB,IAAI,EAAE,eAAe,EACrB,QAAQ,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,EACtC,MAAM,EAAE,GAAG,GACV,IAAI;IAGP;;OAEG;IACI,qBAAqB,CAC1B,IAAI,EAAE,eAAe,EACrB,QAAQ,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,EACtC,MAAM,EAAE,GAAG,GACV,IAAI;IAGP;;OAEG;IACH,IAAW,QAAQ,IAAI,QAAQ,CAE9B;IACD;;OAEG;IACH,IAAW,SAAS,IAAI,SAAS,CAEhC;CACF"}
+{"version":3,"file":"CocosArmatureDisplay.d.ts","sourceRoot":"","sources":["../../../src/dragonbones/cocos/CocosArmatureDisplay.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EACL,SAAS,EACT,QAAQ,EAGR,WAAW,EACX,eAAe,EACf,cAAc,EAEf,MAAM,uBAAuB,CAAC;AAE/B,qBAAa,oBAAqB,SAAQ,EAAE,CAAC,MAAO,YAAW,cAAc;IAC3E;;OAEG;IACI,SAAS,UAAS;IACzB,OAAO,CAAC,UAAU,CAAS;IAE3B,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,YAAY,CAA0B;IAC9C,eAAe,EAAE,EAAE,CAAC,YAAY,CAAe;IAC/C,aAAa,KAAK;;IASlB,QAAQ,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO;IAIxC,QAAQ,CAAC,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,GAAG,IAAI;IAI1E,WAAW,CAAC,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,GAAG,IAAI;IAG7E;;OAEG;IACI,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAGvC;;OAEG;IACI,OAAO,IAAI,IAAI;IAUtB;;OAEG;IACI,QAAQ,IAAI,IAAI;IAgIvB;;OAEG;IACI,OAAO,CAAC,YAAY,UAAO,GAAG,IAAI;IAQzC;;OAEG;IACI,OAAO,IAAI,IAAI;IAGtB;;OAEG;IACI,eAAe,CACpB,IAAI,EAAE,eAAe,EACrB,WAAW,EAAE,WAAW,GACvB,IAAI;IAIP;;OAEG;IACI,kBAAkB,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO;IAKzD;;OAEG;IACI,kBAAkB,CACvB,IAAI,EAAE,eAAe,EACrB,QAAQ,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,EACtC,MAAM,EAAE,GAAG,GACV,IAAI;IAKP;;OAEG;IACI,qBAAqB,CAC1B,IAAI,EAAE,eAAe,EACrB,QAAQ,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,EACtC,MAAM,EAAE,GAAG,GACV,IAAI;IAIP;;OAEG;IACH,IAAW,QAAQ,IAAI,QAAQ,CAE9B;IACD;;OAEG;IACH,IAAW,SAAS,IAAI,SAAS,CAEhC;CACF"}

package/dist/dragonbones/cocos/CocosArmatureDisplay.js

@@ -1,5 +1,4 @@
 "use strict";
-// @ts-nocheck
 /**
  * The MIT License (MIT)
  *
@@ -43,7 +42,8 @@ var dragonbones_js_1 = require("@cocos/dragonbones-js");
 var CocosArmatureDisplay = /** @class */ (function (_super) {
     __extends(CocosArmatureDisplay, _super);
     function CocosArmatureDisplay() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
+        // 1. super init first
+        var _this = _super.call(this) || this;
         /**
          * @private
          */
@@ -52,8 +52,22 @@ var CocosArmatureDisplay = /** @class */ (function (_super) {
         // private _disposeProxy: boolean = false;
         _this._armature = null;
         _this._debugDrawer = null;
+        _this.eventDispatcher = null;
+        _this.listenerCount = {};
+        _super.prototype.ctor.call(_this); // always call this for compatibility with cocos2dx JS Javascript class system
+        _this.eventDispatcher = cc.eventManager;
         return _this;
     }
+    CocosArmatureDisplay.prototype.hasEvent = function (type) {
+        return this.hasDBEventListener(type);
+    };
+    CocosArmatureDisplay.prototype.addEvent = function (type, listener, thisObject) {
+        console.log('addEvent', type, listener, thisObject);
+        this.addDBEventListener(type, listener, thisObject);
+    };
+    CocosArmatureDisplay.prototype.removeEvent = function (type, listener, thisObject) {
+        this.removeDBEventListener(type, listener, thisObject);
+    };
     /**
      * @inheritDoc
      */
@@ -111,37 +125,48 @@ var CocosArmatureDisplay = /** @class */ (function (_super) {
                         var child = this._debugDrawer.getChildByName(slot.name);
                         if (!child) {
                             child = new cc.DrawNode();
-                            child.name = slot.name;
+                            child.setName(slot.name);
                             this._debugDrawer.addChild(child);
                         }
                         child.clear();
-                        child.lineStyle(2.0, 0xff00ff, 0.7);
+                        child.setLineWidth(2.0);
+                        child.setColor(cc.color('0xFF00FF'));
+                        child.setOpacity(0.7);
+                        // child.lineStyle(2.0, 0xff00ff, 0.7);
                         switch (boundingBoxData.type) {
                             case dragonbones_js_1.BoundingBoxType.Rectangle:
-                                child.drawRect(-boundingBoxData.width * 0.5, -boundingBoxData.height * 0.5, boundingBoxData.width, boundingBoxData.height);
+                                child.drawRect(cc.p(-boundingBoxData.width * 0.5, -boundingBoxData.height * 0.5), cc.p(boundingBoxData.width * 0.5, boundingBoxData.height * 0.5));
                                 break;
                             case dragonbones_js_1.BoundingBoxType.Ellipse:
-                                child.drawEllipse(-boundingBoxData.width * 0.5, -boundingBoxData.height * 0.5, boundingBoxData.width, boundingBoxData.height);
+                                child.drawCircle(cc.p(0.0, 0.0), boundingBoxData.width * 0.5, 0, 64);
+                                //   -boundingBoxData.width * 0.5,
+                                //   -boundingBoxData.height * 0.5,
+                                //   boundingBoxData.width,
+                                //   boundingBoxData.height
+                                // );
                                 break;
                             case dragonbones_js_1.BoundingBoxType.Polygon: {
                                 var vertices = boundingBoxData.vertices;
+                                var points = [];
                                 for (var i_1 = 0, l_1 = vertices.length; i_1 < l_1; i_1 += 2) {
                                     var x = vertices[i_1];
                                     var y = vertices[i_1 + 1];
-                                    if (i_1 === 0) {
-                                        child.moveTo(x, y);
-                                    }
-                                    else {
-                                        child.lineTo(x, y);
-                                    }
+                                    // if (i === 0) {
+                                    //   child.moveTo(x, y);
+                                    // } else {
+                                    //   child.lineTo(x, y);
+                                    // }
+                                    // child.drawSegment(cc.p(x, y), cc.p(vertices[i + 2], vertices[i + 3]));
+                                    points.push(cc.p(x, y));
                                 }
-                                child.lineTo(vertices[0], vertices[1]);
+                                // child.lineTo(vertices[0], vertices[1]);
+                                child.drawPoly(points);
                                 break;
                             }
                             default:
                                 break;
                         }
-                        child.endFill();
+                        // child.endFill();
                         slot.updateTransformAndMatrix();
                         slot.updateGlobalTransform();
                         var transform = slot.global;
@@ -183,26 +208,31 @@ var CocosArmatureDisplay = /** @class */ (function (_super) {
      * @private
      */
     CocosArmatureDisplay.prototype.dispatchDBEvent = function (type, eventObject) {
-        this.emit(type, eventObject);
+        console.log('dispatchDBEvent', type, eventObject);
+        this.eventDispatcher.dispatchCustomEvent(type, eventObject);
     };
     /**
      * @inheritDoc
      */
     CocosArmatureDisplay.prototype.hasDBEventListener = function (type) {
-        // return this.listenerCount(type) > 0;
-        return false;
+        console.log('hasDBEventListener', type);
+        return (this.listenerCount[type] || 0) > 0;
+        // return this.eventDispatcher.isEnabled();
     };
     /**
      * @inheritDoc
      */
     CocosArmatureDisplay.prototype.addDBEventListener = function (type, listener, target) {
-        this.addListener(type, listener, target);
+        console.log('addDBEventListener', type);
+        this.listenerCount[type] = (this.listenerCount[type] || 0) + 1;
+        this.eventDispatcher.addCustomListener(type, listener.bind(target));
     };
     /**
      * @inheritDoc
      */
     CocosArmatureDisplay.prototype.removeDBEventListener = function (type, listener, target) {
-        this.removeListener(type, listener, target);
+        this.listenerCount[type] = (this.listenerCount[type] || 0) - 1;
+        this.eventDispatcher.removeCustomListeners(type);
     };
     Object.defineProperty(CocosArmatureDisplay.prototype, "armature", {
         /**

package/dist/dragonbones/cocos/CocosFactory.d.ts

@@ -20,7 +20,7 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-import { Armature, BaseFactory, BuildArmaturePackage, DataParser, Slot, SlotData } from '@cocos/dragonbones-js';
+import { Armature, BaseFactory, BuildArmaturePackage, DataParser, DisplayData, Slot, SlotData } from '@cocos/dragonbones-js';
 import { CocosArmatureDisplay } from './CocosArmatureDisplay';
 import { CocosTextureAtlasData } from './CocosTextureAtlasData';
 /**
@@ -62,7 +62,7 @@ export declare class CocosFactory extends BaseFactory {
     constructor(dataParser?: DataParser | null);
     protected _buildTextureAtlasData(textureAtlasData: CocosTextureAtlasData | null, textureAtlas: cc.Texture2D | null): CocosTextureAtlasData;
     protected _buildArmature(dataPackage: BuildArmaturePackage): Armature;
-    protected _buildSlot(_dataPackage: BuildArmaturePackage, slotData: SlotData, armature: Armature): Slot;
+    protected _buildSlot(_dataPackage: BuildArmaturePackage, slotData: SlotData, armature: DisplayData[]): Slot;
     /**
      * - Create a armature from cached DragonBonesData instances and TextureAtlasData instances, then use the {@link #clock} to update it.
      * The difference is that the armature created by {@link #buildArmature} is not WorldClock instance update.

package/dist/dragonbones/cocos/CocosFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CocosFactory.d.ts","sourceRoot":"","sources":["../../../src/dragonbones/cocos/CocosFactory.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAc,oBAAoB,EAAE,UAAU,EAAe,IAAI,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEzI,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EAAE,qBAAqB,EAAoB,MAAM,yBAAyB,CAAC;AAElF;;;;GAIG;AACH;;;;GAIG;AACH,qBAAa,YAAa,SAAQ,WAAW;IAC3C,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAA4B;IAC/D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA6B;IACpD,OAAO,CAAC,MAAM,CAAC,aAAa;WAOd,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAOnD,OAAc,eAAe,UAAQ;IAErC;;;;OAIG;IACH;;;;OAIG;IACH,WAAkB,OAAO,IAAI,YAAY,CAMxC;IAED;;;;OAIG;WACW,WAAW,IAAI,YAAY;IAOzC;;OAEG;gBACgB,UAAU,GAAE,UAAU,GAAG,IAAW;IAWvD,SAAS,CAAC,sBAAsB,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,IAAI,EAAE,YAAY,EAAE,EAAE,CAAC,SAAS,GAAG,IAAI,GAAG,qBAAqB;IAc1I,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,oBAAoB,GAAG,QAAQ;IAYrE,SAAS,CAAC,UAAU,CAAC,YAAY,EAAE,oBAAoB,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAStG;;;;;;;;;;;;;;;OAeG;IACH;;;;;;;;;;;;;;;OAeG;IACI,oBAAoB,CAAC,YAAY,EAAE,MAAM,EAAE,eAAe,SAAK,EAAE,QAAQ,SAAK,EAAE,gBAAgB,SAAK,GAAG,oBAAoB,GAAG,IAAI;IAU1I;;;;;;OAMG;IACH;;;;;;OAMG;IACI,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,GAAE,MAAM,GAAG,IAAW,GAAG,EAAE,CAAC,MAAM,GAAG,IAAI;IAQvG;;;;;OAKG;IACH;;;;;OAKG;IACH,IAAW,iBAAiB,IAAI,oBAAoB,CAEnD;CACF"}
+{"version":3,"file":"CocosFactory.d.ts","sourceRoot":"","sources":["../../../src/dragonbones/cocos/CocosFactory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAc,oBAAoB,EAAE,UAAU,EAAE,WAAW,EAAe,IAAI,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtJ,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EAAE,qBAAqB,EAAoB,MAAM,yBAAyB,CAAC;AAElF;;;;GAIG;AACH;;;;GAIG;AACH,qBAAa,YAAa,SAAQ,WAAW;IAC3C,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAA4B;IAC/D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA6B;IACpD,OAAO,CAAC,MAAM,CAAC,aAAa;WAOd,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAOnD,OAAc,eAAe,UAAQ;IAErC;;;;OAIG;IACH;;;;OAIG;IACH,WAAkB,OAAO,IAAI,YAAY,CAMxC;IAED;;;;OAIG;WACW,WAAW,IAAI,YAAY;IAOzC;;OAEG;gBACgB,UAAU,GAAE,UAAU,GAAG,IAAW;IAWvD,SAAS,CAAC,sBAAsB,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,IAAI,EAAE,YAAY,EAAE,EAAE,CAAC,SAAS,GAAG,IAAI,GAAG,qBAAqB;IAc1I,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,oBAAoB,GAAG,QAAQ;IAYrE,SAAS,CAAC,UAAU,CAAC,YAAY,EAAE,oBAAoB,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,IAAI;IAS3G;;;;;;;;;;;;;;;OAeG;IACH;;;;;;;;;;;;;;;OAeG;IACI,oBAAoB,CAAC,YAAY,EAAE,MAAM,EAAE,eAAe,SAAK,EAAE,QAAQ,SAAK,EAAE,gBAAgB,SAAK,GAAG,oBAAoB,GAAG,IAAI;IAU1I;;;;;;OAMG;IACH;;;;;;OAMG;IACI,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,GAAE,MAAM,GAAG,IAAW,GAAG,EAAE,CAAC,MAAM,GAAG,IAAI;IAQvG;;;;;OAKG;IACH;;;;;OAKG;IACH,IAAW,iBAAiB,IAAI,oBAAoB,CAEnD;CACF"}

package/dist/dragonbones/cocos/CocosFactory.js

@@ -1,5 +1,4 @@
 "use strict";
-// @ts-nocheck
 /**
  * The MIT License (MIT)
  *

package/dist/dragonbones/cocos/CocosSlot.js

@@ -67,7 +67,7 @@ var CocosSlot = /** @class */ (function (_super) {
         // tslint:disable-next-line:no-unused-expression
         value;
         if (!isRelease) {
-            value.destroy();
+            value.release();
         }
     };
     CocosSlot.prototype._onUpdateDisplay = function () {

package/dist/dragonbones/index.d.ts

@@ -1,6 +1,6 @@
 import { EntityManager, EventManager, EventReceive, System } from 'entityx-ts';
 import { ComponentX } from '../gworld/core/decorator';
-interface DragonBonesData {
+export interface DragonBonesData {
     atlas: string;
     skeleton: string;
     texture: string;

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;AAIpB,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAItD,UAAU,eAAe;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AACD,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,CAAC;IAC/D,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;IAkDzC,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,EAGL,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,MAAM,EACP,MAAM,YAAY,CAAC;AAKpB,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAItD,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,CAAC;IAC/D,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"}

package/dist/dragonbones/index.js

@@ -18,6 +18,7 @@ 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");
@@ -65,6 +66,8 @@ var DragonBonesSystem = /** @class */ (function () {
                 // 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)
@@ -73,9 +76,9 @@ var DragonBonesSystem = /** @class */ (function () {
                 // if (skin) {
                 //   node.setSkin(skin)
                 // }
-                if (animation) {
-                    // node.setAnimation(0, animation, playTimes)
-                }
+                // if (animation) {
+                //   dbComp.setAnimation(animation, playTimes)
+                // }
                 dbComp.node = ett.assign(new NodeComp_1.NodeComp(node, ett));
                 break;
             }

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

@@ -2,11 +2,12 @@ import { Constructor } from 'entityx-ts';
 import { BaseComponentProps } from '../../../@types/safex';
 import { NodeComp } from './NodeComp';
 export declare class EnhancedComponent<Props = object, N extends NodeComp<any> = NodeComp<any>> {
+    static hasRender: boolean;
     props: Props;
+    node: N;
+    enabled: boolean;
     constructor(data?: BaseComponentProps & Props);
     init(data?: Props): void;
-    static hasRender: boolean;
-    node: N;
     addComponent<T extends EnhancedComponent>(instance: T): T;
     getComponent<T extends EnhancedComponent>(component: Constructor<T>): T;
     schedule(callback: (arg: any) => void, interval: number, repeat?: number, delay?: number): void;

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,KAAK,EAAE,KAAK,CAAY;gBACZ,IAAI,CAAC,EAAE,kBAAkB,GAAG,KAAK;IAG7C,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK;IAQjB,MAAM,CAAC,SAAS,UAAO;IACvB,IAAI,EAAE,CAAC,CAAA;IACP,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,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"}

package/dist/gworld/components/EnhancedComponent.js

@@ -4,6 +4,7 @@ exports.EnhancedComponent = void 0;
 var EnhancedComponent = /** @class */ (function () {
     function EnhancedComponent(data) {
         this.props = {};
+        this.enabled = true;
         this.init(data);
     }
     EnhancedComponent.prototype.init = function (data) {

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

@@ -19,7 +19,6 @@ export declare class ButtonComp extends NoRenderComponentX<ButtonCompProps> {
     texType: ccui.Widget.TextureType;
     clickEvents: any[];
     setOnPress(cb: (target: ButtonComp) => void): void;
-    set enabled(val: any);
 }
 export declare class ProgressTimerComp extends ComponentX<ProgressTimerProps & {
     $ref?: ProgressTimerComp;

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,MAAM,uBAAuB,CAAA;AAEvH,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;IAI3C,IAAI,OAAO,CAAC,GAAG,KAAA,EAEd;CACF;AAED,qBAAa,iBAAkB,SAAQ,UAAU,CAAC,kBAAkB,GAAG;IAAE,IAAI,CAAC,EAAE,iBAAiB,CAAA;CAAE,CAAC;IAClG,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;IAAE,IAAI,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,IAAI,CAAC,IAAI,CAAC;IAKzF,SAAS;IAIT,SAAS,CAAC,GAAG,EAAE,MAAM;CAMtB;AAED,qBAAa,YAAa,SAAQ,UAAU,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC;IACzE,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,EAAE,EAAE,CAAC,UAAU,CAAC;IAC5E,IAAI,CAAC,KAAK,EAAE,MAAM;CAKnB;AAED,qBAAa,oBAAqB,SAAQ,kBAAkB;CAAG"}
+{"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,MAAM,uBAAuB,CAAA;AAEvH,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;IAAE,IAAI,CAAC,EAAE,iBAAiB,CAAA;CAAE,CAAC;IAClG,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;IAAE,IAAI,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,IAAI,CAAC,IAAI,CAAC;IAKzF,SAAS;IAIT,SAAS,CAAC,GAAG,EAAE,MAAM;CAMtB;AAED,qBAAa,YAAa,SAAQ,UAAU,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC;IACzE,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,EAAE,EAAE,CAAC,UAAU,CAAC;IAC5E,IAAI,CAAC,KAAK,EAAE,MAAM;CAKnB;AAED,qBAAa,oBAAqB,SAAQ,kBAAkB;CAAG"}

package/dist/gworld/components/GUIComponent.js

@@ -31,17 +31,13 @@ var ButtonComp = /** @class */ (function (_super) {
         var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.clickEvents = [];
         return _this;
+        // setTouchEnabled(val) {
+        //   this.node.setTouchEnabled(val)
+        // }
     }
     ButtonComp.prototype.setOnPress = function (cb) {
         this.props.onPress = cb;
     };
-    Object.defineProperty(ButtonComp.prototype, "enabled", {
-        set: function (val) {
-            this.node.setTouchEnabled(val);
-        },
-        enumerable: false,
-        configurable: true
-    });
     return ButtonComp;
 }(decorator_1.NoRenderComponentX));
 exports.ButtonComp = ButtonComp;

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

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

package/dist/gworld/systems/GUISystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GUISystem.d.ts","sourceRoot":"","sources":["../../../src/gworld/systems/GUISystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAiBnG,qBAAa,SAAU,YAAW,MAAM;IACtC,SAAS,CAAC,aAAa,EAAE,YAAY;IAUrC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY;IA0HzC,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;CAIjE"}
+{"version":3,"file":"GUISystem.d.ts","sourceRoot":"","sources":["../../../src/gworld/systems/GUISystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAiBnG,qBAAa,SAAU,YAAW,MAAM;IACtC,SAAS,CAAC,aAAa,EAAE,YAAY;IAUrC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY;IA2HzC,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;CAIjE"}

package/dist/gworld/systems/GUISystem.js

@@ -22,7 +22,7 @@ var GUISystem = /** @class */ (function () {
     GUISystem.prototype.receive = function (type, event) {
         switch (type) {
             case (0, entityx_ts_1.ComponentAddedEvent)(GUIComponent_1.ButtonComp): {
-                console.log(event.component);
+                // console.log(event.component)
                 var ett = event.entity;
                 var button_1 = ett.getComponent(GUIComponent_1.ButtonComp);
                 var nodeComp_1 = ett.getComponent(NodeComp_1.NodeComp);
@@ -34,7 +34,7 @@ var GUISystem = /** @class */ (function () {
                     // console.log('onTouchBegan', p, nodeComp)
                     var rect = nodeComp_1.getBoundingBox();
                     var nodeSpaceLocation = nodeComp_1.parent.convertToNodeSpace(p);
-                    if (rect.contains(nodeSpaceLocation)) {
+                    if (rect.contains(nodeSpaceLocation) && button_1.enabled) {
                         var scale = cc.scaleTo(0.3, 1.2);
                         nodeComp_1.runAction(scale);
                         button_1.props.onPress(button_1);
@@ -50,10 +50,10 @@ var GUISystem = /** @class */ (function () {
                 break;
             }
             case (0, entityx_ts_1.ComponentAddedEvent)(GUIComponent_1.ProgressTimerComp): {
-                console.log(event.component);
+                // console.log(event.component)
                 var ett = event.entity;
                 var bar = ett.getComponent(GUIComponent_1.ProgressTimerComp);
-                var _a = bar.props, spriteFrame = _a.spriteFrame, _b = _a.fillType, fillType = _b === void 0 ? GUIComponent_1.FillType.HORIZONTAL : _b, _c = _a.fillRange, fillRange = _c === void 0 ? 1 : _c, _d = _a.fillCenter, fillCenter = _d === void 0 ? (0, polyfills_1.Vec2)(0, 0) : _d;
+                var _a = bar.props, spriteFrame = _a.spriteFrame, _b = _a.fillType, fillType = _b === void 0 ? GUIComponent_1.FillType.HORIZONTAL : _b, _c = _a.fillRange, fillRange = _c === void 0 ? 1 : _c, _d = _a.fillCenter, fillCenter = _d === void 0 ? (0, polyfills_1.Vec2)(1, 0) : _d;
                 var sprite = new cc.Sprite(spriteFrame);
                 var pTimer = new cc.ProgressTimer(sprite);
                 var ptt = fillType === GUIComponent_1.FillType.RADIAL ? cc.ProgressTimer.TYPE_RADIAL : cc.ProgressTimer.TYPE_BAR;
@@ -77,7 +77,7 @@ var GUISystem = /** @class */ (function () {
                 break;
             }
             case (0, entityx_ts_1.ComponentAddedEvent)(GUIComponent_1.LabelComp): {
-                console.log(event.component);
+                // console.log(event.component)
                 var ett = event.entity;
                 var label = ett.getComponent(GUIComponent_1.LabelComp);
                 var _e = label.props, _f = _e.string, string = _f === void 0 ? '' : _f, _g = _e.font, font = _g === void 0 ? '' : _g, _h = _e.size, size = _h === void 0 ? 64 : _h;
@@ -88,7 +88,7 @@ var GUISystem = /** @class */ (function () {
                 break;
             }
             case (0, entityx_ts_1.ComponentAddedEvent)(GUIComponent_1.LabelOutlineComp): {
-                console.log(event.component);
+                // console.log(event.component)
                 var ett = event.entity;
                 var outline = ett.getComponent(GUIComponent_1.LabelOutlineComp);
                 var _j = outline.props, color = _j.color, width = _j.width;
@@ -99,7 +99,7 @@ var GUISystem = /** @class */ (function () {
                 break;
             }
             case (0, entityx_ts_1.ComponentAddedEvent)(GUIComponent_1.LabelShadowComp): {
-                console.log(event.component);
+                // console.log(event.component)
                 var ett = event.entity;
                 var outline = ett.getComponent(GUIComponent_1.LabelShadowComp);
                 var _k = outline.props, color = _k.color, blur_1 = _k.blur, offset = _k.offset;
@@ -110,7 +110,7 @@ var GUISystem = /** @class */ (function () {
                 break;
             }
             case (0, entityx_ts_1.ComponentAddedEvent)(GUIComponent_1.ScrollViewComp): {
-                console.log(event.component);
+                // console.log(event.component)
                 var ett = event.entity;
                 var scrollView = ett.getComponent(GUIComponent_1.ScrollViewComp);
                 var _l = scrollView.props, viewSize = _l.viewSize, contentSize = _l.contentSize, _m = _l.direction, direction = _m === void 0 ? cc.SCROLLVIEW_DIRECTION_VERTICAL : _m;
@@ -120,6 +120,7 @@ var GUISystem = /** @class */ (function () {
                 node.setDirection(direction);
                 // node.setContentOffset(cc.p(0, viewSize.height - contentSize.height))
                 // node.setTouchEnabled(false)
+                node.setBounceable(false);
                 scrollView.node = ett.assign(new NodeComp_1.NodeComp(node, ett));
                 break;
             }

package/dist/helper/utils.js

@@ -43,7 +43,7 @@ function registerSystem(component) {
                 var entt = _a[_i];
                 var comp = entt.getComponent(component);
                 // console.log('comp', comp.constructor.name, typeof comp['update'] === 'function')
-                if (comp.node.active && typeof comp['update'] === 'function') {
+                if (comp.node.active && comp.enabled && typeof comp['update'] === 'function') {
                     comp['update'](dt);
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@safe-engine/cocos",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "safe-engine with cocos renderer support",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -23,7 +23,7 @@
   "dependencies": {
     "@cocos/dragonbones-js": "^1.0.2",
     "@esotericsoftware/spine-core": "^4.2.70",
-    "cocos-html5-ts": "^1.1.3",
+    "cocos-html5-ts": "^1.1.6",
     "entityx-ts": "^1.0.0",
     "lodash": "^4.17.21"
   },