@galacean/effects-core 2.0.0-alpha.15 → 2.0.0-alpha.17

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime core for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.0.0-alpha.15
+ * Version: v2.0.0-alpha.17
  */
 
 'use strict';
@@ -328,7 +328,6 @@ function isSimulatorCellPhone() {
 }
 function isAlipayMiniApp() {
     var _my;
-    // @ts-expect-error
     return typeof my !== 'undefined' && ((_my = my) == null ? void 0 : _my.renderTarget) === 'web';
 }
 
@@ -562,8 +561,8 @@ function noop() {}
  *
  * @static
  * @function isString
- * @param {object} obj - 要判断的对象
- * @return {boolean}
+ * @param obj - 要判断的对象
+ * @return
  */ function isString(obj) {
     return typeof obj === 'string';
 }
@@ -572,8 +571,8 @@ function noop() {}
  *
  * @static
  * @function isArray
- * @param {object} obj - 要判断的对象
- * @return {boolean}
+ * @param obj - 要判断的对象
+ * @return
  */ const isArray = Array.isArray || function(obj) {
     return Object.prototype.toString.call(obj) === '[object Array]';
 };
@@ -582,8 +581,8 @@ function noop() {}
  *
  * @static
  * @function isFunction
- * @param {object} obj - 要判断的对象
- * @return {boolean}
+ * @param obj - 要判断的对象
+ * @return
  */ function isFunction(obj) {
     return Object.prototype.toString.call(obj) === '[object Function]';
 }
@@ -592,8 +591,8 @@ function noop() {}
  *
  * @static
  * @function isObject
- * @param {object} obj - 要判断的对象
- * @return {boolean}
+ * @param obj - 要判断的对象
+ * @return
  */ function isObject(obj) {
     return Object.prototype.toString.call(obj) === '[object Object]';
 }
@@ -602,25 +601,12 @@ function isCanvas(canvas) {
     // 小程序 Canvas 无法使用 instanceof HTMLCanvasElement 判断
     return typeof canvas === 'object' && canvas !== null && ((_canvas_tagName = canvas.tagName) == null ? void 0 : _canvas_tagName.toUpperCase()) === 'CANVAS';
 }
-function deepClone(obj) {
-    if (isArray(obj)) {
-        return obj.map(deepClone);
-    } else if (obj && typeof obj === 'object') {
-        if (ArrayBuffer.isView(obj)) {
-            return obj.slice();
-        }
-        const ret = {};
-        const kas = Object.keys(obj);
-        for(let i = 0; i < kas.length; i++){
-            const key = kas[i];
-            ret[key] = deepClone(obj[key]);
-        }
-        return ret;
-    }
-    return obj;
-}
-// TODO: 改名
-function random(min, max) {
+/**
+ * 生成一个位于 min 和 max 之间的随机数
+ * @param min
+ * @param max
+ * @returns
+ */ function randomInRange(min, max) {
     return min + Math.random() * (max - min);
 }
 function throwDestroyedError() {
@@ -3860,7 +3846,7 @@ var CameraClipMode;
      * 蒙版形状切分
      */ ValueType[ValueType["SHAPE_SPLITS"] = 11] = "SHAPE_SPLITS";
     /**
-     *直线路径
+     * 直线路径
      */ ValueType[ValueType["LINEAR_PATH"] = 12] = "LINEAR_PATH";
     /**
      * 多色
@@ -4036,7 +4022,7 @@ var TextAlignment;
 (function(TextAlignment) {
     /**
      * text alignment starts from（x,y) to right direction
-     * 从(x,y)开始第一个字符，向右边延伸
+     * 从 (x,y) 开始第一个字符，向右边延伸
      */ TextAlignment[TextAlignment["left"] = 0] = "left";
     /**
      * (x,y) is middle position of text, where (left + right)/2 =(x,y)
@@ -4044,7 +4030,7 @@ var TextAlignment;
      */ TextAlignment[TextAlignment["middle"] = 1] = "middle";
     /**
      * text alignment ends with（x,y) from left direction
-     * 从(x,y)结束最后一个字符，向左边延伸
+     * 从 (x,y) 结束最后一个字符，向左边延伸
      */ TextAlignment[TextAlignment["right"] = 2] = "right";
 })(TextAlignment || (TextAlignment = {}));
 /**
@@ -4094,6 +4080,7 @@ var DataType;
     DataType["TimelineAsset"] = "TimelineAsset";
     DataType["TransformPlayableAsset"] = "TransformPlayableAsset";
     DataType["SpriteColorPlayableAsset"] = "SpriteColorPlayableAsset";
+    DataType["BinaryAsset"] = "BinaryAsset";
     // FIXME: 先完成ECS的场景转换，后面移到spec中
     DataType["MeshComponent"] = "MeshComponent";
     DataType["SkyboxComponent"] = "SkyboxComponent";
@@ -4102,6 +4089,7 @@ var DataType;
     DataType["ModelPluginComponent"] = "ModelPluginComponent";
     DataType["TreeComponent"] = "TreeComponent";
     DataType["AnimationComponent"] = "AnimationComponent";
+    DataType["SpineComponent"] = "SpineComponent";
     // Non-EffectObject
     DataType["TimelineClip"] = "TimelineClip";
 })(DataType || (DataType = {}));
@@ -4189,11 +4177,11 @@ var VertexBufferSemantic;
     VertexBufferSemantic["TangentBS3"] = "TANGENT_BS3";
 })(VertexBufferSemantic || (VertexBufferSemantic = {}));
 
-class BuiltinObjectGUID {
-}
-BuiltinObjectGUID.WhiteTexture = 'whitetexture00000000000000000000';
-BuiltinObjectGUID.PBRShader = 'pbr00000000000000000000000000000';
-BuiltinObjectGUID.UnlitShader = 'unlit000000000000000000000000000';
+const BuiltinObjectGUID = {
+    WhiteTexture: 'whitetexture00000000000000000000',
+    PBRShader: 'pbr00000000000000000000000000000',
+    UnlitShader: 'unlit000000000000000000000000000'
+};
 
 var index$1 = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -4249,15 +4237,20 @@ var index$1 = /*#__PURE__*/Object.freeze({
     BuiltinObjectGUID: BuiltinObjectGUID
 });
 
