@galacean/engine 0.9.13 → 0.9.15

package/dist/browser.js

@@ -25994,8 +25994,6 @@
      * @internal
      */ var AnimationCurveOwner = /*#__PURE__*/ function() {
         function AnimationCurveOwner(target, type, property, cureType) {
-            this.crossCurveMark = 0;
-            this.hasSavedDefaultValue = false;
             this.baseEvaluateData = {
                 curKeyframeIndex: 0,
                 value: null
@@ -26008,7 +26006,7 @@
             this.type = type;
             this.property = property;
             this.component = target.getComponent(type);
-            this._cureType = cureType;
+            this.cureType = cureType;
             var assemblerType = AnimationCurveOwner.getAssemblerType(type, property);
             this._assembler = new assemblerType();
             this._assembler.initialize(this);
@@ -26017,89 +26015,80 @@
             }
         }
         var _proto = AnimationCurveOwner.prototype;
-        _proto.evaluateAndApplyValue = function evaluateAndApplyValue(curve, time, layerWeight, additive) {
-            if (curve.keys.length) {
-                if (additive) {
-                    var value = curve._evaluateAdditive(time, this.baseEvaluateData);
-                    var cureType = this._cureType;
-                    if (cureType._isReferenceType) {
-                        cureType._additiveValue(value, layerWeight, this.referenceTargetValue);
-                    } else {
-                        var assembler = this._assembler;
-                        var originValue = assembler.getTargetValue();
-                        var additiveValue = cureType._additiveValue(value, layerWeight, originValue);
-                        assembler.setTargetValue(additiveValue);
-                    }
-                } else {
-                    var value1 = curve._evaluate(time, this.baseEvaluateData);
-                    this._applyValue(value1, layerWeight);
-                }
-            }
+        _proto.evaluateValue = function evaluateValue(curve, time, additive) {
+            return additive ? curve._evaluateAdditive(time, this.baseEvaluateData) : curve._evaluate(time, this.baseEvaluateData);
         };
-        _proto.crossFadeAndApplyValue = function crossFadeAndApplyValue(srcCurve, destCurve, srcTime, destTime, crossWeight, layerWeight, additive) {
-            var srcValue = srcCurve && srcCurve.keys.length ? additive ? srcCurve._evaluateAdditive(srcTime, this.baseEvaluateData) : srcCurve._evaluate(srcTime, this.baseEvaluateData) : additive ? this._cureType._getZeroValue(this.baseEvaluateData.value) : this.defaultValue;
-            var destValue = destCurve && destCurve.keys.length ? additive ? destCurve._evaluateAdditive(destTime, this.crossEvaluateData) : destCurve._evaluate(destTime, this.crossEvaluateData) : additive ? this._cureType._getZeroValue(this.crossEvaluateData.value) : this.defaultValue;
-            this._applyCrossValue(srcValue, destValue, crossWeight, layerWeight, additive);
+        _proto.evaluateCrossFadeValue = function evaluateCrossFadeValue(srcCurve, destCurve, srcTime, destTime, crossWeight, additive) {
+            var srcValue = srcCurve && srcCurve.keys.length ? additive ? srcCurve._evaluateAdditive(srcTime, this.baseEvaluateData) : srcCurve._evaluate(srcTime, this.baseEvaluateData) : additive ? this.cureType._getZeroValue(this.baseEvaluateData.value) : this.defaultValue;
+            var destValue = destCurve && destCurve.keys.length ? additive ? destCurve._evaluateAdditive(destTime, this.crossEvaluateData) : destCurve._evaluate(destTime, this.crossEvaluateData) : additive ? this.cureType._getZeroValue(this.crossEvaluateData.value) : this.defaultValue;
+            return this._lerpValue(srcValue, destValue, crossWeight);
         };
-        _proto.crossFadeFromPoseAndApplyValue = function crossFadeFromPoseAndApplyValue(destCurve, destTime, crossWeight, layerWeight, additive) {
-            var srcValue = additive ? this._cureType._subtractValue(this.fixedPoseValue, this.defaultValue, this.baseEvaluateData.value) : this.fixedPoseValue;
-            var destValue = destCurve && destCurve.keys.length ? additive ? destCurve._evaluateAdditive(destTime, this.crossEvaluateData) : destCurve._evaluate(destTime, this.crossEvaluateData) : additive ? this._cureType._getZeroValue(this.crossEvaluateData.value) : this.defaultValue;
-            this._applyCrossValue(srcValue, destValue, crossWeight, layerWeight, additive);
+        _proto.crossFadeFromPoseAndApplyValue = function crossFadeFromPoseAndApplyValue(destCurve, destTime, crossWeight, additive) {
+            var srcValue = additive ? this.cureType._subtractValue(this.fixedPoseValue, this.defaultValue, this.baseEvaluateData.value) : this.fixedPoseValue;
+            var destValue = destCurve && destCurve.keys.length ? additive ? destCurve._evaluateAdditive(destTime, this.crossEvaluateData) : destCurve._evaluate(destTime, this.crossEvaluateData) : additive ? this.cureType._getZeroValue(this.crossEvaluateData.value) : this.defaultValue;
+            return this._lerpValue(srcValue, destValue, crossWeight);
         };
         _proto.revertDefaultValue = function revertDefaultValue() {
             this._assembler.setTargetValue(this.defaultValue);
         };
+        _proto.getEvaluateValue = function getEvaluateValue(out) {
+            if (this.cureType._isReferenceType) {
+                this.cureType._copyValue(this.baseEvaluateData.value, out);
+                return out;
+            } else {
+                return this.baseEvaluateData.value;
+            }
+        };
         _proto.saveDefaultValue = function saveDefaultValue() {
-            if (this._cureType._isReferenceType) {
-                this._cureType._copyValue(this.referenceTargetValue, this.defaultValue);
+            if (this.cureType._isReferenceType) {
+                this.cureType._copyValue(this.referenceTargetValue, this.defaultValue);
             } else {
                 this.defaultValue = this._assembler.getTargetValue();
             }
-            this.hasSavedDefaultValue = true;
         };
         _proto.saveFixedPoseValue = function saveFixedPoseValue() {
-            if (this._cureType._isReferenceType) {
-                this._cureType._copyValue(this.referenceTargetValue, this.fixedPoseValue);
+            if (this.cureType._isReferenceType) {
+                this.cureType._copyValue(this.referenceTargetValue, this.fixedPoseValue);
             } else {
                 this.fixedPoseValue = this._assembler.getTargetValue();
             }
         };
-        _proto._applyValue = function _applyValue(value, weight) {
-            if (weight === 1.0) {
-                if (this._cureType._isReferenceType) {
-                    this._cureType._copyValue(value, this.referenceTargetValue);
+        _proto.applyValue = function applyValue(value, weight, additive) {
+            var cureType = this.cureType;
+            if (additive) {
+                if (cureType._isReferenceType) {
+                    cureType._additiveValue(value, weight, this.referenceTargetValue);
                 } else {
-                    this._assembler.setTargetValue(value);
+                    var assembler = this._assembler;
+                    var originValue = assembler.getTargetValue();
+                    var additiveValue = cureType._additiveValue(value, weight, originValue);
+                    assembler.setTargetValue(additiveValue);
                 }
             } else {
-                if (this._cureType._isReferenceType) {
-                    var targetValue = this.referenceTargetValue;
-                    this._cureType._lerpValue(targetValue, value, weight, targetValue);
+                if (weight === 1.0) {
+                    if (cureType._isReferenceType) {
+                        cureType._copyValue(value, this.referenceTargetValue);
+                    } else {
+                        this._assembler.setTargetValue(value);
+                    }
                 } else {
-                    var originValue = this._assembler.getTargetValue();
-                    var lerpValue = this._cureType._lerpValue(originValue, value, weight);
-                    this._assembler.setTargetValue(lerpValue);
+                    if (cureType._isReferenceType) {
+                        var targetValue = this.referenceTargetValue;
+                        cureType._lerpValue(targetValue, value, weight, targetValue);
+                    } else {
+                        var originValue1 = this._assembler.getTargetValue();
+                        var lerpValue = cureType._lerpValue(originValue1, value, weight);
+                        this._assembler.setTargetValue(lerpValue);
+                    }
                 }
             }
         };
-        _proto._applyCrossValue = function _applyCrossValue(srcValue, destValue, crossWeight, layerWeight, additive) {
-            var out;
-            if (this._cureType._isReferenceType) {
-                out = this.baseEvaluateData.value;
-                this._cureType._lerpValue(srcValue, destValue, crossWeight, out);
-            } else {
-                out = this._cureType._lerpValue(srcValue, destValue, crossWeight);
-            }
-            if (additive) {
-                if (this._cureType._isReferenceType) {
-                    this._cureType._additiveValue(out, layerWeight, this.referenceTargetValue);
-                } else {
-                    var originValue = this._assembler.getTargetValue();
-                    var lerpValue = this._cureType._additiveValue(out, layerWeight, originValue);
-                    this._assembler.setTargetValue(lerpValue);
-                }
+        _proto._lerpValue = function _lerpValue(srcValue, destValue, crossWeight) {
+            if (this.cureType._isReferenceType) {
+                return this.cureType._lerpValue(srcValue, destValue, crossWeight, this.baseEvaluateData.value);
             } else {
-                this._applyValue(out, layerWeight);
+                this.baseEvaluateData.value = this.cureType._lerpValue(srcValue, destValue, crossWeight);
+                return this.baseEvaluateData.value;
             }
         };
         AnimationCurveOwner.registerAssembler = function registerAssembler(componentType, property, assemblerType) {
@@ -26188,6 +26177,26 @@
         return BlendShapeWeightsAnimationCurveOwnerAssembler;
     }();
     AnimationCurveOwner.registerAssembler(SkinnedMeshRenderer, "blendShapeWeights", BlendShapeWeightsAnimationCurveOwnerAssembler);
+    /**
+     * @internal
+     */ var AnimationCurveLayerOwner = /*#__PURE__*/ function() {
+        var AnimationCurveLayerOwner = function AnimationCurveLayerOwner() {
+            this.crossCurveMark = 0;
+        };
+        var _proto = AnimationCurveLayerOwner.prototype;
+        _proto.initFinalValue = function initFinalValue() {
+            var _this_curveOwner = this.curveOwner, cureType = _this_curveOwner.cureType, defaultValue = _this_curveOwner.defaultValue;
+            if (cureType._isReferenceType) {
+                cureType._copyValue(defaultValue, this.finalValue);
+            } else {
+                this.finalValue = defaultValue;
+            }
+        };
+        _proto.saveFinalValue = function saveFinalValue() {
+            this.finalValue = this.curveOwner.getEvaluateValue(this.finalValue);
+        };
+        return AnimationCurveLayerOwner;
+    }();
     /**
      * Associate AnimationCurve and the Entity
      */ var AnimationClipCurveBinding = /*#__PURE__*/ function() {
@@ -26201,10 +26210,22 @@
             var curveType = this.curve.constructor;
             var owner = new AnimationCurveOwner(entity, this.type, this.property, curveType);
             curveType._initializeOwner(owner);
+            owner.saveDefaultValue();
             return owner;
         };
         /**
        * @internal
+       */ _proto._createCurveLayerOwner = function _createCurveLayerOwner(owner) {
+            var curveType = this.curve.constructor;
+            var layerOwner = new AnimationCurveLayerOwner();
+            layerOwner.curveOwner = owner;
+            curveType._initializeLayerOwner(layerOwner);
+            // If curve.keys.length is 0, updateFinishedState will assign 0 to the target, causing an error, so initialize by assigning defaultValue to finalValue.
+            layerOwner.initFinalValue();
+            return layerOwner;
+        };
+        /**
+       * @internal
        */ _proto._getTempCurveOwner = function _getTempCurveOwner(entity) {
             var instanceId = entity.instanceId;
             if (!this._tempCurveOwner[instanceId]) {
@@ -26281,7 +26302,8 @@
                 var targetEntity = entity.findByPath(curveData.relativePath);
                 if (targetEntity) {
                     var curveOwner = curveData._getTempCurveOwner(targetEntity);
-                    curveOwner.evaluateAndApplyValue(curveData.curve, time, 1, false);
+                    var value = curveOwner.evaluateValue(curveData.curve, time, false);
+                    curveOwner.applyValue(value, 1, false);
                 }
             }
         };
@@ -26423,6 +26445,7 @@
                         break;
                 }
             }
+            evaluateData.value = value;
             return value;
         };
         /**
@@ -26478,6 +26501,11 @@
         };
         /**
        * @internal
+       */ AnimationArrayCurve._initializeLayerOwner = function _initializeLayerOwner(owner) {
+            owner.finalValue = [];
+        };
+        /**
+       * @internal
        */ AnimationArrayCurve._lerpValue = function _lerpValue(srcValue, destValue, weight, out) {
             for(var i = 0, n = out.length; i < n; ++i){
                 var src = srcValue[i];
@@ -26567,6 +26595,11 @@
         };
         /**
        * @internal
+       */ AnimationBoolCurve._initializeLayerOwner = function _initializeLayerOwner(owner) {
+            owner.finalValue = false;
+        };
+        /**
+       * @internal
        */ AnimationBoolCurve._lerpValue = function _lerpValue(srcValue, destValue) {
             return destValue;
         };
@@ -26623,6 +26656,11 @@
         };
         /**
        * @internal
+       */ AnimationColorCurve._initializeLayerOwner = function _initializeLayerOwner(owner) {
+            owner.finalValue = new Color$1();
+        };
+        /**
+       * @internal
        */ AnimationColorCurve._lerpValue = function _lerpValue(srcValue, destValue, weight, out) {
             Color$1.lerp(srcValue, destValue, weight, out);
             return out;
@@ -26729,6 +26767,12 @@
         };
         /**
        * @internal
+       */ AnimationFloatArrayCurve._initializeLayerOwner = function _initializeLayerOwner(owner) {
+            var size = owner.curveOwner.referenceTargetValue.length;
+            owner.finalValue = new Float32Array(size);
+        };
+        /**
+       * @internal
        */ AnimationFloatArrayCurve._lerpValue = function _lerpValue(srcValue, destValue, weight, out) {
             for(var i = 0, n = out.length; i < n; ++i){
                 var src = srcValue[i];
@@ -26818,6 +26862,11 @@
         };
         /**
        * @internal
+       */ AnimationFloatCurve._initializeLayerOwner = function _initializeLayerOwner(owner) {
+            owner.finalValue = 0;
+        };
+        /**
+       * @internal
        */ AnimationFloatCurve._lerpValue = function _lerpValue(srcValue, destValue, crossWeight) {
             return srcValue + (destValue - srcValue) * crossWeight;
         };
@@ -26886,6 +26935,11 @@
         };
         /**
        * @internal
+       */ AnimationQuaternionCurve1._initializeLayerOwner = function _initializeLayerOwner(owner) {
+            owner.finalValue = new Quaternion();
+        };
+        /**
+       * @internal
        */ AnimationQuaternionCurve1._lerpValue = function _lerpValue(src, dest, weight, out) {
             Quaternion.slerp(src, dest, weight, out);
             return out;
@@ -26989,6 +27043,11 @@
         };
         /**
        * @internal
+       */ AnimationVector2Curve._initializeLayerOwner = function _initializeLayerOwner(owner) {
+            owner.finalValue = new Vector2();
+        };
+        /**
+       * @internal
        */ AnimationVector2Curve._lerpValue = function _lerpValue(srcValue, destValue, weight, out) {
             Vector2.lerp(srcValue, destValue, weight, out);
             return out;
@@ -27073,6 +27132,11 @@
         };
         /**
        * @internal
+       */ AnimationVector3Curve._initializeLayerOwner = function _initializeLayerOwner(owner) {
+            owner.finalValue = new Vector3();
+        };
+        /**
+       * @internal
        */ AnimationVector3Curve._lerpValue = function _lerpValue(srcValue, destValue, weight, out) {
             Vector3.lerp(srcValue, destValue, weight, out);
             return out;
@@ -27169,6 +27233,11 @@
         };
         /**
        * @internal
+       */ AnimationVector4Curve._initializeLayerOwner = function _initializeLayerOwner(owner) {
+            owner.finalValue = new Vector4();
+        };
+        /**
+       * @internal
        */ AnimationVector4Curve._lerpValue = function _lerpValue(srcValue, destValue, weight, out) {
             Vector4.lerp(srcValue, destValue, weight, out);
             return out;
@@ -27274,6 +27343,7 @@
         LayerState[LayerState[/** Playing state. */ "Playing"] = 1] = "Playing";
         LayerState[LayerState[/** CrossFading state. */ "CrossFading"] = 2] = "CrossFading";
         LayerState[LayerState[/** FixedCrossFading state. */ "FixedCrossFading"] = 3] = "FixedCrossFading";
+        LayerState[LayerState[/** Finished state. */ "Finished"] = 4] = "Finished";
     })(LayerState || (LayerState = {}));
     /**
      * @internal
@@ -27340,12 +27410,14 @@
      * @internal
      */ var AnimatorLayerData = /*#__PURE__*/ function() {
         var AnimatorLayerData = function AnimatorLayerData() {
+            this.curveOwnerPool = Object.create(null);
             this.animatorStateDataMap = {};
             this.srcPlayData = new AnimatorStatePlayData();
             this.destPlayData = new AnimatorStatePlayData();
             this.layerState = LayerState.Standby;
             this.crossCurveMark = 0;
             this.manuallyTransition = new AnimatorStateTransition();
+            this.crossLayerOwnerCollection = [];
         };
         var _proto = AnimatorLayerData.prototype;
         _proto.switchPlayData = function switchPlayData() {
@@ -27359,7 +27431,7 @@
     /**
      * @internal
      */ var AnimatorStateData = function AnimatorStateData() {
-        this.curveOwners = [];
+        this.curveLayerOwner = [];
         this.eventHandlers = [];
     };
     /**
@@ -27371,8 +27443,8 @@
             /** Culling mode of this Animator. */ _this.cullingMode = exports.AnimatorCullingMode.None;
             /** The playback speed of the Animator, 1.0 is normal playback speed. */ _this.speed = 1.0;
             _this._animatorLayersData = [];
-            _this._crossOwnerCollection = [];
-            _this._animationCurveOwners = [];
+            _this._curveOwnerPool = Object.create(null);
+            _this._needRevertCurveOwners = [];
             _this._animationEventHandlerPool = new ClassPool(AnimationEventHandler);
             _this._tempAnimatorStateInfo = {
                 layerIndex: -1,
@@ -27396,7 +27468,7 @@
                 this._reset();
             }
             var stateInfo = this._getAnimatorStateInfo(stateName, layerIndex);
-            var state = stateInfo.state;
+            var state = stateInfo.state, playLayerIndex = stateInfo.layerIndex;
             if (!state) {
                 return;
             }
@@ -27405,9 +27477,8 @@
                 return;
             }
             var animatorLayerData = this._getAnimatorLayerData(stateInfo.layerIndex);
-            //TODO CM: Not consider same stateName, but different animation
-            var animatorStateData = this._getAnimatorStateData(stateName, state, animatorLayerData);
-            this._preparePlay(animatorLayerData, state, animatorStateData);
+            var animatorStateData = this._getAnimatorStateData(stateName, state, animatorLayerData, playLayerIndex);
+            this._preparePlay(animatorLayerData, state);
             animatorLayerData.layerState = LayerState.Playing;
             animatorLayerData.srcPlayData.reset(state, animatorStateData, state._getDuration() * normalizedTimeOffset);
         };
@@ -27458,6 +27529,7 @@
                 return;
             }
             deltaTime *= this.speed;
+            this._revertCurveOwners();
             for(var i1 = 0, n1 = animatorController.layers.length; i1 < n1; i1++){
                 var animatorLayerData = this._getAnimatorLayerData(i1);
                 if (animatorLayerData.layerState === LayerState.Standby) {
@@ -27498,17 +27570,17 @@
         /**
        * @internal
        */ _proto._reset = function _reset() {
-            var _this = this, animationCurveOwners = _this._animationCurveOwners;
+            var _this = this, animationCurveOwners = _this._curveOwnerPool;
             for(var instanceId in animationCurveOwners){
                 var propertyOwners = animationCurveOwners[instanceId];
                 for(var property in propertyOwners){
                     var owner = propertyOwners[property];
-                    owner.hasSavedDefaultValue && owner.revertDefaultValue();
+                    owner.revertDefaultValue();
                 }
             }
             this._animatorLayersData.length = 0;
-            this._crossOwnerCollection.length = 0;
-            this._animationCurveOwners.length = 0;
+            this._needRevertCurveOwners.length = 0;
+            this._curveOwnerPool = {};
             this._animationEventHandlerPool.resetPool();
             if (this._controllerUpdateFlag) {
                 this._controllerUpdateFlag.flag = false;
@@ -27535,38 +27607,51 @@
             stateInfo.state = state;
             return stateInfo;
         };
-        _proto._saveDefaultValues = function _saveDefaultValues(stateData) {
-            var curveOwners = stateData.curveOwners;
-            for(var i = curveOwners.length - 1; i >= 0; i--){
-                var _curveOwners_i;
-                (_curveOwners_i = curveOwners[i]) == null ? void 0 : _curveOwners_i.saveDefaultValue();
-            }
-        };
-        _proto._getAnimatorStateData = function _getAnimatorStateData(stateName, animatorState, animatorLayerData) {
+        _proto._getAnimatorStateData = function _getAnimatorStateData(stateName, animatorState, animatorLayerData, layerIndex) {
             var animatorStateDataMap = animatorLayerData.animatorStateDataMap;
             var animatorStateData = animatorStateDataMap[stateName];
             if (!animatorStateData) {
                 animatorStateData = new AnimatorStateData();
                 animatorStateDataMap[stateName] = animatorStateData;
-                this._saveAnimatorStateData(animatorState, animatorStateData);
+                this._saveAnimatorStateData(animatorState, animatorStateData, animatorLayerData, layerIndex);
                 this._saveAnimatorEventHandlers(animatorState, animatorStateData);
             }
             return animatorStateData;
         };
-        _proto._saveAnimatorStateData = function _saveAnimatorStateData(animatorState, animatorStateData) {
-            var _this = this, entity = _this.entity, animationCureOwners = _this._animationCurveOwners;
-            var curveOwners = animatorStateData.curveOwners;
+        _proto._saveAnimatorStateData = function _saveAnimatorStateData(animatorState, animatorStateData, animatorLayerData, layerIndex) {
+            var _this = this, entity = _this.entity, curveOwnerPool = _this._curveOwnerPool;
+            var curveLayerOwner = animatorStateData.curveLayerOwner;
+            var layerCurveOwnerPool = animatorLayerData.curveOwnerPool;
             var _animatorState_clip = animatorState.clip, curves = _animatorState_clip._curveBindings;
             for(var i = curves.length - 1; i >= 0; i--){
                 var curve = curves[i];
                 var targetEntity = curve.relativePath === "" ? entity : entity.findByPath(curve.relativePath);
                 if (targetEntity) {
+                    var _curveOwnerPool, _instanceId, _propertyOwners, _property, _layerCurveOwnerPool, _instanceId1, _layerPropertyOwners, _property1;
                     var property = curve.property;
                     var instanceId = targetEntity.instanceId;
-                    var propertyOwners = animationCureOwners[instanceId] || (animationCureOwners[instanceId] = {});
-                    curveOwners[i] = propertyOwners[property] || (propertyOwners[property] = curve._createCurveOwner(targetEntity));
+                    var needRevert = false;
+                    var baseAnimatorLayerData = this._animatorLayersData[0];
+                    var baseLayerCurveOwnerPool = baseAnimatorLayerData.curveOwnerPool;
+                    if (this.animatorController.layers[layerIndex].blendingMode === exports.AnimatorLayerBlendingMode.Additive && layerIndex > 0 && !(baseLayerCurveOwnerPool[instanceId] && baseLayerCurveOwnerPool[instanceId][property])) {
+                        needRevert = true;
+                    }
+                    // Get owner
+                    var propertyOwners = (_curveOwnerPool = curveOwnerPool)[_instanceId = instanceId] || (_curveOwnerPool[_instanceId] = Object.create(null));
+                    var owner = (_propertyOwners = propertyOwners)[_property = property] || (_propertyOwners[_property] = curve._createCurveOwner(targetEntity));
+                    //@todo: There is performance waste here, which will be handled together with organizing AnimatorStateData later. The logic is changing from runtime to initialization.
+                    if (needRevert) {
+                        this._needRevertCurveOwners.push(owner);
+                    } else {
+                        var index = this._needRevertCurveOwners.indexOf(owner);
+                        index > -1 && this._needRevertCurveOwners.splice(index, 1);
+                    }
+                    // Get layer owner
+                    var layerPropertyOwners = (_layerCurveOwnerPool = layerCurveOwnerPool)[_instanceId1 = instanceId] || (_layerCurveOwnerPool[_instanceId1] = Object.create(null));
+                    var layerOwner = (_layerPropertyOwners = layerPropertyOwners)[_property1 = property] || (_layerPropertyOwners[_property1] = curve._createCurveLayerOwner(owner));
+                    curveLayerOwner[i] = layerOwner;
                 } else {
-                    curveOwners[i] = null;
+                    curveLayerOwner[i] = null;
                     console.warn("The entity don't have the child entity which path is " + curve.relativePath + ".");
                 }
             }
@@ -27594,65 +27679,60 @@
         };
         _proto._clearCrossData = function _clearCrossData(animatorLayerData) {
             animatorLayerData.crossCurveMark++;
-            this._crossOwnerCollection.length = 0;
+            animatorLayerData.crossLayerOwnerCollection.length = 0;
         };
-        _proto._addCrossCurveData = function _addCrossCurveData(crossCurveData, owner, curCurveIndex, nextCurveIndex) {
-            owner.crossSrcCurveIndex = curCurveIndex;
-            owner.crossDestCurveIndex = nextCurveIndex;
-            crossCurveData.push(owner);
+        _proto._addCrossOwner = function _addCrossOwner(animatorLayerData, layerOwner, curCurveIndex, nextCurveIndex) {
+            layerOwner.crossSrcCurveIndex = curCurveIndex;
+            layerOwner.crossDestCurveIndex = nextCurveIndex;
+            animatorLayerData.crossLayerOwnerCollection.push(layerOwner);
         };
         _proto._prepareCrossFading = function _prepareCrossFading(animatorLayerData) {
-            var crossCurveData = this._crossOwnerCollection;
-            var crossCurveMark = animatorLayerData.crossCurveMark;
             // Add src cross curve data.
-            this._prepareSrcCrossData(crossCurveData, animatorLayerData.srcPlayData, crossCurveMark, false);
+            this._prepareSrcCrossData(animatorLayerData, false);
             // Add dest cross curve data.
-            this._prepareDestCrossData(crossCurveData, animatorLayerData.destPlayData, crossCurveMark, false);
+            this._prepareDestCrossData(animatorLayerData, false);
         };
         _proto._prepareStandbyCrossFading = function _prepareStandbyCrossFading(animatorLayerData) {
-            var crossOwnerCollection = this._crossOwnerCollection;
-            var srcPlayData = animatorLayerData.srcPlayData, crossCurveMark = animatorLayerData.crossCurveMark;
             // Standby have two sub state, one is never play, one is finished, never play srcPlayData.state is null.
-            srcPlayData.state && this._prepareSrcCrossData(crossOwnerCollection, srcPlayData, crossCurveMark, true);
+            animatorLayerData.srcPlayData.state && this._prepareSrcCrossData(animatorLayerData, true);
             // Add dest cross curve data.
-            this._prepareDestCrossData(crossOwnerCollection, animatorLayerData.destPlayData, crossCurveMark, true);
+            this._prepareDestCrossData(animatorLayerData, true);
         };
         _proto._prepareFixedPoseCrossFading = function _prepareFixedPoseCrossFading(animatorLayerData) {
-            var crossOwnerCollection = this._crossOwnerCollection;
+            var crossLayerOwnerCollection = animatorLayerData.crossLayerOwnerCollection;
             // Save current cross curve data owner fixed pose.
-            for(var i = crossOwnerCollection.length - 1; i >= 0; i--){
-                var item = crossOwnerCollection[i];
-                item.saveFixedPoseValue();
+            for(var i = crossLayerOwnerCollection.length - 1; i >= 0; i--){
+                var layerOwner = crossLayerOwnerCollection[i];
+                if (!layerOwner) continue;
+                layerOwner.curveOwner.saveFixedPoseValue();
                 // Reset destCurveIndex When fixed pose crossFading again.
-                item.crossDestCurveIndex = -1;
+                layerOwner.crossDestCurveIndex = -1;
             }
             // prepare dest AnimatorState cross data.
-            this._prepareDestCrossData(crossOwnerCollection, animatorLayerData.destPlayData, animatorLayerData.crossCurveMark, true);
-        };
-        _proto._prepareSrcCrossData = function _prepareSrcCrossData(crossCurveData, srcPlayData, crossCurveMark, saveFixed) {
-            var curveOwners = srcPlayData.stateData.curveOwners;
-            for(var i = curveOwners.length - 1; i >= 0; i--){
-                var owner = curveOwners[i];
-                if (!owner) continue;
-                owner.crossCurveMark = crossCurveMark;
-                owner.crossCurveDataIndex = crossCurveData.length;
-                saveFixed && owner.saveFixedPoseValue();
-                this._addCrossCurveData(crossCurveData, owner, i, -1);
-            }
-        };
-        _proto._prepareDestCrossData = function _prepareDestCrossData(crossCurveData, destPlayData, crossCurveMark, saveFixed) {
-            var curveOwners = destPlayData.stateData.curveOwners;
-            for(var i = curveOwners.length - 1; i >= 0; i--){
-                var owner = curveOwners[i];
-                if (!owner) continue;
-                if (owner.crossCurveMark === crossCurveMark) {
-                    crossCurveData[owner.crossCurveDataIndex].crossDestCurveIndex = i;
+            this._prepareDestCrossData(animatorLayerData, true);
+        };
+        _proto._prepareSrcCrossData = function _prepareSrcCrossData(animatorLayerData, saveFixed) {
+            var curveLayerOwner = animatorLayerData.srcPlayData.stateData.curveLayerOwner;
+            for(var i = curveLayerOwner.length - 1; i >= 0; i--){
+                var layerOwner = curveLayerOwner[i];
+                if (!layerOwner) continue;
+                layerOwner.crossCurveMark = animatorLayerData.crossCurveMark;
+                saveFixed && layerOwner.curveOwner.saveFixedPoseValue();
+                this._addCrossOwner(animatorLayerData, layerOwner, i, -1);
+            }
+        };
+        _proto._prepareDestCrossData = function _prepareDestCrossData(animatorLayerData, saveFixed) {
+            var curveLayerOwner = animatorLayerData.destPlayData.stateData.curveLayerOwner;
+            for(var i = curveLayerOwner.length - 1; i >= 0; i--){
+                var layerOwner = curveLayerOwner[i];
+                if (!layerOwner) continue;
+                if (layerOwner.crossCurveMark === animatorLayerData.crossCurveMark) {
+                    layerOwner.crossDestCurveIndex = i;
                 } else {
-                    owner.saveDefaultValue();
+                    var owner = layerOwner.curveOwner;
                     saveFixed && owner.saveFixedPoseValue();
-                    owner.crossCurveMark = crossCurveMark;
-                    owner.crossCurveDataIndex = crossCurveData.length;
-                    this._addCrossCurveData(crossCurveData, owner, -1, i);
+                    layerOwner.crossCurveMark = animatorLayerData.crossCurveMark;
+                    this._addCrossOwner(animatorLayerData, layerOwner, -1, i);
                 }
             }
         };
@@ -27667,7 +27747,7 @@
             var srcPlayData = layerData.srcPlayData, destPlayData = layerData.destPlayData, crossFadeTransitionInfo = layerData.crossFadeTransition;
             var additive = blendingMode === exports.AnimatorLayerBlendingMode.Additive;
             firstLayer && (weight = 1.0);
-            //TODO: 任意情况都应该检查，后面要优化
+            //@todo: All situations should be checked, optimizations will follow later.
             layerData.layerState !== LayerState.FixedCrossFading && this._checkTransition(srcPlayData, crossFadeTransitionInfo, layerIndex);
             switch(layerData.layerState){
                 case LayerState.Playing:
@@ -27679,26 +27759,36 @@
                 case LayerState.CrossFading:
                     this._updateCrossFade(srcPlayData, destPlayData, layerData, layerIndex, weight, deltaTime, additive, aniUpdate);
                     break;
+                case LayerState.Finished:
+                    this._updateFinishedState(srcPlayData, weight, additive, aniUpdate);
+                    break;
             }
         };
         _proto._updatePlayingState = function _updatePlayingState(playData, layerData, layerIndex, weight, delta, additive, aniUpdate) {
-            var _playData_stateData = playData.stateData, curveOwners = _playData_stateData.curveOwners, eventHandlers = _playData_stateData.eventHandlers;
+            var _playData_stateData = playData.stateData, curveLayerOwner = _playData_stateData.curveLayerOwner, eventHandlers = _playData_stateData.eventHandlers;
             var state = playData.state, lastPlayState = playData.playState, lastClipTime = playData.clipTime;
             var _state_clip = state.clip, curveBindings = _state_clip._curveBindings;
             playData.update(this.speed < 0);
-            if (!aniUpdate) {
-                return;
-            }
             var clipTime = playData.clipTime, playState = playData.playState;
-            eventHandlers.length && this._fireAnimationEvents(playData, eventHandlers, lastClipTime, clipTime);
-            for(var i = curveBindings.length - 1; i >= 0; i--){
-                var owner = curveOwners[i];
-                owner == null ? void 0 : owner.evaluateAndApplyValue(curveBindings[i].curve, clipTime, weight, additive);
+            var finished = playState === AnimatorStatePlayState.Finished;
+            if (aniUpdate || finished) {
+                for(var i = curveBindings.length - 1; i >= 0; i--){
+                    var layerOwner = curveLayerOwner[i];
+                    var owner = layerOwner == null ? void 0 : layerOwner.curveOwner;
+                    if (!owner) continue;
+                    var curve = curveBindings[i].curve;
+                    if (curve.keys.length) {
+                        var value = owner.evaluateValue(curve, clipTime, additive);
+                        aniUpdate && owner.applyValue(value, weight, additive);
+                        finished && layerOwner.saveFinalValue();
+                    }
+                }
             }
             playData.frameTime += state.speed * delta;
             if (playState === AnimatorStatePlayState.Finished) {
-                layerData.layerState = LayerState.Standby;
+                layerData.layerState = LayerState.Finished;
             }
+            eventHandlers.length && this._fireAnimationEvents(playData, eventHandlers, lastClipTime, clipTime);
             if (lastPlayState === AnimatorStatePlayState.UnStarted) {
                 this._callAnimatorScriptOnEnter(state, layerIndex);
             }
@@ -27709,7 +27799,7 @@
             }
         };
         _proto._updateCrossFade = function _updateCrossFade(srcPlayData, destPlayData, layerData, layerIndex, weight, delta, additive, aniUpdate) {
-            var _this = this, crossCurveDataCollection = _this._crossOwnerCollection;
+            var crossLayerOwnerCollection = layerData.crossLayerOwnerCollection;
             var _srcPlayData_state_clip = srcPlayData.state.clip, srcCurves = _srcPlayData_state_clip._curveBindings;
             var srcState = srcPlayData.state, srcStateData = srcPlayData.stateData, lastSrcPlayState = srcPlayData.playState;
             var srcEventHandlers = srcStateData.eventHandlers;
@@ -27718,18 +27808,27 @@
             var _destState_clip = destState.clip, destCurves = _destState_clip._curveBindings;
             var lastSrcClipTime = srcPlayData.clipTime;
             var lastDestClipTime = destPlayData.clipTime;
-            var crossWeight = Math.abs(destPlayData.frameTime) / (destState._getDuration() * layerData.crossFadeTransition.duration);
-            crossWeight >= 1.0 && (crossWeight = 1.0);
+            var duration = destState._getDuration() * layerData.crossFadeTransition.duration;
+            var crossWeight = Math.abs(destPlayData.frameTime) / duration;
+            (crossWeight >= 1.0 || duration === 0) && (crossWeight = 1.0);
             srcPlayData.update(this.speed < 0);
             destPlayData.update(this.speed < 0);
-            var srcPlayState = srcPlayData.playState;
-            var destPlayState = destPlayData.playState;
-            this._updateCrossFadeData(layerData, crossWeight, delta, false);
-            if (!aniUpdate) {
-                return;
+            var srcClipTime = srcPlayData.clipTime, srcPlayState = srcPlayData.playState;
+            var destClipTime = destPlayData.clipTime, destPlayState = destPlayData.playState;
+            var finished = destPlayData.playState === AnimatorStatePlayState.Finished;
+            if (aniUpdate || finished) {
+                for(var i = crossLayerOwnerCollection.length - 1; i >= 0; i--){
+                    var layerOwner = crossLayerOwnerCollection[i];
+                    var owner = layerOwner == null ? void 0 : layerOwner.curveOwner;
+                    if (!owner) continue;
+                    var srcCurveIndex = layerOwner.crossSrcCurveIndex;
+                    var destCurveIndex = layerOwner.crossDestCurveIndex;
+                    var value = owner.evaluateCrossFadeValue(srcCurveIndex >= 0 ? srcCurves[srcCurveIndex].curve : null, destCurveIndex >= 0 ? destCurves[destCurveIndex].curve : null, srcClipTime, destClipTime, crossWeight, additive);
+                    aniUpdate && owner.applyValue(value, weight, additive);
+                    finished && layerOwner.saveFinalValue();
+                }
             }
-            var srcClipTime = srcPlayData.clipTime;
-            var destClipTime = destPlayData.clipTime;
+            this._updateCrossFadeData(layerData, crossWeight, delta, false);
             srcEventHandlers.length && this._fireAnimationEvents(srcPlayData, srcEventHandlers, lastSrcClipTime, srcClipTime);
             destEventHandlers.length && this._fireAnimationEvents(destPlayData, destEventHandlers, lastDestClipTime, destClipTime);
             if (lastSrcPlayState === AnimatorStatePlayState.UnStarted) {
@@ -27748,28 +27847,34 @@
             } else {
                 this._callAnimatorScriptOnUpdate(destState, layerIndex);
             }
-            for(var i = crossCurveDataCollection.length - 1; i >= 0; i--){
-                var crossCurveData = crossCurveDataCollection[i];
-                var crossSrcCurveIndex = crossCurveData.crossSrcCurveIndex, crossDestCurveIndex = crossCurveData.crossDestCurveIndex;
-                crossCurveData.crossFadeAndApplyValue(crossSrcCurveIndex >= 0 ? srcCurves[crossSrcCurveIndex].curve : null, crossDestCurveIndex >= 0 ? destCurves[crossDestCurveIndex].curve : null, srcClipTime, destClipTime, crossWeight, weight, additive);
-            }
         };
-        _proto._updateCrossFadeFromPose = function _updateCrossFadeFromPose(destPlayData, layerData, layerIndex, layerWeight, delta, additive, aniUpdate) {
-            var crossCurveDataCollection = this._crossOwnerCollection;
+        _proto._updateCrossFadeFromPose = function _updateCrossFadeFromPose(destPlayData, layerData, layerIndex, weight, delta, additive, aniUpdate) {
+            var crossLayerOwnerCollection = layerData.crossLayerOwnerCollection;
             var state = destPlayData.state, stateData = destPlayData.stateData, lastPlayState = destPlayData.playState;
             var eventHandlers = stateData.eventHandlers;
             var _state_clip = state.clip, curveBindings = _state_clip._curveBindings;
             var lastDestClipTime = destPlayData.clipTime;
-            var crossWeight = Math.abs(destPlayData.frameTime) / (state._getDuration() * layerData.crossFadeTransition.duration);
-            crossWeight >= 1.0 && (crossWeight = 1.0);
+            var duration = state._getDuration() * layerData.crossFadeTransition.duration;
+            var crossWeight = Math.abs(destPlayData.frameTime) / duration;
+            (crossWeight >= 1.0 || duration === 0) && (crossWeight = 1.0);
             destPlayData.update(this.speed < 0);
             var playState = destPlayData.playState;
             this._updateCrossFadeData(layerData, crossWeight, delta, true);
-            if (!aniUpdate) {
-                return;
-            }
             var destClipTime = destPlayData.clipTime;
-            //TODO: srcState 少了最新一段时间的判断
+            var finished = playState === AnimatorStatePlayState.Finished;
+            // When the animator is culled (aniUpdate=false), if the play state has finished, the final value needs to be calculated and saved to be applied directly.
+            if (aniUpdate || finished) {
+                for(var i = crossLayerOwnerCollection.length - 1; i >= 0; i--){
+                    var layerOwner = crossLayerOwnerCollection[i];
+                    var owner = layerOwner == null ? void 0 : layerOwner.curveOwner;
+                    if (!owner) continue;
+                    var curveIndex = layerOwner.crossDestCurveIndex;
+                    var value = layerOwner.curveOwner.crossFadeFromPoseAndApplyValue(curveIndex >= 0 ? curveBindings[curveIndex].curve : null, destClipTime, crossWeight, additive);
+                    aniUpdate && owner.applyValue(value, weight, additive);
+                    finished && layerOwner.saveFinalValue();
+                }
+            }
+            //@todo: srcState is missing the judgment of the most recent period."
             eventHandlers.length && this._fireAnimationEvents(destPlayData, eventHandlers, lastDestClipTime, destClipTime);
             if (lastPlayState === AnimatorStatePlayState.UnStarted) {
                 this._callAnimatorScriptOnEnter(state, layerIndex);
@@ -27779,10 +27884,18 @@
             } else {
                 this._callAnimatorScriptOnUpdate(state, layerIndex);
             }
-            for(var i = crossCurveDataCollection.length - 1; i >= 0; i--){
-                var crossCurveData = crossCurveDataCollection[i];
-                var crossDestCurveIndex = crossCurveData.crossDestCurveIndex;
-                crossCurveData.crossFadeFromPoseAndApplyValue(crossDestCurveIndex >= 0 ? curveBindings[crossDestCurveIndex].curve : null, destClipTime, crossWeight, layerWeight, additive);
+        };
+        _proto._updateFinishedState = function _updateFinishedState(playData, weight, additive, aniUpdate) {
+            if (!aniUpdate) {
+                return;
+            }
+            var curveLayerOwner = playData.stateData.curveLayerOwner;
+            var _playData_state_clip = playData.state.clip, curveBindings = _playData_state_clip._curveBindings;
+            for(var i = curveBindings.length - 1; i >= 0; i--){
+                var layerOwner = curveLayerOwner[i];
+                var owner = layerOwner == null ? void 0 : layerOwner.curveOwner;
+                if (!owner) continue;
+                owner.applyValue(layerOwner.finalValue, weight, additive);
             }
         };
         _proto._updateCrossFadeData = function _updateCrossFadeData(layerData, crossWeight, delta, fixed) {
@@ -27790,7 +27903,7 @@
             destPlayData.frameTime += destPlayData.state.speed * delta;
             if (crossWeight === 1.0) {
                 if (destPlayData.playState === AnimatorStatePlayState.Finished) {
-                    layerData.layerState = LayerState.Standby;
+                    layerData.layerState = LayerState.Finished;
                 } else {
                     layerData.layerState = LayerState.Playing;
                 }
@@ -27800,25 +27913,24 @@
                 fixed || (layerData.srcPlayData.frameTime += layerData.srcPlayData.state.speed * delta);
             }
         };
-        _proto._preparePlay = function _preparePlay(layerData, playState, playStateData) {
+        _proto._preparePlay = function _preparePlay(layerData, playState) {
             if (layerData.layerState === LayerState.Playing) {
                 var srcPlayData = layerData.srcPlayData;
                 if (srcPlayData.state !== playState) {
-                    var curveOwners = srcPlayData.stateData.curveOwners;
-                    for(var i = curveOwners.length - 1; i >= 0; i--){
-                        var owner = curveOwners[i];
-                        (owner == null ? void 0 : owner.hasSavedDefaultValue) && owner.revertDefaultValue();
+                    var curveLayerOwner = srcPlayData.stateData.curveLayerOwner;
+                    for(var i = curveLayerOwner.length - 1; i >= 0; i--){
+                        var _curveLayerOwner_i;
+                        var owner = (_curveLayerOwner_i = curveLayerOwner[i]) == null ? void 0 : _curveLayerOwner_i.curveOwner;
+                        owner.revertDefaultValue();
                     }
-                    this._saveDefaultValues(playStateData);
                 }
             } else {
-                // layerState is CrossFading, FixedCrossFading, Standby
-                var crossCurveDataCollection = this._crossOwnerCollection;
-                for(var i1 = crossCurveDataCollection.length - 1; i1 >= 0; i1--){
-                    var owner1 = crossCurveDataCollection[i1];
-                    owner1.hasSavedDefaultValue && owner1.revertDefaultValue();
+                // layerState is CrossFading, FixedCrossFading, Standby, Finished
+                var crossLayerOwnerCollection = layerData.crossLayerOwnerCollection;
+                for(var i1 = crossLayerOwnerCollection.length - 1; i1 >= 0; i1--){
+                    var owner1 = crossLayerOwnerCollection[i1].curveOwner;
+                    owner1.revertDefaultValue();
                 }
-                this._saveDefaultValues(playStateData);
             }
         };
         _proto._checkTransition = function _checkTransition(stateData, crossFadeTransition, layerIndex) {
@@ -27835,7 +27947,7 @@
         _proto._crossFadeByTransition = function _crossFadeByTransition(transition, layerIndex) {
             var name = transition.destinationState.name;
             var stateInfo = this._getAnimatorStateInfo(name, layerIndex);
-            var crossState = stateInfo.state;
+            var crossState = stateInfo.state, playLayerIndex = stateInfo.layerIndex;
             if (!crossState) {
                 return;
             }
@@ -27843,21 +27955,21 @@
                 console.warn("The state named " + name + " has no AnimationClip data.");
                 return;
             }
-            var animatorLayerData = this._getAnimatorLayerData(stateInfo.layerIndex);
+            var animatorLayerData = this._getAnimatorLayerData(playLayerIndex);
             var layerState = animatorLayerData.layerState;
             var destPlayData = animatorLayerData.destPlayData;
-            var animatorStateData = this._getAnimatorStateData(name, crossState, animatorLayerData);
+            var animatorStateData = this._getAnimatorStateData(name, crossState, animatorLayerData, playLayerIndex);
             var duration = crossState._getDuration();
             var offset = duration * transition.offset;
             destPlayData.reset(crossState, animatorStateData, offset);
             switch(layerState){
-                // Maybe not play, maybe end.
                 case LayerState.Standby:
                     animatorLayerData.layerState = LayerState.FixedCrossFading;
                     this._clearCrossData(animatorLayerData);
                     this._prepareStandbyCrossFading(animatorLayerData);
                     break;
                 case LayerState.Playing:
+                case LayerState.Finished:
                     animatorLayerData.layerState = LayerState.CrossFading;
                     this._clearCrossData(animatorLayerData);
                     this._prepareCrossFading(animatorLayerData);
@@ -27954,6 +28066,12 @@
                 }
             }
         };
+        _proto._revertCurveOwners = function _revertCurveOwners() {
+            var curveOwners = this._needRevertCurveOwners;
+            for(var i = 0, n = curveOwners.length; i < n; ++i){
+                curveOwners[i].revertDefaultValue();
+            }
+        };
         _create_class$3(Animator, [
             {
                 key: "animatorController",
@@ -27985,10 +28103,10 @@
     ], Animator.prototype, "_animatorLayersData", void 0);
     __decorate$1([
         ignoreClone
-    ], Animator.prototype, "_crossOwnerCollection", void 0);
+    ], Animator.prototype, "_curveOwnerPool", void 0);
     __decorate$1([
         ignoreClone
-    ], Animator.prototype, "_animationCurveOwners", void 0);
+    ], Animator.prototype, "_needRevertCurveOwners", void 0);
     __decorate$1([
         ignoreClone
     ], Animator.prototype, "_animationEventHandlerPool", void 0);
@@ -36275,7 +36393,7 @@
     }));
 
     //@ts-ignore
-    var version = "0.9.13";
+    var version = "0.9.15";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);