@safe-engine/cocos 1.0.3 → 1.0.6
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 +0 -16
- package/dist/dragonbones/cocos/CocosArmatureDisplay.d.ts.map +1 -1
- package/dist/dragonbones/cocos/CocosArmatureDisplay.js +5 -3
- package/dist/dragonbones/cocos/CocosFactory.d.ts +2 -2
- package/dist/dragonbones/cocos/CocosFactory.d.ts.map +1 -1
- package/dist/dragonbones/cocos/CocosFactory.js +5 -10
- package/dist/dragonbones/cocos/CocosTextureAtlasData.d.ts.map +1 -1
- package/dist/dragonbones/cocos/CocosTextureAtlasData.js +9 -10
- package/dist/dragonbones/dragonBones.d.ts +1 -1
- package/dist/dragonbones/dragonBones.d.ts.map +1 -1
- package/dist/dragonbones/dragonBones.js +1 -1
- package/dist/dragonbones/index.d.ts +22 -7
- package/dist/dragonbones/index.d.ts.map +1 -1
- package/dist/dragonbones/index.js +12 -17
- package/dist/gworld/components/NodeComp.d.ts.map +1 -1
- package/package.json +1 -1
package/@types/safex.d.ts
CHANGED
|
@@ -53,22 +53,6 @@ interface SpineData {
|
|
|
53
53
|
texture?: string
|
|
54
54
|
}
|
|
55
55
|
|
|
56
|
-
interface DragonBonesData {
|
|
57
|
-
atlas: string
|
|
58
|
-
skeleton: string
|
|
59
|
-
texture: string
|
|
60
|
-
}
|
|
61
|
-
interface DragonBonesProps {
|
|
62
|
-
data: DragonBonesData
|
|
63
|
-
skin?: string
|
|
64
|
-
animation?: string
|
|
65
|
-
playTimes?: number
|
|
66
|
-
timeScale?: number
|
|
67
|
-
onAnimationStart?: (event: { name: string }) => void
|
|
68
|
-
onAnimationEnd?: (event: { name: string }) => void
|
|
69
|
-
onAnimationComplete?: (event: { name: string }) => void
|
|
70
|
-
}
|
|
71
|
-
|
|
72
56
|
interface PhysicsMaterialProps {
|
|
73
57
|
friction?: number
|
|
74
58
|
restitution?: number
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CocosArmatureDisplay.d.ts","sourceRoot":"","sources":["../../../src/dragonbones/cocos/CocosArmatureDisplay.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"CocosArmatureDisplay.d.ts","sourceRoot":"","sources":["../../../src/dragonbones/cocos/CocosArmatureDisplay.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EACL,QAAQ,EAGR,WAAW,EACX,eAAe,EACf,cAAc,EAEf,MAAM,uBAAuB,CAAC;AAE/B,qBAAa,oBAAqB,SAAQ,EAAE,CAAC,MAAO,YAAW,cAAc;IAC3E;;OAEG;IACI,SAAS,UAAS;IACzB,OAAO,CAAC,UAAU,CAAS;IAE3B,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,YAAY,CAA0B;IAC9C;;OAEG;IACI,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAGvC;;OAEG;IACI,OAAO,IAAI,IAAI;IAUtB;;OAEG;IACI,QAAQ,IAAI,IAAI;IAyHvB;;OAEG;IACI,OAAO,CAAC,YAAY,UAAO,GAAG,IAAI;IAQzC;;OAEG;IACI,OAAO,IAAI,IAAI;IAGtB;;OAEG;IACI,eAAe,CACpB,IAAI,EAAE,eAAe,EACrB,WAAW,EAAE,WAAW,GACvB,IAAI;IAGP;;OAEG;IACI,kBAAkB,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO;IAIzD;;OAEG;IACI,kBAAkB,CACvB,IAAI,EAAE,eAAe,EACrB,QAAQ,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,EACtC,MAAM,EAAE,GAAG,GACV,IAAI;IAGP;;OAEG;IACI,qBAAqB,CAC1B,IAAI,EAAE,eAAe,EACrB,QAAQ,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,EACtC,MAAM,EAAE,GAAG,GACV,IAAI;IAGP;;OAEG;IACH,IAAW,QAAQ,IAAI,QAAQ,CAE9B;IACD;;OAEG;IACH,IAAW,SAAS,IAAI,SAAS,CAEhC;CACF"}
|
|
@@ -115,7 +115,7 @@ var CocosArmatureDisplay = /** @class */ (function (_super) {
|
|
|
115
115
|
this._debugDrawer.addChild(child);
|
|
116
116
|
}
|
|
117
117
|
child.clear();
|
|
118
|
-
child.lineStyle(2.0,
|
|
118
|
+
child.lineStyle(2.0, 0xff00ff, 0.7);
|
|
119
119
|
switch (boundingBoxData.type) {
|
|
120
120
|
case dragonbones_js_1.BoundingBoxType.Rectangle:
|
|
121
121
|
child.drawRect(-boundingBoxData.width * 0.5, -boundingBoxData.height * 0.5, boundingBoxData.width, boundingBoxData.height);
|
|
@@ -123,7 +123,7 @@ var CocosArmatureDisplay = /** @class */ (function (_super) {
|
|
|
123
123
|
case dragonbones_js_1.BoundingBoxType.Ellipse:
|
|
124
124
|
child.drawEllipse(-boundingBoxData.width * 0.5, -boundingBoxData.height * 0.5, boundingBoxData.width, boundingBoxData.height);
|
|
125
125
|
break;
|
|
126
|
-
case dragonbones_js_1.BoundingBoxType.Polygon:
|
|
126
|
+
case dragonbones_js_1.BoundingBoxType.Polygon: {
|
|
127
127
|
var vertices = boundingBoxData.vertices;
|
|
128
128
|
for (var i_1 = 0, l_1 = vertices.length; i_1 < l_1; i_1 += 2) {
|
|
129
129
|
var x = vertices[i_1];
|
|
@@ -137,6 +137,7 @@ var CocosArmatureDisplay = /** @class */ (function (_super) {
|
|
|
137
137
|
}
|
|
138
138
|
child.lineTo(vertices[0], vertices[1]);
|
|
139
139
|
break;
|
|
140
|
+
}
|
|
140
141
|
default:
|
|
141
142
|
break;
|
|
142
143
|
}
|
|
@@ -154,7 +155,8 @@ var CocosArmatureDisplay = /** @class */ (function (_super) {
|
|
|
154
155
|
}
|
|
155
156
|
}
|
|
156
157
|
}
|
|
157
|
-
else if (this._debugDrawer !== null &&
|
|
158
|
+
else if (this._debugDrawer !== null &&
|
|
159
|
+
this._debugDrawer.parent === this) {
|
|
158
160
|
this.removeChild(this._debugDrawer);
|
|
159
161
|
}
|
|
160
162
|
}
|
|
@@ -55,11 +55,11 @@ export declare class CocosFactory extends BaseFactory {
|
|
|
55
55
|
* @version DragonBones 4.7
|
|
56
56
|
* @language zh_CN
|
|
57
57
|
*/
|
|
58
|
-
static newInstance(
|
|
58
|
+
static newInstance(): CocosFactory;
|
|
59
59
|
/**
|
|
60
60
|
* @inheritDoc
|
|
61
61
|
*/
|
|
62
|
-
constructor(dataParser?: DataParser | null
|
|
62
|
+
constructor(dataParser?: DataParser | null);
|
|
63
63
|
protected _buildTextureAtlasData(textureAtlasData: CocosTextureAtlasData | null, textureAtlas: cc.Texture2D | null): CocosTextureAtlasData;
|
|
64
64
|
protected _buildArmature(dataPackage: BuildArmaturePackage): Armature;
|
|
65
65
|
protected _buildSlot(_dataPackage: BuildArmaturePackage, slotData: SlotData, armature: Armature): Slot;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CocosFactory.d.ts","sourceRoot":"","sources":["../../../src/dragonbones/cocos/CocosFactory.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAc,oBAAoB,EAAE,UAAU,EAAe,IAAI,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEzI,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EAAE,qBAAqB,EAAoB,MAAM,yBAAyB,CAAC;AAElF;;;;GAIG;AACH;;;;GAIG;AACH,qBAAa,YAAa,SAAQ,WAAW;IAC3C,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAA4B;IAC/D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA6B;IACpD,OAAO,CAAC,MAAM,CAAC,aAAa;WAOd,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAOnD,OAAc,eAAe,UAAQ;IAErC;;;;OAIG;IACH;;;;OAIG;IACH,WAAkB,OAAO,IAAI,YAAY,CAMxC;IAED;;;;OAIG;WACW,WAAW,
|
|
1
|
+
{"version":3,"file":"CocosFactory.d.ts","sourceRoot":"","sources":["../../../src/dragonbones/cocos/CocosFactory.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAc,oBAAoB,EAAE,UAAU,EAAe,IAAI,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEzI,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EAAE,qBAAqB,EAAoB,MAAM,yBAAyB,CAAC;AAElF;;;;GAIG;AACH;;;;GAIG;AACH,qBAAa,YAAa,SAAQ,WAAW;IAC3C,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAA4B;IAC/D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA6B;IACpD,OAAO,CAAC,MAAM,CAAC,aAAa;WAOd,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAOnD,OAAc,eAAe,UAAQ;IAErC;;;;OAIG;IACH;;;;OAIG;IACH,WAAkB,OAAO,IAAI,YAAY,CAMxC;IAED;;;;OAIG;WACW,WAAW,IAAI,YAAY;IAOzC;;OAEG;gBACgB,UAAU,GAAE,UAAU,GAAG,IAAW;IAWvD,SAAS,CAAC,sBAAsB,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,IAAI,EAAE,YAAY,EAAE,EAAE,CAAC,SAAS,GAAG,IAAI,GAAG,qBAAqB;IAc1I,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,oBAAoB,GAAG,QAAQ;IAYrE,SAAS,CAAC,UAAU,CAAC,YAAY,EAAE,oBAAoB,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAStG;;;;;;;;;;;;;;;OAeG;IACH;;;;;;;;;;;;;;;OAeG;IACI,oBAAoB,CAAC,YAAY,EAAE,MAAM,EAAE,eAAe,SAAK,EAAE,QAAQ,SAAK,EAAE,gBAAgB,SAAK,GAAG,oBAAoB,GAAG,IAAI;IAU1I;;;;;;OAMG;IACH;;;;;;OAMG;IACI,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,GAAE,MAAM,GAAG,IAAW,GAAG,EAAE,CAAC,MAAM,GAAG,IAAI;IAQvG;;;;;OAKG;IACH;;;;;OAKG;IACH,IAAW,iBAAiB,IAAI,oBAAoB,CAEnD;CACF"}
|
|
@@ -58,16 +58,12 @@ var CocosFactory = /** @class */ (function (_super) {
|
|
|
58
58
|
/**
|
|
59
59
|
* @inheritDoc
|
|
60
60
|
*/
|
|
61
|
-
function CocosFactory(dataParser
|
|
61
|
+
function CocosFactory(dataParser) {
|
|
62
62
|
if (dataParser === void 0) { dataParser = null; }
|
|
63
|
-
if (useSharedTicker === void 0) { useSharedTicker = true; }
|
|
64
63
|
var _this = _super.call(this, dataParser) || this;
|
|
65
64
|
if (CocosFactory._dragonBonesInstance === null) {
|
|
66
65
|
var eventManager = new CocosArmatureDisplay_1.CocosArmatureDisplay();
|
|
67
66
|
CocosFactory._dragonBonesInstance = new dragonbones_js_1.DragonBones(eventManager);
|
|
68
|
-
// if (useSharedTicker) {
|
|
69
|
-
// PIXI.Ticker.shared.add(CocosFactory._clockHandler, CocosFactory);
|
|
70
|
-
// }
|
|
71
67
|
}
|
|
72
68
|
_this._dragonBones = CocosFactory._dragonBonesInstance;
|
|
73
69
|
return _this;
|
|
@@ -94,7 +90,7 @@ var CocosFactory = /** @class */ (function (_super) {
|
|
|
94
90
|
*/
|
|
95
91
|
get: function () {
|
|
96
92
|
if (CocosFactory._factory === null) {
|
|
97
|
-
CocosFactory._factory = new CocosFactory(null
|
|
93
|
+
CocosFactory._factory = new CocosFactory(null);
|
|
98
94
|
}
|
|
99
95
|
return CocosFactory._factory;
|
|
100
96
|
},
|
|
@@ -106,16 +102,15 @@ var CocosFactory = /** @class */ (function (_super) {
|
|
|
106
102
|
* @version DragonBones 4.7
|
|
107
103
|
* @language zh_CN
|
|
108
104
|
*/
|
|
109
|
-
CocosFactory.newInstance = function (
|
|
110
|
-
if (useSharedTicker === void 0) { useSharedTicker = true; }
|
|
105
|
+
CocosFactory.newInstance = function () {
|
|
111
106
|
if (CocosFactory._factory === null) {
|
|
112
|
-
CocosFactory._factory = new CocosFactory(null
|
|
107
|
+
CocosFactory._factory = new CocosFactory(null);
|
|
113
108
|
}
|
|
114
109
|
return CocosFactory._factory;
|
|
115
110
|
};
|
|
116
111
|
CocosFactory.prototype._buildTextureAtlasData = function (textureAtlasData, textureAtlas) {
|
|
117
112
|
if (textureAtlasData) {
|
|
118
|
-
console.log(textureAtlasData, 'textureAtlasData', textureAtlas)
|
|
113
|
+
// console.log(textureAtlasData, 'textureAtlasData', textureAtlas)
|
|
119
114
|
var scale = cc.director.getContentScaleFactor();
|
|
120
115
|
textureAtlasData.scale = scale;
|
|
121
116
|
textureAtlasData.renderTexture = textureAtlas;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CocosTextureAtlasData.d.ts","sourceRoot":"","sources":["../../../src/dragonbones/cocos/CocosTextureAtlasData.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CocosTextureAtlasData.d.ts","sourceRoot":"","sources":["../../../src/dragonbones/cocos/CocosTextureAtlasData.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAc,gBAAgB,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAElF,qBAAa,qBAAsB,SAAQ,gBAAgB;WAC3C,QAAQ,IAAI,MAAM;IAIhC,OAAO,CAAC,cAAc,CAA6B;IAEnD,SAAS,CAAC,QAAQ,IAAI,IAAI;IAS1B;;OAEG;IACI,aAAa,IAAI,WAAW;IAGnC;;;;OAIG;IACH;;;;OAIG;IACH,IAAW,aAAa,IAAI,EAAE,CAAC,SAAS,GAAG,IAAI,CAE9C;IACD,IAAW,aAAa,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,GAAG,IAAI,EAqDlD;CACF;AACD;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,WAAW;WACjC,QAAQ,IAAI,MAAM;IAIzB,aAAa,EAAE,EAAE,CAAC,WAAW,GAAG,IAAI,CAAQ;IAEnD,SAAS,CAAC,QAAQ,IAAI,IAAI;CAS3B"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
// @ts-nocheck
|
|
3
2
|
/**
|
|
4
3
|
* The MIT License (MIT)
|
|
5
4
|
*
|
|
@@ -85,9 +84,9 @@ var CocosTextureAtlasData = /** @class */ (function (_super) {
|
|
|
85
84
|
if (this._renderTexture !== null) {
|
|
86
85
|
for (var k in this.textures) {
|
|
87
86
|
var textureData = this.textures[k];
|
|
88
|
-
if (textureData.renderTexture !== null) {
|
|
89
|
-
|
|
90
|
-
}
|
|
87
|
+
// if (textureData.renderTexture !== null) {
|
|
88
|
+
// textureData.renderTexture.destroy();
|
|
89
|
+
// }
|
|
91
90
|
// console.log('textureData', this._renderTexture, textureData)
|
|
92
91
|
// console.log('this._renderTexture', this._renderTexture)
|
|
93
92
|
var x = textureData.region.x;
|
|
@@ -120,9 +119,9 @@ var CocosTextureAtlasData = /** @class */ (function (_super) {
|
|
|
120
119
|
else {
|
|
121
120
|
for (var k in this.textures) {
|
|
122
121
|
var textureData = this.textures[k];
|
|
123
|
-
if (textureData.renderTexture !== null) {
|
|
124
|
-
|
|
125
|
-
}
|
|
122
|
+
// if (textureData.renderTexture !== null) {
|
|
123
|
+
// textureData.renderTexture.destroy();
|
|
124
|
+
// }
|
|
126
125
|
textureData.renderTexture = null;
|
|
127
126
|
}
|
|
128
127
|
}
|
|
@@ -148,9 +147,9 @@ var CocosTextureData = /** @class */ (function (_super) {
|
|
|
148
147
|
};
|
|
149
148
|
CocosTextureData.prototype._onClear = function () {
|
|
150
149
|
_super.prototype._onClear.call(this);
|
|
151
|
-
if (this.renderTexture !== null) {
|
|
152
|
-
|
|
153
|
-
}
|
|
150
|
+
// if (this.renderTexture !== null) {
|
|
151
|
+
// this.renderTexture.destroy();
|
|
152
|
+
// }
|
|
154
153
|
this.renderTexture = null;
|
|
155
154
|
};
|
|
156
155
|
return CocosTextureData;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dragonBones.d.ts","sourceRoot":"","sources":["../../src/dragonbones/dragonBones.ts"],"names":[],"mappings":"AAEA,QAAA,
|
|
1
|
+
{"version":3,"file":"dragonBones.d.ts","sourceRoot":"","sources":["../../src/dragonbones/dragonBones.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,WAAW,KAAoB,CAAC;AAkzKtC,OAAO,EAAE,WAAW,EAAE,CAAC"}
|
|
@@ -4668,7 +4668,7 @@ dragonBones.DBCCSlot = dragonBones.Slot.extend({
|
|
|
4668
4668
|
disposeDisplayList: function () {
|
|
4669
4669
|
var releasedNodeList = [];
|
|
4670
4670
|
var displayA;
|
|
4671
|
-
|
|
4671
|
+
// let armature;
|
|
4672
4672
|
for (var i = 0, l = this._displayList.length; i < l; ++i) {
|
|
4673
4673
|
displayA = this._displayList[i];
|
|
4674
4674
|
if (displayA instanceof dragonBones.Armature) {
|
|
@@ -1,13 +1,27 @@
|
|
|
1
1
|
import { EntityManager, EventManager, EventReceive, System } from 'entityx-ts';
|
|
2
|
-
import { DragonBonesData, DragonBonesProps } from '../../@types/safex';
|
|
3
2
|
import { ComponentX } from '../gworld/core/decorator';
|
|
4
|
-
|
|
5
|
-
data: DragonBonesData;
|
|
3
|
+
interface DragonBonesData {
|
|
6
4
|
atlas: string;
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
5
|
+
skeleton: string;
|
|
6
|
+
texture: string;
|
|
7
|
+
}
|
|
8
|
+
interface DragonBonesProps {
|
|
9
|
+
data: DragonBonesData;
|
|
10
|
+
skin?: string;
|
|
11
|
+
animation?: string;
|
|
12
|
+
playTimes?: number;
|
|
13
|
+
timeScale?: number;
|
|
14
|
+
onAnimationStart?: (event: {
|
|
15
|
+
name: string;
|
|
16
|
+
}) => void;
|
|
17
|
+
onAnimationEnd?: (event: {
|
|
18
|
+
name: string;
|
|
19
|
+
}) => void;
|
|
20
|
+
onAnimationComplete?: (event: {
|
|
21
|
+
name: string;
|
|
22
|
+
}) => void;
|
|
23
|
+
}
|
|
24
|
+
export declare class DragonBones extends ComponentX<DragonBonesProps> {
|
|
11
25
|
setAnimation(name: string, loop?: boolean): void;
|
|
12
26
|
setSkeletonData(data: string): void;
|
|
13
27
|
}
|
|
@@ -17,4 +31,5 @@ export declare class DragonBonesSystem implements System {
|
|
|
17
31
|
update(entities: EntityManager, events: EventManager, dt: number): void;
|
|
18
32
|
}
|
|
19
33
|
export declare function setupDragonBones(): void;
|
|
34
|
+
export {};
|
|
20
35
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/dragonbones/index.ts"],"names":[],"mappings":"
|
|
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;AAIpB,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAGtD,UAAU,eAAe;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AACD,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,WAAY,SAAQ,UAAU,CAAC,gBAAgB,CAAC;IAC3D,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,UAAQ;IAOvC,eAAe,CAAC,IAAI,EAAE,MAAM;CAK7B;AAED,qBAAa,iBAAkB,YAAW,MAAM;IAC9C,SAAS,CAAC,aAAa,EAAE,YAAY;IAMrC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY;IAkDzC,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;CAKjE;AAED,wBAAgB,gBAAgB,SAI/B"}
|
|
@@ -17,13 +17,11 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
exports.DragonBonesSystem = exports.DragonBones = void 0;
|
|
19
19
|
exports.setupDragonBones = setupDragonBones;
|
|
20
|
-
var dragonbones_js_1 = require("@cocos/dragonbones-js");
|
|
21
20
|
var entityx_ts_1 = require("entityx-ts");
|
|
22
21
|
var gworld_1 = require("../gworld");
|
|
23
22
|
var NodeComp_1 = require("../gworld/components/NodeComp");
|
|
24
23
|
var decorator_1 = require("../gworld/core/decorator");
|
|
25
24
|
var CocosFactory_1 = require("./cocos/CocosFactory");
|
|
26
|
-
// import { dragonBones } from './dragonBones'
|
|
27
25
|
var DragonBones = /** @class */ (function (_super) {
|
|
28
26
|
__extends(DragonBones, _super);
|
|
29
27
|
function DragonBones() {
|
|
@@ -50,7 +48,7 @@ var DragonBonesSystem = /** @class */ (function () {
|
|
|
50
48
|
DragonBonesSystem.prototype.configure = function (event_manager) {
|
|
51
49
|
event_manager.subscribe((0, entityx_ts_1.ComponentAddedEvent)(DragonBones), this);
|
|
52
50
|
event_manager.subscribe((0, entityx_ts_1.ComponentRemovedEvent)(DragonBones), this);
|
|
53
|
-
|
|
51
|
+
CocosFactory_1.CocosFactory.newInstance();
|
|
54
52
|
};
|
|
55
53
|
DragonBonesSystem.prototype.receive = function (type, event) {
|
|
56
54
|
switch (type) {
|
|
@@ -58,7 +56,7 @@ var DragonBonesSystem = /** @class */ (function () {
|
|
|
58
56
|
console.log('DragonBones', event);
|
|
59
57
|
var ett = event.entity;
|
|
60
58
|
var dbComp = event.entity.getComponent(DragonBones);
|
|
61
|
-
var
|
|
59
|
+
var _a = dbComp.props, data = _a.data, animation = _a.animation, _b = _a.playTimes, playTimes = _b === void 0 ? 0 : _b;
|
|
62
60
|
// const texturePath = atlas.replace('.json', '.png')
|
|
63
61
|
var atlas = data.atlas, skeleton = data.skeleton, texture = data.texture;
|
|
64
62
|
// cc.textureCache.addImage(texture)
|
|
@@ -66,30 +64,28 @@ var DragonBonesSystem = /** @class */ (function () {
|
|
|
66
64
|
var dataSkel = cc.loader.getRes(skeleton);
|
|
67
65
|
var dataAtlas = cc.loader.getRes(atlas);
|
|
68
66
|
var textureCache = cc.textureCache.getTextureForKey(texture);
|
|
69
|
-
// texture.initWithFile(texturePath)
|
|
67
|
+
// texture.initWithFile(texturePath)
|
|
70
68
|
factory.parseDragonBonesData(dataSkel);
|
|
71
69
|
factory.parseTextureAtlasData(dataAtlas, textureCache);
|
|
72
|
-
// factory.loadDragonBonesData(skel)
|
|
73
|
-
// console.log(skeleton, dataSkel)
|
|
74
|
-
var
|
|
70
|
+
// factory.loadDragonBonesData(skel)
|
|
71
|
+
// console.log(skeleton, dataSkel)
|
|
72
|
+
var node = factory.buildArmatureDisplay(dataSkel.armature[0].name, dataSkel.name);
|
|
75
73
|
// console.log('armature', armature)
|
|
76
|
-
var node = armature.getDisplay();
|
|
77
74
|
console.log('node', node);
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
var state = armature.animation.gotoAndPlay(animation, 0, 0, 0);
|
|
75
|
+
// armature.animation.gotoAndPlay('run', 0.2)
|
|
76
|
+
var state = node.armature.animation.gotoAndPlayByTime(animation, 0, playTimes);
|
|
81
77
|
console.log('state', state);
|
|
82
78
|
// if (skin) {
|
|
83
79
|
// node.setSkin(skin)
|
|
84
80
|
// }
|
|
85
81
|
if (animation) {
|
|
86
|
-
// node.setAnimation(0, animation,
|
|
82
|
+
// node.setAnimation(0, animation, playTimes)
|
|
87
83
|
}
|
|
88
84
|
dbComp.node = ett.assign(new NodeComp_1.NodeComp(node, ett));
|
|
89
85
|
break;
|
|
90
86
|
}
|
|
91
87
|
case (0, entityx_ts_1.ComponentRemovedEvent)(DragonBones): {
|
|
92
|
-
|
|
88
|
+
// const { component } = event
|
|
93
89
|
break;
|
|
94
90
|
}
|
|
95
91
|
default:
|
|
@@ -97,10 +93,9 @@ var DragonBonesSystem = /** @class */ (function () {
|
|
|
97
93
|
}
|
|
98
94
|
};
|
|
99
95
|
DragonBonesSystem.prototype.update = function (entities, events, dt) {
|
|
100
|
-
// throw new Error('Method not implemented.')
|
|
96
|
+
// throw new Error('Method not implemented.')
|
|
101
97
|
// console.log('update', dt)
|
|
102
|
-
|
|
103
|
-
// CocosFactory.advanceTime(dt);
|
|
98
|
+
CocosFactory_1.CocosFactory.advanceTime(dt);
|
|
104
99
|
};
|
|
105
100
|
return DragonBonesSystem;
|
|
106
101
|
}());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeComp.d.ts","sourceRoot":"","sources":["../../../src/gworld/components/NodeComp.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"NodeComp.d.ts","sourceRoot":"","sources":["../../../src/gworld/components/NodeComp.ts"],"names":[],"mappings":"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"}
|