@eva/plugin-renderer-sprite-animation 1.3.0-alpha.1 → 2.0.0-beta.0

package/dist/plugin-renderer-sprite-animation.cjs.js

@@ -99,10 +99,12 @@ var SpriteAnimation$2 = (function (_super) {
         _this.resource = '';
         _this.autoPlay = true;
         _this.speed = 100;
+        _this.forwards = false;
         _this.waitPlay = false;
         _this.waitStop = false;
         _this.times = Infinity;
         _this.count = 0;
+        _this.complete = false;
         return _this;
     }
     SpriteAnimation.prototype.init = function (obj) {
@@ -110,7 +112,13 @@ var SpriteAnimation$2 = (function (_super) {
         obj && Object.assign(this, obj);
         this.on('loop', function () {
             if (++_this.count >= _this.times) {
-                _this.animate.stop();
+                if (_this.forwards) {
+                    _this.gotoAndStop(_this.totalFrames - 1);
+                }
+                else {
+                    _this.animate.stop();
+                }
+                _this.complete = true;
                 _this.emit('complete');
             }
         });
@@ -125,8 +133,12 @@ var SpriteAnimation$2 = (function (_super) {
             this.waitPlay = true;
         }
         else {
+            if (this.complete) {
+                this.gotoAndStop(0);
+            }
             this.animate.play();
             this.count = 0;
+            this.complete = false;
         }
     };
     SpriteAnimation.prototype.stop = function () {
@@ -161,6 +173,22 @@ var SpriteAnimation$2 = (function (_super) {
     SpriteAnimation.prototype.gotoAndStop = function (frameNumber) {
         this.animate.gotoAndStop(frameNumber);
     };
+    Object.defineProperty(SpriteAnimation.prototype, "currentFrame", {
+        get: function () {
+            var _a, _b;
+            return (_b = (_a = this.animate) === null || _a === void 0 ? void 0 : _a.animatedSprite) === null || _b === void 0 ? void 0 : _b.currentFrame;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(SpriteAnimation.prototype, "totalFrames", {
+        get: function () {
+            var _a, _b;
+            return (_b = (_a = this.animate) === null || _a === void 0 ? void 0 : _a.animatedSprite) === null || _b === void 0 ? void 0 : _b.totalFrames;
+        },
+        enumerable: false,
+        configurable: true
+    });
     SpriteAnimation.componentName = 'SpriteAnimation';
     __decorate([
         inspectorDecorator.type('string')
@@ -172,6 +200,9 @@ var SpriteAnimation$2 = (function (_super) {
         inspectorDecorator.type('number'),
         inspectorDecorator.step(10)
     ], SpriteAnimation.prototype, "speed", void 0);
+    __decorate([
+        inspectorDecorator.type('boolean')
+    ], SpriteAnimation.prototype, "forwards", void 0);
     return SpriteAnimation;
 }(eva_js.Component));
 var SpriteAnimation$3 = SpriteAnimation$2;
@@ -181,8 +212,8 @@ eva_js.resource.registerInstance(eva_js.RESOURCE_TYPE.SPRITE_ANIMATION, function
     var name = _a.name, data = _a.data;
     return new Promise(function (r) {
         var e_1, _a;
-        var textureObj = data.json;
-        var texture = pixi_js.BaseTexture.from(data.image);
+        var textureObj = data.json.data;
+        var texture = data.image instanceof pixi_js.Texture ? data.image : pixi_js.Texture.from(data.image);
         var frames = textureObj.frames || {};
         var animations = textureObj.animations || {};
         var newFrames = {};
@@ -212,7 +243,7 @@ eva_js.resource.registerInstance(eva_js.RESOURCE_TYPE.SPRITE_ANIMATION, function
         }
         textureObj.frames = newFrames;
         var spriteSheet = new pixi_js.Spritesheet(texture, textureObj);
-        spriteSheet.parse(function () {
+        spriteSheet.parse().then(function () {
             var textures = spriteSheet.textures;
             var spriteFrames = [];
             for (var key in textures) {
@@ -263,17 +294,21 @@ var SpriteAnimation = (function (_super) {
     };
     SpriteAnimation.prototype.componentChanged = function (changed) {
         return __awaiter(this, void 0, void 0, function () {
-            var component, frames_1, frames_2;
+            var gameObjectId, component, asyncId, frames_1, asyncId, frames_2;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        gameObjectId = changed.gameObject.id;
                         if (!(changed.componentName === 'SpriteAnimation')) return [3, 7];
                         component = changed.component;
                         this.autoPlay[changed.gameObject.id] = component.autoPlay;
                         if (!(changed.type === eva_js.OBSERVER_TYPE.ADD)) return [3, 2];
+                        asyncId = this.increaseAsyncId(gameObjectId);
                         return [4, eva_js.resource.getResource(component.resource)];
                     case 1:
                         frames_1 = (_a.sent()).instance;
+                        if (!this.validateAsyncId(gameObjectId, asyncId))
+                            return [2];
                         if (!frames_1) {
                             console.error("GameObject:" + changed.gameObject.name + "'s Img resource load error");
                         }
@@ -288,9 +323,13 @@ var SpriteAnimation = (function (_super) {
                         if (!(changed.prop && changed.prop.prop[0] === 'speed')) return [3, 3];
                         this.animates[changed.gameObject.id].speed = 1000 / 60 / component.speed;
                         return [3, 5];
-                    case 3: return [4, eva_js.resource.getResource(component.resource)];
+                    case 3:
+                        asyncId = this.increaseAsyncId(gameObjectId);
+                        return [4, eva_js.resource.getResource(component.resource)];
                     case 4:
                         frames_2 = (_a.sent()).instance;
+                        if (!this.validateAsyncId(gameObjectId, asyncId))
+                            return [2];
                         if (!frames_2) {
                             console.error("GameObject:" + changed.gameObject.name + "'s Img resource load error");
                         }
@@ -303,6 +342,7 @@ var SpriteAnimation = (function (_super) {
                     case 5: return [3, 7];
                     case 6:
                         if (changed.type === eva_js.OBSERVER_TYPE.REMOVE) {
+                            this.increaseAsyncId(gameObjectId);
                             this.remove(changed.gameObject.id);
                         }
                         _a.label = 7;
@@ -338,9 +378,11 @@ var SpriteAnimation = (function (_super) {
     };
     SpriteAnimation.prototype.remove = function (id, isChange) {
         var animate = this.animates[id];
+        if (!animate)
+            return;
         this.autoPlay[id] = animate.animatedSprite.playing;
         this.containerManager.getContainer(id).removeChild(animate.animatedSprite);
-        animate.animatedSprite.destroy({ children: true });
+        animate.animatedSprite.destroy();
         delete this.animates[id];
         if (!isChange) {
             delete this.autoPlay[id];

package/dist/plugin-renderer-sprite-animation.cjs.prod.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@eva/eva.js"),t=require("@eva/inspector-decorator"),n=require("@eva/plugin-renderer"),r=require("@eva/renderer-adapter"),o=require("pixi.js"),i=function(e,t){return(i=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n])})(e,t)};function a(e,t){function n(){this.constructor=e}i(e,t),e.prototype=null===t?Object.create(t):(n.prototype=t.prototype,new n)}function s(e,t,n,r){var o,i=arguments.length,a=i<3?t:null===r?r=Object.getOwnPropertyDescriptor(t,n):r;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)a=Reflect.decorate(e,t,n,r);else for(var s=e.length-1;s>=0;s--)(o=e[s])&&(a=(i<3?o(a):i>3?o(t,n,a):o(t,n))||a);return i>3&&a&&Object.defineProperty(t,n,a),a}function c(e,t){var n,r,o,i,a={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function s(i){return function(s){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;a;)try{if(n=1,r&&(o=2&i[0]?r.return:i[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,i[1])).done)return o;switch(r=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return a.label++,{value:i[1],done:!1};case 5:a.label++,r=i[1],i=[0];continue;case 7:i=a.ops.pop(),a.trys.pop();continue;default:if(!(o=a.trys,(o=o.length>0&&o[o.length-1])||6!==i[0]&&2!==i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]<o[3])){a.label=i[1];break}if(6===i[0]&&a.label<o[1]){a.label=o[1],o=i;break}if(o&&a.label<o[2]){a.label=o[2],a.ops.push(i);break}o[2]&&a.ops.pop(),a.trys.pop();continue}i=t.call(e,a)}catch(e){i=[6,e],r=0}finally{n=o=0}if(5&i[0])throw i[1];return{value:i[0]?i[1]:void 0,done:!0}}([i,s])}}}function p(e){var t="function"==typeof Symbol&&e[Symbol.iterator],n=0;return t?t.call(e):{next:function(){return e&&n>=e.length&&(e=void 0),{value:e&&e[n++],done:!e}}}}var u=function(e){function n(){var t=null!==e&&e.apply(this,arguments)||this;return t.resource="",t.autoPlay=!0,t.speed=100,t.waitPlay=!1,t.waitStop=!1,t.times=1/0,t.count=0,t}return a(n,e),n.prototype.init=function(e){var t=this;e&&Object.assign(this,e),this.on("loop",(function(){++t.count>=t.times&&(t.animate.stop(),t.emit("complete"))}))},n.prototype.play=function(e){void 0===e&&(e=1/0),0!==e&&(this.times=e,this.animate?(this.animate.play(),this.count=0):this.waitPlay=!0)},n.prototype.stop=function(){this.animate?this.animate.stop():this.waitStop=!0},Object.defineProperty(n.prototype,"animate",{get:function(){return this._animate},set:function(e){this._animate=e,this.waitPlay&&(this.waitPlay=!1,this.play(this.times)),this.waitStop&&(this.waitStop=!1,this.stop())},enumerable:!1,configurable:!0}),n.prototype.gotoAndPlay=function(e){this.animate.gotoAndPlay(e)},n.prototype.gotoAndStop=function(e){this.animate.gotoAndStop(e)},n.componentName="SpriteAnimation",s([t.type("string")],n.prototype,"resource",void 0),s([t.type("boolean")],n.prototype,"autoPlay",void 0),s([t.type("number"),t.step(10)],n.prototype,"speed",void 0),n}(e.Component);e.resource.registerInstance(e.RESOURCE_TYPE.SPRITE_ANIMATION,(function(e){var t=e.name,n=e.data;return new Promise((function(e){var r,i,a=n.json,s=o.BaseTexture.from(n.image),c=a.frames||{},u=a.animations||{},l={};for(var m in c){l[t+"_s|r|c_"+m]=c[m]}for(var m in u){var f=[];if(u[m]&&u[m].length>=0)try{for(var h=(r=void 0,p(u[m])),d=h.next();!d.done;d=h.next()){var y=d.value,v=t+"_s|r|c_"+y;f.push(v)}}catch(e){r={error:e}}finally{try{d&&!d.done&&(i=h.return)&&i.call(h)}finally{if(r)throw r.error}}u[m]=f}a.frames=l;var g=new o.Spritesheet(s,a);g.parse((function(){var t=g.textures,n=[];for(var r in t)n.push(t[r]);e(n)}))}))})),e.resource.registerDestroy(e.RESOURCE_TYPE.SPRITE_ANIMATION,(function(e){var t,n,r=e.instance;if(r)try{for(var o=p(r),i=o.next();!i.done;i=o.next()){i.value.destroy(!0)}}catch(e){t={error:e}}finally{try{i&&!i.done&&(n=o.return)&&n.call(o)}finally{if(t)throw t.error}}}));var l=function(t){function o(){var e=null!==t&&t.apply(this,arguments)||this;return e.name="SpriteAnimation",e.animates={},e.autoPlay={},e}return a(o,t),o.prototype.init=function(){this.renderSystem=this.game.getSystem(n.RendererSystem),this.renderSystem.rendererManager.register(this)},o.prototype.rendererUpdate=function(e){var t=e.transform.size,n=t.width,r=t.height;this.animates[e.id]&&(this.animates[e.id].animatedSprite.width=n,this.animates[e.id].animatedSprite.height=r)},o.prototype.componentChanged=function(t){return n=this,r=void 0,i=function(){var n,r,o;return c(this,(function(i){switch(i.label){case 0:return"SpriteAnimation"!==t.componentName?[3,7]:(n=t.component,this.autoPlay[t.gameObject.id]=n.autoPlay,t.type!==e.OBSERVER_TYPE.ADD?[3,2]:[4,e.resource.getResource(n.resource)]);case 1:return(r=i.sent().instance)||console.error("GameObject:"+t.gameObject.name+"'s Img resource load error"),this.add({frames:r,id:t.gameObject.id,component:n}),[3,7];case 2:return t.type!==e.OBSERVER_TYPE.CHANGE?[3,6]:t.prop&&"speed"===t.prop.prop[0]?(this.animates[t.gameObject.id].speed=1e3/60/n.speed,[3,5]):[3,3];case 3:return[4,e.resource.getResource(n.resource)];case 4:(o=i.sent().instance)||console.error("GameObject:"+t.gameObject.name+"'s Img resource load error"),this.change({frames:o,id:t.gameObject.id,component:n}),i.label=5;case 5:return[3,7];case 6:t.type===e.OBSERVER_TYPE.REMOVE&&this.remove(t.gameObject.id),i.label=7;case 7:return[2]}}))},new((o=void 0)||(o=Promise))((function(e,t){function a(e){try{c(i.next(e))}catch(e){t(e)}}function s(e){try{c(i.throw(e))}catch(e){t(e)}}function c(t){t.done?e(t.value):new o((function(e){e(t.value)})).then(a,s)}c((i=i.apply(n,r||[])).next())}));var n,r,o,i},o.prototype.add=function(e){var t=e.frames,n=e.id,o=e.component,i=new r.SpriteAnimation({frames:t});this.animates[n]=i,this.containerManager.getContainer(n).addChildAt(i.animatedSprite,0),i.animatedSprite.onComplete=function(){o.emit("complete")},i.animatedSprite.onFrameChange=function(){o.emit("frameChange")},i.animatedSprite.onLoop=function(){o.emit("loop")},o.animate=this.animates[n],this.animates[n].speed=1e3/60/o.speed,this.autoPlay[n]&&i.animatedSprite.play()},o.prototype.change=function(e){var t=e.frames,n=e.id,r=e.component;this.remove(n,!0),this.add({frames:t,id:n,component:r})},o.prototype.remove=function(e,t){var n=this.animates[e];this.autoPlay[e]=n.animatedSprite.playing,this.containerManager.getContainer(e).removeChild(n.animatedSprite),n.animatedSprite.destroy({children:!0}),delete this.animates[e],t||delete this.autoPlay[e]},o.systemName="SpriteAnimation",o=s([e.decorators.componentObserver({SpriteAnimation:["speed","resource"]})],o)}(n.Renderer);exports.SpriteAnimation=u,exports.SpriteAnimationSystem=l;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@eva/eva.js"),t=require("@eva/inspector-decorator"),r=require("@eva/plugin-renderer"),n=require("@eva/renderer-adapter"),o=require("pixi.js"),i=function(e,t){return i=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])},i(e,t)};function a(e,t){function r(){this.constructor=e}i(e,t),e.prototype=null===t?Object.create(t):(r.prototype=t.prototype,new r)}function s(e,t,r,n){var o,i=arguments.length,a=i<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)a=Reflect.decorate(e,t,r,n);else for(var s=e.length-1;s>=0;s--)(o=e[s])&&(a=(i<3?o(a):i>3?o(t,r,a):o(t,r))||a);return i>3&&a&&Object.defineProperty(t,r,a),a}function c(e,t){var r,n,o,i,a={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function s(i){return function(s){return function(i){if(r)throw new TypeError("Generator is already executing.");for(;a;)try{if(r=1,n&&(o=2&i[0]?n.return:i[0]?n.throw||((o=n.return)&&o.call(n),0):n.next)&&!(o=o.call(n,i[1])).done)return o;switch(n=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return a.label++,{value:i[1],done:!1};case 5:a.label++,n=i[1],i=[0];continue;case 7:i=a.ops.pop(),a.trys.pop();continue;default:if(!(o=a.trys,(o=o.length>0&&o[o.length-1])||6!==i[0]&&2!==i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]<o[3])){a.label=i[1];break}if(6===i[0]&&a.label<o[1]){a.label=o[1],o=i;break}if(o&&a.label<o[2]){a.label=o[2],a.ops.push(i);break}o[2]&&a.ops.pop(),a.trys.pop();continue}i=t.call(e,a)}catch(e){i=[6,e],n=0}finally{r=o=0}if(5&i[0])throw i[1];return{value:i[0]?i[1]:void 0,done:!0}}([i,s])}}}function p(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}}}}var u=function(e){function r(){var t=null!==e&&e.apply(this,arguments)||this;return t.resource="",t.autoPlay=!0,t.speed=100,t.forwards=!1,t.waitPlay=!1,t.waitStop=!1,t.times=1/0,t.count=0,t.complete=!1,t}return a(r,e),r.prototype.init=function(e){var t=this;e&&Object.assign(this,e),this.on("loop",(function(){++t.count>=t.times&&(t.forwards?t.gotoAndStop(t.totalFrames-1):t.animate.stop(),t.complete=!0,t.emit("complete"))}))},r.prototype.play=function(e){void 0===e&&(e=1/0),0!==e&&(this.times=e,this.animate?(this.complete&&this.gotoAndStop(0),this.animate.play(),this.count=0,this.complete=!1):this.waitPlay=!0)},r.prototype.stop=function(){this.animate?this.animate.stop():this.waitStop=!0},Object.defineProperty(r.prototype,"animate",{get:function(){return this._animate},set:function(e){this._animate=e,this.waitPlay&&(this.waitPlay=!1,this.play(this.times)),this.waitStop&&(this.waitStop=!1,this.stop())},enumerable:!1,configurable:!0}),r.prototype.gotoAndPlay=function(e){this.animate.gotoAndPlay(e)},r.prototype.gotoAndStop=function(e){this.animate.gotoAndStop(e)},Object.defineProperty(r.prototype,"currentFrame",{get:function(){var e,t;return null===(t=null===(e=this.animate)||void 0===e?void 0:e.animatedSprite)||void 0===t?void 0:t.currentFrame},enumerable:!1,configurable:!0}),Object.defineProperty(r.prototype,"totalFrames",{get:function(){var e,t;return null===(t=null===(e=this.animate)||void 0===e?void 0:e.animatedSprite)||void 0===t?void 0:t.totalFrames},enumerable:!1,configurable:!0}),r.componentName="SpriteAnimation",s([t.type("string")],r.prototype,"resource",void 0),s([t.type("boolean")],r.prototype,"autoPlay",void 0),s([t.type("number"),t.step(10)],r.prototype,"speed",void 0),s([t.type("boolean")],r.prototype,"forwards",void 0),r}(e.Component),l=u,m="_s|r|c_";e.resource.registerInstance(e.RESOURCE_TYPE.SPRITE_ANIMATION,(function(e){var t=e.name,r=e.data;return new Promise((function(e){var n,i,a=r.json.data,s=r.image instanceof o.Texture?r.image:o.Texture.from(r.image),c=a.frames||{},u=a.animations||{},l={};for(var d in c){l[t+m+d]=c[d]}for(var d in u){var f=[];if(u[d]&&u[d].length>=0)try{for(var h=(n=void 0,p(u[d])),y=h.next();!y.done;y=h.next()){var v=y.value,g=t+m+v;f.push(g)}}catch(e){n={error:e}}finally{try{y&&!y.done&&(i=h.return)&&i.call(h)}finally{if(n)throw n.error}}u[d]=f}a.frames=l;var b=new o.Spritesheet(s,a);b.parse().then((function(){var t=b.textures,r=[];for(var n in t)r.push(t[n]);e(r)}))}))})),e.resource.registerDestroy(e.RESOURCE_TYPE.SPRITE_ANIMATION,(function(e){var t,r,n=e.instance;if(n)try{for(var o=p(n),i=o.next();!i.done;i=o.next()){i.value.destroy(!0)}}catch(e){t={error:e}}finally{try{i&&!i.done&&(r=o.return)&&r.call(o)}finally{if(t)throw t.error}}}));var d=function(t){function o(){var e=null!==t&&t.apply(this,arguments)||this;return e.name="SpriteAnimation",e.animates={},e.autoPlay={},e}return a(o,t),o.prototype.init=function(){this.renderSystem=this.game.getSystem(r.RendererSystem),this.renderSystem.rendererManager.register(this)},o.prototype.rendererUpdate=function(e){var t=e.transform.size,r=t.width,n=t.height;this.animates[e.id]&&(this.animates[e.id].animatedSprite.width=r,this.animates[e.id].animatedSprite.height=n)},o.prototype.componentChanged=function(t){return r=this,n=void 0,i=function(){var r,n,o,i,a;return c(this,(function(s){switch(s.label){case 0:return r=t.gameObject.id,"SpriteAnimation"!==t.componentName?[3,7]:(n=t.component,this.autoPlay[t.gameObject.id]=n.autoPlay,t.type!==e.OBSERVER_TYPE.ADD?[3,2]:(i=this.increaseAsyncId(r),[4,e.resource.getResource(n.resource)]));case 1:return o=s.sent().instance,this.validateAsyncId(r,i)?(o||console.error("GameObject:"+t.gameObject.name+"'s Img resource load error"),this.add({frames:o,id:t.gameObject.id,component:n}),[3,7]):[2];case 2:return t.type!==e.OBSERVER_TYPE.CHANGE?[3,6]:t.prop&&"speed"===t.prop.prop[0]?(this.animates[t.gameObject.id].speed=1e3/60/n.speed,[3,5]):[3,3];case 3:return i=this.increaseAsyncId(r),[4,e.resource.getResource(n.resource)];case 4:if(a=s.sent().instance,!this.validateAsyncId(r,i))return[2];a||console.error("GameObject:"+t.gameObject.name+"'s Img resource load error"),this.change({frames:a,id:t.gameObject.id,component:n}),s.label=5;case 5:return[3,7];case 6:t.type===e.OBSERVER_TYPE.REMOVE&&(this.increaseAsyncId(r),this.remove(t.gameObject.id)),s.label=7;case 7:return[2]}}))},new((o=void 0)||(o=Promise))((function(e,t){function a(e){try{c(i.next(e))}catch(e){t(e)}}function s(e){try{c(i.throw(e))}catch(e){t(e)}}function c(t){t.done?e(t.value):new o((function(e){e(t.value)})).then(a,s)}c((i=i.apply(r,n||[])).next())}));var r,n,o,i},o.prototype.add=function(e){var t=e.frames,r=e.id,o=e.component,i=new n.SpriteAnimation({frames:t});this.animates[r]=i,this.containerManager.getContainer(r).addChildAt(i.animatedSprite,0),i.animatedSprite.onComplete=function(){o.emit("complete")},i.animatedSprite.onFrameChange=function(){o.emit("frameChange")},i.animatedSprite.onLoop=function(){o.emit("loop")},o.animate=this.animates[r],this.animates[r].speed=1e3/60/o.speed,this.autoPlay[r]&&i.animatedSprite.play()},o.prototype.change=function(e){var t=e.frames,r=e.id,n=e.component;this.remove(r,!0),this.add({frames:t,id:r,component:n})},o.prototype.remove=function(e,t){var r=this.animates[e];r&&(this.autoPlay[e]=r.animatedSprite.playing,this.containerManager.getContainer(e).removeChild(r.animatedSprite),r.animatedSprite.destroy(),delete this.animates[e],t||delete this.autoPlay[e])},o.systemName="SpriteAnimation",o=s([e.decorators.componentObserver({SpriteAnimation:["speed","resource"]})],o)}(r.Renderer);exports.SpriteAnimation=l,exports.SpriteAnimationSystem=d;

package/dist/plugin-renderer-sprite-animation.esm.js

@@ -2,7 +2,7 @@ import { Component, resource, RESOURCE_TYPE, decorators, OBSERVER_TYPE } from '@
 import { type, step } from '@eva/inspector-decorator';
 import { RendererSystem, Renderer } from '@eva/plugin-renderer';
 import { SpriteAnimation as SpriteAnimation$4 } from '@eva/renderer-adapter';
-import { BaseTexture, Spritesheet } from 'pixi.js';
+import { Texture, Spritesheet } from 'pixi.js';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -95,10 +95,12 @@ var SpriteAnimation$2 = (function (_super) {
         _this.resource = '';
         _this.autoPlay = true;
         _this.speed = 100;
+        _this.forwards = false;
         _this.waitPlay = false;
         _this.waitStop = false;
         _this.times = Infinity;
         _this.count = 0;
+        _this.complete = false;
         return _this;
     }
     SpriteAnimation.prototype.init = function (obj) {
@@ -106,7 +108,13 @@ var SpriteAnimation$2 = (function (_super) {
         obj && Object.assign(this, obj);
         this.on('loop', function () {
             if (++_this.count >= _this.times) {
-                _this.animate.stop();
+                if (_this.forwards) {
+                    _this.gotoAndStop(_this.totalFrames - 1);
+                }
+                else {
+                    _this.animate.stop();
+                }
+                _this.complete = true;
                 _this.emit('complete');
             }
         });
@@ -121,8 +129,12 @@ var SpriteAnimation$2 = (function (_super) {
             this.waitPlay = true;
         }
         else {
+            if (this.complete) {
+                this.gotoAndStop(0);
+            }
             this.animate.play();
             this.count = 0;
+            this.complete = false;
         }
     };
     SpriteAnimation.prototype.stop = function () {
@@ -157,6 +169,22 @@ var SpriteAnimation$2 = (function (_super) {
     SpriteAnimation.prototype.gotoAndStop = function (frameNumber) {
         this.animate.gotoAndStop(frameNumber);
     };
+    Object.defineProperty(SpriteAnimation.prototype, "currentFrame", {
+        get: function () {
+            var _a, _b;
+            return (_b = (_a = this.animate) === null || _a === void 0 ? void 0 : _a.animatedSprite) === null || _b === void 0 ? void 0 : _b.currentFrame;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(SpriteAnimation.prototype, "totalFrames", {
+        get: function () {
+            var _a, _b;
+            return (_b = (_a = this.animate) === null || _a === void 0 ? void 0 : _a.animatedSprite) === null || _b === void 0 ? void 0 : _b.totalFrames;
+        },
+        enumerable: false,
+        configurable: true
+    });
     SpriteAnimation.componentName = 'SpriteAnimation';
     __decorate([
         type('string')
@@ -168,6 +196,9 @@ var SpriteAnimation$2 = (function (_super) {
         type('number'),
         step(10)
     ], SpriteAnimation.prototype, "speed", void 0);
+    __decorate([
+        type('boolean')
+    ], SpriteAnimation.prototype, "forwards", void 0);
     return SpriteAnimation;
 }(Component));
 var SpriteAnimation$3 = SpriteAnimation$2;
@@ -177,8 +208,8 @@ resource.registerInstance(RESOURCE_TYPE.SPRITE_ANIMATION, function (_a) {
     var name = _a.name, data = _a.data;
     return new Promise(function (r) {
         var e_1, _a;
-        var textureObj = data.json;
-        var texture = BaseTexture.from(data.image);
+        var textureObj = data.json.data;
+        var texture = data.image instanceof Texture ? data.image : Texture.from(data.image);
         var frames = textureObj.frames || {};
         var animations = textureObj.animations || {};
         var newFrames = {};
@@ -208,7 +239,7 @@ resource.registerInstance(RESOURCE_TYPE.SPRITE_ANIMATION, function (_a) {
         }
         textureObj.frames = newFrames;
         var spriteSheet = new Spritesheet(texture, textureObj);
-        spriteSheet.parse(function () {
+        spriteSheet.parse().then(function () {
             var textures = spriteSheet.textures;
             var spriteFrames = [];
             for (var key in textures) {
@@ -259,17 +290,21 @@ var SpriteAnimation = (function (_super) {
     };
     SpriteAnimation.prototype.componentChanged = function (changed) {
         return __awaiter(this, void 0, void 0, function () {
-            var component, frames_1, frames_2;
+            var gameObjectId, component, asyncId, frames_1, asyncId, frames_2;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        gameObjectId = changed.gameObject.id;
                         if (!(changed.componentName === 'SpriteAnimation')) return [3, 7];
                         component = changed.component;
                         this.autoPlay[changed.gameObject.id] = component.autoPlay;
                         if (!(changed.type === OBSERVER_TYPE.ADD)) return [3, 2];
+                        asyncId = this.increaseAsyncId(gameObjectId);
                         return [4, resource.getResource(component.resource)];
                     case 1:
                         frames_1 = (_a.sent()).instance;
+                        if (!this.validateAsyncId(gameObjectId, asyncId))
+                            return [2];
                         if (!frames_1) {
                             console.error("GameObject:" + changed.gameObject.name + "'s Img resource load error");
                         }
@@ -284,9 +319,13 @@ var SpriteAnimation = (function (_super) {
                         if (!(changed.prop && changed.prop.prop[0] === 'speed')) return [3, 3];
                         this.animates[changed.gameObject.id].speed = 1000 / 60 / component.speed;
                         return [3, 5];
-                    case 3: return [4, resource.getResource(component.resource)];
+                    case 3:
+                        asyncId = this.increaseAsyncId(gameObjectId);
+                        return [4, resource.getResource(component.resource)];
                     case 4:
                         frames_2 = (_a.sent()).instance;
+                        if (!this.validateAsyncId(gameObjectId, asyncId))
+                            return [2];
                         if (!frames_2) {
                             console.error("GameObject:" + changed.gameObject.name + "'s Img resource load error");
                         }
@@ -299,6 +338,7 @@ var SpriteAnimation = (function (_super) {
                     case 5: return [3, 7];
                     case 6:
                         if (changed.type === OBSERVER_TYPE.REMOVE) {
+                            this.increaseAsyncId(gameObjectId);
                             this.remove(changed.gameObject.id);
                         }
                         _a.label = 7;
@@ -334,9 +374,11 @@ var SpriteAnimation = (function (_super) {
     };
     SpriteAnimation.prototype.remove = function (id, isChange) {
         var animate = this.animates[id];
+        if (!animate)
+            return;
         this.autoPlay[id] = animate.animatedSprite.playing;
         this.containerManager.getContainer(id).removeChild(animate.animatedSprite);
-        animate.animatedSprite.destroy({ children: true });
+        animate.animatedSprite.destroy();
         delete this.animates[id];
         if (!isChange) {
             delete this.autoPlay[id];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eva/plugin-renderer-sprite-animation",
-  "version": "1.3.0-alpha.1",
+  "version": "2.0.0-beta.0",
   "description": "@eva/plugin-renderer-sprite-animation",
   "main": "index.js",
   "module": "dist/plugin-renderer-sprite-animation.esm.js",
@@ -19,9 +19,9 @@
   "homepage": "https://eva.js.org",
   "dependencies": {
     "@eva/inspector-decorator": "^0.0.5",
-    "@eva/plugin-renderer": "1.3.0-alpha.1",
-    "@eva/renderer-adapter": "1.3.0-alpha.1",
-    "@eva/eva.js": "1.3.0-alpha.1",
-    "pixi.js": "^4.8.7"
+    "@eva/plugin-renderer": "2.0.0-beta.0",
+    "@eva/renderer-adapter": "2.0.0-beta.0",
+    "@eva/eva.js": "2.0.0-beta.0",
+    "pixi.js": "^8.6.3"
   }
 }

package/dist/plugin-renderer-sprite-animation.d.ts

@@ -1,63 +0,0 @@
-import { Component } from '@eva/eva.js';
-import { ComponentChanged } from '@eva/eva.js';
-import { ContainerManager } from '@eva/plugin-renderer';
-import { GameObject } from '@eva/eva.js';
-import { Renderer } from '@eva/plugin-renderer';
-import { RendererManager } from '@eva/plugin-renderer';
-import { RendererSystem } from '@eva/plugin-renderer';
-import { SpriteAnimation as SpriteAnimation_2 } from '@eva/renderer-adapter';
-
-export declare class SpriteAnimation extends Component<SpriteAnimationParams> {
-    static componentName: string;
-    resource: string;
-    autoPlay: boolean;
-    speed: number;
-    _animate: SpriteAnimation_2;
-    private waitPlay;
-    private waitStop;
-    private times;
-    private count;
-    init(obj?: SpriteAnimationParams): void;
-    play(times?: number): void;
-    stop(): void;
-    set animate(val: SpriteAnimation_2);
-    get animate(): SpriteAnimation_2;
-    gotoAndPlay(frameNumber: any): void;
-    gotoAndStop(frameNumber: any): void;
-}
-
-export declare interface SpriteAnimationParams {
-    resource: string;
-    autoPlay: boolean;
-    speed: number;
-}
-
-export declare class SpriteAnimationSystem extends Renderer {
-    static systemName: string;
-    name: string;
-    animates: {
-        [propName: number]: SpriteAnimation_2;
-    };
-    autoPlay: {
-        [propName: number]: boolean;
-    };
-    renderSystem: RendererSystem;
-    rendererManager: RendererManager;
-    containerManager: ContainerManager;
-    init(): void;
-    rendererUpdate(gameObject: GameObject): void;
-    componentChanged(changed: ComponentChanged): Promise<void>;
-    add({ frames, id, component }: {
-        frames: any;
-        id: any;
-        component: any;
-    }): void;
-    change({ frames, id, component }: {
-        frames: any;
-        id: any;
-        component: any;
-    }): void;
-    remove(id: any, isChange?: boolean): void;
-}
-
-export { }