@galacean/engine-core 0.9.14 → 0.9.16

package/dist/miniprogram.js

@@ -21700,8 +21700,8 @@ AnimationCurveOwner.registerAssembler(SkinnedMeshRenderer, "blendShapeWeights",
    */ _proto._createCurveLayerOwner = function _createCurveLayerOwner(owner) {
         var curveType = this.curve.constructor;
         var layerOwner = new AnimationCurveLayerOwner();
-        curveType._initializeLayerOwner(layerOwner);
         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;
@@ -22983,7 +22983,7 @@ exports.AnimatorLayerBlendingMode = void 0;
             console.warn("The state named " + stateName + " has no AnimationClip data.");
             return;
         }
-        var animatorLayerData = this._getAnimatorLayerData(stateInfo.layerIndex);
+        var animatorLayerData = this._getAnimatorLayerData(playLayerIndex);
         var animatorStateData = this._getAnimatorStateData(stateName, state, animatorLayerData, playLayerIndex);
         this._preparePlay(animatorLayerData, state);
         animatorLayerData.layerState = LayerState.Playing;
@@ -23002,8 +23002,8 @@ exports.AnimatorLayerBlendingMode = void 0;
         if ((_this__controllerUpdateFlag = this._controllerUpdateFlag) == null ? void 0 : _this__controllerUpdateFlag.flag) {
             this._reset();
         }
-        var state = this._getAnimatorStateInfo(stateName, layerIndex).state;
-        var manuallyTransition = this._getAnimatorLayerData(layerIndex).manuallyTransition;
+        var _this__getAnimatorStateInfo = this._getAnimatorStateInfo(stateName, layerIndex), state = _this__getAnimatorStateInfo.state, playLayerIndex = _this__getAnimatorStateInfo.layerIndex;
+        var manuallyTransition = this._getAnimatorLayerData(playLayerIndex).manuallyTransition;
         manuallyTransition.duration = normalizedTransitionDuration;
         manuallyTransition.offset = normalizedTimeOffset;
         manuallyTransition.destinationState = state;
@@ -23128,8 +23128,11 @@ exports.AnimatorLayerBlendingMode = void 0;
     _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;
+        if (layerIndex === 0) {
+            animatorLayerData.curveOwnerPool = Object.create(null);
+        }
+        var layerCurveOwnerPool = animatorLayerData.curveOwnerPool;
         for(var i = curves.length - 1; i >= 0; i--){
             var curve = curves[i];
             var targetEntity = curve.relativePath === "" ? entity : entity.findByPath(curve.relativePath);
@@ -23162,6 +23165,24 @@ exports.AnimatorLayerBlendingMode = void 0;
                 console.warn("The entity don't have the child entity which path is " + curve.relativePath + ".");
             }
         }
+        if (layerIndex === 0) {
+            this._needRevertCurveOwners.length = 0;
+            for(var i1 = 1, n = this._animatorLayersData.length; i1 < n; ++i1){
+                var layerData = this._animatorLayersData[i1];
+                var playingCurveOwnerPool = layerData.curveOwnerPool;
+                for(var instanceId1 in playingCurveOwnerPool){
+                    for(var property1 in playingCurveOwnerPool[instanceId1]){
+                        var layerOwner1 = playingCurveOwnerPool[instanceId1][property1];
+                        if (this.animatorController.layers[i1].blendingMode === exports.AnimatorLayerBlendingMode.Additive) {
+                            var baseLayerCurveOwnerPool1 = this._animatorLayersData[0].curveOwnerPool;
+                            if (!(baseLayerCurveOwnerPool1[instanceId1] && baseLayerCurveOwnerPool1[instanceId1][property1])) {
+                                this._needRevertCurveOwners.push(layerOwner1.curveOwner);
+                            }
+                        }
+                    }
+                }
+            }
+        }
     };
     _proto._saveAnimatorEventHandlers = function _saveAnimatorEventHandlers(state, animatorStateData) {
         var eventHandlerPool = this._animationEventHandlerPool;
@@ -23427,16 +23448,14 @@ exports.AnimatorLayerBlendingMode = void 0;
                 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();
+                    (_curveLayerOwner_i = curveLayerOwner[i]) == null ? void 0 : _curveLayerOwner_i.curveOwner.revertDefaultValue();
                 }
             }
         } else {
             // 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();
+                crossLayerOwnerCollection[i1].curveOwner.revertDefaultValue();
             }
         }
     };

