@safe-engine/cocos 2.2.8 → 2.3.4

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.
Files changed (104) hide show
  1. package/@types/index.d.ts +0 -59
  2. package/dist/app.d.ts +1 -1
  3. package/dist/app.d.ts.map +1 -1
  4. package/dist/app.js +25 -23
  5. package/dist/collider/CollideComponent.d.ts +21 -3
  6. package/dist/collider/CollideComponent.d.ts.map +1 -1
  7. package/dist/core/NodeComp.d.ts +1 -1
  8. package/dist/core/NodeComp.d.ts.map +1 -1
  9. package/dist/dragonbones/DragonBonesComp.d.ts +4 -6
  10. package/dist/dragonbones/DragonBonesComp.d.ts.map +1 -1
  11. package/dist/dragonbones/DragonBonesComp.js +15 -13
  12. package/dist/dragonbones/DragonBonesSystem.d.ts +1 -1
  13. package/dist/dragonbones/DragonBonesSystem.d.ts.map +1 -1
  14. package/dist/dragonbones/DragonBonesSystem.js +42 -35
  15. package/dist/dragonbones/db-cocos/CocosArmatureDisplay.d.ts +87 -0
  16. package/dist/dragonbones/db-cocos/CocosArmatureDisplay.d.ts.map +1 -0
  17. package/dist/dragonbones/db-cocos/CocosArmatureDisplay.js +240 -0
  18. package/dist/dragonbones/db-cocos/CocosFactory.d.ts +128 -0
  19. package/dist/dragonbones/db-cocos/CocosFactory.d.ts.map +1 -0
  20. package/dist/dragonbones/db-cocos/CocosFactory.js +190 -0
  21. package/dist/dragonbones/db-cocos/CocosSlot.d.ts +49 -0
  22. package/dist/dragonbones/db-cocos/CocosSlot.d.ts.map +1 -0
  23. package/dist/dragonbones/db-cocos/CocosSlot.js +368 -0
  24. package/dist/dragonbones/db-cocos/CocosTextureAtlasData.d.ts +53 -0
  25. package/dist/dragonbones/db-cocos/CocosTextureAtlasData.d.ts.map +1 -0
  26. package/dist/dragonbones/db-cocos/CocosTextureAtlasData.js +121 -0
  27. package/dist/dragonbones/index.d.ts +0 -1
  28. package/dist/dragonbones/index.d.ts.map +1 -1
  29. package/dist/dragonbones/index.js +0 -1
  30. package/dist/polyfills.d.ts +1 -1
  31. package/dist/polyfills.d.ts.map +1 -1
  32. package/dist/polyfills.js +1 -2
  33. package/dist/render/RenderComponent.d.ts.map +1 -1
  34. package/dist/render/RenderComponent.js +1 -0
  35. package/dist/render/RenderSystem.d.ts.map +1 -1
  36. package/dist/render/RenderSystem.js +34 -2
  37. package/dist/richtext/RichTextComp.js +1 -1
  38. package/dist/spine/SpineSkeleton.d.ts +5 -3
  39. package/dist/spine/SpineSkeleton.d.ts.map +1 -1
  40. package/dist/spine/SpineSkeleton.js +12 -5
  41. package/dist/spine/SpineSystem.d.ts +1 -2
  42. package/dist/spine/SpineSystem.d.ts.map +1 -1
  43. package/dist/spine/SpineSystem.js +22 -24
  44. package/dist/spine/index.d.ts +0 -1
  45. package/dist/spine/index.d.ts.map +1 -1
  46. package/dist/spine/index.js +14 -2
  47. package/dist/spine/spine-cocos/CCSkeleton.d.ts +86 -0
  48. package/dist/spine/spine-cocos/CCSkeleton.d.ts.map +1 -0
  49. package/dist/spine/{CCSkeleton.js → spine-cocos/CCSkeleton.js} +39 -128
  50. package/dist/spine/spine-cocos/CCSkeletonAnimation.d.ts +87 -0
  51. package/dist/spine/spine-cocos/CCSkeletonAnimation.d.ts.map +1 -0
  52. package/dist/spine/{CCSkeletonAnimation.js → spine-cocos/CCSkeletonAnimation.js} +37 -97
  53. package/dist/spine/spine-cocos/CCSkeletonCanvasRenderCmd.d.ts +28 -0
  54. package/dist/spine/spine-cocos/CCSkeletonCanvasRenderCmd.d.ts.map +1 -0
  55. package/dist/spine/spine-cocos/CCSkeletonCanvasRenderCmd.js +224 -0
  56. package/dist/spine/{CCSkeletonTexture.d.ts → spine-cocos/CCSkeletonTexture.d.ts} +1 -1
  57. package/dist/spine/spine-cocos/CCSkeletonTexture.d.ts.map +1 -0
  58. package/dist/spine/{CCSkeletonTexture.js → spine-cocos/CCSkeletonTexture.js} +5 -5
  59. package/dist/spine/spine-cocos/CCSkeletonWebGLRenderCmd.d.ts.map +1 -0
  60. package/dist/spine/{CCSkeletonWebGLRenderCmd.js → spine-cocos/CCSkeletonWebGLRenderCmd.js} +13 -13
  61. package/package.json +5 -6
  62. package/dist/core/index.d.ts +0 -6
  63. package/dist/core/index.d.ts.map +0 -1
  64. package/dist/core/index.js +0 -5
  65. package/dist/dragonbones/PixiDragonBonesSprite.d.ts +0 -19
  66. package/dist/dragonbones/PixiDragonBonesSprite.d.ts.map +0 -1
  67. package/dist/dragonbones/PixiDragonBonesSprite.js +0 -75
  68. package/dist/gworld/EnhancedComponent.d.ts +0 -22
  69. package/dist/gworld/EnhancedComponent.d.ts.map +0 -1
  70. package/dist/gworld/EnhancedComponent.js +0 -44
  71. package/dist/gworld/NodeComp.d.ts +0 -153
  72. package/dist/gworld/NodeComp.d.ts.map +0 -1
  73. package/dist/gworld/NodeComp.js +0 -337
  74. package/dist/gworld/NodePool.d.ts +0 -9
  75. package/dist/gworld/NodePool.d.ts.map +0 -1
  76. package/dist/gworld/NodePool.js +0 -23
  77. package/dist/gworld/Scene.d.ts +0 -5
  78. package/dist/gworld/Scene.d.ts.map +0 -1
  79. package/dist/gworld/Scene.js +0 -14
  80. package/dist/gworld/decorator.d.ts +0 -8
  81. package/dist/gworld/decorator.d.ts.map +0 -1
  82. package/dist/gworld/decorator.js +0 -12
  83. package/dist/gworld/index.d.ts +0 -8
  84. package/dist/gworld/index.d.ts.map +0 -1
  85. package/dist/gworld/index.js +0 -14
  86. package/dist/render/TiledSprite.d.ts +0 -13
  87. package/dist/render/TiledSprite.d.ts.map +0 -1
  88. package/dist/render/TiledSprite.js +0 -69
  89. package/dist/safex.d.ts +0 -10
  90. package/dist/safex.d.ts.map +0 -1
  91. package/dist/safex.js +0 -1
  92. package/dist/spine/CCSkeleton.d.ts +0 -189
  93. package/dist/spine/CCSkeleton.d.ts.map +0 -1
  94. package/dist/spine/CCSkeletonAnimation.d.ts +0 -146
  95. package/dist/spine/CCSkeletonAnimation.d.ts.map +0 -1
  96. package/dist/spine/CCSkeletonCanvasRenderCmd.d.ts +0 -2
  97. package/dist/spine/CCSkeletonCanvasRenderCmd.d.ts.map +0 -1
  98. package/dist/spine/CCSkeletonCanvasRenderCmd.js +0 -228
  99. package/dist/spine/CCSkeletonTexture.d.ts.map +0 -1
  100. package/dist/spine/CCSkeletonWebGLRenderCmd.d.ts.map +0 -1
  101. package/dist/spine/PixiSpineSprite.d.ts +0 -19
  102. package/dist/spine/PixiSpineSprite.d.ts.map +0 -1
  103. package/dist/spine/PixiSpineSprite.js +0 -72
  104. /package/dist/spine/{CCSkeletonWebGLRenderCmd.d.ts → spine-cocos/CCSkeletonWebGLRenderCmd.d.ts} +0 -0
