@safe-engine/cocos 2.2.6 → 2.2.8

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 (45) hide show
  1. package/@types/index.d.ts +0 -2
  2. package/dist/box2d-wasm/PhysicsComponent.d.ts +1 -1
  3. package/dist/box2d-wasm/PhysicsComponent.d.ts.map +1 -1
  4. package/dist/box2d-wasm/PhysicsSystem.js +1 -1
  5. package/dist/collider/CollideSystem.d.ts.map +1 -1
  6. package/dist/collider/CollideSystem.js +6 -5
  7. package/dist/core/EnhancedComponent.d.ts +1 -1
  8. package/dist/core/EnhancedComponent.d.ts.map +1 -1
  9. package/dist/dragonbones/DragonBonesComp.d.ts +29 -0
  10. package/dist/dragonbones/DragonBonesComp.d.ts.map +1 -0
  11. package/dist/dragonbones/DragonBonesComp.js +27 -0
  12. package/dist/dragonbones/DragonBonesSystem.d.ts +9 -0
  13. package/dist/dragonbones/DragonBonesSystem.d.ts.map +1 -0
  14. package/dist/dragonbones/DragonBonesSystem.js +62 -0
  15. package/dist/dragonbones/PixiDragonBonesSprite.d.ts +5 -1
  16. package/dist/dragonbones/PixiDragonBonesSprite.d.ts.map +1 -1
  17. package/dist/dragonbones/PixiDragonBonesSprite.js +10 -6
  18. package/dist/dragonbones/index.d.ts +2 -35
  19. package/dist/dragonbones/index.d.ts.map +1 -1
  20. package/dist/dragonbones/index.js +3 -83
  21. package/dist/gui/GUIComponent.d.ts +1 -1
  22. package/dist/gui/GUIComponent.d.ts.map +1 -1
  23. package/dist/gui/GUISystem.js +2 -2
  24. package/dist/index.d.ts +9 -2
  25. package/dist/index.d.ts.map +1 -1
  26. package/dist/index.js +0 -2
  27. package/dist/render/RenderComponent.d.ts +1 -1
  28. package/dist/render/RenderComponent.d.ts.map +1 -1
  29. package/dist/render/RenderSystem.js +2 -2
  30. package/dist/richtext/RichTextComp.d.ts +1 -1
  31. package/dist/richtext/RichTextComp.d.ts.map +1 -1
  32. package/dist/safex.js +0 -24
  33. package/dist/spine/PixiSpineSprite.d.ts +6 -2
  34. package/dist/spine/PixiSpineSprite.d.ts.map +1 -1
  35. package/dist/spine/PixiSpineSprite.js +15 -13
  36. package/dist/spine/SpineSkeleton.d.ts +20 -0
  37. package/dist/spine/SpineSkeleton.d.ts.map +1 -0
  38. package/dist/spine/SpineSkeleton.js +11 -0
  39. package/dist/spine/SpineSystem.d.ts +7 -0
  40. package/dist/spine/SpineSystem.d.ts.map +1 -0
  41. package/dist/spine/SpineSystem.js +36 -0
  42. package/dist/spine/index.d.ts +2 -24
  43. package/dist/spine/index.d.ts.map +1 -1
  44. package/dist/spine/index.js +4 -42
  45. package/package.json +2 -2
package/@types/index.d.ts CHANGED
@@ -1,7 +1,5 @@
1
1
  type Float = number
2
2
  type Integer = number
3
- declare let dragonBones: any
4
- declare let PIXI: any
5
3
 
