@eva/plugin-renderer-img 1.2.5 → 1.2.7

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

@@ -278,43 +278,49 @@ var _EVA_IIFE_img = function (exports, eva_js, pluginRenderer, rendererAdapter,
       var _a, _b;
 
       return __awaiter(this, void 0, void 0, function () {
-        var component, sprite_1, instance, sprite;
+        var component, sprite, asyncId, instance, asyncId, instance, sprite;
         return __generator(this, function (_c) {
           switch (_c.label) {
             case 0:
-              if (!(changed.componentName === 'Img')) return [3, 4];
+              if (!(changed.componentName === 'Img')) return [3, 5];
               component = changed.component;
-              if (!(changed.type === eva_js.OBSERVER_TYPE.ADD)) return [3, 1];
-              sprite_1 = new rendererAdapter.Sprite(null);
-              eva_js.resource.getResource(component.resource).then(function (_a) {
-                var instance = _a.instance;
+              if (!(changed.type === eva_js.OBSERVER_TYPE.ADD)) return [3, 2];
+              sprite = new rendererAdapter.Sprite(null);
+              this.imgs[changed.gameObject.id] = sprite;
+              this.containerManager.getContainer(changed.gameObject.id).addChildAt(sprite.sprite, 0);
+              asyncId = this.increaseAsyncId(changed.gameObject.id);
+              return [4, eva_js.resource.getResource(component.resource)];
 
-                if (!instance) {
-                  console.error("GameObject:" + changed.gameObject.name + "'s Img resource load error");
-                }
+            case 1:
+              instance = _c.sent().instance;
+              if (!this.validateAsyncId(changed.gameObject.id, asyncId)) return [2];
 
-                sprite_1.image = instance;
-              });
-              this.imgs[changed.gameObject.id] = sprite_1;
-              this.containerManager.getContainer(changed.gameObject.id).addChildAt(sprite_1.sprite, 0);
-              return [3, 4];
+              if (!instance) {
+                console.error("GameObject:" + changed.gameObject.name + "'s Img resource load error");
+              }
 
-            case 1:
-              if (!(changed.type === eva_js.OBSERVER_TYPE.CHANGE)) return [3, 3];
-              return [4, eva_js.resource.getResource(component.resource)];
+              this.imgs[changed.gameObject.id].image = instance;
+              return [3, 5];
 
             case 2:
+              if (!(changed.type === eva_js.OBSERVER_TYPE.CHANGE)) return [3, 4];
+              asyncId = this.increaseAsyncId(changed.gameObject.id);
+              return [4, eva_js.resource.getResource(component.resource)];
+
+            case 3:
               instance = _c.sent().instance;
+              if (!this.validateAsyncId(changed.gameObject.id, asyncId)) return [2];
 
               if (!instance) {
                 console.error("GameObject:" + changed.gameObject.name + "'s Img resource load error");
               }
 
               this.imgs[changed.gameObject.id].image = instance;
-              return [3, 4];
+              return [3, 5];
 
-            case 3:
+            case 4:
               if (changed.type === eva_js.OBSERVER_TYPE.REMOVE) {
+                this.increaseAsyncId(changed.gameObject.id);
                 sprite = this.imgs[changed.gameObject.id];
                 if (!sprite) return [2];
                 (_b = (_a = this.containerManager) === null || _a === void 0 ? void 0 : _a.getContainer(changed.gameObject.id)) === null || _b === void 0 ? void 0 : _b.removeChild(sprite.sprite);
@@ -324,9 +330,9 @@ var _EVA_IIFE_img = function (exports, eva_js, pluginRenderer, rendererAdapter,
                 delete this.imgs[changed.gameObject.id];
               }
 
-              _c.label = 4;
+              _c.label = 5;
 
-            case 4:
+            case 5:
               return [2];
           }
         });

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

@@ -1 +1 @@
-var _EVA_IIFE_img=function(e,t,r,n,o){"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 c(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,c=i<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)c=Reflect.decorate(e,t,r,n);else for(var s=e.length-1;s>=0;s--)(o=e[s])&&(c=(i<3?o(c):i>3?o(t,r,c):o(t,r))||c);return i>3&&c&&Object.defineProperty(t,r,c),c}function a(e,t,r,n){return new(r||(r=Promise))((function(o,i){function c(e){try{a(n.next(e))}catch(e){i(e)}}function s(e){try{a(n.throw(e))}catch(e){i(e)}}function a(e){var t;e.done?o(e.value):(t=e.value,t instanceof r?t:new r((function(e){e(t)}))).then(c,s)}a((n=n.apply(e,t||[])).next())}))}function u(e,t){var r,n,o,i,c={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(;c;)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 c.label++,{value:i[1],done:!1};case 5:c.label++,n=i[1],i=[0];continue;case 7:i=c.ops.pop(),c.trys.pop();continue;default:if(!(o=c.trys,(o=o.length>0&&o[o.length-1])||6!==i[0]&&2!==i[0])){c=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]<o[3])){c.label=i[1];break}if(6===i[0]&&c.label<o[1]){c.label=o[1],o=i;break}if(o&&c.label<o[2]){c.label=o[2],c.ops.push(i);break}o[2]&&c.ops.pop(),c.trys.pop();continue}i=t.call(e,c)}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){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 l=function(e){function t(){var t=null!==e&&e.apply(this,arguments)||this;return t.resource="",t}return c(t,e),t.prototype.init=function(e){e&&e.resource&&(this.resource=e.resource)},t.componentName="Img",s([p("string")],t.prototype,"resource",void 0),t}(t.Component);t.resource.registerInstance(t.RESOURCE_TYPE.IMAGE,(function(e){var t=e.data,r=(void 0===t?{}:t).image;if(r)return o.Texture.from(r)})),t.resource.registerDestroy(t.RESOURCE_TYPE.IMAGE,(function(e){var t=e.instance;t&&t.destroy(!0)}));var f=function(e){function o(){var t=null!==e&&e.apply(this,arguments)||this;return t.name="Img",t.imgs={},t}return c(o,e),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.imgs[e.id]&&(this.imgs[e.id].sprite.width=r,this.imgs[e.id].sprite.height=n)},o.prototype.componentChanged=function(e){var r,o;return a(this,void 0,void 0,(function(){var i,c,s,a;return u(this,(function(u){switch(u.label){case 0:return"Img"!==e.componentName?[3,4]:(i=e.component,e.type!==t.OBSERVER_TYPE.ADD?[3,1]:(c=new n.Sprite(null),t.resource.getResource(i.resource).then((function(t){var r=t.instance;r||console.error("GameObject:"+e.gameObject.name+"'s Img resource load error"),c.image=r})),this.imgs[e.gameObject.id]=c,this.containerManager.getContainer(e.gameObject.id).addChildAt(c.sprite,0),[3,4]));case 1:return e.type!==t.OBSERVER_TYPE.CHANGE?[3,3]:[4,t.resource.getResource(i.resource)];case 2:return(s=u.sent().instance)||console.error("GameObject:"+e.gameObject.name+"'s Img resource load error"),this.imgs[e.gameObject.id].image=s,[3,4];case 3:if(e.type===t.OBSERVER_TYPE.REMOVE){if(!(a=this.imgs[e.gameObject.id]))return[2];null===(o=null===(r=this.containerManager)||void 0===r?void 0:r.getContainer(e.gameObject.id))||void 0===o||o.removeChild(a.sprite),a.sprite.destroy({children:!0}),delete this.imgs[e.gameObject.id]}u.label=4;case 4:return[2]}}))}))},o.systemName="Img",o=s([t.decorators.componentObserver({Img:[{prop:["resource"],deep:!1}]})],o)}(r.Renderer);return e.Img=l,e.ImgSystem=f,Object.defineProperty(e,"__esModule",{value:!0}),e}({},EVA,EVA.plugin.renderer,EVA.rendererAdapter,PIXI);
+window.EVA=window.EVA||{},window.EVA.plugin=window.EVA.plugin||{},window.EVA.plugin.renderer=window.EVA.plugin.renderer||{};var _EVA_IIFE_img=function(e,t,r,n,o){"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 c(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,c=i<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)c=Reflect.decorate(e,t,r,n);else for(var s=e.length-1;s>=0;s--)(o=e[s])&&(c=(i<3?o(c):i>3?o(t,r,c):o(t,r))||c);return i>3&&c&&Object.defineProperty(t,r,c),c}function a(e,t,r,n){return new(r||(r=Promise))((function(o,i){function c(e){try{a(n.next(e))}catch(e){i(e)}}function s(e){try{a(n.throw(e))}catch(e){i(e)}}function a(e){var t;e.done?o(e.value):(t=e.value,t instanceof r?t:new r((function(e){e(t)}))).then(c,s)}a((n=n.apply(e,t||[])).next())}))}function u(e,t){var r,n,o,i,c={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(;c;)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 c.label++,{value:i[1],done:!1};case 5:c.label++,n=i[1],i=[0];continue;case 7:i=c.ops.pop(),c.trys.pop();continue;default:if(!(o=c.trys,(o=o.length>0&&o[o.length-1])||6!==i[0]&&2!==i[0])){c=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]<o[3])){c.label=i[1];break}if(6===i[0]&&c.label<o[1]){c.label=o[1],o=i;break}if(o&&c.label<o[2]){c.label=o[2],c.ops.push(i);break}o[2]&&c.ops.pop(),c.trys.pop();continue}i=t.call(e,c)}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 l(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 p=function(e){function t(){var t=null!==e&&e.apply(this,arguments)||this;return t.resource="",t}return c(t,e),t.prototype.init=function(e){e&&e.resource&&(this.resource=e.resource)},t.componentName="Img",s([l("string")],t.prototype,"resource",void 0),t}(t.Component);t.resource.registerInstance(t.RESOURCE_TYPE.IMAGE,(function(e){var t=e.data,r=(void 0===t?{}:t).image;if(r)return o.Texture.from(r)})),t.resource.registerDestroy(t.RESOURCE_TYPE.IMAGE,(function(e){var t=e.instance;t&&t.destroy(!0)}));var d=function(e){function o(){var t=null!==e&&e.apply(this,arguments)||this;return t.name="Img",t.imgs={},t}return c(o,e),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.imgs[e.id]&&(this.imgs[e.id].sprite.width=r,this.imgs[e.id].sprite.height=n)},o.prototype.componentChanged=function(e){var r,o;return a(this,void 0,void 0,(function(){var i,c,s,a;return u(this,(function(u){switch(u.label){case 0:return"Img"!==e.componentName?[3,5]:(i=e.component,e.type!==t.OBSERVER_TYPE.ADD?[3,2]:(a=new n.Sprite(null),this.imgs[e.gameObject.id]=a,this.containerManager.getContainer(e.gameObject.id).addChildAt(a.sprite,0),c=this.increaseAsyncId(e.gameObject.id),[4,t.resource.getResource(i.resource)]));case 1:return s=u.sent().instance,this.validateAsyncId(e.gameObject.id,c)?(s||console.error("GameObject:"+e.gameObject.name+"'s Img resource load error"),this.imgs[e.gameObject.id].image=s,[3,5]):[2];case 2:return e.type!==t.OBSERVER_TYPE.CHANGE?[3,4]:(c=this.increaseAsyncId(e.gameObject.id),[4,t.resource.getResource(i.resource)]);case 3:return s=u.sent().instance,this.validateAsyncId(e.gameObject.id,c)?(s||console.error("GameObject:"+e.gameObject.name+"'s Img resource load error"),this.imgs[e.gameObject.id].image=s,[3,5]):[2];case 4:if(e.type===t.OBSERVER_TYPE.REMOVE){if(this.increaseAsyncId(e.gameObject.id),!(a=this.imgs[e.gameObject.id]))return[2];null===(o=null===(r=this.containerManager)||void 0===r?void 0:r.getContainer(e.gameObject.id))||void 0===o||o.removeChild(a.sprite),a.sprite.destroy({children:!0}),delete this.imgs[e.gameObject.id]}u.label=5;case 5:return[2]}}))}))},o.systemName="Img",o=s([t.decorators.componentObserver({Img:[{prop:["resource"],deep:!1}]})],o)}(r.Renderer);return e.Img=p,e.ImgSystem=d,Object.defineProperty(e,"__esModule",{value:!0}),e}({},EVA,EVA.plugin.renderer,EVA.rendererAdapter,PIXI);window.EVA.plugin.renderer.img=window.EVA.plugin.renderer.img||_EVA_IIFE_img;

package/dist/miniprogram.js

@@ -80,43 +80,49 @@ var Img = function (_super) {
     var _a, _b;
 
     return __awaiter(this, void 0, void 0, function () {
-      var component, sprite_1, instance, sprite;
+      var component, sprite, asyncId, instance, asyncId, instance, sprite;
       return __generator(this, function (_c) {
         switch (_c.label) {
           case 0:
-            if (!(changed.componentName === 'Img')) return [3, 4];
+            if (!(changed.componentName === 'Img')) return [3, 5];
             component = changed.component;
-            if (!(changed.type === OBSERVER_TYPE.ADD)) return [3, 1];
-            sprite_1 = new Sprite(null);
-            resource.getResource(component.resource).then(function (_a) {
-              var instance = _a.instance;
+            if (!(changed.type === OBSERVER_TYPE.ADD)) return [3, 2];
+            sprite = new Sprite(null);
+            this.imgs[changed.gameObject.id] = sprite;
+            this.containerManager.getContainer(changed.gameObject.id).addChildAt(sprite.sprite, 0);
+            asyncId = this.increaseAsyncId(changed.gameObject.id);
+            return [4, resource.getResource(component.resource)];
 
-              if (!instance) {
-                console.error("GameObject:" + changed.gameObject.name + "'s Img resource load error");
-              }
+          case 1:
+            instance = _c.sent().instance;
+            if (!this.validateAsyncId(changed.gameObject.id, asyncId)) return [2];
 
-              sprite_1.image = instance;
-            });
-            this.imgs[changed.gameObject.id] = sprite_1;
-            this.containerManager.getContainer(changed.gameObject.id).addChildAt(sprite_1.sprite, 0);
-            return [3, 4];
+            if (!instance) {
+              console.error("GameObject:" + changed.gameObject.name + "'s Img resource load error");
+            }
 
-          case 1:
-            if (!(changed.type === OBSERVER_TYPE.CHANGE)) return [3, 3];
-            return [4, resource.getResource(component.resource)];
+            this.imgs[changed.gameObject.id].image = instance;
+            return [3, 5];
 
           case 2:
+            if (!(changed.type === OBSERVER_TYPE.CHANGE)) return [3, 4];
+            asyncId = this.increaseAsyncId(changed.gameObject.id);
+            return [4, resource.getResource(component.resource)];
+
+          case 3:
             instance = _c.sent().instance;
+            if (!this.validateAsyncId(changed.gameObject.id, asyncId)) return [2];
 
             if (!instance) {
               console.error("GameObject:" + changed.gameObject.name + "'s Img resource load error");
             }
 
             this.imgs[changed.gameObject.id].image = instance;
-            return [3, 4];
+            return [3, 5];
 
-          case 3:
+          case 4:
             if (changed.type === OBSERVER_TYPE.REMOVE) {
+              this.increaseAsyncId(changed.gameObject.id);
               sprite = this.imgs[changed.gameObject.id];
               if (!sprite) return [2];
               (_b = (_a = this.containerManager) === null || _a === void 0 ? void 0 : _a.getContainer(changed.gameObject.id)) === null || _b === void 0 ? void 0 : _b.removeChild(sprite.sprite);
@@ -126,9 +132,9 @@ var Img = function (_super) {
               delete this.imgs[changed.gameObject.id];
             }
 
-            _c.label = 4;
+            _c.label = 5;
 
-          case 4:
+          case 5:
             return [2];
         }
       });

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

@@ -138,36 +138,43 @@ var Img = (function (_super) {
     Img.prototype.componentChanged = function (changed) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var component, sprite_1, instance, sprite;
+            var component, sprite, asyncId, instance, asyncId, instance, sprite;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        if (!(changed.componentName === 'Img')) return [3, 4];
+                        if (!(changed.componentName === 'Img')) return [3, 5];
                         component = changed.component;
-                        if (!(changed.type === eva_js.OBSERVER_TYPE.ADD)) return [3, 1];
-                        sprite_1 = new rendererAdapter.Sprite(null);
-                        eva_js.resource.getResource(component.resource).then(function (_a) {
-                            var instance = _a.instance;
-                            if (!instance) {
-                                console.error("GameObject:" + changed.gameObject.name + "'s Img resource load error");
-                            }
-                            sprite_1.image = instance;
-                        });
-                        this.imgs[changed.gameObject.id] = sprite_1;
-                        this.containerManager.getContainer(changed.gameObject.id).addChildAt(sprite_1.sprite, 0);
-                        return [3, 4];
-                    case 1:
-                        if (!(changed.type === eva_js.OBSERVER_TYPE.CHANGE)) return [3, 3];
+                        if (!(changed.type === eva_js.OBSERVER_TYPE.ADD)) return [3, 2];
+                        sprite = new rendererAdapter.Sprite(null);
+                        this.imgs[changed.gameObject.id] = sprite;
+                        this.containerManager.getContainer(changed.gameObject.id).addChildAt(sprite.sprite, 0);
+                        asyncId = this.increaseAsyncId(changed.gameObject.id);
                         return [4, eva_js.resource.getResource(component.resource)];
-                    case 2:
+                    case 1:
                         instance = (_c.sent()).instance;
+                        if (!this.validateAsyncId(changed.gameObject.id, asyncId))
+                            return [2];
                         if (!instance) {
                             console.error("GameObject:" + changed.gameObject.name + "'s Img resource load error");
                         }
                         this.imgs[changed.gameObject.id].image = instance;
-                        return [3, 4];
+                        return [3, 5];
+                    case 2:
+                        if (!(changed.type === eva_js.OBSERVER_TYPE.CHANGE)) return [3, 4];
+                        asyncId = this.increaseAsyncId(changed.gameObject.id);
+                        return [4, eva_js.resource.getResource(component.resource)];
                     case 3:
+                        instance = (_c.sent()).instance;
+                        if (!this.validateAsyncId(changed.gameObject.id, asyncId))
+                            return [2];
+                        if (!instance) {
+                            console.error("GameObject:" + changed.gameObject.name + "'s Img resource load error");
+                        }
+                        this.imgs[changed.gameObject.id].image = instance;
+                        return [3, 5];
+                    case 4:
                         if (changed.type === eva_js.OBSERVER_TYPE.REMOVE) {
+                            this.increaseAsyncId(changed.gameObject.id);
                             sprite = this.imgs[changed.gameObject.id];
                             if (!sprite)
                                 return [2];
@@ -175,8 +182,8 @@ var Img = (function (_super) {
                             sprite.sprite.destroy({ children: true });
                             delete this.imgs[changed.gameObject.id];
                         }
-                        _c.label = 4;
-                    case 4: return [2];
+                        _c.label = 5;
+                    case 5: return [2];
                 }
             });
         });

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@eva/inspector-decorator"),r=require("@eva/eva.js"),t=require("@eva/plugin-renderer"),n=require("@eva/renderer-adapter"),o=require("pixi.js"),i=function(e,r){return(i=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,r){e.__proto__=r}||function(e,r){for(var t in r)r.hasOwnProperty(t)&&(e[t]=r[t])})(e,r)};function c(e,r){function t(){this.constructor=e}i(e,r),e.prototype=null===r?Object.create(r):(t.prototype=r.prototype,new t)}function a(e,r,t,n){var o,i=arguments.length,c=i<3?r:null===n?n=Object.getOwnPropertyDescriptor(r,t):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)c=Reflect.decorate(e,r,t,n);else for(var a=e.length-1;a>=0;a--)(o=e[a])&&(c=(i<3?o(c):i>3?o(r,t,c):o(r,t))||c);return i>3&&c&&Object.defineProperty(r,t,c),c}function s(e,r){var t,n,o,i,c={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function a(i){return function(a){return function(i){if(t)throw new TypeError("Generator is already executing.");for(;c;)try{if(t=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 c.label++,{value:i[1],done:!1};case 5:c.label++,n=i[1],i=[0];continue;case 7:i=c.ops.pop(),c.trys.pop();continue;default:if(!(o=c.trys,(o=o.length>0&&o[o.length-1])||6!==i[0]&&2!==i[0])){c=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]<o[3])){c.label=i[1];break}if(6===i[0]&&c.label<o[1]){c.label=o[1],o=i;break}if(o&&c.label<o[2]){c.label=o[2],c.ops.push(i);break}o[2]&&c.ops.pop(),c.trys.pop();continue}i=r.call(e,c)}catch(e){i=[6,e],n=0}finally{t=o=0}if(5&i[0])throw i[1];return{value:i[0]?i[1]:void 0,done:!0}}([i,a])}}}var u=function(r){function t(){var e=null!==r&&r.apply(this,arguments)||this;return e.resource="",e}return c(t,r),t.prototype.init=function(e){e&&e.resource&&(this.resource=e.resource)},t.componentName="Img",a([e.type("string")],t.prototype,"resource",void 0),t}(r.Component);r.resource.registerInstance(r.RESOURCE_TYPE.IMAGE,(function(e){var r=e.data,t=(void 0===r?{}:r).image;if(t)return o.Texture.from(t)})),r.resource.registerDestroy(r.RESOURCE_TYPE.IMAGE,(function(e){var r=e.instance;r&&r.destroy(!0)}));var p=function(e){function o(){var r=null!==e&&e.apply(this,arguments)||this;return r.name="Img",r.imgs={},r}return c(o,e),o.prototype.init=function(){this.renderSystem=this.game.getSystem(t.RendererSystem),this.renderSystem.rendererManager.register(this)},o.prototype.rendererUpdate=function(e){var r=e.transform.size,t=r.width,n=r.height;this.imgs[e.id]&&(this.imgs[e.id].sprite.width=t,this.imgs[e.id].sprite.height=n)},o.prototype.componentChanged=function(e){var t,o,i,c,a,u;return i=this,c=void 0,u=function(){var i,c,a,u;return s(this,(function(s){switch(s.label){case 0:return"Img"!==e.componentName?[3,4]:(i=e.component,e.type!==r.OBSERVER_TYPE.ADD?[3,1]:(c=new n.Sprite(null),r.resource.getResource(i.resource).then((function(r){var t=r.instance;t||console.error("GameObject:"+e.gameObject.name+"'s Img resource load error"),c.image=t})),this.imgs[e.gameObject.id]=c,this.containerManager.getContainer(e.gameObject.id).addChildAt(c.sprite,0),[3,4]));case 1:return e.type!==r.OBSERVER_TYPE.CHANGE?[3,3]:[4,r.resource.getResource(i.resource)];case 2:return(a=s.sent().instance)||console.error("GameObject:"+e.gameObject.name+"'s Img resource load error"),this.imgs[e.gameObject.id].image=a,[3,4];case 3:if(e.type===r.OBSERVER_TYPE.REMOVE){if(!(u=this.imgs[e.gameObject.id]))return[2];null===(o=null===(t=this.containerManager)||void 0===t?void 0:t.getContainer(e.gameObject.id))||void 0===o||o.removeChild(u.sprite),u.sprite.destroy({children:!0}),delete this.imgs[e.gameObject.id]}s.label=4;case 4:return[2]}}))},new((a=void 0)||(a=Promise))((function(e,r){function t(e){try{o(u.next(e))}catch(e){r(e)}}function n(e){try{o(u.throw(e))}catch(e){r(e)}}function o(r){r.done?e(r.value):new a((function(e){e(r.value)})).then(t,n)}o((u=u.apply(i,c||[])).next())}))},o.systemName="Img",o=a([r.decorators.componentObserver({Img:[{prop:["resource"],deep:!1}]})],o)}(t.Renderer);exports.Img=u,exports.ImgSystem=p;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@eva/inspector-decorator"),t=require("@eva/eva.js"),r=require("@eva/plugin-renderer"),n=require("@eva/renderer-adapter"),i=require("pixi.js"),o=function(e,t){return(o=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var r in t)t.hasOwnProperty(r)&&(e[r]=t[r])})(e,t)};function s(e,t){function r(){this.constructor=e}o(e,t),e.prototype=null===t?Object.create(t):(r.prototype=t.prototype,new r)}function c(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 c=e.length-1;c>=0;c--)(i=e[c])&&(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){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:c(0),throw:c(1),return:c(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function c(o){return function(c){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,c])}}}var u=function(t){function r(){var e=null!==t&&t.apply(this,arguments)||this;return e.resource="",e}return s(r,t),r.prototype.init=function(e){e&&e.resource&&(this.resource=e.resource)},r.componentName="Img",c([e.type("string")],r.prototype,"resource",void 0),r}(t.Component);t.resource.registerInstance(t.RESOURCE_TYPE.IMAGE,(function(e){var t=e.data,r=(void 0===t?{}:t).image;if(r)return i.Texture.from(r)})),t.resource.registerDestroy(t.RESOURCE_TYPE.IMAGE,(function(e){var t=e.instance;t&&t.destroy(!0)}));var l=function(e){function i(){var t=null!==e&&e.apply(this,arguments)||this;return t.name="Img",t.imgs={},t}return s(i,e),i.prototype.init=function(){this.renderSystem=this.game.getSystem(r.RendererSystem),this.renderSystem.rendererManager.register(this)},i.prototype.rendererUpdate=function(e){var t=e.transform.size,r=t.width,n=t.height;this.imgs[e.id]&&(this.imgs[e.id].sprite.width=r,this.imgs[e.id].sprite.height=n)},i.prototype.componentChanged=function(e){var r,i,o,s,c,u;return o=this,s=void 0,u=function(){var o,s,c,u;return a(this,(function(a){switch(a.label){case 0:return"Img"!==e.componentName?[3,5]:(o=e.component,e.type!==t.OBSERVER_TYPE.ADD?[3,2]:(u=new n.Sprite(null),this.imgs[e.gameObject.id]=u,this.containerManager.getContainer(e.gameObject.id).addChildAt(u.sprite,0),s=this.increaseAsyncId(e.gameObject.id),[4,t.resource.getResource(o.resource)]));case 1:return c=a.sent().instance,this.validateAsyncId(e.gameObject.id,s)?(c||console.error("GameObject:"+e.gameObject.name+"'s Img resource load error"),this.imgs[e.gameObject.id].image=c,[3,5]):[2];case 2:return e.type!==t.OBSERVER_TYPE.CHANGE?[3,4]:(s=this.increaseAsyncId(e.gameObject.id),[4,t.resource.getResource(o.resource)]);case 3:return c=a.sent().instance,this.validateAsyncId(e.gameObject.id,s)?(c||console.error("GameObject:"+e.gameObject.name+"'s Img resource load error"),this.imgs[e.gameObject.id].image=c,[3,5]):[2];case 4:if(e.type===t.OBSERVER_TYPE.REMOVE){if(this.increaseAsyncId(e.gameObject.id),!(u=this.imgs[e.gameObject.id]))return[2];null===(i=null===(r=this.containerManager)||void 0===r?void 0:r.getContainer(e.gameObject.id))||void 0===i||i.removeChild(u.sprite),u.sprite.destroy({children:!0}),delete this.imgs[e.gameObject.id]}a.label=5;case 5:return[2]}}))},new((c=void 0)||(c=Promise))((function(e,t){function r(e){try{i(u.next(e))}catch(e){t(e)}}function n(e){try{i(u.throw(e))}catch(e){t(e)}}function i(t){t.done?e(t.value):new c((function(e){e(t.value)})).then(r,n)}i((u=u.apply(o,s||[])).next())}))},i.systemName="Img",i=c([t.decorators.componentObserver({Img:[{prop:["resource"],deep:!1}]})],i)}(r.Renderer);exports.Img=u,exports.ImgSystem=l;

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

@@ -134,36 +134,43 @@ var Img = (function (_super) {
     Img.prototype.componentChanged = function (changed) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var component, sprite_1, instance, sprite;
+            var component, sprite, asyncId, instance, asyncId, instance, sprite;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        if (!(changed.componentName === 'Img')) return [3, 4];
+                        if (!(changed.componentName === 'Img')) return [3, 5];
                         component = changed.component;
-                        if (!(changed.type === OBSERVER_TYPE.ADD)) return [3, 1];
-                        sprite_1 = new Sprite(null);
-                        resource.getResource(component.resource).then(function (_a) {
-                            var instance = _a.instance;
-                            if (!instance) {
-                                console.error("GameObject:" + changed.gameObject.name + "'s Img resource load error");
-                            }
-                            sprite_1.image = instance;
-                        });
-                        this.imgs[changed.gameObject.id] = sprite_1;
-                        this.containerManager.getContainer(changed.gameObject.id).addChildAt(sprite_1.sprite, 0);
-                        return [3, 4];
-                    case 1:
-                        if (!(changed.type === OBSERVER_TYPE.CHANGE)) return [3, 3];
+                        if (!(changed.type === OBSERVER_TYPE.ADD)) return [3, 2];
+                        sprite = new Sprite(null);
+                        this.imgs[changed.gameObject.id] = sprite;
+                        this.containerManager.getContainer(changed.gameObject.id).addChildAt(sprite.sprite, 0);
+                        asyncId = this.increaseAsyncId(changed.gameObject.id);
                         return [4, resource.getResource(component.resource)];
-                    case 2:
+                    case 1:
                         instance = (_c.sent()).instance;
+                        if (!this.validateAsyncId(changed.gameObject.id, asyncId))
+                            return [2];
                         if (!instance) {
                             console.error("GameObject:" + changed.gameObject.name + "'s Img resource load error");
                         }
                         this.imgs[changed.gameObject.id].image = instance;
-                        return [3, 4];
+                        return [3, 5];
+                    case 2:
+                        if (!(changed.type === OBSERVER_TYPE.CHANGE)) return [3, 4];
+                        asyncId = this.increaseAsyncId(changed.gameObject.id);
+                        return [4, resource.getResource(component.resource)];
                     case 3:
+                        instance = (_c.sent()).instance;
+                        if (!this.validateAsyncId(changed.gameObject.id, asyncId))
+                            return [2];
+                        if (!instance) {
+                            console.error("GameObject:" + changed.gameObject.name + "'s Img resource load error");
+                        }
+                        this.imgs[changed.gameObject.id].image = instance;
+                        return [3, 5];
+                    case 4:
                         if (changed.type === OBSERVER_TYPE.REMOVE) {
+                            this.increaseAsyncId(changed.gameObject.id);
                             sprite = this.imgs[changed.gameObject.id];
                             if (!sprite)
                                 return [2];
@@ -171,8 +178,8 @@ var Img = (function (_super) {
                             sprite.sprite.destroy({ children: true });
                             delete this.imgs[changed.gameObject.id];
                         }
-                        _c.label = 4;
-                    case 4: return [2];
+                        _c.label = 5;
+                    case 5: return [2];
                 }
             });
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eva/plugin-renderer-img",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "@eva/plugin-renderer-img",
   "main": "index.js",
   "module": "dist/plugin-renderer-img.esm.js",
@@ -19,9 +19,9 @@
   "homepage": "https://eva.js.org",
   "dependencies": {
     "@eva/inspector-decorator": "^0.0.5",
-    "@eva/plugin-renderer": "1.2.5",
-    "@eva/renderer-adapter": "1.2.5",
-    "@eva/eva.js": "1.2.5",
+    "@eva/plugin-renderer": "1.2.7",
+    "@eva/renderer-adapter": "1.2.7",
+    "@eva/eva.js": "1.2.7",
     "pixi.js": "^4.8.7"
   }
 }