package/@types/index.d.ts CHANGED
@@ -1,61 +1,2 @@
1
1
  type Float = number
2
2
  type Integer = number
3
-
4
- declare namespace cc {
5
- declare let v2: (x?: number | any, y?: number) => Vec2
6
- declare let v3: (x?: number | any, y?: number, z?: number) => Vec3
7
- declare let instantiate: (id: string) => NodeComp
8
-
9
- declare interface Misc {
10
- radiansToDegrees(angle: number): number
11
- degreesToRadians: (angle: number) => number
12
- clampf: (value: number, min_inclusive: number, max_inclusive: number) => number
13
- lerp: (a: number, b: number, r: number) => number
14
- }
15
- declare interface Macro {
16
- REPEAT_FOREVER: number
17
- }
18
- declare interface TextureCache {
19
- addImage(texturePath: string): Texture2D
20
- getTextureForKey(key: string): Texture2D
21
- }
22
-
23
- declare let misc: Misc
24
- declare let macro: Macro
25
- // declare let Vec2: any;
26
- declare let RigidBodyType: any
27
- declare let textureCache: TextureCache
28
-
29
- declare namespace Event {
30
- interface EventTouch {
31
- getLocation(): cc.Vec2
32
- getLocationX(): number
33
- getLocationY(): number
34
- getDelta(): cc.Vec2
35
- getDeltaX(): number
36
- getDeltaY(): number
37
- }
38
- }
39
- // declare function Vec2(x?: number, y?: number): Vec2;
40
- declare class Vec2 extends Point {
41
- x: number
42
- y: number
43
- static ZERO: Vec2
44
- constructor(x?: number, y?: number)
45
- equals(lastPos: Vec2): boolean
46
- add(value: cc.Point): cc.Vec2
47
- addSelf(value: cc.Point): cc.Vec2
48
- sub(value: cc.Point): cc.Vec2
49
- mul(multiply: number): cc.Vec2
50
- mulSelf(multiply: number): cc.Vec2
51
- mag(): number
52
- normalizeSelf(): cc.Vec2
53
- normalize(): cc.Vec2
54
- public signAngle(other: Vec2)
55
- }
56
-
57
- export class Vec3 extends Vec2 {}
58
- export class ParticleSystem extends Node {
59
- constructor(file: string)
60
- }
61
- }
package/dist/app.d.ts CHANGED
@@ -10,7 +10,7 @@ export declare function startGame(defaultFont: string, { width, height }: {
10
10
  width: any;
11
11
  height: any;
12
12
  }, option?: Partial<RunOptions>): Promise<void>;