package/dist/module.js

@@ -21695,8 +21695,8 @@ AnimationCurveOwner.registerAssembler(SkinnedMeshRenderer, "blendShapeWeights",
    */ _proto._createCurveLayerOwner = function _createCurveLayerOwner(owner) {
         var curveType = this.curve.constructor;
         var layerOwner = new AnimationCurveLayerOwner();
-        curveType._initializeLayerOwner(layerOwner);
         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;
@@ -22978,7 +22978,7 @@ var AnimatorLayerBlendingMode;
             console.warn("The state named " + stateName + " has no AnimationClip data.");
             return;
         }
-        var animatorLayerData = this._getAnimatorLayerData(stateInfo.layerIndex);
+        var animatorLayerData = this._getAnimatorLayerData(playLayerIndex);
         var animatorStateData = this._getAnimatorStateData(stateName, state, animatorLayerData, playLayerIndex);
         this._preparePlay(animatorLayerData, state);
         animatorLayerData.layerState = LayerState.Playing;
@@ -22997,8 +22997,8 @@ var AnimatorLayerBlendingMode;
         if ((_this__controllerUpdateFlag = this._controllerUpdateFlag) == null ? void 0 : _this__controllerUpdateFlag.flag) {
             this._reset();
         }
-        var state = this._getAnimatorStateInfo(stateName, layerIndex).state;
-        var manuallyTransition = this._getAnimatorLayerData(layerIndex).manuallyTransition;
+        var _this__getAnimatorStateInfo = this._getAnimatorStateInfo(stateName, layerIndex), state = _this__getAnimatorStateInfo.state, playLayerIndex = _this__getAnimatorStateInfo.layerIndex;
+        var manuallyTransition = this._getAnimatorLayerData(playLayerIndex).manuallyTransition;
         manuallyTransition.duration = normalizedTransitionDuration;
         manuallyTransition.offset = normalizedTimeOffset;
         manuallyTransition.destinationState = state;
@@ -23123,8 +23123,11 @@ var AnimatorLayerBlendingMode;
     _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;
+        if (layerIndex === 0) {
+            animatorLayerData.curveOwnerPool = Object.create(null);
+        }
+        var layerCurveOwnerPool = animatorLayerData.curveOwnerPool;
         for(var i = curves.length - 1; i >= 0; i--){
             var curve = curves[i];
             var targetEntity = curve.relativePath === "" ? entity : entity.findByPath(curve.relativePath);
@@ -23157,6 +23160,24 @@ var AnimatorLayerBlendingMode;
                 console.warn("The entity don't have the child entity which path is " + curve.relativePath + ".");
             }
         }
+        if (layerIndex === 0) {
+            this._needRevertCurveOwners.length = 0;
+            for(var i1 = 1, n = this._animatorLayersData.length; i1 < n; ++i1){
+                var layerData = this._animatorLayersData[i1];
+                var playingCurveOwnerPool = layerData.curveOwnerPool;
+                for(var instanceId1 in playingCurveOwnerPool){
+                    for(var property1 in playingCurveOwnerPool[instanceId1]){
+                        var layerOwner1 = playingCurveOwnerPool[instanceId1][property1];
+                        if (this.animatorController.layers[i1].blendingMode === AnimatorLayerBlendingMode.Additive) {
+                            var baseLayerCurveOwnerPool1 = this._animatorLayersData[0].curveOwnerPool;
+                            if (!(baseLayerCurveOwnerPool1[instanceId1] && baseLayerCurveOwnerPool1[instanceId1][property1])) {
+                                this._needRevertCurveOwners.push(layerOwner1.curveOwner);
+                            }
+                        }
+                    }
+                }
+            }
+        }
     };
     _proto._saveAnimatorEventHandlers = function _saveAnimatorEventHandlers(state, animatorStateData) {
         var eventHandlerPool = this._animationEventHandlerPool;
@@ -23422,16 +23443,14 @@ var AnimatorLayerBlendingMode;
                 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();
+                    (_curveLayerOwner_i = curveLayerOwner[i]) == null ? void 0 : _curveLayerOwner_i.curveOwner.revertDefaultValue();
                 }
             }
         } else {
             // 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();
+                crossLayerOwnerCollection[i1].curveOwner.revertDefaultValue();
             }
         }
     };