@galacean/engine-core 1.3.5 → 1.3.6

package/dist/main.js

@@ -10759,6 +10759,9 @@ var SubRenderElement = /*#__PURE__*/ function() {
 __decorate([
     assignmentClone
 ], SpriteMask.prototype, "influenceLayers", void 0);
+__decorate([
+    ignoreClone
+], SpriteMask.prototype, "_renderElement", void 0);
 __decorate([
     ignoreClone
 ], SpriteMask.prototype, "_subChunk", void 0);
@@ -20929,6 +20932,8 @@ var Collision = function Collision() {
         _this._setUpDirection = _this._setUpDirection.bind(_assert_this_initialized(_this));
         //@ts-ignore
         _this._upDirection._onValueChanged = _this._setUpDirection;
+        // sync world position to physical space
+        _this._onUpdate();
         return _this;
     }
     var _proto = CharacterController.prototype;
@@ -20939,7 +20944,9 @@ var Collision = function Collision() {
    * @param elapsedTime - Time elapsed since last call
    * @return flags - The ControllerCollisionFlag
    */ _proto.move = function move(disp, minDist, elapsedTime) {
-        return this._nativeCollider.move(disp, minDist, elapsedTime);
+        var flags = this._nativeCollider.move(disp, minDist, elapsedTime);
+        this._syncWorldPositionFromPhysicalSpace();
+        return flags;
     };
     /**
    * Add collider shape on this controller.
@@ -20975,8 +20982,7 @@ var Collision = function Collision() {
     /**
    * @internal
    */ _proto._onLateUpdate = function _onLateUpdate() {
-        var position = this.entity.transform.worldPosition;
-        this._nativeCollider.getWorldPosition(position);
+        this._syncWorldPositionFromPhysicalSpace();
         this._updateFlag.flag = false;
     };
     /**
@@ -20999,6 +21005,9 @@ var Collision = function Collision() {
             physics._removeColliderShape(shapes[i]);
         }
     };
+    _proto._syncWorldPositionFromPhysicalSpace = function _syncWorldPositionFromPhysicalSpace() {
+        this._nativeCollider.getWorldPosition(this.entity.transform.worldPosition);
+    };
     _proto._setUpDirection = function _setUpDirection() {
         this._nativeCollider.setUpDirection(this._upDirection);
     };
@@ -28683,7 +28692,9 @@ exports.AnimatorLayerBlendingMode = void 0;
         // Precalculate to get the transition
         srcPlayData.update(playDeltaTime);
         var clipTime = srcPlayData.clipTime, isForwards = srcPlayData.isForwards;
-        var transition = this._applyTransitionsByCondition(layerIndex, layerData, layer, state, layer.stateMachine.anyStateTransitions, aniUpdate) || this._applyStateTransitions(layerIndex, layerData, layer, isForwards, srcPlayData, state.transitions, lastClipTime, clipTime, playDeltaTime, aniUpdate);
+        var transitions = state.transitions;
+        var anyStateTransitions = layer.stateMachine.anyStateTransitions;
+        var transition = anyStateTransitions.length && this._applyTransitionsByCondition(layerIndex, layerData, layer, state, anyStateTransitions, aniUpdate) || transitions.length && this._applyStateTransitions(layerIndex, layerData, layer, isForwards, srcPlayData, transitions, lastClipTime, clipTime, playDeltaTime, aniUpdate);
         var playCostTime;
         if (transition) {
             var clipDuration = state.clip.length;
@@ -28767,7 +28778,7 @@ exports.AnimatorLayerBlendingMode = void 0;
             playedTime - dstPlayDeltaTime > transitionDuration ? // -(transitionDuration - playedTime)
             playedTime - transitionDuration : dstPlayDeltaTime;
         }
-        var actualCostTime = dstPlaySpeed === 0 ? 0 : dstPlayCostTime / dstPlaySpeed;
+        var actualCostTime = dstPlaySpeed === 0 ? deltaTime : dstPlayCostTime / dstPlaySpeed;
         var srcPlayCostTime = actualCostTime * srcPlaySpeed;
         srcPlayData.update(srcPlayCostTime);
         destPlayData.update(dstPlayCostTime);
@@ -28775,6 +28786,7 @@ exports.AnimatorLayerBlendingMode = void 0;
         (crossWeight >= 1.0 - engineMath.MathUtil.zeroTolerance || transitionDuration === 0) && (crossWeight = 1.0);
         var crossFadeFinished = crossWeight === 1.0;
         if (crossFadeFinished) {
+            srcPlayData.playState = AnimatorStatePlayState.Finished;
             this._preparePlayOwner(layerData, destState);
             this._evaluatePlayingState(destPlayData, weight, additive, aniUpdate);
         } else {
@@ -28829,7 +28841,7 @@ exports.AnimatorLayerBlendingMode = void 0;
             playedTime - playDeltaTime > transitionDuration ? // -(transitionDuration - playedTime)
             playedTime - transitionDuration : playDeltaTime;
         }
-        var actualCostTime = playSpeed === 0 ? 0 : dstPlayCostTime / playSpeed;
+        var actualCostTime = playSpeed === 0 ? deltaTime : dstPlayCostTime / playSpeed;
         destPlayData.update(dstPlayCostTime);
         var crossWeight = Math.abs(destPlayData.frameTime) / transitionDuration;
         (crossWeight >= 1.0 - engineMath.MathUtil.zeroTolerance || transitionDuration === 0) && (crossWeight = 1.0);
@@ -28869,14 +28881,16 @@ exports.AnimatorLayerBlendingMode = void 0;
         }
     };
     _proto._updateFinishedState = function _updateFinishedState(layerIndex, layerData, layer, weight, additive, deltaTime, aniUpdate) {
-        var stateMachine = layer.stateMachine;
+        layer.stateMachine;
         var playData = layerData.srcPlayData;
         var state = playData.state;
         var actualSpeed = state.speed * this.speed;
         var actualDeltaTime = actualSpeed * deltaTime;
         playData.updateOrientation(actualDeltaTime);
         var clipTime = playData.clipTime, isForwards = playData.isForwards;
-        var transition = this._applyTransitionsByCondition(layerIndex, layerData, layer, state, stateMachine.anyStateTransitions, aniUpdate) || this._applyStateTransitions(layerIndex, layerData, layer, isForwards, playData, state.transitions, clipTime, clipTime, actualDeltaTime, aniUpdate);
+        var transitions = state.transitions;
+        var anyStateTransitions = layer.stateMachine.anyStateTransitions;
+        var transition = anyStateTransitions.length && this._applyTransitionsByCondition(layerIndex, layerData, layer, state, anyStateTransitions, aniUpdate) || transitions.length && this._applyStateTransitions(layerIndex, layerData, layer, isForwards, playData, transitions, clipTime, clipTime, actualDeltaTime, aniUpdate);
         if (transition) {
             this._updateState(layerIndex, layerData, layer, deltaTime, aniUpdate);
         } else {