@galacean/engine-core 1.3.14 → 1.3.15

package/dist/miniprogram.js

@@ -26269,16 +26269,17 @@ Shader.create(_PostProcessManager.UBER_SHADER_NAME, blitVs, UberPost);
    * @internal
    */ _proto._onDisableInScene = function _onDisableInScene() {
         var componentsManager = this.scene._componentsManager;
+        var prototype = Script.prototype;
         if (!this._started) {
             componentsManager.removeOnStartScript(this);
         }
-        if (this._onUpdateIndex >= 0) {
+        if (this.onUpdate !== prototype.onUpdate) {
             componentsManager.removeOnUpdateScript(this);
         }
-        if (this._onLateUpdateIndex >= 0) {
+        if (this.onLateUpdate !== prototype.onLateUpdate) {
             componentsManager.removeOnLateUpdateScript(this);
         }
-        if (this._onPhysicsUpdateIndex >= 0) {
+        if (this.onPhysicsUpdate !== prototype.onPhysicsUpdate) {
             componentsManager.removeOnPhysicsUpdateScript(this);
         }
         this._entity._removeScript(this);
@@ -28286,7 +28287,8 @@ exports.AnimatorLayerBlendingMode = void 0;
     var _proto = AnimatorStatePlayData.prototype;
     _proto.reset = function reset(state, stateData, offsetFrameTime) {
         this.state = state;
-        this.frameTime = offsetFrameTime;
+        this.playedTime = 0;
+        this.offsetFrameTime = offsetFrameTime;
         this.stateData = stateData;
         this.playState = AnimatorStatePlayState.UnStarted;
         this.clipTime = state.clipStartTime * state.clip.length;
@@ -28305,9 +28307,9 @@ exports.AnimatorLayerBlendingMode = void 0;
         }
     };
     _proto.update = function update(deltaTime) {
-        this.frameTime += deltaTime;
+        this.playedTime += deltaTime;
         var state = this.state;
-        var time = this.frameTime;
+        var time = this.playedTime + this.offsetFrameTime;
         var duration = state._getDuration();
         this.playState = AnimatorStatePlayState.Playing;
         if (state.wrapMode === exports.WrapMode.Loop) {
@@ -28754,9 +28756,8 @@ exports.AnimatorLayerBlendingMode = void 0;
         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;
-            var clipEndTime = state.clipEndTime * clipDuration;
-            var exitTime = transition.exitTime * state._getDuration();
+            var clipEndTime = state._getClipActualEndTime();
+            var exitTime = transition.exitTime * state._getDuration() + state._getClipActualStartTime();
             if (isForwards) {
                 if (exitTime < lastClipTime) {
                     playCostTime = exitTime + clipEndTime - lastClipTime;
@@ -28764,7 +28765,7 @@ exports.AnimatorLayerBlendingMode = void 0;
                     playCostTime = exitTime - lastClipTime;
                 }
             } else {
-                var startTime = state.clipStartTime * clipDuration;
+                var startTime = state._getClipActualStartTime();
                 if (lastClipTime < exitTime) {
                     playCostTime = clipEndTime - exitTime + lastClipTime - startTime;
                 } else {
@@ -28826,20 +28827,22 @@ exports.AnimatorLayerBlendingMode = void 0;
         var lastDestClipTime = destPlayData.clipTime, lastDstPlayState = destPlayData.playState;
         var dstPlayCostTime;
         if (destPlayData.isForwards) {
-            dstPlayCostTime = lastDestClipTime + dstPlayDeltaTime > transitionDuration ? transitionDuration - lastDestClipTime : dstPlayDeltaTime;
+            // The time that has been played
+            var playedTime = destPlayData.playedTime;
+            dstPlayCostTime = playedTime + dstPlayDeltaTime > transitionDuration ? transitionDuration - playedTime : dstPlayDeltaTime;
         } else {
             // The time that has been played
-            var playedTime = destStateDuration - lastDestClipTime;
-            dstPlayCostTime = // -actualDestDeltaTime: The time that will be played, negative are meant to make ite be a periods
+            var playedTime1 = destPlayData.playedTime;
+            dstPlayCostTime = // -dstPlayDeltaTime: The time that will be played, negative are meant to make it be a periods
             // > transition: The time that will be played is enough to finish the transition
-            playedTime - dstPlayDeltaTime > transitionDuration ? // -(transitionDuration - playedTime)
-            playedTime - transitionDuration : dstPlayDeltaTime;
+            playedTime1 - dstPlayDeltaTime > transitionDuration ? // -(transitionDuration - playedTime)
+            playedTime1 - transitionDuration : dstPlayDeltaTime;
         }
         var actualCostTime = dstPlaySpeed === 0 ? deltaTime : dstPlayCostTime / dstPlaySpeed;
         var srcPlayCostTime = actualCostTime * srcPlaySpeed;
         srcPlayData.update(srcPlayCostTime);
         destPlayData.update(dstPlayCostTime);
-        var crossWeight = Math.abs(destPlayData.frameTime) / transitionDuration;
+        var crossWeight = Math.abs(destPlayData.playedTime) / transitionDuration;
         (crossWeight >= 1.0 - miniprogram.MathUtil.zeroTolerance || transitionDuration === 0) && (crossWeight = 1.0);
         var crossFadeFinished = crossWeight === 1.0;
         if (crossFadeFinished) {
@@ -28889,18 +28892,20 @@ exports.AnimatorLayerBlendingMode = void 0;
         var lastDestClipTime = destPlayData.clipTime, lastPlayState = destPlayData.playState;
         var dstPlayCostTime;
         if (destPlayData.isForwards) {
-            dstPlayCostTime = lastDestClipTime + playDeltaTime > transitionDuration ? transitionDuration - lastDestClipTime : playDeltaTime;
+            // The time that has been played
+            var playedTime = destPlayData.playedTime;
+            dstPlayCostTime = playedTime + playDeltaTime > transitionDuration ? transitionDuration - playedTime : playDeltaTime;
         } else {
             // The time that has been played
-            var playedTime = stateDuration - lastDestClipTime;
+            var playedTime1 = destPlayData.playedTime;
             dstPlayCostTime = // -actualDestDeltaTime: The time that will be played, negative are meant to make ite be a periods
             // > transition: The time that will be played is enough to finish the transition
-            playedTime - playDeltaTime > transitionDuration ? // -(transitionDuration - playedTime)
-            playedTime - transitionDuration : playDeltaTime;
+            playedTime1 - playDeltaTime > transitionDuration ? // -(transitionDuration - playedTime)
+            playedTime1 - transitionDuration : playDeltaTime;
         }
         var actualCostTime = playSpeed === 0 ? deltaTime : dstPlayCostTime / playSpeed;
         destPlayData.update(dstPlayCostTime);
-        var crossWeight = Math.abs(destPlayData.frameTime) / transitionDuration;
+        var crossWeight = Math.abs(destPlayData.playedTime) / transitionDuration;
         (crossWeight >= 1.0 - miniprogram.MathUtil.zeroTolerance || transitionDuration === 0) && (crossWeight = 1.0);
         var crossFadeFinished = crossWeight === 1.0;
         if (crossFadeFinished) {
@@ -29028,10 +29033,9 @@ exports.AnimatorLayerBlendingMode = void 0;
     _proto._checkSubTransition = function _checkSubTransition(layerIndex, layerData, layer, playState, transitions, lastClipTime, curClipTime, aniUpdate) {
         var state = playState.state;
         var transitionIndex = playState.currentTransitionIndex;
-        var duration = state._getDuration();
         for(var n = transitions.length; transitionIndex < n; transitionIndex++){
             var transition = transitions[transitionIndex];
-            var exitTime = transition.exitTime * duration;
+            var exitTime = transition.exitTime * state._getDuration() + state._getClipActualStartTime();
             if (exitTime > curClipTime) {
                 break;
             }
@@ -29051,10 +29055,9 @@ exports.AnimatorLayerBlendingMode = void 0;
     _proto._checkBackwardsSubTransition = function _checkBackwardsSubTransition(layerIndex, layerData, layer, playState, transitions, lastClipTime, curClipTime, aniUpdate) {
         var state = playState.state;
         var transitionIndex = playState.currentTransitionIndex;
-        var duration = playState.state._getDuration();
         for(; transitionIndex >= 0; transitionIndex--){
             var transition = transitions[transitionIndex];
-            var exitTime = transition.exitTime * duration;
+            var exitTime = transition.exitTime * state._getDuration() + state._getClipActualStartTime();
             if (exitTime < curClipTime) {
                 break;
             }
@@ -29685,6 +29688,16 @@ function _possible_constructor_return(self, call) {
             }
         }
     };
+    /**
+   * @internal
+   */ _proto._getClipActualStartTime = function _getClipActualStartTime() {
+        return this._clipStartTime * this.clip.length;
+    };
+    /**
+   * @internal
+   */ _proto._getClipActualEndTime = function _getClipActualEndTime() {
+        return this._clipEndTime * this.clip.length;
+    };
     _create_class(AnimatorState, [
         {
             key: "transitions",

package/dist/module.js

@@ -26264,16 +26264,17 @@ Shader.create(_PostProcessManager.UBER_SHADER_NAME, blitVs, UberPost);
    * @internal
    */ _proto._onDisableInScene = function _onDisableInScene() {
         var componentsManager = this.scene._componentsManager;
+        var prototype = Script.prototype;
         if (!this._started) {
             componentsManager.removeOnStartScript(this);
         }
-        if (this._onUpdateIndex >= 0) {
+        if (this.onUpdate !== prototype.onUpdate) {
             componentsManager.removeOnUpdateScript(this);
         }
-        if (this._onLateUpdateIndex >= 0) {
+        if (this.onLateUpdate !== prototype.onLateUpdate) {
             componentsManager.removeOnLateUpdateScript(this);
         }
-        if (this._onPhysicsUpdateIndex >= 0) {
+        if (this.onPhysicsUpdate !== prototype.onPhysicsUpdate) {
             componentsManager.removeOnPhysicsUpdateScript(this);
         }
         this._entity._removeScript(this);
@@ -28281,7 +28282,8 @@ var AnimatorLayerBlendingMode;
     var _proto = AnimatorStatePlayData.prototype;
     _proto.reset = function reset(state, stateData, offsetFrameTime) {
         this.state = state;
-        this.frameTime = offsetFrameTime;
+        this.playedTime = 0;
+        this.offsetFrameTime = offsetFrameTime;
         this.stateData = stateData;
         this.playState = AnimatorStatePlayState.UnStarted;
         this.clipTime = state.clipStartTime * state.clip.length;
@@ -28300,9 +28302,9 @@ var AnimatorLayerBlendingMode;
         }
     };
     _proto.update = function update(deltaTime) {
-        this.frameTime += deltaTime;
+        this.playedTime += deltaTime;
         var state = this.state;
-        var time = this.frameTime;
+        var time = this.playedTime + this.offsetFrameTime;
         var duration = state._getDuration();
         this.playState = AnimatorStatePlayState.Playing;
         if (state.wrapMode === WrapMode.Loop) {
@@ -28749,9 +28751,8 @@ var AnimatorLayerBlendingMode;
         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;
-            var clipEndTime = state.clipEndTime * clipDuration;
-            var exitTime = transition.exitTime * state._getDuration();
+            var clipEndTime = state._getClipActualEndTime();
+            var exitTime = transition.exitTime * state._getDuration() + state._getClipActualStartTime();
             if (isForwards) {
                 if (exitTime < lastClipTime) {
                     playCostTime = exitTime + clipEndTime - lastClipTime;
@@ -28759,7 +28760,7 @@ var AnimatorLayerBlendingMode;
                     playCostTime = exitTime - lastClipTime;
                 }
             } else {
-                var startTime = state.clipStartTime * clipDuration;
+                var startTime = state._getClipActualStartTime();
                 if (lastClipTime < exitTime) {
                     playCostTime = clipEndTime - exitTime + lastClipTime - startTime;
                 } else {
@@ -28821,20 +28822,22 @@ var AnimatorLayerBlendingMode;
         var lastDestClipTime = destPlayData.clipTime, lastDstPlayState = destPlayData.playState;
         var dstPlayCostTime;
         if (destPlayData.isForwards) {
-            dstPlayCostTime = lastDestClipTime + dstPlayDeltaTime > transitionDuration ? transitionDuration - lastDestClipTime : dstPlayDeltaTime;
+            // The time that has been played
+            var playedTime = destPlayData.playedTime;
+            dstPlayCostTime = playedTime + dstPlayDeltaTime > transitionDuration ? transitionDuration - playedTime : dstPlayDeltaTime;
         } else {
             // The time that has been played
-            var playedTime = destStateDuration - lastDestClipTime;
-            dstPlayCostTime = // -actualDestDeltaTime: The time that will be played, negative are meant to make ite be a periods
+            var playedTime1 = destPlayData.playedTime;
+            dstPlayCostTime = // -dstPlayDeltaTime: The time that will be played, negative are meant to make it be a periods
             // > transition: The time that will be played is enough to finish the transition
-            playedTime - dstPlayDeltaTime > transitionDuration ? // -(transitionDuration - playedTime)
-            playedTime - transitionDuration : dstPlayDeltaTime;
+            playedTime1 - dstPlayDeltaTime > transitionDuration ? // -(transitionDuration - playedTime)
+            playedTime1 - transitionDuration : dstPlayDeltaTime;
         }
         var actualCostTime = dstPlaySpeed === 0 ? deltaTime : dstPlayCostTime / dstPlaySpeed;
         var srcPlayCostTime = actualCostTime * srcPlaySpeed;
         srcPlayData.update(srcPlayCostTime);
         destPlayData.update(dstPlayCostTime);
-        var crossWeight = Math.abs(destPlayData.frameTime) / transitionDuration;
+        var crossWeight = Math.abs(destPlayData.playedTime) / transitionDuration;
         (crossWeight >= 1.0 - MathUtil.zeroTolerance || transitionDuration === 0) && (crossWeight = 1.0);
         var crossFadeFinished = crossWeight === 1.0;
         if (crossFadeFinished) {
@@ -28884,18 +28887,20 @@ var AnimatorLayerBlendingMode;
         var lastDestClipTime = destPlayData.clipTime, lastPlayState = destPlayData.playState;
         var dstPlayCostTime;
         if (destPlayData.isForwards) {
-            dstPlayCostTime = lastDestClipTime + playDeltaTime > transitionDuration ? transitionDuration - lastDestClipTime : playDeltaTime;
+            // The time that has been played
+            var playedTime = destPlayData.playedTime;
+            dstPlayCostTime = playedTime + playDeltaTime > transitionDuration ? transitionDuration - playedTime : playDeltaTime;
         } else {
             // The time that has been played
-            var playedTime = stateDuration - lastDestClipTime;
+            var playedTime1 = destPlayData.playedTime;
             dstPlayCostTime = // -actualDestDeltaTime: The time that will be played, negative are meant to make ite be a periods
             // > transition: The time that will be played is enough to finish the transition
-            playedTime - playDeltaTime > transitionDuration ? // -(transitionDuration - playedTime)
-            playedTime - transitionDuration : playDeltaTime;
+            playedTime1 - playDeltaTime > transitionDuration ? // -(transitionDuration - playedTime)
+            playedTime1 - transitionDuration : playDeltaTime;
         }
         var actualCostTime = playSpeed === 0 ? deltaTime : dstPlayCostTime / playSpeed;
         destPlayData.update(dstPlayCostTime);
-        var crossWeight = Math.abs(destPlayData.frameTime) / transitionDuration;
+        var crossWeight = Math.abs(destPlayData.playedTime) / transitionDuration;
         (crossWeight >= 1.0 - MathUtil.zeroTolerance || transitionDuration === 0) && (crossWeight = 1.0);
         var crossFadeFinished = crossWeight === 1.0;
         if (crossFadeFinished) {
@@ -29023,10 +29028,9 @@ var AnimatorLayerBlendingMode;
     _proto._checkSubTransition = function _checkSubTransition(layerIndex, layerData, layer, playState, transitions, lastClipTime, curClipTime, aniUpdate) {
         var state = playState.state;
         var transitionIndex = playState.currentTransitionIndex;
-        var duration = state._getDuration();
         for(var n = transitions.length; transitionIndex < n; transitionIndex++){
             var transition = transitions[transitionIndex];
-            var exitTime = transition.exitTime * duration;
+            var exitTime = transition.exitTime * state._getDuration() + state._getClipActualStartTime();
             if (exitTime > curClipTime) {
                 break;
             }
@@ -29046,10 +29050,9 @@ var AnimatorLayerBlendingMode;
     _proto._checkBackwardsSubTransition = function _checkBackwardsSubTransition(layerIndex, layerData, layer, playState, transitions, lastClipTime, curClipTime, aniUpdate) {
         var state = playState.state;
         var transitionIndex = playState.currentTransitionIndex;
-        var duration = playState.state._getDuration();
         for(; transitionIndex >= 0; transitionIndex--){
             var transition = transitions[transitionIndex];
-            var exitTime = transition.exitTime * duration;
+            var exitTime = transition.exitTime * state._getDuration() + state._getClipActualStartTime();
             if (exitTime < curClipTime) {
                 break;
             }
@@ -29680,6 +29683,16 @@ function _possible_constructor_return(self, call) {
             }
         }
     };
+    /**
+   * @internal
+   */ _proto._getClipActualStartTime = function _getClipActualStartTime() {
+        return this._clipStartTime * this.clip.length;
+    };
+    /**
+   * @internal
+   */ _proto._getClipActualEndTime = function _getClipActualEndTime() {
+        return this._clipEndTime * this.clip.length;
+    };
     _create_class(AnimatorState, [
         {
             key: "transitions",