@eva/plugin-renderer-spine 1.2.2-type.0 → 1.2.4

package/dist/EVA.plugin.renderer.spine.js

@@ -184,6 +184,23 @@ var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
     }
   }
 
+  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 = {};
@@ -214,17 +231,59 @@ var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
       _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 () {
@@ -235,7 +294,14 @@ var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
       try {
         if (name) this.animationName = name;
 
-        if (!this.armature) {} else {
+        if (!this.armature) {
+          this.waitExecuteInfos.push({
+            playType: true,
+            name: name,
+            loop: loop !== null && loop !== void 0 ? loop : this.autoPlay,
+            track: track
+          });
+        } else {
           if (track === undefined) {
             track = 0;
           }
@@ -249,6 +315,10 @@ var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
 
     Spine.prototype.stop = function (track) {
       if (!this.armature) {
+        this.waitExecuteInfos.push({
+          playType: false,
+          track: track
+        });
         return;
       }
 
@@ -537,24 +607,26 @@ var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
     };
 
     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 () {
@@ -576,7 +648,7 @@ var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
               }
 
               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];
@@ -596,15 +668,6 @@ var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
               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
               });
@@ -649,17 +712,17 @@ var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
     };
 
     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);
@@ -672,9 +735,9 @@ var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
               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;
@@ -9489,9 +9552,9 @@ var _EVA_IIFE_spine = function (exports, pixi_js, eva_js, pluginRenderer) {
         var cachedResource = loader.resources[name];
 
         if (cachedResource) {
-          function done() {
+          var done = function done() {
             callback(cachedResource.texture.baseTexture);
-          }
+          };
 
           if (cachedResource.texture) {
             done();