@safe-engine/cocos 1.1.3 → 1.2.2
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/@types/safex.d.ts +7 -4
- package/dist/dragonbones/index.d.ts +3 -1
- package/dist/dragonbones/index.d.ts.map +1 -1
- 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 +5 -10
- package/dist/gworld/components/GUIComponent.d.ts.map +1 -1
- package/dist/gworld/components/GUIComponent.js +3 -7
- package/dist/gworld/components/RenderComponent.d.ts +4 -8
- package/dist/gworld/components/RenderComponent.d.ts.map +1 -1
- package/dist/gworld/systems/GUISystem.js +1 -1
- package/dist/helper/utils.js +1 -1
- package/package.json +1 -1
package/@types/safex.d.ts
CHANGED
|
@@ -2,10 +2,13 @@ import { Color4B, NodeComp } from '../src'
|
|
|
2
2
|
|
|
3
3
|
type ColorSource = ReturnType<typeof Color4B>
|
|
4
4
|
|
|
5
|
-
interface
|
|
6
|
-
$ref?:
|
|
7
|
-
$
|
|
8
|
-
|
|
5
|
+
interface RefComp<T> {
|
|
6
|
+
$ref?: T
|
|
7
|
+
$push?: T[]
|
|
8
|
+
}
|
|
9
|
+
interface BaseComponentProps extends RefComp<unknown> {
|
|
10
|
+
$refNode?: NodeComp
|
|
11
|
+
$pushNode?: NodeComp[]
|
|
9
12
|
node?: Partial<NodeComp>
|
|
10
13
|
// [$key: `$${string}`]: string
|
|
11
14
|
}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { EntityManager, EventManager, EventReceive, System } from 'entityx-ts';
|
|
2
|
+
import { RefComp } from '../../@types/safex';
|
|
2
3
|
import { ComponentX } from '../gworld/core/decorator';
|
|
4
|
+
import { CocosArmatureDisplay } from './cocos/CocosArmatureDisplay';
|
|
3
5
|
export interface DragonBonesData {
|
|
4
6
|
atlas: string;
|
|
5
7
|
skeleton: string;
|
|
@@ -21,7 +23,7 @@ interface DragonBonesProps {
|
|
|
21
23
|
name: string;
|
|
22
24
|
}) => void;
|
|
23
25
|
}
|
|
24
|
-
export declare class DragonBonesComp extends ComponentX<DragonBonesProps> {
|
|
26
|
+
export declare class DragonBonesComp extends ComponentX<DragonBonesProps & RefComp<DragonBonesComp>, CocosArmatureDisplay> {
|
|
25
27
|
setAnimation(name: string, playTimes?: number): void;
|
|
26
28
|
}
|
|
27
29
|
export declare class DragonBonesSystem implements System {
|
|
@@ -1 +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;
|
|
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"}
|
|
@@ -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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { LabelCompProps, LabelOutlineCompProps, LabelShadowCompProps, ProgressTimerProps } from '../../../@types/safex';
|
|
1
|
+
import { LabelCompProps, LabelOutlineCompProps, LabelShadowCompProps, ProgressTimerProps, RefComp } from '../../../@types/safex';
|
|
2
2
|
import { Color4B, Size, Vec2 } from '../../polyfills';
|
|
3
3
|
import { ComponentX, NoRenderComponentX } from '../core/decorator';
|
|
4
4
|
export declare const FillType: {
|
|
@@ -19,11 +19,8 @@ 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
|
-
export declare class ProgressTimerComp extends ComponentX<ProgressTimerProps & {
|
|
25
|
-
$ref?: ProgressTimerComp;
|
|
26
|
-
}> {
|
|
23
|
+
export declare class ProgressTimerComp extends ComponentX<ProgressTimerProps & RefComp<ProgressTimerComp>> {
|
|
27
24
|
spriteFrame: string;
|
|
28
25
|
fillType: Values;
|
|
29
26
|
fillRange: number;
|
|
@@ -33,13 +30,11 @@ export declare class ProgressTimerComp extends ComponentX<ProgressTimerProps & {
|
|
|
33
30
|
setFillStart(val: number): void;
|
|
34
31
|
setFillRange(val: number): void;
|
|
35
32
|
}
|
|
36
|
-
export declare class LabelComp extends ComponentX<LabelCompProps & {
|
|
37
|
-
$ref?: LabelComp;
|
|
38
|
-
}, ccui.Text> {
|
|
33
|
+
export declare class LabelComp extends ComponentX<LabelCompProps & RefComp<LabelComp>, ccui.Text> {
|
|
39
34
|
getString(): string;
|
|
40
35
|
setString(val: string): void;
|
|
41
36
|
}
|
|
42
|
-
export declare class RichTextComp extends ComponentX<LabelCompProps
|
|
37
|
+
export declare class RichTextComp extends ComponentX<LabelCompProps & RefComp<RichTextComp>, ccui.RichText> {
|
|
43
38
|
get string(): string;
|
|
44
39
|
set string(val: string);
|
|
45
40
|
}
|
|
@@ -63,7 +58,7 @@ interface ScrollViewProps {
|
|
|
63
58
|
contentSize: Size;
|
|
64
59
|
direction?: ScrollViewDirection;
|
|
65
60
|
}
|
|
66
|
-
export declare class ScrollViewComp extends ComponentX<ScrollViewProps
|
|
61
|
+
export declare class ScrollViewComp extends ComponentX<ScrollViewProps & RefComp<ScrollViewComp>, cc.ScrollView> {
|
|
67
62
|
zoom(scale: number): void;
|
|
68
63
|
}
|
|
69
64
|
export declare class BlockInputEventsComp extends NoRenderComponentX {
|
|
@@ -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;
|
|
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"}
|
|
@@ -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;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { GraphicsRenderProps, SpineData } from '../../../@types/safex';
|
|
1
|
+
import { GraphicsRenderProps, RefComp, SpineData } from '../../../@types/safex';
|
|
2
2
|
import { ComponentX } from '../core/decorator';
|
|
3
3
|
export declare class NodeRender extends ComponentX {
|
|
4
4
|
nodeName: string;
|
|
@@ -8,9 +8,7 @@ interface SpriteRenderProps {
|
|
|
8
8
|
texType?: number;
|
|
9
9
|
type?: number;
|
|
10
10
|
}
|
|
11
|
-
export declare class SpriteRender extends ComponentX<SpriteRenderProps & {
|
|
12
|
-
$ref?: SpriteRender;
|
|
13
|
-
}, cc.Sprite> {
|
|
11
|
+
export declare class SpriteRender extends ComponentX<SpriteRenderProps & RefComp<SpriteRender>, cc.Sprite> {
|
|
14
12
|
get spriteFrame(): string;
|
|
15
13
|
set spriteFrame(frame: string);
|
|
16
14
|
}
|
|
@@ -33,9 +31,7 @@ interface SpineSkeletonProps {
|
|
|
33
31
|
timeScale?: number;
|
|
34
32
|
loop?: boolean;
|
|
35
33
|
}
|
|
36
|
-
export declare class SpineSkeleton extends ComponentX<SpineSkeletonProps & {
|
|
37
|
-
$ref: SpineSkeleton;
|
|
38
|
-
}> {
|
|
34
|
+
export declare class SpineSkeleton extends ComponentX<SpineSkeletonProps & RefComp<SpineSkeleton>> {
|
|
39
35
|
data: SpineData;
|
|
40
36
|
skin: string;
|
|
41
37
|
animation: string;
|
|
@@ -44,7 +40,7 @@ export declare class SpineSkeleton extends ComponentX<SpineSkeletonProps & {
|
|
|
44
40
|
setAnimation(name: string, loop?: boolean): void;
|
|
45
41
|
setSkeletonData(data: string): void;
|
|
46
42
|
}
|
|
47
|
-
export declare class GraphicsRender extends ComponentX<GraphicsRenderProps
|
|
43
|
+
export declare class GraphicsRender extends ComponentX<GraphicsRenderProps & RefComp<GraphicsRender>, cc.DrawNode> {
|
|
48
44
|
lineWidth: number;
|
|
49
45
|
strokeColor: cc.Color;
|
|
50
46
|
fillColor: cc.Color;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RenderComponent.d.ts","sourceRoot":"","sources":["../../../src/gworld/components/RenderComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"RenderComponent.d.ts","sourceRoot":"","sources":["../../../src/gworld/components/RenderComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAE/E,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,qBAAa,UAAW,SAAQ,UAAU;IACxC,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,UAAU,iBAAiB;IACzB,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,qBAAa,YAAa,SAAQ,UAAU,CAAC,iBAAiB,GAAG,OAAO,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC;IAChG,IAAI,WAAW,WAEd;IAED,IAAI,WAAW,CAAC,KAAK,QAAA,EAepB;CACF;AACD,UAAU,eAAe;IACvB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB;AACD,qBAAa,UAAW,SAAQ,UAAU,CAAC,eAAe,EAAE,EAAE,CAAC,YAAY,CAAC;CAAI;AAEhF,UAAU,iBAAiB;IACzB,SAAS,EAAE,MAAM,CAAA;CAClB;AACD,qBAAa,YAAa,SAAQ,UAAU,CAAC,iBAAiB,EAAE,EAAE,CAAC,cAAc,CAAC;CAAI;AAEtF,UAAU,kBAAkB;IAC1B,IAAI,EAAE,SAAS,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,OAAO,CAAA;CACf;AACD,qBAAa,aAAc,SAAQ,UAAU,CAAC,kBAAkB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IACxF,IAAI,EAAE,SAAS,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,OAAO,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;IAEjB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,UAAQ;IAOvC,eAAe,CAAC,IAAI,EAAE,MAAM;CAK7B;AAED,qBAAa,cAAe,SAAQ,UAAU,CAAC,mBAAmB,GAAG,OAAO,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC;IACxG,SAAS,SAAI;IACb,WAAW,WAAM;IACjB,SAAS,WAAO;IAEhB,MAAM,CAAC,CAAC,KAAA,EAAE,CAAC,KAAA,EAAE,CAAC,KAAA;IAwDd,KAAK;CAKN;AAED,UAAU,aAAa;IACrB,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,qBAAa,QAAS,SAAQ,UAAU,CAAC,aAAa,GAAG;IAAE,IAAI,CAAC,EAAE,QAAQ,CAAA;CAAE,EAAE,EAAE,CAAC,WAAW,CAAC;CAAI"}
|
|
@@ -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
|
}
|