@galacean/effects-threejs 2.8.8 → 2.8.9

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.8.8
+ * Version: v2.8.9
  */
 
 'use strict';
@@ -17867,14 +17867,14 @@ exports.CompositionComponent = /*#__PURE__*/ function(Component) {
                         }
                     }
                 }
-                if (exports.VFXItem.isComposition(hitTestItem)) {
-                    if (hitTestItem.getComponent(CompositionComponent).hitTest(ray, x, y, regions, force, options)) {
-                        hitTestSuccess = true;
-                    }
-                } else {
-                    if (_this.hitTestRecursive(hitTestItem, ray, x, y, regions, force, options)) {
-                        hitTestSuccess = true;
-                    }
+            }
+            if (exports.VFXItem.isComposition(hitTestItem)) {
+                if (hitTestItem.getComponent(CompositionComponent).hitTest(ray, x, y, regions, force, options)) {
+                    hitTestSuccess = true;
+                }
+            } else {
+                if (_this.hitTestRecursive(hitTestItem, ray, x, y, regions, force, options)) {
+                    hitTestSuccess = true;
                 }
             }
         };
@@ -29401,12 +29401,6 @@ exports.TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
             } else {
                 context.font = style.fontDesc;
             }
-            if (style.hasShadow) {
-                _this.setupShadow();
-            }
-            if (style.isOutlined) {
-                _this.setupOutline();
-            }
             // textColor 统一是 0-1，写入 canvas 时乘 255
             var _style_textColor = style.textColor, r = _style_textColor[0], g = _style_textColor[1], b = _style_textColor[2], a = _style_textColor[3];
             context.fillStyle = "rgba(" + r * 255 + ", " + g * 255 + ", " + b * 255 + ", " + a + ")";
@@ -29447,8 +29441,13 @@ exports.TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
                 chars: charsArray,
                 charOffsetX: charOffsetX
             });
-            // 先描边
-            if (style.isOutlined && style.outlineWidth > 0) {
+            var hasOutline = style.isOutlined && style.outlineWidth > 0;
+            if (hasOutline) {
+                // 有描边：在描边时启用阴影
+                if (style.hasShadow) {
+                    _this.setupShadow();
+                }
+                _this.setupOutline();
                 charsInfo.forEach(function(charInfo) {
                     var ox = layout.getOffsetX(style, charInfo.width);
                     for(var i = 0; i < charInfo.chars.length; i++){
@@ -29458,8 +29457,15 @@ exports.TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
                         context.strokeText(str, drawX, drawY);
                     }
                 });
+                // 描边完成后立即禁用阴影，避免填充时重复绘制阴影
+                if (style.hasShadow) {
+                    context.shadowColor = "transparent";
+                }
+            }
+            // 填充阶段：无描边时才启用阴影
+            if (!hasOutline && style.hasShadow) {
+                _this.setupShadow();
             }
-            // 再填充
             charsInfo.forEach(function(charInfo) {
                 var ox = layout.getOffsetX(style, charInfo.width);
                 for(var i = 0; i < charInfo.chars.length; i++){
@@ -29469,6 +29475,7 @@ exports.TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
                     context.fillText(str, drawX, drawY);
                 }
             });
+            // 清理阴影状态
             if (style.hasShadow) {
                 context.shadowColor = "transparent";
             }
@@ -31652,7 +31659,7 @@ function getStandardSpriteContent(sprite, transform) {
     return ret;
 }
 
-var version$2 = "2.8.8";
+var version$2 = "2.8.9";
 var v0 = /^(\d+)\.(\d+)\.(\d+)(-(\w+)\.\d+)?$/;
 var standardVersion = /^(\d+)\.(\d+)$/;
 var reverseParticle = false;
@@ -35352,7 +35359,7 @@ registerPlugin("text", TextLoader);
 registerPlugin("sprite", SpriteLoader);
 registerPlugin("particle", ParticleLoader);
 registerPlugin("interact", InteractLoader);
-var version$1 = "2.8.8";
+var version$1 = "2.8.9";
 logger.info("Core version: " + version$1 + ".");
 
 var _obj;
@@ -36929,7 +36936,7 @@ applyMixins(exports.ThreeTextComponent, [
  */ Mesh.create = function(engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "2.8.8";
+var version = "2.8.9";
 logger.info("THREEJS plugin version: " + version + ".");
 
 exports.ActivationMixerPlayable = ActivationMixerPlayable;