@safe-engine/cocos 1.1.3 → 1.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/gworld/components/EnhancedComponent.d.ts +3 -2
- package/dist/gworld/components/EnhancedComponent.d.ts.map +1 -1
- package/dist/gworld/components/EnhancedComponent.js +1 -0
- package/dist/gworld/components/GUIComponent.d.ts +0 -1
- package/dist/gworld/components/GUIComponent.d.ts.map +1 -1
- package/dist/gworld/components/GUIComponent.js +3 -7
- package/dist/gworld/systems/GUISystem.js +1 -1
- package/dist/helper/utils.js +1 -1
- package/package.json +1 -1
|
@@ -2,11 +2,12 @@ import { Constructor } from 'entityx-ts';
|
|
|
2
2
|
import { BaseComponentProps } from '../../../@types/safex';
|
|
3
3
|
import { NodeComp } from './NodeComp';
|
|
4
4
|
export declare class EnhancedComponent<Props = object, N extends NodeComp<any> = NodeComp<any>> {
|
|
5
|
+
static hasRender: boolean;
|
|
5
6
|
props: Props;
|
|
7
|
+
node: N;
|
|
8
|
+
enabled: boolean;
|
|
6
9
|
constructor(data?: BaseComponentProps & Props);
|
|
7
10
|
init(data?: Props): void;
|
|
8
|
-
static hasRender: boolean;
|
|
9
|
-
node: N;
|
|
10
11
|
addComponent<T extends EnhancedComponent>(instance: T): T;
|
|
11
12
|
getComponent<T extends EnhancedComponent>(component: Constructor<T>): T;
|
|
12
13
|
schedule(callback: (arg: any) => void, interval: number, repeat?: number, delay?: number): void;
|
|
@@ -1 +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;
|
|
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"}
|
|
@@ -19,7 +19,6 @@ export declare class ButtonComp extends NoRenderComponentX<ButtonCompProps> {
|
|
|
19
19
|
texType: ccui.Widget.TextureType;
|
|
20
20
|
clickEvents: any[];
|
|
21
21
|
setOnPress(cb: (target: ButtonComp) => void): void;
|
|
22
|
-
set enabled(val: any);
|
|
23
22
|
}
|
|
24
23
|
export declare class ProgressTimerComp extends ComponentX<ProgressTimerProps & {
|
|
25
24
|
$ref?: ProgressTimerComp;
|
|
@@ -1 +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;
|
|
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;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"}
|
|
@@ -31,17 +31,13 @@ var ButtonComp = /** @class */ (function (_super) {
|
|
|
31
31
|
var _this = _super !== null && _super.apply(this, arguments) || this;
|
|
32
32
|
_this.clickEvents = [];
|
|
33
33
|
return _this;
|
|
34
|
+
// setTouchEnabled(val) {
|
|
35
|
+
// this.node.setTouchEnabled(val)
|
|
36
|
+
// }
|
|
34
37
|
}
|
|
35
38
|
ButtonComp.prototype.setOnPress = function (cb) {
|
|
36
39
|
this.props.onPress = cb;
|
|
37
40
|
};
|
|
38
|
-
Object.defineProperty(ButtonComp.prototype, "enabled", {
|
|
39
|
-
set: function (val) {
|
|
40
|
-
this.node.setTouchEnabled(val);
|
|
41
|
-
},
|
|
42
|
-
enumerable: false,
|
|
43
|
-
configurable: true
|
|
44
|
-
});
|
|
45
41
|
return ButtonComp;
|
|
46
42
|
}(decorator_1.NoRenderComponentX));
|
|
47
43
|
exports.ButtonComp = ButtonComp;
|
|
@@ -34,7 +34,7 @@ var GUISystem = /** @class */ (function () {
|
|
|
34
34
|
// console.log('onTouchBegan', p, nodeComp)
|
|
35
35
|
var rect = nodeComp_1.getBoundingBox();
|
|
36
36
|
var nodeSpaceLocation = nodeComp_1.parent.convertToNodeSpace(p);
|
|
37
|
-
if (rect.contains(nodeSpaceLocation)) {
|
|
37
|
+
if (rect.contains(nodeSpaceLocation) && button_1.enabled) {
|
|
38
38
|
var scale = cc.scaleTo(0.3, 1.2);
|
|
39
39
|
nodeComp_1.runAction(scale);
|
|
40
40
|
button_1.props.onPress(button_1);
|
package/dist/helper/utils.js
CHANGED
|
@@ -43,7 +43,7 @@ function registerSystem(component) {
|
|
|
43
43
|
var entt = _a[_i];
|
|
44
44
|
var comp = entt.getComponent(component);
|
|
45
45
|
// console.log('comp', comp.constructor.name, typeof comp['update'] === 'function')
|
|
46
|
-
if (comp.node.active && typeof comp['update'] === 'function') {
|
|
46
|
+
if (comp.node.active && comp.enabled && typeof comp['update'] === 'function') {
|
|
47
47
|
comp['update'](dt);
|
|
48
48
|
}
|
|
49
49
|
}
|