@eva/plugin-renderer-sprite 1.2.6 → 1.2.7-editor.2

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

@@ -5,22 +5,24 @@ window.EVA.plugin.renderer = window.EVA.plugin.renderer || {};
 var _EVA_IIFE_sprite = function (exports, eva_js, pluginRenderer, pixi_js) {
   'use strict';
 
-  var _extendStatics = function extendStatics(d, b) {
-    _extendStatics = Object.setPrototypeOf || {
+  var _extendStatics$ = function extendStatics$1(d, b) {
+    _extendStatics$ = Object.setPrototypeOf || {
       __proto__: []
     } instanceof Array && function (d, b) {
       d.__proto__ = b;
     } || function (d, b) {
       for (var p in b) {
-        if (b.hasOwnProperty(p)) d[p] = b[p];
+        if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p];
       }
     };
 
-    return _extendStatics(d, b);
+    return _extendStatics$(d, b);
   };
 
-  function __extends(d, b) {
-    _extendStatics(d, b);
+  function __extends$1(d, b) {
+    if (typeof b !== "function" && b !== null) throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+
+    _extendStatics$(d, b);
 
     function __() {
       this.constructor = d;
@@ -29,6 +31,22 @@ var _EVA_IIFE_sprite = function (exports, eva_js, pluginRenderer, pixi_js) {
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
   }
 
+  var _assign = function __assign() {
+    _assign = Object.assign || function __assign(t) {
+      for (var s, i = 1, n = arguments.length; i < n; i++) {
+        s = arguments[i];
+
+        for (var p in s) {
+          if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+      }
+
+      return t;
+    };
+
+    return _assign.apply(this, arguments);
+  };
+
   function __decorate(decorators, target, key, desc) {
     var c = arguments.length,
         r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
@@ -39,6 +57,10 @@ var _EVA_IIFE_sprite = function (exports, eva_js, pluginRenderer, pixi_js) {
     return c > 3 && r && Object.defineProperty(target, key, r), r;
   }
 
+  function __metadata(metadataKey, metadataValue) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
+  }
+
   function __awaiter(thisArg, _arguments, P, generator) {
     function adopt(value) {
       return value instanceof P ? value : new P(function (resolve) {
@@ -199,29 +221,111 @@ var _EVA_IIFE_sprite = function (exports, eva_js, pluginRenderer, pixi_js) {
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
   }
 
-  function getIDEPropsPropertyObj(target, propertyKey) {
-    if (!target.constructor.IDEProps) {
-      target.constructor.IDEProps = {};
+  var SymbolKeysNotSupportedError = function (_super) {
+    __extends$1(SymbolKeysNotSupportedError, _super);
+
+    function SymbolKeysNotSupportedError() {
+      var _newTarget = this.constructor;
+
+      var _this = _super.call(this, 'Symbol keys are not supported yet!') || this;
+
+      Object.setPrototypeOf(_this, _newTarget.prototype);
+      return _this;
+    }
+
+    return SymbolKeysNotSupportedError;
+  }(Error);
+
+  (function (_super) {
+    __extends$1(StaticGetPropertiesIsNotAFunctionError, _super);
+
+    function StaticGetPropertiesIsNotAFunctionError() {
+      var _newTarget = this.constructor;
+
+      var _this = _super.call(this, 'getProperties is not a function!') || this;
+
+      Object.setPrototypeOf(_this, _newTarget.prototype);
+      return _this;
+    }
+
+    return StaticGetPropertiesIsNotAFunctionError;
+  })(Error);
+
+  var IDE_PROPERTY_METADATA = 'IDE_PROPERTY_METADATA';
+
+  function transformBasicType(type) {
+    if (type === String) {
+      return 'string';
+    }
+
+    if (type === Number) {
+      return 'number';
+    }
+
+    if (type === Boolean) {
+      return 'boolean';
+    }
+
+    return 'unknown';
+  }
+
+  function defineTypes(target, key, options, returnTypeFunction) {
+    var type = Reflect.getMetadata('design:type', target, key);
+    var isArray = type === Array;
+    var str = transformBasicType(type);
+
+    if (str !== 'unknown') {
+      type = str;
+    }
+
+    if (returnTypeFunction) {
+      var returnType = returnTypeFunction();
+
+      if (Array.isArray(returnType)) {
+        isArray = true;
+        type = returnType[0];
+      } else {
+        type = returnType;
+      }
     }
 
-    if (!target.constructor.IDEProps[propertyKey]) {
-      target.constructor.IDEProps[propertyKey] = {};
+    var properties = Reflect.getMetadata(IDE_PROPERTY_METADATA, target.constructor) || {};
+    properties[key] = _assign({
+      type: type,
+      isArray: isArray
+    }, options);
+    Reflect.defineMetadata(IDE_PROPERTY_METADATA, properties, target.constructor);
+  }
+
+  function getTypeDecoratorParams(returnTypeFuncOrOptions, maybeOptions) {
+    if (typeof returnTypeFuncOrOptions === 'function') {
+      return {
+        returnTypeFunc: returnTypeFuncOrOptions,
+        options: maybeOptions || {}
+      };
     }
 
-    var propertyObj = target.constructor.IDEProps[propertyKey];
-    return propertyObj;
+    return {
+      options: returnTypeFuncOrOptions || {}
+    };
   }
 
-  function type(type) {
+  function Field(returnTypeFunction, maybeOptions) {
     return function (target, propertyKey) {
-      var prop = getIDEPropsPropertyObj(target, propertyKey);
-      prop.key = propertyKey;
-      prop.type = type;
+      if (typeof propertyKey === 'symbol') {
+        throw new SymbolKeysNotSupportedError();
+      }
+
+      var _a = getTypeDecoratorParams(returnTypeFunction, maybeOptions),
+          options = _a.options,
+          returnTypeFunc = _a.returnTypeFunc;
+
+      defineTypes(target, propertyKey, options, returnTypeFunc);
     };
   }
 
   var Sprite$3 = function (_super) {
-    __extends(Sprite, _super);
+    __extends$1(Sprite, _super);
 
     function Sprite() {
       var _this = _super !== null && _super.apply(this, arguments) || this;
@@ -240,15 +344,94 @@ var _EVA_IIFE_sprite = function (exports, eva_js, pluginRenderer, pixi_js) {
 
     Sprite.componentName = 'Sprite';
 
-    __decorate([type('string')], Sprite.prototype, "resource", void 0);
+    __decorate([Field(), __metadata("design:type", String)], Sprite.prototype, "resource", void 0);
 
-    __decorate([type('string')], Sprite.prototype, "spriteName", void 0);
+    __decorate([Field(), __metadata("design:type", String)], Sprite.prototype, "spriteName", void 0);
 
     return Sprite;
   }(eva_js.Component);
 
   var Sprite$4 = Sprite$3;
 
+  var _extendStatics = function extendStatics(d, b) {
+    _extendStatics = Object.setPrototypeOf || {
+      __proto__: []
+    } instanceof Array && function (d, b) {
+      d.__proto__ = b;
+    } || function (d, b) {
+      for (var p in b) {
+        if (b.hasOwnProperty(p)) d[p] = b[p];
+      }
+    };
+
+    return _extendStatics(d, b);
+  };
+
+  function __extends(d, b) {
+    _extendStatics(d, b);
+
+    function __() {
+      this.constructor = d;
+    }
+
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+  }
+
+  (function (_super) {
+    __extends(Application, _super);
+
+    function Application(params) {
+      var _this = this;
+
+      params.autoStart = false;
+      _this = _super.call(this, params) || this;
+      return _this;
+    }
+
+    return Application;
+  })(pixi_js.Application);
+
+  (function (_super) {
+    __extends(Container, _super);
+
+    function Container() {
+      return _super !== null && _super.apply(this, arguments) || this;
+    }
+
+    return Container;
+  })(pixi_js.Container);
+
+  (function (_super) {
+    __extends(Graphics, _super);
+
+    function Graphics() {
+      return _super !== null && _super.apply(this, arguments) || this;
+    }
+
+    return Graphics;
+  })(pixi_js.Graphics);
+
+  (function (_super) {
+    __extends(NinePatch, _super);
+
+    function NinePatch(img, leftWidth, topHeight, rightWidth, bottomHeight) {
+      var _this = this;
+
+      var texture;
+
+      if (img === 'string') {
+        texture = pixi_js.Texture.fromFrame(img);
+      } else {
+        texture = pixi_js.Texture.from(img);
+      }
+
+      _this = _super.call(this, texture, leftWidth, topHeight, rightWidth, bottomHeight) || this;
+      return _this;
+    }
+
+    return NinePatch;
+  })(pixi_js.mesh.NineSlicePlane);
+
   var Sprite$2 = function () {
     function Sprite(image) {
       this._image = null;
@@ -289,7 +472,94 @@ var _EVA_IIFE_sprite = function (exports, eva_js, pluginRenderer, pixi_js) {
     return Sprite;
   }();
 
-  var SpriteEngine = Sprite$2;
+  var Sprite$1$1 = Sprite$2;
+
+  (function () {
+    function SpriteAnimation(_a) {
+      var frames = _a.frames;
+      this.animatedSprite = new pixi_js.extras.AnimatedSprite(frames);
+    }
+
+    SpriteAnimation.prototype.play = function () {
+      this.animatedSprite.play();
+    };
+
+    SpriteAnimation.prototype.stop = function () {
+      this.animatedSprite.stop();
+    };
+
+    SpriteAnimation.prototype.gotoAndPlay = function (frameNumber) {
+      this.animatedSprite.gotoAndPlay(frameNumber);
+    };
+
+    SpriteAnimation.prototype.gotoAndStop = function (frameNumber) {
+      this.animatedSprite.gotoAndStop(frameNumber);
+    };
+
+    Object.defineProperty(SpriteAnimation.prototype, "speed", {
+      get: function get() {
+        return this.animatedSprite.animationSpeed;
+      },
+      set: function set(val) {
+        this.animatedSprite.animationSpeed = val;
+      },
+      enumerable: false,
+      configurable: true
+    });
+    return SpriteAnimation;
+  })();
+
+  (function (_super) {
+    __extends(Text, _super);
+
+    function Text(text, style) {
+      return _super.call(this, text, style) || this;
+    }
+
+    return Text;
+  })(pixi_js.Text);
+
+  var PIXITilingSprite = pixi_js.extras.TilingSprite;
+
+  (function () {
+    function TilingSprite(image) {
+      this._image = null;
+      this._image = image;
+
+      if (image) {
+        if (image instanceof HTMLImageElement) {
+          this.tilingSprite = new PIXITilingSprite(pixi_js.Texture.from(image));
+        } else if (image instanceof pixi_js.Texture) {
+          this.tilingSprite = new PIXITilingSprite(image);
+        }
+      } else {
+        this.tilingSprite = new PIXITilingSprite(pixi_js.Texture.EMPTY);
+      }
+    }
+
+    Object.defineProperty(TilingSprite.prototype, "image", {
+      get: function get() {
+        return this._image;
+      },
+      set: function set(val) {
+        if (this._image === val) {
+          return;
+        }
+
+        if (val instanceof HTMLImageElement) {
+          this.tilingSprite.texture = pixi_js.Texture.from(val);
+        } else if (val instanceof pixi_js.Texture) {
+          this.tilingSprite.texture = val;
+        }
+
+        this._image = val;
+      },
+      enumerable: false,
+      configurable: true
+    });
+    return TilingSprite;
+  })();
+
   var resourceKeySplit = '_s|r|c_';
   eva_js.resource.registerInstance(eva_js.RESOURCE_TYPE.SPRITE, function (_a) {
     var name = _a.name,
@@ -352,7 +622,7 @@ var _EVA_IIFE_sprite = function (exports, eva_js, pluginRenderer, pixi_js) {
   });
 
   var Sprite = function (_super) {
-    __extends(Sprite, _super);
+    __extends$1(Sprite, _super);
 
     function Sprite() {
       var _this = _super !== null && _super.apply(this, arguments) || this;
@@ -380,52 +650,52 @@ var _EVA_IIFE_sprite = function (exports, eva_js, pluginRenderer, pixi_js) {
 
     Sprite.prototype.componentChanged = function (changed) {
       return __awaiter(this, void 0, void 0, function () {
-        var component_1, sprite_1, instance, sprite;
-
-        var _this = this;
-
+        var gameObjectId, component, sprite, asyncId, instance, asyncId, instance, sprite;
         return __generator(this, function (_a) {
           switch (_a.label) {
             case 0:
-              if (!(changed.componentName === 'Sprite')) return [3, 4];
-              component_1 = changed.component;
-              if (!(changed.type === eva_js.OBSERVER_TYPE.ADD)) return [3, 1];
-              sprite_1 = new SpriteEngine(null);
-              eva_js.resource.getResource(component_1.resource).then(function (_a) {
-                var instance = _a.instance;
-                return __awaiter(_this, void 0, void 0, function () {
-                  return __generator(this, function (_b) {
-                    if (!instance) {
-                      console.error("GameObject:" + changed.gameObject.name + "'s Sprite resource load error");
-                      return [2];
-                    }
-
-                    sprite_1.image = instance[component_1.resource + resourceKeySplit + component_1.spriteName];
-                    return [2];
-                  });
-                });
-              });
-              this.sprites[changed.gameObject.id] = sprite_1;
-              this.containerManager.getContainer(changed.gameObject.id).addChildAt(sprite_1.sprite, 0);
-              return [3, 4];
+              if (!(changed.componentName === 'Sprite')) return [3, 5];
+              gameObjectId = changed.gameObject.id;
+              component = changed.component;
+              if (!(changed.type === eva_js.OBSERVER_TYPE.ADD)) return [3, 2];
+              sprite = new Sprite$1$1(null);
+              this.sprites[changed.gameObject.id] = sprite;
+              this.containerManager.getContainer(changed.gameObject.id).addChildAt(sprite.sprite, 0);
+              asyncId = this.increaseAsyncId(gameObjectId);
+              return [4, eva_js.resource.getResource(component.resource)];
 
             case 1:
-              if (!(changed.type === eva_js.OBSERVER_TYPE.CHANGE)) return [3, 3];
-              return [4, eva_js.resource.getResource(component_1.resource)];
+              instance = _a.sent().instance;
+              if (!this.validateAsyncId(gameObjectId, asyncId)) return [2];
+
+              if (!instance) {
+                console.error("GameObject:" + changed.gameObject.name + "'s Sprite resource load error");
+                return [2];
+              }
+
+              sprite.image = instance[component.resource + resourceKeySplit + component.spriteName];
+              return [3, 5];
 
             case 2:
+              if (!(changed.type === eva_js.OBSERVER_TYPE.CHANGE)) return [3, 4];
+              asyncId = this.increaseAsyncId(gameObjectId);
+              return [4, eva_js.resource.getResource(component.resource)];
+
+            case 3:
               instance = _a.sent().instance;
+              if (!this.validateAsyncId(gameObjectId, asyncId)) return [2];
 
               if (!instance) {
                 console.error("GameObject:" + changed.gameObject.name + "'s Sprite resource load error");
                 return [2];
               }
 
-              this.sprites[changed.gameObject.id].image = instance[component_1.resource + resourceKeySplit + component_1.spriteName];
-              return [3, 4];
+              this.sprites[changed.gameObject.id].image = instance[component.resource + resourceKeySplit + component.spriteName];
+              return [3, 5];
 
-            case 3:
+            case 4:
               if (changed.type === eva_js.OBSERVER_TYPE.REMOVE) {
+                this.increaseAsyncId(gameObjectId);
                 sprite = this.sprites[changed.gameObject.id];
                 this.containerManager.getContainer(changed.gameObject.id).removeChild(sprite.sprite);
                 sprite.sprite.destroy({
@@ -434,9 +704,9 @@ var _EVA_IIFE_sprite = function (exports, eva_js, pluginRenderer, pixi_js) {
                 delete this.sprites[changed.gameObject.id];
               }
 
-              _a.label = 4;
+              _a.label = 5;
 
-            case 4:
+            case 5:
               return [2];
           }
         });

package/dist/EVA.plugin.renderer.sprite.min.js

@@ -1 +1 @@
-window.EVA=window.EVA||{},window.EVA.plugin=window.EVA.plugin||{},window.EVA.plugin.renderer=window.EVA.plugin.renderer||{};var _EVA_IIFE_sprite=function(e,t,r,n){"use strict";var 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])})(e,t)};function o(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 i,o=arguments.length,s=o<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)s=Reflect.decorate(e,t,r,n);else for(var a=e.length-1;a>=0;a--)(i=e[a])&&(s=(o<3?i(s):o>3?i(t,r,s):i(t,r))||s);return o>3&&s&&Object.defineProperty(t,r,s),s}function a(e,t,r,n){return new(r||(r=Promise))((function(i,o){function s(e){try{c(n.next(e))}catch(e){o(e)}}function a(e){try{c(n.throw(e))}catch(e){o(e)}}function c(e){var t;e.done?i(e.value):(t=e.value,t instanceof r?t:new r((function(e){e(t)}))).then(s,a)}c((n=n.apply(e,t||[])).next())}))}function c(e,t){var r,n,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(r)throw new TypeError("Generator is already executing.");for(;s;)try{if(r=1,n&&(i=2&o[0]?n.return:o[0]?n.throw||((i=n.return)&&i.call(n),0):n.next)&&!(i=i.call(n,o[1])).done)return i;switch(n=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,n=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(i=s.trys,(i=i.length>0&&i[i.length-1])||6!==o[0]&&2!==o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue}o=t.call(e,s)}catch(e){o=[6,e],n=0}finally{r=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}}function u(e){var t="function"==typeof Symbol&&Symbol.iterator,r=t&&e[t],n=0;if(r)return r.call(e);if(e&&"number"==typeof e.length)return{next:function(){return e&&n>=e.length&&(e=void 0),{value:e&&e[n++],done:!e}}};throw new TypeError(t?"Object is not iterable.":"Symbol.iterator is not defined.")}function p(e){return function(t,r){var n=function(e,t){return e.constructor.IDEProps||(e.constructor.IDEProps={}),e.constructor.IDEProps[t]||(e.constructor.IDEProps[t]={}),e.constructor.IDEProps[t]}(t,r);n.key=r,n.type=e}}var f=function(e){function t(){var t=null!==e&&e.apply(this,arguments)||this;return t.resource="",t.spriteName="",t}return o(t,e),t.prototype.init=function(e){e&&e.resource&&(this.resource=e.resource,this.spriteName=e.spriteName)},t.componentName="Sprite",s([p("string")],t.prototype,"resource",void 0),s([p("string")],t.prototype,"spriteName",void 0),t}(t.Component),l=function(){function e(e){this._image=null,this._image=e,e?e instanceof HTMLImageElement?this.sprite=n.Sprite.from(e):e instanceof n.Texture&&(this.sprite=new n.Sprite(e)):this.sprite=new n.Sprite}return Object.defineProperty(e.prototype,"image",{get:function(){return this._image},set:function(e){this._image!==e&&(e instanceof HTMLImageElement?(this.sprite.texture&&this.sprite.texture.destroy(!1),this.sprite.texture=n.Texture.from(e)):e instanceof n.Texture&&(this.sprite.texture=e),this._image=e)},enumerable:!1,configurable:!0}),e}(),h="_s|r|c_";t.resource.registerInstance(t.RESOURCE_TYPE.SPRITE,(function(e){var t=e.name,r=e.data;return new Promise((function(e){var i,o,s=r.json,a=n.BaseTexture.from(r.image),c=s.frames||{},p=s.animations||{},f={};for(var l in c){f[t+h+l]=c[l]}for(var l in p){var d=[];if(p[l]&&p[l].length>=0)try{for(var m=(i=void 0,u(p[l])),y=m.next();!y.done;y=m.next()){var g=y.value,v=t+h+g;d.push(v)}}catch(e){i={error:e}}finally{try{y&&!y.done&&(o=m.return)&&o.call(m)}finally{if(i)throw i.error}}p[l]=d}s.frames=f;var E=new n.Spritesheet(a,s);E.parse((function(){var t=E.textures;e(t)}))}))})),t.resource.registerDestroy(t.RESOURCE_TYPE.SPRITE,(function(e){var t=e.instance;if(t)for(var r in t)t[r].destroy(!0)}));var d=function(e){function n(){var t=null!==e&&e.apply(this,arguments)||this;return t.name="Sprite",t.sprites={},t}return o(n,e),n.prototype.init=function(){this.renderSystem=this.game.getSystem(r.RendererSystem),this.renderSystem.rendererManager.register(this)},n.prototype.rendererUpdate=function(e){var t=e.transform.size,r=t.width,n=t.height;this.sprites[e.id]&&(this.sprites[e.id].sprite.width=r,this.sprites[e.id].sprite.height=n)},n.prototype.componentChanged=function(e){return a(this,void 0,void 0,(function(){var r,n,i,o,s=this;return c(this,(function(u){switch(u.label){case 0:return"Sprite"!==e.componentName?[3,4]:(r=e.component,e.type!==t.OBSERVER_TYPE.ADD?[3,1]:(n=new l(null),t.resource.getResource(r.resource).then((function(t){var i=t.instance;return a(s,void 0,void 0,(function(){return c(this,(function(t){return i?(n.image=i[r.resource+h+r.spriteName],[2]):(console.error("GameObject:"+e.gameObject.name+"'s Sprite resource load error"),[2])}))}))})),this.sprites[e.gameObject.id]=n,this.containerManager.getContainer(e.gameObject.id).addChildAt(n.sprite,0),[3,4]));case 1:return e.type!==t.OBSERVER_TYPE.CHANGE?[3,3]:[4,t.resource.getResource(r.resource)];case 2:return(i=u.sent().instance)?(this.sprites[e.gameObject.id].image=i[r.resource+h+r.spriteName],[3,4]):(console.error("GameObject:"+e.gameObject.name+"'s Sprite resource load error"),[2]);case 3:e.type===t.OBSERVER_TYPE.REMOVE&&(o=this.sprites[e.gameObject.id],this.containerManager.getContainer(e.gameObject.id).removeChild(o.sprite),o.sprite.destroy({children:!0}),delete this.sprites[e.gameObject.id]),u.label=4;case 4:return[2]}}))}))},n.systemName="Sprite",n=s([t.decorators.componentObserver({Sprite:["spriteName"]})],n)}(r.Renderer);return e.Sprite=f,e.SpriteSystem=d,Object.defineProperty(e,"__esModule",{value:!0}),e}({},EVA,EVA.plugin.renderer,PIXI);window.EVA.plugin.renderer.sprite=window.EVA.plugin.renderer.sprite||_EVA_IIFE_sprite;
+window.EVA=window.EVA||{},window.EVA.plugin=window.EVA.plugin||{},window.EVA.plugin.renderer=window.EVA.plugin.renderer||{};var _EVA_IIFE_sprite=function(e,t,r,n){"use strict";var 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)Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r])},i(e,t)};function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");function r(){this.constructor=e}i(e,t),e.prototype=null===t?Object.create(t):(r.prototype=t.prototype,new r)}var a=function(){return a=Object.assign||function(e){for(var t,r=1,n=arguments.length;r<n;r++)for(var i in t=arguments[r])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e},a.apply(this,arguments)};function s(e,t,r,n){var i,o=arguments.length,a=o<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--)(i=e[s])&&(a=(o<3?i(a):o>3?i(t,r,a):i(t,r))||a);return o>3&&a&&Object.defineProperty(t,r,a),a}function c(e,t){if("object"==typeof Reflect&&"function"==typeof Reflect.metadata)return Reflect.metadata(e,t)}function u(e,t,r,n){return new(r||(r=Promise))((function(i,o){function a(e){try{c(n.next(e))}catch(e){o(e)}}function s(e){try{c(n.throw(e))}catch(e){o(e)}}function c(e){var t;e.done?i(e.value):(t=e.value,t instanceof r?t:new r((function(e){e(t)}))).then(a,s)}c((n=n.apply(e,t||[])).next())}))}function p(e,t){var r,n,i,o,a={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function s(o){return function(s){return function(o){if(r)throw new TypeError("Generator is already executing.");for(;a;)try{if(r=1,n&&(i=2&o[0]?n.return:o[0]?n.throw||((i=n.return)&&i.call(n),0):n.next)&&!(i=i.call(n,o[1])).done)return i;switch(n=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return a.label++,{value:o[1],done:!1};case 5:a.label++,n=o[1],o=[0];continue;case 7:o=a.ops.pop(),a.trys.pop();continue;default:if(!(i=a.trys,(i=i.length>0&&i[i.length-1])||6!==o[0]&&2!==o[0])){a=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){a.label=o[1];break}if(6===o[0]&&a.label<i[1]){a.label=i[1],i=o;break}if(i&&a.label<i[2]){a.label=i[2],a.ops.push(o);break}i[2]&&a.ops.pop(),a.trys.pop();continue}o=t.call(e,a)}catch(e){o=[6,e],n=0}finally{r=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,s])}}}function f(e){var t="function"==typeof Symbol&&Symbol.iterator,r=t&&e[t],n=0;if(r)return r.call(e);if(e&&"number"==typeof e.length)return{next:function(){return e&&n>=e.length&&(e=void 0),{value:e&&e[n++],done:!e}}};throw new TypeError(t?"Object is not iterable.":"Symbol.iterator is not defined.")}var l=function(e){function t(){var t=this.constructor,r=e.call(this,"Symbol keys are not supported yet!")||this;return Object.setPrototypeOf(r,t.prototype),r}return o(t,e),t}(Error);!function(e){function t(){var t=this.constructor,r=e.call(this,"getProperties is not a function!")||this;return Object.setPrototypeOf(r,t.prototype),r}o(t,e)}(Error);var h="IDE_PROPERTY_METADATA";function y(e,t,r,n){var i=Reflect.getMetadata("design:type",e,t),o=i===Array,s=function(e){return e===String?"string":e===Number?"number":e===Boolean?"boolean":"unknown"}(i);if("unknown"!==s&&(i=s),n){var c=n();Array.isArray(c)?(o=!0,i=c[0]):i=c}var u=Reflect.getMetadata(h,e.constructor)||{};u[t]=a({type:i,isArray:o},r),Reflect.defineMetadata(h,u,e.constructor)}function d(e,t){return function(r,n){if("symbol"==typeof n)throw new l;var i=function(e,t){return"function"==typeof e?{returnTypeFunc:e,options:t||{}}:{options:e||{}}}(e,t);y(r,n,i.options,i.returnTypeFunc)}}var m=function(e){function t(){var t=null!==e&&e.apply(this,arguments)||this;return t.resource="",t.spriteName="",t}return o(t,e),t.prototype.init=function(e){e&&e.resource&&(this.resource=e.resource,this.spriteName=e.spriteName)},t.componentName="Sprite",s([d(),c("design:type",String)],t.prototype,"resource",void 0),s([d(),c("design:type",String)],t.prototype,"spriteName",void 0),t}(t.Component),g=m,b=function(e,t){return b=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])},b(e,t)};function v(e,t){function r(){this.constructor=e}b(e,t),e.prototype=null===t?Object.create(t):(r.prototype=t.prototype,new r)}!function(e){function t(t){return t.autoStart=!1,e.call(this,t)||this}v(t,e)}(n.Application),function(e){function t(){return null!==e&&e.apply(this,arguments)||this}v(t,e)}(n.Container),function(e){function t(){return null!==e&&e.apply(this,arguments)||this}v(t,e)}(n.Graphics),function(e){function t(t,r,i,o,a){var s;return s="string"===t?n.Texture.fromFrame(t):n.Texture.from(t),e.call(this,s,r,i,o,a)||this}v(t,e)}(n.mesh.NineSlicePlane);var S=function(){function e(e){this._image=null,this._image=e,e?e instanceof HTMLImageElement?this.sprite=n.Sprite.from(e):e instanceof n.Texture&&(this.sprite=new n.Sprite(e)):this.sprite=new n.Sprite}return Object.defineProperty(e.prototype,"image",{get:function(){return this._image},set:function(e){this._image!==e&&(e instanceof HTMLImageElement?(this.sprite.texture&&this.sprite.texture.destroy(!1),this.sprite.texture=n.Texture.from(e)):e instanceof n.Texture&&(this.sprite.texture=e),this._image=e)},enumerable:!1,configurable:!0}),e}(),w=S;!function(){function e(e){var t=e.frames;this.animatedSprite=new n.extras.AnimatedSprite(t)}e.prototype.play=function(){this.animatedSprite.play()},e.prototype.stop=function(){this.animatedSprite.stop()},e.prototype.gotoAndPlay=function(e){this.animatedSprite.gotoAndPlay(e)},e.prototype.gotoAndStop=function(e){this.animatedSprite.gotoAndStop(e)},Object.defineProperty(e.prototype,"speed",{get:function(){return this.animatedSprite.animationSpeed},set:function(e){this.animatedSprite.animationSpeed=e},enumerable:!1,configurable:!0})}(),function(e){function t(t,r){return e.call(this,t,r)||this}v(t,e)}(n.Text);var E=n.extras.TilingSprite;!function(){function e(e){this._image=null,this._image=e,e?e instanceof HTMLImageElement?this.tilingSprite=new E(n.Texture.from(e)):e instanceof n.Texture&&(this.tilingSprite=new E(e)):this.tilingSprite=new E(n.Texture.EMPTY)}Object.defineProperty(e.prototype,"image",{get:function(){return this._image},set:function(e){this._image!==e&&(e instanceof HTMLImageElement?this.tilingSprite.texture=n.Texture.from(e):e instanceof n.Texture&&(this.tilingSprite.texture=e),this._image=e)},enumerable:!1,configurable:!0})}();var O="_s|r|c_";t.resource.registerInstance(t.RESOURCE_TYPE.SPRITE,(function(e){var t=e.name,r=e.data;return new Promise((function(e){var i,o,a=r.json,s=n.BaseTexture.from(r.image),c=a.frames||{},u=a.animations||{},p={};for(var l in c){p[t+O+l]=c[l]}for(var l in u){var h=[];if(u[l]&&u[l].length>=0)try{for(var y=(i=void 0,f(u[l])),d=y.next();!d.done;d=y.next()){var m=d.value,g=t+O+m;h.push(g)}}catch(e){i={error:e}}finally{try{d&&!d.done&&(o=y.return)&&o.call(y)}finally{if(i)throw i.error}}u[l]=h}a.frames=p;var b=new n.Spritesheet(s,a);b.parse((function(){var t=b.textures;e(t)}))}))})),t.resource.registerDestroy(t.RESOURCE_TYPE.SPRITE,(function(e){var t=e.instance;if(t)for(var r in t)t[r].destroy(!0)}));var _=function(e){function n(){var t=null!==e&&e.apply(this,arguments)||this;return t.name="Sprite",t.sprites={},t}return o(n,e),n.prototype.init=function(){this.renderSystem=this.game.getSystem(r.RendererSystem),this.renderSystem.rendererManager.register(this)},n.prototype.rendererUpdate=function(e){var t=e.transform.size,r=t.width,n=t.height;this.sprites[e.id]&&(this.sprites[e.id].sprite.width=r,this.sprites[e.id].sprite.height=n)},n.prototype.componentChanged=function(e){return u(this,void 0,void 0,(function(){var r,n,i,o,a;return p(this,(function(s){switch(s.label){case 0:return"Sprite"!==e.componentName?[3,5]:(r=e.gameObject.id,n=e.component,e.type!==t.OBSERVER_TYPE.ADD?[3,2]:(a=new w(null),this.sprites[e.gameObject.id]=a,this.containerManager.getContainer(e.gameObject.id).addChildAt(a.sprite,0),i=this.increaseAsyncId(r),[4,t.resource.getResource(n.resource)]));case 1:return o=s.sent().instance,this.validateAsyncId(r,i)?o?(a.image=o[n.resource+O+n.spriteName],[3,5]):(console.error("GameObject:"+e.gameObject.name+"'s Sprite resource load error"),[2]):[2];case 2:return e.type!==t.OBSERVER_TYPE.CHANGE?[3,4]:(i=this.increaseAsyncId(r),[4,t.resource.getResource(n.resource)]);case 3:return o=s.sent().instance,this.validateAsyncId(r,i)?o?(this.sprites[e.gameObject.id].image=o[n.resource+O+n.spriteName],[3,5]):(console.error("GameObject:"+e.gameObject.name+"'s Sprite resource load error"),[2]):[2];case 4:e.type===t.OBSERVER_TYPE.REMOVE&&(this.increaseAsyncId(r),a=this.sprites[e.gameObject.id],this.containerManager.getContainer(e.gameObject.id).removeChild(a.sprite),a.sprite.destroy({children:!0}),delete this.sprites[e.gameObject.id]),s.label=5;case 5:return[2]}}))}))},n.systemName="Sprite",n=s([t.decorators.componentObserver({Sprite:["spriteName"]})],n)}(r.Renderer),A=_;return e.Sprite=g,e.SpriteSystem=A,Object.defineProperty(e,"__esModule",{value:!0}),e}({},EVA,EVA.plugin.renderer,PIXI);window.EVA.plugin.renderer.sprite=window.EVA.plugin.renderer.sprite||_EVA_IIFE_sprite;

package/dist/miniprogram.js

@@ -1,6 +1,6 @@
-import { __extends, __decorate, __values, __awaiter, __generator } from 'tslib';
+import { __extends, __decorate, __metadata, __values, __awaiter, __generator } from 'tslib';
 import { Component, resource, RESOURCE_TYPE, OBSERVER_TYPE, decorators } from '@eva/eva.js/dist/miniprogram';
-import { type } from '@eva/inspector-decorator';
+import { Field } from '@eva/inspector-decorator';
 import { RendererSystem, Renderer } from '@eva/plugin-renderer/dist/miniprogram';
 import { Sprite as Sprite$4 } from '@eva/renderer-adapter/dist/miniprogram';
 import { BaseTexture, Spritesheet } from '@eva/miniprogram-pixi';
@@ -25,9 +25,9 @@ var Sprite$2 = function (_super) {
 
   Sprite.componentName = 'Sprite';
 
-  __decorate([type('string')], Sprite.prototype, "resource", void 0);
+  __decorate([Field(), __metadata("design:type", String)], Sprite.prototype, "resource", void 0);
 
-  __decorate([type('string')], Sprite.prototype, "spriteName", void 0);
+  __decorate([Field(), __metadata("design:type", String)], Sprite.prototype, "spriteName", void 0);
 
   return Sprite;
 }(Component);
@@ -123,52 +123,52 @@ var Sprite = function (_super) {
 
   Sprite.prototype.componentChanged = function (changed) {
     return __awaiter(this, void 0, void 0, function () {
-      var component_1, sprite_1, instance, sprite;
-
-      var _this = this;
-
+      var gameObjectId, component, sprite, asyncId, instance, asyncId, instance, sprite;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
-            if (!(changed.componentName === 'Sprite')) return [3, 4];
-            component_1 = changed.component;
-            if (!(changed.type === OBSERVER_TYPE.ADD)) return [3, 1];
-            sprite_1 = new Sprite$4(null);
-            resource.getResource(component_1.resource).then(function (_a) {
-              var instance = _a.instance;
-              return __awaiter(_this, void 0, void 0, function () {
-                return __generator(this, function (_b) {
-                  if (!instance) {
-                    console.error("GameObject:" + changed.gameObject.name + "'s Sprite resource load error");
-                    return [2];
-                  }
-
-                  sprite_1.image = instance[component_1.resource + resourceKeySplit + component_1.spriteName];
-                  return [2];
-                });
-              });
-            });
-            this.sprites[changed.gameObject.id] = sprite_1;
-            this.containerManager.getContainer(changed.gameObject.id).addChildAt(sprite_1.sprite, 0);
-            return [3, 4];
+            if (!(changed.componentName === 'Sprite')) return [3, 5];
+            gameObjectId = changed.gameObject.id;
+            component = changed.component;
+            if (!(changed.type === OBSERVER_TYPE.ADD)) return [3, 2];
+            sprite = new Sprite$4(null);
+            this.sprites[changed.gameObject.id] = sprite;
+            this.containerManager.getContainer(changed.gameObject.id).addChildAt(sprite.sprite, 0);
+            asyncId = this.increaseAsyncId(gameObjectId);
+            return [4, resource.getResource(component.resource)];
 
           case 1:
-            if (!(changed.type === OBSERVER_TYPE.CHANGE)) return [3, 3];
-            return [4, resource.getResource(component_1.resource)];
+            instance = _a.sent().instance;
+            if (!this.validateAsyncId(gameObjectId, asyncId)) return [2];
+
+            if (!instance) {
+              console.error("GameObject:" + changed.gameObject.name + "'s Sprite resource load error");
+              return [2];
+            }
+
+            sprite.image = instance[component.resource + resourceKeySplit + component.spriteName];
+            return [3, 5];
 
           case 2:
+            if (!(changed.type === OBSERVER_TYPE.CHANGE)) return [3, 4];
+            asyncId = this.increaseAsyncId(gameObjectId);
+            return [4, resource.getResource(component.resource)];
+
+          case 3:
             instance = _a.sent().instance;
+            if (!this.validateAsyncId(gameObjectId, asyncId)) return [2];
 
             if (!instance) {
               console.error("GameObject:" + changed.gameObject.name + "'s Sprite resource load error");
               return [2];
             }
 
-            this.sprites[changed.gameObject.id].image = instance[component_1.resource + resourceKeySplit + component_1.spriteName];
-            return [3, 4];
+            this.sprites[changed.gameObject.id].image = instance[component.resource + resourceKeySplit + component.spriteName];
+            return [3, 5];
 
-          case 3:
+          case 4:
             if (changed.type === OBSERVER_TYPE.REMOVE) {
+              this.increaseAsyncId(gameObjectId);
               sprite = this.sprites[changed.gameObject.id];
               this.containerManager.getContainer(changed.gameObject.id).removeChild(sprite.sprite);
               sprite.sprite.destroy({
@@ -177,9 +177,9 @@ var Sprite = function (_super) {
               delete this.sprites[changed.gameObject.id];
             }
 
-            _a.label = 4;
+            _a.label = 5;
 
-          case 4:
+          case 5:
             return [2];
         }
       });

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

@@ -43,6 +43,10 @@ function __decorate(decorators, target, key, desc) {
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 
+function __metadata(metadataKey, metadataValue) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
+}
+
 function __awaiter(thisArg, _arguments, P, generator) {
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
@@ -107,10 +111,12 @@ var Sprite$3 = (function (_super) {
     };
     Sprite.componentName = 'Sprite';
     __decorate([
-        inspectorDecorator.type('string')
+        inspectorDecorator.Field(),
+        __metadata("design:type", String)
     ], Sprite.prototype, "resource", void 0);
     __decorate([
-        inspectorDecorator.type('string')
+        inspectorDecorator.Field(),
+        __metadata("design:type", String)
     ], Sprite.prototype, "spriteName", void 0);
     return Sprite;
 }(eva_js.Component));
@@ -227,52 +233,54 @@ var Sprite = (function (_super) {
     };
     Sprite.prototype.componentChanged = function (changed) {
         return __awaiter(this, void 0, void 0, function () {
-            var component_1, sprite_1, instance, sprite;
-            var _this = this;
+            var gameObjectId, component, sprite, asyncId, instance, asyncId, instance, sprite;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!(changed.componentName === 'Sprite')) return [3, 4];
-                        component_1 = changed.component;
-                        if (!(changed.type === eva_js.OBSERVER_TYPE.ADD)) return [3, 1];
-                        sprite_1 = new SpriteEngine(null);
-                        eva_js.resource.getResource(component_1.resource).then(function (_a) {
-                            var instance = _a.instance;
-                            return __awaiter(_this, void 0, void 0, function () {
-                                return __generator(this, function (_b) {
-                                    if (!instance) {
-                                        console.error("GameObject:" + changed.gameObject.name + "'s Sprite resource load error");
-                                        return [2];
-                                    }
-                                    sprite_1.image = instance[component_1.resource + resourceKeySplit + component_1.spriteName];
-                                    return [2];
-                                });
-                            });
-                        });
-                        this.sprites[changed.gameObject.id] = sprite_1;
-                        this.containerManager.getContainer(changed.gameObject.id).addChildAt(sprite_1.sprite, 0);
-                        return [3, 4];
+                        if (!(changed.componentName === 'Sprite')) return [3, 5];
+                        gameObjectId = changed.gameObject.id;
+                        component = changed.component;
+                        if (!(changed.type === eva_js.OBSERVER_TYPE.ADD)) return [3, 2];
+                        sprite = new SpriteEngine(null);
+                        this.sprites[changed.gameObject.id] = sprite;
+                        this.containerManager.getContainer(changed.gameObject.id).addChildAt(sprite.sprite, 0);
+                        asyncId = this.increaseAsyncId(gameObjectId);
+                        return [4, eva_js.resource.getResource(component.resource)];
                     case 1:
-                        if (!(changed.type === eva_js.OBSERVER_TYPE.CHANGE)) return [3, 3];
-                        return [4, eva_js.resource.getResource(component_1.resource)];
+                        instance = (_a.sent()).instance;
+                        if (!this.validateAsyncId(gameObjectId, asyncId))
+                            return [2];
+                        if (!instance) {
+                            console.error("GameObject:" + changed.gameObject.name + "'s Sprite resource load error");
+                            return [2];
+                        }
+                        sprite.image = instance[component.resource + resourceKeySplit + component.spriteName];
+                        return [3, 5];
                     case 2:
+                        if (!(changed.type === eva_js.OBSERVER_TYPE.CHANGE)) return [3, 4];
+                        asyncId = this.increaseAsyncId(gameObjectId);
+                        return [4, eva_js.resource.getResource(component.resource)];
+                    case 3:
                         instance = (_a.sent()).instance;
+                        if (!this.validateAsyncId(gameObjectId, asyncId))
+                            return [2];
                         if (!instance) {
                             console.error("GameObject:" + changed.gameObject.name + "'s Sprite resource load error");
                             return [2];
                         }
                         this.sprites[changed.gameObject.id].image =
-                            instance[component_1.resource + resourceKeySplit + component_1.spriteName];
-                        return [3, 4];
-                    case 3:
+                            instance[component.resource + resourceKeySplit + component.spriteName];
+                        return [3, 5];
+                    case 4:
                         if (changed.type === eva_js.OBSERVER_TYPE.REMOVE) {
+                            this.increaseAsyncId(gameObjectId);
                             sprite = this.sprites[changed.gameObject.id];
                             this.containerManager.getContainer(changed.gameObject.id).removeChild(sprite.sprite);
                             sprite.sprite.destroy({ children: true });
                             delete this.sprites[changed.gameObject.id];
                         }
-                        _a.label = 4;
-                    case 4: return [2];
+                        _a.label = 5;
+                    case 5: return [2];
                 }
             });
         });

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

@@ -1 +1 @@
-"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("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])})(e,t)};function o(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 i,o=arguments.length,s=o<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)s=Reflect.decorate(e,t,r,n);else for(var a=e.length-1;a>=0;a--)(i=e[a])&&(s=(o<3?i(s):o>3?i(t,r,s):i(t,r))||s);return o>3&&s&&Object.defineProperty(t,r,s),s}function a(e,t,r,n){return new(r||(r=Promise))((function(i,o){function s(e){try{c(n.next(e))}catch(e){o(e)}}function a(e){try{c(n.throw(e))}catch(e){o(e)}}function c(e){e.done?i(e.value):new r((function(t){t(e.value)})).then(s,a)}c((n=n.apply(e,t||[])).next())}))}function c(e,t){var r,n,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(r)throw new TypeError("Generator is already executing.");for(;s;)try{if(r=1,n&&(i=2&o[0]?n.return:o[0]?n.throw||((i=n.return)&&i.call(n),0):n.next)&&!(i=i.call(n,o[1])).done)return i;switch(n=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,n=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(i=s.trys,(i=i.length>0&&i[i.length-1])||6!==o[0]&&2!==o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue}o=t.call(e,s)}catch(e){o=[6,e],n=0}finally{r=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}}function u(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 p=function(e){function r(){var t=null!==e&&e.apply(this,arguments)||this;return t.resource="",t.spriteName="",t}return o(r,e),r.prototype.init=function(e){e&&e.resource&&(this.resource=e.resource,this.spriteName=e.spriteName)},r.componentName="Sprite",s([t.type("string")],r.prototype,"resource",void 0),s([t.type("string")],r.prototype,"spriteName",void 0),r}(e.Component),f=function(){function e(e){this._image=null,this._image=e,e?e instanceof HTMLImageElement?this.sprite=n.Sprite.from(e):e instanceof n.Texture&&(this.sprite=new n.Sprite(e)):this.sprite=new n.Sprite}return Object.defineProperty(e.prototype,"image",{get:function(){return this._image},set:function(e){this._image!==e&&(e instanceof HTMLImageElement?(this.sprite.texture&&this.sprite.texture.destroy(!1),this.sprite.texture=n.Texture.from(e)):e instanceof n.Texture&&(this.sprite.texture=e),this._image=e)},enumerable:!1,configurable:!0}),e}();e.resource.registerInstance(e.RESOURCE_TYPE.SPRITE,(function(e){var t=e.name,r=e.data;return new Promise((function(e){var i,o,s=r.json,a=n.BaseTexture.from(r.image),c=s.frames||{},p=s.animations||{},f={};for(var l in c){f[t+"_s|r|c_"+l]=c[l]}for(var l in p){var h=[];if(p[l]&&p[l].length>=0)try{for(var m=(i=void 0,u(p[l])),d=m.next();!d.done;d=m.next()){var y=d.value,g=t+"_s|r|c_"+y;h.push(g)}}catch(e){i={error:e}}finally{try{d&&!d.done&&(o=m.return)&&o.call(m)}finally{if(i)throw i.error}}p[l]=h}s.frames=f;var v=new n.Spritesheet(a,s);v.parse((function(){var t=v.textures;e(t)}))}))})),e.resource.registerDestroy(e.RESOURCE_TYPE.SPRITE,(function(e){var t=e.instance;if(t)for(var r in t)t[r].destroy(!0)}));var l=function(t){function n(){var e=null!==t&&t.apply(this,arguments)||this;return e.name="Sprite",e.sprites={},e}return o(n,t),n.prototype.init=function(){this.renderSystem=this.game.getSystem(r.RendererSystem),this.renderSystem.rendererManager.register(this)},n.prototype.rendererUpdate=function(e){var t=e.transform.size,r=t.width,n=t.height;this.sprites[e.id]&&(this.sprites[e.id].sprite.width=r,this.sprites[e.id].sprite.height=n)},n.prototype.componentChanged=function(t){return a(this,void 0,void 0,(function(){var r,n,i,o,s=this;return c(this,(function(u){switch(u.label){case 0:return"Sprite"!==t.componentName?[3,4]:(r=t.component,t.type!==e.OBSERVER_TYPE.ADD?[3,1]:(n=new f(null),e.resource.getResource(r.resource).then((function(e){var i=e.instance;return a(s,void 0,void 0,(function(){return c(this,(function(e){return i?(n.image=i[r.resource+"_s|r|c_"+r.spriteName],[2]):(console.error("GameObject:"+t.gameObject.name+"'s Sprite resource load error"),[2])}))}))})),this.sprites[t.gameObject.id]=n,this.containerManager.getContainer(t.gameObject.id).addChildAt(n.sprite,0),[3,4]));case 1:return t.type!==e.OBSERVER_TYPE.CHANGE?[3,3]:[4,e.resource.getResource(r.resource)];case 2:return(i=u.sent().instance)?(this.sprites[t.gameObject.id].image=i[r.resource+"_s|r|c_"+r.spriteName],[3,4]):(console.error("GameObject:"+t.gameObject.name+"'s Sprite resource load error"),[2]);case 3:t.type===e.OBSERVER_TYPE.REMOVE&&(o=this.sprites[t.gameObject.id],this.containerManager.getContainer(t.gameObject.id).removeChild(o.sprite),o.sprite.destroy({children:!0}),delete this.sprites[t.gameObject.id]),u.label=4;case 4:return[2]}}))}))},n.systemName="Sprite",n=s([e.decorators.componentObserver({Sprite:["spriteName"]})],n)}(r.Renderer);exports.Sprite=p,exports.SpriteSystem=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("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 o(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 i,o=arguments.length,s=o<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)s=Reflect.decorate(e,t,r,n);else for(var a=e.length-1;a>=0;a--)(i=e[a])&&(s=(o<3?i(s):o>3?i(t,r,s):i(t,r))||s);return o>3&&s&&Object.defineProperty(t,r,s),s}function a(e,t){if("object"==typeof Reflect&&"function"==typeof Reflect.metadata)return Reflect.metadata(e,t)}function c(e,t){var r,n,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(r)throw new TypeError("Generator is already executing.");for(;s;)try{if(r=1,n&&(i=2&o[0]?n.return:o[0]?n.throw||((i=n.return)&&i.call(n),0):n.next)&&!(i=i.call(n,o[1])).done)return i;switch(n=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,n=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(i=s.trys,(i=i.length>0&&i[i.length-1])||6!==o[0]&&2!==o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue}o=t.call(e,s)}catch(e){o=[6,e],n=0}finally{r=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}}function u(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 p=function(e){function r(){var t=null!==e&&e.apply(this,arguments)||this;return t.resource="",t.spriteName="",t}return o(r,e),r.prototype.init=function(e){e&&e.resource&&(this.resource=e.resource,this.spriteName=e.spriteName)},r.componentName="Sprite",s([t.Field(),a("design:type",String)],r.prototype,"resource",void 0),s([t.Field(),a("design:type",String)],r.prototype,"spriteName",void 0),r}(e.Component),l=p,f=function(){function e(e){this._image=null,this._image=e,e?e instanceof HTMLImageElement?this.sprite=n.Sprite.from(e):e instanceof n.Texture&&(this.sprite=new n.Sprite(e)):this.sprite=new n.Sprite}return Object.defineProperty(e.prototype,"image",{get:function(){return this._image},set:function(e){this._image!==e&&(e instanceof HTMLImageElement?(this.sprite.texture&&this.sprite.texture.destroy(!1),this.sprite.texture=n.Texture.from(e)):e instanceof n.Texture&&(this.sprite.texture=e),this._image=e)},enumerable:!1,configurable:!0}),e}(),h=f;e.resource.registerInstance(e.RESOURCE_TYPE.SPRITE,(function(e){var t=e.name,r=e.data;return new Promise((function(e){var i,o,s=r.json,a=n.BaseTexture.from(r.image),c=s.frames||{},p=s.animations||{},l={};for(var f in c){l[t+"_s|r|c_"+f]=c[f]}for(var f in p){var h=[];if(p[f]&&p[f].length>=0)try{for(var d=(i=void 0,u(p[f])),m=d.next();!m.done;m=d.next()){var y=m.value,g=t+"_s|r|c_"+y;h.push(g)}}catch(e){i={error:e}}finally{try{m&&!m.done&&(o=d.return)&&o.call(d)}finally{if(i)throw i.error}}p[f]=h}s.frames=l;var v=new n.Spritesheet(a,s);v.parse((function(){var t=v.textures;e(t)}))}))})),e.resource.registerDestroy(e.RESOURCE_TYPE.SPRITE,(function(e){var t=e.instance;if(t)for(var r in t)t[r].destroy(!0)}));var d=function(t){function n(){var e=null!==t&&t.apply(this,arguments)||this;return e.name="Sprite",e.sprites={},e}return o(n,t),n.prototype.init=function(){this.renderSystem=this.game.getSystem(r.RendererSystem),this.renderSystem.rendererManager.register(this)},n.prototype.rendererUpdate=function(e){var t=e.transform.size,r=t.width,n=t.height;this.sprites[e.id]&&(this.sprites[e.id].sprite.width=r,this.sprites[e.id].sprite.height=n)},n.prototype.componentChanged=function(t){return r=this,n=void 0,o=function(){var r,n,i,o,s;return c(this,(function(a){switch(a.label){case 0:return"Sprite"!==t.componentName?[3,5]:(r=t.gameObject.id,n=t.component,t.type!==e.OBSERVER_TYPE.ADD?[3,2]:(s=new h(null),this.sprites[t.gameObject.id]=s,this.containerManager.getContainer(t.gameObject.id).addChildAt(s.sprite,0),i=this.increaseAsyncId(r),[4,e.resource.getResource(n.resource)]));case 1:return o=a.sent().instance,this.validateAsyncId(r,i)?o?(s.image=o[n.resource+"_s|r|c_"+n.spriteName],[3,5]):(console.error("GameObject:"+t.gameObject.name+"'s Sprite resource load error"),[2]):[2];case 2:return t.type!==e.OBSERVER_TYPE.CHANGE?[3,4]:(i=this.increaseAsyncId(r),[4,e.resource.getResource(n.resource)]);case 3:return o=a.sent().instance,this.validateAsyncId(r,i)?o?(this.sprites[t.gameObject.id].image=o[n.resource+"_s|r|c_"+n.spriteName],[3,5]):(console.error("GameObject:"+t.gameObject.name+"'s Sprite resource load error"),[2]):[2];case 4:t.type===e.OBSERVER_TYPE.REMOVE&&(this.increaseAsyncId(r),s=this.sprites[t.gameObject.id],this.containerManager.getContainer(t.gameObject.id).removeChild(s.sprite),s.sprite.destroy({children:!0}),delete this.sprites[t.gameObject.id]),a.label=5;case 5:return[2]}}))},new((i=void 0)||(i=Promise))((function(e,t){function s(e){try{c(o.next(e))}catch(e){t(e)}}function a(e){try{c(o.throw(e))}catch(e){t(e)}}function c(t){t.done?e(t.value):new i((function(e){e(t.value)})).then(s,a)}c((o=o.apply(r,n||[])).next())}));var r,n,i,o},n.systemName="Sprite",n=s([e.decorators.componentObserver({Sprite:["spriteName"]})],n)}(r.Renderer);exports.Sprite=l,exports.SpriteSystem=d;

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

@@ -1,5 +1,5 @@
 import { Component, resource, RESOURCE_TYPE, decorators, OBSERVER_TYPE } from '@eva/eva.js';
-import { type } from '@eva/inspector-decorator';
+import { Field } from '@eva/inspector-decorator';
 import { RendererSystem, Renderer } from '@eva/plugin-renderer';
 import { Texture, Sprite as Sprite$5, BaseTexture, Spritesheet } from 'pixi.js';
 
@@ -39,6 +39,10 @@ function __decorate(decorators, target, key, desc) {
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 
+function __metadata(metadataKey, metadataValue) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
+}
+
 function __awaiter(thisArg, _arguments, P, generator) {
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
@@ -103,10 +107,12 @@ var Sprite$3 = (function (_super) {
     };
     Sprite.componentName = 'Sprite';
     __decorate([
-        type('string')
+        Field(),
+        __metadata("design:type", String)
     ], Sprite.prototype, "resource", void 0);
     __decorate([
-        type('string')
+        Field(),
+        __metadata("design:type", String)
     ], Sprite.prototype, "spriteName", void 0);
     return Sprite;
 }(Component));
@@ -223,52 +229,54 @@ var Sprite = (function (_super) {
     };
     Sprite.prototype.componentChanged = function (changed) {
         return __awaiter(this, void 0, void 0, function () {
-            var component_1, sprite_1, instance, sprite;
-            var _this = this;
+            var gameObjectId, component, sprite, asyncId, instance, asyncId, instance, sprite;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!(changed.componentName === 'Sprite')) return [3, 4];
-                        component_1 = changed.component;
-                        if (!(changed.type === OBSERVER_TYPE.ADD)) return [3, 1];
-                        sprite_1 = new SpriteEngine(null);
-                        resource.getResource(component_1.resource).then(function (_a) {
-                            var instance = _a.instance;
-                            return __awaiter(_this, void 0, void 0, function () {
-                                return __generator(this, function (_b) {
-                                    if (!instance) {
-                                        console.error("GameObject:" + changed.gameObject.name + "'s Sprite resource load error");
-                                        return [2];
-                                    }
-                                    sprite_1.image = instance[component_1.resource + resourceKeySplit + component_1.spriteName];
-                                    return [2];
-                                });
-                            });
-                        });
-                        this.sprites[changed.gameObject.id] = sprite_1;
-                        this.containerManager.getContainer(changed.gameObject.id).addChildAt(sprite_1.sprite, 0);
-                        return [3, 4];
+                        if (!(changed.componentName === 'Sprite')) return [3, 5];
+                        gameObjectId = changed.gameObject.id;
+                        component = changed.component;
+                        if (!(changed.type === OBSERVER_TYPE.ADD)) return [3, 2];
+                        sprite = new SpriteEngine(null);
+                        this.sprites[changed.gameObject.id] = sprite;
+                        this.containerManager.getContainer(changed.gameObject.id).addChildAt(sprite.sprite, 0);
+                        asyncId = this.increaseAsyncId(gameObjectId);
+                        return [4, resource.getResource(component.resource)];
                     case 1:
-                        if (!(changed.type === OBSERVER_TYPE.CHANGE)) return [3, 3];
-                        return [4, resource.getResource(component_1.resource)];
+                        instance = (_a.sent()).instance;
+                        if (!this.validateAsyncId(gameObjectId, asyncId))
+                            return [2];
+                        if (!instance) {
+                            console.error("GameObject:" + changed.gameObject.name + "'s Sprite resource load error");
+                            return [2];
+                        }
+                        sprite.image = instance[component.resource + resourceKeySplit + component.spriteName];
+                        return [3, 5];
                     case 2:
+                        if (!(changed.type === OBSERVER_TYPE.CHANGE)) return [3, 4];
+                        asyncId = this.increaseAsyncId(gameObjectId);
+                        return [4, resource.getResource(component.resource)];
+                    case 3:
                         instance = (_a.sent()).instance;
+                        if (!this.validateAsyncId(gameObjectId, asyncId))
+                            return [2];
                         if (!instance) {
                             console.error("GameObject:" + changed.gameObject.name + "'s Sprite resource load error");
                             return [2];
                         }
                         this.sprites[changed.gameObject.id].image =
-                            instance[component_1.resource + resourceKeySplit + component_1.spriteName];
-                        return [3, 4];
-                    case 3:
+                            instance[component.resource + resourceKeySplit + component.spriteName];
+                        return [3, 5];
+                    case 4:
                         if (changed.type === OBSERVER_TYPE.REMOVE) {
+                            this.increaseAsyncId(gameObjectId);
                             sprite = this.sprites[changed.gameObject.id];
                             this.containerManager.getContainer(changed.gameObject.id).removeChild(sprite.sprite);
                             sprite.sprite.destroy({ children: true });
                             delete this.sprites[changed.gameObject.id];
                         }
-                        _a.label = 4;
-                    case 4: return [2];
+                        _a.label = 5;
+                    case 5: return [2];
                 }
             });
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eva/plugin-renderer-sprite",
-  "version": "1.2.6",
+  "version": "1.2.7-editor.2",
   "description": "@eva/plugin-renderer-sprite",
   "main": "index.js",
   "module": "dist/plugin-renderer-sprite.esm.js",
@@ -18,9 +18,9 @@
   "license": "MIT",
   "homepage": "https://eva.js.org",
   "dependencies": {
-    "@eva/inspector-decorator": "^0.0.5",
-    "@eva/plugin-renderer": "1.2.6",
-    "@eva/eva.js": "1.2.6",
+    "@eva/inspector-decorator": "0.1.0-alpha.1",
+    "@eva/plugin-renderer": "1.2.7-editor.2",
+    "@eva/eva.js": "1.2.7-editor.2",
     "pixi.js": "^4.8.7"
   }
 }