@galacean/engine 0.9.16 → 0.9.18

package/dist/browser.js

@@ -27473,7 +27473,7 @@
                 return;
             }
             if (!state.clip) {
-                console.warn("The state named " + stateName + " has no AnimationClip data.");
+                Logger.warn("The state named " + stateName + " has no AnimationClip data.");
                 return;
             }
             var animatorLayerData = this._getAnimatorLayerData(playLayerIndex);
@@ -27622,9 +27622,6 @@
             var _this = this, entity = _this.entity, curveOwnerPool = _this._curveOwnerPool;
             var curveLayerOwner = animatorStateData.curveLayerOwner;
             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];
@@ -27634,9 +27631,7 @@
                     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
@@ -27645,9 +27640,6 @@
                     //@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));
@@ -27655,25 +27647,7 @@
                     curveLayerOwner[i] = layerOwner;
                 } else {
                     curveLayerOwner[i] = null;
-                    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);
-                                }
-                            }
-                        }
-                    }
+                    Logger.warn("The entity don't have the child entity which path is " + curve.relativePath + ".");
                 }
             }
         };
@@ -27971,7 +27945,7 @@
                 return;
             }
             if (!crossState.clip) {
-                console.warn("The state named " + name + " has no AnimationClip data.");
+                Logger.warn("The state named " + name + " has no AnimationClip data.");
                 return;
             }
             var animatorLayerData = this._getAnimatorLayerData(playLayerIndex);
@@ -27983,12 +27957,12 @@
             destPlayData.reset(crossState, animatorStateData, offset);
             switch(layerState){
                 case LayerState.Standby:
+                case LayerState.Finished:
                     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);
@@ -36412,7 +36386,7 @@
     }));
 
     //@ts-ignore
-    var version = "0.9.16";
+    var version = "0.9.18";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);