@eva/spine-base 2.1.0-beta.11 → 2.1.0-beta.12

package/README.md

@@ -4,3 +4,19 @@ More Introduction
 
 - [EN](https://eva.js.org)
 - [中文](https://eva-engine.gitee.io)
+
+## Slot object readiness
+
+`Spine#addSlotObject(slot, gameObject, options)` is safe to call before the
+Spine armature, renderer container manager, or target GameObject container is
+ready. The component keeps the latest request for each GameObject and mounts it
+once all three dependencies are available.
+
+- Repeating the call for one GameObject replaces its previous pending or mounted
+  slot request.
+- `removeSlotObject(gameObject)` cancels both pending and mounted requests.
+- Destroying the Spine component destroys pending and mounted slot GameObjects.
+- Invalid slots are discarded with a warning after skeleton metadata becomes
+  available.
+
+Do not force a resource reload merely to retry a slot mount.

package/dist/EVA.plugin.spineBase.js

@@ -182,6 +182,7 @@ var _EVA_IIFE_spineBase = function (exports, eva_js, pluginRenderer, pixi_js) {
         }
       }
       this.waitExecuteInfos = [];
+      this._flushPendingSlotObjects();
     }
     get armature() {
       return this._armature;
@@ -212,8 +213,8 @@ var _EVA_IIFE_spineBase = function (exports, eva_js, pluginRenderer, pixi_js) {
     }
     destroy() {
       this.onDestroy();
+      this._destroySlotGameObjects();
       if (this.armature && !this.armature.destroyed) {
-        this._destroySlotGameObjects();
         this.armature.destroy({
           children: true
         });
@@ -324,24 +325,22 @@ var _EVA_IIFE_spineBase = function (exports, eva_js, pluginRenderer, pixi_js) {
       return this.armature.skeleton.findBone(boneName);
     }
     addSlotObject(slot, gameObject, options) {
-      if (!this.armature) {
-        console.warn('Spine armature is not ready, cannot addSlotObject');
-        return;
-      }
-      if (!this._containerManager) {
-        console.warn('ContainerManager is not available');
+      if (this.destroied) {
+        console.warn('Spine component has been destroyed, cannot addSlotObject');
         return;
       }
-      const container = this._containerManager.getContainer(gameObject.id);
-      if (!container) {
-        this._pendingSlotObjects.push({
-          slot,
-          gameObject,
-          options
-        });
+      if (!gameObject || gameObject.destroyed) {
+        console.warn('Cannot add a destroyed or missing GameObject to a Spine slot');
         return;
       }
-      this._doAddSlotObject(slot, gameObject, container, options);
+      this._pendingSlotObjects = this._pendingSlotObjects.filter(pending => pending.gameObject !== gameObject);
+      this._detachSlotObject(gameObject);
+      this._pendingSlotObjects.push({
+        slot,
+        gameObject,
+        options
+      });
+      this._flushPendingSlotObjects();
     }
     _doAddSlotObject(slot, gameObject, container, options) {
       const wrapper = new pixi_js.Container();
@@ -353,6 +352,31 @@ var _EVA_IIFE_spineBase = function (exports, eva_js, pluginRenderer, pixi_js) {
       });
       this._syncTransformTree(gameObject);
     }
+    _isSlotAvailable(slot) {
+      var _a, _b, _c, _d;
+      if (typeof slot === 'number') {
+        if (!Number.isInteger(slot) || slot < 0) return false;
+        const slots = (_b = (_a = this.armature) === null || _a === void 0 ? void 0 : _a.skeleton) === null || _b === void 0 ? void 0 : _b.slots;
+        return !Array.isArray(slots) || slot < slots.length;
+      }
+      if (typeof slot !== 'string' || slot.length === 0) return false;
+      const findSlot = (_d = (_c = this.armature) === null || _c === void 0 ? void 0 : _c.skeleton) === null || _d === void 0 ? void 0 : _d.findSlot;
+      return typeof findSlot !== 'function' || Boolean(findSlot.call(this.armature.skeleton, slot));
+    }
+    _detachSlotObject(gameObject) {
+      const entry = this._slotGameObjects.get(gameObject);
+      if (!entry) return;
+      if (this.armature && !this.armature.destroyed) {
+        this.armature.removeSlotObject(entry.wrapper);
+      }
+      for (const child of [...entry.wrapper.children]) {
+        entry.wrapper.removeChild(child);
+      }
+      entry.wrapper.destroy({
+        children: false
+      });
+      this._slotGameObjects.delete(gameObject);
+    }
     _syncTransformTree(gameObject) {
       var _a;
       if (!this._containerManager) return;
@@ -369,39 +393,39 @@ var _EVA_IIFE_spineBase = function (exports, eva_js, pluginRenderer, pixi_js) {
       }
     }
     _flushPendingSlotObjects() {
-      if (this._pendingSlotObjects.length === 0) return;
+      if (this.destroied || this._pendingSlotObjects.length === 0) return;
       if (!this.armature || !this._containerManager) return;
       const still = [];
-      for (const pending of this._pendingSlotObjects) {
+      const pendingSlotObjects = this._pendingSlotObjects;
+      this._pendingSlotObjects = [];
+      for (const pending of pendingSlotObjects) {
+        if (pending.gameObject.destroyed) continue;
+        if (!this._isSlotAvailable(pending.slot)) {
+          console.warn(`Spine slot "${pending.slot}" does not exist; pending slot object was discarded`);
+          continue;
+        }
         const container = this._containerManager.getContainer(pending.gameObject.id);
         if (container) {
-          this._doAddSlotObject(pending.slot, pending.gameObject, container, pending.options);
+          try {
+            this._doAddSlotObject(pending.slot, pending.gameObject, container, pending.options);
+          } catch (error) {
+            console.warn(`Failed to add GameObject to Spine slot "${pending.slot}"`, error);
+          }
         } else {
           still.push(pending);
         }
       }
-      this._pendingSlotObjects = still;
+      this._pendingSlotObjects.push(...still);
     }
     removeSlotObject(gameObject) {
       this._pendingSlotObjects = this._pendingSlotObjects.filter(p => p.gameObject !== gameObject);
-      const entry = this._slotGameObjects.get(gameObject);
-      if (entry && this.armature) {
-        this.armature.removeSlotObject(entry.wrapper);
-        entry.wrapper.destroy({
-          children: false
-        });
-      }
-      this._slotGameObjects.delete(gameObject);
+      this._detachSlotObject(gameObject);
     }
     _destroySlotGameObjects() {
-      for (const [gameObject, entry] of this._slotGameObjects) {
+      const gameObjects = new Set([...this._slotGameObjects.keys(), ...this._pendingSlotObjects.map(pending => pending.gameObject)]);
+      for (const gameObject of gameObjects) {
+        this._detachSlotObject(gameObject);
         if (!gameObject.destroyed) {
-          if (this.armature) {
-            this.armature.removeSlotObject(entry.wrapper);
-          }
-          entry.wrapper.destroy({
-            children: false
-          });
           gameObject.destroy();
         }
       }
@@ -453,17 +477,25 @@ var _EVA_IIFE_spineBase = function (exports, eva_js, pluginRenderer, pixi_js) {
       return data.spineData;
     });
   }
-  function releaseSpineData(res, _imageSrc) {
+  function releaseSpineData(res, _imageSrc, destroyResource = true) {
     const resourceName = res.name;
     const data = dataMap[resourceName];
     if (!data) {
       return;
     }
     data.ref--;
+    if (data.ref > 0) {
+      return;
+    }
+    if (dataMap[resourceName] === data) {
+      delete dataMap[resourceName];
+    }
+    if (!destroyResource) {
+      return;
+    }
     setTimeout(() => __awaiter(this, void 0, void 0, function* () {
-      if (data.ref <= 0) {
+      if (data.ref <= 0 && !dataMap[resourceName]) {
         eva_js.resource.destroy(resourceName);
-        delete dataMap[resourceName];
       }
     }), 100);
   }
@@ -520,6 +552,7 @@ var _EVA_IIFE_spineBase = function (exports, eva_js, pluginRenderer, pixi_js) {
         const armature = this.armatures[key];
         const component = this._spineComponents[key];
         if (!armature || armature.destroyed || (component === null || component === void 0 ? void 0 : component.destroied)) {
+          this.releaseComponentResource(component);
           delete this.armatures[key];
           delete this._spineComponents[key];
           continue;
@@ -529,6 +562,7 @@ var _EVA_IIFE_spineBase = function (exports, eva_js, pluginRenderer, pixi_js) {
       for (let key in this._spineComponents) {
         const component = this._spineComponents[key];
         if (!component || component.destroied) {
+          this.releaseComponentResource(component);
           delete this._spineComponents[key];
           continue;
         }
@@ -639,7 +673,7 @@ var _EVA_IIFE_spineBase = function (exports, eva_js, pluginRenderer, pixi_js) {
       this.add(changed);
     }
     remove(changed) {
-      var _a, _b, _c, _d, _e, _f;
+      var _a, _b;
       return __awaiter(this, void 0, void 0, function* () {
         const gameObjectId = changed.gameObject.id;
         this.increaseAsyncId(gameObjectId);
@@ -661,19 +695,40 @@ var _EVA_IIFE_spineBase = function (exports, eva_js, pluginRenderer, pixi_js) {
               children: true
             });
           }
-          if (!component.keepResource && component.lastResource) {
-            try {
-              const res = yield eva_js.resource.getResource(component.lastResource);
-              const imageSrc = ((_d = (_c = res.data) === null || _c === void 0 ? void 0 : _c.image) === null || _d === void 0 ? void 0 : _d.src) || ((_f = (_e = res.data) === null || _e === void 0 ? void 0 : _e.image) === null || _f === void 0 ? void 0 : _f.label);
-              releaseSpineData(res, imageSrc);
-            } catch (error) {
-              console.warn('Failed to release Spine resource', component.lastResource, error);
-            }
-          }
         }
+        this.releaseComponentResource(component);
         if (changed.type === eva_js.OBSERVER_TYPE.CHANGE) ;
       });
     }
+    onDestroy() {
+      for (const key of Object.keys(this._spineComponents)) {
+        const component = this._spineComponents[+key];
+        const armature = this.armatures[+key];
+        component === null || component === void 0 ? void 0 : component._destroySlotGameObjects();
+        if (armature && !armature.destroyed) {
+          armature.destroy({
+            children: true
+          });
+        }
+        if (component) {
+          component.armature = null;
+        }
+        this.releaseComponentResource(component);
+      }
+      this.armatures = {};
+      this._spineComponents = {};
+      this.asyncIdMap = {};
+    }
+    releaseComponentResource(component) {
+      const resourceName = component === null || component === void 0 ? void 0 : component.lastResource;
+      if (!component || !resourceName) {
+        return;
+      }
+      component.lastResource = '';
+      releaseSpineData({
+        name: resourceName
+      }, '', !component.keepResource);
+    }
   };
   SpineSystem.systemName = 'SpineSystem';
   SpineSystem = __decorate([eva_js.decorators.componentObserver({

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

@@ -1 +1 @@
-function _extends(){return _extends=Object.assign?Object.assign.bind():function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var i in n)({}).hasOwnProperty.call(n,i)&&(e[i]=n[i])}return e},_extends.apply(null,arguments)}globalThis.EVA=globalThis.EVA||{},globalThis.EVA.plugin=globalThis.EVA.plugin||{};var _EVA_IIFE_spineBase=function(e,t,n,i){"use strict";function r(e,t,n,i){var r,s=arguments.length,o=s<3?t:null===i?i=Object.getOwnPropertyDescriptor(t,n):i;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(e,t,n,i);else for(var a=e.length-1;a>=0;a--)(r=e[a])&&(o=(s<3?r(o):s>3?r(t,n,o):r(t,n))||o);return s>3&&o&&Object.defineProperty(t,n,o),o}function s(e,t){if("object"==typeof Reflect&&"function"==typeof Reflect.metadata)return Reflect.metadata(e,t)}function o(e,t,n,i){return new(n||(n=Promise))(function(r,s){function o(e){try{c(i.next(e))}catch(e){s(e)}}function a(e){try{c(i.throw(e))}catch(e){s(e)}}function c(e){var t;e.done?r(e.value):(t=e.value,t instanceof n?t:new n(function(e){e(t)})).then(o,a)}c((i=i.apply(e,t||[])).next())})}"function"==typeof SuppressedError&&SuppressedError,"function"==typeof SuppressedError&&SuppressedError;class a extends Error{constructor(){super("Symbol keys are not supported yet!"),Object.setPrototypeOf(this,new.target.prototype)}}const c="IDE_PROPERTY_METADATA";function l(e,t,n,i){let r=Reflect.getMetadata("design:type",e,t),s=r===Array;const o=function(e){return e===String?"string":e===Number?"number":e===Boolean?"boolean":"unknown"}(r);if("unknown"!==o&&(r=o),i){const e=i();Array.isArray(e)?(s=!0,r=e[0]):r=e}const a=Reflect.getMetadata(c,e.constructor)||{},l=_extends(_extends(_extends({},a[t]||{}),{type:r,isArray:s}),n);a[t]=l,Reflect.defineMetadata(c,a,e.constructor);!function(e,t,n){const i=e.constructor,r=i.IDEProps||{};r[t]=_extends(_extends({key:t},r[t]),n),i.IDEProps=r}(e,t,function(e,t){var n={};for(var i in e)Object.prototype.hasOwnProperty.call(e,i)&&t.indexOf(i)<0&&(n[i]=e[i]);if(null!=e&&"function"==typeof Object.getOwnPropertySymbols){var r=0;for(i=Object.getOwnPropertySymbols(e);r<i.length;r++)t.indexOf(i[r])<0&&Object.prototype.propertyIsEnumerable.call(e,i[r])&&(n[i[r]]=e[i[r]])}return n}(l,["isArray"]))}function d(e){return t={type:e},(e,i)=>{if("symbol"==typeof i)throw new a;const{options:r,returnTypeFunc:s}=function(e,t){return"function"==typeof e?{returnTypeFunc:e,options:t||{}}:{options:e||{}}}(t,n);l(e,i,r,s)};var t,n}var u;!function(e){e[e.Edit=2]="Edit",e[e.Game=4]="Game",e[e.All=6]="All"}(u||(u={}));class m extends t.Component{constructor(e){super(e),this.resource="",this.scale=1,this.animationName="",this.autoPlay=!0,this.keepResource=!1,this.timeScale=1,this.skin="",this._slotGameObjects=new Map,this._pendingSlotObjects=[],this.waitExecuteInfos=[],this.listenerBound=!1,this.paused=!1,this.init(e)}set armature(e){if(this._armature=e,e){this.applyTimeScale(),this.skin&&this.setSkin(this.skin),this.autoPlay&&this.play(this.animationName);for(const e of this.waitExecuteInfos)if(e.playType){const{name:t,loop:n,track:i}=e;this.play(t,n,i)}else this.stop(e.track);this.waitExecuteInfos=[]}}get armature(){return this._armature}init(e){e&&_extends(this,e),this.listenerBound||(this.listenerBound=!0,this.on("start",e=>{var t;null===(t=this.onStart)||void 0===t||t.call(this,e)}),this.on("complete",e=>{var t;null===(t=this.onComplete)||void 0===t||t.call(this,e)}),this.on("event",(e,t)=>{var n;null===(n=this.onEvent)||void 0===n||n.call(this,e,t)}))}onDestroy(){this.destroied=!0}load(){return this.armature}destroy(){this.onDestroy(),this.armature&&!this.armature.destroyed&&(this._destroySlotGameObjects(),this.armature.destroy({children:!0})),this.armature=null}pause(){this.paused=!0,this.applyTimeScale()}resume(){this.paused=!1,this.applyTimeScale()}setSkin(e){var t,n,i,r,s;if(this.skin=e,null===(t=this.armature)||void 0===t?void 0:t.skeleton){if(this.armature.skeleton.setSkinByName)this.armature.skeleton.setSkinByName(e);else if(this.armature.skeleton.setSkin){const t=(null===(i=null===(n=this.armature.skeleton.data)||void 0===n?void 0:n.findSkin)||void 0===i?void 0:i.call(n,e))||e;this.armature.skeleton.setSkin(t)}null===(s=(r=this.armature.skeleton).setSlotsToSetupPose)||void 0===s||s.call(r)}}play(e,t,n){try{const i=null!=t?t:this.autoPlay;e&&(this.animationName=e),this.armature?(void 0===n&&(n=0),this.applyTimeScale(),this.armature.state.setAnimation(n,this.animationName,i)):this.waitExecuteInfos.push({playType:!0,name:e,loop:i,track:n})}catch(e){console.log(e)}}stop(e){this.armature?(void 0===e&&(e=0),this.armature.state.setEmptyAnimation(e,0)):this.waitExecuteInfos.push({playType:!1,track:e})}applyTimeScale(){var e;(null===(e=this.armature)||void 0===e?void 0:e.state)&&(this.armature.state.timeScale=this.paused?0:this.timeScale)}addAnimation(e,t,n,i){try{this.armature&&(void 0===i&&(i=0),this.armature.state.addAnimation(i,e,n,t))}catch(e){console.log(e)}}setMix(e,t,n){this.armature&&this.armature.state.data.setMix(e,t,n)}getAnim(e=0){try{if(this.armature)return this.armature.state.tracks[e].animation.name}catch(e){console.log(e)}}setDefaultMix(e){this.armature&&(this.armature.state.data.defaultMix=e)}setAttachment(e,t){this.armature&&this.armature.skeleton.setAttachment(e,t)}getBone(e){if(this.armature)return this.armature.skeleton.findBone(e)}addSlotObject(e,t,n){if(!this.armature)return void console.warn("Spine armature is not ready, cannot addSlotObject");if(!this._containerManager)return void console.warn("ContainerManager is not available");const i=this._containerManager.getContainer(t.id);i?this._doAddSlotObject(e,t,i,n):this._pendingSlotObjects.push({slot:e,gameObject:t,options:n})}_doAddSlotObject(e,t,n,r){const s=new i.Container;s.addChild(n),this.armature.addSlotObject(e,s,r),this._slotGameObjects.set(t,{slot:e,wrapper:s}),this._syncTransformTree(t)}_syncTransformTree(e){var t;if(this._containerManager&&(this._containerManager.updateTransform({name:e.id,transform:e.transform}),null===(t=e.transform)||void 0===t?void 0:t.children))for(const t of e.transform.children)t.gameObject&&this._syncTransformTree(t.gameObject)}_flushPendingSlotObjects(){if(0===this._pendingSlotObjects.length)return;if(!this.armature||!this._containerManager)return;const e=[];for(const t of this._pendingSlotObjects){const n=this._containerManager.getContainer(t.gameObject.id);n?this._doAddSlotObject(t.slot,t.gameObject,n,t.options):e.push(t)}this._pendingSlotObjects=e}removeSlotObject(e){this._pendingSlotObjects=this._pendingSlotObjects.filter(t=>t.gameObject!==e);const t=this._slotGameObjects.get(e);t&&this.armature&&(this.armature.removeSlotObject(t.wrapper),t.wrapper.destroy({children:!1})),this._slotGameObjects.delete(e)}_destroySlotGameObjects(){for(const[e,t]of this._slotGameObjects)e.destroyed||(this.armature&&this.armature.removeSlotObject(t.wrapper),t.wrapper.destroy({children:!1}),e.destroy());this._slotGameObjects.clear(),this._pendingSlotObjects=[]}}m.componentName="Spine",r([d("string"),s("design:type",String)],m.prototype,"resource",void 0),r([d("number"),s("design:type",Number)],m.prototype,"scale",void 0),r([d("string"),s("design:type",String)],m.prototype,"animationName",void 0),r([d("boolean"),s("design:type",Boolean)],m.prototype,"autoPlay",void 0),r([d("boolean"),s("design:type",Boolean)],m.prototype,"keepResource",void 0),r([d("number"),s("design:type",Number)],m.prototype,"timeScale",void 0),r([d("string"),s("design:type",String)],m.prototype,"skin",void 0);let p={};function h(e,t,n){return o(this,void 0,void 0,function*(){let i=p[e.name];if(!i)if(e.complete)i=function(e,t,n,i){const r=t.ske,s=t.atlas,o=new i.AtlasAttachmentLoader(s),a=r instanceof Uint8Array?new i.SkeletonBinary(o):new i.SkeletonJson(o);a.scale=n||1;const c={spineData:a.readSkeletonData(r),ref:0,imageSrc:(l=t.image,l?"string"==typeof l?l:l.label||(null===(d=l.source)||void 0===d?void 0:d.label)||(null===(m=null===(u=l.source)||void 0===u?void 0:u.resource)||void 0===m?void 0:m.src)||(null===(h=l.source)||void 0===h?void 0:h._sourceOrigin)||l.src||(null===(y=l.baseTexture)||void 0===y?void 0:y.cacheId)||"":"")};var l,d,u,m,h,y;return p[e]=c,c}(e.name,e.data,t,n);else if(!i)return;return i.ref++,i.spineData})}let y=class extends n.Renderer{constructor(){super(...arguments),this.armatures={},this._spineComponents={}}init({pixiSpine:e}){this.renderSystem=this.game.getSystem(n.RendererSystem),this.renderSystem.rendererManager.register(this),this.pixiSpine=e,this.game.canvas.addEventListener("webglcontextrestored",()=>{const e=this.game.gameObjects;let n=[];for(let i in this.armatures){const r=+i;for(let i=0;i<e.length;++i){let s=e[i];if(s.id===r){let e=s.getComponent(m);e&&(this.remove({type:t.OBSERVER_TYPE.REMOVE,gameObject:s,component:e,componentName:m.componentName}),n.push({type:t.OBSERVER_TYPE.ADD,gameObject:s,component:e,componentName:m.componentName}));break}}}setTimeout(()=>{n.forEach(e=>{this.add(e)})},1e3)},!1)}update(e){super.update();for(let t in this.armatures){const n=this.armatures[t],i=this._spineComponents[t];!n||n.destroyed||(null==i?void 0:i.destroied)?(delete this.armatures[t],delete this._spineComponents[t]):n.update(.001*e.deltaTime)}for(let e in this._spineComponents){const t=this._spineComponents[e];t&&!t.destroied?t._flushPendingSlotObjects():delete this._spineComponents[e]}}componentChanged(e){return o(this,void 0,void 0,function*(){if("Spine"===e.componentName)if(e.type===t.OBSERVER_TYPE.ADD)this.add(e);else if(e.type===t.OBSERVER_TYPE.CHANGE){if("resource"===e.prop.prop[0])this.change(e)}else e.type===t.OBSERVER_TYPE.REMOVE&&this.remove(e)})}add(e,n){var i,r,s;return o(this,void 0,void 0,function*(){const o=e.component;clearTimeout(o.addHandler);const a=e.gameObject.id,c=this.increaseAsyncId(a),l=yield t.resource.getResource(o.resource);if(!this.validateAsyncId(a,c)||o.destroied||e.gameObject.destroyed)return;const d=yield h(l,o.scale,this.pixiSpine);if(!this.validateAsyncId(a,c)||o.destroied||e.gameObject.destroyed)return;if(!d)return void(o.addHandler=setTimeout(()=>{o.destroied||e.gameObject.destroyed||(void 0===n&&(n=20),--n>0?this.add(e,n):console.log("retry exceed max times",o.resource))},1e3));this.remove(e);const u=null===(r=null===(i=this.renderSystem)||void 0===i?void 0:i.containerManager)||void 0===r?void 0:r.getContainer(e.gameObject.id);if(!u||o.destroied||e.gameObject.destroyed)return;o.lastResource=o.resource;const m=new this.pixiSpine.Spine({skeletonData:d,autoUpdate:!1});if(this.armatures[e.gameObject.id]=m,this._spineComponents[e.gameObject.id]=o,e.gameObject&&e.gameObject.transform){const t=e.gameObject.transform;m.x=t.size.width*t.origin.x,m.y=t.size.height*t.origin.y}u.addChildAt(m,0),m.update(),o._containerManager=null===(s=this.renderSystem)||void 0===s?void 0:s.containerManager,o.armature=m,o.emit("loaded",{resource:o.resource}),m.state.addListener({start:(e,t)=>{o.emit("start",{track:e,name:e.animation.name})},complete:(e,t)=>{o.emit("complete",{track:e,name:e.animation.name})},interrupt:(e,t)=>{o.emit("interrupt",{track:e,name:e.animation.name})},end:(e,t)=>{o.emit("end",{track:e,name:e.animation.name})},event:(e,t)=>{o.emit("event",e,t)}})})}change(e){this.remove(e),this.add(e)}remove(e){var n,i,r,s,a,c;return o(this,void 0,void 0,function*(){const l=e.gameObject.id;this.increaseAsyncId(l);const d=e.component;clearTimeout(d.addHandler);const u=this.armatures[l],m=null===(i=null===(n=this.renderSystem)||void 0===n?void 0:n.containerManager)||void 0===i?void 0:i.getContainer(l);m&&u&&m.removeChild(u);const h=d.armature;if(d.armature=null,delete this.armatures[l],delete this._spineComponents[l],h&&(d._destroySlotGameObjects(),h.destroyed||h.destroy({children:!0}),!d.keepResource&&d.lastResource))try{const e=yield t.resource.getResource(d.lastResource);(null===(s=null===(r=e.data)||void 0===r?void 0:r.image)||void 0===s?void 0:s.src)||(null===(c=null===(a=e.data)||void 0===a?void 0:a.image)||void 0===c||c.label);!function(e){const n=e.name,i=p[n];i&&(i.ref--,setTimeout(()=>o(this,void 0,void 0,function*(){i.ref<=0&&(t.resource.destroy(n),delete p[n])}),100))}(e)}catch(e){console.warn("Failed to release Spine resource",d.lastResource,e)}e.type,t.OBSERVER_TYPE.CHANGE})}};y.systemName="SpineSystem",y=r([t.decorators.componentObserver({Spine:["resource"]})],y);var f=y;return t.resource.registerResourceType("SPINE"),e.Spine=m,e.SpineSystem=f,Object.defineProperty(e,"__esModule",{value:!0}),e}({},EVA,EVA.plugin.renderer,PIXI);globalThis.EVA.plugin.spineBase=globalThis.EVA.plugin.spineBase||_EVA_IIFE_spineBase;
+function _extends(){return _extends=Object.assign?Object.assign.bind():function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var s in n)({}).hasOwnProperty.call(n,s)&&(e[s]=n[s])}return e},_extends.apply(null,arguments)}globalThis.EVA=globalThis.EVA||{},globalThis.EVA.plugin=globalThis.EVA.plugin||{};var _EVA_IIFE_spineBase=function(e,t,n,s){"use strict";function o(e,t,n,s){var o,i=arguments.length,r=i<3?t:null===s?s=Object.getOwnPropertyDescriptor(t,n):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)r=Reflect.decorate(e,t,n,s);else for(var a=e.length-1;a>=0;a--)(o=e[a])&&(r=(i<3?o(r):i>3?o(t,n,r):o(t,n))||r);return i>3&&r&&Object.defineProperty(t,n,r),r}function i(e,t){if("object"==typeof Reflect&&"function"==typeof Reflect.metadata)return Reflect.metadata(e,t)}function r(e,t,n,s){return new(n||(n=Promise))(function(o,i){function r(e){try{l(s.next(e))}catch(e){i(e)}}function a(e){try{l(s.throw(e))}catch(e){i(e)}}function l(e){var t;e.done?o(e.value):(t=e.value,t instanceof n?t:new n(function(e){e(t)})).then(r,a)}l((s=s.apply(e,t||[])).next())})}"function"==typeof SuppressedError&&SuppressedError,"function"==typeof SuppressedError&&SuppressedError;class a extends Error{constructor(){super("Symbol keys are not supported yet!"),Object.setPrototypeOf(this,new.target.prototype)}}const l="IDE_PROPERTY_METADATA";function c(e,t,n,s){let o=Reflect.getMetadata("design:type",e,t),i=o===Array;const r=function(e){return e===String?"string":e===Number?"number":e===Boolean?"boolean":"unknown"}(o);if("unknown"!==r&&(o=r),s){const e=s();Array.isArray(e)?(i=!0,o=e[0]):o=e}const a=Reflect.getMetadata(l,e.constructor)||{},c=_extends(_extends(_extends({},a[t]||{}),{type:o,isArray:i}),n);a[t]=c,Reflect.defineMetadata(l,a,e.constructor);!function(e,t,n){const s=e.constructor,o=s.IDEProps||{};o[t]=_extends(_extends({key:t},o[t]),n),s.IDEProps=o}(e,t,function(e,t){var n={};for(var s in e)Object.prototype.hasOwnProperty.call(e,s)&&t.indexOf(s)<0&&(n[s]=e[s]);if(null!=e&&"function"==typeof Object.getOwnPropertySymbols){var o=0;for(s=Object.getOwnPropertySymbols(e);o<s.length;o++)t.indexOf(s[o])<0&&Object.prototype.propertyIsEnumerable.call(e,s[o])&&(n[s[o]]=e[s[o]])}return n}(c,["isArray"]))}function d(e){return t={type:e},(e,s)=>{if("symbol"==typeof s)throw new a;const{options:o,returnTypeFunc:i}=function(e,t){return"function"==typeof e?{returnTypeFunc:e,options:t||{}}:{options:e||{}}}(t,n);c(e,s,o,i)};var t,n}var u;!function(e){e[e.Edit=2]="Edit",e[e.Game=4]="Game",e[e.All=6]="All"}(u||(u={}));class m extends t.Component{constructor(e){super(e),this.resource="",this.scale=1,this.animationName="",this.autoPlay=!0,this.keepResource=!1,this.timeScale=1,this.skin="",this._slotGameObjects=new Map,this._pendingSlotObjects=[],this.waitExecuteInfos=[],this.listenerBound=!1,this.paused=!1,this.init(e)}set armature(e){if(this._armature=e,e){this.applyTimeScale(),this.skin&&this.setSkin(this.skin),this.autoPlay&&this.play(this.animationName);for(const e of this.waitExecuteInfos)if(e.playType){const{name:t,loop:n,track:s}=e;this.play(t,n,s)}else this.stop(e.track);this.waitExecuteInfos=[],this._flushPendingSlotObjects()}}get armature(){return this._armature}init(e){e&&_extends(this,e),this.listenerBound||(this.listenerBound=!0,this.on("start",e=>{var t;null===(t=this.onStart)||void 0===t||t.call(this,e)}),this.on("complete",e=>{var t;null===(t=this.onComplete)||void 0===t||t.call(this,e)}),this.on("event",(e,t)=>{var n;null===(n=this.onEvent)||void 0===n||n.call(this,e,t)}))}onDestroy(){this.destroied=!0}load(){return this.armature}destroy(){this.onDestroy(),this._destroySlotGameObjects(),this.armature&&!this.armature.destroyed&&this.armature.destroy({children:!0}),this.armature=null}pause(){this.paused=!0,this.applyTimeScale()}resume(){this.paused=!1,this.applyTimeScale()}setSkin(e){var t,n,s,o,i;if(this.skin=e,null===(t=this.armature)||void 0===t?void 0:t.skeleton){if(this.armature.skeleton.setSkinByName)this.armature.skeleton.setSkinByName(e);else if(this.armature.skeleton.setSkin){const t=(null===(s=null===(n=this.armature.skeleton.data)||void 0===n?void 0:n.findSkin)||void 0===s?void 0:s.call(n,e))||e;this.armature.skeleton.setSkin(t)}null===(i=(o=this.armature.skeleton).setSlotsToSetupPose)||void 0===i||i.call(o)}}play(e,t,n){try{const s=null!=t?t:this.autoPlay;e&&(this.animationName=e),this.armature?(void 0===n&&(n=0),this.applyTimeScale(),this.armature.state.setAnimation(n,this.animationName,s)):this.waitExecuteInfos.push({playType:!0,name:e,loop:s,track:n})}catch(e){console.log(e)}}stop(e){this.armature?(void 0===e&&(e=0),this.armature.state.setEmptyAnimation(e,0)):this.waitExecuteInfos.push({playType:!1,track:e})}applyTimeScale(){var e;(null===(e=this.armature)||void 0===e?void 0:e.state)&&(this.armature.state.timeScale=this.paused?0:this.timeScale)}addAnimation(e,t,n,s){try{this.armature&&(void 0===s&&(s=0),this.armature.state.addAnimation(s,e,n,t))}catch(e){console.log(e)}}setMix(e,t,n){this.armature&&this.armature.state.data.setMix(e,t,n)}getAnim(e=0){try{if(this.armature)return this.armature.state.tracks[e].animation.name}catch(e){console.log(e)}}setDefaultMix(e){this.armature&&(this.armature.state.data.defaultMix=e)}setAttachment(e,t){this.armature&&this.armature.skeleton.setAttachment(e,t)}getBone(e){if(this.armature)return this.armature.skeleton.findBone(e)}addSlotObject(e,t,n){this.destroied?console.warn("Spine component has been destroyed, cannot addSlotObject"):t&&!t.destroyed?(this._pendingSlotObjects=this._pendingSlotObjects.filter(e=>e.gameObject!==t),this._detachSlotObject(t),this._pendingSlotObjects.push({slot:e,gameObject:t,options:n}),this._flushPendingSlotObjects()):console.warn("Cannot add a destroyed or missing GameObject to a Spine slot")}_doAddSlotObject(e,t,n,o){const i=new s.Container;i.addChild(n),this.armature.addSlotObject(e,i,o),this._slotGameObjects.set(t,{slot:e,wrapper:i}),this._syncTransformTree(t)}_isSlotAvailable(e){var t,n,s,o;if("number"==typeof e){if(!Number.isInteger(e)||e<0)return!1;const s=null===(n=null===(t=this.armature)||void 0===t?void 0:t.skeleton)||void 0===n?void 0:n.slots;return!Array.isArray(s)||e<s.length}if("string"!=typeof e||0===e.length)return!1;const i=null===(o=null===(s=this.armature)||void 0===s?void 0:s.skeleton)||void 0===o?void 0:o.findSlot;return"function"!=typeof i||Boolean(i.call(this.armature.skeleton,e))}_detachSlotObject(e){const t=this._slotGameObjects.get(e);if(t){this.armature&&!this.armature.destroyed&&this.armature.removeSlotObject(t.wrapper);for(const e of[...t.wrapper.children])t.wrapper.removeChild(e);t.wrapper.destroy({children:!1}),this._slotGameObjects.delete(e)}}_syncTransformTree(e){var t;if(this._containerManager&&(this._containerManager.updateTransform({name:e.id,transform:e.transform}),null===(t=e.transform)||void 0===t?void 0:t.children))for(const t of e.transform.children)t.gameObject&&this._syncTransformTree(t.gameObject)}_flushPendingSlotObjects(){if(this.destroied||0===this._pendingSlotObjects.length)return;if(!this.armature||!this._containerManager)return;const e=[],t=this._pendingSlotObjects;this._pendingSlotObjects=[];for(const n of t){if(n.gameObject.destroyed)continue;if(!this._isSlotAvailable(n.slot)){console.warn(`Spine slot "${n.slot}" does not exist; pending slot object was discarded`);continue}const t=this._containerManager.getContainer(n.gameObject.id);if(t)try{this._doAddSlotObject(n.slot,n.gameObject,t,n.options)}catch(e){console.warn(`Failed to add GameObject to Spine slot "${n.slot}"`,e)}else e.push(n)}this._pendingSlotObjects.push(...e)}removeSlotObject(e){this._pendingSlotObjects=this._pendingSlotObjects.filter(t=>t.gameObject!==e),this._detachSlotObject(e)}_destroySlotGameObjects(){const e=new Set([...this._slotGameObjects.keys(),...this._pendingSlotObjects.map(e=>e.gameObject)]);for(const t of e)this._detachSlotObject(t),t.destroyed||t.destroy();this._slotGameObjects.clear(),this._pendingSlotObjects=[]}}m.componentName="Spine",o([d("string"),i("design:type",String)],m.prototype,"resource",void 0),o([d("number"),i("design:type",Number)],m.prototype,"scale",void 0),o([d("string"),i("design:type",String)],m.prototype,"animationName",void 0),o([d("boolean"),i("design:type",Boolean)],m.prototype,"autoPlay",void 0),o([d("boolean"),i("design:type",Boolean)],m.prototype,"keepResource",void 0),o([d("number"),i("design:type",Number)],m.prototype,"timeScale",void 0),o([d("string"),i("design:type",String)],m.prototype,"skin",void 0);let h={};function p(e,t,n){return r(this,void 0,void 0,function*(){let s=h[e.name];if(!s)if(e.complete)s=function(e,t,n,s){const o=t.ske,i=t.atlas,r=new s.AtlasAttachmentLoader(i),a=o instanceof Uint8Array?new s.SkeletonBinary(r):new s.SkeletonJson(r);a.scale=n||1;const l={spineData:a.readSkeletonData(o),ref:0,imageSrc:(c=t.image,c?"string"==typeof c?c:c.label||(null===(d=c.source)||void 0===d?void 0:d.label)||(null===(m=null===(u=c.source)||void 0===u?void 0:u.resource)||void 0===m?void 0:m.src)||(null===(p=c.source)||void 0===p?void 0:p._sourceOrigin)||c.src||(null===(f=c.baseTexture)||void 0===f?void 0:f.cacheId)||"":"")};var c,d,u,m,p,f;return h[e]=l,l}(e.name,e.data,t,n);else if(!s)return;return s.ref++,s.spineData})}let f=class extends n.Renderer{constructor(){super(...arguments),this.armatures={},this._spineComponents={}}init({pixiSpine:e}){this.renderSystem=this.game.getSystem(n.RendererSystem),this.renderSystem.rendererManager.register(this),this.pixiSpine=e,this.game.canvas.addEventListener("webglcontextrestored",()=>{const e=this.game.gameObjects;let n=[];for(let s in this.armatures){const o=+s;for(let s=0;s<e.length;++s){let i=e[s];if(i.id===o){let e=i.getComponent(m);e&&(this.remove({type:t.OBSERVER_TYPE.REMOVE,gameObject:i,component:e,componentName:m.componentName}),n.push({type:t.OBSERVER_TYPE.ADD,gameObject:i,component:e,componentName:m.componentName}));break}}}setTimeout(()=>{n.forEach(e=>{this.add(e)})},1e3)},!1)}update(e){super.update();for(let t in this.armatures){const n=this.armatures[t],s=this._spineComponents[t];!n||n.destroyed||(null==s?void 0:s.destroied)?(this.releaseComponentResource(s),delete this.armatures[t],delete this._spineComponents[t]):n.update(.001*e.deltaTime)}for(let e in this._spineComponents){const t=this._spineComponents[e];t&&!t.destroied?t._flushPendingSlotObjects():(this.releaseComponentResource(t),delete this._spineComponents[e])}}componentChanged(e){return r(this,void 0,void 0,function*(){if("Spine"===e.componentName)if(e.type===t.OBSERVER_TYPE.ADD)this.add(e);else if(e.type===t.OBSERVER_TYPE.CHANGE){if("resource"===e.prop.prop[0])this.change(e)}else e.type===t.OBSERVER_TYPE.REMOVE&&this.remove(e)})}add(e,n){var s,o,i;return r(this,void 0,void 0,function*(){const r=e.component;clearTimeout(r.addHandler);const a=e.gameObject.id,l=this.increaseAsyncId(a),c=yield t.resource.getResource(r.resource);if(!this.validateAsyncId(a,l)||r.destroied||e.gameObject.destroyed)return;const d=yield p(c,r.scale,this.pixiSpine);if(!this.validateAsyncId(a,l)||r.destroied||e.gameObject.destroyed)return;if(!d)return void(r.addHandler=setTimeout(()=>{r.destroied||e.gameObject.destroyed||(void 0===n&&(n=20),--n>0?this.add(e,n):console.log("retry exceed max times",r.resource))},1e3));this.remove(e);const u=null===(o=null===(s=this.renderSystem)||void 0===s?void 0:s.containerManager)||void 0===o?void 0:o.getContainer(e.gameObject.id);if(!u||r.destroied||e.gameObject.destroyed)return;r.lastResource=r.resource;const m=new this.pixiSpine.Spine({skeletonData:d,autoUpdate:!1});if(this.armatures[e.gameObject.id]=m,this._spineComponents[e.gameObject.id]=r,e.gameObject&&e.gameObject.transform){const t=e.gameObject.transform;m.x=t.size.width*t.origin.x,m.y=t.size.height*t.origin.y}u.addChildAt(m,0),m.update(),r._containerManager=null===(i=this.renderSystem)||void 0===i?void 0:i.containerManager,r.armature=m,r.emit("loaded",{resource:r.resource}),m.state.addListener({start:(e,t)=>{r.emit("start",{track:e,name:e.animation.name})},complete:(e,t)=>{r.emit("complete",{track:e,name:e.animation.name})},interrupt:(e,t)=>{r.emit("interrupt",{track:e,name:e.animation.name})},end:(e,t)=>{r.emit("end",{track:e,name:e.animation.name})},event:(e,t)=>{r.emit("event",e,t)}})})}change(e){this.remove(e),this.add(e)}remove(e){var n,s;return r(this,void 0,void 0,function*(){const o=e.gameObject.id;this.increaseAsyncId(o);const i=e.component;clearTimeout(i.addHandler);const r=this.armatures[o],a=null===(s=null===(n=this.renderSystem)||void 0===n?void 0:n.containerManager)||void 0===s?void 0:s.getContainer(o);a&&r&&a.removeChild(r);const l=i.armature;i.armature=null,delete this.armatures[o],delete this._spineComponents[o],l&&(i._destroySlotGameObjects(),l.destroyed||l.destroy({children:!0})),this.releaseComponentResource(i),e.type,t.OBSERVER_TYPE.CHANGE})}onDestroy(){for(const e of Object.keys(this._spineComponents)){const t=this._spineComponents[+e],n=this.armatures[+e];null==t||t._destroySlotGameObjects(),n&&!n.destroyed&&n.destroy({children:!0}),t&&(t.armature=null),this.releaseComponentResource(t)}this.armatures={},this._spineComponents={},this.asyncIdMap={}}releaseComponentResource(e){const n=null==e?void 0:e.lastResource;e&&n&&(e.lastResource="",function(e,n,s=!0){const o=e.name,i=h[o];i&&(i.ref--,i.ref>0||(h[o]===i&&delete h[o],s&&setTimeout(()=>r(this,void 0,void 0,function*(){i.ref<=0&&!h[o]&&t.resource.destroy(o)}),100)))}({name:n},0,!e.keepResource))}};f.systemName="SpineSystem",f=o([t.decorators.componentObserver({Spine:["resource"]})],f);var y=f;return t.resource.registerResourceType("SPINE"),e.Spine=m,e.SpineSystem=y,Object.defineProperty(e,"__esModule",{value:!0}),e}({},EVA,EVA.plugin.renderer,PIXI);globalThis.EVA.plugin.spineBase=globalThis.EVA.plugin.spineBase||_EVA_IIFE_spineBase;

package/dist/spine-base.cjs.js

@@ -119,7 +119,7 @@ class Spine extends eva_js.Component {
         this.timeScale = 1;
         /** 当前皮肤名称 */
         this.skin = '';
-        /** 挂载到插槽的 GameObject 映射（GameObject -> { slot, wrapper }） */
+        /** 挂载到插槽的 GameObject 及对应 slot/wrapper 映射 */
         this._slotGameObjects = new Map();
         /** 等待容器就绪的 slot 挂载请求 */
         this._pendingSlotObjects = [];
@@ -129,10 +129,7 @@ class Spine extends eva_js.Component {
         this.paused = false;
         this.init(params);
     }
-    /**
-     * 设置骨架实例
-     * 当骨架加载完成后自动执行等待队列中的动画操作
-     */
+    // 设置骨架实例；骨架加载完成后自动执行等待队列中的动画操作。
     set armature(val) {
         this._armature = val;
         if (!val)
@@ -153,6 +150,7 @@ class Spine extends eva_js.Component {
             }
         }
         this.waitExecuteInfos = [];
+        this._flushPendingSlotObjects();
     }
     /** 获取骨架实例 */
     get armature() {
@@ -194,8 +192,8 @@ class Spine extends eva_js.Component {
     }
     destroy() {
         this.onDestroy();
+        this._destroySlotGameObjects();
         if (this.armature && !this.armature.destroyed) {
-            this._destroySlotGameObjects();
             this.armature.destroy({ children: true });
         }
         this.armature = null;
@@ -399,21 +397,19 @@ class Spine extends eva_js.Component {
      * @param options.followAttachmentTimeline - 是否跟随插槽的附件时间线
      */
     addSlotObject(slot, gameObject, options) {
-        if (!this.armature) {
-            console.warn('Spine armature is not ready, cannot addSlotObject');
+        if (this.destroied) {
+            console.warn('Spine component has been destroyed, cannot addSlotObject');
             return;
         }
-        if (!this._containerManager) {
-            console.warn('ContainerManager is not available');
+        if (!gameObject || gameObject.destroyed) {
+            console.warn('Cannot add a destroyed or missing GameObject to a Spine slot');
             return;
         }
-        const container = this._containerManager.getContainer(gameObject.id);
-        if (!container) {
-            // 容器尚未就绪，加入 pending 队列，等待下一帧自动处理
-            this._pendingSlotObjects.push({ slot, gameObject, options });
-            return;
-        }
-        this._doAddSlotObject(slot, gameObject, container, options);
+        // 同一 GameObject 只保留最后一次挂载意图，避免依赖分阶段就绪时重复挂载。
+        this._pendingSlotObjects = this._pendingSlotObjects.filter(pending => pending.gameObject !== gameObject);
+        this._detachSlotObject(gameObject);
+        this._pendingSlotObjects.push({ slot, gameObject, options });
+        this._flushPendingSlotObjects();
     }
     _doAddSlotObject(slot, gameObject, container, options) {
         // 创建 wrapper 容器：Spine 骨骼矩阵作用在 wrapper 上，
@@ -426,6 +422,32 @@ class Spine extends eva_js.Component {
         // 手动同步 gameObject 及其子树的 transform 到 container
         this._syncTransformTree(gameObject);
     }
+    _isSlotAvailable(slot) {
+        var _a, _b, _c, _d;
+        if (typeof slot === 'number') {
+            if (!Number.isInteger(slot) || slot < 0)
+                return false;
+            const slots = (_b = (_a = this.armature) === null || _a === void 0 ? void 0 : _a.skeleton) === null || _b === void 0 ? void 0 : _b.slots;
+            return !Array.isArray(slots) || slot < slots.length;
+        }
+        if (typeof slot !== 'string' || slot.length === 0)
+            return false;
+        const findSlot = (_d = (_c = this.armature) === null || _c === void 0 ? void 0 : _c.skeleton) === null || _d === void 0 ? void 0 : _d.findSlot;
+        return typeof findSlot !== 'function' || Boolean(findSlot.call(this.armature.skeleton, slot));
+    }
+    _detachSlotObject(gameObject) {
+        const entry = this._slotGameObjects.get(gameObject);
+        if (!entry)
+            return;
+        if (this.armature && !this.armature.destroyed) {
+            this.armature.removeSlotObject(entry.wrapper);
+        }
+        for (const child of [...entry.wrapper.children]) {
+            entry.wrapper.removeChild(child);
+        }
+        entry.wrapper.destroy({ children: false });
+        this._slotGameObjects.delete(gameObject);
+    }
     /**
      * 递归同步 gameObject 及其子树的 transform 到对应的渲染容器
      */
@@ -449,21 +471,34 @@ class Spine extends eva_js.Component {
      * 处理等待容器就绪的 slot 挂载请求（由 SpineSystem 每帧调用）
      */
     _flushPendingSlotObjects() {
-        if (this._pendingSlotObjects.length === 0)
+        if (this.destroied || this._pendingSlotObjects.length === 0)
             return;
         if (!this.armature || !this._containerManager)
             return;
         const still = [];
-        for (const pending of this._pendingSlotObjects) {
+        const pendingSlotObjects = this._pendingSlotObjects;
+        this._pendingSlotObjects = [];
+        for (const pending of pendingSlotObjects) {
+            if (pending.gameObject.destroyed)
+                continue;
+            if (!this._isSlotAvailable(pending.slot)) {
+                console.warn(`Spine slot "${pending.slot}" does not exist; pending slot object was discarded`);
+                continue;
+            }
             const container = this._containerManager.getContainer(pending.gameObject.id);
             if (container) {
-                this._doAddSlotObject(pending.slot, pending.gameObject, container, pending.options);
+                try {
+                    this._doAddSlotObject(pending.slot, pending.gameObject, container, pending.options);
+                }
+                catch (error) {
+                    console.warn(`Failed to add GameObject to Spine slot "${pending.slot}"`, error);
+                }
             }
             else {
                 still.push(pending);
             }
         }
-        this._pendingSlotObjects = still;
+        this._pendingSlotObjects.push(...still);
     }
     /**
      * 从插槽上移除挂载的 GameObject
@@ -473,24 +508,19 @@ class Spine extends eva_js.Component {
     removeSlotObject(gameObject) {
         // 从 pending 队列中移除
         this._pendingSlotObjects = this._pendingSlotObjects.filter(p => p.gameObject !== gameObject);
-        const entry = this._slotGameObjects.get(gameObject);
-        if (entry && this.armature) {
-            this.armature.removeSlotObject(entry.wrapper);
-            entry.wrapper.destroy({ children: false });
-        }
-        this._slotGameObjects.delete(gameObject);
+        this._detachSlotObject(gameObject);
     }
     /**
      * 销毁所有挂载到插槽的 GameObject（内部使用）
      */
     _destroySlotGameObjects() {
-        for (const [gameObject, entry] of this._slotGameObjects) {
+        const gameObjects = new Set([
+            ...this._slotGameObjects.keys(),
+            ...this._pendingSlotObjects.map(pending => pending.gameObject),
+        ]);
+        for (const gameObject of gameObjects) {
+            this._detachSlotObject(gameObject);
             if (!gameObject.destroyed) {
-                // 先从 spine 插槽移除 wrapper，避免 destroy 时重复操作
-                if (this.armature) {
-                    this.armature.removeSlotObject(entry.wrapper);
-                }
-                entry.wrapper.destroy({ children: false });
                 gameObject.destroy();
             }
         }
@@ -574,17 +604,31 @@ function getSpineData(res, scale, pixiSpine) {
         return data.spineData;
     });
 }
-function releaseSpineData(res, _imageSrc) {
+function releaseSpineData(res, _imageSrc, destroyResource = true) {
     const resourceName = res.name;
     const data = dataMap[resourceName];
     if (!data) {
         return;
     }
     data.ref--;
+    if (data.ref > 0) {
+        return;
+    }
+    // Parsed skeleton data owns attachment objects that point at Pixi textures.
+    // Armature teardown can invalidate those objects even when the raw resource
+    // is intentionally kept. Remove this generation immediately so the next
+    // EvaApp reparses the still-loaded atlas instead of rendering stale sources.
+    if (dataMap[resourceName] === data) {
+        delete dataMap[resourceName];
+    }
+    if (!destroyResource) {
+        return;
+    }
     setTimeout(() => __awaiter(this, void 0, void 0, function* () {
-        if (data.ref <= 0) {
+        // A newer EvaApp may have rebuilt the same resource name while this delayed
+        // release was pending. Never unload the replacement generation's assets.
+        if (data.ref <= 0 && !dataMap[resourceName]) {
             eva_js.resource.destroy(resourceName);
-            delete dataMap[resourceName];
         }
     }), 100);
 }
@@ -667,6 +711,7 @@ let SpineSystem = class SpineSystem extends pluginRenderer.Renderer {
             const armature = this.armatures[key];
             const component = this._spineComponents[key];
             if (!armature || armature.destroyed || (component === null || component === void 0 ? void 0 : component.destroied)) {
+                this.releaseComponentResource(component);
                 delete this.armatures[key];
                 delete this._spineComponents[key];
                 continue;
@@ -679,6 +724,7 @@ let SpineSystem = class SpineSystem extends pluginRenderer.Renderer {
         for (let key in this._spineComponents) {
             const component = this._spineComponents[key];
             if (!component || component.destroied) {
+                this.releaseComponentResource(component);
                 delete this._spineComponents[key];
                 continue;
             }
@@ -790,7 +836,7 @@ let SpineSystem = class SpineSystem extends pluginRenderer.Renderer {
         this.add(changed);
     }
     remove(changed) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const gameObjectId = changed.gameObject.id;
             this.increaseAsyncId(gameObjectId);
@@ -811,20 +857,36 @@ let SpineSystem = class SpineSystem extends pluginRenderer.Renderer {
                 if (!componentArmature.destroyed) {
                     componentArmature.destroy({ children: true });
                 }
-                if (!component.keepResource && component.lastResource) {
-                    try {
-                        const res = yield eva_js.resource.getResource(component.lastResource);
-                        const imageSrc = ((_d = (_c = res.data) === null || _c === void 0 ? void 0 : _c.image) === null || _d === void 0 ? void 0 : _d.src) || ((_f = (_e = res.data) === null || _e === void 0 ? void 0 : _e.image) === null || _f === void 0 ? void 0 : _f.label);
-                        releaseSpineData(res, imageSrc);
-                    }
-                    catch (error) {
-                        console.warn('Failed to release Spine resource', component.lastResource, error);
-                    }
-                }
             }
+            this.releaseComponentResource(component);
             if (changed.type === eva_js.OBSERVER_TYPE.CHANGE) ;
         });
     }
+    onDestroy() {
+        for (const key of Object.keys(this._spineComponents)) {
+            const component = this._spineComponents[+key];
+            const armature = this.armatures[+key];
+            component === null || component === void 0 ? void 0 : component._destroySlotGameObjects();
+            if (armature && !armature.destroyed) {
+                armature.destroy({ children: true });
+            }
+            if (component) {
+                component.armature = null;
+            }
+            this.releaseComponentResource(component);
+        }
+        this.armatures = {};
+        this._spineComponents = {};
+        this.asyncIdMap = {};
+    }
+    releaseComponentResource(component) {
+        const resourceName = component === null || component === void 0 ? void 0 : component.lastResource;
+        if (!component || !resourceName) {
+            return;
+        }
+        component.lastResource = '';
+        releaseSpineData({ name: resourceName }, '', !component.keepResource);
+    }
 };
 /** 系统名称 */
 SpineSystem.systemName = 'SpineSystem';

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@eva/eva.js"),t=require("@eva/plugin-renderer"),i=require("pixi.js"),s=require("@eva/inspector-decorator");function r(e,t,i,s){var r,n=arguments.length,a=n<3?t:null===s?s=Object.getOwnPropertyDescriptor(t,i):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)a=Reflect.decorate(e,t,i,s);else for(var o=e.length-1;o>=0;o--)(r=e[o])&&(a=(n<3?r(a):n>3?r(t,i,a):r(t,i))||a);return n>3&&a&&Object.defineProperty(t,i,a),a}function n(e,t){if("object"==typeof Reflect&&"function"==typeof Reflect.metadata)return Reflect.metadata(e,t)}function a(e,t,i,s){return new(i||(i=Promise))(function(r,n){function a(e){try{c(s.next(e))}catch(e){n(e)}}function o(e){try{c(s.throw(e))}catch(e){n(e)}}function c(e){var t;e.done?r(e.value):(t=e.value,t instanceof i?t:new i(function(e){e(t)})).then(a,o)}c((s=s.apply(e,t||[])).next())})}"function"==typeof SuppressedError&&SuppressedError;class o extends e.Component{constructor(e){super(e),this.resource="",this.scale=1,this.animationName="",this.autoPlay=!0,this.keepResource=!1,this.timeScale=1,this.skin="",this._slotGameObjects=new Map,this._pendingSlotObjects=[],this.waitExecuteInfos=[],this.listenerBound=!1,this.paused=!1,this.init(e)}set armature(e){if(this._armature=e,e){this.applyTimeScale(),this.skin&&this.setSkin(this.skin),this.autoPlay&&this.play(this.animationName);for(const e of this.waitExecuteInfos)if(e.playType){const{name:t,loop:i,track:s}=e;this.play(t,i,s)}else this.stop(e.track);this.waitExecuteInfos=[]}}get armature(){return this._armature}init(e){e&&Object.assign(this,e),this.listenerBound||(this.listenerBound=!0,this.on("start",e=>{var t;null===(t=this.onStart)||void 0===t||t.call(this,e)}),this.on("complete",e=>{var t;null===(t=this.onComplete)||void 0===t||t.call(this,e)}),this.on("event",(e,t)=>{var i;null===(i=this.onEvent)||void 0===i||i.call(this,e,t)}))}onDestroy(){this.destroied=!0}load(){return this.armature}destroy(){this.onDestroy(),this.armature&&!this.armature.destroyed&&(this._destroySlotGameObjects(),this.armature.destroy({children:!0})),this.armature=null}pause(){this.paused=!0,this.applyTimeScale()}resume(){this.paused=!1,this.applyTimeScale()}setSkin(e){var t,i,s,r,n;if(this.skin=e,null===(t=this.armature)||void 0===t?void 0:t.skeleton){if(this.armature.skeleton.setSkinByName)this.armature.skeleton.setSkinByName(e);else if(this.armature.skeleton.setSkin){const t=(null===(s=null===(i=this.armature.skeleton.data)||void 0===i?void 0:i.findSkin)||void 0===s?void 0:s.call(i,e))||e;this.armature.skeleton.setSkin(t)}null===(n=(r=this.armature.skeleton).setSlotsToSetupPose)||void 0===n||n.call(r)}}play(e,t,i){try{const s=null!=t?t:this.autoPlay;e&&(this.animationName=e),this.armature?(void 0===i&&(i=0),this.applyTimeScale(),this.armature.state.setAnimation(i,this.animationName,s)):this.waitExecuteInfos.push({playType:!0,name:e,loop:s,track:i})}catch(e){console.log(e)}}stop(e){this.armature?(void 0===e&&(e=0),this.armature.state.setEmptyAnimation(e,0)):this.waitExecuteInfos.push({playType:!1,track:e})}applyTimeScale(){var e;(null===(e=this.armature)||void 0===e?void 0:e.state)&&(this.armature.state.timeScale=this.paused?0:this.timeScale)}addAnimation(e,t,i,s){try{this.armature&&(void 0===s&&(s=0),this.armature.state.addAnimation(s,e,i,t))}catch(e){console.log(e)}}setMix(e,t,i){this.armature&&this.armature.state.data.setMix(e,t,i)}getAnim(e=0){try{if(this.armature)return this.armature.state.tracks[e].animation.name}catch(e){console.log(e)}}setDefaultMix(e){this.armature&&(this.armature.state.data.defaultMix=e)}setAttachment(e,t){this.armature&&this.armature.skeleton.setAttachment(e,t)}getBone(e){if(this.armature)return this.armature.skeleton.findBone(e)}addSlotObject(e,t,i){if(!this.armature)return void console.warn("Spine armature is not ready, cannot addSlotObject");if(!this._containerManager)return void console.warn("ContainerManager is not available");const s=this._containerManager.getContainer(t.id);s?this._doAddSlotObject(e,t,s,i):this._pendingSlotObjects.push({slot:e,gameObject:t,options:i})}_doAddSlotObject(e,t,s,r){const n=new i.Container;n.addChild(s),this.armature.addSlotObject(e,n,r),this._slotGameObjects.set(t,{slot:e,wrapper:n}),this._syncTransformTree(t)}_syncTransformTree(e){var t;if(this._containerManager&&(this._containerManager.updateTransform({name:e.id,transform:e.transform}),null===(t=e.transform)||void 0===t?void 0:t.children))for(const t of e.transform.children)t.gameObject&&this._syncTransformTree(t.gameObject)}_flushPendingSlotObjects(){if(0===this._pendingSlotObjects.length)return;if(!this.armature||!this._containerManager)return;const e=[];for(const t of this._pendingSlotObjects){const i=this._containerManager.getContainer(t.gameObject.id);i?this._doAddSlotObject(t.slot,t.gameObject,i,t.options):e.push(t)}this._pendingSlotObjects=e}removeSlotObject(e){this._pendingSlotObjects=this._pendingSlotObjects.filter(t=>t.gameObject!==e);const t=this._slotGameObjects.get(e);t&&this.armature&&(this.armature.removeSlotObject(t.wrapper),t.wrapper.destroy({children:!1})),this._slotGameObjects.delete(e)}_destroySlotGameObjects(){for(const[e,t]of this._slotGameObjects)e.destroyed||(this.armature&&this.armature.removeSlotObject(t.wrapper),t.wrapper.destroy({children:!1}),e.destroy());this._slotGameObjects.clear(),this._pendingSlotObjects=[]}}o.componentName="Spine",r([s.type("string"),n("design:type",String)],o.prototype,"resource",void 0),r([s.type("number"),n("design:type",Number)],o.prototype,"scale",void 0),r([s.type("string"),n("design:type",String)],o.prototype,"animationName",void 0),r([s.type("boolean"),n("design:type",Boolean)],o.prototype,"autoPlay",void 0),r([s.type("boolean"),n("design:type",Boolean)],o.prototype,"keepResource",void 0),r([s.type("number"),n("design:type",Number)],o.prototype,"timeScale",void 0),r([s.type("string"),n("design:type",String)],o.prototype,"skin",void 0);let c={};function d(e,t,i){return a(this,void 0,void 0,function*(){let s=c[e.name];if(!s)if(e.complete)s=function(e,t,i,s){const r=t.ske,n=t.atlas,a=new s.AtlasAttachmentLoader(n),o=r instanceof Uint8Array?new s.SkeletonBinary(a):new s.SkeletonJson(a);o.scale=i||1;const d={spineData:o.readSkeletonData(r),ref:0,imageSrc:(l=t.image,l?"string"==typeof l?l:l.label||(null===(m=l.source)||void 0===m?void 0:m.label)||(null===(h=null===(u=l.source)||void 0===u?void 0:u.resource)||void 0===h?void 0:h.src)||(null===(p=l.source)||void 0===p?void 0:p._sourceOrigin)||l.src||(null===(y=l.baseTexture)||void 0===y?void 0:y.cacheId)||"":"")};var l,m,u,h,p,y;return c[e]=d,d}(e.name,e.data,t,i);else if(!s)return;return s.ref++,s.spineData})}let l=class extends t.Renderer{constructor(){super(...arguments),this.armatures={},this._spineComponents={}}init({pixiSpine:i}){this.renderSystem=this.game.getSystem(t.RendererSystem),this.renderSystem.rendererManager.register(this),this.pixiSpine=i,this.game.canvas.addEventListener("webglcontextrestored",()=>{const t=this.game.gameObjects;let i=[];for(let s in this.armatures){const r=+s;for(let s=0;s<t.length;++s){let n=t[s];if(n.id===r){let t=n.getComponent(o);t&&(this.remove({type:e.OBSERVER_TYPE.REMOVE,gameObject:n,component:t,componentName:o.componentName}),i.push({type:e.OBSERVER_TYPE.ADD,gameObject:n,component:t,componentName:o.componentName}));break}}}setTimeout(()=>{i.forEach(e=>{this.add(e)})},1e3)},!1)}update(e){super.update();for(let t in this.armatures){const i=this.armatures[t],s=this._spineComponents[t];!i||i.destroyed||(null==s?void 0:s.destroied)?(delete this.armatures[t],delete this._spineComponents[t]):i.update(.001*e.deltaTime)}for(let e in this._spineComponents){const t=this._spineComponents[e];t&&!t.destroied?t._flushPendingSlotObjects():delete this._spineComponents[e]}}componentChanged(t){return a(this,void 0,void 0,function*(){if("Spine"===t.componentName)if(t.type===e.OBSERVER_TYPE.ADD)this.add(t);else if(t.type===e.OBSERVER_TYPE.CHANGE){if("resource"===t.prop.prop[0])this.change(t)}else t.type===e.OBSERVER_TYPE.REMOVE&&this.remove(t)})}add(t,i){var s,r,n;return a(this,void 0,void 0,function*(){const a=t.component;clearTimeout(a.addHandler);const o=t.gameObject.id,c=this.increaseAsyncId(o),l=yield e.resource.getResource(a.resource);if(!this.validateAsyncId(o,c)||a.destroied||t.gameObject.destroyed)return;const m=yield d(l,a.scale,this.pixiSpine);if(!this.validateAsyncId(o,c)||a.destroied||t.gameObject.destroyed)return;if(!m)return void(a.addHandler=setTimeout(()=>{a.destroied||t.gameObject.destroyed||(void 0===i&&(i=20),--i>0?this.add(t,i):console.log("retry exceed max times",a.resource))},1e3));this.remove(t);const u=null===(r=null===(s=this.renderSystem)||void 0===s?void 0:s.containerManager)||void 0===r?void 0:r.getContainer(t.gameObject.id);if(!u||a.destroied||t.gameObject.destroyed)return;a.lastResource=a.resource;const h=new this.pixiSpine.Spine({skeletonData:m,autoUpdate:!1});if(this.armatures[t.gameObject.id]=h,this._spineComponents[t.gameObject.id]=a,t.gameObject&&t.gameObject.transform){const e=t.gameObject.transform;h.x=e.size.width*e.origin.x,h.y=e.size.height*e.origin.y}u.addChildAt(h,0),h.update(),a._containerManager=null===(n=this.renderSystem)||void 0===n?void 0:n.containerManager,a.armature=h,a.emit("loaded",{resource:a.resource}),h.state.addListener({start:(e,t)=>{a.emit("start",{track:e,name:e.animation.name})},complete:(e,t)=>{a.emit("complete",{track:e,name:e.animation.name})},interrupt:(e,t)=>{a.emit("interrupt",{track:e,name:e.animation.name})},end:(e,t)=>{a.emit("end",{track:e,name:e.animation.name})},event:(e,t)=>{a.emit("event",e,t)}})})}change(e){this.remove(e),this.add(e)}remove(t){var i,s,r,n,o,d;return a(this,void 0,void 0,function*(){const l=t.gameObject.id;this.increaseAsyncId(l);const m=t.component;clearTimeout(m.addHandler);const u=this.armatures[l],h=null===(s=null===(i=this.renderSystem)||void 0===i?void 0:i.containerManager)||void 0===s?void 0:s.getContainer(l);h&&u&&h.removeChild(u);const p=m.armature;if(m.armature=null,delete this.armatures[l],delete this._spineComponents[l],p&&(m._destroySlotGameObjects(),p.destroyed||p.destroy({children:!0}),!m.keepResource&&m.lastResource))try{const t=yield e.resource.getResource(m.lastResource);(null===(n=null===(r=t.data)||void 0===r?void 0:r.image)||void 0===n?void 0:n.src)||(null===(d=null===(o=t.data)||void 0===o?void 0:o.image)||void 0===d||d.label);!function(t){const i=t.name,s=c[i];s&&(s.ref--,setTimeout(()=>a(this,void 0,void 0,function*(){s.ref<=0&&(e.resource.destroy(i),delete c[i])}),100))}(t)}catch(e){console.warn("Failed to release Spine resource",m.lastResource,e)}t.type,e.OBSERVER_TYPE.CHANGE})}};l.systemName="SpineSystem",l=r([e.decorators.componentObserver({Spine:["resource"]})],l);var m=l;e.resource.registerResourceType("SPINE"),exports.Spine=o,exports.SpineSystem=m;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@eva/eva.js"),t=require("@eva/plugin-renderer"),s=require("pixi.js"),i=require("@eva/inspector-decorator");function n(e,t,s,i){var n,o=arguments.length,r=o<3?t:null===i?i=Object.getOwnPropertyDescriptor(t,s):i;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)r=Reflect.decorate(e,t,s,i);else for(var a=e.length-1;a>=0;a--)(n=e[a])&&(r=(o<3?n(r):o>3?n(t,s,r):n(t,s))||r);return o>3&&r&&Object.defineProperty(t,s,r),r}function o(e,t){if("object"==typeof Reflect&&"function"==typeof Reflect.metadata)return Reflect.metadata(e,t)}function r(e,t,s,i){return new(s||(s=Promise))(function(n,o){function r(e){try{c(i.next(e))}catch(e){o(e)}}function a(e){try{c(i.throw(e))}catch(e){o(e)}}function c(e){var t;e.done?n(e.value):(t=e.value,t instanceof s?t:new s(function(e){e(t)})).then(r,a)}c((i=i.apply(e,t||[])).next())})}"function"==typeof SuppressedError&&SuppressedError;class a extends e.Component{constructor(e){super(e),this.resource="",this.scale=1,this.animationName="",this.autoPlay=!0,this.keepResource=!1,this.timeScale=1,this.skin="",this._slotGameObjects=new Map,this._pendingSlotObjects=[],this.waitExecuteInfos=[],this.listenerBound=!1,this.paused=!1,this.init(e)}set armature(e){if(this._armature=e,e){this.applyTimeScale(),this.skin&&this.setSkin(this.skin),this.autoPlay&&this.play(this.animationName);for(const e of this.waitExecuteInfos)if(e.playType){const{name:t,loop:s,track:i}=e;this.play(t,s,i)}else this.stop(e.track);this.waitExecuteInfos=[],this._flushPendingSlotObjects()}}get armature(){return this._armature}init(e){e&&Object.assign(this,e),this.listenerBound||(this.listenerBound=!0,this.on("start",e=>{var t;null===(t=this.onStart)||void 0===t||t.call(this,e)}),this.on("complete",e=>{var t;null===(t=this.onComplete)||void 0===t||t.call(this,e)}),this.on("event",(e,t)=>{var s;null===(s=this.onEvent)||void 0===s||s.call(this,e,t)}))}onDestroy(){this.destroied=!0}load(){return this.armature}destroy(){this.onDestroy(),this._destroySlotGameObjects(),this.armature&&!this.armature.destroyed&&this.armature.destroy({children:!0}),this.armature=null}pause(){this.paused=!0,this.applyTimeScale()}resume(){this.paused=!1,this.applyTimeScale()}setSkin(e){var t,s,i,n,o;if(this.skin=e,null===(t=this.armature)||void 0===t?void 0:t.skeleton){if(this.armature.skeleton.setSkinByName)this.armature.skeleton.setSkinByName(e);else if(this.armature.skeleton.setSkin){const t=(null===(i=null===(s=this.armature.skeleton.data)||void 0===s?void 0:s.findSkin)||void 0===i?void 0:i.call(s,e))||e;this.armature.skeleton.setSkin(t)}null===(o=(n=this.armature.skeleton).setSlotsToSetupPose)||void 0===o||o.call(n)}}play(e,t,s){try{const i=null!=t?t:this.autoPlay;e&&(this.animationName=e),this.armature?(void 0===s&&(s=0),this.applyTimeScale(),this.armature.state.setAnimation(s,this.animationName,i)):this.waitExecuteInfos.push({playType:!0,name:e,loop:i,track:s})}catch(e){console.log(e)}}stop(e){this.armature?(void 0===e&&(e=0),this.armature.state.setEmptyAnimation(e,0)):this.waitExecuteInfos.push({playType:!1,track:e})}applyTimeScale(){var e;(null===(e=this.armature)||void 0===e?void 0:e.state)&&(this.armature.state.timeScale=this.paused?0:this.timeScale)}addAnimation(e,t,s,i){try{this.armature&&(void 0===i&&(i=0),this.armature.state.addAnimation(i,e,s,t))}catch(e){console.log(e)}}setMix(e,t,s){this.armature&&this.armature.state.data.setMix(e,t,s)}getAnim(e=0){try{if(this.armature)return this.armature.state.tracks[e].animation.name}catch(e){console.log(e)}}setDefaultMix(e){this.armature&&(this.armature.state.data.defaultMix=e)}setAttachment(e,t){this.armature&&this.armature.skeleton.setAttachment(e,t)}getBone(e){if(this.armature)return this.armature.skeleton.findBone(e)}addSlotObject(e,t,s){this.destroied?console.warn("Spine component has been destroyed, cannot addSlotObject"):t&&!t.destroyed?(this._pendingSlotObjects=this._pendingSlotObjects.filter(e=>e.gameObject!==t),this._detachSlotObject(t),this._pendingSlotObjects.push({slot:e,gameObject:t,options:s}),this._flushPendingSlotObjects()):console.warn("Cannot add a destroyed or missing GameObject to a Spine slot")}_doAddSlotObject(e,t,i,n){const o=new s.Container;o.addChild(i),this.armature.addSlotObject(e,o,n),this._slotGameObjects.set(t,{slot:e,wrapper:o}),this._syncTransformTree(t)}_isSlotAvailable(e){var t,s,i,n;if("number"==typeof e){if(!Number.isInteger(e)||e<0)return!1;const i=null===(s=null===(t=this.armature)||void 0===t?void 0:t.skeleton)||void 0===s?void 0:s.slots;return!Array.isArray(i)||e<i.length}if("string"!=typeof e||0===e.length)return!1;const o=null===(n=null===(i=this.armature)||void 0===i?void 0:i.skeleton)||void 0===n?void 0:n.findSlot;return"function"!=typeof o||Boolean(o.call(this.armature.skeleton,e))}_detachSlotObject(e){const t=this._slotGameObjects.get(e);if(t){this.armature&&!this.armature.destroyed&&this.armature.removeSlotObject(t.wrapper);for(const e of[...t.wrapper.children])t.wrapper.removeChild(e);t.wrapper.destroy({children:!1}),this._slotGameObjects.delete(e)}}_syncTransformTree(e){var t;if(this._containerManager&&(this._containerManager.updateTransform({name:e.id,transform:e.transform}),null===(t=e.transform)||void 0===t?void 0:t.children))for(const t of e.transform.children)t.gameObject&&this._syncTransformTree(t.gameObject)}_flushPendingSlotObjects(){if(this.destroied||0===this._pendingSlotObjects.length)return;if(!this.armature||!this._containerManager)return;const e=[],t=this._pendingSlotObjects;this._pendingSlotObjects=[];for(const s of t){if(s.gameObject.destroyed)continue;if(!this._isSlotAvailable(s.slot)){console.warn(`Spine slot "${s.slot}" does not exist; pending slot object was discarded`);continue}const t=this._containerManager.getContainer(s.gameObject.id);if(t)try{this._doAddSlotObject(s.slot,s.gameObject,t,s.options)}catch(e){console.warn(`Failed to add GameObject to Spine slot "${s.slot}"`,e)}else e.push(s)}this._pendingSlotObjects.push(...e)}removeSlotObject(e){this._pendingSlotObjects=this._pendingSlotObjects.filter(t=>t.gameObject!==e),this._detachSlotObject(e)}_destroySlotGameObjects(){const e=new Set([...this._slotGameObjects.keys(),...this._pendingSlotObjects.map(e=>e.gameObject)]);for(const t of e)this._detachSlotObject(t),t.destroyed||t.destroy();this._slotGameObjects.clear(),this._pendingSlotObjects=[]}}a.componentName="Spine",n([i.type("string"),o("design:type",String)],a.prototype,"resource",void 0),n([i.type("number"),o("design:type",Number)],a.prototype,"scale",void 0),n([i.type("string"),o("design:type",String)],a.prototype,"animationName",void 0),n([i.type("boolean"),o("design:type",Boolean)],a.prototype,"autoPlay",void 0),n([i.type("boolean"),o("design:type",Boolean)],a.prototype,"keepResource",void 0),n([i.type("number"),o("design:type",Number)],a.prototype,"timeScale",void 0),n([i.type("string"),o("design:type",String)],a.prototype,"skin",void 0);let c={};function d(e,t,s){return r(this,void 0,void 0,function*(){let i=c[e.name];if(!i)if(e.complete)i=function(e,t,s,i){const n=t.ske,o=t.atlas,r=new i.AtlasAttachmentLoader(o),a=n instanceof Uint8Array?new i.SkeletonBinary(r):new i.SkeletonJson(r);a.scale=s||1;const d={spineData:a.readSkeletonData(n),ref:0,imageSrc:(l=t.image,l?"string"==typeof l?l:l.label||(null===(m=l.source)||void 0===m?void 0:m.label)||(null===(h=null===(u=l.source)||void 0===u?void 0:u.resource)||void 0===h?void 0:h.src)||(null===(p=l.source)||void 0===p?void 0:p._sourceOrigin)||l.src||(null===(y=l.baseTexture)||void 0===y?void 0:y.cacheId)||"":"")};var l,m,u,h,p,y;return c[e]=d,d}(e.name,e.data,t,s);else if(!i)return;return i.ref++,i.spineData})}let l=class extends t.Renderer{constructor(){super(...arguments),this.armatures={},this._spineComponents={}}init({pixiSpine:s}){this.renderSystem=this.game.getSystem(t.RendererSystem),this.renderSystem.rendererManager.register(this),this.pixiSpine=s,this.game.canvas.addEventListener("webglcontextrestored",()=>{const t=this.game.gameObjects;let s=[];for(let i in this.armatures){const n=+i;for(let i=0;i<t.length;++i){let o=t[i];if(o.id===n){let t=o.getComponent(a);t&&(this.remove({type:e.OBSERVER_TYPE.REMOVE,gameObject:o,component:t,componentName:a.componentName}),s.push({type:e.OBSERVER_TYPE.ADD,gameObject:o,component:t,componentName:a.componentName}));break}}}setTimeout(()=>{s.forEach(e=>{this.add(e)})},1e3)},!1)}update(e){super.update();for(let t in this.armatures){const s=this.armatures[t],i=this._spineComponents[t];!s||s.destroyed||(null==i?void 0:i.destroied)?(this.releaseComponentResource(i),delete this.armatures[t],delete this._spineComponents[t]):s.update(.001*e.deltaTime)}for(let e in this._spineComponents){const t=this._spineComponents[e];t&&!t.destroied?t._flushPendingSlotObjects():(this.releaseComponentResource(t),delete this._spineComponents[e])}}componentChanged(t){return r(this,void 0,void 0,function*(){if("Spine"===t.componentName)if(t.type===e.OBSERVER_TYPE.ADD)this.add(t);else if(t.type===e.OBSERVER_TYPE.CHANGE){if("resource"===t.prop.prop[0])this.change(t)}else t.type===e.OBSERVER_TYPE.REMOVE&&this.remove(t)})}add(t,s){var i,n,o;return r(this,void 0,void 0,function*(){const r=t.component;clearTimeout(r.addHandler);const a=t.gameObject.id,c=this.increaseAsyncId(a),l=yield e.resource.getResource(r.resource);if(!this.validateAsyncId(a,c)||r.destroied||t.gameObject.destroyed)return;const m=yield d(l,r.scale,this.pixiSpine);if(!this.validateAsyncId(a,c)||r.destroied||t.gameObject.destroyed)return;if(!m)return void(r.addHandler=setTimeout(()=>{r.destroied||t.gameObject.destroyed||(void 0===s&&(s=20),--s>0?this.add(t,s):console.log("retry exceed max times",r.resource))},1e3));this.remove(t);const u=null===(n=null===(i=this.renderSystem)||void 0===i?void 0:i.containerManager)||void 0===n?void 0:n.getContainer(t.gameObject.id);if(!u||r.destroied||t.gameObject.destroyed)return;r.lastResource=r.resource;const h=new this.pixiSpine.Spine({skeletonData:m,autoUpdate:!1});if(this.armatures[t.gameObject.id]=h,this._spineComponents[t.gameObject.id]=r,t.gameObject&&t.gameObject.transform){const e=t.gameObject.transform;h.x=e.size.width*e.origin.x,h.y=e.size.height*e.origin.y}u.addChildAt(h,0),h.update(),r._containerManager=null===(o=this.renderSystem)||void 0===o?void 0:o.containerManager,r.armature=h,r.emit("loaded",{resource:r.resource}),h.state.addListener({start:(e,t)=>{r.emit("start",{track:e,name:e.animation.name})},complete:(e,t)=>{r.emit("complete",{track:e,name:e.animation.name})},interrupt:(e,t)=>{r.emit("interrupt",{track:e,name:e.animation.name})},end:(e,t)=>{r.emit("end",{track:e,name:e.animation.name})},event:(e,t)=>{r.emit("event",e,t)}})})}change(e){this.remove(e),this.add(e)}remove(t){var s,i;return r(this,void 0,void 0,function*(){const n=t.gameObject.id;this.increaseAsyncId(n);const o=t.component;clearTimeout(o.addHandler);const r=this.armatures[n],a=null===(i=null===(s=this.renderSystem)||void 0===s?void 0:s.containerManager)||void 0===i?void 0:i.getContainer(n);a&&r&&a.removeChild(r);const c=o.armature;o.armature=null,delete this.armatures[n],delete this._spineComponents[n],c&&(o._destroySlotGameObjects(),c.destroyed||c.destroy({children:!0})),this.releaseComponentResource(o),t.type,e.OBSERVER_TYPE.CHANGE})}onDestroy(){for(const e of Object.keys(this._spineComponents)){const t=this._spineComponents[+e],s=this.armatures[+e];null==t||t._destroySlotGameObjects(),s&&!s.destroyed&&s.destroy({children:!0}),t&&(t.armature=null),this.releaseComponentResource(t)}this.armatures={},this._spineComponents={},this.asyncIdMap={}}releaseComponentResource(t){const s=null==t?void 0:t.lastResource;t&&s&&(t.lastResource="",function(t,s,i=!0){const n=t.name,o=c[n];o&&(o.ref--,o.ref>0||(c[n]===o&&delete c[n],i&&setTimeout(()=>r(this,void 0,void 0,function*(){o.ref<=0&&!c[n]&&e.resource.destroy(n)}),100)))}({name:s},0,!t.keepResource))}};l.systemName="SpineSystem",l=n([e.decorators.componentObserver({Spine:["resource"]})],l);var m=l;e.resource.registerResourceType("SPINE"),exports.Spine=a,exports.SpineSystem=m;

package/dist/spine-base.d.ts

@@ -9,6 +9,14 @@ import { RendererManager } from '@eva/plugin-renderer';
 import { RendererSystem } from '@eva/plugin-renderer';
 import { UpdateParams } from '@eva/eva.js';
 
+declare interface PendingSlotObject {
+    slot: number | string;
+    gameObject: GameObject;
+    options?: {
+        followAttachmentTimeline?: boolean;
+    };
+}
+
 /**
  * Spine 骨骼动画组件
  *
@@ -90,25 +98,15 @@ export declare class Spine extends Component<SpineParams> {
     private _armature;
     /** 容器管理器引用（由 SpineSystem 设置） */
     _containerManager: any;
-    /** 挂载到插槽的 GameObject 映射（GameObject -> { slot, wrapper }） */
+    /** 挂载到插槽的 GameObject 及对应 slot/wrapper 映射 */
     private _slotGameObjects;
     /** 等待容器就绪的 slot 挂载请求 */
-    _pendingSlotObjects: {
-        slot: number | string;
-        gameObject: GameObject;
-        options?: {
-            followAttachmentTimeline?: boolean;
-        };
-    }[];
+    _pendingSlotObjects: PendingSlotObject[];
     /** 等待执行的动画操作队列 */
     private waitExecuteInfos;
     private listenerBound;
     private paused;
     constructor(params?: SpineParams);
-    /**
-     * 设置骨架实例
-     * 当骨架加载完成后自动执行等待队列中的动画操作
-     */
     set armature(val: any);
     /** 获取骨架实例 */
     get armature(): any;
@@ -222,6 +220,8 @@ export declare class Spine extends Component<SpineParams> {
         followAttachmentTimeline?: boolean;
     }): void;
     private _doAddSlotObject;
+    private _isSlotAvailable;
+    private _detachSlotObject;
     /**
      * 递归同步 gameObject 及其子树的 transform 到对应的渲染容器
      */
@@ -300,6 +300,8 @@ export declare class SpineSystem extends Renderer {
     add(changed: ComponentChanged, count?: number): Promise<void>;
     change(changed: ComponentChanged): void;
     remove(changed: ComponentChanged): Promise<void>;
+    onDestroy(): void;
+    private releaseComponentResource;
 }
 
 export { }

package/dist/spine-base.esm.js

@@ -115,7 +115,7 @@ class Spine extends Component {
         this.timeScale = 1;
         /** 当前皮肤名称 */
         this.skin = '';
-        /** 挂载到插槽的 GameObject 映射（GameObject -> { slot, wrapper }） */
+        /** 挂载到插槽的 GameObject 及对应 slot/wrapper 映射 */
         this._slotGameObjects = new Map();
         /** 等待容器就绪的 slot 挂载请求 */
         this._pendingSlotObjects = [];
@@ -125,10 +125,7 @@ class Spine extends Component {
         this.paused = false;
         this.init(params);
     }
-    /**
-     * 设置骨架实例
-     * 当骨架加载完成后自动执行等待队列中的动画操作
-     */
+    // 设置骨架实例；骨架加载完成后自动执行等待队列中的动画操作。
     set armature(val) {
         this._armature = val;
         if (!val)
@@ -149,6 +146,7 @@ class Spine extends Component {
             }
         }
         this.waitExecuteInfos = [];
+        this._flushPendingSlotObjects();
     }
     /** 获取骨架实例 */
     get armature() {
@@ -190,8 +188,8 @@ class Spine extends Component {
     }
     destroy() {
         this.onDestroy();
+        this._destroySlotGameObjects();
         if (this.armature && !this.armature.destroyed) {
-            this._destroySlotGameObjects();
             this.armature.destroy({ children: true });
         }
         this.armature = null;
@@ -395,21 +393,19 @@ class Spine extends Component {
      * @param options.followAttachmentTimeline - 是否跟随插槽的附件时间线
      */
     addSlotObject(slot, gameObject, options) {
-        if (!this.armature) {
-            console.warn('Spine armature is not ready, cannot addSlotObject');
+        if (this.destroied) {
+            console.warn('Spine component has been destroyed, cannot addSlotObject');
             return;
         }
-        if (!this._containerManager) {
-            console.warn('ContainerManager is not available');
+        if (!gameObject || gameObject.destroyed) {
+            console.warn('Cannot add a destroyed or missing GameObject to a Spine slot');
             return;
         }
-        const container = this._containerManager.getContainer(gameObject.id);
-        if (!container) {
-            // 容器尚未就绪，加入 pending 队列，等待下一帧自动处理
-            this._pendingSlotObjects.push({ slot, gameObject, options });
-            return;
-        }
-        this._doAddSlotObject(slot, gameObject, container, options);
+        // 同一 GameObject 只保留最后一次挂载意图，避免依赖分阶段就绪时重复挂载。
+        this._pendingSlotObjects = this._pendingSlotObjects.filter(pending => pending.gameObject !== gameObject);
+        this._detachSlotObject(gameObject);
+        this._pendingSlotObjects.push({ slot, gameObject, options });
+        this._flushPendingSlotObjects();
     }
     _doAddSlotObject(slot, gameObject, container, options) {
         // 创建 wrapper 容器：Spine 骨骼矩阵作用在 wrapper 上，
@@ -422,6 +418,32 @@ class Spine extends Component {
         // 手动同步 gameObject 及其子树的 transform 到 container
         this._syncTransformTree(gameObject);
     }
+    _isSlotAvailable(slot) {
+        var _a, _b, _c, _d;
+        if (typeof slot === 'number') {
+            if (!Number.isInteger(slot) || slot < 0)
+                return false;
+            const slots = (_b = (_a = this.armature) === null || _a === void 0 ? void 0 : _a.skeleton) === null || _b === void 0 ? void 0 : _b.slots;
+            return !Array.isArray(slots) || slot < slots.length;
+        }
+        if (typeof slot !== 'string' || slot.length === 0)
+            return false;
+        const findSlot = (_d = (_c = this.armature) === null || _c === void 0 ? void 0 : _c.skeleton) === null || _d === void 0 ? void 0 : _d.findSlot;
+        return typeof findSlot !== 'function' || Boolean(findSlot.call(this.armature.skeleton, slot));
+    }
+    _detachSlotObject(gameObject) {
+        const entry = this._slotGameObjects.get(gameObject);
+        if (!entry)
+            return;
+        if (this.armature && !this.armature.destroyed) {
+            this.armature.removeSlotObject(entry.wrapper);
+        }
+        for (const child of [...entry.wrapper.children]) {
+            entry.wrapper.removeChild(child);
+        }
+        entry.wrapper.destroy({ children: false });
+        this._slotGameObjects.delete(gameObject);
+    }
     /**
      * 递归同步 gameObject 及其子树的 transform 到对应的渲染容器
      */
@@ -445,21 +467,34 @@ class Spine extends Component {
      * 处理等待容器就绪的 slot 挂载请求（由 SpineSystem 每帧调用）
      */
     _flushPendingSlotObjects() {
-        if (this._pendingSlotObjects.length === 0)
+        if (this.destroied || this._pendingSlotObjects.length === 0)
             return;
         if (!this.armature || !this._containerManager)
             return;
         const still = [];
-        for (const pending of this._pendingSlotObjects) {
+        const pendingSlotObjects = this._pendingSlotObjects;
+        this._pendingSlotObjects = [];
+        for (const pending of pendingSlotObjects) {
+            if (pending.gameObject.destroyed)
+                continue;
+            if (!this._isSlotAvailable(pending.slot)) {
+                console.warn(`Spine slot "${pending.slot}" does not exist; pending slot object was discarded`);
+                continue;
+            }
             const container = this._containerManager.getContainer(pending.gameObject.id);
             if (container) {
-                this._doAddSlotObject(pending.slot, pending.gameObject, container, pending.options);
+                try {
+                    this._doAddSlotObject(pending.slot, pending.gameObject, container, pending.options);
+                }
+                catch (error) {
+                    console.warn(`Failed to add GameObject to Spine slot "${pending.slot}"`, error);
+                }
             }
             else {
                 still.push(pending);
             }
         }
-        this._pendingSlotObjects = still;
+        this._pendingSlotObjects.push(...still);
     }
     /**
      * 从插槽上移除挂载的 GameObject
@@ -469,24 +504,19 @@ class Spine extends Component {
     removeSlotObject(gameObject) {
         // 从 pending 队列中移除
         this._pendingSlotObjects = this._pendingSlotObjects.filter(p => p.gameObject !== gameObject);
-        const entry = this._slotGameObjects.get(gameObject);
-        if (entry && this.armature) {
-            this.armature.removeSlotObject(entry.wrapper);
-            entry.wrapper.destroy({ children: false });
-        }
-        this._slotGameObjects.delete(gameObject);
+        this._detachSlotObject(gameObject);
     }
     /**
      * 销毁所有挂载到插槽的 GameObject（内部使用）
      */
     _destroySlotGameObjects() {
-        for (const [gameObject, entry] of this._slotGameObjects) {
+        const gameObjects = new Set([
+            ...this._slotGameObjects.keys(),
+            ...this._pendingSlotObjects.map(pending => pending.gameObject),
+        ]);
+        for (const gameObject of gameObjects) {
+            this._detachSlotObject(gameObject);
             if (!gameObject.destroyed) {
-                // 先从 spine 插槽移除 wrapper，避免 destroy 时重复操作
-                if (this.armature) {
-                    this.armature.removeSlotObject(entry.wrapper);
-                }
-                entry.wrapper.destroy({ children: false });
                 gameObject.destroy();
             }
         }
@@ -570,17 +600,31 @@ function getSpineData(res, scale, pixiSpine) {
         return data.spineData;
     });
 }
-function releaseSpineData(res, _imageSrc) {
+function releaseSpineData(res, _imageSrc, destroyResource = true) {
     const resourceName = res.name;
     const data = dataMap[resourceName];
     if (!data) {
         return;
     }
     data.ref--;
+    if (data.ref > 0) {
+        return;
+    }
+    // Parsed skeleton data owns attachment objects that point at Pixi textures.
+    // Armature teardown can invalidate those objects even when the raw resource
+    // is intentionally kept. Remove this generation immediately so the next
+    // EvaApp reparses the still-loaded atlas instead of rendering stale sources.
+    if (dataMap[resourceName] === data) {
+        delete dataMap[resourceName];
+    }
+    if (!destroyResource) {
+        return;
+    }
     setTimeout(() => __awaiter(this, void 0, void 0, function* () {
-        if (data.ref <= 0) {
+        // A newer EvaApp may have rebuilt the same resource name while this delayed
+        // release was pending. Never unload the replacement generation's assets.
+        if (data.ref <= 0 && !dataMap[resourceName]) {
             resource.destroy(resourceName);
-            delete dataMap[resourceName];
         }
     }), 100);
 }
@@ -663,6 +707,7 @@ let SpineSystem = class SpineSystem extends Renderer {
             const armature = this.armatures[key];
             const component = this._spineComponents[key];
             if (!armature || armature.destroyed || (component === null || component === void 0 ? void 0 : component.destroied)) {
+                this.releaseComponentResource(component);
                 delete this.armatures[key];
                 delete this._spineComponents[key];
                 continue;
@@ -675,6 +720,7 @@ let SpineSystem = class SpineSystem extends Renderer {
         for (let key in this._spineComponents) {
             const component = this._spineComponents[key];
             if (!component || component.destroied) {
+                this.releaseComponentResource(component);
                 delete this._spineComponents[key];
                 continue;
             }
@@ -786,7 +832,7 @@ let SpineSystem = class SpineSystem extends Renderer {
         this.add(changed);
     }
     remove(changed) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const gameObjectId = changed.gameObject.id;
             this.increaseAsyncId(gameObjectId);
@@ -807,20 +853,36 @@ let SpineSystem = class SpineSystem extends Renderer {
                 if (!componentArmature.destroyed) {
                     componentArmature.destroy({ children: true });
                 }
-                if (!component.keepResource && component.lastResource) {
-                    try {
-                        const res = yield resource.getResource(component.lastResource);
-                        const imageSrc = ((_d = (_c = res.data) === null || _c === void 0 ? void 0 : _c.image) === null || _d === void 0 ? void 0 : _d.src) || ((_f = (_e = res.data) === null || _e === void 0 ? void 0 : _e.image) === null || _f === void 0 ? void 0 : _f.label);
-                        releaseSpineData(res, imageSrc);
-                    }
-                    catch (error) {
-                        console.warn('Failed to release Spine resource', component.lastResource, error);
-                    }
-                }
             }
+            this.releaseComponentResource(component);
             if (changed.type === OBSERVER_TYPE.CHANGE) ;
         });
     }
+    onDestroy() {
+        for (const key of Object.keys(this._spineComponents)) {
+            const component = this._spineComponents[+key];
+            const armature = this.armatures[+key];
+            component === null || component === void 0 ? void 0 : component._destroySlotGameObjects();
+            if (armature && !armature.destroyed) {
+                armature.destroy({ children: true });
+            }
+            if (component) {
+                component.armature = null;
+            }
+            this.releaseComponentResource(component);
+        }
+        this.armatures = {};
+        this._spineComponents = {};
+        this.asyncIdMap = {};
+    }
+    releaseComponentResource(component) {
+        const resourceName = component === null || component === void 0 ? void 0 : component.lastResource;
+        if (!component || !resourceName) {
+            return;
+        }
+        component.lastResource = '';
+        releaseSpineData({ name: resourceName }, '', !component.keepResource);
+    }
 };
 /** 系统名称 */
 SpineSystem.systemName = 'SpineSystem';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eva/spine-base",
-  "version": "2.1.0-beta.11",
+  "version": "2.1.0-beta.12",
   "description": "@eva/spine-base",
   "main": "index.js",
   "module": "dist/spine-base.esm.js",
@@ -18,8 +18,8 @@
   "license": "MIT",
   "homepage": "https://eva.js.org",
   "dependencies": {
-    "@eva/eva.js": "2.1.0-beta.11",
-    "@eva/plugin-renderer": "2.1.0-beta.11",
+    "@eva/eva.js": "2.1.0-beta.12",
+    "@eva/plugin-renderer": "2.1.0-beta.12",
     "@eva/inspector-decorator": "^2.0.0-beta.0",
     "pixi.js": "^8.17.0"
   }