@galacean/engine-core 0.9.15 → 0.9.17

package/dist/miniprogram.js

@@ -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,8 @@ 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;
+        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);
@@ -23138,9 +23138,7 @@ exports.AnimatorLayerBlendingMode = void 0;
                 var property = curve.property;
                 var instanceId = targetEntity.instanceId;
                 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])) {
+                if (this.animatorController.layers[layerIndex].blendingMode === exports.AnimatorLayerBlendingMode.Additive && layerIndex > 0) {
                     needRevert = true;
                 }
                 // Get owner
@@ -23427,16 +23425,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

@@ -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,8 @@ 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;
+        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);
@@ -23133,9 +23133,7 @@ var AnimatorLayerBlendingMode;
                 var property = curve.property;
                 var instanceId = targetEntity.instanceId;
                 var needRevert = false;
-                var baseAnimatorLayerData = this._animatorLayersData[0];
-                var baseLayerCurveOwnerPool = baseAnimatorLayerData.curveOwnerPool;
-                if (this.animatorController.layers[layerIndex].blendingMode === AnimatorLayerBlendingMode.Additive && layerIndex > 0 && !(baseLayerCurveOwnerPool[instanceId] && baseLayerCurveOwnerPool[instanceId][property])) {
+                if (this.animatorController.layers[layerIndex].blendingMode === AnimatorLayerBlendingMode.Additive && layerIndex > 0) {
                     needRevert = true;
                 }
                 // Get owner
@@ -23422,16 +23420,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();
             }
         }
     };