@leafer-game/miniapp 2.2.7 → 2.2.9

package/dist/miniapp.module.js

@@ -2992,7 +2992,7 @@ const PathCommandNodeHelper = {
     toCommand(_nodes) {
         return [];
     },
-    toNode(_data) {
+    toNode(_data, _filterSamePoint) {
         return [];
     }
 };
@@ -4883,6 +4883,13 @@ const LeafHelper = {
         if (!fromWorld) fromWorld = leaf.__nowWorld;
         if (leaf.__worldFlipped || Platform.fullImageShadow) currentCanvas.copyWorldByReset(fromCanvas, fromWorld, leaf.__nowWorld, blendMode, onlyResetTransform); else currentCanvas.copyWorldToInner(fromCanvas, fromWorld, leaf.__layout.renderBounds, blendMode);
     },
+    clip(leaf, canvas, options) {
+        if (leaf.__worldOpacity) {
+            canvas.setWorld(leaf.__nowWorld = leaf.__getNowWorld(options));
+            leaf.__drawRenderPath(canvas);
+            canvas.clipUI(leaf);
+        }
+    },
     renderComplex(_leaf, _canvas, _options) {},
     updateComplex(_leaf) {},
     checkComplex(_leaf) {},
@@ -6258,11 +6265,7 @@ const LeafRender = {
         }
     },
     __clip(canvas, options) {
-        if (this.__worldOpacity) {
-            canvas.setWorld(this.__nowWorld = this.__getNowWorld(options));
-            this.__drawRenderPath(canvas);
-            canvas.clipUI(this);
-        }
+        LeafHelper.clip(this, canvas, options);
     },
     __updateWorldOpacity() {
         this.__worldOpacity = this.__.visible ? this.parent ? this.parent.__worldOpacity * this.__.opacity : this.__.opacity : 0;
@@ -7043,7 +7046,7 @@ class LeafLevelList {
     }
 }
 
-const version = "2.2.7";
+const version = "2.2.9";
 
 class LeaferCanvas extends LeaferCanvasBase {
     get allowBackgroundColor() {
@@ -8105,7 +8108,17 @@ Platform.render = function(target, canvas, options) {
     });
     options.topList = new LeafList;
     target.__render(canvas, options);
-    if (options.topList.length) options.topList.forEach(item => item.__render(canvas, topOptions));
+    if (options.topList.length) options.topList.forEach(item => {
+        const {parent: parent} = item;
+        if (parent && parent.isBranchLeaf && parent.overflow !== "show") {
+            canvas.save();
+            LeafHelper.clip(parent, canvas, topOptions);
+            item.__render(canvas, topOptions);
+            canvas.restore();
+        } else {
+            item.__render(canvas, topOptions);
+        }
+    });
 };
 
 function effectType(defaultValue) {
@@ -15154,6 +15167,7 @@ const HighCurveHelper = {
         motionDistance = UnitConvert.number(motionDistance, total);
         if (offsetX) motionDistance += offsetX;
         if (motionDistance > total) motionDistance = motionDistance % total;
+        if (motionDistance < 0) motionDistance = total + motionDistance;
         let nowDistance = 0, distance, to = {};
         let i = 0, index = 0, x = 0, y = 0, startX = 0, startY = 0, toX, toY, command;
         let x1, y1, x2, y2, t;
@@ -15362,11 +15376,7 @@ ui$1.getMotionPathData = function() {
     return getMotionPathData(getMotionPath(this));
 };
 
-ui$1.getMotionContentHeight = function() {
-    return this.__layout.boxBounds.height;
-};
-
-ui$1.getMotionPoint = function(motionDistance, motionAround, motionVertical, offsetX = 0, offsetY = 0, pathElement) {
+ui$1.getMotionPoint = function(motionDistance, motionAround, offsetX = 0, offsetY = 0, pathElement) {
     if (!pathElement) pathElement = getMotionPath(this);
     const data = getMotionPathData(pathElement);
     if (!data.total) return {};
@@ -15379,25 +15389,7 @@ ui$1.getMotionPoint = function(motionDistance, motionAround, motionVertical, off
         if (point.rotation) PointHelper.rotate(tempPoint, point.rotation, point);
         PointHelper.copy(point, tempPoint);
     }
-    let verticalType, verticalOffset;
-    if (isObject(motionVertical)) verticalType = motionVertical.type, verticalOffset = motionVertical.offset; else if (isNumber(motionVertical)) verticalOffset = motionVertical; else verticalType = motionVertical;
-    if (verticalType !== "below" || offsetY) {
-        const {rotation: rotation} = point, height = this.getMotionContentHeight();
-        if (verticalOffset) offsetY += verticalType === "above" ? -verticalOffset : verticalOffset;
-        switch (verticalType) {
-          case "above":
-            toVertical(point, rotation, -height + offsetY);
-            break;
-
-          case "center":
-            toVertical(point, rotation, -height / 2 + offsetY);
-            break;
-
-          case "below":
-          default:
-            toVertical(point, rotation, offsetY);
-        }
-    }
+    if (offsetY) toVertical(point, point.rotation, offsetY);
     MatrixHelper.toOuterPoint(pathElement.localTransform, point);
     return point;
 };