13
- export declare function loadAll(assets?: string[], cb?: (progress: number) => void, onCompleted?: () => void): void;
13
+ export declare function loadAll(assets?: string[], cb?: (progress: number) => void): Promise<unknown>;
14
14
  export declare function loadJsonFromCache<T>(filePath: string): T;
15
15
  export declare const audioEngine: typeof cc.audioEngine;
16
16
  export {};
package/dist/app.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAKA,wBAAgB,SAAS,CAAC,WAAW,CAAC,EAAE,MAAM,QAQ7C;AACD,UAAU,UAAU;IAClB,SAAS,EAAE,CAAC,GAAG,CAAC,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;CACtB;AACD,wBAAsB,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;;;CAAA,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,iBA2CnG;AAED,wBAAgB,OAAO,CAAC,MAAM,GAAE,MAAM,EAAO,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,EAAE,WAAW,CAAC,EAAE,MAAM,IAAI,QA0BvG;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,CAIxD;AAED,eAAO,MAAM,WAAW,uBAAiB,CAAA"}
1
+ {"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAKA,wBAAgB,SAAS,CAAC,WAAW,CAAC,EAAE,MAAM,QAQ7C;AACD,UAAU,UAAU;IAClB,SAAS,EAAE,CAAC,GAAG,CAAC,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;CACtB;AACD,wBAAsB,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;;;CAAA,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,iBA2CnG;AAED,wBAAgB,OAAO,CAAC,MAAM,GAAE,MAAM,EAAO,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,oBA4B7E;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,CAIxD;AAED,eAAO,MAAM,WAAW,uBAAiB,CAAA"}
package/dist/app.js CHANGED
@@ -50,29 +50,31 @@ export async function startGame(defaultFont, { width, height }, option) {
50
50
  });
51
51
  });
52
52
  }
