@galacean/effects-threejs 2.7.0-alpha.1 → 2.7.0-beta.0

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime threejs plugin for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.7.0-alpha.1
+ * Version: v2.7.0-beta.0
  */
 
 'use strict';
@@ -3684,15 +3684,30 @@ var MaterialBlending;
 var TextOverflow;
 (function(TextOverflow) {
     /**
-     * display 模式下，会显示所有文本，文本大小会根据边界框调整。
-     */ TextOverflow[TextOverflow["display"] = 0] = "display";
+     * visible 模式下，文本内容超出边界框时，会继续显示内容，不进行裁剪或缩放。
+     */ TextOverflow[TextOverflow["visible"] = 0] = "visible";
+    /**
+     * display 模式下，会显示所有文本，文本字号大小会根据边界框调整。
+     */ TextOverflow[TextOverflow["display"] = 1] = "display";
     /**
      * clip 模式下，当文本内容超出边界框时，多余的会被截断。
-     */ TextOverflow[TextOverflow["clip"] = 1] = "clip";
+     */ TextOverflow[TextOverflow["clip"] = 2] = "clip";
     /**
      * ellipsis 模式下，会使用（...）来代替超出边界框的内容。
-     */ TextOverflow[TextOverflow["ellipsis"] = 2] = "ellipsis";
+     */ TextOverflow[TextOverflow["ellipsis"] = 3] = "ellipsis";
 })(TextOverflow || (TextOverflow = {}));
