@eva/spine-base 1.2.2-mini.1 → 1.2.2

package/dist/EVA.plugin.spineBase.js

@@ -183,6 +183,23 @@ var _EVA_IIFE_spineBase = function (exports, eva_js, pluginRenderer, pixi_js) {
     }
   }
 
+  function __values(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator,
+        m = s && o[s],
+        i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+      next: function next() {
+        if (o && i >= o.length) o = void 0;
+        return {
+          value: o && o[i++],
+          done: !o
+        };
+      }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+  }
+
   function getIDEPropsPropertyObj(target, propertyKey) {
     if (!target.constructor.IDEProps) {
       target.constructor.IDEProps = {};
@@ -213,17 +230,59 @@ var _EVA_IIFE_spineBase = function (exports, eva_js, pluginRenderer, pixi_js) {
       _this.resource = '';
       _this.animationName = '';
       _this.autoPlay = true;
+      _this.waitExecuteInfos = [];
       return _this;
     }
 
+    Object.defineProperty(Spine.prototype, "armature", {
+      get: function get() {
+        return this._armature;
+      },
+      set: function set(val) {
+        var e_1, _a;
+
+        this._armature = val;
+        if (!val) return;
+
+        if (this.autoPlay) {
+          this.play(this.animationName);
+        }
+
+        try {
+          for (var _b = __values(this.waitExecuteInfos), _c = _b.next(); !_c.done; _c = _b.next()) {
+            var info = _c.value;
+
+            if (info.playType) {
+              var name_1 = info.name,
+                  loop = info.loop,
+                  track = info.track;
+              this.play(name_1, loop, track);
+            } else {
+              this.stop(info.track);
+            }
+          }
+        } catch (e_1_1) {
+          e_1 = {
+            error: e_1_1
+          };
+        } finally {
+          try {
+            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+          } finally {
+            if (e_1) throw e_1.error;
+          }
+        }
+
+        this.waitExecuteInfos = [];
+      },
+      enumerable: false,
+      configurable: true
+    });
+
     Spine.prototype.init = function (obj) {
       if (!obj) return;
 
       _extends(this, obj);
-
-      if (this.autoPlay) {
-        this.play(this.animationName);
-      }
     };
 
     Spine.prototype.onDestroy = function () {
@@ -234,7 +293,14 @@ var _EVA_IIFE_spineBase = function (exports, eva_js, pluginRenderer, pixi_js) {
       try {
         if (name) this.animationName = name;
 
-        if (!this.armature) {} else {
+        if (!this.armature) {
+          this.waitExecuteInfos.push({
+            playType: true,
+            name: name,
+            loop: loop,
+            track: track
+          });
+        } else {
           if (track === undefined) {
             track = 0;
           }
@@ -248,6 +314,10 @@ var _EVA_IIFE_spineBase = function (exports, eva_js, pluginRenderer, pixi_js) {
 
     Spine.prototype.stop = function (track) {
       if (!this.armature) {
+        this.waitExecuteInfos.push({
+          playType: false,
+          track: track
+        });
         return;
       }
 
@@ -536,24 +606,26 @@ var _EVA_IIFE_spineBase = function (exports, eva_js, pluginRenderer, pixi_js) {
     };
 
     SpineSystem.prototype.add = function (changed, count) {
+      var _a, _b;
+
       return __awaiter(this, void 0, void 0, function () {
         var component, res, spineData, container, armature, tran;
 
         var _this = this;
 
-        return __generator(this, function (_a) {
-          switch (_a.label) {
+        return __generator(this, function (_c) {
+          switch (_c.label) {
             case 0:
               component = changed.component;
               clearTimeout(component.addHandler);
               return [4, eva_js.resource.getResource(component.resource)];
 
             case 1:
-              res = _a.sent();
+              res = _c.sent();
               return [4, getSpineData(res, this.pixiSpine)];
 
             case 2:
-              spineData = _a.sent();
+              spineData = _c.sent();
 
               if (!spineData) {
                 component.addHandler = setTimeout(function () {
@@ -575,7 +647,7 @@ var _EVA_IIFE_spineBase = function (exports, eva_js, pluginRenderer, pixi_js) {
               }
 
               this.remove(changed);
-              container = this.renderSystem.containerManager.getContainer(changed.gameObject.id);
+              container = (_b = (_a = this.renderSystem) === null || _a === void 0 ? void 0 : _a.containerManager) === null || _b === void 0 ? void 0 : _b.getContainer(changed.gameObject.id);
 
               if (!container) {
                 return [2];
@@ -595,15 +667,6 @@ var _EVA_IIFE_spineBase = function (exports, eva_js, pluginRenderer, pixi_js) {
               armature.update();
               armature.updateTransform();
               component.armature = armature;
-
-              if (component.autoPlay) {
-                try {
-                  armature.state.setAnimation(0, component.animationName, true);
-                } catch (e) {
-                  console.log(e);
-                }
-              }
-
               component.emit('loaded', {
                 resource: component.resource
               });
@@ -648,17 +711,17 @@ var _EVA_IIFE_spineBase = function (exports, eva_js, pluginRenderer, pixi_js) {
     };
 
     SpineSystem.prototype.remove = function (changed) {
-      var _a, _b;
+      var _a, _b, _c, _d;
 
       return __awaiter(this, void 0, void 0, function () {
         var component, armature, container, res;
-        return __generator(this, function (_c) {
-          switch (_c.label) {
+        return __generator(this, function (_e) {
+          switch (_e.label) {
             case 0:
               component = changed.component;
               clearTimeout(component.addHandler);
               armature = this.armatures[changed.gameObject.id];
-              container = this.renderSystem.containerManager.getContainer(changed.gameObject.id);
+              container = (_b = (_a = this.renderSystem) === null || _a === void 0 ? void 0 : _a.containerManager) === null || _b === void 0 ? void 0 : _b.getContainer(changed.gameObject.id);
 
               if (container && armature) {
                 container.removeChild(armature);
@@ -671,9 +734,9 @@ var _EVA_IIFE_spineBase = function (exports, eva_js, pluginRenderer, pixi_js) {
               return [4, eva_js.resource.getResource(component.lastResource)];
 
             case 1:
-              res = _c.sent();
-              releaseSpineData(res.name, (_b = (_a = res.data) === null || _a === void 0 ? void 0 : _a.image) === null || _b === void 0 ? void 0 : _b.src);
-              _c.label = 2;
+              res = _e.sent();
+              releaseSpineData(res.name, (_d = (_c = res.data) === null || _c === void 0 ? void 0 : _c.image) === null || _d === void 0 ? void 0 : _d.src);
+              _e.label = 2;
 
             case 2:
               component.armature = null;

package/dist/EVA.plugin.spineBase.min.js

@@ -1 +1 @@
-function _extends(){return(_extends=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(t[r]=n[r])}return t}).apply(this,arguments)}var _EVA_IIFE_spineBase=function(t,e,n,r){"use strict";var o=function(t,e){return(o=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])})(t,e)};function a(t,e){function n(){this.constructor=t}o(t,e),t.prototype=null===e?Object.create(e):(n.prototype=e.prototype,new n)}function i(t,e,n,r){var o,a=arguments.length,i=a<3?e:null===r?r=Object.getOwnPropertyDescriptor(e,n):r;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)i=Reflect.decorate(t,e,n,r);else for(var s=t.length-1;s>=0;s--)(o=t[s])&&(i=(a<3?o(i):a>3?o(e,n,i):o(e,n))||i);return a>3&&i&&Object.defineProperty(e,n,i),i}function s(t,e,n,r){return new(n||(n=Promise))((function(o,a){function i(t){try{c(r.next(t))}catch(t){a(t)}}function s(t){try{c(r.throw(t))}catch(t){a(t)}}function c(t){var e;t.done?o(t.value):(e=t.value,e instanceof n?e:new n((function(t){t(e)}))).then(i,s)}c((r=r.apply(t,e||[])).next())}))}function c(t,e){var n,r,o,a,i={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(a){return function(s){return function(a){if(n)throw new TypeError("Generator is already executing.");for(;i;)try{if(n=1,r&&(o=2&a[0]?r.return:a[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,a[1])).done)return o;switch(r=0,o&&(a=[2&a[0],o.value]),a[0]){case 0:case 1:o=a;break;case 4:return i.label++,{value:a[1],done:!1};case 5:i.label++,r=a[1],a=[0];continue;case 7:a=i.ops.pop(),i.trys.pop();continue;default:if(!(o=i.trys,(o=o.length>0&&o[o.length-1])||6!==a[0]&&2!==a[0])){i=0;continue}if(3===a[0]&&(!o||a[1]>o[0]&&a[1]<o[3])){i.label=a[1];break}if(6===a[0]&&i.label<o[1]){i.label=o[1],o=a;break}if(o&&i.label<o[2]){i.label=o[2],i.ops.push(a);break}o[2]&&i.ops.pop(),i.trys.pop();continue}a=e.call(t,i)}catch(t){a=[6,t],r=0}finally{n=o=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}([a,s])}}}function u(t){return function(e,n){var r=function(t,e){return t.constructor.IDEProps||(t.constructor.IDEProps={}),t.constructor.IDEProps[e]||(t.constructor.IDEProps[e]={}),t.constructor.IDEProps[e]}(e,n);r.key=n,r.type=t}}var m=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.resource="",e.animationName="",e.autoPlay=!0,e}return a(e,t),e.prototype.init=function(t){t&&(_extends(this,t),this.autoPlay&&this.play(this.animationName))},e.prototype.onDestroy=function(){this.destroied=!0},e.prototype.play=function(t,e,n){try{t&&(this.animationName=t),this.armature&&(void 0===n&&(n=0),this.armature.state.setAnimation(n,this.animationName,e))}catch(t){console.log(t)}},e.prototype.stop=function(t){this.armature&&(void 0===t&&(t=0),this.armature.state.setEmptyAnimation(t,0))},e.prototype.addAnimation=function(t,e,n,r){try{this.armature&&(void 0===r&&(r=0),this.armature.state.addAnimation(r,t,n,e))}catch(t){console.log(t)}},e.prototype.setMix=function(t,e,n){this.armature&&this.armature.stateData.setMix(t,e,n)},e.prototype.getAnim=function(t){void 0===t&&(t=0);try{if(this.armature)return this.armature.state.tracks[t].animation.name}catch(t){console.log(t)}},e.prototype.setDefaultMix=function(t){this.armature&&(this.armature.stateData.defaultMix=t)},e.prototype.setAttachment=function(t,e){this.armature&&this.armature.skeleton.setAttachment(t,e)},e.prototype.getBone=function(t){if(this.armature)return this.armature.skeleton.findBone(t)},e.componentName="Spine",i([u("string")],e.prototype,"resource",void 0),i([u("string")],e.prototype,"animationName",void 0),i([u("boolean")],e.prototype,"autoPlay",void 0),e}(e.Component),p={};function f(t){var e=t.image;return{tex:r.Texture.from(e),count:0}}var l={};function d(t,e,n,r){var o=null,a=function(t,e){var n=p[t];return n||(n=f(e),p[t]=n),n.tex}(e.image.src,e);new r.core.TextureAtlas(e.atlas,(function(t,e){e(a.baseTexture)}),(function(t){if(t){var a=new r.core.AtlasAttachmentLoader(t),i=new r.core.SkeletonJson(a);n&&(i.scale=n),o=i.readSkeletonData(e.ske)}}));var i={spineData:o,ref:0,imageSrc:e.image.src};return l[t]=i,i}function h(t,e){return s(this,void 0,void 0,(function(){var n;return c(this,(function(r){if(!(n=l[t.name]))if(t.complete)n=d(t.name,t.data,t.scale,e);else if(!n)return[2];return function(t,e){var n=p[t];n||(n=f(e),p[t]=n),n.count++,n.tex}(t.data.image.src,t.data),n.ref++,[2,n.spineData]}))}))}function y(t,e){var n=l[t];n&&(n.ref--,n.ref<=0&&(!function(t){t&&setTimeout((function(){var e=p[t];e&&(e.count--,e.count<=0&&(e.tex&&(e.tex.destroy(!0),e.tex=null),delete p[t]))}),100)}(e),delete l[t]))}var v=function(t){function r(){var e=null!==t&&t.apply(this,arguments)||this;return e.armatures={},e}return a(r,t),r.prototype.init=function(t){var r=this,o=t.pixiSpine;this.renderSystem=this.game.getSystem(n.RendererSystem),this.renderSystem.rendererManager.register(this),this.pixiSpine=o,this.game.canvas.addEventListener("webglcontextrestored",(function(){var t=r.game.gameObjects,n=[];for(var o in r.armatures)for(var a=+o,i=0;i<t.length;++i){var s=t[i];if(s.id===a){var c=s.getComponent(m);c&&(r.remove({type:e.OBSERVER_TYPE.REMOVE,gameObject:s,component:c,componentName:m.componentName}),n.push({type:e.OBSERVER_TYPE.ADD,gameObject:s,component:c,componentName:m.componentName}));break}}setTimeout((function(){n.forEach((function(t){r.add(t)}))}),1e3)}),!1)},r.prototype.update=function(e){for(var n in this.armatures)this.armatures[n].update(.001*e.deltaTime),this.armatures[n].updateTransform();t.prototype.update.call(this)},r.prototype.componentChanged=function(t){return s(this,void 0,void 0,(function(){return c(this,(function(n){if("Spine"===t.componentName)if(t.type===e.OBSERVER_TYPE.ADD)this.add(t);else if(t.type===e.OBSERVER_TYPE.CHANGE)switch(t.prop.prop[0]){case"resource":this.change(t)}else t.type===e.OBSERVER_TYPE.REMOVE&&this.remove(t);return[2]}))}))},r.prototype.add=function(t,n){return s(this,void 0,void 0,(function(){var r,o,a,i,s,u=this;return c(this,(function(c){switch(c.label){case 0:return r=t.component,clearTimeout(r.addHandler),[4,e.resource.getResource(r.resource)];case 1:return[4,h(c.sent(),this.pixiSpine)];case 2:if(!(o=c.sent()))return r.addHandler=setTimeout((function(){r.destroied||(void 0===n&&(n=20),--n>0?u.add(t,n):console.log("retry exceed max times",r.resource))}),1e3),[2];if(this.remove(t),!(a=this.renderSystem.containerManager.getContainer(t.gameObject.id)))return[2];if(r.lastResource=r.resource,i=new this.pixiSpine.Spine(o),this.armatures[t.gameObject.id]=i,t.gameObject&&t.gameObject.transform&&(s=t.gameObject.transform,i.x=s.size.width*s.origin.x,i.y=s.size.height*s.origin.y),a.addChildAt(i,0),i.update(),i.updateTransform(),r.armature=i,r.autoPlay)try{i.state.setAnimation(0,r.animationName,!0)}catch(t){console.log(t)}return r.emit("loaded",{resource:r.resource}),i.state.addListener({start:function(t,e){r.emit("start",{track:t,name:t.animation.name})},complete:function(t,e){r.emit("complete",{track:t,name:t.animation.name})},interrupt:function(t,e){r.emit("interrupt",{track:t,name:t.animation.name})},end:function(t,e){r.emit("end",{track:t,name:t.animation.name})},event:function(t,e){r.emit("event",t,e)}}),[2]}}))}))},r.prototype.change=function(t){this.remove(t),this.add(t)},r.prototype.remove=function(t){var n,r;return s(this,void 0,void 0,(function(){var o,a,i,s;return c(this,(function(c){switch(c.label){case 0:return o=t.component,clearTimeout(o.addHandler),a=this.armatures[t.gameObject.id],(i=this.renderSystem.containerManager.getContainer(t.gameObject.id))&&a&&i.removeChild(a),o.armature?(o.armature.destroy({children:!0}),[4,e.resource.getResource(o.lastResource)]):[3,2];case 1:y((s=c.sent()).name,null===(r=null===(n=s.data)||void 0===n?void 0:n.image)||void 0===r?void 0:r.src),c.label=2;case 2:return o.armature=null,delete this.armatures[t.gameObject.id],t.type,e.OBSERVER_TYPE.CHANGE,[2]}}))}))},r.systemName="SpineSystem",r=i([e.decorators.componentObserver({Spine:["resource"]})],r)}(n.Renderer);return e.resource.registerResourceType("SPINE"),t.Spine=m,t.SpineSystem=v,Object.defineProperty(t,"__esModule",{value:!0}),t}({},EVA,EVA.plugin.renderer,PIXI);
+function _extends(){return(_extends=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var r=arguments[e];for(var n in r)Object.prototype.hasOwnProperty.call(r,n)&&(t[n]=r[n])}return t}).apply(this,arguments)}var _EVA_IIFE_spineBase=function(t,e,r,n){"use strict";var o=function(t,e){return(o=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var r in e)e.hasOwnProperty(r)&&(t[r]=e[r])})(t,e)};function a(t,e){function r(){this.constructor=t}o(t,e),t.prototype=null===e?Object.create(e):(r.prototype=e.prototype,new r)}function i(t,e,r,n){var o,a=arguments.length,i=a<3?e:null===n?n=Object.getOwnPropertyDescriptor(e,r):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)i=Reflect.decorate(t,e,r,n);else for(var u=t.length-1;u>=0;u--)(o=t[u])&&(i=(a<3?o(i):a>3?o(e,r,i):o(e,r))||i);return a>3&&i&&Object.defineProperty(e,r,i),i}function u(t,e,r,n){return new(r||(r=Promise))((function(o,a){function i(t){try{s(n.next(t))}catch(t){a(t)}}function u(t){try{s(n.throw(t))}catch(t){a(t)}}function s(t){var e;t.done?o(t.value):(e=t.value,e instanceof r?e:new r((function(t){t(e)}))).then(i,u)}s((n=n.apply(t,e||[])).next())}))}function s(t,e){var r,n,o,a,i={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return a={next:u(0),throw:u(1),return:u(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function u(a){return function(u){return function(a){if(r)throw new TypeError("Generator is already executing.");for(;i;)try{if(r=1,n&&(o=2&a[0]?n.return:a[0]?n.throw||((o=n.return)&&o.call(n),0):n.next)&&!(o=o.call(n,a[1])).done)return o;switch(n=0,o&&(a=[2&a[0],o.value]),a[0]){case 0:case 1:o=a;break;case 4:return i.label++,{value:a[1],done:!1};case 5:i.label++,n=a[1],a=[0];continue;case 7:a=i.ops.pop(),i.trys.pop();continue;default:if(!(o=i.trys,(o=o.length>0&&o[o.length-1])||6!==a[0]&&2!==a[0])){i=0;continue}if(3===a[0]&&(!o||a[1]>o[0]&&a[1]<o[3])){i.label=a[1];break}if(6===a[0]&&i.label<o[1]){i.label=o[1],o=a;break}if(o&&i.label<o[2]){i.label=o[2],i.ops.push(a);break}o[2]&&i.ops.pop(),i.trys.pop();continue}a=e.call(t,i)}catch(t){a=[6,t],n=0}finally{r=o=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}([a,u])}}}function c(t){return function(e,r){var n=function(t,e){return t.constructor.IDEProps||(t.constructor.IDEProps={}),t.constructor.IDEProps[e]||(t.constructor.IDEProps[e]={}),t.constructor.IDEProps[e]}(e,r);n.key=r,n.type=t}}var p=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.resource="",e.animationName="",e.autoPlay=!0,e.waitExecuteInfos=[],e}return a(e,t),Object.defineProperty(e.prototype,"armature",{get:function(){return this._armature},set:function(t){var e,r;if(this._armature=t,t){this.autoPlay&&this.play(this.animationName);try{for(var n=function(t){var e="function"==typeof Symbol&&Symbol.iterator,r=e&&t[e],n=0;if(r)return r.call(t);if(t&&"number"==typeof t.length)return{next:function(){return t&&n>=t.length&&(t=void 0),{value:t&&t[n++],done:!t}}};throw new TypeError(e?"Object is not iterable.":"Symbol.iterator is not defined.")}(this.waitExecuteInfos),o=n.next();!o.done;o=n.next()){var a=o.value;if(a.playType){var i=a.name,u=a.loop,s=a.track;this.play(i,u,s)}else this.stop(a.track)}}catch(t){e={error:t}}finally{try{o&&!o.done&&(r=n.return)&&r.call(n)}finally{if(e)throw e.error}}this.waitExecuteInfos=[]}},enumerable:!1,configurable:!0}),e.prototype.init=function(t){t&&_extends(this,t)},e.prototype.onDestroy=function(){this.destroied=!0},e.prototype.play=function(t,e,r){try{t&&(this.animationName=t),this.armature?(void 0===r&&(r=0),this.armature.state.setAnimation(r,this.animationName,e)):this.waitExecuteInfos.push({playType:!0,name:t,loop:e,track:r})}catch(t){console.log(t)}},e.prototype.stop=function(t){this.armature?(void 0===t&&(t=0),this.armature.state.setEmptyAnimation(t,0)):this.waitExecuteInfos.push({playType:!1,track:t})},e.prototype.addAnimation=function(t,e,r,n){try{this.armature&&(void 0===n&&(n=0),this.armature.state.addAnimation(n,t,r,e))}catch(t){console.log(t)}},e.prototype.setMix=function(t,e,r){this.armature&&this.armature.stateData.setMix(t,e,r)},e.prototype.getAnim=function(t){void 0===t&&(t=0);try{if(this.armature)return this.armature.state.tracks[t].animation.name}catch(t){console.log(t)}},e.prototype.setDefaultMix=function(t){this.armature&&(this.armature.stateData.defaultMix=t)},e.prototype.setAttachment=function(t,e){this.armature&&this.armature.skeleton.setAttachment(t,e)},e.prototype.getBone=function(t){if(this.armature)return this.armature.skeleton.findBone(t)},e.componentName="Spine",i([c("string")],e.prototype,"resource",void 0),i([c("string")],e.prototype,"animationName",void 0),i([c("boolean")],e.prototype,"autoPlay",void 0),e}(e.Component),l={};function m(t){var e=t.image;return{tex:n.Texture.from(e),count:0}}var f={};function d(t,e,r,n){var o=null,a=function(t,e){var r=l[t];return r||(r=m(e),l[t]=r),r.tex}(e.image.src,e);new n.core.TextureAtlas(e.atlas,(function(t,e){e(a.baseTexture)}),(function(t){if(t){var a=new n.core.AtlasAttachmentLoader(t),i=new n.core.SkeletonJson(a);r&&(i.scale=r),o=i.readSkeletonData(e.ske)}}));var i={spineData:o,ref:0,imageSrc:e.image.src};return f[t]=i,i}function h(t,e){return u(this,void 0,void 0,(function(){var r;return s(this,(function(n){if(!(r=f[t.name]))if(t.complete)r=d(t.name,t.data,t.scale,e);else if(!r)return[2];return function(t,e){var r=l[t];r||(r=m(e),l[t]=r),r.count++,r.tex}(t.data.image.src,t.data),r.ref++,[2,r.spineData]}))}))}function y(t,e){var r=f[t];r&&(r.ref--,r.ref<=0&&(!function(t){t&&setTimeout((function(){var e=l[t];e&&(e.count--,e.count<=0&&(e.tex&&(e.tex.destroy(!0),e.tex=null),delete l[t]))}),100)}(e),delete f[t]))}var v=function(t){function n(){var e=null!==t&&t.apply(this,arguments)||this;return e.armatures={},e}return a(n,t),n.prototype.init=function(t){var n=this,o=t.pixiSpine;this.renderSystem=this.game.getSystem(r.RendererSystem),this.renderSystem.rendererManager.register(this),this.pixiSpine=o,this.game.canvas.addEventListener("webglcontextrestored",(function(){var t=n.game.gameObjects,r=[];for(var o in n.armatures)for(var a=+o,i=0;i<t.length;++i){var u=t[i];if(u.id===a){var s=u.getComponent(p);s&&(n.remove({type:e.OBSERVER_TYPE.REMOVE,gameObject:u,component:s,componentName:p.componentName}),r.push({type:e.OBSERVER_TYPE.ADD,gameObject:u,component:s,componentName:p.componentName}));break}}setTimeout((function(){r.forEach((function(t){n.add(t)}))}),1e3)}),!1)},n.prototype.update=function(e){for(var r in this.armatures)this.armatures[r].update(.001*e.deltaTime),this.armatures[r].updateTransform();t.prototype.update.call(this)},n.prototype.componentChanged=function(t){return u(this,void 0,void 0,(function(){return s(this,(function(r){if("Spine"===t.componentName)if(t.type===e.OBSERVER_TYPE.ADD)this.add(t);else if(t.type===e.OBSERVER_TYPE.CHANGE)switch(t.prop.prop[0]){case"resource":this.change(t)}else t.type===e.OBSERVER_TYPE.REMOVE&&this.remove(t);return[2]}))}))},n.prototype.add=function(t,r){var n,o;return u(this,void 0,void 0,(function(){var a,i,u,c,p,l=this;return s(this,(function(s){switch(s.label){case 0:return a=t.component,clearTimeout(a.addHandler),[4,e.resource.getResource(a.resource)];case 1:return[4,h(s.sent(),this.pixiSpine)];case 2:return(i=s.sent())?(this.remove(t),(u=null===(o=null===(n=this.renderSystem)||void 0===n?void 0:n.containerManager)||void 0===o?void 0:o.getContainer(t.gameObject.id))?(a.lastResource=a.resource,c=new this.pixiSpine.Spine(i),this.armatures[t.gameObject.id]=c,t.gameObject&&t.gameObject.transform&&(p=t.gameObject.transform,c.x=p.size.width*p.origin.x,c.y=p.size.height*p.origin.y),u.addChildAt(c,0),c.update(),c.updateTransform(),a.armature=c,a.emit("loaded",{resource:a.resource}),c.state.addListener({start:function(t,e){a.emit("start",{track:t,name:t.animation.name})},complete:function(t,e){a.emit("complete",{track:t,name:t.animation.name})},interrupt:function(t,e){a.emit("interrupt",{track:t,name:t.animation.name})},end:function(t,e){a.emit("end",{track:t,name:t.animation.name})},event:function(t,e){a.emit("event",t,e)}}),[2]):[2]):(a.addHandler=setTimeout((function(){a.destroied||(void 0===r&&(r=20),--r>0?l.add(t,r):console.log("retry exceed max times",a.resource))}),1e3),[2])}}))}))},n.prototype.change=function(t){this.remove(t),this.add(t)},n.prototype.remove=function(t){var r,n,o,a;return u(this,void 0,void 0,(function(){var i,u,c,p;return s(this,(function(s){switch(s.label){case 0:return i=t.component,clearTimeout(i.addHandler),u=this.armatures[t.gameObject.id],(c=null===(n=null===(r=this.renderSystem)||void 0===r?void 0:r.containerManager)||void 0===n?void 0:n.getContainer(t.gameObject.id))&&u&&c.removeChild(u),i.armature?(i.armature.destroy({children:!0}),[4,e.resource.getResource(i.lastResource)]):[3,2];case 1:y((p=s.sent()).name,null===(a=null===(o=p.data)||void 0===o?void 0:o.image)||void 0===a?void 0:a.src),s.label=2;case 2:return i.armature=null,delete this.armatures[t.gameObject.id],t.type,e.OBSERVER_TYPE.CHANGE,[2]}}))}))},n.systemName="SpineSystem",n=i([e.decorators.componentObserver({Spine:["resource"]})],n)}(r.Renderer);return e.resource.registerResourceType("SPINE"),t.Spine=p,t.SpineSystem=v,Object.defineProperty(t,"__esModule",{value:!0}),t}({},EVA,EVA.plugin.renderer,PIXI);

package/dist/miniprogram.js

@@ -1,7 +1,7 @@
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 import { Component, OBSERVER_TYPE, resource, decorators } from '@eva/eva.js/dist/miniprogram';
-import { __extends, __decorate, __awaiter, __generator } from 'tslib';
+import { __extends, __values, __decorate, __awaiter, __generator } from 'tslib';
 import { RendererSystem, Renderer } from '@eva/plugin-renderer/dist/miniprogram';
 import { type } from '@eva/inspector-decorator';
 import { Texture } from '@eva/miniprogram-pixi';
@@ -15,17 +15,59 @@ var Spine = function (_super) {
     _this.resource = '';
     _this.animationName = '';
     _this.autoPlay = true;
+    _this.waitExecuteInfos = [];
     return _this;
   }
 
+  Object.defineProperty(Spine.prototype, "armature", {
+    get: function get() {
+      return this._armature;
+    },
+    set: function set(val) {
+      var e_1, _a;
+
+      this._armature = val;
+      if (!val) return;
+
+      if (this.autoPlay) {
+        this.play(this.animationName);
+      }
+
+      try {
+        for (var _b = __values(this.waitExecuteInfos), _c = _b.next(); !_c.done; _c = _b.next()) {
+          var info = _c.value;
+
+          if (info.playType) {
+            var name_1 = info.name,
+                loop = info.loop,
+                track = info.track;
+            this.play(name_1, loop, track);
+          } else {
+            this.stop(info.track);
+          }
+        }
+      } catch (e_1_1) {
+        e_1 = {
+          error: e_1_1
+        };
+      } finally {
+        try {
+          if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+        } finally {
+          if (e_1) throw e_1.error;
+        }
+      }
+
+      this.waitExecuteInfos = [];
+    },
+    enumerable: false,
+    configurable: true
+  });
+
   Spine.prototype.init = function (obj) {
     if (!obj) return;
 
     _extends(this, obj);
-
-    if (this.autoPlay) {
-      this.play(this.animationName);
-    }
   };
 
   Spine.prototype.onDestroy = function () {
@@ -36,7 +78,14 @@ var Spine = function (_super) {
     try {
       if (name) this.animationName = name;
 
-      if (!this.armature) {} else {
+      if (!this.armature) {
+        this.waitExecuteInfos.push({
+          playType: true,
+          name: name,
+          loop: loop,
+          track: track
+        });
+      } else {
         if (track === undefined) {
           track = 0;
         }
@@ -50,6 +99,10 @@ var Spine = function (_super) {
 
   Spine.prototype.stop = function (track) {
     if (!this.armature) {
+      this.waitExecuteInfos.push({
+        playType: false,
+        track: track
+      });
       return;
     }
 
@@ -338,24 +391,26 @@ var SpineSystem = function (_super) {
   };
 
   SpineSystem.prototype.add = function (changed, count) {
+    var _a, _b;
+
     return __awaiter(this, void 0, void 0, function () {
       var component, res, spineData, container, armature, tran;
 
       var _this = this;
 
-      return __generator(this, function (_a) {
-        switch (_a.label) {
+      return __generator(this, function (_c) {
+        switch (_c.label) {
           case 0:
             component = changed.component;
             clearTimeout(component.addHandler);
             return [4, resource.getResource(component.resource)];
 
           case 1:
-            res = _a.sent();
+            res = _c.sent();
             return [4, getSpineData(res, this.pixiSpine)];
 
           case 2:
-            spineData = _a.sent();
+            spineData = _c.sent();
 
             if (!spineData) {
               component.addHandler = setTimeout(function () {
@@ -377,7 +432,7 @@ var SpineSystem = function (_super) {
             }
 
             this.remove(changed);
-            container = this.renderSystem.containerManager.getContainer(changed.gameObject.id);
+            container = (_b = (_a = this.renderSystem) === null || _a === void 0 ? void 0 : _a.containerManager) === null || _b === void 0 ? void 0 : _b.getContainer(changed.gameObject.id);
 
             if (!container) {
               return [2];
@@ -397,15 +452,6 @@ var SpineSystem = function (_super) {
             armature.update();
             armature.updateTransform();
             component.armature = armature;
-
-            if (component.autoPlay) {
-              try {
-                armature.state.setAnimation(0, component.animationName, true);
-              } catch (e) {
-                console.log(e);
-              }
-            }
-
             component.emit('loaded', {
               resource: component.resource
             });
@@ -450,17 +496,17 @@ var SpineSystem = function (_super) {
   };
 
   SpineSystem.prototype.remove = function (changed) {
-    var _a, _b;
+    var _a, _b, _c, _d;
 
     return __awaiter(this, void 0, void 0, function () {
       var component, armature, container, res;
-      return __generator(this, function (_c) {
-        switch (_c.label) {
+      return __generator(this, function (_e) {
+        switch (_e.label) {
           case 0:
             component = changed.component;
             clearTimeout(component.addHandler);
             armature = this.armatures[changed.gameObject.id];
-            container = this.renderSystem.containerManager.getContainer(changed.gameObject.id);
+            container = (_b = (_a = this.renderSystem) === null || _a === void 0 ? void 0 : _a.containerManager) === null || _b === void 0 ? void 0 : _b.getContainer(changed.gameObject.id);
 
             if (container && armature) {
               container.removeChild(armature);
@@ -473,9 +519,9 @@ var SpineSystem = function (_super) {
             return [4, resource.getResource(component.lastResource)];
 
           case 1:
-            res = _c.sent();
-            releaseSpineData(res.name, (_b = (_a = res.data) === null || _a === void 0 ? void 0 : _a.image) === null || _b === void 0 ? void 0 : _b.src);
-            _c.label = 2;
+            res = _e.sent();
+            releaseSpineData(res.name, (_d = (_c = res.data) === null || _c === void 0 ? void 0 : _c.image) === null || _d === void 0 ? void 0 : _d.src);
+            _e.label = 2;
 
           case 2:
             component.armature = null;

package/dist/spine-base.cjs.js

@@ -78,6 +78,17 @@ function __generator(thisArg, body) {
         } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
+}
+
+function __values(o) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+    if (m) return m.call(o);
+    return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
 }
 
 var Spine = (function (_super) {
@@ -87,15 +98,49 @@ var Spine = (function (_super) {
         _this.resource = '';
         _this.animationName = '';
         _this.autoPlay = true;
+        _this.waitExecuteInfos = [];
         return _this;
     }
+    Object.defineProperty(Spine.prototype, "armature", {
+        get: function () {
+            return this._armature;
+        },
+        set: function (val) {
+            var e_1, _a;
+            this._armature = val;
+            if (!val)
+                return;
+            if (this.autoPlay) {
+                this.play(this.animationName);
+            }
+            try {
+                for (var _b = __values(this.waitExecuteInfos), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var info = _c.value;
+                    if (info.playType) {
+                        var name_1 = info.name, loop = info.loop, track = info.track;
+                        this.play(name_1, loop, track);
+                    }
+                    else {
+                        this.stop(info.track);
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            this.waitExecuteInfos = [];
+        },
+        enumerable: false,
+        configurable: true
+    });
     Spine.prototype.init = function (obj) {
         if (!obj)
             return;
         Object.assign(this, obj);
-        if (this.autoPlay) {
-            this.play(this.animationName);
-        }
     };
     Spine.prototype.onDestroy = function () {
         this.destroied = true;
@@ -105,6 +150,12 @@ var Spine = (function (_super) {
             if (name)
                 this.animationName = name;
             if (!this.armature) {
+                this.waitExecuteInfos.push({
+                    playType: true,
+                    name: name,
+                    loop: loop,
+                    track: track
+                });
             }
             else {
                 if (track === undefined) {
@@ -119,6 +170,10 @@ var Spine = (function (_super) {
     };
     Spine.prototype.stop = function (track) {
         if (!this.armature) {
+            this.waitExecuteInfos.push({
+                playType: false,
+                track: track
+            });
             return;
         }
         if (track === undefined) {
@@ -364,20 +419,21 @@ var SpineSystem = (function (_super) {
         });
     };
     SpineSystem.prototype.add = function (changed, count) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
             var component, res, spineData, container, armature, tran;
             var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         component = changed.component;
                         clearTimeout(component.addHandler);
                         return [4, eva_js.resource.getResource(component.resource)];
                     case 1:
-                        res = _a.sent();
+                        res = _c.sent();
                         return [4, getSpineData(res, this.pixiSpine)];
                     case 2:
-                        spineData = _a.sent();
+                        spineData = _c.sent();
                         if (!spineData) {
                             component.addHandler = setTimeout(function () {
                                 if (!component.destroied) {
@@ -396,7 +452,7 @@ var SpineSystem = (function (_super) {
                             return [2];
                         }
                         this.remove(changed);
-                        container = this.renderSystem.containerManager.getContainer(changed.gameObject.id);
+                        container = (_b = (_a = this.renderSystem) === null || _a === void 0 ? void 0 : _a.containerManager) === null || _b === void 0 ? void 0 : _b.getContainer(changed.gameObject.id);
                         if (!container) {
                             return [2];
                         }
@@ -412,14 +468,6 @@ var SpineSystem = (function (_super) {
                         armature.update();
                         armature.updateTransform();
                         component.armature = armature;
-                        if (component.autoPlay) {
-                            try {
-                                armature.state.setAnimation(0, component.animationName, true);
-                            }
-                            catch (e) {
-                                console.log(e);
-                            }
-                        }
                         component.emit('loaded', { resource: component.resource });
                         armature.state.addListener({
                             start: function (track, event) {
@@ -448,16 +496,16 @@ var SpineSystem = (function (_super) {
         this.add(changed);
     };
     SpineSystem.prototype.remove = function (changed) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function () {
             var component, armature, container, res;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         component = changed.component;
                         clearTimeout(component.addHandler);
                         armature = this.armatures[changed.gameObject.id];
-                        container = this.renderSystem.containerManager.getContainer(changed.gameObject.id);
+                        container = (_b = (_a = this.renderSystem) === null || _a === void 0 ? void 0 : _a.containerManager) === null || _b === void 0 ? void 0 : _b.getContainer(changed.gameObject.id);
                         if (container && armature) {
                             container.removeChild(armature);
                         }
@@ -465,9 +513,9 @@ var SpineSystem = (function (_super) {
                         component.armature.destroy({ children: true });
                         return [4, eva_js.resource.getResource(component.lastResource)];
                     case 1:
-                        res = _c.sent();
-                        releaseSpineData(res.name, (_b = (_a = res.data) === null || _a === void 0 ? void 0 : _a.image) === null || _b === void 0 ? void 0 : _b.src);
-                        _c.label = 2;
+                        res = _e.sent();
+                        releaseSpineData(res.name, (_d = (_c = res.data) === null || _c === void 0 ? void 0 : _c.image) === null || _d === void 0 ? void 0 : _d.src);
+                        _e.label = 2;
                     case 2:
                         component.armature = null;
                         delete this.armatures[changed.gameObject.id];

package/dist/spine-base.cjs.prod.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@eva/eva.js"),t=require("@eva/plugin-renderer"),r=require("@eva/inspector-decorator"),n=require("pixi.js"),o=function(e,t){return(o=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var r in t)t.hasOwnProperty(r)&&(e[r]=t[r])})(e,t)};function a(e,t){function r(){this.constructor=e}o(e,t),e.prototype=null===t?Object.create(t):(r.prototype=t.prototype,new r)}function i(e,t,r,n){var o,a=arguments.length,i=a<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)i=Reflect.decorate(e,t,r,n);else for(var s=e.length-1;s>=0;s--)(o=e[s])&&(i=(a<3?o(i):a>3?o(t,r,i):o(t,r))||i);return a>3&&i&&Object.defineProperty(t,r,i),i}function s(e,t,r,n){return new(r||(r=Promise))((function(o,a){function i(e){try{u(n.next(e))}catch(e){a(e)}}function s(e){try{u(n.throw(e))}catch(e){a(e)}}function u(e){e.done?o(e.value):new r((function(t){t(e.value)})).then(i,s)}u((n=n.apply(e,t||[])).next())}))}function u(e,t){var r,n,o,a,i={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(a){return function(s){return function(a){if(r)throw new TypeError("Generator is already executing.");for(;i;)try{if(r=1,n&&(o=2&a[0]?n.return:a[0]?n.throw||((o=n.return)&&o.call(n),0):n.next)&&!(o=o.call(n,a[1])).done)return o;switch(n=0,o&&(a=[2&a[0],o.value]),a[0]){case 0:case 1:o=a;break;case 4:return i.label++,{value:a[1],done:!1};case 5:i.label++,n=a[1],a=[0];continue;case 7:a=i.ops.pop(),i.trys.pop();continue;default:if(!(o=i.trys,(o=o.length>0&&o[o.length-1])||6!==a[0]&&2!==a[0])){i=0;continue}if(3===a[0]&&(!o||a[1]>o[0]&&a[1]<o[3])){i.label=a[1];break}if(6===a[0]&&i.label<o[1]){i.label=o[1],o=a;break}if(o&&i.label<o[2]){i.label=o[2],i.ops.push(a);break}o[2]&&i.ops.pop(),i.trys.pop();continue}a=t.call(e,i)}catch(e){a=[6,e],n=0}finally{r=o=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}([a,s])}}}var c=function(e){function t(){var t=null!==e&&e.apply(this,arguments)||this;return t.resource="",t.animationName="",t.autoPlay=!0,t}return a(t,e),t.prototype.init=function(e){e&&(Object.assign(this,e),this.autoPlay&&this.play(this.animationName))},t.prototype.onDestroy=function(){this.destroied=!0},t.prototype.play=function(e,t,r){try{e&&(this.animationName=e),this.armature&&(void 0===r&&(r=0),this.armature.state.setAnimation(r,this.animationName,t))}catch(e){console.log(e)}},t.prototype.stop=function(e){this.armature&&(void 0===e&&(e=0),this.armature.state.setEmptyAnimation(e,0))},t.prototype.addAnimation=function(e,t,r,n){try{this.armature&&(void 0===n&&(n=0),this.armature.state.addAnimation(n,e,r,t))}catch(e){console.log(e)}},t.prototype.setMix=function(e,t,r){this.armature&&this.armature.stateData.setMix(e,t,r)},t.prototype.getAnim=function(e){void 0===e&&(e=0);try{if(this.armature)return this.armature.state.tracks[e].animation.name}catch(e){console.log(e)}},t.prototype.setDefaultMix=function(e){this.armature&&(this.armature.stateData.defaultMix=e)},t.prototype.setAttachment=function(e,t){this.armature&&this.armature.skeleton.setAttachment(e,t)},t.prototype.getBone=function(e){if(this.armature)return this.armature.skeleton.findBone(e)},t.componentName="Spine",i([r.type("string")],t.prototype,"resource",void 0),i([r.type("string")],t.prototype,"animationName",void 0),i([r.type("boolean")],t.prototype,"autoPlay",void 0),t}(e.Component),m={};function p(e){var t=e.image;return{tex:n.Texture.from(t),count:0}}var l={};function f(e,t,r,n){var o=null,a=function(e,t){var r=m[e];return r||(r=p(t),m[e]=r),r.tex}(t.image.src,t);new n.core.TextureAtlas(t.atlas,(function(e,t){t(a.baseTexture)}),(function(e){if(e){var a=new n.core.AtlasAttachmentLoader(e),i=new n.core.SkeletonJson(a);r&&(i.scale=r),o=i.readSkeletonData(t.ske)}}));var i={spineData:o,ref:0,imageSrc:t.image.src};return l[e]=i,i}function d(e,t){return s(this,void 0,void 0,(function(){var r;return u(this,(function(n){if(!(r=l[e.name]))if(e.complete)r=f(e.name,e.data,e.scale,t);else if(!r)return[2];return function(e,t){var r=m[e];r||(r=p(t),m[e]=r),r.count++,r.tex}(e.data.image.src,e.data),r.ref++,[2,r.spineData]}))}))}function h(e,t){var r=l[e];r&&(r.ref--,r.ref<=0&&(!function(e){e&&setTimeout((function(){var t=m[e];t&&(t.count--,t.count<=0&&(t.tex&&(t.tex.destroy(!0),t.tex=null),delete m[e]))}),100)}(t),delete l[e]))}var y=function(r){function n(){var e=null!==r&&r.apply(this,arguments)||this;return e.armatures={},e}return a(n,r),n.prototype.init=function(r){var n=this,o=r.pixiSpine;this.renderSystem=this.game.getSystem(t.RendererSystem),this.renderSystem.rendererManager.register(this),this.pixiSpine=o,this.game.canvas.addEventListener("webglcontextrestored",(function(){var t=n.game.gameObjects,r=[];for(var o in n.armatures)for(var a=+o,i=0;i<t.length;++i){var s=t[i];if(s.id===a){var u=s.getComponent(c);u&&(n.remove({type:e.OBSERVER_TYPE.REMOVE,gameObject:s,component:u,componentName:c.componentName}),r.push({type:e.OBSERVER_TYPE.ADD,gameObject:s,component:u,componentName:c.componentName}));break}}setTimeout((function(){r.forEach((function(e){n.add(e)}))}),1e3)}),!1)},n.prototype.update=function(e){for(var t in this.armatures)this.armatures[t].update(.001*e.deltaTime),this.armatures[t].updateTransform();r.prototype.update.call(this)},n.prototype.componentChanged=function(t){return s(this,void 0,void 0,(function(){return u(this,(function(r){if("Spine"===t.componentName)if(t.type===e.OBSERVER_TYPE.ADD)this.add(t);else if(t.type===e.OBSERVER_TYPE.CHANGE)switch(t.prop.prop[0]){case"resource":this.change(t)}else t.type===e.OBSERVER_TYPE.REMOVE&&this.remove(t);return[2]}))}))},n.prototype.add=function(t,r){return s(this,void 0,void 0,(function(){var n,o,a,i,s,c=this;return u(this,(function(u){switch(u.label){case 0:return n=t.component,clearTimeout(n.addHandler),[4,e.resource.getResource(n.resource)];case 1:return[4,d(u.sent(),this.pixiSpine)];case 2:if(!(o=u.sent()))return n.addHandler=setTimeout((function(){n.destroied||(void 0===r&&(r=20),--r>0?c.add(t,r):console.log("retry exceed max times",n.resource))}),1e3),[2];if(this.remove(t),!(a=this.renderSystem.containerManager.getContainer(t.gameObject.id)))return[2];if(n.lastResource=n.resource,i=new this.pixiSpine.Spine(o),this.armatures[t.gameObject.id]=i,t.gameObject&&t.gameObject.transform&&(s=t.gameObject.transform,i.x=s.size.width*s.origin.x,i.y=s.size.height*s.origin.y),a.addChildAt(i,0),i.update(),i.updateTransform(),n.armature=i,n.autoPlay)try{i.state.setAnimation(0,n.animationName,!0)}catch(e){console.log(e)}return n.emit("loaded",{resource:n.resource}),i.state.addListener({start:function(e,t){n.emit("start",{track:e,name:e.animation.name})},complete:function(e,t){n.emit("complete",{track:e,name:e.animation.name})},interrupt:function(e,t){n.emit("interrupt",{track:e,name:e.animation.name})},end:function(e,t){n.emit("end",{track:e,name:e.animation.name})},event:function(e,t){n.emit("event",e,t)}}),[2]}}))}))},n.prototype.change=function(e){this.remove(e),this.add(e)},n.prototype.remove=function(t){var r,n;return s(this,void 0,void 0,(function(){var o,a,i,s;return u(this,(function(u){switch(u.label){case 0:return o=t.component,clearTimeout(o.addHandler),a=this.armatures[t.gameObject.id],(i=this.renderSystem.containerManager.getContainer(t.gameObject.id))&&a&&i.removeChild(a),o.armature?(o.armature.destroy({children:!0}),[4,e.resource.getResource(o.lastResource)]):[3,2];case 1:h((s=u.sent()).name,null===(n=null===(r=s.data)||void 0===r?void 0:r.image)||void 0===n?void 0:n.src),u.label=2;case 2:return o.armature=null,delete this.armatures[t.gameObject.id],t.type,e.OBSERVER_TYPE.CHANGE,[2]}}))}))},n.systemName="SpineSystem",n=i([e.decorators.componentObserver({Spine:["resource"]})],n)}(t.Renderer);e.resource.registerResourceType("SPINE"),exports.Spine=c,exports.SpineSystem=y;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@eva/eva.js"),t=require("@eva/plugin-renderer"),r=require("@eva/inspector-decorator"),n=require("pixi.js"),o=function(e,t){return(o=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var r in t)t.hasOwnProperty(r)&&(e[r]=t[r])})(e,t)};function a(e,t){function r(){this.constructor=e}o(e,t),e.prototype=null===t?Object.create(t):(r.prototype=t.prototype,new r)}function i(e,t,r,n){var o,a=arguments.length,i=a<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)i=Reflect.decorate(e,t,r,n);else for(var u=e.length-1;u>=0;u--)(o=e[u])&&(i=(a<3?o(i):a>3?o(t,r,i):o(t,r))||i);return a>3&&i&&Object.defineProperty(t,r,i),i}function u(e,t,r,n){return new(r||(r=Promise))((function(o,a){function i(e){try{s(n.next(e))}catch(e){a(e)}}function u(e){try{s(n.throw(e))}catch(e){a(e)}}function s(e){e.done?o(e.value):new r((function(t){t(e.value)})).then(i,u)}s((n=n.apply(e,t||[])).next())}))}function s(e,t){var r,n,o,a,i={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return a={next:u(0),throw:u(1),return:u(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function u(a){return function(u){return function(a){if(r)throw new TypeError("Generator is already executing.");for(;i;)try{if(r=1,n&&(o=2&a[0]?n.return:a[0]?n.throw||((o=n.return)&&o.call(n),0):n.next)&&!(o=o.call(n,a[1])).done)return o;switch(n=0,o&&(a=[2&a[0],o.value]),a[0]){case 0:case 1:o=a;break;case 4:return i.label++,{value:a[1],done:!1};case 5:i.label++,n=a[1],a=[0];continue;case 7:a=i.ops.pop(),i.trys.pop();continue;default:if(!(o=i.trys,(o=o.length>0&&o[o.length-1])||6!==a[0]&&2!==a[0])){i=0;continue}if(3===a[0]&&(!o||a[1]>o[0]&&a[1]<o[3])){i.label=a[1];break}if(6===a[0]&&i.label<o[1]){i.label=o[1],o=a;break}if(o&&i.label<o[2]){i.label=o[2],i.ops.push(a);break}o[2]&&i.ops.pop(),i.trys.pop();continue}a=t.call(e,i)}catch(e){a=[6,e],n=0}finally{r=o=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}([a,u])}}}var c=function(e){function t(){var t=null!==e&&e.apply(this,arguments)||this;return t.resource="",t.animationName="",t.autoPlay=!0,t.waitExecuteInfos=[],t}return a(t,e),Object.defineProperty(t.prototype,"armature",{get:function(){return this._armature},set:function(e){var t,r;if(this._armature=e,e){this.autoPlay&&this.play(this.animationName);try{for(var n=function(e){var t="function"==typeof Symbol&&e[Symbol.iterator],r=0;return t?t.call(e):{next:function(){return e&&r>=e.length&&(e=void 0),{value:e&&e[r++],done:!e}}}}(this.waitExecuteInfos),o=n.next();!o.done;o=n.next()){var a=o.value;if(a.playType){var i=a.name,u=a.loop,s=a.track;this.play(i,u,s)}else this.stop(a.track)}}catch(e){t={error:e}}finally{try{o&&!o.done&&(r=n.return)&&r.call(n)}finally{if(t)throw t.error}}this.waitExecuteInfos=[]}},enumerable:!1,configurable:!0}),t.prototype.init=function(e){e&&Object.assign(this,e)},t.prototype.onDestroy=function(){this.destroied=!0},t.prototype.play=function(e,t,r){try{e&&(this.animationName=e),this.armature?(void 0===r&&(r=0),this.armature.state.setAnimation(r,this.animationName,t)):this.waitExecuteInfos.push({playType:!0,name:e,loop:t,track:r})}catch(e){console.log(e)}},t.prototype.stop=function(e){this.armature?(void 0===e&&(e=0),this.armature.state.setEmptyAnimation(e,0)):this.waitExecuteInfos.push({playType:!1,track:e})},t.prototype.addAnimation=function(e,t,r,n){try{this.armature&&(void 0===n&&(n=0),this.armature.state.addAnimation(n,e,r,t))}catch(e){console.log(e)}},t.prototype.setMix=function(e,t,r){this.armature&&this.armature.stateData.setMix(e,t,r)},t.prototype.getAnim=function(e){void 0===e&&(e=0);try{if(this.armature)return this.armature.state.tracks[e].animation.name}catch(e){console.log(e)}},t.prototype.setDefaultMix=function(e){this.armature&&(this.armature.stateData.defaultMix=e)},t.prototype.setAttachment=function(e,t){this.armature&&this.armature.skeleton.setAttachment(e,t)},t.prototype.getBone=function(e){if(this.armature)return this.armature.skeleton.findBone(e)},t.componentName="Spine",i([r.type("string")],t.prototype,"resource",void 0),i([r.type("string")],t.prototype,"animationName",void 0),i([r.type("boolean")],t.prototype,"autoPlay",void 0),t}(e.Component),p={};function m(e){var t=e.image;return{tex:n.Texture.from(t),count:0}}var l={};function f(e,t,r,n){var o=null,a=function(e,t){var r=p[e];return r||(r=m(t),p[e]=r),r.tex}(t.image.src,t);new n.core.TextureAtlas(t.atlas,(function(e,t){t(a.baseTexture)}),(function(e){if(e){var a=new n.core.AtlasAttachmentLoader(e),i=new n.core.SkeletonJson(a);r&&(i.scale=r),o=i.readSkeletonData(t.ske)}}));var i={spineData:o,ref:0,imageSrc:t.image.src};return l[e]=i,i}function d(e,t){return u(this,void 0,void 0,(function(){var r;return s(this,(function(n){if(!(r=l[e.name]))if(e.complete)r=f(e.name,e.data,e.scale,t);else if(!r)return[2];return function(e,t){var r=p[e];r||(r=m(t),p[e]=r),r.count++,r.tex}(e.data.image.src,e.data),r.ref++,[2,r.spineData]}))}))}function h(e,t){var r=l[e];r&&(r.ref--,r.ref<=0&&(!function(e){e&&setTimeout((function(){var t=p[e];t&&(t.count--,t.count<=0&&(t.tex&&(t.tex.destroy(!0),t.tex=null),delete p[e]))}),100)}(t),delete l[e]))}var y=function(r){function n(){var e=null!==r&&r.apply(this,arguments)||this;return e.armatures={},e}return a(n,r),n.prototype.init=function(r){var n=this,o=r.pixiSpine;this.renderSystem=this.game.getSystem(t.RendererSystem),this.renderSystem.rendererManager.register(this),this.pixiSpine=o,this.game.canvas.addEventListener("webglcontextrestored",(function(){var t=n.game.gameObjects,r=[];for(var o in n.armatures)for(var a=+o,i=0;i<t.length;++i){var u=t[i];if(u.id===a){var s=u.getComponent(c);s&&(n.remove({type:e.OBSERVER_TYPE.REMOVE,gameObject:u,component:s,componentName:c.componentName}),r.push({type:e.OBSERVER_TYPE.ADD,gameObject:u,component:s,componentName:c.componentName}));break}}setTimeout((function(){r.forEach((function(e){n.add(e)}))}),1e3)}),!1)},n.prototype.update=function(e){for(var t in this.armatures)this.armatures[t].update(.001*e.deltaTime),this.armatures[t].updateTransform();r.prototype.update.call(this)},n.prototype.componentChanged=function(t){return u(this,void 0,void 0,(function(){return s(this,(function(r){if("Spine"===t.componentName)if(t.type===e.OBSERVER_TYPE.ADD)this.add(t);else if(t.type===e.OBSERVER_TYPE.CHANGE)switch(t.prop.prop[0]){case"resource":this.change(t)}else t.type===e.OBSERVER_TYPE.REMOVE&&this.remove(t);return[2]}))}))},n.prototype.add=function(t,r){var n,o;return u(this,void 0,void 0,(function(){var a,i,u,c,p,m=this;return s(this,(function(s){switch(s.label){case 0:return a=t.component,clearTimeout(a.addHandler),[4,e.resource.getResource(a.resource)];case 1:return[4,d(s.sent(),this.pixiSpine)];case 2:return(i=s.sent())?(this.remove(t),(u=null===(o=null===(n=this.renderSystem)||void 0===n?void 0:n.containerManager)||void 0===o?void 0:o.getContainer(t.gameObject.id))?(a.lastResource=a.resource,c=new this.pixiSpine.Spine(i),this.armatures[t.gameObject.id]=c,t.gameObject&&t.gameObject.transform&&(p=t.gameObject.transform,c.x=p.size.width*p.origin.x,c.y=p.size.height*p.origin.y),u.addChildAt(c,0),c.update(),c.updateTransform(),a.armature=c,a.emit("loaded",{resource:a.resource}),c.state.addListener({start:function(e,t){a.emit("start",{track:e,name:e.animation.name})},complete:function(e,t){a.emit("complete",{track:e,name:e.animation.name})},interrupt:function(e,t){a.emit("interrupt",{track:e,name:e.animation.name})},end:function(e,t){a.emit("end",{track:e,name:e.animation.name})},event:function(e,t){a.emit("event",e,t)}}),[2]):[2]):(a.addHandler=setTimeout((function(){a.destroied||(void 0===r&&(r=20),--r>0?m.add(t,r):console.log("retry exceed max times",a.resource))}),1e3),[2])}}))}))},n.prototype.change=function(e){this.remove(e),this.add(e)},n.prototype.remove=function(t){var r,n,o,a;return u(this,void 0,void 0,(function(){var i,u,c,p;return s(this,(function(s){switch(s.label){case 0:return i=t.component,clearTimeout(i.addHandler),u=this.armatures[t.gameObject.id],(c=null===(n=null===(r=this.renderSystem)||void 0===r?void 0:r.containerManager)||void 0===n?void 0:n.getContainer(t.gameObject.id))&&u&&c.removeChild(u),i.armature?(i.armature.destroy({children:!0}),[4,e.resource.getResource(i.lastResource)]):[3,2];case 1:h((p=s.sent()).name,null===(a=null===(o=p.data)||void 0===o?void 0:o.image)||void 0===a?void 0:a.src),s.label=2;case 2:return i.armature=null,delete this.armatures[t.gameObject.id],t.type,e.OBSERVER_TYPE.CHANGE,[2]}}))}))},n.systemName="SpineSystem",n=i([e.decorators.componentObserver({Spine:["resource"]})],n)}(t.Renderer);e.resource.registerResourceType("SPINE"),exports.Spine=c,exports.SpineSystem=y;

package/dist/spine-base.d.ts

@@ -13,7 +13,10 @@ export declare class Spine extends Component<SpineParams> {
     resource: string;
     animationName: string;
     autoPlay: boolean;
-    armature: any;
+    private _armature;
+    private waitExecuteInfos;
+    set armature(val: any);
+    get armature(): any;
     destroied: boolean;
     addHandler: any;
     lastResource: string;

package/dist/spine-base.esm.js

@@ -74,6 +74,17 @@ function __generator(thisArg, body) {
         } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
+}
+
+function __values(o) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+    if (m) return m.call(o);
+    return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
 }
 
 var Spine = (function (_super) {
@@ -83,15 +94,49 @@ var Spine = (function (_super) {
         _this.resource = '';
         _this.animationName = '';
         _this.autoPlay = true;
+        _this.waitExecuteInfos = [];
         return _this;
     }
+    Object.defineProperty(Spine.prototype, "armature", {
+        get: function () {
+            return this._armature;
+        },
+        set: function (val) {
+            var e_1, _a;
+            this._armature = val;
+            if (!val)
+                return;
+            if (this.autoPlay) {
+                this.play(this.animationName);
+            }
+            try {
+                for (var _b = __values(this.waitExecuteInfos), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var info = _c.value;
+                    if (info.playType) {
+                        var name_1 = info.name, loop = info.loop, track = info.track;
+                        this.play(name_1, loop, track);
+                    }
+                    else {
+                        this.stop(info.track);
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            this.waitExecuteInfos = [];
+        },
+        enumerable: false,
+        configurable: true
+    });
     Spine.prototype.init = function (obj) {
         if (!obj)
             return;
         Object.assign(this, obj);
-        if (this.autoPlay) {
-            this.play(this.animationName);
-        }
     };
     Spine.prototype.onDestroy = function () {
         this.destroied = true;
@@ -101,6 +146,12 @@ var Spine = (function (_super) {
             if (name)
                 this.animationName = name;
             if (!this.armature) {
+                this.waitExecuteInfos.push({
+                    playType: true,
+                    name: name,
+                    loop: loop,
+                    track: track
+                });
             }
             else {
                 if (track === undefined) {
@@ -115,6 +166,10 @@ var Spine = (function (_super) {
     };
     Spine.prototype.stop = function (track) {
         if (!this.armature) {
+            this.waitExecuteInfos.push({
+                playType: false,
+                track: track
+            });
             return;
         }
         if (track === undefined) {
@@ -360,20 +415,21 @@ var SpineSystem = (function (_super) {
         });
     };
     SpineSystem.prototype.add = function (changed, count) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
             var component, res, spineData, container, armature, tran;
             var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         component = changed.component;
                         clearTimeout(component.addHandler);
                         return [4, resource.getResource(component.resource)];
                     case 1:
-                        res = _a.sent();
+                        res = _c.sent();
                         return [4, getSpineData(res, this.pixiSpine)];
                     case 2:
-                        spineData = _a.sent();
+                        spineData = _c.sent();
                         if (!spineData) {
                             component.addHandler = setTimeout(function () {
                                 if (!component.destroied) {
@@ -392,7 +448,7 @@ var SpineSystem = (function (_super) {
                             return [2];
                         }
                         this.remove(changed);
-                        container = this.renderSystem.containerManager.getContainer(changed.gameObject.id);
+                        container = (_b = (_a = this.renderSystem) === null || _a === void 0 ? void 0 : _a.containerManager) === null || _b === void 0 ? void 0 : _b.getContainer(changed.gameObject.id);
                         if (!container) {
                             return [2];
                         }
@@ -408,14 +464,6 @@ var SpineSystem = (function (_super) {
                         armature.update();
                         armature.updateTransform();
                         component.armature = armature;
-                        if (component.autoPlay) {
-                            try {
-                                armature.state.setAnimation(0, component.animationName, true);
-                            }
-                            catch (e) {
-                                console.log(e);
-                            }
-                        }
                         component.emit('loaded', { resource: component.resource });
                         armature.state.addListener({
                             start: function (track, event) {
@@ -444,16 +492,16 @@ var SpineSystem = (function (_super) {
         this.add(changed);
     };
     SpineSystem.prototype.remove = function (changed) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function () {
             var component, armature, container, res;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         component = changed.component;
                         clearTimeout(component.addHandler);
                         armature = this.armatures[changed.gameObject.id];
-                        container = this.renderSystem.containerManager.getContainer(changed.gameObject.id);
+                        container = (_b = (_a = this.renderSystem) === null || _a === void 0 ? void 0 : _a.containerManager) === null || _b === void 0 ? void 0 : _b.getContainer(changed.gameObject.id);
                         if (container && armature) {
                             container.removeChild(armature);
                         }
@@ -461,9 +509,9 @@ var SpineSystem = (function (_super) {
                         component.armature.destroy({ children: true });
                         return [4, resource.getResource(component.lastResource)];
                     case 1:
-                        res = _c.sent();
-                        releaseSpineData(res.name, (_b = (_a = res.data) === null || _a === void 0 ? void 0 : _a.image) === null || _b === void 0 ? void 0 : _b.src);
-                        _c.label = 2;
+                        res = _e.sent();
+                        releaseSpineData(res.name, (_d = (_c = res.data) === null || _c === void 0 ? void 0 : _c.image) === null || _d === void 0 ? void 0 : _d.src);
+                        _e.label = 2;
                     case 2:
                         component.armature = null;
                         delete this.armatures[changed.gameObject.id];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eva/spine-base",
-  "version": "1.2.2-mini.1",
+  "version": "1.2.2",
   "description": "@eva/spine-base",
   "main": "index.js",
   "module": "dist/spine-base.esm.js",
@@ -18,8 +18,8 @@
   "license": "MIT",
   "homepage": "https://eva.js.org",
   "dependencies": {
-    "@eva/eva.js": "1.2.2-mini.1",
-    "@eva/plugin-renderer": "1.2.2-mini.1",
+    "@eva/eva.js": "1.2.2",
+    "@eva/plugin-renderer": "1.2.2",
     "@eva/inspector-decorator": "^0.0.5",
     "pixi.js": "^4.8.9"
   }