53
- export function loadAll(assets = [], cb, onCompleted) {
54
- cc.loader.load(assets.map((value) => {
55
- if (value.endsWith('.ttf')) {
56
- return {
57
- type: 'font',
58
- name: cc.path.basename(value, '.ttf'),
59
- srcs: [value],
60
- };
61
- }
62
- return value;
63
- }), function (result, count, loadedCount) {
64
- // console.log(result)
65
- if (result instanceof cc.Texture2D) {
66
- // cc.textureCache.addImage(result.url)
67
- const frame = new cc.SpriteFrame(result, cc.rect(0, 0, result.getPixelsWide(), result.getPixelsHigh()));
68
- // console.log('cc.Texture2D', result, frame)
69
- cc.spriteFrameCache.addSpriteFrame(frame, result.url);
70
- }
71
- let percent = loadedCount / count;
72
- percent = Math.min(percent, 1);
73
- if (cb)
74
- cb(percent);
75
- }, onCompleted);
53
+ export function loadAll(assets = [], cb) {
54
+ return new Promise((resolve) => {
55
+ cc.loader.load(assets.map((value) => {
56
+ if (value.endsWith('.ttf')) {
57
+ return {
58
+ type: 'font',
59
+ name: cc.path.basename(value, '.ttf'),
60
+ srcs: [value],
61
+ };
62
+ }
63
+ return value;
64
+ }), function (result, count, loadedCount) {
65
+ // console.log(result)
66
+ if (result instanceof cc.Texture2D) {
67
+ // cc.textureCache.addImage(result.url)
68
+ const frame = new cc.SpriteFrame(result, cc.rect(0, 0, result.getPixelsWide(), result.getPixelsHigh()));
69
+ // console.log('cc.Texture2D', result, frame)
70
+ cc.spriteFrameCache.addSpriteFrame(frame, result.url);
71
+ }
72
+ let percent = loadedCount / count;
73
+ percent = Math.min(percent, 1);
74
+ if (cb)
75
+ cb(percent);
76
+ }, resolve);
77
+ });
76
78
  }
77
79
  export function loadJsonFromCache(filePath) {
78
80
  const res = cc.loader.getRes(filePath);
@@ -9,14 +9,32 @@ interface ColliderProps extends BaseComponentProps<Collider> {
9
9
  onCollisionStay?: (other: Collider) => void;
10
10
  }
11
11
  export declare class Collider<T = ColliderProps> extends ComponentX<T> {
12
- _worldPoints: cc.Vec2[] | cc.Point[];
13
- _worldPosition: cc.Vec2 | cc.Point;
12
+ _worldPoints: Vec2[] | cc.Point[];
13
+ _worldPosition: Vec2 | cc.Point;
14
14
  _worldRadius: any;
15
15
  _AABB: cc.Rect;
16
16
  _preAabb: cc.Rect;
17
17
  getAABB(): cc.Rect;
18
18
  get world(): {
19
- points: cc.Point[] | cc.Vec2[];
19
+ points: cc.Point[] | {
20
+ x: number;
21
+ y: number;
22
+ equals(other: /*elided*/ any): boolean;
23
+ add(value: cc.Point | Vec2): /*elided*/ any;
24
+ addSelf(value: cc.Point | Vec2): /*elided*/ any;
25
+ sub(value: cc.Point | Vec2): /*elided*/ any;
26
+ mul(multiply: number): /*elided*/ any;
27
+ mulSelf(multiply: number): /*elided*/ any;
28
+ mag(): number;
29
+ normalizeSelf(): /*elided*/ any;
30
+ normalize(): /*elided*/ any;
31
+ cross(other: Vec2): number;
32
+ signAngle(other: Vec2): number;
33
+ lengthSqr(): number;
34
+ dot(other: Vec2): number;
35
+ angle(other: Vec2): number;
36
+ distance(other: /*elided*/ any): number;
37
+ }[];
20
38
  preAabb: cc.Rect;
21
39
  };
22
40
  }
@@ -1 +1 @@
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,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAYnC,UAAU,aAAc,SAAQ,kBAAkB,CAAC,QAAQ,CAAC;IAC1D,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACzB,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,QAAQ,CAAC,CAAC,GAAG,aAAa,CAAE,SAAQ,UAAU,CAAC,CAAC,CAAC;IAC5D,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,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AACD,qBAAa,WAAY,SAAQ,QAAQ,CAAC,aAAa,GAAG,gBAAgB,CAAC;IACzE,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;CA6B7B;AAED,UAAU,mBAAoB,SAAQ,kBAAkB,CAAC,cAAc,CAAC;IACtE,MAAM,EAAE,MAAM,CAAA;CACf;AACD,qBAAa,cAAe,SAAQ,QAAQ,CAAC,aAAa,GAAG,mBAAmB,CAAC;IAC/E,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ;CAuB7B;AAED,UAAU,oBAAqB,SAAQ,kBAAkB,CAAC,eAAe,CAAC;IACxE,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;CACzC;AAED,qBAAa,eAAgB,SAAQ,QAAQ,CAAC,aAAa,GAAG,oBAAoB,CAAC;IACjF,IAAI,MAAM,IAAI,IAAI,EAAE,CAUnB;IAED,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,EAExB;IAED,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ;CAoB7B;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"}
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,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAYnC,UAAU,aAAc,SAAQ,kBAAkB,CAAC,QAAQ,CAAC;IAC1D,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACzB,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,QAAQ,CAAC,CAAC,GAAG,aAAa,CAAE,SAAQ,UAAU,CAAC,CAAC,CAAC;IAC5D,YAAY,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,CAAK;IACtC,cAAc,EAAE,IAAI,GAAG,EAAE,CAAC,KAAK,CAAA;IAC/B,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,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AACD,qBAAa,WAAY,SAAQ,QAAQ,CAAC,aAAa,GAAG,gBAAgB,CAAC;IACzE,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;CA6B7B;AAED,UAAU,mBAAoB,SAAQ,kBAAkB,CAAC,cAAc,CAAC;IACtE,MAAM,EAAE,MAAM,CAAA;CACf;AACD,qBAAa,cAAe,SAAQ,QAAQ,CAAC,aAAa,GAAG,mBAAmB,CAAC;IAC/E,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ;CAuB7B;AAED,UAAU,oBAAqB,SAAQ,kBAAkB,CAAC,eAAe,CAAC;IACxE,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;CACzC;AAED,qBAAa,eAAgB,SAAQ,QAAQ,CAAC,aAAa,GAAG,oBAAoB,CAAC;IACjF,IAAI,MAAM,IAAI,IAAI,EAAE,CAUnB;IAED,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,EAExB;IAED,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ;CAoB7B;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"}
@@ -105,7 +105,7 @@ export declare class NodeComp<C extends cc.Node = cc.Node> {
105
105
  angle(other: Vec2): number;
106
106
  distance(other: /*elided*/ any): number;
107
107
  };
108
- convertToWorldSpaceAR(point: cc.Vec2): {
108
+ convertToWorldSpaceAR(point: Vec2): {
109
109
  x: number;
110
110
  y: number;
111
111
  equals(other: /*elided*/ any): boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"NodeComp.d.ts","sourceRoot":"","sources":["../../src/core/NodeComp.ts"],"names":[],"mappings":"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"}
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;AAGhD,OAAO,EAAE,aAAa,EAAiB,MAAM,aAAa,CAAA;AAC1D,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEtE,MAAM,MAAM,iBAAiB,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,CAAA;AAC5D,qBAAa,QAAQ,CAAC,CAAC,SAAS,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI;IAC/C,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,CAAC,CAAA;IACX,MAAM,EAAE,QAAQ,CAAA;IAChB,QAAQ,EAAE,QAAQ,EAAE,CAAK;IACzB,IAAI,EAAE,MAAM,CAAA;IAEZ,OAAO,CAAC,OAAO,CAAO;gBAEV,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM;IAKvC,IAAI,IAAI,WAEP;IAED,IAAI,QAAQ,IAAI,QAAQ,CAAC,IAAI,CAAC,CAE7B;IAED,IAAI,QAAQ,CAAC,GAAG,EAAE,IAAI,EAErB;IAED,IAAI,EAAE,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAE3B;IAED,IAAI,IAAI,IAIM,MAAM,CAFnB;IAED,IAAI,IAAI,CAAC,GAAG,EAAE,MAAM,EAEnB;IAED,IAAI,IAAI,IAIM,MAAM,CAFnB;IAED,IAAI,IAAI,CAAC,GAAG,EAAE,MAAM,EAEnB;IAED,IAAI,KAAK,IAIM,MAAM,CAFpB;IAED,IAAI,KAAK,CAAC,GAAG,EAAE,MAAM,EAEpB;IAED,IAAI,MAAM,IAIM,MAAM,CAFrB;IAED,IAAI,MAAM,CAAC,GAAG,EAAE,MAAM,EAErB;IAED,IAAI,MAAM,IAIM,MAAM,CAFrB;IAED,IAAI,MAAM,CAAC,GAAG,EAAE,MAAM,EAErB;IAED,IAAI,OAAO,IAIM,MAAM,CAFtB;IAED,IAAI,OAAO,CAAC,GAAG,EAAE,MAAM,EAEtB;IAED,IAAI,OAAO,IAIM,MAAM,CAFtB;IAED,IAAI,OAAO,CAAC,GAAG,EAAE,MAAM,EAEtB;IACD;;;;OAIG;IACH,IAAI,QAAQ,IAYM,MAAM,CAVvB;IACD;;;;;;;;OAQG;IACH,IAAI,QAAQ,CAAC,GAAG,EAAE,MAAM,EAEvB;IAED,IAAI,KAAK,IAIM,EAAE,CAAC,KAAK,CAFtB;IAED,IAAI,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,EAEtB;IAED,IAAI,OAAO,IAIM,MAAM,CAFtB;IAED,IAAI,OAAO,CAAC,GAAG,EAAE,MAAM,EAEtB;IAED,IAAI,MAAM,IAUM,OAAO,CAFtB;IAED,IAAI,MAAM,CAAC,GAAG,EAAE,OAAO,EAStB;IAUD,IAAI,CAAC,WAEJ;IAED,IAAI,CAAC,CAAC,GAAG,QAAA,EAER;IAED,IAAI,CAAC,WAEJ;IAED,IAAI,CAAC,CAAC,GAAG,QAAA,EAER;IAED,IAAI,MAAM,WAET;IAED,IAAI,MAAM,CAAC,GAAG,QAAA,EAEb;IAED,IAAI,aAAa,WAEhB;IAED,OAAO;IAOP,YAAY,CAAC,CAAC,SAAS,aAAa,EAAE,QAAQ,EAAE,CAAC,GAAG;QAAE,MAAM,CAAC,EAAE,GAAG,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,IAAI,CAAA;KAAE,GAAG,CAAC;IAQ5F,YAAY,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;IAInE,uBAAuB,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE;IAUhF,sBAAsB,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;IAI7E,sBAAsB,CAAC,CAAC,SAAS,aAAa,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;IASzE,kBAAkB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;;;;;;;;;;;;;;;;;;;IAKlC,oBAAoB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;;;;;;;;;;;;;;;;;;;IAKpC,qBAAqB,CAAC,KAAK,EAAE,IAAI;;;;;;;;;;;;;;;;;;;IAKjC,cAAc;IAQd,IAAI,WAAW,IAIO,IAAI,CAFzB;IAED,IAAI,WAAW,CAAC,IAAI,EAAE,IAAI,EAWzB;IAED,SAAS,CAAC,GAAG,EAAE,EAAE,CAAC,cAAc;IAIhC,cAAc;IAId,0BAA0B;IAK1B,2BAA2B;IAK3B,gBAAgB,CAAC,OAAO,CAAC,EAAE,OAAO;IAkBlC,QAAQ,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;IAQvD,iBAAiB,CAAC,OAAO,CAAC,KAAA;IAM1B,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC;IAM1B,OAAO,CAAC,CAAC,SAAS,OAAO,GAAG,KAAK,GAAG,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IASjE,IAAI,KAAK,kBAMR;IAED,UAAU,CAAC,GAAG,EAAE,MAAM;IAOtB,gBAAgB,CAAC,SAAS,EAAE,iBAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC;CAOhE"}
@@ -1,7 +1,6 @@
1
- import { PixiArmatureDisplay } from 'dragonbones-pixijs';
2
1
  import { BaseComponentProps } from '..';
3
2
  import { ComponentX } from '../core/decorator';
4
- import { PixiDragonBonesSprite } from './PixiDragonBonesSprite';
3
+ import { CocosArmatureDisplay } from './db-cocos/CocosArmatureDisplay';
5
4
  export interface DragonBonesData {
6
5
  atlas: string;
7
6
  skeleton: string;
@@ -17,11 +16,10 @@ interface DragonBonesProps {
17
16
  onAnimationEnd?: () => void;
18
17
  onAnimationComplete?: () => void;
19
18
  }
20
- export declare class DragonBonesComp extends ComponentX<DragonBonesProps & BaseComponentProps<DragonBonesComp>, cc.Node> {
21
- armature: PixiArmatureDisplay;
22
- dragon: PixiDragonBonesSprite;
19
+ export declare class DragonBonesComp extends ComponentX<DragonBonesProps & BaseComponentProps<DragonBonesComp>, CocosArmatureDisplay> {
23
20
  setAnimation(name: string, playTimes?: number): void;
24
- getAnimationName(): any;
21
+ getAnimationName(): string;
22
+ setSkeletonData(data: string): void;
25
23
  setFLipX(isFlipX: boolean): void;
26
24
  setTimeScale(timeScale: Float): void;
27
25
  }
@@ -1 +1 @@
1
- {"version":3,"file":"DragonBonesComp.d.ts","sourceRoot":"","sources":["../../src/dragonbones/DragonBonesComp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAExD,OAAO,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAA;AACvC,OAAO,EAAE,UAAU,EAAU,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAE/D,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;AAED,qBAAa,eAAgB,SAAQ,UAAU,CAAC,gBAAgB,GAAG,kBAAkB,CAAC,eAAe,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC;IAC9G,QAAQ,EAAE,mBAAmB,CAAA;IAC7B,MAAM,EAAE,qBAAqB,CAAA;IAE7B,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,SAAI;IAOxC,gBAAgB;IAShB,QAAQ,CAAC,OAAO,EAAE,OAAO;IAIzB,YAAY,CAAC,SAAS,EAAE,KAAK;CAG9B"}
1
+ {"version":3,"file":"DragonBonesComp.d.ts","sourceRoot":"","sources":["../../src/dragonbones/DragonBonesComp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAA;AACvC,OAAO,EAAE,UAAU,EAAU,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAA;AAEtE,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;AAED,qBAAa,eAAgB,SAAQ,UAAU,CAAC,gBAAgB,GAAG,kBAAkB,CAAC,eAAe,CAAC,EAAE,oBAAoB,CAAC;IAC3H,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,SAAI;IAQxC,gBAAgB;IAKhB,eAAe,CAAC,IAAI,EAAE,MAAM;IAM5B,QAAQ,CAAC,OAAO,EAAE,OAAO;IAKzB,YAAY,CAAC,SAAS,EAAE,KAAK;CAI9B"}
@@ -1,27 +1,29 @@
1
1
  import { ComponentX, render } from '../core/decorator';
2
2
  export class DragonBonesComp extends ComponentX {
3
- armature;
4
- dragon;
5
3
  setAnimation(name, playTimes = 0) {
6
- if (this.armature) {
7
- if (this.armature.animation.lastAnimationName === name)
4
+ const armature = this.node.instance;
5
+ if (armature) {
6
+ if (armature.animation.lastAnimationName === name)
8
7
  return;
9
- this.armature.animation.gotoAndPlayByTime(name, 0, playTimes);
8
+ armature.animation.gotoAndPlayByTime(name, 0, playTimes);
10
9
  }
11
10
  }
12
11
  getAnimationName() {
13
- return this.armature.animation.lastAnimationName;
12
+ const armature = this.node.instance;
13
+ return armature.animation.lastAnimationName;
14
+ }
15
+ setSkeletonData(data) {
16
+ const skel = this.node.instance;
17
+ const atlas = data.replace('.json', '.atlas');
18
+ skel.armature.display.initWithArgs(data, atlas, this.node.scale);
14
19
  }
15
- // setSkeletonData(data: string) {
16
- // const skel = this.node.instance as CocosArmatureDisplay;
17
- // const atlas = data.replace('.json', '.atlas');
18
- // skel.armature.armatureData(data, atlas, this.node.scale);
19
- // }
20
20
  setFLipX(isFlipX) {
21
- this.armature._armature.flipX = isFlipX;
21
+ const armature = this.node.instance;
22
+ armature.armature.flipX = isFlipX;
22
23
  }
23
24
  setTimeScale(timeScale) {
24
- this.armature.animation.timeScale = timeScale;
25
+ const armature = this.node.instance;
26
+ armature.animation.timeScale = timeScale;
25
27
  }
26
28
  }
27
29
  Object.defineProperty(DragonBonesComp.prototype, 'render', { value: render });
@@ -4,6 +4,6 @@ export type DragonBonesEventData = {
4
4
  };
5
5
  export declare class DragonBonesSystem implements System {
6
6
  configure(event_manager: EventManager): void;
7
- update(entities: EntityManager): void;
7
+ update(entities: EntityManager, events: EventManager, dt: number): void;
8
8
  }
9
9
  //# sourceMappingURL=DragonBonesSystem.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"DragonBonesSystem.d.ts","sourceRoot":"","sources":["../../src/dragonbones/DragonBonesSystem.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAM5E,MAAM,MAAM,oBAAoB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAA;AAEnD,qBAAa,iBAAkB,YAAW,MAAM;IAC9C,SAAS,CAAC,aAAa,EAAE,YAAY;IAuDrC,MAAM,CAAC,QAAQ,EAAE,aAAa;CAU/B"}
1
+ {"version":3,"file":"DragonBonesSystem.d.ts","sourceRoot":"","sources":["../../src/dragonbones/DragonBonesSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAO5E,MAAM,MAAM,oBAAoB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAA;AAEnD,qBAAa,iBAAkB,YAAW,MAAM;IAC9C,SAAS,CAAC,aAAa,EAAE,YAAY;IA4DrC,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;CAYjE"}
@@ -1,62 +1,69 @@
1
- import { EventObject } from 'dragonbones-pixijs';
2
1
  import { EventTypes } from 'entityx-ts';
2
+ import { EventObject } from '@cocos/dragonbones-js';
3
3
  import { NodeComp } from '../core/NodeComp';
4
4
  import { DragonBonesComp } from './DragonBonesComp';
5
- import { PixiDragonBonesSprite } from './PixiDragonBonesSprite';
5
+ import { CocosFactory } from './db-cocos/CocosFactory';
6
6
  export class DragonBonesSystem {
7
7
  configure(event_manager) {
8
- event_manager.subscribe(EventTypes.ComponentAdded, DragonBonesComp, async ({ entity }) => {
9
- const dbComp = entity.getComponent(DragonBonesComp);
8
+ CocosFactory.newInstance();
9
+ event_manager.subscribe(EventTypes.ComponentAdded, DragonBonesComp, async ({ entity, component: dbComp }) => {
10
10
  const { data, animation, playTimes = 0, timeScale = 1 } = dbComp.props;
11
+ // const texturePath = atlas.replace('.json', '.png')
11
12
  const { atlas, skeleton, texture } = data;
12
- const dragon = new PixiDragonBonesSprite({
13
- skeleton,
14
- atlas,
15
- texture,
16
- animationName: animation,
17
- playTimes,
18
- // width: dataSkel.armature[0].aabb.width,
19
- // height: dataSkel.armature[0].aabb.height,
20
- });
21
- dbComp.armature = dragon._armatureDisplay;
22
- dbComp.dragon = dragon;
23
- // console.log('armature', dbComp.armature)
24
- dbComp.armature.animation.timeScale = timeScale;
25
- const node = new cc.Node();
26
- node.addChild(dragon);
13
+ // cc.textureCache.addImage(texture)
14
+ const factory = CocosFactory.factory;
15
+ const dataSkel = cc.loader.getRes(skeleton);
16
+ const dataAtlas = cc.loader.getRes(atlas);
17
+ const textureCache = cc.textureCache.getTextureForKey(texture);
18
+ // texture.initWithFile(texturePath)
19
+ factory.parseDragonBonesData(dataSkel);
20
+ factory.parseTextureAtlasData(dataAtlas, textureCache);
21
+ // factory.loadDragonBonesData(skel)
22
+ // console.log(skeleton, dataSkel)
23
+ const node = factory.buildArmatureDisplay(dataSkel.armature[0].name, dataSkel.name);
24
+ // console.log('node', node)
25
+ // armature.animation.gotoAndPlay('run', 0.2)
26
+ node.armature.animation.timeScale = timeScale;
27
+ if (animation) {
28
+ const state = node.armature.animation.gotoAndPlayByTime(animation, 0, playTimes);
29
+ }
30
+ // console.log('state', state);
31
+ // if (skin) {
32
+ // node.setSkin(skin)
33
+ // }
27
34
  dbComp.node = entity.assign(new NodeComp(node, entity));
28
35
  if (dbComp.props.onAnimationStart)
29
- dbComp.armature.addDBEventListener(EventObject.START, () => {
36
+ node.armature.eventDispatcher.addDBEventListener(EventObject.START, (event) => {
30
37
  if (dbComp.node.active && dbComp.enabled)
31
38
  dbComp.props.onAnimationStart();
32
39
  }, dbComp);
33
40
  if (dbComp.props.onAnimationEnd)
34
- dbComp.armature.addDBEventListener(EventObject.COMPLETE, () => {
41
+ node.armature.eventDispatcher.addDBEventListener(EventObject.COMPLETE, (event) => {
35
42
  if (dbComp.node.active && dbComp.enabled)
36
43
  dbComp.props.onAnimationEnd();
37
44
  }, dbComp);
38
45
  if (dbComp.props.onAnimationComplete)
39
- dbComp.armature.addDBEventListener(EventObject.LOOP_COMPLETE, () => {
46
+ node.armature.eventDispatcher.addDBEventListener(EventObject.LOOP_COMPLETE, (event) => {
40
47
  if (dbComp.node.active && dbComp.enabled)
41
48
  dbComp.props.onAnimationComplete();
42
49
  }, dbComp);
43
50
  });
44
51
  event_manager.subscribe(EventTypes.ComponentRemoved, DragonBonesComp, ({ component }) => {
45
- const dbComp = component;
46
- // dbComp.armature.removeDBEventListener()
47
- dbComp.armature.destroy();
52
+ const armature = component.node.instance;
53
+ armature.destroy();
48
54
  // console.log('remove dragonbones component', dbComp.node.entity.id)
49
55
  });
50
56
  }
51
- // update(entities: EntityManager, events: EventManager, dt: number)
52
- update(entities) {
53
- const animations = entities.entities_with_components(DragonBonesComp);
54
- animations.forEach((ett) => {
55
- const dbComp = ett.getComponent(DragonBonesComp);
56
- if (dbComp.node && dbComp.node.active) {
57
- // console.log(' dragonbones updateTexture', dbComp.node.entity.id)
58
- dbComp.dragon.updateTexture();
59
- }
60
- });
57
+ update(entities, events, dt) {
58
+ // update(entities: EntityManager) {
59
+ // const animations = entities.entities_with_components(DragonBonesComp)
60
+ // animations.forEach((ett) => {
61
+ // const dbComp = ett.getComponent(DragonBonesComp)
62
+ // if (dbComp.node && dbComp.node.active) {
63
+ // // console.log(' dragonbones updateTexture', dbComp.node.entity.id)
64
+ // dbComp.dragon.updateTexture()
65
+ // }
66
+ // })
67
+ CocosFactory.advanceTime(dt);
61
68
  }
62
69
  }
@@ -0,0 +1,87 @@
1
+ /**
2
+ * The MIT License (MIT)
3
+ *
4
+ * Copyright (c) 2012-2018 DragonBones team and other contributors
5
+ *
6
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
7
+ * this software and associated documentation files (the "Software"), to deal in
8
+ * the Software without restriction, including without limitation the rights to
9
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
10
+ * the Software, and to permit persons to whom the Software is furnished to do so,
11
+ * subject to the following conditions:
12
+ *
13
+ * The above copyright notice and this permission notice shall be included in all
14
+ * copies or substantial portions of the Software.
15
+ *
16
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
18
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
19
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
20
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22
+ */
23
+ import { Animation, Armature, EventObject, EventStringType, IArmatureProxy } from '@cocos/dragonbones-js';
24
+ export type EventCallbackType = (...args: any[]) => void;
25
+ export interface EventMap {
26
+ [key: string]: [EventCallbackType];
27
+ }
28
+ export declare class CocosArmatureDisplay extends cc.Sprite implements IArmatureProxy {
29
+ /**
30
+ * @private
31
+ */
32
+ debugDraw: boolean;
33
+ private _debugDraw;
34
+ private _armature;
35
+ private _debugDrawer;
36
+ listenerCount: {};
37
+ events: EventMap;
38
+ constructor();
39
+ hasEvent(type: EventStringType): boolean;
40
+ addEvent(type: EventStringType, listener: Function, thisObject: any): void;
41
+ removeEvent(type: EventStringType, listener: Function, thisObject: any): void;
42
+ /**
43
+ * @inheritDoc
44
+ */
45
+ dbInit(armature: Armature): void;
46
+ /**
47
+ * @inheritDoc
48
+ */
49
+ dbClear(): void;
50
+ /**
51
+ * @inheritDoc
52
+ */
53
+ dbUpdate(): void;
54
+ /**
55
+ * @inheritDoc
56
+ */
57
+ dispose(disposeProxy?: boolean): void;
58
+ /**
59
+ * @inheritDoc
60
+ */
61
+ destroy(): void;
62
+ /**
63
+ * @private
64
+ */
65
+ dispatchDBEvent(type: EventStringType, eventObject: EventObject): void;
66
+ /**
67
+ * @inheritDoc
68
+ */
69
+ hasDBEventListener(type: EventStringType): boolean;
70
+ /**
71
+ * @inheritDoc
72
+ */
73
+ addDBEventListener(type: EventStringType, listener: (event: EventObject) => void, target: any): void;
74
+ /**
75
+ * @inheritDoc
76
+ */
77
+ removeDBEventListener(type: EventStringType, listener: (event: EventObject) => void, target: any): void;
78
+ /**
79
+ * @inheritDoc
80
+ */
81
+ get armature(): Armature;
82
+ /**
83
+ * @inheritDoc
84
+ */
85
+ get animation(): Animation;
86
+ }
87
+ //# sourceMappingURL=CocosArmatureDisplay.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"CocosArmatureDisplay.d.ts","sourceRoot":"","sources":["../../../src/dragonbones/db-cocos/CocosArmatureDisplay.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EACL,SAAS,EACT,QAAQ,EAGR,WAAW,EACX,eAAe,EACf,cAAc,EAEf,MAAM,uBAAuB,CAAA;AAE9B,MAAM,MAAM,iBAAiB,GAAG,CAAC,GAAG,IAAI,OAAA,KAAK,IAAI,CAAA;AACjD,MAAM,WAAW,QAAQ;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,iBAAiB,CAAC,CAAA;CACnC;AACD,qBAAa,oBAAqB,SAAQ,EAAE,CAAC,MAAO,YAAW,cAAc;IAC3E;;OAEG;IACI,SAAS,UAAQ;IACxB,OAAO,CAAC,UAAU,CAAQ;IAE1B,OAAO,CAAC,SAAS,CAAwB;IACzC,OAAO,CAAC,YAAY,CAAyB;IAE7C,aAAa,KAAK;IAClB,MAAM,EAAE,QAAQ,CAAK;;IASrB,QAAQ,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO;IAIxC,QAAQ,CAAC,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,GAAG,IAAI;IAI1E,WAAW,CAAC,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,GAAG,IAAI;IAG7E;;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;IAOzC;;OAEG;IACI,OAAO,IAAI,IAAI;IAGtB;;OAEG;IACI,eAAe,CAAC,IAAI,EAAE,eAAe,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI;IAS7E;;OAEG;IACI,kBAAkB,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO;IAKzD;;OAEG;IACI,kBAAkB,CAAC,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,IAAI;IAW3G;;OAEG;IACI,qBAAqB,CAAC,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,IAAI;IAK9G;;OAEG;IACH,IAAW,QAAQ,IAAI,QAAQ,CAE9B;IACD;;OAEG;IACH,IAAW,SAAS,IAAI,SAAS,CAEhC;CACF"}