-const effectsClassStore = {};
 const decoratorInitialStore = {};
 const mergedStore = {};
-function getDirectStore(target) {
-    const classKey = target.constructor.name;
-    if (!decoratorInitialStore[classKey]) {
-        decoratorInitialStore[classKey] = {};
-    }
-    return decoratorInitialStore[classKey];
+const effectsClassStore = {};
+function effectsClass(className) {
+    return (target, context)=>{
+        if (effectsClassStore[className]) {
+            console.warn(`Class ${className} 重复注册`);
+        }
+        // TODO: three修改json dataType, 这边重复注册直接 return
+        effectsClassStore[className] = target;
+    };
+}
+function serialize(type, sourceName) {
+    return generateSerializableMember(type, sourceName); // value member
 }
 function getMergedStore(target) {
     const classKey = target.constructor.name;
@@ -4282,34 +4275,32 @@ function getMergedStore(target) {
     }
     return store;
 }
-function serialize(type, sourceName) {
-    return generateSerializableMember(type, sourceName); // value member
-}
-function effectsClass(className) {
-    return (target, context)=>{
-        if (effectsClassStore[className]) {
-            console.warn('Class ' + className + ' 重复注册');
-        }
-        //TODO: three修改json dataType, 这边重复注册直接 return
-        effectsClassStore[className] = target;
-    };
-}
 function generateSerializableMember(type, sourceName) {
     return (target, propertyKey)=>{
         const classStore = getDirectStore(target);
         if (!classStore[propertyKey]) {
             classStore[propertyKey] = {
-                type: type,
-                sourceName: sourceName
+                type,
+                sourceName
             };
         }
     };
 }
+function getDirectStore(target) {
+    const classKey = target.constructor.name;
+    if (!decoratorInitialStore[classKey]) {
+        decoratorInitialStore[classKey] = {};
+    }
+    return decoratorInitialStore[classKey];
+}
 
 /**
  * @since 2.0.0
  * @internal
  */ class EffectsObject {
+    static is(obj) {
+        return obj instanceof EffectsObject && 'guid' in obj;
+    }
     getInstanceId() {
         return this.guid;
     }
@@ -4505,6 +4496,7 @@ __decorate([
         super(...args);
         this.started = false;
         this.materials = [];
+        this._priority = 0;
         this._enabled = true;
     }
 }
@@ -9213,7 +9205,7 @@ class RandomValue extends ValueGetter {
         this.max = props[1];
     }
     getValue(time) {
-        return random(this.min, this.max);
+        return randomInRange(this.min, this.max);
     }
     toUniform() {
         return new Float32Array([
@@ -12778,13 +12770,16 @@ const tempColor = [
 let seed$3 = 0;
 class SpriteColorPlayable extends Playable {
     processFrame(context) {
-        const boundItem = context.output.getUserData();
+        const boundObject = context.output.getUserData();
+        if (!(boundObject instanceof VFXItem)) {
+            return;
+        }
         if (!this.spriteMaterial) {
-            this.spriteMaterial = boundItem.getComponent(SpriteComponent).material;
+            this.spriteMaterial = boundObject.getComponent(SpriteComponent).material;
         }
         let colorInc = vecFill(tempColor, 1);
         let colorChanged;
-        const life = this.time / boundItem.duration;
+        const life = this.time / boundObject.duration;
         const opacityOverLifetime = this.opacityOverLifetime;
         const colorOverLifetime = this.colorOverLifetime;
         if (colorOverLifetime) {
@@ -12883,7 +12878,6 @@ class SpriteComponent extends RendererComponent {
         renderer.drawGeometry(geo, material);
     }
     start() {
-        this.priority = this.item.listIndex;
         this.item.getHitTestParams = this.getHitTestParams;
     }
     update(dt) {
@@ -13781,7 +13775,7 @@ class Cone {
         // dir + [0,0,1]
         dir.z += 1;
         return {
-            position: position.multiply(random(0, 1)),
+            position: position.multiply(randomInRange(0, 1)),
             direction: dir.normalize()
         };
     }
@@ -13793,7 +13787,7 @@ class Cone {
 }
 function getArcAngle(arc, arcMode, opt) {
     if (arcMode === ShapeArcMode.RANDOM) {
-        arc = random(0, arc);
+        arc = randomInRange(0, arc);
     } else if (arcMode === ShapeArcMode.UNIDIRECTIONAL_CYCLE) {
         const d = opt.index % (opt.total + 1);
         arc = arc / opt.total * d;
@@ -13825,8 +13819,8 @@ class Circle {
 }
 class Rectangle {
     generate(opt) {
-        const x = random(-this._d, this._d);
-        const y = random(-this._h, this._h);
+        const x = randomInRange(-this._d, this._d);
+        const y = randomInRange(-this._h, this._h);
         return {
             direction: new Vector3(0, 0, 1),
             position: new Vector3(x, y, 0)
@@ -13871,7 +13865,7 @@ class RectangleEdge {
 }
 class Edge {
     generate(options) {
-        const x = this.arcMode === ShapeArcMode.UNIFORM_BURST ? options.burstIndex % options.burstCount / (options.burstCount - 1) : random(0, 1);
+        const x = this.arcMode === ShapeArcMode.UNIFORM_BURST ? options.burstIndex % options.burstCount / (options.burstCount - 1) : randomInRange(0, 1);
         return {
             direction: new Vector3(0, 1, 0),
             position: new Vector3(this._d * (x - 0.5), 0, 0)
@@ -13889,7 +13883,7 @@ class Donut {
     generate(opt) {
         const dradius = this.donutRadius;
         const center = this.radius - dradius;
-        const angle = random(0, Math.PI * 2);
+        const angle = randomInRange(0, Math.PI * 2);
         const arc = getArcAngle(this.arc, this.arcMode, opt) * DEG2RAD;
         const rot = tempMat4$2.setFromRotationZ(arc);
         const direction = new Vector3(Math.cos(angle), Math.sin(angle), 0);
@@ -13909,7 +13903,7 @@ class Donut {
 const tempMat4$1 = new Matrix4();
 class Sphere {
     getHorizontalAngle() {
-        return random(-90, 90);
+        return randomInRange(-90, 90);
     }
     generate(opt) {
         const rz = getArcAngle(this.arc, this.arcMode, opt) * DEG2RAD;
@@ -13931,7 +13925,7 @@ class Sphere {
 }
 class Hemisphere extends Sphere {
     getHorizontalAngle() {
-        return random(0, 90);
+        return randomInRange(0, 90);
     }
 }
 
@@ -15252,7 +15246,7 @@ function getTrailMeshShader(trails, particleMaxCount, name, env = '', gpuCapabil
  * @internal
  */ class ParticleSystemRenderer extends RendererComponent {
     start() {
-        this._priority = this.item.listIndex;
+        this._priority = this.item.renderOrder;
         this.particleMesh.gravityModifier.scaleXCoord(this.item.duration);
         for (const mesh of this.meshes){
             mesh.start();
@@ -15927,11 +15921,9 @@ class ParticleSystem extends Component {
         this.props = props;
         this.destroyed = false;
         const cachePrefix = '';
-        const options = props.options;
-        const positionOverLifetime = props.positionOverLifetime;
-        const shape = props.shape;
-        const gravityModifier = positionOverLifetime.gravityOverLifetime;
-        const gravity = ensureVec3(positionOverLifetime.gravity);
+        const { options, positionOverLifetime = {}, shape } = props;
+        const gravityModifier = positionOverLifetime == null ? void 0 : positionOverLifetime.gravityOverLifetime;
+        const gravity = ensureVec3(positionOverLifetime == null ? void 0 : positionOverLifetime.gravity);
         const _textureSheetAnimation = props.textureSheetAnimation;
         const textureSheetAnimation = _textureSheetAnimation ? {
             animationDelay: createValueGetter(_textureSheetAnimation.animationDelay || 0),
@@ -15942,7 +15934,7 @@ class ParticleSystem extends Component {
             row: _textureSheetAnimation.row,
             total: _textureSheetAnimation.total || _textureSheetAnimation.col * _textureSheetAnimation.row
         } : undefined;
-        const startTurbulence = !!(shape && shape.turbulenceX || shape.turbulenceY || shape.turbulenceZ);
+        const startTurbulence = !!(shape && shape.turbulenceX || (shape == null ? void 0 : shape.turbulenceY) || (shape == null ? void 0 : shape.turbulenceZ));
         let turbulence;
         if (startTurbulence) {
             var _shape_turbulenceX, _shape_turbulenceY, _shape_turbulenceZ;
@@ -15973,7 +15965,7 @@ class ParticleSystem extends Component {
             }
         }
         let forceTarget;
-        if (positionOverLifetime.forceTarget) {
+        if (positionOverLifetime == null ? void 0 : positionOverLifetime.forceTarget) {
             forceTarget = {
                 target: positionOverLifetime.target || [
                     0,
@@ -16282,13 +16274,13 @@ function randomArrItem(arr, keepArr) {
  * @internal
  */ class ParticleBehaviourPlayable extends Playable {
     start(context) {
-        const binding = context.output.getUserData();
-        if (this.particleSystem) {
+        const boundObject = context.output.getUserData();
+        if (this.particleSystem || !(boundObject instanceof VFXItem)) {
             return;
         }
-        this.particleSystem = binding.getComponent(ParticleSystem);
+        this.particleSystem = boundObject.getComponent(ParticleSystem);
         if (this.particleSystem) {
-            this.particleSystem.name = binding.name;
+            this.particleSystem.name = boundObject.name;
             this.particleSystem.start();
             this.particleSystem.initEmitterTransform();
         }
@@ -17408,10 +17400,13 @@ const tempPos = new Vector3();
     }
     processFrame(context) {
         if (!this.binding) {
-            this.binding = context.output.getUserData();
-            this.start();
+            const boundObject = context.output.getUserData();
+            if (boundObject instanceof VFXItem) {
+                this.binding = boundObject;
+                this.start();
+            }
         }
-        if (this.binding.composition) {
+        if (this.binding && this.binding.composition) {
             this.sampleAnimation();
         }
     }
@@ -17579,13 +17574,37 @@ AnimationClip = __decorate([
 ], AnimationClip);
 class AnimationClipPlayable extends Playable {
     processFrame(context) {
-        const boundItem = context.output.getUserData();
-        if (boundItem.composition) {
-            this.clip.sampleAnimation(boundItem, this.time);
+        const boundObject = context.output.getUserData();
+        if (!(boundObject instanceof VFXItem)) {
+            return;
+        }
+        if (boundObject.composition) {
+            this.clip.sampleAnimation(boundObject, this.time);
         }
     }
 }
 
+/**
+ * @since 2.0.0
+ * @internal
+ */ class TimelineClip {
+    toLocalTime(time) {
+        let localTime = time - this.start;
+        const duration = this.duration;
+        if (localTime - duration > 0.001) {
+            if (this.endBehaviour === ItemEndBehavior.loop) {
+                localTime = localTime % duration;
+            } else if (this.endBehaviour === ItemEndBehavior.freeze) {
+                localTime = Math.min(duration, localTime);
+            }
+        }
+        return localTime;
+    }
+    constructor(){
+        this.start = 0;
+        this.duration = 0;
+    }
+}
 class TrackAsset extends PlayableAsset {
     /**
    * 重写该方法以获取自定义对象绑定
@@ -17666,7 +17685,7 @@ class TrackAsset extends PlayableAsset {
     }
 }
 __decorate([
-    serialize('TimelineClip')
+    serialize(TimelineClip)
 ], TrackAsset.prototype, "clips", void 0);
 __decorate([
     serialize()
@@ -17679,27 +17698,6 @@ exports.TrackType = void 0;
     TrackType[TrackType["MasterTrack"] = 0] = "MasterTrack";
     TrackType[TrackType["ObjectTrack"] = 1] = "ObjectTrack";
 })(exports.TrackType || (exports.TrackType = {}));
-class TimelineClip {
-    toLocalTime(time) {
-        let localTime = time - this.start;
-        const duration = this.duration;
-        if (localTime - duration > 0.001) {
-            if (this.endBehaviour === ItemEndBehavior.loop) {
-                localTime = localTime % duration;
-            } else if (this.endBehaviour === ItemEndBehavior.freeze) {
-                localTime = Math.min(duration, localTime);
-            }
-        }
-        return localTime;
-    }
-    constructor(){
-        this.start = 0;
-        this.duration = 0;
-    }
-}
-TimelineClip = __decorate([
-    effectsClass('TimelineClip')
-], TimelineClip);
 class RuntimeClip {
     set enable(value) {
         if (value) {
@@ -17774,10 +17772,6 @@ class ObjectBindingTrack extends TrackAsset {
             particleClip.endBehaviour = boundItem.endBehavior;
         }
     }
-    fromData(data) {
-        super.fromData(data);
-        this.data = data;
-    }
 }
 ObjectBindingTrack = __decorate([
     effectsClass('ObjectBindingTrack')
@@ -17791,13 +17785,11 @@ TransformTrack = __decorate([
 
 class ActivationMixerPlayable extends Playable {
     processFrame(context) {
-        if (!this.bindingItem) {
-            this.bindingItem = context.output.getUserData();
-        }
-        if (!this.bindingItem) {
+        const boundObject = context.output.getUserData();
+        if (!(boundObject instanceof VFXItem)) {
             return;
         }
-        const bindingItem = this.bindingItem;
+        const boundItem = boundObject;
         let hasInput = false;
         for(let i = 0; i < this.getInputCount(); i++){
             if (this.getInputWeight(i) > 0) {
@@ -17806,11 +17798,11 @@ class ActivationMixerPlayable extends Playable {
             }
         }
         if (hasInput) {
-            bindingItem.transform.setValid(true);
-            this.showRendererComponents(bindingItem);
+            boundItem.transform.setValid(true);
+            this.showRendererComponents(boundItem);
         } else {
-            bindingItem.transform.setValid(false);
-            this.hideRendererComponents(bindingItem);
+            boundItem.transform.setValid(false);
+            this.hideRendererComponents(boundItem);
         }
     }
     hideRendererComponents(item) {
@@ -17965,7 +17957,6 @@ function compareTracks(a, b) {
         this.startTime = startTime;
         this.resolveBindings();
         this.timelinePlayable = this.timelineAsset.createPlayable(this.graph);
-        this.timelinePlayable.play();
         // 重播不销毁元素
         if (this.item.endBehavior !== ItemEndBehavior.destroy) {
             this.setReusable(true);
@@ -18177,7 +18168,9 @@ SubCompositionTrack = __decorate([
 class SubCompositionClipPlayable extends Playable {
     processFrame(context) {
         const boundObject = context.output.getUserData();
-        boundObject.time = this.getTime();
+        if (boundObject instanceof CompositionComponent) {
+            boundObject.time = this.getTime();
+        }
     }
 }
 
@@ -18347,7 +18340,6 @@ class CanvasPool {
             return this.elements.shift();
         }
         if (getConfig(TEMPLATE_USE_OFFSCREEN_CANVAS)) {
-            // @ts-expect-error
             return window._createOffscreenCanvas(10, 10);
         } else {
             // in hongmeng system, create too many canvas will case render error
@@ -18902,6 +18894,19 @@ class VFXItem extends EffectsObject {
         return (_this_composition_reusable = (_this_composition = this.composition) == null ? void 0 : _this_composition.reusable) != null ? _this_composition_reusable : false;
     }
     /**
+   * 元素在合成中的索引
+   */ get renderOrder() {
+        return this.listIndex;
+    }
+    set renderOrder(value) {
+        if (this.listIndex !== value) {
+            this.listIndex = value;
+            for (const rendererComponent of this.rendererComponents){
+                rendererComponent.priority = value;
+            }
+        }
+    }
+    /**
    * 设置元素的动画速度
    * @param speed - 速度
    */ setSpeed(speed) {
@@ -19158,7 +19163,6 @@ class VFXItem extends EffectsObject {
         this.parentId = parentId;
         this.duration = duration;
         this.endBehavior = endBehavior;
-        this.listIndex = listIndex;
         //@ts-expect-error
         this.oldId = data.oldId;
         if (!data.content) {
@@ -19169,17 +19173,11 @@ class VFXItem extends EffectsObject {
         if (duration <= 0) {
             throw Error(`Item duration can't be less than 0, see ${HELP_LINK['Item duration can\'t be less than 0']}`);
         }
-        if (data.components) {
-            for (const component of data.components){
-                const newComponent = component;
-                this.components.push(newComponent);
-                if (newComponent instanceof RendererComponent) {
-                    this.rendererComponents.push(newComponent);
-                } else if (newComponent instanceof ItemBehaviour) {
-                    this.itemBehaviours.push(newComponent);
-                }
-            }
+        for (const component of this.components){
+            component.onAttached();
         }
+        // renderOrder 在 component 初始化后设置。确保能拿到 rendererComponent。
+        this.renderOrder = listIndex;
     }
     toData() {
         var _this_parent;
@@ -19274,6 +19272,7 @@ class VFXItem extends EffectsObject {
         /**
    * 元素动画的速度
    */ this.speed = 1;
+        this.listIndex = 0;
         this.name = 'VFXItem';
         this.transform.name = this.name;
         this.transform.engine = engine;
@@ -19282,6 +19281,9 @@ class VFXItem extends EffectsObject {
         }
     }
 }
+__decorate([
+    serialize()
+], VFXItem.prototype, "components", void 0);
 VFXItem = __decorate([
     effectsClass(DataType.VFXItemData)
 ], VFXItem);
@@ -19477,20 +19479,20 @@ class SerializationHelper {
             if (value === undefined) {
                 value = effectsObject[key];
             }
-            if (value instanceof EffectsObject) {
-                this.collectSerializableObject(value, res);
-            } else if (value instanceof Array) {
+            if (EffectsObject.is(value)) {
+                SerializationHelper.collectSerializableObject(value, res);
+            } else if (isArray(value)) {
                 for (const arrayValue of value){
-                    if (arrayValue instanceof EffectsObject) {
-                        this.collectSerializableObject(arrayValue, res);
+                    if (EffectsObject.is(arrayValue)) {
+                        SerializationHelper.collectSerializableObject(arrayValue, res);
                     }
                 }
-            } else if (value instanceof Object) {
+            } else if (isObject(value)) {
                 // 非 EffectsObject 对象只递归一层
                 for (const objectKey of Object.keys(value)){
                     const objectValue = value[objectKey];
-                    if (objectValue instanceof EffectsObject) {
-                        this.collectSerializableObject(objectValue, res);
+                    if (EffectsObject.is(objectValue)) {
+                        SerializationHelper.collectSerializableObject(objectValue, res);
                     }
                 }
             }
@@ -19525,17 +19527,17 @@ class SerializationHelper {
             if (typeof value === 'number' || typeof value === 'string' || typeof value === 'boolean' || SerializationHelper.checkTypedArray(value)) {
                 // TODO json 数据避免传 typedArray
                 serializedData[key] = value;
-            } else if (value instanceof Array) {
+            } else if (isArray(value)) {
                 if (!serializedData[key]) {
                     serializedData[key] = [];
                 }
                 SerializationHelper.serializeArrayProperty(value, serializedData[key], 0);
-            } else if (value instanceof EffectsObject) {
+            } else if (EffectsObject.is(value)) {
                 // TODO 处理 EffectsObject 递归序列化
                 serializedData[key] = {
                     id: value.getInstanceId()
                 };
-            } else if (value instanceof Object) {
+            } else if (isObject(value)) {
                 if (!serializedData[key]) {
                     serializedData[key] = {};
                 }
@@ -19548,17 +19550,17 @@ class SerializationHelper {
             if (typeof value === 'number' || typeof value === 'string' || typeof value === 'boolean' || SerializationHelper.checkTypedArray(value)) {
                 // TODO json 数据避免传 typedArray
                 serializedData[key] = value;
-            } else if (value instanceof Array) {
+            } else if (isArray(value)) {
                 if (!serializedData[key]) {
                     serializedData[key] = [];
                 }
                 SerializationHelper.serializeArrayProperty(value, serializedData[key], 0);
-            } else if (value instanceof EffectsObject) {
+            } else if (EffectsObject.is(value)) {
                 // TODO 处理 EffectsObject 递归序列化
                 serializedData[key] = {
                     id: value.getInstanceId()
                 };
-            } else if (value instanceof Object) {
+            } else if (isObject(value)) {
                 if (!serializedData[key]) {
                     serializedData[key] = {};
                 }
@@ -19618,13 +19620,13 @@ class SerializationHelper {
     static checkTypedArray(obj) {
         return obj instanceof Int8Array || obj instanceof Uint8Array || obj instanceof Uint8ClampedArray || obj instanceof Int16Array || obj instanceof Uint16Array || obj instanceof Int32Array || obj instanceof Uint32Array || obj instanceof Float32Array || obj instanceof Float64Array || obj instanceof ArrayBuffer;
     }
+    // check value is { id: 7e69662e964e4892ae8933f24562395b }
     static checkDataPath(value) {
-        // check value is { id: 7e69662e964e4892ae8933f24562395b }
-        return value instanceof Object && Object.keys(value).length === 1 && value.id && value.id.length === 32;
+        return !!(isObject(value) && Object.keys(value).length === 1 && 'id' in value && isString(value.id) && value.id.length === 32);
     }
     // TODO 测试函数，2.0 上线后移除
     static checkGLTFNode(value) {
-        return value instanceof Object && value.nodeIndex !== undefined && value.isJoint !== undefined;
+        return isObject(value) && value.nodeIndex !== undefined && value.isJoint !== undefined;
     }
     static checkImageSource(value) {
         return isCanvas(value) || value instanceof HTMLImageElement;
@@ -19634,9 +19636,8 @@ class SerializationHelper {
             console.error('序列化数据的内嵌对象层数大于上限');
             return;
         }
-        if (typeof property === 'number' || typeof property === 'string' || typeof property === 'boolean') {
-            return property;
-        } else if (property instanceof Array) {
+        // 加载并链接 DataPath 字段表示的 EffectsObject 引用。Class 对象 copy [key, value] 会丢失对象信息，因此只递归数组对象和普通 js Object 结构对象。
+        if (isArray(property)) {
             const res = [];
             for (const value of property){
                 res.push(SerializationHelper.deserializeProperty(value, engine, level + 1, type));
@@ -19645,21 +19646,19 @@ class SerializationHelper {
         // TODO json 数据避免传 typedArray
         } else if (SerializationHelper.checkDataPath(property)) {
             return engine.assetLoader.loadGUID(property.id);
-        } else if (property instanceof EffectsObject || SerializationHelper.checkImageSource(property) || SerializationHelper.checkTypedArray(property) || SerializationHelper.checkGLTFNode(property)) {
-            return property;
-        } else if (property instanceof Object) {
+        } else if (isObject(property) && property.constructor === Object) {
             let res;
             if (type) {
-                const classConstructor = effectsClassStore[type];
-                res = new classConstructor();
+                res = new type();
             } else {
                 res = {};
             }
             for (const key of Object.keys(property)){
-                // @ts-expect-error
                 res[key] = SerializationHelper.deserializeProperty(property[key], engine, level + 1);
             }
             return res;
+        } else {
+            return property;
         }
     }
     static deserializePropertyAsync(property, engine, level, type) {
@@ -19668,9 +19667,7 @@ class SerializationHelper {
                 console.error('序列化数据的内嵌对象层数大于上限');
                 return;
             }
-            if (typeof property === 'number' || typeof property === 'string' || typeof property === 'boolean') {
-                return property;
-            } else if (property instanceof Array) {
+            if (isArray(property)) {
                 const res = [];
                 for (const value of property){
                     res.push((yield SerializationHelper.deserializePropertyAsync(value, engine, level + 1, type)));
@@ -19680,21 +19677,19 @@ class SerializationHelper {
             } else if (SerializationHelper.checkDataPath(property)) {
                 const res = yield engine.assetLoader.loadGUIDAsync(property.id);
                 return res;
-            } else if (property instanceof EffectsObject || SerializationHelper.checkImageSource(property) || SerializationHelper.checkTypedArray(property) || SerializationHelper.checkGLTFNode(property)) {
-                return property;
-            } else if (property instanceof Object) {
+            } else if (isObject(property) && property.constructor === Object) {
                 let res;
                 if (type) {
-                    const classConstructor = effectsClassStore[type];
-                    res = new classConstructor();
+                    res = new type();
                 } else {
                     res = {};
                 }
                 for (const key of Object.keys(property)){
-                    // @ts-expect-error
                     res[key] = SerializationHelper.deserializeProperty(property[key], engine, level + 1);
                 }
                 return res;
+            } else {
+                return property;
             }
         })();
     }
@@ -19711,17 +19706,17 @@ class SerializationHelper {
             if (typeof value === 'number' || typeof value === 'string' || typeof value === 'boolean' || SerializationHelper.checkTypedArray(objectProperty)) {
                 // TODO json 数据避免传 typedArray
                 serializedData[key] = value;
-            } else if (value instanceof Array) {
+            } else if (isArray(value)) {
                 if (!serializedData[key]) {
                     serializedData[key] = [];
                 }
                 SerializationHelper.serializeArrayProperty(value, serializedData[key], level + 1);
-            } else if (value instanceof EffectsObject) {
+            } else if (EffectsObject.is(value)) {
                 // TODO 处理 EffectsObject 递归序列化
                 serializedData[key] = {
                     id: value.getInstanceId()
                 };
-            } else if (value instanceof Object) {
+            } else if (isObject(value)) {
                 if (!serializedData[key]) {
                     serializedData[key] = {};
                 }
@@ -19742,17 +19737,17 @@ class SerializationHelper {
             if (typeof value === 'number' || typeof value === 'string' || typeof value === 'boolean' || SerializationHelper.checkTypedArray(arrayProperty)) {
                 // TODO json 数据避免传 typedArray
                 serializedData[i] = value;
-            } else if (value instanceof Array) {
+            } else if (isArray(value)) {
                 if (!serializedData[i]) {
                     serializedData[i] = [];
                 }
-                this.serializeArrayProperty(value, serializedData[i], level + 1);
-            } else if (value instanceof EffectsObject) {
+                SerializationHelper.serializeArrayProperty(value, serializedData[i], level + 1);
+            } else if (EffectsObject.is(value)) {
                 // TODO 处理 EffectsObject 递归序列化
                 serializedData[i] = {
                     id: value.getInstanceId()
                 };
-            } else if (value instanceof Object) {
+            } else if (isObject(value)) {
                 if (!serializedData[i]) {
                     serializedData[i] = {};
                 }
@@ -20683,8 +20678,6 @@ function getStandardCameraContent(model) {
 /**
  * 3.0 以下版本数据适配（runtime 2.0及以上版本支持）
  */ function version30Migration(json) {
-    var // 更正 spine 数据中的 images 属性
-    _json_spines;
     var // 兼容老版本数据中不存在textures的情况
     _result;
     const result = _extends({}, json, {
@@ -20694,7 +20687,8 @@ function getStandardCameraContent(model) {
         materials: [],
         shaders: [],
         geometries: [],
-        animations: []
+        animations: [],
+        miscs: []
     });
     // image数据添加 guid
     for (const image of result.images){
@@ -20723,17 +20717,10 @@ function getStandardCameraContent(model) {
             });
         }
     }
-    (_json_spines = json.spines) == null ? void 0 : _json_spines.forEach((spine)=>{
-        for(let i = 0; i < spine.images.length; i++){
-            var _json_textures_spine_images_i;
-            //@ts-expect-error
-            const textureId = (_json_textures_spine_images_i = json.textures[spine.images[i]]) == null ? void 0 : _json_textures_spine_images_i.id;
-            //@ts-expect-error
-            spine.images[i] = {
-                id: textureId
-            };
-        }
-    });
+    // 处理老版本数据中 bins 没有 id 的情况
+    if (json.bins) {
+        convertBinaryAsset(json.bins, result);
+    }
     const itemOldIdToGuidMap = {};
     const guidToItemMap = {};
     // 更正Composition.endBehavior
@@ -20954,6 +20941,10 @@ function getStandardCameraContent(model) {
             //@ts-expect-error
             item.type = 'orientation-transformer';
         }
+        // Spine 元素转为 guid 索引
+        if (item.type === ItemType.spine && json.spines && json.spines.length !== 0) {
+            convertSpineData(json.spines[item.content.options.spine], item.content, result);
+        }
         // item 的 content 转为 component data 加入 JSONScene.components
         if (item.type === ItemType.sprite || item.type === ItemType.particle || item.type === ItemType.mesh || item.type === ItemType.skybox || item.type === ItemType.light || item.type === 'camera' || item.type === ItemType.tree || item.type === ItemType.interact || item.type === ItemType.camera || item.type === ItemType.text || item.type === ItemType.spine || item.type === 'editor-gizmo' || item.type === 'orientation-transformer') {
             item.components = [];
@@ -21197,20 +21188,48 @@ function convertTimelineAsset(composition, guidToItemMap, jsonScene) {
         id: timelineAssetData.id
     };
     composition.sceneBindings = sceneBindings;
-    if (!jsonScene.animations) {
-        jsonScene.animations = [];
-    }
-    // @ts-expect-error
-    jsonScene.animations.push(timelineAssetData);
+    jsonScene.miscs.push(timelineAssetData);
     for (const trackData of trackDatas){
         //@ts-expect-error
-        jsonScene.animations.push(trackData);
+        jsonScene.miscs.push(trackData);
     }
     for (const playableAsset of playableAssetDatas){
         //@ts-expect-error
-        jsonScene.animations.push(playableAsset);
+        jsonScene.miscs.push(playableAsset);
     }
 }
+function convertBinaryAsset(bins, jsonScene) {
+    //@ts-expect-error
+    jsonScene.bins = bins.map((bin)=>({
+            url: bin.url,
+            'dataType': 'BinaryAsset',
+            id: generateGUID()
+        }));
+}
+function convertSpineData(resource, content, jsonScene) {
+    //@ts-expect-error
+    content.resource = {
+        'atlas': {
+            'bins': {
+                //@ts-expect-error
+                'id': jsonScene.bins[resource.atlas[1][0]].id
+            },
+            'source': resource.atlas[1].slice(1)
+        },
+        'skeleton': {
+            'bins': {
+                //@ts-expect-error
+                'id': jsonScene.bins[resource.skeleton[1][0]].id
+            },
+            'source': resource.skeleton[1].slice(1)
+        },
+        'skeletonType': resource.skeletonType,
+        'images': resource.images.map((i)=>({
+                //@ts-expect-error
+                id: jsonScene.textures[i].id
+            }))
+    };
+}
 
 const v0 = /^(\d+)\.(\d+)\.(\d+)(-(\w+)\.\d+)?$/;
 const standardVersion = /^(\d+)\.(\d+)$/;
@@ -21513,7 +21532,17 @@ function getStandardItem(item, opt = {}) {
     }
 }
 
-const renderLevelPassSet = {
+/**
+ * 机型和渲染等级对应表
+ *
+ * 机型：B-低端机、A-中端机、S-高端机
+ * 渲染等级：B-低、A-中、S-高、A+-中高、B+-全部
+ *
+ * - S（高端机）：高、全部、中高
+ * - A（中端机）：中、全部、中高
+ * - B（低端机）：低、全部
+ * - undefined（全部机型）
+ */ const renderLevelPassSet = {
     [RenderLevel.S]: [
         RenderLevel.S,
         RenderLevel.BPlus,
@@ -21759,7 +21788,7 @@ let seed = 1;
             const shaderLibrary = renderer == null ? void 0 : renderer.getShaderLibrary();
             yield pluginSystem == null ? void 0 : pluginSystem.precompile(compositions, renderer, options);
             yield new Promise((resolve)=>{
-                shaderLibrary.compileAllShaders(()=>{
+                shaderLibrary == null ? void 0 : shaderLibrary.compileAllShaders(()=>{
                     resolve(null);
                 });
             });
@@ -23187,7 +23216,7 @@ let listOrder = 0;
             scene.textures = undefined;
             scene.consumed = true;
         }
-        const { sourceContent, pluginSystem, imgUsage, totalTime, renderLevel, refCompositionProps } = this.compositionSourceManager;
+        const { sourceContent, pluginSystem, imgUsage, totalTime, refCompositionProps } = this.compositionSourceManager;
         assertExist(sourceContent);
         this.renderer = renderer;
         this.refCompositionProps = refCompositionProps;
@@ -23213,7 +23242,6 @@ let listOrder = 0;
         };
         this.reusable = reusable;
         this.speed = speed;
-        this.renderLevel = renderLevel;
         this.autoRefTex = !this.keepResource && imageUsage && this.rootItem.endBehavior !== ItemEndBehavior.loop;
         this.name = sourceContent.name;
         this.pluginSystem = pluginSystem;
@@ -23264,7 +23292,7 @@ let listOrder = 0;
     }
     addPackageDatas(scene) {
         const { jsonScene, textureOptions = [] } = scene;
-        const { items = [], materials = [], shaders = [], geometries = [], components = [], animations = [], bins = [] } = jsonScene;
+        const { items = [], materials = [], shaders = [], geometries = [], components = [], animations = [], bins = [], miscs = [] } = jsonScene;
         for (const vfxItemData of items){
             this.addEffectsObjectData(vfxItemData);
         }
@@ -23283,6 +23311,9 @@ let listOrder = 0;
         for (const animationData of animations){
             this.addEffectsObjectData(animationData);
         }
+        for (const miscData of miscs){
+            this.addEffectsObjectData(miscData);
+        }
         for(let i = 0; i < bins.length; i++){
             const binaryData = bins[i];
             const binaryBuffer = scene.bins[i];
@@ -23657,7 +23688,9 @@ exports.SubCompositionPlayableAsset = SubCompositionPlayableAsset;
 exports.SubCompositionTrack = SubCompositionTrack;
 exports.TEMPLATE_USE_OFFSCREEN_CANVAS = TEMPLATE_USE_OFFSCREEN_CANVAS;
 exports.TextComponent = TextComponent;
+exports.TextLayout = TextLayout;
 exports.TextLoader = TextLoader;
+exports.TextStyle = TextStyle;
 exports.Texture = Texture;
 exports.TextureFactory = TextureFactory;
 exports.Ticker = Ticker;
@@ -23695,7 +23728,6 @@ exports.createShape = createShape;
 exports.createVFXItem = createVFXItem;
 exports.createValueGetter = createValueGetter;
 exports.decimalEqual = decimalEqual;
-exports.deepClone = deepClone;
 exports.defaultGlobalVolume = defaultGlobalVolume;
 exports.defaultPlugins = defaultPlugins;
 exports.deserializeMipmapTexture = deserializeMipmapTexture;
@@ -23782,7 +23814,7 @@ exports.particleUniformTypeMap = particleUniformTypeMap;
 exports.particleVert = particleVert;
 exports.pluginLoaderMap = pluginLoaderMap;
 exports.pointOnLine = pointOnLine;
-exports.random = random;
+exports.randomInRange = randomInRange;
 exports.registerPlugin = registerPlugin;
 exports.removeItem = removeItem;
 exports.rotateVec2 = rotateVec2;