@safe-engine/pixi 8.2.8 → 8.3.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/base/EnhancedComponent.d.ts +1 -0
- package/dist/base/EnhancedComponent.d.ts.map +1 -1
- package/dist/base/EnhancedComponent.js +2 -0
- package/dist/base/utils.d.ts +4 -4
- package/dist/base/utils.d.ts.map +1 -1
- package/dist/base/utils.js +15 -2
- package/dist/components/BaseComponent.d.ts +1 -3
- package/dist/components/BaseComponent.d.ts.map +1 -1
- package/dist/components/BaseComponent.js +2 -10
- package/dist/components/NodeComp.d.ts.map +1 -1
- package/dist/components/NodeComp.js +2 -1
- package/dist/components/Scene.d.ts +1 -1
- package/dist/components/Scene.d.ts.map +1 -1
- package/dist/components/Scene.js +4 -2
- package/dist/gui/GUIComponent.d.ts +18 -17
- package/dist/gui/GUIComponent.d.ts.map +1 -1
- package/dist/gui/GUIComponent.js +42 -25
- package/dist/gui/GUISystem.js +6 -6
- package/dist/helper/utils.d.ts +4 -1
- package/dist/helper/utils.d.ts.map +1 -1
- package/dist/helper/utils.js +3 -0
- package/dist/norender/NoRenderSystem.js +4 -4
- package/dist/render/RenderComponent.d.ts +4 -4
- package/dist/render/RenderComponent.d.ts.map +1 -1
- package/dist/render/RenderComponent.js +14 -4
- package/dist/render/RenderSystem.d.ts.map +1 -1
- package/dist/render/RenderSystem.js +1 -6
- package/package.json +1 -1
|
@@ -11,6 +11,7 @@ export interface BaseNode<C> {
|
|
|
11
11
|
}
|
|
12
12
|
export declare class EnhancedComponent<Props = Object, N extends BaseNode<any> = BaseNode<any>> {
|
|
13
13
|
constructor(data?: BaseComponentProps & Props);
|
|
14
|
+
init(data?: Props): void;
|
|
14
15
|
node: N;
|
|
15
16
|
actionsMap: {
|
|
16
17
|
[key: string]: Animation;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnhancedComponent.d.ts","sourceRoot":"","sources":["../../src/base/EnhancedComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAEpD,MAAM,WAAW,QAAQ,CAAC,CAAC;IACzB,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,CAAC,CAAA;IACX,YAAY,CAAC,CAAC,SAAS,iBAAiB,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAA;IACzD,YAAY,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;IACnE,uBAAuB,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAA;IAChF,sBAAsB,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;CAE9E;AAED,qBAAa,iBAAiB,CAAC,KAAK,GAAG,MAAM,EAAE,CAAC,SAAS,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC;gBACxE,IAAI,CAAC,EAAE,kBAAkB,GAAG,KAAK;
|
|
1
|
+
{"version":3,"file":"EnhancedComponent.d.ts","sourceRoot":"","sources":["../../src/base/EnhancedComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAEpD,MAAM,WAAW,QAAQ,CAAC,CAAC;IACzB,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,CAAC,CAAA;IACX,YAAY,CAAC,CAAC,SAAS,iBAAiB,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAA;IACzD,YAAY,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;IACnE,uBAAuB,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAA;IAChF,sBAAsB,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;CAE9E;AAED,qBAAa,iBAAiB,CAAC,KAAK,GAAG,MAAM,EAAE,CAAC,SAAS,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC;gBACxE,IAAI,CAAC,EAAE,kBAAkB,GAAG,KAAK;IAE7C,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK;IAQjB,IAAI,EAAE,CAAC,CAAA;IACP,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAK;IAC7C,YAAY,CAAC,CAAC,SAAS,iBAAiB,EAAE,QAAQ,KAAA,GAAG,CAAC;IAGtD,YAAY,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;IAGnE,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,CAAC,GAAG,CAAC,CAAA"}
|
package/dist/base/utils.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Constructor } from 'entityx-ts';
|
|
2
|
-
import {
|
|
3
|
-
export
|
|
4
|
-
|
|
5
|
-
|
|
2
|
+
import { ComponentX, NoRenderComponentX } from '../components/BaseComponent';
|
|
3
|
+
export type GetProps<T> = T extends ComponentX<infer P> ? P : T extends NoRenderComponentX<infer Q> ? Q : never;
|
|
4
|
+
export declare function instantiate<T extends ComponentX>(ComponentType: Constructor<T>, data?: GetProps<T>): T;
|
|
5
|
+
export declare function loadScene<T extends ComponentX>(ComponentType: Constructor<T>): void;
|
|
6
6
|
//# sourceMappingURL=utils.d.ts.map
|
package/dist/base/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/base/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/base/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAE7E,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,kBAAkB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAEhH,wBAAgB,WAAW,CAAC,CAAC,SAAS,UAAU,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAQtG;AAED,wBAAgB,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC,QAK5E"}
|
package/dist/base/utils.js
CHANGED
|
@@ -1,3 +1,16 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
import { GameWorld } from '..';
|
|
2
|
+
export function instantiate(ComponentType, data) {
|
|
3
|
+
const instance = new ComponentType();
|
|
4
|
+
instance.init(data);
|
|
5
|
+
// console.log(ComponentType.name, data, instance)
|
|
6
|
+
if (!instance.render) {
|
|
7
|
+
return instance;
|
|
8
|
+
}
|
|
9
|
+
return instance.render();
|
|
10
|
+
}
|
|
11
|
+
export function loadScene(ComponentType) {
|
|
12
|
+
const world = GameWorld.Instance;
|
|
13
|
+
world.entities.reset();
|
|
14
|
+
const instance = new ComponentType();
|
|
15
|
+
instance.render();
|
|
3
16
|
}
|
|
@@ -2,11 +2,9 @@ import { Container } from 'pixi.js';
|
|
|
2
2
|
import { EnhancedComponent } from '../base';
|
|
3
3
|
import { NodeComp } from './NodeComp';
|
|
4
4
|
export declare class NoRenderComponentX<Props = Object, C extends Container = Container> extends EnhancedComponent<Props, NodeComp<C>> {
|
|
5
|
-
static create(data?: any): NoRenderComponentX<any, Container<import("pixi.js").ContainerChild>>;
|
|
6
5
|
}
|
|
7
6
|
export declare class ComponentX<Props = Object, C extends Container = Container> extends EnhancedComponent<Props, NodeComp<C>> {
|
|
8
7
|
static hasRender: boolean;
|
|
9
|
-
render?(
|
|
10
|
-
static create(data?: any): any;
|
|
8
|
+
render?(): this;
|
|
11
9
|
}
|
|
12
10
|
//# sourceMappingURL=BaseComponent.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseComponent.d.ts","sourceRoot":"","sources":["../../src/components/BaseComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AACnC,OAAO,EAAE,iBAAiB,EAAa,MAAM,SAAS,CAAA;AAEtD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,qBAAa,kBAAkB,CAAC,KAAK,GAAG,MAAM,EAAE,CAAC,SAAS,SAAS,GAAG,SAAS,CAAE,SAAQ,iBAAiB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"BaseComponent.d.ts","sourceRoot":"","sources":["../../src/components/BaseComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AACnC,OAAO,EAAE,iBAAiB,EAAa,MAAM,SAAS,CAAA;AAEtD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,qBAAa,kBAAkB,CAAC,KAAK,GAAG,MAAM,EAAE,CAAC,SAAS,SAAS,GAAG,SAAS,CAAE,SAAQ,iBAAiB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;CAC7H;AAED,qBAAa,UAAU,CAAC,KAAK,GAAG,MAAM,EAAE,CAAC,SAAS,SAAS,GAAG,SAAS,CAAE,SAAQ,iBAAiB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IACpH,MAAM,CAAC,SAAS,UAAO;IACvB,MAAM,CAAC,IAAI,IAAI;CAMhB"}
|
|
@@ -1,19 +1,11 @@
|
|
|
1
1
|
import { EnhancedComponent, GameWorld } from '../base';
|
|
2
2
|
export class NoRenderComponentX extends EnhancedComponent {
|
|
3
|
-
static create(data) {
|
|
4
|
-
return new this(data);
|
|
5
|
-
}
|
|
6
3
|
}
|
|
7
4
|
export class ComponentX extends EnhancedComponent {
|
|
8
|
-
|
|
9
|
-
// console.log('create', this, this.prototype['render'])
|
|
10
|
-
if (this.prototype.render) {
|
|
11
|
-
const instance = new this(data);
|
|
12
|
-
return instance.render(data);
|
|
13
|
-
}
|
|
5
|
+
render() {
|
|
14
6
|
const world = GameWorld.Instance;
|
|
15
7
|
const root = world.entities.create();
|
|
16
|
-
const comp = root.assign(
|
|
8
|
+
const comp = root.assign(this);
|
|
17
9
|
return comp;
|
|
18
10
|
}
|
|
19
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeComp.d.ts","sourceRoot":"","sources":["../../src/components/NodeComp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAEhD,OAAO,EAAE,MAAM,EAAiB,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACnE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,KAAK,EAAU,MAAM,SAAS,CAAA;AACtE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"NodeComp.d.ts","sourceRoot":"","sources":["../../src/components/NodeComp.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import remove from 'lodash/remove';
|
|
2
2
|
import { actionManager } from 'pixi-action-ease';
|
|
3
3
|
import { Point, Sprite } from 'pixi.js';
|
|
4
|
+
import { instantiate } from '../base';
|
|
4
5
|
import { ProgressBarComp } from '../gui/GUIComponent';
|
|
5
6
|
import { ExtraDataComp } from '../norender/NoRenderComponent';
|
|
6
7
|
export class NodeComp {
|
|
@@ -335,7 +336,7 @@ export class NodeComp {
|
|
|
335
336
|
const data = this.getComponent(ExtraDataComp);
|
|
336
337
|
// console.log('setData', key, value, data)
|
|
337
338
|
if (!data) {
|
|
338
|
-
this.addComponent(ExtraDataComp
|
|
339
|
+
this.addComponent(instantiate(ExtraDataComp, { key, value }));
|
|
339
340
|
}
|
|
340
341
|
else {
|
|
341
342
|
data.setData(key, value);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Scene.d.ts","sourceRoot":"","sources":["../../src/components/Scene.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAa,MAAM,SAAS,CAAA;AAEtD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,qBAAa,cAAe,SAAQ,iBAAiB,CAAC,EAAE,EAAE,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"Scene.d.ts","sourceRoot":"","sources":["../../src/components/Scene.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAa,MAAM,SAAS,CAAA;AAEtD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,qBAAa,cAAe,SAAQ,iBAAiB,CAAC,EAAE,EAAE,QAAQ,CAAC;IACjE,MAAM;CAWP"}
|
package/dist/components/Scene.js
CHANGED
|
@@ -2,12 +2,14 @@ import { app } from '../app';
|
|
|
2
2
|
import { EnhancedComponent, GameWorld } from '../base';
|
|
3
3
|
import { NodeComp } from './NodeComp';
|
|
4
4
|
export class SceneComponent extends EnhancedComponent {
|
|
5
|
-
|
|
5
|
+
render() {
|
|
6
6
|
const world = GameWorld.Instance;
|
|
7
7
|
world.entities.reset();
|
|
8
8
|
const root = world.entities.create();
|
|
9
9
|
const node = root.assign(new NodeComp(app.stage, root));
|
|
10
|
-
|
|
10
|
+
app.stage.eventMode = 'static';
|
|
11
|
+
app.stage.hitArea = app.screen;
|
|
12
|
+
const sceneComponent = root.assign(this);
|
|
11
13
|
sceneComponent.node = node;
|
|
12
14
|
return sceneComponent;
|
|
13
15
|
}
|
|
@@ -18,7 +18,6 @@ export declare class ButtonComp extends NoRenderComponentX<ButtonCompProps> {
|
|
|
18
18
|
disableImage: string;
|
|
19
19
|
zoomScale: number;
|
|
20
20
|
onPress: (target: ButtonComp) => void;
|
|
21
|
-
setOnPress(cb: (target: ButtonComp) => void): void;
|
|
22
21
|
set enabled(val: any);
|
|
23
22
|
}
|
|
24
23
|
export declare class ProgressBarComp extends ComponentX<{}, ProgressBar> {
|
|
@@ -30,15 +29,15 @@ export declare class ProgressBarComp extends ComponentX<{}, ProgressBar> {
|
|
|
30
29
|
set progress(val: number);
|
|
31
30
|
}
|
|
32
31
|
export declare class LabelComp extends ComponentX<LabelCompProps, Text> {
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
32
|
+
private _font;
|
|
33
|
+
private _string;
|
|
34
|
+
private _size;
|
|
35
|
+
get string(): string;
|
|
36
|
+
set string(val: string);
|
|
37
|
+
get size(): number;
|
|
38
|
+
set size(val: number);
|
|
39
|
+
get font(): string;
|
|
40
|
+
set font(val: string);
|
|
42
41
|
}
|
|
43
42
|
export declare class ScrollView extends NoRenderComponentX<ScrollViewProps> {
|
|
44
43
|
width: number;
|
|
@@ -59,13 +58,15 @@ export declare class ProgressTimerComp extends ComponentX<ProgressTimerProps & {
|
|
|
59
58
|
setFillRange(val: number): void;
|
|
60
59
|
}
|
|
61
60
|
export declare class RichTextComp extends ComponentX<LabelCompProps, TaggedText> {
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
61
|
+
private _font;
|
|
62
|
+
private _string;
|
|
63
|
+
private _size;
|
|
64
|
+
get string(): string;
|
|
65
|
+
set string(val: string);
|
|
66
|
+
get size(): number;
|
|
67
|
+
set size(size: number);
|
|
68
|
+
get font(): string;
|
|
69
|
+
set font(font: string);
|
|
69
70
|
}
|
|
70
71
|
export declare class LabelOutlineComp extends NoRenderComponentX<LabelOutlineCompProps> {
|
|
71
72
|
color: Color4B;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GUIComponent.d.ts","sourceRoot":"","sources":["../../src/gui/GUIComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACjH,OAAO,EAAU,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAEnE,OAAO,UAAU,MAAM,uBAAuB,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACnJ,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAC5E,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAGlE,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;AAErC,qBAAa,UAAW,SAAQ,kBAAkB,CAAC,eAAe,CAAC;IACjE,WAAW,EAAE,MAAM,CAAA;IACnB,aAAa,EAAE,MAAM,CAAA;IACrB,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"GUIComponent.d.ts","sourceRoot":"","sources":["../../src/gui/GUIComponent.ts"],"names":[],"mappings":"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"}
|
package/dist/gui/GUIComponent.js
CHANGED
|
@@ -8,9 +8,9 @@ export const FillType = {
|
|
|
8
8
|
RADIAL: 2,
|
|
9
9
|
};
|
|
10
10
|
export class ButtonComp extends NoRenderComponentX {
|
|
11
|
-
setOnPress(cb) {
|
|
12
|
-
|
|
13
|
-
}
|
|
11
|
+
// setOnPress(cb: (target: ButtonComp) => void) {
|
|
12
|
+
// this.onPress = cb
|
|
13
|
+
// }
|
|
14
14
|
set enabled(val) {
|
|
15
15
|
this.node.instance.interactive = val;
|
|
16
16
|
}
|
|
@@ -30,34 +30,37 @@ export class ProgressBarComp extends ComponentX {
|
|
|
30
30
|
export class LabelComp extends ComponentX {
|
|
31
31
|
constructor() {
|
|
32
32
|
super(...arguments);
|
|
33
|
-
this.
|
|
33
|
+
this._size = 64;
|
|
34
34
|
}
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
return this.node.instance.text;
|
|
38
|
-
}
|
|
35
|
+
get string() {
|
|
36
|
+
return this._string;
|
|
39
37
|
}
|
|
40
|
-
|
|
38
|
+
set string(val) {
|
|
39
|
+
this._string = val;
|
|
40
|
+
if (!this.node)
|
|
41
|
+
return;
|
|
41
42
|
if (this.node.instance instanceof Text) {
|
|
42
43
|
this.node.instance.text = val;
|
|
43
44
|
}
|
|
44
45
|
}
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
return this.node.instance.style.fontSize;
|
|
48
|
-
}
|
|
46
|
+
get size() {
|
|
47
|
+
return this._size;
|
|
49
48
|
}
|
|
50
|
-
|
|
49
|
+
set size(val) {
|
|
50
|
+
this._size = val;
|
|
51
|
+
if (!this.node)
|
|
52
|
+
return;
|
|
51
53
|
if (this.node.instance instanceof Text) {
|
|
52
54
|
this.node.instance.style.fontSize = val;
|
|
53
55
|
}
|
|
54
56
|
}
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
return this.node.instance.style.fontFamily;
|
|
58
|
-
}
|
|
57
|
+
get font() {
|
|
58
|
+
return this._font;
|
|
59
59
|
}
|
|
60
|
-
|
|
60
|
+
set font(val) {
|
|
61
|
+
this._font = val;
|
|
62
|
+
if (!this.node)
|
|
63
|
+
return;
|
|
61
64
|
// console.log('set font', val, Assets.get(val))
|
|
62
65
|
if (this.node.instance instanceof Text) {
|
|
63
66
|
if (Assets.get(val))
|
|
@@ -82,11 +85,13 @@ export class ProgressTimerComp extends ComponentX {
|
|
|
82
85
|
}
|
|
83
86
|
}
|
|
84
87
|
export class RichTextComp extends ComponentX {
|
|
85
|
-
|
|
86
|
-
return this.
|
|
88
|
+
get string() {
|
|
89
|
+
return this._string;
|
|
87
90
|
}
|
|
88
|
-
|
|
89
|
-
this.
|
|
91
|
+
set string(val) {
|
|
92
|
+
this._string = val;
|
|
93
|
+
if (!this.node)
|
|
94
|
+
return;
|
|
90
95
|
const jObj = parseFontString(val);
|
|
91
96
|
const styledOutput = transformToStyledElements(jObj);
|
|
92
97
|
const newText = generateStringFromStyledElements(styledOutput);
|
|
@@ -96,10 +101,22 @@ export class RichTextComp extends ComponentX {
|
|
|
96
101
|
this.node.instance.setText(wrapped);
|
|
97
102
|
this.node.instance.setTagStyles(styles);
|
|
98
103
|
}
|
|
99
|
-
|
|
104
|
+
get size() {
|
|
105
|
+
return this._size;
|
|
106
|
+
}
|
|
107
|
+
set size(size) {
|
|
108
|
+
this._size = size;
|
|
109
|
+
if (!this.node)
|
|
110
|
+
return;
|
|
100
111
|
this.node.instance.setStyleForTag('root', { fontSize: size, color: '#fff' });
|
|
101
112
|
}
|
|
102
|
-
|
|
113
|
+
get font() {
|
|
114
|
+
return this._font;
|
|
115
|
+
}
|
|
116
|
+
set font(font) {
|
|
117
|
+
this._font = font;
|
|
118
|
+
if (!this.node)
|
|
119
|
+
return;
|
|
103
120
|
this.node.instance.setStyleForTag('root', { color: '#fff', fontFamily: font });
|
|
104
121
|
}
|
|
105
122
|
}
|
package/dist/gui/GUISystem.js
CHANGED
|
@@ -79,9 +79,9 @@ export class GUISystem {
|
|
|
79
79
|
component.node = entity.assign(new NodeComp(node, entity));
|
|
80
80
|
const { string = '', font = '', size } = component;
|
|
81
81
|
if (font)
|
|
82
|
-
component.
|
|
83
|
-
component.
|
|
84
|
-
component.
|
|
82
|
+
component.font = (font);
|
|
83
|
+
component.size = (size);
|
|
84
|
+
component.string = (string);
|
|
85
85
|
});
|
|
86
86
|
event_manager.subscribe(EventTypes.ComponentAdded, RichTextComp, ({ entity, component }) => {
|
|
87
87
|
// console.log('ComponentAddedEvent LabelComp', component)
|
|
@@ -89,11 +89,11 @@ export class GUISystem {
|
|
|
89
89
|
const node = new TaggedText(string);
|
|
90
90
|
// node.defaultStyle = { }
|
|
91
91
|
component.node = entity.assign(new NodeComp(node, entity));
|
|
92
|
-
component.
|
|
92
|
+
component.string = (string);
|
|
93
93
|
if (font)
|
|
94
|
-
component.
|
|
94
|
+
component.font = (font);
|
|
95
95
|
if (size)
|
|
96
|
-
component.
|
|
96
|
+
component.size = (size);
|
|
97
97
|
});
|
|
98
98
|
// event_manager.subscribe(EventTypes.ComponentAdded, BlockInputEventsComp), this);
|
|
99
99
|
}
|
package/dist/helper/utils.d.ts
CHANGED
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import { Constructor, EntityManager, EventManager } from 'entityx-ts';
|
|
2
2
|
import { Point } from 'pixi.js';
|
|
3
3
|
import { EnhancedComponent, GameWorld } from '../base';
|
|
4
|
-
export declare function v2(x?: number
|
|
4
|
+
export declare function v2(x?: number | {
|
|
5
|
+
x: number;
|
|
6
|
+
y: number;
|
|
7
|
+
}, y?: number): Point;
|
|
5
8
|
export declare function getDistance(point1: Point, point2: Point): number;
|
|
6
9
|
export declare function registerSystem<T extends EnhancedComponent<any>>(component: Constructor<T>): {
|
|
7
10
|
new (): {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/helper/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,YAAY,EAAoC,MAAM,YAAY,CAAC;AACxG,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAIvD,wBAAgB,EAAE,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/helper/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,YAAY,EAAoC,MAAM,YAAY,CAAC;AACxG,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAIvD,wBAAgB,EAAE,CAAC,CAAC,GAAE,MAAM,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAM,EAAE,CAAC,SAAI,SAKjE;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,UAIvD;AAED,wBAAgB,cAAc,CAAC,CAAC,SAAS,iBAAiB,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;;iCAK7D,YAAY,CAAC,SAAS,CAAC;yBAU/B,aAAa,UAAU,YAAY,CAAC,SAAS,CAAC,MAAM,MAAM;;EAe9E"}
|
package/dist/helper/utils.js
CHANGED
|
@@ -3,6 +3,9 @@ import { Point } from 'pixi.js';
|
|
|
3
3
|
import { GameWorld } from '../base';
|
|
4
4
|
import { NodeComp } from '../components/NodeComp';
|
|
5
5
|
export function v2(x = 0, y = 0) {
|
|
6
|
+
if (typeof x === 'object' && 'x' in x && 'y' in x) {
|
|
7
|
+
return new Point(x.x, x.y);
|
|
8
|
+
}
|
|
6
9
|
return new Point(x, y);
|
|
7
10
|
}
|
|
8
11
|
export function getDistance(point1, point2) {
|
|
@@ -14,22 +14,22 @@ export class NoRenderSystem {
|
|
|
14
14
|
touchComp.node = nodeComp;
|
|
15
15
|
const container = nodeComp.instance;
|
|
16
16
|
if (touchComp.onTouchStart) {
|
|
17
|
-
container.on('
|
|
17
|
+
container.on('pointerdown', (event) => {
|
|
18
18
|
touchComp.onTouchStart(event, nodeComp);
|
|
19
19
|
});
|
|
20
20
|
}
|
|
21
21
|
if (touchComp.onTouchMove) {
|
|
22
|
-
container.on('
|
|
22
|
+
container.on('pointermove', (event) => {
|
|
23
23
|
touchComp.onTouchMove(event, nodeComp);
|
|
24
24
|
});
|
|
25
25
|
}
|
|
26
26
|
if (touchComp.onTouchEnd) {
|
|
27
|
-
container.on('
|
|
27
|
+
container.on('pointerup', (event) => {
|
|
28
28
|
touchComp.onTouchEnd(event, nodeComp);
|
|
29
29
|
});
|
|
30
30
|
}
|
|
31
31
|
if (touchComp.onTouchEnd) {
|
|
32
|
-
container.on('
|
|
32
|
+
container.on('pointercancel', (event) => {
|
|
33
33
|
touchComp.onTouchEnd(event, nodeComp);
|
|
34
34
|
});
|
|
35
35
|
}
|
|
@@ -8,15 +8,15 @@ export declare class NodeRender extends ComponentX {
|
|
|
8
8
|
nodeName?: string;
|
|
9
9
|
}
|
|
10
10
|
export declare class SpriteRender extends ComponentX<SpriteRenderProps, Sprite> {
|
|
11
|
-
|
|
11
|
+
protected _spriteFrame: string;
|
|
12
12
|
type: SpriteTypes;
|
|
13
13
|
fillType: LoadingBarMode;
|
|
14
14
|
fillRange: number;
|
|
15
15
|
fillCenter: Point;
|
|
16
16
|
loadingBar: LoadingBar;
|
|
17
17
|
setFillRange(val: number): void;
|
|
18
|
-
|
|
19
|
-
|
|
18
|
+
get spriteFrame(): string;
|
|
19
|
+
set spriteFrame(frame: string);
|
|
20
20
|
}
|
|
21
21
|
declare enum PointType {
|
|
22
22
|
Circle = 0,
|
|
@@ -39,7 +39,7 @@ export declare class GraphicsRender extends ComponentX<GraphicsRenderProps, Grap
|
|
|
39
39
|
drawPoly(points: Vec2[], closedPolygon: boolean, color: Color4B, thickness?: Float): void;
|
|
40
40
|
drawSolidPoly(points: Vec2[], color: Color4B): void;
|
|
41
41
|
drawDot(points: Vec2[], color: Color4B): void;
|
|
42
|
-
drawSegment(from:
|
|
42
|
+
drawSegment(from: Point, to: Point, color?: Color4B): void;
|
|
43
43
|
drawTriangle(p1: Vec2, p2: Vec2, p3: Vec2, color: Color4B): void;
|
|
44
44
|
clear(): void;
|
|
45
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RenderComponent.d.ts","sourceRoot":"","sources":["../../src/render/RenderComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAW,MAAM,SAAS,CAAA;AAE1D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAA;AAClC,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACzF,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AACxD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAE5C,qBAAa,UAAW,SAAQ,UAAU;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,qBAAa,YAAa,SAAQ,UAAU,CAAC,iBAAiB,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"RenderComponent.d.ts","sourceRoot":"","sources":["../../src/render/RenderComponent.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,11 +19,13 @@ export class SpriteRender extends ComponentX {
|
|
|
19
19
|
this.loadingBar.progress = val;
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
|
-
|
|
23
|
-
return this.
|
|
22
|
+
get spriteFrame() {
|
|
23
|
+
return this._spriteFrame;
|
|
24
24
|
}
|
|
25
|
-
|
|
26
|
-
this.
|
|
25
|
+
set spriteFrame(frame) {
|
|
26
|
+
this._spriteFrame = frame;
|
|
27
|
+
if (!this.node)
|
|
28
|
+
return;
|
|
27
29
|
const sprite = this.node.instance;
|
|
28
30
|
// if (this.node.instance instanceof cc.Sprite) {
|
|
29
31
|
sprite.texture = Texture.from(frame);
|
|
@@ -91,6 +93,14 @@ export class GraphicsRender extends ComponentX {
|
|
|
91
93
|
drawDot(points, color) {
|
|
92
94
|
}
|
|
93
95
|
drawSegment(from, to, color) {
|
|
96
|
+
this.node.instance.moveTo(from.x, from.y);
|
|
97
|
+
this.node.instance.lineTo(to.x, to.y);
|
|
98
|
+
this.node.instance.strokeStyle = {
|
|
99
|
+
cap: 'round', join: 'round',
|
|
100
|
+
width: this.lineWidth || 36,
|
|
101
|
+
color: color || this.strokeColor,
|
|
102
|
+
};
|
|
103
|
+
this.node.instance.stroke();
|
|
94
104
|
}
|
|
95
105
|
drawTriangle(p1, p2, p3, color) {
|
|
96
106
|
this.node.instance.poly([p1, p2, p3], true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RenderSystem.d.ts","sourceRoot":"","sources":["../../src/render/RenderSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,MAAM,EACP,MAAM,YAAY,CAAA;AAOnB,oBAAY,WAAW;IACrB,MAAM,IAAA;IACN,MAAM,IAAA;IACN,KAAK,IAAA;IACL,MAAM,IAAA;IACN,IAAI,IAAA;IACJ,SAAS,IAAA;CACV;AAED,qBAAa,YAAa,YAAW,MAAM;IACzC,SAAS,CAAC,aAAa,EAAE,YAAY;
|
|
1
|
+
{"version":3,"file":"RenderSystem.d.ts","sourceRoot":"","sources":["../../src/render/RenderSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,MAAM,EACP,MAAM,YAAY,CAAA;AAOnB,oBAAY,WAAW;IACrB,MAAM,IAAA;IACN,MAAM,IAAA;IACN,KAAK,IAAA;IACL,MAAM,IAAA;IACN,IAAI,IAAA;IACJ,SAAS,IAAA;CACV;AAED,qBAAa,YAAa,YAAW,MAAM;IACzC,SAAS,CAAC,aAAa,EAAE,YAAY;CA8CtC"}
|
|
@@ -46,15 +46,10 @@ export class RenderSystem {
|
|
|
46
46
|
// maskComp.node = ett.assign(new NodeComp(node, ett))
|
|
47
47
|
});
|
|
48
48
|
event_manager.subscribe(EventTypes.ComponentAdded, GraphicsRender, ({ entity, component }) => {
|
|
49
|
-
const { lineWidth, strokeColor, fillColor } = component
|
|
49
|
+
// const { lineWidth, strokeColor, fillColor } = component
|
|
50
50
|
// console.log('GraphicsRender', component);
|
|
51
51
|
const node = new Graphics();
|
|
52
|
-
node.fill(fillColor);
|
|
53
|
-
// node.fillStyle = fillColor
|
|
54
|
-
node.stroke(strokeColor);
|
|
55
|
-
node.width = lineWidth;
|
|
56
52
|
component.node = entity.assign(new NodeComp(node, entity));
|
|
57
|
-
// node.drawCircle(0, 0, 100)
|
|
58
53
|
});
|
|
59
54
|
event_manager.subscribe(EventTypes.ComponentRemoved, NodeComp, ({ component }) => {
|
|
60
55
|
if (component) {
|