@safe-engine/cocos 2.6.1 → 2.6.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.
|
@@ -10,7 +10,6 @@ interface ButtonCompProps {
|
|
|
10
10
|
spriteFrame: string;
|
|
11
11
|
selectedImage?: string;
|
|
12
12
|
disableImage?: string;
|
|
13
|
-
param?: string;
|
|
14
13
|
zoomScale?: number;
|
|
15
14
|
capInsets?: [number, number, number, number];
|
|
16
15
|
onPress?: (target: ButtonComp) => void;
|
|
@@ -55,24 +54,9 @@ interface ScrollViewProps {
|
|
|
55
54
|
isScrollToTop?: boolean;
|
|
56
55
|
isBounced?: boolean;
|
|
57
56
|
}
|
|
58
|
-
export declare class ScrollViewComp extends ComponentX<ScrollViewProps & BaseComponentProps<ScrollViewComp>,
|
|
57
|
+
export declare class ScrollViewComp extends ComponentX<ScrollViewProps & BaseComponentProps<ScrollViewComp>, ccui.ScrollView> {
|
|
59
58
|
zoom(scale: number): void;
|
|
60
59
|
}
|
|
61
|
-
export declare enum ListViewDirection {
|
|
62
|
-
NONE,
|
|
63
|
-
HORIZONTAL,
|
|
64
|
-
VERTICAL,
|
|
65
|
-
BOTH
|
|
66
|
-
}
|
|
67
|
-
interface ListViewProps {
|
|
68
|
-
viewSize: Size;
|
|
69
|
-
contentSize: Size;
|
|
70
|
-
direction?: ListViewDirection;
|
|
71
|
-
isScrollToTop?: boolean;
|
|
72
|
-
isBounced?: boolean;
|
|
73
|
-
}
|
|
74
|
-
export declare class ListViewComp extends ComponentX<ListViewProps & BaseComponentProps<ListViewComp>, ccui.ScrollView> {
|
|
75
|
-
}
|
|
76
60
|
interface InputCompProps {
|
|
77
61
|
placeHolder?: string;
|
|
78
62
|
font?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GUIComponent.d.ts","sourceRoot":"","sources":["../../src/gui/GUIComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,IAAI,CAAA;AACpD,OAAO,EAAE,UAAU,EAAU,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAEzC,eAAO,MAAM,QAAQ;;;;CAIpB,CAAA;AAID,UAAU,eAAe;IACvB,WAAW,EAAE,MAAM,CAAA;IACnB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,
|
|
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
|
@@ -48,27 +48,19 @@ export class LabelComp extends ComponentX {
|
|
|
48
48
|
}
|
|
49
49
|
export var ScrollViewDirection;
|
|
50
50
|
(function (ScrollViewDirection) {
|
|
51
|
-
ScrollViewDirection[ScrollViewDirection["NONE"] =
|
|
52
|
-
ScrollViewDirection[ScrollViewDirection["HORIZONTAL"] =
|
|
53
|
-
ScrollViewDirection[ScrollViewDirection["VERTICAL"] =
|
|
54
|
-
ScrollViewDirection[ScrollViewDirection["BOTH"] =
|
|
51
|
+
ScrollViewDirection[ScrollViewDirection["NONE"] = ccui.ScrollView.DIR_NONE] = "NONE";
|
|
52
|
+
ScrollViewDirection[ScrollViewDirection["HORIZONTAL"] = ccui.ScrollView.DIR_HORIZONTAL] = "HORIZONTAL";
|
|
53
|
+
ScrollViewDirection[ScrollViewDirection["VERTICAL"] = ccui.ScrollView.DIR_VERTICAL] = "VERTICAL";
|
|
54
|
+
ScrollViewDirection[ScrollViewDirection["BOTH"] = ccui.ScrollView.DIR_BOTH] = "BOTH";
|
|
55
55
|
})(ScrollViewDirection || (ScrollViewDirection = {}));
|
|
56
56
|
export class ScrollViewComp extends ComponentX {
|
|
57
57
|
zoom(scale) {
|
|
58
|
-
if (this.node.instance instanceof
|
|
59
|
-
|
|
58
|
+
if (this.node.instance instanceof ccui.ScrollView) {
|
|
59
|
+
;
|
|
60
|
+
this.node.instance._innerContainer.setScale(scale);
|
|
60
61
|
}
|
|
61
62
|
}
|
|
62
63
|
}
|
|
63
|
-
export var ListViewDirection;
|
|
64
|
-
(function (ListViewDirection) {
|
|
65
|
-
ListViewDirection[ListViewDirection["NONE"] = ccui.ScrollView.DIR_NONE] = "NONE";
|
|
66
|
-
ListViewDirection[ListViewDirection["HORIZONTAL"] = ccui.ScrollView.DIR_HORIZONTAL] = "HORIZONTAL";
|
|
67
|
-
ListViewDirection[ListViewDirection["VERTICAL"] = ccui.ScrollView.DIR_VERTICAL] = "VERTICAL";
|
|
68
|
-
ListViewDirection[ListViewDirection["BOTH"] = ccui.ScrollView.DIR_BOTH] = "BOTH";
|
|
69
|
-
})(ListViewDirection || (ListViewDirection = {}));
|
|
70
|
-
export class ListViewComp extends ComponentX {
|
|
71
|
-
}
|
|
72
64
|
export class InputComp extends ComponentX {
|
|
73
65
|
get string() {
|
|
74
66
|
return this.node.instance.getString();
|
|
@@ -95,6 +87,5 @@ export class GridLayoutComp extends ComponentX {
|
|
|
95
87
|
Object.defineProperty(ProgressTimerComp.prototype, 'render', { value: render });
|
|
96
88
|
Object.defineProperty(LabelComp.prototype, 'render', { value: render });
|
|
97
89
|
Object.defineProperty(ScrollViewComp.prototype, 'render', { value: render });
|
|
98
|
-
Object.defineProperty(ListViewComp.prototype, 'render', { value: render });
|
|
99
90
|
Object.defineProperty(InputComp.prototype, 'render', { value: render });
|
|
100
91
|
Object.defineProperty(ButtonComp.prototype, 'render', { value: render });
|
package/dist/gui/GUISystem.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GUISystem.d.ts","sourceRoot":"","sources":["../../src/gui/GUISystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAoC,MAAM,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"GUISystem.d.ts","sourceRoot":"","sources":["../../src/gui/GUISystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAoC,MAAM,EAAE,MAAM,YAAY,CAAA;AAKnF,qBAAa,SAAU,YAAW,MAAM;IACtC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAA;IAC1B,SAAS,CAAC,aAAa,EAAE,YAAY;IAUrC,OAAO,CAAC,eAAe,CAuBtB;IAED,OAAO,CAAC,sBAAsB,CAc7B;IAED,OAAO,CAAC,cAAc,CAerB;IAED,OAAO,CAAC,mBAAmB,CAU1B;IAED,OAAO,CAAC,cAAc,CAWrB;IAED,OAAO,CAAC,eAAe,CAetB;IAED,OAAO,CAAC,mBAAmB,CAG1B;CAKF"}
|
package/dist/gui/GUISystem.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { EventTypes } from 'entityx-ts';
|
|
2
2
|
import { NodeComp } from '../core/NodeComp';
|
|
3
3
|
import { Vec2 } from '../polyfills';
|
|
4
|
-
import { ButtonComp, FillType, GridLayoutComp, InputComp, LabelComp,
|
|
4
|
+
import { ButtonComp, FillType, GridLayoutComp, InputComp, LabelComp, ProgressTimerComp, ScrollViewComp, WidgetComp } from './GUIComponent';
|
|
5
5
|
export class GUISystem {
|
|
6
6
|
static defaultFont;
|
|
7
7
|
configure(event_manager) {
|
|
@@ -9,7 +9,6 @@ export class GUISystem {
|
|
|
9
9
|
event_manager.subscribe(EventTypes.ComponentAdded, ProgressTimerComp, this.onAddProgressTimerComp);
|
|
10
10
|
event_manager.subscribe(EventTypes.ComponentAdded, LabelComp, this.onAddLabelComp);
|
|
11
11
|
event_manager.subscribe(EventTypes.ComponentAdded, ScrollViewComp, this.onAddScrollViewComp);
|
|
12
|
-
event_manager.subscribe(EventTypes.ComponentAdded, ListViewComp, this.onAddListViewComp);
|
|
13
12
|
event_manager.subscribe(EventTypes.ComponentAdded, InputComp, this.onAddInputComp);
|
|
14
13
|
event_manager.subscribe(EventTypes.ComponentAdded, WidgetComp, this.onAddWidgetComp);
|
|
15
14
|
event_manager.subscribe(EventTypes.ComponentAdded, GridLayoutComp, this.onAddGridLayoutComp);
|
|
@@ -72,18 +71,6 @@ export class GUISystem {
|
|
|
72
71
|
};
|
|
73
72
|
onAddScrollViewComp = ({ entity, component: scrollView }) => {
|
|
74
73
|
const { viewSize, contentSize, isScrollToTop, isBounced, direction = cc.SCROLLVIEW_DIRECTION_VERTICAL } = scrollView.props;
|
|
75
|
-
const node = new cc.ScrollView(viewSize);
|
|
76
|
-
node.setViewSize(viewSize);
|
|
77
|
-
node.setContentSize(contentSize);
|
|
78
|
-
node.setDirection(direction);
|
|
79
|
-
if (isScrollToTop !== undefined)
|
|
80
|
-
node.setContentOffset(cc.p(0, viewSize.height - contentSize.height));
|
|
81
|
-
// node.setTouchEnabled(false)
|
|
82
|
-
node.setBounceable(isBounced !== undefined);
|
|
83
|
-
scrollView.node = entity.assign(new NodeComp(node, entity));
|
|
84
|
-
};
|
|
85
|
-
onAddListViewComp = ({ entity, component: listView }) => {
|
|
86
|
-
const { viewSize, contentSize, isScrollToTop, isBounced, direction = ccui.ScrollView.DIR_VERTICAL } = listView.props;
|
|
87
74
|
const node = new ccui.ScrollView();
|
|
88
75
|
node.setContentSize(viewSize);
|
|
89
76
|
node.setInnerContainerSize(contentSize);
|
|
@@ -92,7 +79,7 @@ export class GUISystem {
|
|
|
92
79
|
node.scrollToTop(0, true);
|
|
93
80
|
// node.setTouchEnabled(false)
|
|
94
81
|
node.setBounceEnabled(isBounced !== undefined);
|
|
95
|
-
|
|
82
|
+
scrollView.node = entity.assign(new NodeComp(node, entity));
|
|
96
83
|
};
|
|
97
84
|
onAddInputComp = ({ entity, component: textInput }) => {
|
|
98
85
|
const { placeHolder = '', font = GUISystem.defaultFont, size = 64, maxLength = 20, isPassword = false } = textInput.props;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@safe-engine/cocos",
|
|
3
|
-
"version": "2.6.
|
|
3
|
+
"version": "2.6.3",
|
|
4
4
|
"description": "safe-engine with cocos renderer support",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"@cocos/dragonbones-js": "^1.0.2",
|
|
25
25
|
"@esotericsoftware/spine-core": "^4.2.98",
|
|
26
26
|
"box2d-wasm": "^7.0.0",
|
|
27
|
-
"cocos-html5-ts": "^2.1.
|
|
27
|
+
"cocos-html5-ts": "^2.1.7",
|
|
28
28
|
"entityx-ts": "^2.3.1"
|
|
29
29
|
},
|
|
30
30
|
"author": "",
|