+var TextSizeMode;
+(function(TextSizeMode) {
+    /**
+     * 自适应宽度
+     */ TextSizeMode[TextSizeMode["autoWidth"] = 0] = "autoWidth";
+    /**
+     * 自适应高度
+     */ TextSizeMode[TextSizeMode["autoHeight"] = 1] = "autoHeight";
+    /**
+     * 固定宽高
+     */ TextSizeMode[TextSizeMode["fixed"] = 2] = "fixed";
+})(TextSizeMode || (TextSizeMode = {}));
 var TextBaseline;
 (function(TextBaseline) {
     /**
@@ -3756,20 +3771,21 @@ var BuiltinObjectGUID = {
     UnlitShader: "unlit000000000000000000000000000"
 };
 
-/**
- * 填充类型
- */ var FillType;
+var FillType;
 (function(FillType) {
-    /**
-     * 纯色
-     */ FillType[FillType["Solid"] = 0] = "Solid";
-    /**
-     * 线性渐变
-     */ FillType[FillType["LinearGradient"] = 1] = "LinearGradient";
-    /**
-     * 径向渐变
-     */ FillType[FillType["RadialGradient"] = 2] = "RadialGradient";
+    FillType[FillType["Solid"] = 0] = "Solid";
+    FillType[FillType["GradientLinear"] = 1] = "GradientLinear";
+    FillType[FillType["GradientRadial"] = 2] = "GradientRadial";
+    FillType[FillType["GradientAngular"] = 3] = "GradientAngular";
+    FillType[FillType["Texture"] = 4] = "Texture";
 })(FillType || (FillType = {}));
+var TexturePaintScaleMode;
+(function(TexturePaintScaleMode) {
+    TexturePaintScaleMode[TexturePaintScaleMode["Fill"] = 0] = "Fill";
+    TexturePaintScaleMode[TexturePaintScaleMode["Fit"] = 1] = "Fit";
+    TexturePaintScaleMode[TexturePaintScaleMode["Crop"] = 2] = "Crop";
+    TexturePaintScaleMode[TexturePaintScaleMode["Tile"] = 3] = "Tile";
+})(TexturePaintScaleMode || (TexturePaintScaleMode = {}));
 
 /**
  * 矢量图形类型
@@ -4033,12 +4049,14 @@ var index$1 = /*#__PURE__*/Object.freeze({
     get MaterialBlending () { return MaterialBlending; },
     get RenderMode3D () { return RenderMode3D; },
     get TextOverflow () { return TextOverflow; },
+    get TextSizeMode () { return TextSizeMode; },
     get TextBaseline () { return TextBaseline; },
     get TextAlignment () { return TextAlignment; },
     get TextWeight () { return TextWeight; },
     get FontStyle () { return FontStyle; },
     BuiltinObjectGUID: BuiltinObjectGUID,
     get FillType () { return FillType; },
+    get TexturePaintScaleMode () { return TexturePaintScaleMode; },
     get ShapePrimitiveType () { return ShapePrimitiveType; },
     get LineCap () { return LineCap; },
     get LineJoin () { return LineJoin; },
@@ -4146,10 +4164,16 @@ function getDirectStore(target) {
    * 反序列化函数
    *
    * @param data - 对象的序列化的数据
-   */ _proto.fromData = function fromData(data) {};
+   */ _proto.fromData = function fromData(data) {
+        if (data.id !== undefined) {
+            this.setInstanceId(data.id);
+        }
+    };
     /**
-   *
-   */ _proto.dispose = function dispose() {};
+   * 销毁当前对象
+   */ _proto.dispose = function dispose() {
+        this.engine.removeInstance(this.guid);
+    };
     /**
    *
    * @param obj
@@ -5243,7 +5267,7 @@ var Pose = /*#__PURE__*/ function() {
         }
         for(var _iterator2 = _create_for_of_iterator_helper_loose(skeleton.defaultColorPropertyValues), _step2; !(_step2 = _iterator2()).done;){
             var defaultColor = _step2.value;
-            this.colorPropertyValues.push(defaultColor);
+            this.colorPropertyValues.push(new Color().copyFrom(defaultColor));
         }
     }
     var _proto = Pose.prototype;
@@ -6718,7 +6742,7 @@ var Skeleton = /*#__PURE__*/ function() {
                 break;
             case 1:
                 this.colorAnimatedObjects.push(animatedObject);
-                this.defaultColorPropertyValues.push(directTarget[lastPropertyName]);
+                this.defaultColorPropertyValues.push(new Color().copyFrom(directTarget[lastPropertyName]));
                 this.pathToObjectIndex.set(totalPath, this.colorAnimatedObjects.length - 1);
         }
     };
@@ -7015,6 +7039,7 @@ function _create_class(Constructor, protoProps, staticProps) {
         if (this.item) {
             removeItem(this.item.components, this);
         }
+        EffectsObject.prototype.dispose.call(this);
     };
     _proto.start = function start() {
         if (this.isStartCalled) {
@@ -12205,9 +12230,8 @@ var seed$8 = 1;
         this.destroyed = true;
         if (this.engine !== undefined) {
             this.engine.removeMesh(this);
-            // @ts-expect-error
-            this.engine = undefined;
         }
+        RendererComponent.prototype.dispose.call(this);
     };
     _create_class(Mesh, [
         {
@@ -13363,8 +13387,6 @@ var seed$6 = 1;
         this.clearAction = clearAction;
         this.name = "RenderFrame" + seed$6++;
         var firstRP = renderPasses[0];
-        this.emptyTexture = generateWhiteTexture(engine);
-        this.transparentTexture = generateTransparentTexture(engine);
         this.camera = camera;
         this.keepColorBuffer = keepColorBuffer;
         this.renderPassInfoMap.set(firstRP, {
@@ -13413,8 +13435,6 @@ var seed$6 = 1;
         }
         this.passTextureCache.dispose();
         this._renderPasses.length = 0;
-        this.emptyTexture.dispose();
-        this.transparentTexture.dispose();
         if (this.resource) {
             var _this_resource_depthStencil_texture, _this_resource_depthStencil;
             this.resource.color_a.dispose();
@@ -14074,7 +14094,7 @@ var Renderer = /*#__PURE__*/ function() {
         _this.renderer = {
             renderMode: RenderMode.MESH,
             blending: BlendingMode.ALPHA,
-            texture: _this.engine.emptyTexture,
+            texture: _this.engine.whiteTexture,
             occlusion: false,
             transparentOcclusion: false,
             side: SideMode.DOUBLE,
@@ -14282,7 +14302,7 @@ var Renderer = /*#__PURE__*/ function() {
         this.renderer = {
             renderMode: (_renderer_renderMode = renderer.renderMode) != null ? _renderer_renderMode : RenderMode.MESH,
             blending: (_renderer_blending = renderer.blending) != null ? _renderer_blending : BlendingMode.ALPHA,
-            texture: renderer.texture ? this.engine.findObject(renderer.texture) : this.engine.emptyTexture,
+            texture: renderer.texture ? this.engine.findObject(renderer.texture) : this.engine.whiteTexture,
             occlusion: !!renderer.occlusion,
             transparentOcclusion: !!renderer.transparentOcclusion || this.maskManager.maskMode === exports.MaskMode.MASK,
             side: (_renderer_side = renderer.side) != null ? _renderer_side : SideMode.DOUBLE,
@@ -16126,20 +16146,26 @@ function oldBezierKeyFramesToNew(props) {
         keyDatas.push(keyData);
         lastControl = p2;
     }
-    var calculateSlop = function(p0, p1) {
+    var calculateSlope = function(p0, p1) {
         return (p1.y - p0.y) / (p1.x - p0.x + NumberEpsilon);
     };
     for(var i1 = 0; i1 < keyDatas.length; i1++){
         var leftControl = keyDatas[i1].leftControl;
         var value = keyDatas[i1].value;
         var rightControl = keyDatas[i1].rightControl;
-        var outSlop = calculateSlop(value, rightControl);
-        var inSlop = calculateSlop(leftControl, value);
+        var inSlope = 0;
+        var outSlope = 0;
+        if (i1 > 0) {
+            inSlope = calculateSlope(leftControl, value);
+        }
+        if (i1 < keyDatas.length - 1) {
+            outSlope = calculateSlope(value, rightControl);
+        }
         var keyframe = {
             time: value.x,
             value: value.y,
-            inSlope: inSlop,
-            outSlope: outSlop,
+            inSlope: inSlope,
+            outSlope: outSlope,
             inWeight: 0,
             outWeight: 0,
             tangentMode: keyDatas[i1].tangentMode,
@@ -16262,16 +16288,8 @@ var ColorCurve = /*#__PURE__*/ function(ValueGetter) {
 
 var vert = "precision highp float;attribute vec3 aPos;attribute vec2 aUV;varying vec2 uv0;uniform mat4 effects_MatrixVP;uniform mat4 effects_MatrixInvV;uniform mat4 effects_ObjectToWorld;void main(){vec4 pos=vec4(aPos.xyz,1.0);uv0=aUV;gl_Position=effects_MatrixVP*effects_ObjectToWorld*pos;}";
 
-var frag = "precision highp float;\n#define _MAX_STOPS 8\n#define PI 3.14159265359\nuniform vec4 _Color;uniform vec4 _Colors[_MAX_STOPS];uniform float _Stops[_MAX_STOPS];uniform int _StopsCount;uniform float _FillType;uniform vec2 _StartPoint;uniform vec2 _EndPoint;uniform sampler2D _ImageTex;uniform vec2 _ImageSize;uniform vec2 _DestSize;uniform int _ImageScaleMode;uniform mat3 _ImageTransform;uniform float _ImageScalingFactor;uniform float _ImageOpacity;varying vec2 uv0;vec4 smoothMix(vec4 a,vec4 b,float t){return mix(a,b,smoothstep(0.0,1.0,t));}float calculateAngleRatio(vec2 v1,vec2 v2){float angle=atan(v2.y,v2.x)-atan(v1.y,v1.x);if(angle<0.0)angle+=2.0*PI;return angle/(2.0*PI);}vec2 applyTransform(mat3 m,vec2 uv){vec3 p=m*vec3(uv,1.0);return p.xy;}void main(){vec4 finalColor=vec4(1.0);if(_FillType==0.0){finalColor=_Color;}else if(_FillType==1.0||_FillType==2.0||_FillType==3.0){float t=0.0;if(_FillType==1.0){vec2 gradientVector=_EndPoint-_StartPoint;vec2 pixelVector=uv0-_StartPoint;float denom=max(dot(gradientVector,gradientVector),1e-6);t=clamp(dot(pixelVector,gradientVector)/denom,0.0,1.0);}else if(_FillType==2.0){float maxRadius=max(distance(_EndPoint,_StartPoint),0.001);t=clamp(distance(uv0,_StartPoint)/maxRadius,0.0,1.0);}else{vec2 center=_StartPoint;vec2 referenceVector=_EndPoint-center;vec2 targetVector=uv0-center;if(length(targetVector)>0.001){t=calculateAngleRatio(referenceVector,targetVector);}}finalColor=_Colors[0];for(int i=1;i<_MAX_STOPS;i++){if(i>=_StopsCount)break;float prevStop=_Stops[i-1];float currStop=_Stops[i];if(t>=prevStop&&t<=currStop){float localT=(t-prevStop)/max(currStop-prevStop,1e-6);finalColor=smoothMix(_Colors[i-1],_Colors[i],localT);break;}}}else if(_FillType==4.0){vec2 uv=uv0;float rSrc=_ImageSize.x/max(_ImageSize.y,1.0);float rDst=_DestSize.x/max(_DestSize.y,1.0);bool maskOutside=false;if(_ImageScaleMode==0){vec2 scale=vec2(1.0);if(rDst>rSrc){scale=vec2(1.0,rSrc/rDst);}else{scale=vec2(rDst/rSrc,1.0);}uv=(uv-0.5)*scale+0.5;uv=clamp(uv,0.0,1.0);}else if(_ImageScaleMode==1){vec2 scale=vec2(1.0);if(rDst>rSrc){scale=vec2(rSrc/rDst,1.0);}else{scale=vec2(1.0,rSrc/rDst);}uv=(uv-0.5)*scale+0.5;maskOutside=true;}else if(_ImageScaleMode==2){uv=applyTransform(_ImageTransform,uv0);maskOutside=true;}else if(_ImageScaleMode==3){float aspectFix=rDst/max(rSrc,1e-6);vec2 uvTile=(uv0-0.5)*vec2(aspectFix,1.0)+0.5;float s=max(abs(_ImageScalingFactor),1e-6);uv=fract(uvTile*s);}vec4 img=texture2D(_ImageTex,uv);if(maskOutside){if(uv.x<0.0||uv.x>1.0||uv.y<0.0||uv.y>1.0){img.a=0.0;}}img.a*=_ImageOpacity;finalColor=img;}finalColor.rgb*=finalColor.a;gl_FragColor=finalColor;}";
+var frag = "precision highp float;\n#define _MAX_STOPS 8\n#define PI 3.14159265359\nuniform vec4 _Color;uniform vec4 _Colors[_MAX_STOPS];uniform float _Stops[_MAX_STOPS];uniform int _StopsCount;uniform float _FillType;uniform vec2 _StartPoint;uniform vec2 _EndPoint;uniform sampler2D _ImageTex;uniform vec2 _ImageSize;uniform vec2 _DestSize;uniform int _ImageScaleMode;uniform mat3 _TextureTransform;uniform float _ImageScalingFactor;uniform float _ImageOpacity;varying vec2 uv0;vec4 smoothMix(vec4 a,vec4 b,float t){return mix(a,b,smoothstep(0.0,1.0,t));}float calculateAngleRatio(vec2 v1,vec2 v2){float angle=atan(v2.y,v2.x)-atan(v1.y,v1.x);if(angle<0.0)angle+=2.0*PI;return angle/(2.0*PI);}vec2 applyTransform(mat3 m,vec2 uv){uv=uv-vec2(0.5,0.5);vec3 p=m*vec3(uv,1.0);p.xy=p.xy+vec2(0.5,0.5);return p.xy;}void main(){vec4 finalColor=vec4(1.0);if(_FillType==0.0){finalColor=_Color;}else if(_FillType==1.0||_FillType==2.0||_FillType==3.0){float t=0.0;if(_FillType==1.0){vec2 gradientVector=_EndPoint-_StartPoint;vec2 pixelVector=uv0-_StartPoint;float denom=max(dot(gradientVector,gradientVector),1e-6);t=clamp(dot(pixelVector,gradientVector)/denom,0.0,1.0);}else if(_FillType==2.0){float maxRadius=max(distance(_EndPoint,_StartPoint),0.001);t=clamp(distance(uv0,_StartPoint)/maxRadius,0.0,1.0);}else{vec2 center=_StartPoint;vec2 referenceVector=_EndPoint-center;vec2 targetVector=uv0-center;if(length(targetVector)>0.001){t=calculateAngleRatio(referenceVector,targetVector);}}finalColor=_Colors[0];for(int i=1;i<_MAX_STOPS;i++){if(i>=_StopsCount)break;float prevStop=_Stops[i-1];float currStop=_Stops[i];if(t>=prevStop&&t<=currStop){float localT=(t-prevStop)/max(currStop-prevStop,1e-6);finalColor=smoothMix(_Colors[i-1],_Colors[i],localT);break;}}}else if(_FillType==4.0){vec2 uv=uv0;float rSrc=_ImageSize.x/max(_ImageSize.y,1.0);float rDst=_DestSize.x/max(_DestSize.y,1.0);bool maskOutside=false;if(_ImageScaleMode==0){vec2 scale=vec2(1.0);if(rDst>rSrc){scale=vec2(1.0,rSrc/rDst);}else{scale=vec2(rDst/rSrc,1.0);}uv=(uv-0.5)*scale+0.5;uv=clamp(uv,0.0,1.0);}else if(_ImageScaleMode==1){vec2 scale=vec2(1.0);if(rDst>rSrc){scale=vec2(rSrc/rDst,1.0);}else{scale=vec2(1.0,rSrc/rDst);}uv=(uv-0.5)*scale+0.5;maskOutside=true;}else if(_ImageScaleMode==2){uv=applyTransform(_TextureTransform,uv0);maskOutside=true;}else if(_ImageScaleMode==3){float aspectFix=rDst/max(rSrc,1e-6);vec2 uvTile=(uv0-0.5)*vec2(aspectFix,1.0)+0.5;float s=max(abs(_ImageScalingFactor),1e-6);uv=fract(uvTile*s);}vec4 img=texture2D(_ImageTex,uv);if(maskOutside){if(uv.x<0.0||uv.x>1.0||uv.y<0.0||uv.y>1.0){img.a=0.0;}}img.a*=_ImageOpacity;finalColor=img;}finalColor.rgb*=finalColor.a;gl_FragColor=finalColor;}";
 
-exports.FillType = void 0;
-(function(FillType) {
-    FillType[FillType["Solid"] = 0] = "Solid";
-    FillType[FillType["GradientLinear"] = 1] = "GradientLinear";
-    FillType[FillType["GradientRadial"] = 2] = "GradientRadial";
-    FillType[FillType["GradientAngular"] = 3] = "GradientAngular";
-    FillType[FillType["Texture"] = 4] = "Texture";
-})(exports.FillType || (exports.FillType = {}));
 exports.TexturePaintScaleMode = void 0;
 (function(TexturePaintScaleMode) {
     TexturePaintScaleMode[TexturePaintScaleMode["Fill"] = 0] = "Fill";
@@ -16284,8 +16302,6 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
     function ShapeComponent(engine) {
         var _this;
         _this = RendererComponent.call(this, engine) || this;
-        _this.hasStroke = false;
-        _this.hasFill = false;
         _this.shapeDirty = true;
         _this.materialDirty = true;
         _this.graphicsPath = new GraphicsPath();
@@ -16297,10 +16313,15 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
             join: LineJoin.Miter,
             miterLimit: 10
         };
+        _this.strokeWidth = 1;
+        _this.strokeCap = LineCap.Butt;
+        _this.strokeJoin = LineJoin.Miter;
         _this.strokes = [];
         /**
    * 用于点击测试的碰撞器
    */ _this.meshCollider = new MeshCollider();
+        _this.fillMaterials = [];
+        _this.strokeMaterials = [];
         _this.getHitTestParams = function(force) {
             var sizeMatrix = Matrix4.fromScale(_this.transform.size.x, _this.transform.size.y, 1);
             var worldMatrix = sizeMatrix.premultiply(_this.transform.getWorldMatrix());
@@ -16312,15 +16333,15 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
                         behavior: 0,
                         type: area.type,
                         triangles: area.area,
-                        backfaceCulling: _this.renderer.side === SideMode.FRONT
+                        backfaceCulling: _this.rendererOptions.side === SideMode.FRONT
                     };
                 }
             }
         };
-        _this.renderer = {
+        _this.rendererOptions = {
             renderMode: RenderMode.MESH,
             blending: BlendingMode.ALPHA,
-            texture: _this.engine.emptyTexture,
+            texture: _this.engine.whiteTexture,
             occlusion: false,
             transparentOcclusion: false,
             side: SideMode.DOUBLE,
@@ -16330,12 +16351,12 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
         // Create Shape Attrributes
         //-------------------------------------------------------------------------
         var gradientStrokeFill = {
-            type: 0,
+            type: FillType.Solid,
             color: new Color(1, 1, 1, 1)
         };
         _this.strokes.push(gradientStrokeFill);
         var gradientLayerFill = {
-            type: 0,
+            type: FillType.Solid,
             color: new Color(1, 1, 1, 1)
         };
         _this.fills.push(gradientLayerFill);
@@ -16408,25 +16429,6 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
             indexCount: 0,
             vertexCount: 0
         });
-        // Create Material
-        //-------------------------------------------------------------------------
-        var materialProps = {
-            shader: {
-                vertex: vert,
-                fragment: frag,
-                glslVersion: exports.GLSLVersion.GLSL1
-            }
-        };
-        var fillMaterial = Material.create(engine, materialProps);
-        var strokeMaterial = Material.create(engine, materialProps);
-        fillMaterial.depthMask = false;
-        fillMaterial.depthTest = true;
-        fillMaterial.blending = true;
-        _this.material = fillMaterial;
-        strokeMaterial.depthMask = false;
-        strokeMaterial.depthTest = true;
-        strokeMaterial.blending = true;
-        _this.materials[1] = strokeMaterial;
         return _this;
     }
     var _proto = ShapeComponent.prototype;
@@ -16454,18 +16456,26 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
         if (!this.isActiveAndEnabled) {
             return;
         }
-        var previousColorMask0 = this.material.colorMask;
-        var previousColorMask1 = this.materials[1].colorMask;
-        this.material.colorMask = false;
-        this.materials[1].colorMask = false;
-        this.draw(renderer);
-        this.material.colorMask = previousColorMask0;
-        this.materials[1].colorMask = previousColorMask1;
+        var previousColorMask = false;
+        for(var i = 0; i < this.fillMaterials.length; i++){
+            previousColorMask = this.fillMaterials[i].colorMask;
+            this.fillMaterials[i].colorMask = false;
+            renderer.drawGeometry(this.geometry, this.transform.getWorldMatrix(), this.fillMaterials[i], 0);
+            this.fillMaterials[i].colorMask = previousColorMask;
+        }
+        for(var i1 = 0; i1 < this.strokeMaterials.length; i1++){
+            previousColorMask = this.strokeMaterials[i1].colorMask;
+            this.strokeMaterials[i1].colorMask = false;
+            renderer.drawGeometry(this.geometry, this.transform.getWorldMatrix(), this.strokeMaterials[i1], 1);
+            this.strokeMaterials[i1].colorMask = previousColorMask;
+        }
     };
     _proto.draw = function draw(renderer) {
-        for(var i = 0; i < this.materials.length; i++){
-            var material = this.materials[i];
-            renderer.drawGeometry(this.geometry, this.transform.getWorldMatrix(), material, i);
+        for(var i = 0; i < this.fillMaterials.length; i++){
+            renderer.drawGeometry(this.geometry, this.transform.getWorldMatrix(), this.fillMaterials[i], 0);
+        }
+        for(var i1 = 0; i1 < this.strokeMaterials.length; i1++){
+            renderer.drawGeometry(this.geometry, this.transform.getWorldMatrix(), this.strokeMaterials[i1], 1);
         }
     };
     _proto.getBoundingBox = function getBoundingBox() {
@@ -16479,7 +16489,7 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
         var vertices = [];
         var indices = [];
         // Triangulate shapePrimitives, build fill and stroke shape geometry
-        if (this.hasFill) {
+        if (this.fills.length > 0) {
             for(var _iterator = _create_for_of_iterator_helper_loose(shapePrimitives), _step; !(_step = _iterator()).done;){
                 var shapePrimitive = _step.value;
                 var shape = shapePrimitive.shape;
@@ -16491,7 +16501,7 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
             }
         }
         var fillIndexCount = indices.length;
-        if (this.hasStroke) {
+        if (this.strokes.length > 0) {
             for(var _iterator1 = _create_for_of_iterator_helper_loose(shapePrimitives), _step1; !(_step1 = _iterator1()).done;){
                 var shapePrimitive1 = _step1.value;
                 var shape1 = shapePrimitive1.shape;
@@ -16499,6 +16509,9 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
                 indices.length;
                 var vertOffset1 = vertices.length / 2;
                 var lineStyle = this.strokeAttributes;
+                lineStyle.cap = this.strokeCap;
+                lineStyle.join = this.strokeJoin;
+                lineStyle.width = this.strokeWidth;
                 var close = true;
                 if (this.shapeAttributes.type === ShapePrimitiveType.Custom) {
                     close = shape1.closePath;
@@ -16626,48 +16639,20 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
         }
     };
     _proto.updateMaterials = function updateMaterials() {
-        for(var _iterator = _create_for_of_iterator_helper_loose(this.materials), _step; !(_step = _iterator()).done;){
-            var material = _step.value;
-            var renderer = this.renderer;
-            var side = renderer.side, occlusion = renderer.occlusion, blendMode = renderer.blending, mask = renderer.mask, texture = renderer.texture;
-            var maskMode = this.maskManager.maskMode;
-            material.blending = true;
-            material.depthTest = true;
-            material.depthMask = occlusion;
-            material.stencilRef = mask !== undefined ? [
-                mask,
-                mask
-            ] : undefined;
-            setBlendMode(material, blendMode);
-            // 兼容旧数据中模板需要渲染的情况
-            setMaskMode(material, maskMode);
-            setSideMode(material, side);
-            material.shader.shaderData.properties = '_MainTex("_MainTex",2D) = "white" {}';
-            material.setVector4("_TexOffset", new Vector4(0, 0, 1, 1));
-            material.setTexture("_MainTex", texture);
-            var preMultiAlpha = getPreMultiAlpha(blendMode);
-            var texParams = new Vector4();
-            texParams.x = renderer.occlusion ? +renderer.transparentOcclusion : 1;
-            texParams.y = preMultiAlpha;
-            texParams.z = renderer.renderMode;
-            texParams.w = maskMode;
-            material.setVector4("_TexParams", texParams);
-            if (texParams.x === 0 || this.maskManager.alphaMaskEnabled) {
-                material.enableMacro("ALPHA_CLIP");
-            } else {
-                material.disableMacro("ALPHA_CLIP");
-            }
+        for(var i = 0; i < this.fills.length; i++){
+            this.updatePaintMaterial(this.fillMaterials[i], this.fills[i]);
+        }
+        for(var i1 = 0; i1 < this.strokes.length; i1++){
+            this.updatePaintMaterial(this.strokeMaterials[i1], this.strokes[i1]);
         }
-        this.updatePaintMaterial(this.material, this.fills[0]);
-        this.updatePaintMaterial(this.materials[1], this.strokes[0]);
     };
     _proto.updatePaintMaterial = function updatePaintMaterial(material, paint) {
         material.setFloat("_FillType", paint.type);
-        if (paint.type === 0) {
+        if (paint.type === FillType.Solid) {
             material.color = paint.color;
-        } else if (paint.type === 1 || paint.type === 3 || paint.type === 2) {
+        } else if (paint.type === FillType.GradientLinear || paint.type === FillType.GradientAngular || paint.type === FillType.GradientRadial) {
             this.updateGradientMaterial(material, paint.gradientStops, paint.startPoint, paint.endPoint);
-        } else if (paint.type === 4) {
+        } else if (paint.type === FillType.Texture) {
             material.setInt("_ImageScaleMode", paint.scaleMode);
             material.setVector2("_ImageSize", new Vector2(paint.texture.getWidth(), paint.texture.getHeight()));
             var boundingBox = this.getBoundingBox();
@@ -16677,6 +16662,8 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
             material.setFloat("_ImageOpacity", paint.opacity);
             material.setFloat("_ImageScalingFactor", paint.scalingFactor);
             material.setTexture("_ImageTex", paint.texture);
+            var transform = paint.textureTransform;
+            material.setMatrix3("_TextureTransform", new Matrix3().scale(transform.scale.x, transform.scale.y).rotate(transform.rotation).translate(transform.offset.x, transform.offset.y).invert());
         }
     };
     _proto.updateGradientMaterial = function updateGradientMaterial(material, gradient, startPoint, endPoint) {
@@ -16694,6 +16681,46 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
         material.setVector2("_StartPoint", startPoint);
         material.setVector2("_EndPoint", endPoint);
     };
+    _proto.createMaterialFromRendererOptions = function createMaterialFromRendererOptions(rendererOptions) {
+        var materialProps = {
+            shader: {
+                vertex: vert,
+                fragment: frag,
+                glslVersion: exports.GLSLVersion.GLSL1
+            }
+        };
+        var material = Material.create(this.engine, materialProps);
+        var renderer = rendererOptions;
+        var side = renderer.side, occlusion = renderer.occlusion, blendMode = renderer.blending, mask = renderer.mask, texture = renderer.texture;
+        var maskMode = this.maskManager.maskMode;
+        material.blending = true;
+        material.depthTest = true;
+        material.depthMask = occlusion;
+        material.stencilRef = mask !== undefined ? [
+            mask,
+            mask
+        ] : undefined;
+        setBlendMode(material, blendMode);
+        // 兼容旧数据中模板需要渲染的情况
+        setMaskMode(material, maskMode);
+        setSideMode(material, side);
+        material.shader.shaderData.properties = '_ImageTex("_ImageTex",2D) = "white" {}';
+        material.setVector4("_TexOffset", new Vector4(0, 0, 1, 1));
+        material.setTexture("_ImageTex", texture);
+        var preMultiAlpha = getPreMultiAlpha(blendMode);
+        var texParams = new Vector4();
+        texParams.x = renderer.occlusion ? +renderer.transparentOcclusion : 1;
+        texParams.y = preMultiAlpha;
+        texParams.z = renderer.renderMode;
+        texParams.w = maskMode;
+        material.setVector4("_TexParams", texParams);
+        if (texParams.x === 0 || this.maskManager.alphaMaskEnabled) {
+            material.enableMacro("ALPHA_CLIP");
+        } else {
+            material.disableMacro("ALPHA_CLIP");
+        }
+        return material;
+    };
     _proto.fromData = function fromData(data) {
         RendererComponent.prototype.fromData.call(this, data);
         this.shapeDirty = true;
@@ -16702,44 +16729,37 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
         }
         var _data_renderer;
         var renderer = (_data_renderer = data.renderer) != null ? _data_renderer : {};
-        var _renderer_renderMode, _renderer_blending, _renderer_side;
-        this.renderer = {
-            renderMode: (_renderer_renderMode = renderer.renderMode) != null ? _renderer_renderMode : RenderMode.MESH,
+        var _renderer_blending, _renderer_side;
+        this.rendererOptions = {
+            renderMode: RenderMode.MESH,
             blending: (_renderer_blending = renderer.blending) != null ? _renderer_blending : BlendingMode.ALPHA,
-            texture: renderer.texture ? this.engine.findObject(renderer.texture) : this.engine.emptyTexture,
+            texture: renderer.texture ? this.engine.findObject(renderer.texture) : this.engine.whiteTexture,
             occlusion: !!renderer.occlusion,
             transparentOcclusion: !!renderer.transparentOcclusion || this.maskManager.maskMode === exports.MaskMode.MASK,
             side: (_renderer_side = renderer.side) != null ? _renderer_side : SideMode.DOUBLE,
             mask: this.maskManager.getRefValue()
         };
-        var strokeAttributes = data.stroke;
-        if (strokeAttributes) {
-            this.strokeAttributes = {
-                width: strokeAttributes.width,
-                alignment: 0.5,
-                cap: strokeAttributes.cap,
-                join: strokeAttributes.join,
-                miterLimit: 10
-            };
-        }
-        //@ts-expect-error
-        for(var _iterator = _create_for_of_iterator_helper_loose(data.strokes), _step; !(_step = _iterator()).done;){
-            var stroke = _step.value;
-            var strokeParam = stroke;
-            if (strokeParam) {
-                this.hasStroke = true;
-                this.strokes[0] = this.createPaint(strokeParam);
-            }
-        }
-        //@ts-expect-error
-        for(var _iterator1 = _create_for_of_iterator_helper_loose(data.fills), _step1; !(_step1 = _iterator1()).done;){
-            var fill = _step1.value;
-            var fillParam = fill;
-            if (fillParam) {
-                this.hasFill = true;
-                this.fills[0] = this.createPaint(fillParam);
-            }
-        }
+        var _data_strokeCap;
+        this.strokeCap = (_data_strokeCap = data.strokeCap) != null ? _data_strokeCap : LineCap.Butt;
+        var _data_strokeWidth;
+        this.strokeWidth = (_data_strokeWidth = data.strokeWidth) != null ? _data_strokeWidth : 1;
+        var _data_strokeJoin;
+        this.strokeJoin = (_data_strokeJoin = data.strokeJoin) != null ? _data_strokeJoin : LineJoin.Miter;
+        this.fills.length = 0;
+        this.fillMaterials.length = 0;
+        for(var _iterator = _create_for_of_iterator_helper_loose(data.fills), _step; !(_step = _iterator()).done;){
+            var fill = _step.value;
+            this.fills.push(this.createPaint(fill));
+            this.fillMaterials.push(this.createMaterialFromRendererOptions(this.rendererOptions));
+        }
+        this.strokes.length = 0;
+        this.strokeMaterials.length = 0;
+        for(var _iterator1 = _create_for_of_iterator_helper_loose(data.strokes), _step1; !(_step1 = _iterator1()).done;){
+            var stroke = _step1.value;
+            this.strokes.push(this.createPaint(stroke));
+            this.strokeMaterials.push(this.createMaterialFromRendererOptions(this.rendererOptions));
+        }
+        this.materials = [].concat(this.fillMaterials, this.strokeMaterials);
         switch(data.type){
             case ShapePrimitiveType.Custom:
                 {
@@ -16821,7 +16841,7 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
     _proto.createPaint = function createPaint(paintData) {
         var paint;
         switch(paintData.type){
-            case 0:
+            case FillType.Solid:
                 {
                     paint = {
                         type: paintData.type,
@@ -16829,9 +16849,9 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
                     };
                     break;
                 }
-            case 1:
-            case 3:
-            case 2:
+            case FillType.GradientLinear:
+            case FillType.GradientAngular:
+            case FillType.GradientRadial:
                 {
                     paint = {
                         type: paintData.type,
@@ -16841,15 +16861,32 @@ exports.ShapeComponent = /*#__PURE__*/ function(RendererComponent) {
                     };
                     break;
                 }
-            case 4:
+            case FillType.Texture:
                 {
+                    var _paintData_textureTransform;
+                    var textureTransform = _extends({
+                        offset: {
+                            x: 0,
+                            y: 0
+                        },
+                        rotation: 0,
+                        scale: {
+                            x: 1,
+                            y: 1
+                        }
+                    }, (_paintData_textureTransform = paintData.textureTransform) != null ? _paintData_textureTransform : {});
                     var _paintData_scalingFactor, _paintData_opacity;
                     paint = {
                         type: paintData.type,
                         texture: this.engine.findObject(paintData.texture),
                         scaleMode: paintData.scaleMode,
                         scalingFactor: (_paintData_scalingFactor = paintData.scalingFactor) != null ? _paintData_scalingFactor : 1,
-                        opacity: (_paintData_opacity = paintData.opacity) != null ? _paintData_opacity : 1
+                        opacity: (_paintData_opacity = paintData.opacity) != null ? _paintData_opacity : 1,
+                        textureTransform: {
+                            offset: new Vector2().copyFrom(textureTransform.offset),
+                            rotation: textureTransform.rotation,
+                            scale: new Vector2().copyFrom(textureTransform.scale)
+                        }
                     };
                     break;
                 }
@@ -17240,11 +17277,11 @@ var vertex = "\nprecision highp float;\n\nattribute vec2 aPoint;\nuniform vec4 u
 var fragment = "\nprecision highp float;\n\n#define fragColor gl_FragColor\n\nvarying vec4 vColor;\nvoid main() {\n  gl_FragColor = vColor*vColor.a;\n}\n";
 var seed$5 = 1;
 var InteractMesh = /*#__PURE__*/ function() {
-    function InteractMesh(props, rendererOptions, transform, engine) {
+    function InteractMesh(props, transform, engine) {
         this.transform = transform;
         this.engine = engine;
         this.color = props.options.previewColor;
-        var material = this.createMaterial(rendererOptions);
+        var material = this.createMaterial();
         var geometry = this.createGeometry();
         this.mesh = this.createMesh(geometry, material);
         this.updateMesh();
@@ -17267,7 +17304,7 @@ var InteractMesh = /*#__PURE__*/ function() {
         material.setVector4("uPos", uPos);
         material.setQuaternion("uQuat", tempQuat);
     };
-    _proto.createMaterial = function createMaterial(rendererOptions) {
+    _proto.createMaterial = function createMaterial() {
         var _this_engine_renderer;
         var macros = [
             [
@@ -17281,7 +17318,6 @@ var InteractMesh = /*#__PURE__*/ function() {
                 vertex: vertex,
                 fragment: fragment,
                 glslVersion: exports.GLSLVersion.GLSL1,
-                cacheId: "" + rendererOptions.cachePrefix + "_effects_interact",
                 macros: macros
             }
         };
@@ -17403,19 +17439,33 @@ exports.InteractComponent = /*#__PURE__*/ function(RendererComponent) {
         return _this;
     }
     var _proto = InteractComponent.prototype;
-    _proto.getDragRangeX = function getDragRangeX() {
+    /**
+   * 获取拖拽范围 X 轴
+   * @returns 拖拽范围 [min, max]
+   */ _proto.getDragRangeX = function getDragRangeX() {
         return this.dragRange.dxRange;
     };
-    _proto.setDragRangeX = function setDragRangeX(min, max) {
+    /**
+   * 设置拖拽范围 X 轴
+   * @param min 最小值
+   * @param max 最大值
+   */ _proto.setDragRangeX = function setDragRangeX(min, max) {
         this.dragRange.dxRange = [
             min,
             max
         ];
     };
-    _proto.getDragRangeY = function getDragRangeY() {
+    /**
+   * 获取拖拽范围 Y 轴
+   * @returns 拖拽范围 [min, max]
+   */ _proto.getDragRangeY = function getDragRangeY() {
         return this.dragRange.dyRange;
     };
-    _proto.setDragRangeY = function setDragRangeY(min, max) {
+    /**
+   * 设置拖拽范围 Y 轴
+   * @param min 最小值
+   * @param max 最大值
+   */ _proto.setDragRangeY = function setDragRangeY(min, max) {
         this.dragRange.dyRange = [
             min,
             max
@@ -17423,15 +17473,11 @@ exports.InteractComponent = /*#__PURE__*/ function(RendererComponent) {
     };
     _proto.onStart = function onStart() {
         var env = this.item.engine.renderer.env;
-        var composition = this.item.composition;
         var _this_interactData_options = this.interactData.options, type = _this_interactData_options.type, showPreview = _this_interactData_options.showPreview;
         if (type === InteractType.CLICK) {
             this.clickable = true;
             if (showPreview && env === PLAYER_OPTIONS_ENV_EDITOR) {
-                var rendererOptions = composition == null ? void 0 : composition.getRendererOptions();
-                if (rendererOptions !== undefined) {
-                    this.previewContent = new InteractMesh(this.item.props.content, rendererOptions, this.transform, this.engine);
-                }
+                this.previewContent = new InteractMesh(this.item.props.content, this.transform, this.engine);
             }
         }
         if (this.previewContent) {
@@ -17640,7 +17686,10 @@ exports.InteractComponent = /*#__PURE__*/ function(RendererComponent) {
             }
         }
     };
-    _proto.canInteract = function canInteract() {
+    /**
+   * 是否可以交互
+   * @returns
+   */ _proto.canInteract = function canInteract() {
         var _this_item_composition;
         return Boolean((_this_item_composition = this.item.composition) == null ? void 0 : _this_item_composition.interactive) && this._interactive;
     };
@@ -17675,7 +17724,9 @@ exports.InteractComponent = /*#__PURE__*/ function(RendererComponent) {
             get: function get() {
                 return this._interactive;
             },
-            set: function set(enable) {
+            set: /**
+   * 是否响应点击和拖拽交互事件
+   */ function set(enable) {
                 this._interactive = enable;
                 if (!enable) {
                     // 立刻停止惯性滑动
@@ -18432,6 +18483,12 @@ var tmpScale = new Vector3(1, 1, 1);
         this./**
    * @internal
    */ transform = new Transform();
+        this./**
+   * 画布的像素宽度
+   */ pixelWidth = 0;
+        this./**
+   * 画布的像素高度
+   */ pixelHeight = 0;
         this.viewportMatrix = Matrix4.fromIdentity();
         this.viewMatrix = Matrix4.fromIdentity();
         this.projectionMatrix = Matrix4.fromIdentity();
@@ -18446,7 +18503,7 @@ var tmpScale = new Vector3(1, 1, 1);
             0,
             0,
             0
-        ] : _options_rotation;
+        ] : _options_rotation, _options_pixelWidth = options.pixelWidth, pixelWidth = _options_pixelWidth === void 0 ? 0 : _options_pixelWidth, _options_pixelHeight = options.pixelHeight, pixelHeight = _options_pixelHeight === void 0 ? 0 : _options_pixelHeight;
         var euler = new Euler(rotation[0], rotation[1], rotation[2]);
         var quat = new Quaternion().setFromEuler(euler);
         this.options = {
@@ -18456,6 +18513,8 @@ var tmpScale = new Vector3(1, 1, 1);
             aspect: aspect,
             clipMode: clipMode
         };
+        this.pixelWidth = pixelWidth;
+        this.pixelHeight = pixelHeight;
         this.transform.setPosition(position[0], position[1], position[2]);
         this.transform.setQuaternion(quat.x, quat.y, quat.z, quat.w);
         this.dirty = true;
@@ -18602,6 +18661,48 @@ var tmpScale = new Vector3(1, 1, 1);
             this.dirty = false;
         }
     };
+    /**
+   * 将世界坐标转换为屏幕像素坐标
+   * @param position - 世界坐标
+   * @param out - 输出的屏幕坐标，如果不传则创建新的 Vector3
+   * @returns 屏幕坐标 (x, y 为像素坐标，左下角为(0,0)，右上角为(width,height)，z 为深度比例 [0,1]，0=近平面，1=远平面)
+   */ _proto.worldToScreenPoint = function worldToScreenPoint(position, out) {
+        this.updateMatrix();
+        var result = out != null ? out : new Vector3();
+        var vpMatrix = this.getViewProjectionMatrix();
+        // 应用视图投影矩阵，得到 NDC 坐标 [-1, 1]
+        result.set(position.x, position.y, position.z);
+        vpMatrix.projectPoint(result, result);
+        // 将 NDC 坐标转换为像素坐标
+        // NDC: x,y in [-1, 1], 其中 (-1,-1) 是左下角，(1,1) 是右上角
+        // Screen: x,y in [0, width/height], 其中 (0,0) 是左下角
+        result.x = (result.x + 1) * 0.5 * this.pixelWidth;
+        result.y = (result.y + 1) * 0.5 * this.pixelHeight;
+        // 将 NDC z 值从 [-1, 1] 转换为深度比例 [0, 1]
+        // -1 (近平面) -> 0, 1 (远平面) -> 1
+        result.z = (result.z + 1) * 0.5;
+        return result;
+    };
+    /**
+   * 将屏幕像素坐标转换为世界坐标
+   * @param position - 屏幕坐标 (x, y 为像素坐标，左下角为(0,0)，z 为深度比例 [0,1]，0=近平面，1=远平面)
+   * @param out - 输出的世界坐标，如果不传则创建新的 Vector3
+   * @returns 世界坐标
+   */ _proto.screenToWorldPoint = function screenToWorldPoint(position, out) {
+        this.updateMatrix();
+        var result = out != null ? out : new Vector3();
+        var invVPMatrix = this.getInverseViewProjectionMatrix();
+        // 将像素坐标转换为 NDC 坐标 [-1, 1]
+        var ndcX = position.x / this.pixelWidth * 2 - 1;
+        var ndcY = position.y / this.pixelHeight * 2 - 1;
+        // 将深度比例 [0, 1] 转换为 NDC z 值 [-1, 1]
+        // 0 (近平面) -> -1, 1 (远平面) -> 1
+        var ndcZ = position.z * 2 - 1;
+        // 应用逆视图投影矩阵
+        result.set(ndcX, ndcY, ndcZ);
+        invVPMatrix.projectPoint(result, result);
+        return result;
+    };
     _create_class(Camera, [
         {
             key: "near",
@@ -21463,7 +21564,6 @@ function modifyMaxKeyframeShader(shader, maxVertex, maxFrag) {
     var _proto = ParticleSystemRenderer.prototype;
     _proto.onStart = function onStart() {
         this._priority = this.item.renderOrder;
-        this.particleMesh.gravityModifier.scaleXCoord(this.item.duration);
         for(var _iterator = _create_for_of_iterator_helper_loose(this.meshes), _step; !(_step = _iterator()).done;){
             var mesh = _step.value;
             mesh.onStart();
@@ -22424,7 +22524,6 @@ exports.ParticleSystem = /*#__PURE__*/ function(Component) {
             };
         }
         this.item.getHitTestParams = this.getHitTestParams;
-        this.item._content = this;
     };
     _create_class(ParticleSystem, [
         {
@@ -22949,7 +23048,7 @@ var tempPos = new Vector3();
    */ _proto.sampleAnimation = function sampleAnimation() {
         var _this = this;
         var boundItem = this.boundObject;
-        var duration = boundItem.duration;
+        var duration = this.getDuration();
         var life = this.time / duration;
         life = life < 0 ? 0 : life > 1 ? 1 : life;
         if (this.sizeXOverLifetime) {
@@ -23419,41 +23518,45 @@ exports.ObjectBindingTrack = /*#__PURE__*/ function(TrackAsset) {
         if (!_instanceof1(boundItem, exports.VFXItem)) {
             return;
         }
-        var hasActiveTrack = false;
         for(var _iterator = _create_for_of_iterator_helper_loose(this.getChildTracks()), _step; !(_step = _iterator()).done;){
             var childTrack = _step.value;
             if (_instanceof1(childTrack, exports.ActivationTrack)) {
-                hasActiveTrack = true;
+                // 添加粒子动画 clip // TODO 待移除
+                if (boundItem.getComponent(exports.ParticleSystem)) {
+                    var particleTrack = timelineAsset.createTrack(ParticleTrack, this, "ParticleTrack");
+                    for(var _iterator1 = _create_for_of_iterator_helper_loose(childTrack.getClips()), _step1; !(_step1 = _iterator1()).done;){
+                        var activationClip = _step1.value;
+                        var particleClip = particleTrack.createClip(ParticleBehaviourPlayableAsset);
+                        particleClip.start = activationClip.start;
+                        particleClip.duration = activationClip.duration;
+                        particleClip.endBehavior = activationClip.endBehavior;
+                    }
+                }
+                // 添加图层帧动画动画时间 clip // TODO 待移除
+                if (boundItem.getComponent(exports.SpriteComponent)) {
+                    var componentTimeTrack = timelineAsset.createTrack(SpriteComponentTimeTrack, this, "SpriteComponentTimeTrack");
+                    for(var _iterator2 = _create_for_of_iterator_helper_loose(childTrack.getClips()), _step2; !(_step2 = _iterator2()).done;){
+                        var activationClip1 = _step2.value;
+                        var clip = componentTimeTrack.createClip(ComponentTimePlayableAsset);
+                        clip.start = activationClip1.start;
+                        clip.duration = activationClip1.duration;
+                        clip.endBehavior = activationClip1.endBehavior;
+                    }
+                }
+                // 添加图层帧动画动画时间 clip // TODO 待移除
+                if (boundItem.getComponent(exports.EffectComponent)) {
+                    var componentTimeTrack1 = timelineAsset.createTrack(EffectComponentTimeTrack, this, "EffectComponentTimeTrack");
+                    for(var _iterator3 = _create_for_of_iterator_helper_loose(childTrack.getClips()), _step3; !(_step3 = _iterator3()).done;){
+                        var activationClip2 = _step3.value;
+                        var clip1 = componentTimeTrack1.createClip(ComponentTimePlayableAsset);
+                        clip1.start = activationClip2.start;
+                        clip1.duration = activationClip2.duration;
+                        clip1.endBehavior = activationClip2.endBehavior;
+                    }
+                }
                 break;
             }
         }
-        if (!hasActiveTrack) {
-            return;
-        }
-        // 添加粒子动画 clip // TODO 待移除
-        if (boundItem.getComponent(exports.ParticleSystem)) {
-            var particleTrack = timelineAsset.createTrack(ParticleTrack, this, "ParticleTrack");
-            var particleClip = particleTrack.createClip(ParticleBehaviourPlayableAsset);
-            particleClip.start = boundItem.start;
-            particleClip.duration = boundItem.duration;
-            particleClip.endBehavior = boundItem.endBehavior;
-        }
-        // 添加图层帧动画动画时间 clip // TODO 待移除
-        if (boundItem.getComponent(exports.SpriteComponent)) {
-            var componentTimeTrack = timelineAsset.createTrack(SpriteComponentTimeTrack, this, "SpriteComponentTimeTrack");
-            var clip = componentTimeTrack.createClip(ComponentTimePlayableAsset);
-            clip.start = boundItem.start;
-            clip.duration = boundItem.duration;
-            clip.endBehavior = boundItem.endBehavior;
-        }
-        // 添加图层帧动画动画时间 clip // TODO 待移除
-        if (boundItem.getComponent(exports.EffectComponent)) {
-            var componentTimeTrack1 = timelineAsset.createTrack(EffectComponentTimeTrack, this, "EffectComponentTimeTrack");
-            var clip1 = componentTimeTrack1.createClip(ComponentTimePlayableAsset);
-            clip1.start = boundItem.start;
-            clip1.duration = boundItem.duration;
-            clip1.endBehavior = boundItem.endBehavior;
-        }
     };
     return ObjectBindingTrack;
 }(exports.TrackAsset);
@@ -24238,13 +24341,14 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
         _this.pluginSystem = scene.pluginSystem;
         _this.pluginSystem.initializeComposition(_assert_this_initialized(_this), scene);
         _this.camera = new Camera(_this.name, _extends({}, sourceContent == null ? void 0 : sourceContent.camera, {
-            aspect: width / height
+            aspect: width / height,
+            pixelWidth: width,
+            pixelHeight: height
         }));
         _this.url = scene.url;
         _this.interactive = true;
         _this.handleItemMessage = handleItemMessage;
         _this.createRenderFrame();
-        _this.rendererOptions = null;
         Composition.buildItemTree(_this.rootItem);
         _this.rootComposition.setChildrenRenderOrder(0);
         _this.pluginSystem.resetComposition(_assert_this_initialized(_this), _this.renderFrame);
@@ -24300,9 +24404,11 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
             this.restart();
         }
         if (this.rootComposition.isStartCalled) {
-            this.gotoAndPlay(this.time - this.startTime);
+            this.setTime(this.time - this.startTime);
+            this.resume();
         } else {
-            this.gotoAndPlay(0);
+            this.setTime(0);
+            this.resume();
         }
     };
     /**
@@ -24334,6 +24440,9 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
    * @param time - 相对 startTime 的时间
    */ _proto.gotoAndPlay = function gotoAndPlay(time) {
         this.setTime(time);
+        this.emit("goto", {
+            time: time
+        });
         this.resume();
     };
     /**
@@ -24341,6 +24450,9 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
    * @param time - 相对 startTime 的时间
    */ _proto.gotoAndStop = function gotoAndStop(time) {
         this.setTime(time);
+        this.emit("goto", {
+            time: time
+        });
         this.pause();
     };
     /**
@@ -24371,9 +24483,6 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
         if (pause) {
             this.paused = true;
         }
-        this.emit("goto", {
-            time: time
-        });
     };
     _proto.addItem = function addItem(item) {
         this.items.push(item);
@@ -24405,7 +24514,6 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
     /**
    * 重置状态函数
    */ _proto.reset = function reset() {
-        this.rendererOptions = null;
         this.isEnded = false;
         this.isEndCalled = false;
         this.rootComposition.time = 0;
@@ -24431,9 +24539,9 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
         if (this.getPaused()) {
             return;
         }
-        // scene VFXItem components lifetime function.
+        // Scene VFXItem components lifetime function
         if (!this.rootItem.isDuringPlay) {
-            this.callAwake(this.rootItem);
+            this.rootItem.awake();
             this.rootItem.beginPlay();
         }
         var previousCompositionTime = this.time;
@@ -24458,19 +24566,6 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
     _proto.shouldDispose = function shouldDispose() {
         return this.isEnded && this.rootItem.endBehavior === EndBehavior.destroy && !this.reusable;
     };
-    _proto.callAwake = function callAwake(item) {
-        for(var _iterator = _create_for_of_iterator_helper_loose(item.components), _step; !(_step = _iterator()).done;){
-            var component = _step.value;
-            if (!component.isAwakeCalled) {
-                component.onAwake();
-                component.isAwakeCalled = true;
-            }
-        }
-        for(var _iterator1 = _create_for_of_iterator_helper_loose(item.children), _step1; !(_step1 = _iterator1()).done;){
-            var child = _step1.value;
-            this.callAwake(child);
-        }
-    };
     /**
    * 更新相机
    * @override
@@ -24559,7 +24654,7 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
         return (_this_renderer = this.renderer) == null ? void 0 : _this_renderer.engine;
     };
     /**
-   * Item 求交测试，返回求交结果列表，x 和 y 是归一化到[-1, 1]区间的值，原点在左上角
+   * Item 求交测试，返回求交结果列表，x 和 y 是归一化到[-1, 1]区间的值，x 向右，y 向上
    * @param x - 鼠标或触点的 x，已经归一化到[-1, 1]
    * @param y - 鼠标或触点的 y，已经归一化到[-1, 1]
    * @param force - 是否强制求交，没有交互信息的 Item 也要进行求交测试
@@ -24658,7 +24753,7 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
    * 合成对象销毁
    */ _proto.dispose = function dispose() {
         var _this = this;
-        var _this_rendererOptions, _this_pluginSystem;
+        var _this_pluginSystem;
         if (this.destroyed) {
             return;
         }
@@ -24678,7 +24773,6 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
         this.rootItem.dispose();
         // FIXME: 注意这里增加了renderFrame销毁
         this.renderFrame.dispose();
-        (_this_rendererOptions = this.rendererOptions) == null ? void 0 : _this_rendererOptions.emptyTexture.dispose();
         (_this_pluginSystem = this.pluginSystem) == null ? void 0 : _this_pluginSystem.destroyComposition(this);
         this.update = function() {
             {
@@ -24775,15 +24869,6 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
             this.textureOffloaded = true;
         }
     };
-    _proto.getRendererOptions = function getRendererOptions() {
-        if (!this.rendererOptions) {
-            this.rendererOptions = {
-                emptyTexture: this.renderFrame.emptyTexture,
-                cachePrefix: "-"
-            };
-        }
-        return this.rendererOptions;
-    };
     /**
    * 重新加载纹理
    */ _proto.reloadTexture = function reloadTexture() {
@@ -24897,7 +24982,9 @@ exports.VFXItem = /*#__PURE__*/ function(EffectsObject) {
     function VFXItem(engine, props) {
         var _this;
         _this = EffectsObject.call(this, engine) || this;
-        _this.children = [];
+        /**
+   * 元素的子元素列表
+   */ _this.children = [];
         /**
    * 元素的变换包含位置、旋转、缩放。
    */ _this.transform = new Transform();
@@ -24908,9 +24995,6 @@ exports.VFXItem = /*#__PURE__*/ function(EffectsObject) {
    * 元素动画的持续时间
    */ _this.duration = 0;
         /**
-   * 元素动画的开始时间
-   */ _this.start = 0;
-        /**
    * 元素动画结束时行为（如何处理元素）
    */ _this.endBehavior = EndBehavior.forward;
         _this.type = ItemType.base;
@@ -25030,6 +25114,7 @@ exports.VFXItem = /*#__PURE__*/ function(EffectsObject) {
             this.composition = vfxItem.composition;
         }
         if (!this.isDuringPlay && vfxItem.isDuringPlay) {
+            this.awake();
             this.beginPlay();
         }
     };
@@ -25205,6 +25290,21 @@ exports.VFXItem = /*#__PURE__*/ function(EffectsObject) {
     };
     /**
    * @internal
+   */ _proto.awake = function awake() {
+        for(var _iterator = _create_for_of_iterator_helper_loose(this.components), _step; !(_step = _iterator()).done;){
+            var component = _step.value;
+            if (!component.isAwakeCalled) {
+                component.onAwake();
+                component.isAwakeCalled = true;
+            }
+        }
+        for(var _iterator1 = _create_for_of_iterator_helper_loose(this.children), _step1; !(_step1 = _iterator1()).done;){
+            var child = _step1.value;
+            child.awake();
+        }
+    };
+    /**
+   * @internal
    */ _proto.onActiveChanged = function onActiveChanged() {
         if (!this.isEnabled) {
             this.onEnable();
@@ -25243,12 +25343,11 @@ exports.VFXItem = /*#__PURE__*/ function(EffectsObject) {
     };
     _proto.fromData = function fromData(data) {
         EffectsObject.prototype.fromData.call(this, data);
-        var id = data.id, name = data.name, delay = data.delay, parentId = data.parentId, endBehavior = data.endBehavior, transform = data.transform, _data_duration = data.duration, duration = _data_duration === void 0 ? 0 : _data_duration;
+        var id = data.id, name = data.name, parentId = data.parentId, endBehavior = data.endBehavior, transform = data.transform, _data_duration = data.duration, duration = _data_duration === void 0 ? 0 : _data_duration;
         this.props = data;
         this.type = data.type;
         this.id = id.toString(); // TODO 老数据 id 是 number，需要转换
         this.name = name;
-        this.start = delay ? delay : this.start;
         if (transform) {
             this.transform.fromData(transform);
         }
@@ -25325,10 +25424,10 @@ exports.VFXItem = /*#__PURE__*/ function(EffectsObject) {
                 component.dispose();
             }
             this.components = [];
-            this._content = undefined;
             this._composition = null;
             this.transform.setValid(false);
         }
+        EffectsObject.prototype.dispose.call(this);
     };
     _proto.resetChildrenParent = function resetChildrenParent() {
         // GE 父元素销毁子元素继承逻辑
@@ -25468,14 +25567,6 @@ exports.VFXItem = /*#__PURE__*/ function(EffectsObject) {
         return false;
     };
     _create_class(VFXItem, [
-        {
-            key: "content",
-            get: /**
-   * 返回元素创建的数据
-   */ function get() {
-                return this._content;
-            }
-        },
         {
             key: "composition",
             get: /**
@@ -25609,7 +25700,7 @@ var ColorPlayable = /*#__PURE__*/ function(Playable) {
         }
         var colorInc = vecFill(tempColor, 1);
         var colorChanged;
-        var life = this.time / boundObject.duration;
+        var life = this.time / this.getDuration();
         var opacityOverLifetime = this.opacityOverLifetime;
         var colorOverLifetime = this.colorOverLifetime;
         if (colorOverLifetime) {
@@ -25893,7 +25984,7 @@ exports.SpriteComponent = /*#__PURE__*/ function(MaskableGraphic) {
         _this = MaskableGraphic.call(this, engine) || this;
         _this.time = 0;
         _this.duration = 0;
-        _this.frameAnimationLoop = true;
+        _this.loop = true;
         /**
    * @internal
   */ _this.splits = singleSplits;
@@ -25908,7 +25999,7 @@ exports.SpriteComponent = /*#__PURE__*/ function(MaskableGraphic) {
         var _this = this;
         var time = this.time;
         var duration = this.duration;
-        if (time > duration && this.frameAnimationLoop) {
+        if (time > duration && this.loop) {
             time = time % duration;
         }
         var life = Math.min(Math.max(time / duration, 0.0), 1.0);
@@ -26148,6 +26239,8 @@ exports.SpriteComponent = /*#__PURE__*/ function(MaskableGraphic) {
         var _data_duration;
         //@ts-expect-error
         this.duration = (_data_duration = data.duration) != null ? _data_duration : this.item.duration;
+        var _data_loop;
+        this.loop = (_data_loop = data.loop) != null ? _data_loop : true;
     };
     return SpriteComponent;
 }(MaskableGraphic);
@@ -28900,7 +28993,8 @@ var TextLayout = /*#__PURE__*/ function() {
     function TextLayout(options) {
         this.width = 0;
         this.height = 0;
-        var _options_textHeight = options.textHeight, textHeight = _options_textHeight === void 0 ? 100 : _options_textHeight, _options_textWidth = options.textWidth, textWidth = _options_textWidth === void 0 ? 100 : _options_textWidth, _options_textOverflow = options.textOverflow, textOverflow = _options_textOverflow === void 0 ? TextOverflow.clip : _options_textOverflow, _options_textBaseline = options.textBaseline, textBaseline = _options_textBaseline === void 0 ? TextBaseline.top : _options_textBaseline, _options_textAlign = options.textAlign, textAlign = _options_textAlign === void 0 ? TextAlignment.left : _options_textAlign, _options_text = options.text, text = _options_text === void 0 ? " " : _options_text, _options_letterSpace = options.letterSpace, letterSpace = _options_letterSpace === void 0 ? 0 : _options_letterSpace, _options_lineGap = options.lineGap, lineGap = _options_lineGap === void 0 ? 0.571 : _options_lineGap, _options_autoWidth = options.autoWidth, autoWidth = _options_autoWidth === void 0 ? false : _options_autoWidth, fontSize = options.fontSize, _options_lineHeight = options.lineHeight, lineHeight = _options_lineHeight === void 0 ? fontSize : _options_lineHeight;
+        var fontSize = options.fontSize, _options_textHeight = options.textHeight, textHeight = _options_textHeight === void 0 ? 100 : _options_textHeight, _options_textWidth = options.textWidth, textWidth = _options_textWidth === void 0 ? 100 : _options_textWidth, _options_textOverflow = options.textOverflow, textOverflow = _options_textOverflow === void 0 ? TextOverflow.clip : _options_textOverflow, _options_textBaseline = options.textBaseline, textBaseline = _options_textBaseline === void 0 ? TextBaseline.top : _options_textBaseline, _options_textAlign = options.textAlign, textAlign = _options_textAlign === void 0 ? TextAlignment.left : _options_textAlign, _options_text = options.text, text = _options_text === void 0 ? " " : _options_text, _options_letterSpace = options.letterSpace, letterSpace = _options_letterSpace === void 0 ? 0 : _options_letterSpace, _options_lineGap = options.lineGap, lineGap = _options_lineGap === void 0 ? 0.571 : _options_lineGap, _options_autoWidth = options.autoWidth, autoWidth = _options_autoWidth === void 0 ? false : _options_autoWidth, _options_lineHeight = options.lineHeight, lineHeight = _options_lineHeight === void 0 ? fontSize : _options_lineHeight, _options_useLegacyRichText = options.// @ts-expect-error
+        useLegacyRichText, useLegacyRichText = _options_useLegacyRichText === void 0 ? false : _options_useLegacyRichText;
         var tempWidth = fontSize + letterSpace;
         this.autoWidth = autoWidth;
         this.maxTextWidth = text.length * tempWidth;
@@ -28908,6 +29002,7 @@ var TextLayout = /*#__PURE__*/ function() {
         this.height = textHeight;
         this.letterSpace = letterSpace;
         this.lineGap = lineGap;
+        this.useLegacyRichText = useLegacyRichText;
         this.overflow = textOverflow;
         this.textBaseline = textBaseline;
         this.textAlign = textAlign;
@@ -28958,6 +29053,38 @@ var TextLayout = /*#__PURE__*/ function() {
         return offsetX;
     };
     /**
+   * 富文本垂直对齐计算
+   * @param style - 字体样式
+   * @param lineHeights - 每行高度数组
+   * @param fontSize - 字体大小
+   * @returns 第一行基线的 Y 坐标
+   */ _proto.getOffsetYRich = function getOffsetYRich(style, lineHeights, fontSize) {
+        var outlineWidth = style.outlineWidth, fontScale = style.fontScale;
+        var total = lineHeights.reduce(function(a, b) {
+            return a + b;
+        }, 0);
+        // 使用与原始 getOffsetY 相同的经验值计算
+        // /3 计算 Y 轴偏移量，以匹配编辑器行为
+        var offsetY = (lineHeights[0] - fontSize) / 3;
+        // 计算基础偏移量（从画布顶部到第一行基线的距离）
+        var baseOffset = fontSize + outlineWidth * fontScale;
+        // 除第一行外的所有行的总高度
+        var commonCalculation = total - lineHeights[0]; // 使用实际总高度减去第一行高度
+        var offsetResult = 0;
+        switch(this.textBaseline){
+            case TextBaseline.top:
+                offsetResult = baseOffset + offsetY;
+                break;
+            case TextBaseline.middle:
+                offsetResult = (this.height * fontScale - total + this.lineGap * fontScale) / 2 + baseOffset;
+                break;
+            case TextBaseline.bottom:
+                offsetResult = this.height * fontScale - commonCalculation - offsetY;
+                break;
+        }
+        return offsetResult;
+    };
+    /**
    * 设置文本框的宽度和高度
    * @param width 文本框宽度
    * @param height 文本框高度
@@ -29088,6 +29215,10 @@ exports.TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
         MaskableGraphic.prototype.onUpdate.call(this, dt);
         this.updateTexture();
     };
+    _proto.onDestroy = function onDestroy() {
+        MaskableGraphic.prototype.onDestroy.call(this);
+        this.disposeTextTexture();
+    };
     _proto.fromData = function fromData(data) {
         MaskableGraphic.prototype.fromData.call(this, data);
         var interaction = data.interaction, options = data.options;
@@ -29128,10 +29259,10 @@ var TextComponentBase = /*#__PURE__*/ function() {
         var width = this.textLayout.width + this.textStyle.fontOffset;
         var lineCount = 1;
         var x = 0;
-        //设置context.font的字号
-        // if (context) {
-        //   context.font = this.getFontDesc(this.textStyle.fontSize);
-        // }
+        // 设置context.font的字号，确保measureText能正确计算字宽
+        if (context) {
+            context.font = this.getFontDesc(this.textStyle.fontSize);
+        }
         for(var i = 0; i < text.length; i++){
             var _context_measureText;
             var str = text[i];
@@ -29461,10 +29592,17 @@ var TextComponentBase = /*#__PURE__*/ function() {
             wrapS: glContext.CLAMP_TO_EDGE,
             wrapT: glContext.CLAMP_TO_EDGE
         });
+        this.disposeTextTexture();
         this.renderer.texture = texture;
         this.material.setTexture("_MainTex", texture);
         this.isDirty = false;
     };
+    _proto.disposeTextTexture = function disposeTextTexture() {
+        var texture = this.renderer.texture;
+        if (texture && texture !== this.engine.whiteTexture) {
+            texture.dispose();
+        }
+    };
     _proto.getFontDesc = function getFontDesc(size) {
         var _this_textStyle = this.textStyle, fontSize = _this_textStyle.fontSize, fontScale = _this_textStyle.fontScale, fontFamily = _this_textStyle.fontFamily, textWeight = _this_textStyle.textWeight, fontStyle = _this_textStyle.fontStyle;
         var fontDesc = "" + (size || fontSize * fontScale).toString() + "px ";
@@ -30505,35 +30643,75 @@ function version34Migration(json) {
         }
         if (componentData1.dataType === DataType.ShapeComponent) {
             var shapeComponentData = componentData1;
-            //@ts-expect-error
             shapeComponentData.fills = [];
+            //@ts-expect-error
             if (shapeComponentData.fill) {
                 var solidPaintData = {
-                    type: exports.FillType.Solid,
+                    type: FillType.Solid,
+                    //@ts-expect-error
                     color: shapeComponentData.fill.color
                 };
-                //@ts-expect-error
                 shapeComponentData.fills.push(solidPaintData);
             }
-            delete shapeComponentData.fill;
             //@ts-expect-error
+            delete shapeComponentData.fill;
             shapeComponentData.strokes = [];
+            //@ts-expect-error
             if (shapeComponentData.stroke) {
                 var solidPaintData1 = {
-                    type: exports.FillType.Solid,
+                    type: FillType.Solid,
+                    //@ts-expect-error
                     color: shapeComponentData.stroke.color
                 };
-                //@ts-expect-error
                 shapeComponentData.strokes.push(solidPaintData1);
                 //@ts-expect-error
-                shapeComponentData.stroke.color = undefined;
+                shapeComponentData.strokeWidth = shapeComponentData.stroke.width;
+                //@ts-expect-error
+                shapeComponentData.strokeCap = shapeComponentData.stroke.cap;
+                //@ts-expect-error
+                shapeComponentData.strokeJoin = shapeComponentData.stroke.join;
+                //@ts-expect-error
+                delete shapeComponentData.stroke;
             }
         }
     }
+    // 处理富文本lineGap兼容性
+    processRichTextLineGapCompatibility(json);
     //@ts-expect-error
     json.version = "3.5";
     return json;
 }
+/**
+ * 处理富文本 lineGap 兼容性
+ */ function processRichTextLineGapCompatibility(json) {
+    if (!json.components) {
+        return;
+    }
+    // 遍历所有组件，处理富文本组件
+    for(var _iterator = _create_for_of_iterator_helper_loose(json.components), _step; !(_step = _iterator()).done;){
+        var component = _step.value;
+        // 识别富文本组件并处理 lineGap 兼容性
+        if (component.dataType === DataType.RichTextComponent && component.options) {
+            ensureRichTextLineGap(component.options);
+        }
+    }
+}
+/**
+ * 确保富文本组件有版本标识字段
+ */ function ensureRichTextLineGap(options) {
+    // 检查是否已经处理过
+    if (!options || options.useLegacyRichText !== undefined) {
+        return;
+    }
+    // 根据是否存在 lineGap 字段来判断版本
+    if (options.lineGap === undefined) {
+        // 旧版本（没有 lineGap 字段）
+        options.useLegacyRichText = true;
+    } else {
+        // 新版本（有 lineGap 字段）
+        options.useLegacyRichText = false;
+    }
+}
 /**
  * 根据形状获取形状几何体数据
  * @param shape - 形状
@@ -31456,7 +31634,7 @@ function getStandardSpriteContent(sprite, transform) {
     return ret;
 }
 
-var version$2 = "2.7.0-alpha.1";
+var version$2 = "2.7.0-beta.0";
 var v0 = /^(\d+)\.(\d+)\.(\d+)(-(\w+)\.\d+)?$/;
 var standardVersion = /^(\d+)\.(\d+)$/;
 var reverseParticle = false;
@@ -32692,7 +32870,7 @@ function createTextureOptionsBySource(image, sourceFrom, id) {
     function AssetService(engine) {
         this.engine = engine;
         this.builtinObjects = [];
-        this.builtinObjects.push(generateWhiteTexture(engine));
+        this.builtinObjects.push(engine.whiteTexture);
     }
     var _proto = AssetService.prototype;
     /**
@@ -34368,7 +34546,7 @@ var FBGeometryDataT = /*#__PURE__*/ function() {
         this.jsonSceneData = {};
         this.objectInstance = {};
         this.assetLoader = new AssetLoader(this);
-        this.emptyTexture = generateWhiteTexture(this);
+        this.whiteTexture = generateWhiteTexture(this);
         this.transparentTexture = generateTransparentTexture(this);
     }
     var _proto = Engine.prototype;
@@ -34729,7 +34907,7 @@ registerPlugin("sprite", SpriteLoader, exports.VFXItem);
 registerPlugin("particle", ParticleLoader, exports.VFXItem);
 registerPlugin("cal", CalculateLoader, exports.VFXItem);
 registerPlugin("interact", InteractLoader, exports.VFXItem);
-var version$1 = "2.7.0-alpha.1";
+var version$1 = "2.7.0-beta.0";
 logger.info("Core version: " + version$1 + ".");
 
 var _obj;
@@ -35048,12 +35226,13 @@ var _obj3;
         //FIXME: 暂时不实现
         throw new Error("Method not implemented.");
     };
-    _proto.dispose = function dispose(destroyOptions) {
-        if (!this.destroyed) {
+    _proto.dispose = function dispose() {
+        if (this.destroyed) {
             return;
         }
         this.material.dispose();
         this.destroyed = true;
+        Material.prototype.dispose.call(this);
     };
     _create_class(ThreeMaterial, [
         {
@@ -35540,6 +35719,7 @@ var seed = 1;
         }
         this.geometry.dispose();
         this.destroyed = true;
+        Geometry.prototype.dispose.call(this);
     };
     _proto.setAttributeType = function setAttributeType(name, attr, geometry, attributes, maxCount) {
         var _attr_stride = attr.stride, stride = _attr_stride === void 0 ? 0 : _attr_stride, size = attr.size, offset = attr.offset, normalize = attr.normalize, _attr_type = attr.type, type = _attr_type === void 0 ? glContext.FLOAT : _attr_type;
@@ -35681,6 +35861,7 @@ var seed = 1;
             this.mesh.clear();
             this.destroyed = true;
         }
+        Mesh.prototype.dispose.call(this);
     };
     _create_class(ThreeMesh, [
         {
@@ -35768,6 +35949,7 @@ var seed = 1;
    * 释放纹理占用的内存
    */ _proto.dispose = function dispose() {
         this.texture.dispose();
+        Texture.prototype.dispose.call(this);
     };
     /**
    * 通过图层设置创建贴图
@@ -35907,25 +36089,6 @@ var seed = 1;
             }
         }
     };
-    /**
-   * 获取 render 参数
-   *
-   * @returns
-   */ _proto.getRendererOptions = function getRendererOptions() {
-        var emptyTexture = ThreeTexture.createWithData(this.renderer.engine, {
-            data: new Uint8Array(4).fill(255),
-            width: 1,
-            height: 1
-        });
-        emptyTexture.texture.needsUpdate = true;
-        if (!this.rendererOptions) {
-            this.rendererOptions = {
-                emptyTexture: emptyTexture,
-                cachePrefix: "-"
-            };
-        }
-        return this.rendererOptions;
-    };
     return ThreeComposition;
 }(Composition);
 /**
@@ -36167,10 +36330,10 @@ exports.ThreeSpriteComponent = /*#__PURE__*/ function(SpriteComponent) {
    * 销毁方法
    *
    */ _proto.dispose = function dispose() {
-        SpriteComponent.prototype.dispose.call(this);
         if (!this.isActiveAndEnabled) {
             this.threeMesh.clear();
         }
+        SpriteComponent.prototype.dispose.call(this);
     };
     _proto.fromData = function fromData(data) {
         SpriteComponent.prototype.fromData.call(this, data);
@@ -36325,7 +36488,7 @@ setMaxSpriteMeshItemCount(8);
  */ Mesh.create = function(engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "2.7.0-alpha.1";
+var version = "2.7.0-beta.0";
 logger.info("THREEJS plugin version: " + version + ".");
 
 exports.AbstractPlugin = AbstractPlugin;