@safe-engine/cocos 1.8.6 → 1.9.3
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/box2d-wasm/PhysicsSystem.js +1 -1
- package/dist/collider/CollideComponent.d.ts +12 -10
- package/dist/collider/CollideComponent.d.ts.map +1 -1
- package/dist/collider/CollideComponent.js +7 -6
- package/dist/core/NodeComp.d.ts +3 -15
- package/dist/core/NodeComp.d.ts.map +1 -1
- package/dist/core/NodeComp.js +6 -57
- package/dist/dragonbones/index.d.ts +2 -3
- package/dist/dragonbones/index.d.ts.map +1 -1
- package/dist/dragonbones/index.js +6 -4
- package/dist/spine/index.d.ts +2 -2
- package/dist/spine/index.d.ts.map +1 -1
- package/dist/spine/index.js +5 -5
- package/package.json +1 -1
|
@@ -144,7 +144,7 @@ export class PhysicsSystem {
|
|
|
144
144
|
const [x = 0, y = 0] = offset;
|
|
145
145
|
const zero = new b2Vec2(0, 0);
|
|
146
146
|
const position = new b2Vec2(node.posX, node.posY);
|
|
147
|
-
const { width, height } = node.
|
|
147
|
+
const { width, height } = node.contentSize;
|
|
148
148
|
const { scaleX, scaleY, anchorX, anchorY } = node;
|
|
149
149
|
const bd = new b2BodyDef();
|
|
150
150
|
bd.set_type(type);
|
|
@@ -1,14 +1,13 @@
|
|
|
1
|
+
import { BaseComponentProps } from '..';
|
|
1
2
|
import { NoRenderComponentX } from '../core/decorator';
|
|
2
3
|
import { Vec2 } from '../polyfills';
|
|
3
|
-
interface ColliderProps {
|
|
4
|
-
offset?: Vec2;
|
|
4
|
+
interface ColliderProps extends BaseComponentProps<Collider> {
|
|
5
5
|
tag?: number;
|
|
6
|
-
enabled?: boolean;
|
|
7
6
|
onCollisionEnter?: (other: Collider) => void;
|
|
8
7
|
onCollisionExit?: (other: Collider) => void;
|
|
9
8
|
onCollisionStay?: (other: Collider) => void;
|
|
10
9
|
}
|
|
11
|
-
export declare class Collider
|
|
10
|
+
export declare class Collider extends NoRenderComponentX<ColliderProps> {
|
|
12
11
|
_worldPoints: cc.Vec2[] | cc.Point[];
|
|
13
12
|
_worldPosition: cc.Vec2 | cc.Point;
|
|
14
13
|
_worldRadius: any;
|
|
@@ -20,25 +19,28 @@ export declare class Collider<T = ColliderProps> extends NoRenderComponentX<T> {
|
|
|
20
19
|
preAabb: cc.Rect;
|
|
21
20
|
};
|
|
22
21
|
}
|
|
23
|
-
interface BoxColliderProps extends
|
|
22
|
+
interface BoxColliderProps extends BaseComponentProps<BoxCollider> {
|
|
23
|
+
offset?: [number, number];
|
|
24
24
|
width: number;
|
|
25
25
|
height: number;
|
|
26
26
|
}
|
|
27
|
-
export declare class BoxCollider extends
|
|
27
|
+
export declare class BoxCollider extends NoRenderComponentX<BoxColliderProps> {
|
|
28
28
|
get size(): cc.Size;
|
|
29
29
|
set size(s: cc.Size);
|
|
30
30
|
update(dt: any, draw: cc.DrawNode): void;
|
|
31
31
|
}
|
|
32
|
-
interface CircleColliderProps extends
|
|
32
|
+
interface CircleColliderProps extends BaseComponentProps<CircleCollider> {
|
|
33
|
+
offset?: [number, number];
|
|
33
34
|
radius: number;
|
|
34
35
|
}
|
|
35
|
-
export declare class CircleCollider extends
|
|
36
|
+
export declare class CircleCollider extends NoRenderComponentX<CircleColliderProps> {
|
|
36
37
|
update(dt: any, draw: cc.DrawNode): void;
|
|
37
38
|
}
|
|
38
|
-
interface PolygonColliderProps extends
|
|
39
|
+
interface PolygonColliderProps extends BaseComponentProps<PolygonCollider> {
|
|
40
|
+
offset?: [number, number];
|
|
39
41
|
points: Array<Vec2>;
|
|
40
42
|
}
|
|
41
|
-
export declare class PolygonCollider extends
|
|
43
|
+
export declare class PolygonCollider extends NoRenderComponentX<PolygonColliderProps> {
|
|
42
44
|
get points(): Vec2[];
|
|
43
45
|
set points(points: Vec2[]);
|
|
44
46
|
update(dt: any, draw: cc.DrawNode): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CollideComponent.d.ts","sourceRoot":"","sources":["../../src/collider/CollideComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAEtD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAYnC,UAAU,
|
|
1
|
+
{"version":3,"file":"CollideComponent.d.ts","sourceRoot":"","sources":["../../src/collider/CollideComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAA;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAEtD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAYnC,UAAU,aAAc,SAAQ,kBAAkB,CAAC,QAAQ,CAAC;IAC1D,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,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,QAAS,SAAQ,kBAAkB,CAAC,aAAa,CAAC;IAC7D,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;IAKP,IAAI,KAAK;;;MAKR;CACF;AAED,UAAU,gBAAiB,SAAQ,kBAAkB,CAAC,WAAW,CAAC;IAChE,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACzB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AACD,qBAAa,WAAY,SAAQ,kBAAkB,CAAC,gBAAgB,CAAC;IACnE,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,kBAAkB,CAAC,cAAc,CAAC;IACtE,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACzB,MAAM,EAAE,MAAM,CAAA;CACf;AACD,qBAAa,cAAe,SAAQ,kBAAkB,CAAC,mBAAmB,CAAC;IACzE,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ;CAsB7B;AAED,UAAU,oBAAqB,SAAQ,kBAAkB,CAAC,eAAe,CAAC;IACxE,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACzB,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;CACpB;AAED,qBAAa,eAAgB,SAAQ,kBAAkB,CAAC,oBAAoB,CAAC;IAC3E,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"}
|
|
@@ -30,7 +30,7 @@ export class Collider extends NoRenderComponentX {
|
|
|
30
30
|
};
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
|
-
export class BoxCollider extends
|
|
33
|
+
export class BoxCollider extends NoRenderComponentX {
|
|
34
34
|
get size() {
|
|
35
35
|
return cc.size(this.props.width, this.props.height);
|
|
36
36
|
}
|
|
@@ -43,7 +43,7 @@ export class BoxCollider extends Collider {
|
|
|
43
43
|
return;
|
|
44
44
|
}
|
|
45
45
|
const collider = this.getComponent(Collider);
|
|
46
|
-
const
|
|
46
|
+
const [x, y] = this.props.offset || [0, 0];
|
|
47
47
|
const hw = this.props.width * 0.5;
|
|
48
48
|
const hh = this.props.height * 0.5;
|
|
49
49
|
const transform = getNodeToWorldTransformAR(this.node);
|
|
@@ -66,7 +66,7 @@ export class BoxCollider extends Collider {
|
|
|
66
66
|
}
|
|
67
67
|
}
|
|
68
68
|
}
|
|
69
|
-
export class CircleCollider extends
|
|
69
|
+
export class CircleCollider extends NoRenderComponentX {
|
|
70
70
|
update(dt, draw) {
|
|
71
71
|
if (!this.node) {
|
|
72
72
|
return;
|
|
@@ -74,7 +74,8 @@ export class CircleCollider extends Collider {
|
|
|
74
74
|
const transform = getNodeToWorldTransformAR(this.node);
|
|
75
75
|
const collider = this.getComponent(Collider);
|
|
76
76
|
collider._worldRadius = this.props.radius * this.node.scaleX;
|
|
77
|
-
|
|
77
|
+
const [x, y] = this.props.offset || [0, 0];
|
|
78
|
+
collider._worldPosition = cc.pointApplyAffineTransform(cc.p(x, y), transform);
|
|
78
79
|
if (draw) {
|
|
79
80
|
draw.drawDot(collider._worldPosition, collider._worldRadius, cc.Color.DEBUG_FILL_COLOR);
|
|
80
81
|
draw.drawCircle(collider._worldPosition, collider._worldRadius, 0, 64, true, 3, cc.Color.DEBUG_BORDER_COLOR);
|
|
@@ -89,9 +90,9 @@ export class CircleCollider extends Collider {
|
|
|
89
90
|
// cc.Color.WHITE, 3, cc.Color.DEBUG_BORDER_COLOR);
|
|
90
91
|
}
|
|
91
92
|
}
|
|
92
|
-
export class PolygonCollider extends
|
|
93
|
+
export class PolygonCollider extends NoRenderComponentX {
|
|
93
94
|
get points() {
|
|
94
|
-
const
|
|
95
|
+
const [x, y] = this.props.offset || [0, 0];
|
|
95
96
|
const pointsList = this.props.points.map((p) => Vec2(p.x + x, p.y + y));
|
|
96
97
|
return pointsList;
|
|
97
98
|
}
|
package/dist/core/NodeComp.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Constructor, Entity } from 'entityx-ts';
|
|
2
|
-
import { Vec2 } from '../polyfills';
|
|
2
|
+
import { Size, Vec2 } from '../polyfills';
|
|
3
3
|
import { ComponentType, EnhancedComponent } from './EnhancedComponent';
|
|
4
4
|
export type EventCallbackType = (...args: any[]) => void;
|
|
5
5
|
export declare class NodeComp<C extends cc.Node = cc.Node> {
|
|
@@ -66,10 +66,6 @@ export declare class NodeComp<C extends cc.Node = cc.Node> {
|
|
|
66
66
|
getComponentsInChildren<T extends ComponentType>(component: Constructor<T>): T[];
|
|
67
67
|
getComponentInChildren<T extends ComponentType>(component: Constructor<T>): T;
|
|
68
68
|
hasComponentInChildren<T extends ComponentType>(component: Constructor<T>): boolean;
|
|
69
|
-
getPercent(): number;
|
|
70
|
-
setPercent(val: number): void;
|
|
71
|
-
setTouchEnabled(enabled: boolean): void;
|
|
72
|
-
addTouchEventListener(cb: any): void;
|
|
73
69
|
convertToNodeSpace(point: cc.Point): {
|
|
74
70
|
x: number;
|
|
75
71
|
y: number;
|
|
@@ -127,17 +123,9 @@ export declare class NodeComp<C extends cc.Node = cc.Node> {
|
|
|
127
123
|
angle(other: Vec2): number;
|
|
128
124
|
distance(other: /*elided*/ any): number;
|
|
129
125
|
};
|
|
130
|
-
getPosition(): cc.Point;
|
|
131
|
-
setPosition(x: number | cc.Vec2 | cc.Vec3 | cc.Point, y?: number): void;
|
|
132
|
-
setRotation(deg: number): void;
|
|
133
|
-
getRotation(): number;
|
|
134
|
-
setAnchorPoint(point: number | cc.Point, y?: number): void;
|
|
135
|
-
getAnchorPoint(): cc.Point;
|
|
136
126
|
getBoundingBox(): cc.Rect;
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
setColor(color: cc.Color): void;
|
|
140
|
-
setScale(scaleX: number, scaleY?: number): void;
|
|
127
|
+
get contentSize(): Size;
|
|
128
|
+
set contentSize(size: Size);
|
|
141
129
|
runAction(atc: cc.ActionInterval): void;
|
|
142
130
|
stopAllActions(): void;
|
|
143
131
|
pauseAllActionsAndSchedule(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeComp.d.ts","sourceRoot":"","sources":["../../src/core/NodeComp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAIhD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"NodeComp.d.ts","sourceRoot":"","sources":["../../src/core/NodeComp.ts"],"names":[],"mappings":"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"}
|
package/dist/core/NodeComp.js
CHANGED
|
@@ -136,7 +136,7 @@ export class NodeComp {
|
|
|
136
136
|
return this.instance.height;
|
|
137
137
|
}
|
|
138
138
|
set height(val) {
|
|
139
|
-
this.instance.setContentSize(
|
|
139
|
+
this.instance.setContentSize(this.width, val);
|
|
140
140
|
}
|
|
141
141
|
get zIndex() {
|
|
142
142
|
return this.instance.zIndex;
|
|
@@ -176,33 +176,6 @@ export class NodeComp {
|
|
|
176
176
|
return child.getComponent(component);
|
|
177
177
|
});
|
|
178
178
|
}
|
|
179
|
-
getPercent() {
|
|
180
|
-
if (this.instance instanceof ccui.LoadingBar) {
|
|
181
|
-
return this.instance.getPercent();
|
|
182
|
-
}
|
|
183
|
-
return 0;
|
|
184
|
-
}
|
|
185
|
-
setPercent(val) {
|
|
186
|
-
if (this.instance instanceof ccui.LoadingBar) {
|
|
187
|
-
return this.instance.setPercent(val);
|
|
188
|
-
}
|
|
189
|
-
}
|
|
190
|
-
setTouchEnabled(enabled) {
|
|
191
|
-
if (!cc.sys.isObjectValid(this.instance)) {
|
|
192
|
-
return;
|
|
193
|
-
}
|
|
194
|
-
if (this.instance instanceof ccui.Widget) {
|
|
195
|
-
this.instance.setTouchEnabled(enabled);
|
|
196
|
-
}
|
|
197
|
-
}
|
|
198
|
-
addTouchEventListener(cb) {
|
|
199
|
-
if (!cc.sys.isObjectValid(this.instance)) {
|
|
200
|
-
return;
|
|
201
|
-
}
|
|
202
|
-
if (this.instance instanceof ccui.Widget) {
|
|
203
|
-
this.instance.addTouchEventListener(cb);
|
|
204
|
-
}
|
|
205
|
-
}
|
|
206
179
|
convertToNodeSpace(point) {
|
|
207
180
|
const { x, y } = this.instance.convertToNodeSpace(point);
|
|
208
181
|
return Vec2(x, y);
|
|
@@ -215,24 +188,6 @@ export class NodeComp {
|
|
|
215
188
|
const { x, y } = this.instance.convertToWorldSpaceAR(point);
|
|
216
189
|
return Vec2(x, y);
|
|
217
190
|
}
|
|
218
|
-
getPosition() {
|
|
219
|
-
return this.instance.getPosition();
|
|
220
|
-
}
|
|
221
|
-
setPosition(x, y) {
|
|
222
|
-
this.instance.setPosition(x, y);
|
|
223
|
-
}
|
|
224
|
-
setRotation(deg) {
|
|
225
|
-
this.instance.setRotation(deg);
|
|
226
|
-
}
|
|
227
|
-
getRotation() {
|
|
228
|
-
return this.instance.getRotation();
|
|
229
|
-
}
|
|
230
|
-
setAnchorPoint(point, y) {
|
|
231
|
-
this.instance.setAnchorPoint(point, y);
|
|
232
|
-
}
|
|
233
|
-
getAnchorPoint() {
|
|
234
|
-
return this.instance.getAnchorPoint();
|
|
235
|
-
}
|
|
236
191
|
getBoundingBox() {
|
|
237
192
|
const box = this.instance.getBoundingBox();
|
|
238
193
|
box.contains = function (point) {
|
|
@@ -240,14 +195,14 @@ export class NodeComp {
|
|
|
240
195
|
};
|
|
241
196
|
return box;
|
|
242
197
|
}
|
|
243
|
-
|
|
198
|
+
get contentSize() {
|
|
244
199
|
return this.instance.getContentSize();
|
|
245
200
|
}
|
|
246
|
-
|
|
247
|
-
this.instance.setContentSize(size
|
|
201
|
+
set contentSize(size) {
|
|
202
|
+
this.instance.setContentSize(size);
|
|
248
203
|
if (this.instance instanceof cc.ClippingNode) {
|
|
249
|
-
const hw =
|
|
250
|
-
const hh =
|
|
204
|
+
const hw = size.width * 0.5;
|
|
205
|
+
const hh = size.height * 0.5;
|
|
251
206
|
const stencil = new cc.DrawNode();
|
|
252
207
|
const rectangle = [cc.p(-hw, -hh), cc.p(hw, -hh), cc.p(hw, hh), cc.p(-hw, hh)];
|
|
253
208
|
stencil.drawPoly(rectangle, cc.Color.WHITE, 0, cc.Color.WHITE);
|
|
@@ -255,12 +210,6 @@ export class NodeComp {
|
|
|
255
210
|
this.instance.stencil = stencil;
|
|
256
211
|
}
|
|
257
212
|
}
|
|
258
|
-
setColor(color) {
|
|
259
|
-
this.instance.setColor(color);
|
|
260
|
-
}
|
|
261
|
-
setScale(scaleX, scaleY) {
|
|
262
|
-
this.instance.setScale(scaleX, scaleY || scaleX);
|
|
263
|
-
}
|
|
264
213
|
runAction(atc) {
|
|
265
214
|
this.instance.runAction(atc);
|
|
266
215
|
}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { EntityManager, EventManager, System } from 'entityx-ts';
|
|
2
2
|
import { ComponentX } from '../core/decorator';
|
|
3
|
-
import { GameWorld } from '../gworld';
|
|
4
3
|
import { BaseComponentProps } from '../safex';
|
|
5
4
|
export type DragonBonesEventData = {
|
|
6
5
|
name: string;
|
|
@@ -46,6 +45,6 @@ export declare class DragonBonesSystem implements System {
|
|
|
46
45
|
configure(event_manager: EventManager): void;
|
|
47
46
|
update(entities: EntityManager): void;
|
|
48
47
|
}
|
|
49
|
-
export declare function setupDragonBones(
|
|
50
|
-
export
|
|
48
|
+
export declare function setupDragonBones(): void;
|
|
49
|
+
export * from './PixiDragonBonesSprite';
|
|
51
50
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/dragonbones/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAG5E,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/dragonbones/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAG5E,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAG7C,MAAM,MAAM,oBAAoB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAA;AACnD,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,UAAU,gBAAgB;IACxB,IAAI,EAAE,eAAe,CAAA;IACrB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,SAAS,CAAC,EAAE,KAAK,CAAA;IAEjB,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAA;IAC7B,cAAc,CAAC,EAAE,MAAM,IAAI,CAAA;IAC3B,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAA;CACjC;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;IAOxC,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;IAyDrC,MAAM,CAAC,QAAQ,EAAE,aAAa;CAW/B;AAED,wBAAgB,gBAAgB,SAI/B;AAED,cAAc,yBAAyB,CAAA"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { EventTypes } from 'entityx-ts';
|
|
2
2
|
import { NodeComp } from '../core/NodeComp';
|
|
3
3
|
import { ComponentX } from '../core/decorator';
|
|
4
|
+
import { GameWorld } from '../gworld';
|
|
4
5
|
import { PixiDragonBonesSprite } from './PixiDragonBonesSprite';
|
|
5
6
|
export class DragonBonesComp extends ComponentX {
|
|
6
7
|
armature;
|
|
@@ -87,8 +88,9 @@ export class DragonBonesSystem {
|
|
|
87
88
|
});
|
|
88
89
|
}
|
|
89
90
|
}
|
|
90
|
-
export function setupDragonBones(
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
91
|
+
export function setupDragonBones() {
|
|
92
|
+
GameWorld.Instance.systems.add(DragonBonesSystem);
|
|
93
|
+
GameWorld.Instance.listUpdate.push(DragonBonesSystem);
|
|
94
|
+
GameWorld.Instance.systems.configureOnce(DragonBonesSystem);
|
|
94
95
|
}
|
|
96
|
+
export * from './PixiDragonBonesSprite';
|
package/dist/spine/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { EntityManager, EventManager, System } from 'entityx-ts';
|
|
2
|
-
import { BaseComponentProps, ComponentX
|
|
2
|
+
import { BaseComponentProps, ComponentX } from '..';
|
|
3
3
|
interface SpineData {
|
|
4
4
|
atlas: string;
|
|
5
5
|
skeleton: string;
|
|
@@ -26,6 +26,6 @@ export declare class SpineSystem implements System {
|
|
|
26
26
|
private onAddSpineSkeleton;
|
|
27
27
|
update(entities: EntityManager, events: EventManager, dt: number): any;
|
|
28
28
|
}
|
|
29
|
-
export declare function setupSpine(
|
|
29
|
+
export declare function setupSpine(): void;
|
|
30
30
|
export {};
|
|
31
31
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/spine/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAE5E,OAAO,EAAE,kBAAkB,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/spine/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAE5E,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAuB,MAAM,IAAI,CAAA;AAGxE,UAAU,SAAS;IACjB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,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,kBAAkB,CAAC,aAAa,CAAC,CAAC;IACnG,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,WAAY,YAAW,MAAM;IACxC,SAAS,CAAC,aAAa,EAAE,YAAY;IAGrC,OAAO,CAAC,kBAAkB,CAazB;IACD,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;CAIjE;AAED,wBAAgB,UAAU,SAIzB"}
|
package/dist/spine/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { EventTypes } from 'entityx-ts';
|
|
2
|
-
import { ComponentX, NodeComp } from '..';
|
|
2
|
+
import { ComponentX, GameWorld, NodeComp } from '..';
|
|
3
3
|
import { SkeletonAnimation } from './CCSkeletonAnimation';
|
|
4
4
|
export class SpineSkeleton extends ComponentX {
|
|
5
5
|
data;
|
|
@@ -41,8 +41,8 @@ export class SpineSystem {
|
|
|
41
41
|
// throw new Error('Method not implemented.');
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
|
-
export function setupSpine(
|
|
45
|
-
|
|
46
|
-
//
|
|
47
|
-
|
|
44
|
+
export function setupSpine() {
|
|
45
|
+
GameWorld.Instance.systems.add(SpineSystem);
|
|
46
|
+
// GameWorld.Instance.listUpdate.push(SpineSystem)
|
|
47
|
+
GameWorld.Instance.systems.configureOnce(SpineSystem);
|
|
48
48
|
}
|