fix: enter exit duration could be zero

Author: Hardy--Lee

packages/webgal/src/Core/Modules/animationFunctions.ts

@@ -7,7 +7,12 @@ import { baseTransform } from '@/store/stageInterface';
 import { generateTimelineObj } from '@/Core/controller/stage/pixi/animations/timeline';
 import { WebGAL } from '@/Core/WebGAL';
 import PixiStage, { IAnimationObject } from '@/Core/controller/stage/pixi/PixiController';
-import { DEFAULT_FIG_IN_DURATION, DEFAULT_FIG_OUT_DURATION } from '../constants';
+import {
+  DEFAULT_BG_IN_DURATION,
+  DEFAULT_BG_OUT_DURATION,
+  DEFAULT_FIG_IN_DURATION,
+  DEFAULT_FIG_OUT_DURATION,
+} from '../constants';
 
 // eslint-disable-next-line max-params
 export function getAnimationObject(animationName: string, target: string, duration: number, writeDefault: boolean) {
@@ -59,7 +64,7 @@ export function getEnterExitAnimation(
   if (type === 'enter') {
     let duration = DEFAULT_FIG_IN_DURATION;
     if (isBg) {
-      duration = 1500;
+      duration = DEFAULT_BG_IN_DURATION;
     }
     duration =
       webgalStore.getState().stage.animationSettings.find((setting) => setting.target === target)?.enterDuration ??
@@ -83,7 +88,7 @@ export function getEnterExitAnimation(
     // exit
     let duration = DEFAULT_FIG_OUT_DURATION;
     if (isBg) {
-      duration = 1500;
+      duration = DEFAULT_BG_OUT_DURATION;
     }
     duration =
       webgalStore.getState().stage.animationSettings.find((setting) => setting.target + '-off' === target)

packages/webgal/src/Core/constants.ts

@@ -9,3 +9,5 @@ export const STAGE_KEYS = {
 export const WEBGAL_NONE = 'none';
 export const DEFAULT_FIG_IN_DURATION = 300;
 export const DEFAULT_FIG_OUT_DURATION = 450;
+export const DEFAULT_BG_IN_DURATION = 1000;
+export const DEFAULT_BG_OUT_DURATION = 1500;

packages/webgal/src/Core/gameScripts/changeBg/index.ts

@@ -13,6 +13,7 @@ import { AnimationFrame, IUserAnimation } from '@/Core/Modules/animations';
 import cloneDeep from 'lodash/cloneDeep';
 import { getAnimateDuration } from '@/Core/Modules/animationFunctions';
 import { WebGAL } from '@/Core/WebGAL';
+import { DEFAULT_BG_OUT_DURATION } from '@/Core/constants';
 
 /**
  * 进行背景图片的切换
@@ -24,10 +25,10 @@ export const changeBg = (sentence: ISentence): IPerform => {
   const unlockName = getStringArgByKey(sentence, 'unlockname') ?? '';
   const series = getStringArgByKey(sentence, 'series') ?? 'default';
   const transformString = getStringArgByKey(sentence, 'transform');
-  let duration = getNumberArgByKey(sentence, 'duration') ?? 1000;
+  let duration = getNumberArgByKey(sentence, 'duration') ?? DEFAULT_BG_OUT_DURATION;
   const enterDuration = getNumberArgByKey(sentence, 'enterDuration') ?? duration;
   duration = enterDuration;
-  const exitDuration = getNumberArgByKey(sentence, 'exitDurationOfPrev');
+  const exitDuration = getNumberArgByKey(sentence, 'exitDurationOfPrev') ?? DEFAULT_BG_OUT_DURATION;
   const ease = getStringArgByKey(sentence, 'ease') ?? '';
 
   const dispatch = webgalStore.dispatch;
@@ -101,12 +102,12 @@ export const changeBg = (sentence: ISentence): IPerform => {
     );
     duration = getAnimateDuration(exitAnimation);
   }
-  if (enterDuration) {
+  if (enterDuration >= 0) {
     webgalStore.dispatch(
       stageActions.updateAnimationSettings({ target: 'bg-main', key: 'enterDuration', value: enterDuration }),
     );
   }
-  if (exitDuration) {
+  if (exitDuration >= 0) {
     webgalStore.dispatch(
       stageActions.updateAnimationSettings({ target: 'bg-main', key: 'exitDuration', value: exitDuration }),
     );

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

@@ -12,7 +12,7 @@ import { logger } from '@/Core/util/logger';
 import { getAnimateDuration } from '@/Core/Modules/animationFunctions';
 import { WebGAL } from '@/Core/WebGAL';
 import { baseBlinkParam, baseFocusParam, BlinkParam, FocusParam } from '@/Core/live2DCore';
-import { DEFAULT_FIG_IN_DURATION, WEBGAL_NONE } from '../constants';
+import { DEFAULT_FIG_IN_DURATION, DEFAULT_FIG_OUT_DURATION, WEBGAL_NONE } from '../constants';
 /**
  * 更改立绘
  * @param sentence 语句
@@ -93,7 +93,7 @@ export function changeFigure(sentence: ISentence): IPerform {
   let zIndex = getNumberArgByKey(sentence, 'zIndex') ?? -1;
   const enterDuration = getNumberArgByKey(sentence, 'enterDuration') ?? duration;
   duration = enterDuration;
-  const exitDuration = getNumberArgByKey(sentence, 'exitDurationOfPrev');
+  const exitDuration = getNumberArgByKey(sentence, 'exitDurationOfPrev') ?? DEFAULT_FIG_OUT_DURATION;
 
   const dispatch = webgalStore.dispatch;
 
@@ -206,12 +206,12 @@ export function changeFigure(sentence: ISentence): IPerform {
       );
       duration = getAnimateDuration(exitAnimation);
     }
-    if (enterDuration) {
+    if (enterDuration >= 0) {
       webgalStore.dispatch(
         stageActions.updateAnimationSettings({ target: key, key: 'enterDuration', value: enterDuration }),
       );
     }
-    if (exitDuration) {
+    if (exitDuration >= 0) {
       webgalStore.dispatch(
         stageActions.updateAnimationSettings({ target: key, key: 'exitDuration', value: exitDuration }),
       );