Merge pull request #723 from OpenWebGAL/dev

Dev

Author: MakinoharaShoko

packages/webgal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webgal-engine",
-  "version": "4.5.13",
+  "version": "4.5.14",
   "scripts": {
     "dev": "vite --host --port 3000",
     "build": "cross-env NODE_ENV=production tsc && vite build --base=./",

packages/webgal/public/game/scene/demo_performs.txt

@@ -0,0 +1,22 @@
+label: performs;
+choose: cherryBlossoms: cherryBlossoms | rain:rain | snow:snow | heavySnow:heavySnow;
+
+label: cherryBlossoms;
+pixiInit;
+pixiPerform: cherryBlossoms;
+jumpLabel: performs;
+
+label: rain;
+pixiInit;
+pixiPerform: rain;
+jumpLabel: performs;
+
+label: snow;
+pixiInit;
+pixiPerform: snow;
+jumpLabel: performs;
+
+label: heavySnow;
+pixiInit;
+pixiPerform: heavySnow;
+jumpLabel: performs;

packages/webgal/public/game/scene/function_test.txt

@@ -1 +1 @@
-choose:Lip Sync Animation Test:demo_animation.txt | Variable interpolation test:demo_var.txt | Change Config:demo_changeConfig.txt;
+choose: Lip Sync Animation Test:demo_animation.txt | Variable interpolation test:demo_var.txt | Change Config:demo_changeConfig.txt | Performs:demo_performs.txt;

packages/webgal/public/game/template/template.json

@@ -1,4 +1,4 @@
 {
   "name":"Default Template",
-  "webgal-version":"4.5.13"
+  "webgal-version":"4.5.14"
 }

packages/webgal/public/game/tex/cherryBlossoms.png

@@ -6,16 +6,25 @@ import cloneDeep from 'lodash/cloneDeep';
 import { baseTransform } from '@/store/stageInterface';
 import { generateTimelineObj } from '@/Core/controller/stage/pixi/animations/timeline';
 import { WebGAL } from '@/Core/WebGAL';
-import PixiStage from '@/Core/controller/stage/pixi/PixiController';
+import PixiStage, { IAnimationObject } from '@/Core/controller/stage/pixi/PixiController';
 
-export function getAnimationObject(animationName: string, target: string, duration: number) {
+// eslint-disable-next-line max-params
+export function getAnimationObject(animationName: string, target: string, duration: number, writeDefault: boolean) {
   const effect = WebGAL.animationManager.getAnimations().find((ani) => ani.name === animationName);
   if (effect) {
     const mappedEffects = effect.effects.map((effect) => {
       const targetSetEffect = webgalStore.getState().stage.effects.find((e) => e.target === target);
-      const newEffect = cloneDeep({ ...(targetSetEffect?.transform ?? baseTransform), duration: 0 });
+      let newEffect;
+
+      if (!writeDefault && targetSetEffect && targetSetEffect.transform) {
+        newEffect = cloneDeep({ ...targetSetEffect.transform, duration: 0, ease: '' });
+      } else {
+        newEffect = cloneDeep({ ...baseTransform, duration: 0, ease: '' });
+      }
+
       PixiStage.assignTransform(newEffect, effect);
       newEffect.duration = effect.duration;
+      newEffect.ease = effect.ease;
       return newEffect;
     });
     logger.debug('装载自定义动画', mappedEffects);
@@ -44,27 +53,19 @@ export function getEnterExitAnimation(
   realTarget?: string, // 用于立绘和背景移除时，以当前时间打上特殊标记
 ): {
   duration: number;
-  animation: {
-    setStartState: () => void;
-    tickerFunc: (delta: number) => void;
-    setEndState: () => void;
-  } | null;
+  animation: IAnimationObject | null;
 } {
   if (type === 'enter') {
     let duration = 500;
     if (isBg) {
       duration = 1500;
     }
     // 走默认动画
-    let animation: {
-      setStartState: () => void;
-      tickerFunc: (delta: number) => void;
-      setEndState: () => void;
-    } | null = generateUniversalSoftInAnimationObj(realTarget ?? target, duration);
+    let animation: IAnimationObject | null = generateUniversalSoftInAnimationObj(realTarget ?? target, duration);
     const animarionName = WebGAL.animationManager.nextEnterAnimationName.get(target);
     if (animarionName) {
       logger.debug('取代默认进入动画', target);
-      animation = getAnimationObject(animarionName, realTarget ?? target, getAnimateDuration(animarionName));
+      animation = getAnimationObject(animarionName, realTarget ?? target, getAnimateDuration(animarionName), false);
       duration = getAnimateDuration(animarionName);
       // 用后重置
       WebGAL.animationManager.nextEnterAnimationName.delete(target);
@@ -76,15 +77,11 @@ export function getEnterExitAnimation(
       duration = 1500;
     }
     // 走默认动画
-    let animation: {
-      setStartState: () => void;
-      tickerFunc: (delta: number) => void;
-      setEndState: () => void;
-    } | null = generateUniversalSoftOffAnimationObj(realTarget ?? target, duration);
+    let animation: IAnimationObject | null = generateUniversalSoftOffAnimationObj(realTarget ?? target, duration);
     const animarionName = WebGAL.animationManager.nextExitAnimationName.get(target);
     if (animarionName) {
       logger.debug('取代默认退出动画', target);
-      animation = getAnimationObject(animarionName, realTarget ?? target, getAnimateDuration(animarionName));
+      animation = getAnimationObject(animarionName, realTarget ?? target, getAnimateDuration(animarionName), false);
       duration = getAnimateDuration(animarionName);
       // 用后重置
       WebGAL.animationManager.nextExitAnimationName.delete(target);