@galacean/effects-core 2.2.5 → 2.2.6

package/dist/fallback/migration.d.ts

@@ -7,6 +7,11 @@ export declare function version21Migration(json: JSONSceneLegacy): JSONSceneLega
  * 2.2 以下版本数据适配（mars-player@2.5.0 及以上版本支持 2.2 以下数据的适配）
  */
 export declare function version22Migration(json: JSONSceneLegacy): JSONSceneLegacy;
+/**
+ * 3.1 版本数据适配
+ * - 富文本插件名称的适配
+ */
+export declare function version31Migration(json: JSONSceneLegacy): JSONSceneLegacy;
 /**
  * 3.0 以下版本数据适配（runtime 2.0及以上版本支持）
  */

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime core for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.2.5
+ * Version: v2.2.6
  */
 
 'use strict';
@@ -957,7 +957,7 @@ var pluginInfoMap = {
     "video": "@galacean/effects-plugin-multimedia",
     "audio": "@galacean/effects-plugin-multimedia",
     "orientation-transformer": "@galacean/effects-plugin-orientation-transformer",
-    "richtext": "@galacean/effects-plugin-rich-text",
+    "rich-text": "@galacean/effects-plugin-rich-text",
     "spine": "@galacean/effects-plugin-spine"
 };
 function getPluginUsageInfo(name) {
@@ -11719,25 +11719,35 @@ function numberToFix(a, fixed) {
 }
 
 var keyframeInfo = {
+    pointIndexCache: {
+        xIndex: 0,
+        yIndex: 0
+    },
     /**
    * 根据不同关键帧类型，获取位于曲线上的点
    */ getPointInCurve: function getPointInCurve(keyframe) {
         keyframe[0]; var data = keyframe[1];
-        var _this_getPointIndexInCurve = this.getPointIndexInCurve(keyframe), xIndex = _this_getPointIndexInCurve.xIndex, yIndex = _this_getPointIndexInCurve.yIndex;
+        var _this_getPointIndexInCurve = this.getPointIndexInCurve(keyframe, this.pointIndexCache), xIndex = _this_getPointIndexInCurve.xIndex, yIndex = _this_getPointIndexInCurve.yIndex;
         var time = data[xIndex];
         var value = data[yIndex];
         return new Vector2(time, value);
     },
     /**
    * 根据不同关键帧类型，获取位于曲线上的点的索引
-   */ getPointIndexInCurve: function getPointIndexInCurve(keyframe) {
+   */ getPointIndexInCurve: function getPointIndexInCurve(keyframe, res) {
         var type = keyframe[0], markType = keyframe[2];
         // 不同类型，存放的时间不同
         var index = type === BezierKeyframeType.LINE ? 0 : type === BezierKeyframeType.EASE_OUT ? 0 : type === BezierKeyframeType.EASE_IN ? 2 : type === BezierKeyframeType.EASE ? 2 : type === BezierKeyframeType.HOLD ? markType === BezierKeyframeType.EASE_IN ? 2 : 0 : 0;
-        return {
-            xIndex: index,
-            yIndex: index + 1
-        };
+        if (res) {
+            res.xIndex = index;
+            res.yIndex = index + 1;
+            return res;
+        } else {
+            return {
+                xIndex: index,
+                yIndex: index + 1
+            };
+        }
     },
     /**
    * 关键帧左侧是否为缓动类型（否则为线段）
@@ -12644,6 +12654,8 @@ var BezierCurve = /*#__PURE__*/ function(ValueGetter) {
                 timeEnd: Number(e.x)
             };
         }
+        this.startKeyframe = keyframes[0];
+        this.endKeyframe = keyframes[keyframes.length - 1];
         this.keyTimeData = Object.keys(this.curveMap);
     };
     _proto.getValue = function getValue(time) {
@@ -12651,12 +12663,18 @@ var BezierCurve = /*#__PURE__*/ function(ValueGetter) {
         var keyTimeData = this.keyTimeData;
         var keyTimeStart = this.curveMap[keyTimeData[0]].timeStart;
         var keyTimeEnd = this.curveMap[keyTimeData[keyTimeData.length - 1]].timeEnd;
-        // const keyTimeStart = Number(keyTimeData[0].split('&')[0]);
-        // const keyTimeEnd = Number(keyTimeData[keyTimeData.length - 1].split('&')[1]);
         if (time <= keyTimeStart) {
+            if (this.startKeyframe[0] === BezierKeyframeType.LINE || this.startKeyframe[0] === BezierKeyframeType.HOLD) {
+                keyframeInfo.getPointIndexInCurve(this.startKeyframe, keyframeInfo.pointIndexCache);
+                return this.endKeyframe[1][keyframeInfo.pointIndexCache.yIndex];
+            }
             return this.getCurveValue(keyTimeData[0], keyTimeStart);
         }
         if (time >= keyTimeEnd) {
+            if (this.endKeyframe[0] === BezierKeyframeType.LINE || this.endKeyframe[0] === BezierKeyframeType.HOLD) {
+                keyframeInfo.getPointIndexInCurve(this.endKeyframe, keyframeInfo.pointIndexCache);
+                return this.endKeyframe[1][keyframeInfo.pointIndexCache.yIndex];
+            }
             return this.getCurveValue(keyTimeData[keyTimeData.length - 1], keyTimeEnd);
         }
         for(var i = 0; i < keyTimeData.length; i++){
@@ -16260,7 +16278,7 @@ var EventSystem = /*#__PURE__*/ function() {
             var vy = 0;
             var ts = performance.now();
             if (!_this.target) {
-                logger.error("Trigger TouchEvent after EventSystem is disposed.");
+                logger.warn("Trigger TouchEvent after EventSystem is disposed.");
                 return {
                     x: x,
                     y: y,
@@ -26002,6 +26020,18 @@ function getStandardInteractContent(ui) {
     });
     return json;
 }
+/**
+ * 3.1 版本数据适配
+ * - 富文本插件名称的适配
+ */ function version31Migration(json) {
+    var _json_plugins;
+    (_json_plugins = json.plugins) == null ? void 0 : _json_plugins.forEach(function(plugin, index) {
+        if (plugin === "richtext") {
+            json.plugins[index] = "rich-text";
+        }
+    });
+    return json;
+}
 /**
  * 3.0 以下版本数据适配（runtime 2.0及以上版本支持）
  */ function version30Migration(json) {
@@ -26829,6 +26859,8 @@ function getStandardJSON(json) {
     }
     // 修正老版本数据中，meshItem 以及 lightItem 结束行为错误问题
     version22Migration(json);
+    // 修正老版本数据中，富文本插件名称的问题
+    version31Migration(json);
     if (v0.test(json.version)) {
         var _exec;
         reverseParticle = ((_exec = /^(\d+)/.exec(json.version)) == null ? void 0 : _exec[0]) === "0";
@@ -31371,7 +31403,7 @@ registerPlugin("sprite", SpriteLoader, exports.VFXItem, true);
 registerPlugin("particle", ParticleLoader, exports.VFXItem, true);
 registerPlugin("cal", CalculateLoader, exports.VFXItem, true);
 registerPlugin("interact", InteractLoader, exports.VFXItem, true);
-var version = "2.2.5";
+var version = "2.2.6";
 logger.info("Core version: " + version + ".");
 
 exports.AbstractPlugin = AbstractPlugin;