fix: set old transform end state to new target

Author: MakinoharaShoko

packages/webgal/src/Core/controller/stage/pixi/PixiController.ts

@@ -17,6 +17,7 @@ export interface IAnimationObject {
   setEndState: Function;
   tickerFunc: PIXI.TickerCallback<number>;
   getEndStateEffect?: Function;
+  forceStopWithoutSetEndState?: Function;
 }
 
 interface IStageAnimationObject {
@@ -267,6 +268,19 @@ export default class PixiStage {
     }
   }
 
+  public removeAnimationWithoutSetEndState(key: string) {
+    const index = this.stageAnimations.findIndex((e) => e.key === key);
+    if (index >= 0) {
+      const thisTickerFunc = this.stageAnimations[index];
+      this.currentApp?.ticker.remove(thisTickerFunc.animationObject.tickerFunc);
+      if (thisTickerFunc.animationObject.forceStopWithoutSetEndState) {
+        thisTickerFunc.animationObject.forceStopWithoutSetEndState();
+      }
+      this.unlockStageObject(thisTickerFunc.targetKey ?? 'default');
+      this.stageAnimations.splice(index, 1);
+    }
+  }
+
   public removeAllAnimations() {
     while (this.stageAnimations.length > 0) {
       this.removeAnimationByIndex(0);

packages/webgal/src/Core/controller/stage/pixi/animations/timeline.ts

@@ -129,11 +129,17 @@ export function generateTimelineObj(
     return timeline[timeline.length - 1];
   }
 
+  function forceStopWithoutSetEndState() {
+    if (animateInstance) animateInstance.stop();
+    animateInstance = null;
+  }
+
   return {
     setStartState,
     setEndState,
     tickerFunc,
     getEndStateEffect,
+    forceStopWithoutSetEndState,
   };
 }
 

packages/webgal/src/Core/gameScripts/setTransform.ts

@@ -46,8 +46,11 @@ export const setTransform = (sentence: ISentence): IPerform => {
   const animationDuration = getAnimateDuration(animationName);
 
   const key = `${target}-${animationName}-${animationDuration}`;
-  let stopFunction = () => {};
+  let keepAnimationStopped = false;
   setTimeout(() => {
+    if (keep && keepAnimationStopped) {
+      return;
+    }
     WebGAL.gameplay.pixiStage?.stopPresetAnimationOnTarget(target);
     const animationObj: IAnimationObject | null = getAnimationObject(
       animationName,
@@ -60,10 +63,13 @@ export const setTransform = (sentence: ISentence): IPerform => {
       WebGAL.gameplay.pixiStage?.registerAnimation(animationObj, key, target);
     }
   }, 0);
-  stopFunction = () => {
+  const stopFunction = () => {
+    if (keep) {
+      WebGAL.gameplay.pixiStage?.removeAnimationWithoutSetEndState(key);
+      keepAnimationStopped = true;
+      return;
+    }
     setTimeout(() => {
-      const endDialogKey = webgalStore.getState().stage.currentDialogKey;
-      const isHasNext = startDialogKey !== endDialogKey;
       WebGAL.gameplay.pixiStage?.removeAnimationWithSetEffects(key);
     }, 0);
   };