fix: fix the order of layerState when AnimatorStatePlayState.Finished (…

…galacean#774) * fix: the order of layerState when AnimatorStatePlayState.Finished galacean#774
luzhuang · Apr 29, 2022 · 375face · 375face
1 parent 38f77aa
commit 375face
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/packages/core/src/animation/Animator.ts b/packages/core/src/animation/Animator.ts
@@ -473,15 +473,6 @@ export class Animator extends Component {
 
     eventHandlers.length && this._fireAnimationEvents(playData, eventHandlers, lastClipTime, clipTime);
 
-    if (lastPlayState === AnimatorStatePlayState.UnStarted) {
-      this._callAnimatorScriptOnEnter(state, layerIndex);
-    }
-    if (playState === AnimatorStatePlayState.Finished) {
-      this._callAnimatorScriptOnExit(state, layerIndex);
-    } else {
-      this._callAnimatorScriptOnUpdate(state, layerIndex);
-    }
-
     for (let i = curves.length - 1; i >= 0; i--) {
       const owner = curveOwners[i];
       const value = this._evaluateCurve(owner.property, curves[i].curve, clipTime, additive);
@@ -496,6 +487,15 @@ export class Animator extends Component {
     if (playState === AnimatorStatePlayState.Finished) {
       layerData.layerState = LayerState.Standby;
     }
+
+    if (lastPlayState === AnimatorStatePlayState.UnStarted) {
+      this._callAnimatorScriptOnEnter(state, layerIndex);
+    }
+    if (playState === AnimatorStatePlayState.Finished) {
+      this._callAnimatorScriptOnExit(state, layerIndex);
+    } else {
+      this._callAnimatorScriptOnUpdate(state, layerIndex);
+    }
   }
 
   private _updateCrossFade(