6
4
  declare namespace cc {
7
5
  declare let v2: (x?: number | any, y?: number) => Vec2
@@ -1,6 +1,6 @@
1
+ import { BaseComponentProps } from '..';
1
2
  import { ComponentX } from '../core/decorator';
2
3
  import { Vec2 } from '../polyfills';
3
- import { BaseComponentProps } from '../safex';
4
4
  import { PhysicsSprite } from './PhysicsSprite';
5
5
  interface RigidBodyProps {
6
6
  type?: 0 | 1 | 2;
@@ -1 +1 @@
1
- {"version":3,"file":"PhysicsComponent.d.ts","sourceRoot":"","sources":["../../src/box2d-wasm/PhysicsComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AACnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAG/C,UAAU,cAAc;IACtB,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAChB,OAAO,CAAC,EAAE,KAAK,CAAA;IACf,WAAW,CAAC,EAAE,KAAK,CAAA;IACnB,QAAQ,CAAC,EAAE,KAAK,CAAA;IAChB,YAAY,CAAC,EAAE,KAAK,CAAA;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAA;IAC3C,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAA;IACzC,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,KAAA,KAAK,IAAI,CAAA;IACjD,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,CAAC,KAAA,KAAK,IAAI,CAAA;CACvD;AAED,qBAAa,SAAU,SAAQ,UAAU,CAAC,cAAc,CAAC;IACvD,IAAI,EAAE,KAAK,CAAC,MAAM,CAAA;IAClB,YAAY,EAAE,aAAa,CAAA;IAC3B,IAAI,cAAc,CAAC,GAAG,EAAE,IAAI,EAK3B;IAED,IAAI,cAAc,IAPM,IAAI,CAa3B;IAED,YAAY,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,IAAI;IAWlC,kBAAkB,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,IAAI;IAWxC,WAAW,CAAC,MAAM,EAAE,KAAK;IAOzB,IAAI,QAAQ,CAAC,GAAG,EAAE,IAAI,EASrB;IAED,IAAI,QAAQ,IAXM,IAAI,CAarB;CACF;AAED,UAAU,uBAAuB;IAC/B,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC1B;AACD,qBAAa,kBAAmB,SAAQ,UAAU,CAAC,uBAAuB,GAAG,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;CASnH;AACD,UAAU,0BAA0B;IAClC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC1B;AACD,qBAAa,qBAAsB,SAAQ,UAAU,CAAC,0BAA0B,GAAG,kBAAkB,CAAC,qBAAqB,CAAC,CAAC;CAAG;AAChI,UAAU,2BAA2B;IACnC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;IACxC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC1B;AACD,qBAAa,sBAAuB,SAAQ,UAAU,CAAC,2BAA2B,GAAG,kBAAkB,CAAC,sBAAsB,CAAC,CAAC;CAAG"}
1
+ {"version":3,"file":"PhysicsComponent.d.ts","sourceRoot":"","sources":["../../src/box2d-wasm/PhysicsComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAG/C,UAAU,cAAc;IACtB,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAChB,OAAO,CAAC,EAAE,KAAK,CAAA;IACf,WAAW,CAAC,EAAE,KAAK,CAAA;IACnB,QAAQ,CAAC,EAAE,KAAK,CAAA;IAChB,YAAY,CAAC,EAAE,KAAK,CAAA;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAA;IAC3C,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAA;IACzC,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,KAAA,KAAK,IAAI,CAAA;IACjD,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,CAAC,KAAA,KAAK,IAAI,CAAA;CACvD;AAED,qBAAa,SAAU,SAAQ,UAAU,CAAC,cAAc,CAAC;IACvD,IAAI,EAAE,KAAK,CAAC,MAAM,CAAA;IAClB,YAAY,EAAE,aAAa,CAAA;IAC3B,IAAI,cAAc,CAAC,GAAG,EAAE,IAAI,EAK3B;IAED,IAAI,cAAc,IAPM,IAAI,CAa3B;IAED,YAAY,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,IAAI;IAWlC,kBAAkB,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,IAAI;IAWxC,WAAW,CAAC,MAAM,EAAE,KAAK;IAOzB,IAAI,QAAQ,CAAC,GAAG,EAAE,IAAI,EASrB;IAED,IAAI,QAAQ,IAXM,IAAI,CAarB;CACF;AAED,UAAU,uBAAuB;IAC/B,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC1B;AACD,qBAAa,kBAAmB,SAAQ,UAAU,CAAC,uBAAuB,GAAG,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;CASnH;AACD,UAAU,0BAA0B;IAClC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC1B;AACD,qBAAa,qBAAsB,SAAQ,UAAU,CAAC,0BAA0B,GAAG,kBAAkB,CAAC,qBAAqB,CAAC,CAAC;CAAG;AAChI,UAAU,2BAA2B;IACnC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;IACxC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC1B;AACD,qBAAa,sBAAuB,SAAQ,UAAU,CAAC,2BAA2B,GAAG,kBAAkB,CAAC,sBAAsB,CAAC,CAAC;CAAG"}
@@ -89,7 +89,7 @@ export class PhysicsSystem {
89
89
  fixtureDef.set_density(density);
90
90
  fixtureDef.set_friction(friction);
91
91
  fixtureDef.set_restitution(restitution);
92
- fixtureDef.set_isSensor(isSensor);
92
+ fixtureDef.set_isSensor(isSensor !== undefined);
93
93
  rigidBody.body.CreateFixture(fixtureDef);
94
94
  rigidBody.body.SetTransform(position, 0);
95
95
  rigidBody.body.SetLinearVelocity(zero);
@@ -1 +1 @@
1
- {"version":3,"file":"CollideSystem.d.ts","sourceRoot":"","sources":["../../src/collider/CollideSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAI5E,OAAO,EAA+B,QAAQ,EAAiB,QAAQ,EAAmB,MAAM,oBAAoB,CAAA;AAEpH,wBAAgB,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,WAQ5D;AAED,qBAAa,aAAc,YAAW,MAAM;IAC1C,aAAa,EAAE,QAAQ,EAAE,CAAK;IAC9B,UAAU,EAAE,QAAQ,EAAE,CAAK;IAC3B,eAAe,QAAK;IACpB,aAAa,EAAE,EAAE,CAAC,QAAQ,CAAA;IAC1B,gBAAgB,UAAQ;IACxB,OAAO,UAAO;IACd,cAAc,cAAW;IAEzB,SAAS,CAAC,aAAa,EAAE,YAAY;IASrC,OAAO,CAAC,aAAa,CASpB;IAED,OAAO,CAAC,gBAAgB,CAEvB;IAED,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;IA2GhE,WAAW,CAAC,QAAQ,EAAE,QAAQ;IAS9B,cAAc,CAAC,QAAQ,EAAE,QAAQ;IAIjC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK;IAI3B,eAAe,CAAC,MAAM,UAAO;CAI9B"}
1
+ {"version":3,"file":"CollideSystem.d.ts","sourceRoot":"","sources":["../../src/collider/CollideSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAK5E,OAAO,EAA+B,QAAQ,EAAiB,QAAQ,EAAmB,MAAM,oBAAoB,CAAA;AAEpH,wBAAgB,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,WAQ5D;AAED,qBAAa,aAAc,YAAW,MAAM;IAC1C,aAAa,EAAE,QAAQ,EAAE,CAAK;IAC9B,UAAU,EAAE,QAAQ,EAAE,CAAK;IAC3B,eAAe,QAAK;IACpB,aAAa,EAAE,EAAE,CAAC,QAAQ,CAAA;IAC1B,gBAAgB,UAAQ;IACxB,OAAO,UAAO;IACd,cAAc,cAAW;IAEzB,SAAS,CAAC,aAAa,EAAE,YAAY;IASrC,OAAO,CAAC,aAAa,CASpB;IAED,OAAO,CAAC,gBAAgB,CAEvB;IAED,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;IA2GhE,WAAW,CAAC,QAAQ,EAAE,QAAQ;IAS9B,cAAc,CAAC,QAAQ,EAAE,QAAQ;IAIjC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK;IAI3B,eAAe,CAAC,MAAM,UAAO;CAI9B"}
@@ -1,6 +1,7 @@
1
1
  import { EventTypes } from 'entityx-ts';
2
2
  import { NodeComp } from '../core/NodeComp';
3
3
  import { GameWorld } from '../gworld';
4
+ import { instantiate } from '../helper';
4
5
  import { BoxCollider, CircleCollider, Collider, CollisionType, Contract, PolygonCollider } from './CollideComponent';
5
6
  export function shouldCollider(colA, colB) {
6
7
  const groupA = colA.props.tag;
@@ -28,12 +29,12 @@ export class CollideSystem {
28
29
  event_manager.subscribe(EventTypes.ComponentRemoved, PolygonCollider, this.onRemoveCollider.bind(this));
29
30
  }
30
31
  onAddCollider = ({ entity, component }) => {
31
- // let collider = entity.getComponent(Collider)
32
- // if (!collider) {
33
- // collider = entity.assign(instantiate(Collider))
34
- // }
32
+ let collider = entity.getComponent(Collider);
33
+ if (!collider) {
34
+ collider = entity.assign(instantiate(Collider));
35
+ }
35
36
  // console.log('onAddCollider', component, collider)
36
- // collider.node = entity.getComponent(NodeComp)
37
+ collider.node = entity.getComponent(NodeComp);
37
38
  component.node = entity.getComponent(NodeComp);
38
39
  this.addCollider(component);
39
40
  };
@@ -1,5 +1,5 @@
1
1
  import { Constructor } from 'entityx-ts';
2
- import { BaseComponentProps } from '../safex';
2
+ import { BaseComponentProps } from '..';
3
3
  import { NodeComp } from './NodeComp';
4
4
  export declare class EnhancedComponent<Props = object, N extends NodeComp<any> = NodeComp<any>> {
5
5
  props: Props;
@@ -1 +1 @@
1
- {"version":3,"file":"EnhancedComponent.d.ts","sourceRoot":"","sources":["../../src/core/EnhancedComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,qBAAa,iBAAiB,CAAC,KAAK,GAAG,MAAM,EAAE,CAAC,SAAS,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC;IACpF,KAAK,EAAE,KAAK,CAAY;IACxB,IAAI,EAAE,CAAC,CAAA;IACP,OAAO,UAAO;gBACF,IAAI,CAAC,EAAE,kBAAkB,CAAC,iBAAiB,CAAC,GAAG,KAAK;IAGhE,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK;IASjB,YAAY,CAAC,CAAC,SAAS,iBAAiB,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC;IAGzD,YAAY,CAAC,CAAC,SAAS,iBAAiB,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;IAGvE,QAAQ,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAE,MAAgC,EAAE,KAAK,SAAI;IAG5G,UAAU,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI;IAGvC,sBAAsB;IAGtB,YAAY,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;IAGtE,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,CAAA"}
1
+ {"version":3,"file":"EnhancedComponent.d.ts","sourceRoot":"","sources":["../../src/core/EnhancedComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,OAAO,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAA;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,qBAAa,iBAAiB,CAAC,KAAK,GAAG,MAAM,EAAE,CAAC,SAAS,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC;IACpF,KAAK,EAAE,KAAK,CAAY;IACxB,IAAI,EAAE,CAAC,CAAA;IACP,OAAO,UAAO;gBACF,IAAI,CAAC,EAAE,kBAAkB,CAAC,iBAAiB,CAAC,GAAG,KAAK;IAGhE,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK;IASjB,YAAY,CAAC,CAAC,SAAS,iBAAiB,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC;IAGzD,YAAY,CAAC,CAAC,SAAS,iBAAiB,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;IAGvE,QAAQ,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAE,MAAgC,EAAE,KAAK,SAAI;IAG5G,UAAU,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI;IAGvC,sBAAsB;IAGtB,YAAY,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;IAGtE,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,CAAA"}
@@ -0,0 +1,29 @@
1
+ import { PixiArmatureDisplay } from 'dragonbones-pixijs';
2
+ import { BaseComponentProps } from '..';
3
+ import { ComponentX } from '../core/decorator';
4
+ import { PixiDragonBonesSprite } from './PixiDragonBonesSprite';
5
+ export interface DragonBonesData {
6
+ atlas: string;
7
+ skeleton: string;
8
+ texture: string;
9
+ }
10
+ interface DragonBonesProps {
11
+ data: DragonBonesData;
12
+ skin?: string;
13
+ animation?: string;
14
+ playTimes?: Integer;
15
+ timeScale?: Float;
16
+ onAnimationStart?: () => void;
17
+ onAnimationEnd?: () => void;
18
+ onAnimationComplete?: () => void;
19
+ }
20
+ export declare class DragonBonesComp extends ComponentX<DragonBonesProps & BaseComponentProps<DragonBonesComp>, cc.Node> {
21
+ armature: PixiArmatureDisplay;
22
+ dragon: PixiDragonBonesSprite;
23
+ setAnimation(name: string, playTimes?: number): void;
24
+ getAnimationName(): any;
25
+ setFLipX(isFlipX: boolean): void;
26
+ setTimeScale(timeScale: Float): void;
27
+ }
28
+ export {};
29
+ //# sourceMappingURL=DragonBonesComp.d.ts.map
@@ -0,0 +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"}
@@ -0,0 +1,27 @@
1
+ import { ComponentX, render } from '../core/decorator';
2
+ export class DragonBonesComp extends ComponentX {
3
+ armature;
4
+ dragon;
5
+ setAnimation(name, playTimes = 0) {
6
+ if (this.armature) {
7
+ if (this.armature.animation.lastAnimationName === name)
8
+ return;
9
+ this.armature.animation.gotoAndPlayByTime(name, 0, playTimes);
10
+ }
11
+ }
12
+ getAnimationName() {
13
+ return this.armature.animation.lastAnimationName;
14
+ }
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
+ setFLipX(isFlipX) {
21
+ this.armature._armature.flipX = isFlipX;
22
+ }
23
+ setTimeScale(timeScale) {
24
+ this.armature.animation.timeScale = timeScale;
25
+ }
26
+ }
27
+ Object.defineProperty(DragonBonesComp.prototype, 'render', { value: render });
@@ -0,0 +1,9 @@
1
+ import { EntityManager, EventManager, System } from 'entityx-ts';
2
+ export type DragonBonesEventData = {
3
+ name: string;
4
+ };
5
+ export declare class DragonBonesSystem implements System {
6
+ configure(event_manager: EventManager): void;
7
+ update(entities: EntityManager): void;
8
+ }
9
+ //# sourceMappingURL=DragonBonesSystem.d.ts.map
@@ -0,0 +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"}
@@ -0,0 +1,62 @@
1
+ import { EventObject } from 'dragonbones-pixijs';
2
+ import { EventTypes } from 'entityx-ts';
3
+ import { NodeComp } from '../core/NodeComp';
4
+ import { DragonBonesComp } from './DragonBonesComp';
5
+ import { PixiDragonBonesSprite } from './PixiDragonBonesSprite';
6
+ export class DragonBonesSystem {
7
+ configure(event_manager) {
8
+ event_manager.subscribe(EventTypes.ComponentAdded, DragonBonesComp, async ({ entity }) => {
9
+ const dbComp = entity.getComponent(DragonBonesComp);
10
+ const { data, animation, playTimes = 0, timeScale = 1 } = dbComp.props;
11
+ 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);
27
+ dbComp.node = entity.assign(new NodeComp(node, entity));
28
+ if (dbComp.props.onAnimationStart)
29
+ dbComp.armature.addDBEventListener(EventObject.START, () => {
30
+ if (dbComp.node.active && dbComp.enabled)
31
+ dbComp.props.onAnimationStart();
32
+ }, dbComp);
33
+ if (dbComp.props.onAnimationEnd)
34
+ dbComp.armature.addDBEventListener(EventObject.COMPLETE, () => {
35
+ if (dbComp.node.active && dbComp.enabled)
36
+ dbComp.props.onAnimationEnd();
37
+ }, dbComp);
38
+ if (dbComp.props.onAnimationComplete)
39
+ dbComp.armature.addDBEventListener(EventObject.LOOP_COMPLETE, () => {
40
+ if (dbComp.node.active && dbComp.enabled)
41
+ dbComp.props.onAnimationComplete();
42
+ }, dbComp);
43
+ });
44
+ event_manager.subscribe(EventTypes.ComponentRemoved, DragonBonesComp, ({ component }) => {
45
+ const dbComp = component;
46
+ // dbComp.armature.removeDBEventListener()
47
+ dbComp.armature.destroy();
48
+ // console.log('remove dragonbones component', dbComp.node.entity.id)
49
+ });
50
+ }
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
+ });
61
+ }
62
+ }
@@ -1,6 +1,10 @@
1
1
  import { PixiArmatureDisplay } from 'dragonbones-pixijs';
2
2
  import { Application } from 'pixi.js';
3
- export declare function loadDragonBonesAssets(skeleton: any, atlas: any, texture: any): Promise<any>;
3
+ export declare function loadDragonBonesAssets({ skeleton, atlas, texture }: {
4
+ skeleton: any;
5
+ atlas: any;
6
+ texture: any;
7
+ }): Promise<any>;
4
8
  export declare class PixiDragonBonesSprite extends cc.Sprite {
5
9
  _canvas: any;
6
10
  _pixiApp: Application;
@@ -1 +1 @@
1
- {"version":3,"file":"PixiDragonBonesSprite.d.ts","sourceRoot":"","sources":["../../src/dragonbones/PixiDragonBonesSprite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAe,MAAM,oBAAoB,CAAA;AACrE,OAAO,EAAE,WAAW,EAAU,MAAM,SAAS,CAAA;AAE7C,wBAAgB,qBAAqB,CAAC,QAAQ,KAAA,EAAE,KAAK,KAAA,EAAE,OAAO,KAAA,gBAE7D;AACD,qBAAa,qBAAsB,SAAQ,EAAE,CAAC,MAAM;IAClD,OAAO,EAAE,GAAG,CAAA;IACZ,QAAQ,EAAE,WAAW,CAAA;IACrB,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAA;IACtB,OAAO,MAAA;IACP,gBAAgB,EAAE,mBAAmB,CAAA;gBACzB,MAAM,KAAA;IA+BlB,cAAc;IAsBd,aAAa;IASb,MAAM;CAMP"}
1
+ {"version":3,"file":"PixiDragonBonesSprite.d.ts","sourceRoot":"","sources":["../../src/dragonbones/PixiDragonBonesSprite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAe,MAAM,oBAAoB,CAAA;AACrE,OAAO,EAAE,WAAW,EAAU,MAAM,SAAS,CAAA;AAE7C,wBAAgB,qBAAqB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE;;;;CAAA,gBAGjE;AAED,qBAAa,qBAAsB,SAAQ,EAAE,CAAC,MAAM;IAClD,OAAO,EAAE,GAAG,CAAA;IACZ,QAAQ,EAAE,WAAW,CAAA;IACrB,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAA;IACtB,OAAO,MAAA;IACP,gBAAgB,EAAE,mBAAmB,CAAA;gBACzB,MAAM,KAAA;IA+BlB,cAAc;IAuBd,aAAa;IASb,MAAM;CAQP"}
@@ -1,6 +1,7 @@
1
1
  import { PixiFactory } from 'dragonbones-pixijs';
2
2
  import { Application, Assets } from 'pixi.js';
3
- export function loadDragonBonesAssets(skeleton, atlas, texture) {
3
+ export function loadDragonBonesAssets({ skeleton, atlas, texture }) {
4
+ // console.log('loadDragonBonesAssets', skeleton, atlas, texture)
4
5
  return Assets.load([skeleton, atlas, texture]);
5
6
  }
6
7
  export class PixiDragonBonesSprite extends cc.Sprite {
@@ -36,13 +37,14 @@ export class PixiDragonBonesSprite extends cc.Sprite {
36
37
  // this.schedule(this.updateTexture, 1 / 30);
37
38
  }
38
39
  _setupArmature() {
39
- const { key, skeleton, atlas, texture, playTimes, animationName, scale = 1 } = this._config;
40
+ const { skeleton, atlas, texture, playTimes, animationName, scale = 1 } = this._config;
40
41
  const factory = PixiFactory.factory;
41
- const dragonData = factory.parseDragonBonesData(Assets.get(skeleton), key);
42
- factory.parseTextureAtlasData(Assets.get(atlas), Assets.get(texture), key);
42
+ const atlasAsset = Assets.get(atlas);
43
+ const dragonData = factory.parseDragonBonesData(Assets.get(skeleton), atlasAsset.name);
44
+ factory.parseTextureAtlasData(Assets.get(atlas), Assets.get(texture), atlasAsset.name);
43
45
  const { armatureNames } = dragonData;
44
46
  const armatureName = armatureNames[0];
45
- const display = factory.buildArmatureDisplay(armatureName, key);
47
+ const display = factory.buildArmatureDisplay(armatureName, atlasAsset.name);
46
48
  if (!display) {
47
49
  console.error('Cannot build armature:', armatureName);
48
50
  return;
@@ -55,7 +57,7 @@ export class PixiDragonBonesSprite extends cc.Sprite {
55
57
  this._armatureDisplay = display;
56
58
  }
57
59
  updateTexture() {
58
- if (this._armatureDisplay && this._pixiApp.renderer) {
60
+ if (this._armatureDisplay && this._pixiApp.renderer && this._pixiApp.stage) {
59
61
  this._pixiApp.renderer.render(this._pixiApp.stage);
60
62
  this._texture.initWithElement(this._canvas);
61
63
  this._texture.handleLoadedTexture();
@@ -66,6 +68,8 @@ export class PixiDragonBonesSprite extends cc.Sprite {
66
68
  // this.unschedule(this.updateTexture);
67
69
  this._pixiApp.destroy(true, { children: true });
68
70
  this._canvas.remove();
71
+ this._armatureDisplay.destroy();
72
+ this._armatureDisplay = null;
69
73
  super.onExit();
70
74
  }
71
75
  }
@@ -1,37 +1,4 @@
1
- import { PixiArmatureDisplay } from 'dragonbones-pixijs';
2
- import { EntityManager, EventManager, System } from 'entityx-ts';
3
- import { ComponentX } from '../core/decorator';
4
- import { BaseComponentProps } from '../safex';
5
- import { PixiDragonBonesSprite } from './PixiDragonBonesSprite';
6
- export type DragonBonesEventData = {
7
- name: string;
8
- };
9
- export interface DragonBonesData {
10
- atlas: string;
11
- skeleton: string;
12
- texture: string;
13
- }
14
- interface DragonBonesProps {
15
- data: DragonBonesData;
16
- skin?: string;
17
- animation?: string;
18
- playTimes?: Integer;
19
- timeScale?: Float;
20
- onAnimationStart?: () => void;
21
- onAnimationEnd?: () => void;
22
- onAnimationComplete?: () => void;
23
- }
24
- export declare class DragonBonesComp extends ComponentX<DragonBonesProps & BaseComponentProps<DragonBonesComp>, PixiDragonBonesSprite> {
25
- armature: PixiArmatureDisplay;
26
- setAnimation(name: string, playTimes?: number): void;
27
- getAnimationName(): any;
28
- setFLipX(isFlipX: boolean): void;
29
- setTimeScale(timeScale: Float): void;
30
- }
31
- export declare class DragonBonesSystem implements System {
32
- configure(event_manager: EventManager): void;
33
- update(entities: EntityManager): void;
34
- }
35
- export declare function setupDragonBones(): void;
1
+ export * from './DragonBonesComp';
36
2
  export * from './PixiDragonBonesSprite';
3
+ export declare function setupDragonBones(): void;
37
4
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/dragonbones/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,EAAE,aAAa,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAG5E,OAAO,EAAE,UAAU,EAAU,MAAM,mBAAmB,CAAA;AAEtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAE/D,MAAM,MAAM,oBAAoB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAA;AACnD,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,UAAU,gBAAgB;IACxB,IAAI,EAAE,eAAe,CAAA;IACrB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,SAAS,CAAC,EAAE,KAAK,CAAA;IAEjB,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAA;IAC7B,cAAc,CAAC,EAAE,MAAM,IAAI,CAAA;IAC3B,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAA;CACjC;AAED,qBAAa,eAAgB,SAAQ,UAAU,CAAC,gBAAgB,GAAG,kBAAkB,CAAC,eAAe,CAAC,EAAE,qBAAqB,CAAC;IAC5H,QAAQ,EAAE,mBAAmB,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;AAED,qBAAa,iBAAkB,YAAW,MAAM;IAC9C,SAAS,CAAC,aAAa,EAAE,YAAY;IAmDrC,MAAM,CAAC,QAAQ,EAAE,aAAa;CAU/B;AAED,wBAAgB,gBAAgB,SAE/B;AAED,cAAc,yBAAyB,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/dragonbones/index.ts"],"names":[],"mappings":"AAGA,cAAc,mBAAmB,CAAA;AACjC,cAAc,yBAAyB,CAAA;AAEvC,wBAAgB,gBAAgB,SAE/B"}
@@ -1,87 +1,7 @@
1
- import { EventTypes } from 'entityx-ts';
2
- import { NodeComp } from '../core/NodeComp';
3
- import { ComponentX, render } from '../core/decorator';
4
1
  import { GameWorld } from '../gworld';
5
- import { PixiDragonBonesSprite } from './PixiDragonBonesSprite';
6
- export class DragonBonesComp extends ComponentX {
7
- armature;
8
- setAnimation(name, playTimes = 0) {
9
- if (this.armature) {
10
- if (this.armature.animation.lastAnimationName === name)
11
- return;
12
- this.armature.animation.gotoAndPlayByTime(name, 0, playTimes);
13
- }
14
- }
15
- getAnimationName() {
16
- return this.armature.animation.lastAnimationName;
17
- }
18
- // setSkeletonData(data: string) {
19
- // const skel = this.node.instance as CocosArmatureDisplay;
20
- // const atlas = data.replace('.json', '.atlas');
21
- // skel.armature.armatureData(data, atlas, this.node.scale);
22
- // }
23
- setFLipX(isFlipX) {
24
- this.armature._armature.flipX = isFlipX;
25
- }
26
- setTimeScale(timeScale) {
27
- this.armature.animation.timeScale = timeScale;
28
- }
29
- }
30
- export class DragonBonesSystem {
31
- configure(event_manager) {
32
- event_manager.subscribe(EventTypes.ComponentAdded, DragonBonesComp, async ({ entity }) => {
33
- const dbComp = entity.getComponent(DragonBonesComp);
34
- const { data, animation, playTimes = 0, timeScale = 1 } = dbComp.props;
35
- const { atlas, skeleton, texture } = data;
36
- const dragon = new PixiDragonBonesSprite({
37
- skeleton,
38
- atlas,
39
- texture,
40
- animationName: animation,
41
- playTimes,
42
- // width: dataSkel.armature[0].aabb.width,
43
- // height: dataSkel.armature[0].aabb.height,
44
- });
45
- dbComp.armature = dragon._armatureDisplay;
46
- // console.log('armature', dbComp.armature)
47
- dbComp.armature.animation.timeScale = timeScale;
48
- dbComp.node = entity.assign(new NodeComp(dragon, entity));
49
- if (dbComp.props.onAnimationStart)
50
- dbComp.armature.addDBEventListener(dragonBones.EventObject.START, () => {
51
- if (dbComp.node.active && dbComp.enabled)
52
- dbComp.props.onAnimationStart();
53
- }, dbComp);
54
- if (dbComp.props.onAnimationEnd)
55
- dbComp.armature.addDBEventListener(dragonBones.EventObject.COMPLETE, () => {
56
- if (dbComp.node.active && dbComp.enabled)
57
- dbComp.props.onAnimationEnd();
58
- }, dbComp);
59
- if (dbComp.props.onAnimationComplete)
60
- dbComp.armature.addDBEventListener(dragonBones.EventObject.LOOP_COMPLETE, () => {
61
- if (dbComp.node.active && dbComp.enabled)
62
- dbComp.props.onAnimationComplete();
63
- }, dbComp);
64
- });
65
- event_manager.subscribe(EventTypes.ComponentRemoved, DragonBonesComp, ({ component }) => {
66
- const dbComp = component;
67
- dbComp.armature.removeDBEventListener();
68
- dbComp.node.removeAllChildren();
69
- });
70
- }
71
- // update(entities: EntityManager, events: EventManager, dt: number)
72
- update(entities) {
73
- // console.log('update', dt)
74
- const animations = entities.entities_with_components(DragonBonesComp);
75
- animations.forEach((ett) => {
76
- const dbComp = ett.getComponent(DragonBonesComp);
77
- if (dbComp.node && dbComp.node.active) {
78
- dbComp.node.instance.updateTexture();
79
- }
80
- });
81
- }
82
- }
2
+ import { DragonBonesSystem } from './DragonBonesSystem';
3
+ export * from './DragonBonesComp';
4
+ export * from './PixiDragonBonesSprite';
83
5
  export function setupDragonBones() {
84
6
  GameWorld.Instance.addSystemAndUpdate(DragonBonesSystem);
85
7
  }
86
- export * from './PixiDragonBonesSprite';
87
- Object.defineProperty(DragonBonesComp.prototype, 'render', { value: render });
@@ -1,6 +1,6 @@
1
+ import { BaseComponentProps, ColorSource } from '..';
1
2
  import { ComponentX } from '../core/decorator';
2
3
  import { Size, Vec2 } from '../polyfills';
3
- import { BaseComponentProps, ColorSource } from '../safex';
4
4
  export declare const FillType: {
5
5
  HORIZONTAL: number;
6
6
  VERTICAL: number;
@@ -1 +1 @@
1
- {"version":3,"file":"GUIComponent.d.ts","sourceRoot":"","sources":["../../src/gui/GUIComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAU,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAE1D,eAAO,MAAM,QAAQ;;;;CAIpB,CAAA;AAID,UAAU,eAAe;IACvB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;CACvC;AACD,qBAAa,UAAW,SAAQ,UAAU,CAAC,eAAe,CAAC;CAK1D;AAED,UAAU,kBAAkB;IAC1B,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,IAAI,CAAA;IACjB,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AAED,qBAAa,iBAAkB,SAAQ,UAAU,CAAC,kBAAkB,GAAG,kBAAkB,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC,aAAa,GAAG,EAAE,CAAC,IAAI,CAAC;IACvI,IAAI,SAAS,IAYM,MAAM,CARxB;IAED,IAAI,SAAS,CAAC,GAAG,EAAE,MAAM,EAIxB;IAED,IAAI,SAAS,CAAC,GAAG,EAAE,MAAM,EAIxB;CACF;AAED,UAAU,cAAc;IACtB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;IAC/B,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;CACrC;AAED,qBAAa,SAAU,SAAQ,UAAU,CAAC,cAAc,GAAG,kBAAkB,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC;IAClG,IAAI,MAAM,IAIM,MAAM,CAFrB;IAED,IAAI,MAAM,CAAC,GAAG,EAAE,MAAM,EAKrB;CACF;AAED,oBAAY,mBAAmB;IAC7B,IAAmC;IACnC,UAA+C;IAC/C,QAA2C;IAC3C,IAAmC;CACpC;AACD,UAAU,eAAe;IACvB,QAAQ,EAAE,IAAI,CAAA;IACd,WAAW,EAAE,IAAI,CAAA;IACjB,SAAS,CAAC,EAAE,mBAAmB,CAAA;IAC/B,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AACD,qBAAa,cAAe,SAAQ,UAAU,CAAC,eAAe,GAAG,kBAAkB,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC;IACjH,IAAI,CAAC,KAAK,EAAE,MAAM;CAKnB;AAED,UAAU,cAAc;IACtB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB;AACD,qBAAa,SAAU,SAAQ,UAAU,CAAC,cAAc,GAAG,kBAAkB,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC;IACvG,IAAI,MAAM,WAET;CACF;AAED,qBAAa,oBAAqB,SAAQ,UAAU;CAAG"}
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,CAAC,EAAE,MAAM,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;CACvC;AACD,qBAAa,UAAW,SAAQ,UAAU,CAAC,eAAe,CAAC;CAK1D;AAED,UAAU,kBAAkB;IAC1B,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,IAAI,CAAA;IACjB,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AAED,qBAAa,iBAAkB,SAAQ,UAAU,CAAC,kBAAkB,GAAG,kBAAkB,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC,aAAa,GAAG,EAAE,CAAC,IAAI,CAAC;IACvI,IAAI,SAAS,IAYM,MAAM,CARxB;IAED,IAAI,SAAS,CAAC,GAAG,EAAE,MAAM,EAIxB;IAED,IAAI,SAAS,CAAC,GAAG,EAAE,MAAM,EAIxB;CACF;AAED,UAAU,cAAc;IACtB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;IAC/B,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;CACrC;AAED,qBAAa,SAAU,SAAQ,UAAU,CAAC,cAAc,GAAG,kBAAkB,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC;IAClG,IAAI,MAAM,IAIM,MAAM,CAFrB;IAED,IAAI,MAAM,CAAC,GAAG,EAAE,MAAM,EAKrB;CACF;AAED,oBAAY,mBAAmB;IAC7B,IAAmC;IACnC,UAA+C;IAC/C,QAA2C;IAC3C,IAAmC;CACpC;AACD,UAAU,eAAe;IACvB,QAAQ,EAAE,IAAI,CAAA;IACd,WAAW,EAAE,IAAI,CAAA;IACjB,SAAS,CAAC,EAAE,mBAAmB,CAAA;IAC/B,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AACD,qBAAa,cAAe,SAAQ,UAAU,CAAC,eAAe,GAAG,kBAAkB,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC;IACjH,IAAI,CAAC,KAAK,EAAE,MAAM;CAKnB;AAED,UAAU,cAAc;IACtB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB;AACD,qBAAa,SAAU,SAAQ,UAAU,CAAC,cAAc,GAAG,kBAAkB,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC;IACvG,IAAI,MAAM,WAET;CACF;AAED,qBAAa,oBAAqB,SAAQ,UAAU;CAAG"}
@@ -74,10 +74,10 @@ export class GUISystem {
74
74
  node.setContentSize(contentSize);
75
75
  node.setViewSize(viewSize);
76
76
  node.setDirection(direction);
77
- if (isScrollToTop)
77
+ if (isScrollToTop !== undefined)
78
78
  node.setContentOffset(cc.p(0, viewSize.height - contentSize.height));
79
79
  // node.setTouchEnabled(false)
80
- node.setBounceable(isBounced);
80
+ node.setBounceable(isBounced !== undefined);
81
81
  scrollView.node = entity.assign(new NodeComp(node, entity));
82
82
  };
83
83
  onAddBlockInputEventsComp = ({ entity, component: blockInput }) => {
package/dist/index.d.ts CHANGED
@@ -1,3 +1,4 @@
1
+ import { Color4B, NodeComp } from '.';
1
2
  export * from './app';
2
3
  export * from './collider';
3
4
  export * from './core/decorator';
@@ -13,6 +14,12 @@ export * from './polyfills';
13
14
  export { type Touch } from './polyfills';
14
15
  export * from './render';
15
16
  export * from './richtext';
16
- export * from './safex';
17
- export * from './spine';
17
+ export type ColorSource = ReturnType<typeof Color4B>;
18
+ export interface BaseComponentProps<T> {
19
+ $ref?: T;
20
+ $push?: T[];
21
+ $refNode?: NodeComp;
22
+ $pushNode?: NodeComp[];
23
+ node?: Partial<NodeComp>;
24
+ }
18
25
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAA;AACrB,cAAc,YAAY,CAAA;AAC1B,cAAc,kBAAkB,CAAA;AAChC,cAAc,0BAA0B,CAAA;AACxC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,cAAc,CAAA;AAC5B,cAAc,OAAO,CAAA;AACrB,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,aAAa,CAAA;AACxC,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,SAAS,CAAA;AACvB,cAAc,SAAS,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAA;AACrC,cAAc,OAAO,CAAA;AACrB,cAAc,YAAY,CAAA;AAC1B,cAAc,kBAAkB,CAAA;AAChC,cAAc,0BAA0B,CAAA;AACxC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,cAAc,CAAA;AAC5B,cAAc,OAAO,CAAA;AACrB,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,aAAa,CAAA;AACxC,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,OAAO,CAAC,CAAA;AAEpD,MAAM,WAAW,kBAAkB,CAAC,CAAC;IACnC,IAAI,CAAC,EAAE,CAAC,CAAA;IACR,KAAK,CAAC,EAAE,CAAC,EAAE,CAAA;IACX,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAA;IACtB,IAAI,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;CAEzB"}
package/dist/index.js CHANGED
@@ -12,5 +12,3 @@ export * from './norender';
12
12
  export * from './polyfills';
13
13
  export * from './render';
14
14
  export * from './richtext';
15
- export * from './safex';
16
- export * from './spine';
@@ -1,6 +1,6 @@
1
+ import { BaseComponentProps, ColorSource } from '..';
1
2
  import { ComponentX } from '../core/decorator';
2
3
  import { Color4B, Size, Vec2 } from '../polyfills';
3
- import { BaseComponentProps, ColorSource } from '../safex';
4
4
  export declare class NodeRender extends ComponentX {
5
5
  nodeName: string;
6
6
  }
@@ -1 +1 @@
1
- {"version":3,"file":"RenderComponent.d.ts","sourceRoot":"","sources":["../../src/render/RenderComponent.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RenderComponent.d.ts","sourceRoot":"","sources":["../../src/render/RenderComponent.ts"],"names":[],"mappings":"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"}
@@ -49,7 +49,7 @@ export class RenderSystem {
49
49
  spriteComp.node = ett.assign(new NodeComp(node, ett));
50
50
  };
51
51
  onAddMaskRender = ({ entity, component: maskComp }) => {
52
- const { inverted = false, spriteFrame, cropSize, alphaThreshold = 0.05 } = maskComp.props;
52
+ const { inverted, spriteFrame, cropSize, alphaThreshold = 0.05 } = maskComp.props;
53
53
  let stencil = new cc.Sprite(spriteFrame);
54
54
  if (cropSize) {
55
55
  const { width, height } = cropSize;
@@ -57,7 +57,7 @@ export class RenderSystem {
57
57
  }
58
58
  const clipper = new cc.ClippingNode(stencil);
59
59
  clipper.setAlphaThreshold(!spriteFrame ? 1 : alphaThreshold);
60
- clipper.setInverted(inverted);
60
+ clipper.setInverted(inverted !== undefined);
61
61
  maskComp.node = entity.assign(new NodeComp(clipper, entity));
62
62
  };
63
63
  onAddGraphicsRender = ({ entity }) => {
@@ -1,5 +1,5 @@
1
+ import { BaseComponentProps } from '..';
1
2
  import { ComponentX } from '../core/decorator';
2
- import { BaseComponentProps } from '../safex';
3
3
  interface RichTextCompProps {
4
4
  font?: string;
5
5
  string?: string;
@@ -1 +1 @@
1
- {"version":3,"file":"RichTextComp.d.ts","sourceRoot":"","sources":["../../src/richtext/RichTextComp.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAU,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAK7C,UAAU,iBAAiB;IACzB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,qBAAa,YAAa,SAAQ,UAAU,CAAC,iBAAiB,GAAG,kBAAkB,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;IAC/G,IAAI,MAAM,IAIM,MAAM,CAFrB;IAED,IAAI,MAAM,CAAC,GAAG,EAAE,MAAM,EAyBrB;CACF"}
1
+ {"version":3,"file":"RichTextComp.d.ts","sourceRoot":"","sources":["../../src/richtext/RichTextComp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAa,MAAM,IAAI,CAAA;AAClD,OAAO,EAAE,UAAU,EAAU,MAAM,mBAAmB,CAAA;AAKtD,UAAU,iBAAiB;IACzB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,qBAAa,YAAa,SAAQ,UAAU,CAAC,iBAAiB,GAAG,kBAAkB,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;IAC/G,IAAI,MAAM,IAIM,MAAM,CAFrB;IAED,IAAI,MAAM,CAAC,GAAG,EAAE,MAAM,EAyBrB;CACF"}
package/dist/safex.js CHANGED
@@ -1,25 +1 @@
1
1
  export {};
2
- // interface LoadingBarProps {}
3
- // interface PhysicsMaterialProps {
4
- // friction?: number
5
- // restitution?: number
6
- // density?: number
7
- // }
8
- // interface ColliderPhysicsProps {
9
- // tag?: number
10
- // group?: number
11
- // offset?: Vec2
12
- // onCollisionEnter?: (other: Collider) => void
13
- // onCollisionExit?: (other: Collider) => void
14
- // onCollisionStay?: (other: Collider) => void
15
- // }
16
- // interface BoxColliderPhysicsProps {
17
- // width: number
18
- // height: number
19
- // }
20
- // interface CircleColliderPhysicsProps {
21
- // radius: number
22
- // }
23
- // interface PolygonColliderPhysicsProps {
24
- // points: Array<Vec2>
25
- // }
@@ -1,6 +1,10 @@
1
1
  import { Spine } from '@esotericsoftware/spine-pixi-v8';
2
2
  import { Application } from 'pixi.js';
3
- export declare function loadSpineAssets(skeleton: any, atlas: any, texture: any): Promise<any>;
3
+ export declare function loadSpineAssets({ skeleton, atlas, texture }: {
4
+ skeleton: any;
5
+ atlas: any;
6
+ texture: any;
7
+ }): Promise<any>;
4
8
  export declare class PixiSpineSprite extends cc.Sprite {
5
9
  _canvas: any;
6
10
  _pixiApp: Application;
@@ -8,7 +12,7 @@ export declare class PixiSpineSprite extends cc.Sprite {
8
12
  _config: any;
9
13
  _armatureDisplay: Spine;
10
14
  constructor(config: any);
11
- _setupArmature(): void;
15
+ _setupSpine(): void;
12
16
  updateTexture(): void;
13
17
  onExit(): void;
14
18
  }
@@ -1 +1 @@
1
- {"version":3,"file":"PixiSpineSprite.d.ts","sourceRoot":"","sources":["../../src/spine/PixiSpineSprite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iCAAiC,CAAA;AACvD,OAAO,EAAE,WAAW,EAAU,MAAM,SAAS,CAAA;AAE7C,wBAAgB,eAAe,CAAC,QAAQ,KAAA,EAAE,KAAK,KAAA,EAAE,OAAO,KAAA,gBAEvD;AAED,qBAAa,eAAgB,SAAQ,EAAE,CAAC,MAAM;IAC5C,OAAO,EAAE,GAAG,CAAA;IACZ,QAAQ,EAAE,WAAW,CAAA;IACrB,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAA;IACtB,OAAO,MAAA;IACP,gBAAgB,EAAE,KAAK,CAAA;gBACX,MAAM,KAAA;IAgClB,cAAc;IAmBd,aAAa;IASb,MAAM;CAMP"}
1
+ {"version":3,"file":"PixiSpineSprite.d.ts","sourceRoot":"","sources":["../../src/spine/PixiSpineSprite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iCAAiC,CAAA;AACvD,OAAO,EAAE,WAAW,EAAU,MAAM,SAAS,CAAA;AAE7C,wBAAgB,eAAe,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE;;;;CAAA,gBAE3D;AAED,qBAAa,eAAgB,SAAQ,EAAE,CAAC,MAAM;IAC5C,OAAO,EAAE,GAAG,CAAA;IACZ,QAAQ,EAAE,WAAW,CAAA;IACrB,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAA;IACtB,OAAO,MAAA;IACP,gBAAgB,EAAE,KAAK,CAAA;gBACX,MAAM,KAAA;IA4BlB,WAAW;IAsBX,aAAa;IAUb,MAAM;CAMP"}
@@ -1,6 +1,6 @@
1
1
  import { Spine } from '@esotericsoftware/spine-pixi-v8';
2
2
  import { Application, Assets } from 'pixi.js';
3
- export function loadSpineAssets(skeleton, atlas, texture) {
3
+ export function loadSpineAssets({ skeleton, atlas, texture }) {
4
4
  return Assets.load([skeleton, atlas, texture]);
5
5
  }
6
6
  export class PixiSpineSprite extends cc.Sprite {
@@ -12,7 +12,6 @@ export class PixiSpineSprite extends cc.Sprite {
12
12
  constructor(config) {
13
13
  super();
14
14
  super.ctor(); // always call this for compatibility with cocos2dx JS Javascript class system
15
- // this.scheduleUpdate()
16
15
  this._canvas = document.createElement('canvas');
17
16
  this._canvas.width = config.width || 1024;
18
17
  this._canvas.height = config.height || 1024;
@@ -32,37 +31,40 @@ export class PixiSpineSprite extends cc.Sprite {
32
31
  this._texture.handleLoadedTexture();
33
32
  this.initWithTexture(this._texture);
34
33
  this._config = config;
35
- this._armatureDisplay = null;
36
- this._setupArmature();
37
- // this.schedule(this.updateTexture, 1 / 30);
34
+ this._setupSpine();
38
35
  }
39
- _setupArmature() {
36
+ _setupSpine() {
40
37
  const { skeleton, atlas, loop, skin, timeScale, animationName } = this._config;
41
- const display = Spine.from({ skeleton, atlas });
38
+ // console.log('_setupSpine', this._config, Assets.get(this._config.texture))
39
+ const display = Spine.from({ skeleton, atlas, scale: timeScale });
42
40
  if (!display) {
43
- console.error('Cannot build armature:', skeleton);
41
+ console.error('Cannot build spine:', skeleton);
44
42
  return;
45
43
  }
46
44
  if (skin) {
47
- display.skeleton.setSkin(skin);
45
+ const skeletonData = display.skeleton.data;
46
+ const newSkin = skeletonData.findSkin(skin);
47
+ display.skeleton.setSkin(newSkin);
48
+ display.skeleton.setSlotsToSetupPose();
48
49
  }
49
- display.state.setAnimation(0, animationName, loop);
50
+ if (animationName)
51
+ display.state.setAnimation(0, animationName, loop);
50
52
  display.x = this._canvas.width / 2;
51
53
  display.y = this._canvas.height;
52
- display.state.timeScale = timeScale;
53
54
  this._pixiApp.stage.addChild(display);
54
55
  this._armatureDisplay = display;
55
56
  }
56
57
  updateTexture() {
57
- if (this._armatureDisplay && this._pixiApp.renderer) {
58
+ if (this._armatureDisplay && this._pixiApp.renderer && this._texture) {
58
59
  this._pixiApp.renderer.render(this._pixiApp.stage);
59
60
  this._texture.initWithElement(this._canvas);
60
61
  this._texture.handleLoadedTexture();
62
+ // console.log('updateTexture', this._texture.getPixelsHigh(), this._texture.getPixelsWide())
61
63
  this.setTexture(this._texture);
62
64
  }
63
65
  }
64
66
  onExit() {
65
- // this.unschedule(this.updateTexture);
67
+ // console.log('onExit')
66
68
  this._pixiApp.destroy(true, { children: true });
67
69
  this._canvas.remove();
68
70
  super.onExit();
@@ -0,0 +1,20 @@
1
+ import { BaseComponentProps, ComponentX } from '..';
2
+ import { PixiSpineSprite } from './PixiSpineSprite';
3
+ export interface SpineData {
4
+ atlas: string;
5
+ skeleton: string;
6
+ texture?: string;
7
+ }
8
+ interface SpineSkeletonProps {
9
+ data: SpineData;
10
+ skin?: string;
11
+ animation?: string;
12
+ timeScale?: number;
13
+ loop?: boolean;
14
+ }
15
+ export declare class SpineSkeleton extends ComponentX<SpineSkeletonProps & BaseComponentProps<SpineSkeleton>, cc.Node> {
16
+ spine: PixiSpineSprite;
17
+ setAnimation(name: string, loop?: boolean): void;
18
+ }
19
+ export {};
20
+ //# sourceMappingURL=SpineSkeleton.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"SpineSkeleton.d.ts","sourceRoot":"","sources":["../../src/spine/SpineSkeleton.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAU,MAAM,IAAI,CAAA;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAEnD,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,UAAU,kBAAkB;IAC1B,IAAI,EAAE,SAAS,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,OAAO,CAAA;CACf;AACD,qBAAa,aAAc,SAAQ,UAAU,CAAC,kBAAkB,GAAG,kBAAkB,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC;IAC5G,KAAK,EAAE,eAAe,CAAA;IAEtB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,UAAO;CAYvC"}
@@ -0,0 +1,11 @@
1
+ import { ComponentX, render } from '..';
2
+ export class SpineSkeleton extends ComponentX {
3
+ spine;
4
+ setAnimation(name, loop = true) {
5
+ const skel = this.spine;
6
+ if (skel._armatureDisplay.state.setAnimation) {
7
+ skel._armatureDisplay.state.setAnimation(0, name, loop);
8
+ }
9
+ }
10
+ }
11
+ Object.defineProperty(SpineSkeleton.prototype, 'render', { value: render });
@@ -0,0 +1,7 @@
1
+ import { EntityManager, EventManager, System } from 'entityx-ts';
2
+ export declare class SpineSystem implements System {
3
+ configure(event_manager: EventManager): void;
4
+ private onAddSpineSkeleton;
5
+ update(entities: EntityManager): void;
6
+ }
7
+ //# sourceMappingURL=SpineSystem.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"SpineSystem.d.ts","sourceRoot":"","sources":["../../src/spine/SpineSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAoC,MAAM,EAAE,MAAM,YAAY,CAAA;AAMlG,qBAAa,WAAY,YAAW,MAAM;IACxC,SAAS,CAAC,aAAa,EAAE,YAAY;IAGrC,OAAO,CAAC,kBAAkB,CAiBzB;IACD,MAAM,CAAC,QAAQ,EAAE,aAAa;CAS/B"}
@@ -0,0 +1,36 @@
1
+ import { EventTypes } from 'entityx-ts';
2
+ import { NodeComp } from '../core/NodeComp';
3
+ import { PixiSpineSprite } from './PixiSpineSprite';
4
+ import { SpineSkeleton } from './SpineSkeleton';
5
+ export class SpineSystem {
6
+ configure(event_manager) {
7
+ event_manager.subscribe(EventTypes.ComponentAdded, SpineSkeleton, this.onAddSpineSkeleton);
8
+ }
9
+ onAddSpineSkeleton = async ({ entity, component: spineComp }) => {
10
+ const { data, skin, animation, loop = true, timeScale = 1 } = spineComp.props;
11
+ const { atlas, skeleton, texture } = data;
12
+ // console.log('spineComp', data)
13
+ const spine = new PixiSpineSprite({
14
+ skeleton,
15
+ atlas,
16
+ texture,
17
+ animationName: animation,
18
+ loop,
19
+ skin,
20
+ timeScale,
21
+ });
22
+ const node = new cc.Node();
23
+ node.addChild(spine);
24
+ spineComp.spine = spine;
25
+ spineComp.node = entity.assign(new NodeComp(node, entity));
26
+ };
27
+ update(entities) {
28
+ const animations = entities.entities_with_components(SpineSkeleton);
29
+ animations.forEach((ett) => {
30
+ const spine = ett.getComponent(SpineSkeleton);
31
+ if (spine.node && spine.node.active) {
32
+ spine.spine.updateTexture();
33
+ }
34
+ });
35
+ }
36
+ }
@@ -1,26 +1,4 @@
1
- import { EntityManager, EventManager, System } from 'entityx-ts';
2
- import { BaseComponentProps, ComponentX } from '..';
3
- import { PixiSpineSprite } from './PixiSpineSprite';
4
- export interface SpineData {
5
- atlas: string;
6
- skeleton: string;
7
- texture?: string;
8
- }
9
- interface SpineSkeletonProps {
10
- data: SpineData;
11
- skin?: string;
12
- animation?: string;
13
- timeScale?: number;
14
- loop?: boolean;
15
- }
16
- export declare class SpineSkeleton extends ComponentX<SpineSkeletonProps & BaseComponentProps<SpineSkeleton>, PixiSpineSprite> {
17
- setAnimation(name: string, loop?: boolean): void;
18
- }
19
- export declare class SpineSystem implements System {
20
- configure(event_manager: EventManager): void;
21
- private onAddSpineSkeleton;
22
- update(entities: EntityManager): void;
23
- }
24
- export declare function setupSpine(): void;
25
1
  export * from './PixiSpineSprite';
2
+ export * from './SpineSkeleton';
3
+ export declare function setupSpine(): void;
26
4
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/spine/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAoC,MAAM,EAAE,MAAM,YAAY,CAAA;AAElG,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAA+B,MAAM,IAAI,CAAA;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAEnD,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,UAAU,kBAAkB;IAC1B,IAAI,EAAE,SAAS,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,OAAO,CAAA;CACf;AACD,qBAAa,aAAc,SAAQ,UAAU,CAAC,kBAAkB,GAAG,kBAAkB,CAAC,aAAa,CAAC,EAAE,eAAe,CAAC;IACpH,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,UAAQ;CAYxC;AAED,qBAAa,WAAY,YAAW,MAAM;IACxC,SAAS,CAAC,aAAa,EAAE,YAAY;IAGrC,OAAO,CAAC,kBAAkB,CAczB;IACD,MAAM,CAAC,QAAQ,EAAE,aAAa;CAS/B;AAGD,wBAAgB,UAAU,SAEzB;AACD,cAAc,mBAAmB,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/spine/index.ts"],"names":[],"mappings":"AAGA,cAAc,mBAAmB,CAAA;AACjC,cAAc,iBAAiB,CAAA;AAE/B,wBAAgB,UAAU,SAEzB"}
@@ -1,45 +1,7 @@
1
- import { EventTypes } from 'entityx-ts';
2
- import { ComponentX, GameWorld, NodeComp, render } from '..';
3
- import { PixiSpineSprite } from './PixiSpineSprite';
4
- export class SpineSkeleton extends ComponentX {
5
- setAnimation(name, loop = false) {
6
- const skel = this.node.instance;
7
- if (skel._armatureDisplay.state.setAnimation) {
8
- skel._armatureDisplay.state.setAnimation(0, name, loop);
9
- }
10
- }
11
- }
12
- export class SpineSystem {
13
- configure(event_manager) {
14
- event_manager.subscribe(EventTypes.ComponentAdded, SpineSkeleton, this.onAddSpineSkeleton);
15
- }
16
- onAddSpineSkeleton = async ({ entity, component: spineComp }) => {
17
- const { data, skin, animation, loop = true, timeScale = 1 } = spineComp.props;
18
- const { atlas, skeleton, texture } = data;
19
- // console.log('spineComp', data)
20
- const node = new PixiSpineSprite({
21
- skeleton,
22
- atlas,
23
- texture,
24
- animationName: animation,
25
- loop,
26
- skin,
27
- timeScale,
28
- });
29
- spineComp.node = entity.assign(new NodeComp(node, entity));
30
- };
31
- update(entities) {
32
- const animations = entities.entities_with_components(SpineSkeleton);
33
- animations.forEach((ett) => {
34
- const spine = ett.getComponent(SpineSkeleton);
35
- if (spine.node && spine.node.active) {
36
- spine.node.instance.updateTexture();
37
- }
38
- });
39
- }
40
- }
41
- Object.defineProperty(SpineSkeleton.prototype, 'render', { value: render });
1
+ import { GameWorld } from '..';
2
+ import { SpineSystem } from './SpineSystem';
3
+ export * from './PixiSpineSprite';
4
+ export * from './SpineSkeleton';
42
5
  export function setupSpine() {
43
6
  GameWorld.Instance.addSystemAndUpdate(SpineSystem);
44
7
  }
45
- export * from './PixiSpineSprite';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@safe-engine/cocos",
3
- "version": "2.2.6",
3
+ "version": "2.2.8",
4
4
  "description": "safe-engine with cocos renderer support",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
@@ -21,7 +21,7 @@
21
21
  "typescript": "^5.9.2"
22
22
  },
23
23
  "dependencies": {
24
- "@esotericsoftware/spine-pixi-v8": "^4.2.90",
24
+ "@esotericsoftware/spine-pixi-v8": "^4.2.92",
25
25
  "box2d-wasm": "^7.0.0",
26
26
  "cocos-html5-ts": "^1.2.2",
27
27
  "dragonbones-pixijs": "^1.0.5",