Feat: Support parallel animation for setAnimation command; Fix: potential runtime error caused by undefined parameters reported by review bot

TremblingMoeNew · TremblingMoeNew · commit 650fcfd3ffef · 2025-12-07T13:48:48.000+08:00
diff --git a/packages/webgal/public/game/scene/demo_parallel_animation.txt b/packages/webgal/public/game/scene/demo_parallel_animation.txt
@@ -0,0 +1,31 @@
+changeBg:WebGalEnter.webp -next;
+changeFigure:stand.webp -id=figure01 -transform={"position":{"x":1000,"y":720}};
+;演示setAnimation平行执行
+setAnimation:shockwaveIn -target=figure01 -next
+setAnimation:move-front-and-back -target=figure01 -parallel
+;演示通过-continue接续执行两个常规setTransform正常运作、不被打断
+setTransform:{"position":{"x":-1000}} -duration=5000 -target=figure01 -continue
+setTransform:{"position":{"x":1000}} -duration=5000 -target=figure01
+;演示setTransform平行执行
+setTransform:{"position":{"x":-1000},"scale":{"x":0.5},"contrast":0.5} -duration=5000 -target=figure01 -ease=easeOut -next -keep
+wait:2000
+setTransform:{"position":{"y":0},"scale":{"y":0.5},"saturation":0} -duration=5000 -target=figure01 -ease=linear -parallel -continue
+setTransform:{"position":{"y":-720},"scale":{"y":1},"saturation":1} -duration=5000 -target=figure01 -ease=linear -next
+setTransform:{"position":{"x":1000},"scale":{"x":1},"contrast":1} -duration=5000 -target=figure01 -ease=easeIn -parallel;
+;演示参数解耦改动后setTempAnimation普通运作是否正常
+setTempAnimation:[{"duration":0}, {"duration":500,"position":{"x":-1000}}, {"duration":500,"position":{"y":720},"scale":{"y":0.5},"saturation":0}, {"duration":500,"position":{"x":-1000, "y":720}}, {"duration":500}, {"duration":500,"position":{"x":-1000},"scale":{"x":0.5},"contrast":0.5}] -target=figure01
+setTempAnimation:[{"duration":0}, {"duration":500,"position":{"x":1000}}, {"duration":500,"position":{"y":720}}, {"duration":500,"position":{"x":1000, "y":720}}, {"duration":500}, {"duration":500,"position":{"x":1000}}] -target=figure01
+;演示参数解耦改动后setTransform的-writeDefault参数是否运作正常
+setTransform:{} -writeDefault -target=figure01 -duration=500
+setTransform:{"position":{"x":1000,"y":720}} -target=figure01 -next;
+setAnimation:shockwaveOut -target=figure01 -parallel
+;演示setTempAnimation平行执行
+setTempAnimation:[{"duration":0},{"position":{"x":-1000},"scale":{"x":0.5},"contrast":0.5,"duration":5000,"ease":"easeOut"},{"position":{"x":-1000},"scale":{"x":0.5},"contrast":0.5,"duration":2000},{"position":{"x":600},"scale":{"x":1},"contrast":1,"duration":5000,"ease":"easeIn"},{"duration":2000}] -target=figure01 -next;
+setTempAnimation:[{"duration":2000},{"position":{"y":0},"scale":{"y":0.5},"saturation":0,"duration":5000,"ease":"linear"},{"position":{"y":-720},"scale":{"y":1},"saturation":1,"duration":5000,"ease":"linear"},{"duration":2000}] -target=figure01 -parallel -continue;
+;演示并行执行多条终止时间点不一致的setTransform
+setTransform:{"position":{"x":-1000}} -duration=5000 -next -target=figure01;
+setTransform:{"position":{"y":0}} -duration=3000 -parallel -target=figure01;
+setTransform:{"position":{"x":1000}} -duration=3000 -next -target=figure01;
+setTransform:{"position":{"y":-720}} -duration=5000 -parallel -target=figure01;
+changeBg: -next;
+changeFigure: -id=figure01
diff --git a/packages/webgal/src/Core/Modules/animationFunctions.ts b/packages/webgal/src/Core/Modules/animationFunctions.ts
@@ -33,8 +33,8 @@ export function getAnimationObject(animationName: string, target: string, durati
       let newEffect;
 
       if (!writeDefault && targetSetEffect && targetSetEffect.transform) {
-        const targetScale = pickBy(targetSetEffect.transform.scale, (source, key)=> unionScaleKeys.has(key))
-        const targetPosition = pickBy(targetSetEffect.transform.position, (source, key)=> unionPositionKeys.has(key))
+        const targetScale = pickBy(targetSetEffect.transform.scale || {}, (source, key)=> unionScaleKeys.has(key))
+        const targetPosition = pickBy(targetSetEffect.transform.position || {}, (source, key)=> unionPositionKeys.has(key))
         const originalTransform = { ...pickBy(targetSetEffect.transform, (source, key)=> unionKeys.has(key))};
         originalTransform.scale = targetScale
         originalTransform.position = targetPosition
diff --git a/packages/webgal/src/Core/controller/stage/pixi/PixiController.ts b/packages/webgal/src/Core/controller/stage/pixi/PixiController.ts
@@ -73,8 +73,8 @@ export default class PixiStage {
     if (!source) return;
     const targetScale = target.scale;
     const targetPosition = target.position;
-    if (target.scale) Object.assign(targetScale!, omitBy(source.scale,isUndefined));
-    if (target.position) Object.assign(targetPosition!, omitBy(source.position,isUndefined));
+    if (target.scale) Object.assign(targetScale!, omitBy(source.scale || {},isUndefined));
+    if (target.position) Object.assign(targetPosition!, omitBy(source.position || {},isUndefined));
     Object.assign(target, omitBy(source,isUndefined));
     target.scale = targetScale;
     target.position = targetPosition;
diff --git a/packages/webgal/src/Core/controller/stage/pixi/animations/generateTransformAnimationObj.ts b/packages/webgal/src/Core/controller/stage/pixi/animations/generateTransformAnimationObj.ts
@@ -32,9 +32,9 @@ export function generateTransformAnimationObj(
       animationObj.unshift(effectWithDuration);
     }
     else {
-      const targetScale = pickBy(targetEffect!.transform!.scale, (source, key)=> has(applyFrame.scale, key))
-      const targetPosition = pickBy(targetEffect!.transform!.position, (source, key)=> has(applyFrame.position, key))
-      const effectWithDuration = { ...pickBy(targetEffect!.transform!, (source, key)=> has(applyFrame, key) ), duration: 0, ease };
+      const targetScale = pickBy(targetEffect.transform?.scale || {}, (source, key)=> has(applyFrame.scale, key))
+      const targetPosition = pickBy(targetEffect.transform?.position || {}, (source, key)=> has(applyFrame.position, key))
+      const effectWithDuration = { ...pickBy(targetEffect.transform || {}, (source, key)=> has(applyFrame, key) ), duration: 0, ease };
       effectWithDuration.scale = targetScale
       effectWithDuration.position = targetPosition
       animationObj.unshift(effectWithDuration);
diff --git a/packages/webgal/src/Core/gameScripts/setAnimation.ts b/packages/webgal/src/Core/gameScripts/setAnimation.ts
@@ -20,11 +20,12 @@ export const setAnimation = (sentence: ISentence): IPerform => {
   target = target !== '' ? target : 'default_id';
   const writeDefault = getBooleanArgByKey(sentence, 'writeDefault') ?? false;
   const keep = getBooleanArgByKey(sentence, 'keep') ?? false;
+  const parallel = getBooleanArgByKey(sentence, 'parallel') ?? false;
 
   const key = `${target}-${animationName}-${animationDuration}`;
   const performInitName = `animation-${target}`;
 
-  WebGAL.gameplay.performController.unmountPerform(performInitName, true);
+  if (!parallel) WebGAL.gameplay.performController.unmountPerform(performInitName, true);
 
   let stopFunction;
   setTimeout(() => {
@@ -56,5 +57,6 @@ export const setAnimation = (sentence: ISentence): IPerform => {
     blockingNext: () => false,
     blockingAuto: () => !keep,
     stopTimeout: undefined, // 暂时不用，后面会交给自动清除
+    isParallel: parallel,
   };
 };
diff --git a/packages/webgal/src/store/stageReducer.ts b/packages/webgal/src/store/stageReducer.ts
@@ -124,13 +124,18 @@ const stageSlice = createSlice({
       const effectIndex = state.effects.findIndex((e) => e.target === target);
       if (effectIndex >= 0) {
         // Update the existing effect
-        const targetScale = state.effects[effectIndex]!.transform!.scale;
-        const targetPosition = state.effects[effectIndex]!.transform!.position;
-        if (transform!.scale) Object.assign(targetScale!, omitBy(transform!.scale,isUndefined));
-        if (transform!.position) Object.assign(targetPosition!, omitBy(transform!.position,isUndefined));
-        Object.assign(state.effects[effectIndex]!.transform!, omitBy(transform,isUndefined))
-        state.effects[effectIndex].transform!.scale = targetScale;
-        state.effects[effectIndex].transform!.position = targetPosition;
+        if (!state.effects[effectIndex].transform) {
+          state.effects[effectIndex].transform = transform;
+        }
+        else if (transform){
+          const targetScale = state.effects[effectIndex].transform.scale || {};
+          const targetPosition = state.effects[effectIndex].transform.position || {};
+          if (transform.scale) Object.assign(targetScale, omitBy(transform.scale,isUndefined));
+          if (transform.position) Object.assign(targetPosition, omitBy(transform.position,isUndefined));
+          Object.assign(state.effects[effectIndex].transform, omitBy(transform,isUndefined))
+          state.effects[effectIndex].transform.scale = targetScale;
+          state.effects[effectIndex].transform.position = targetPosition;
+        }
       } else {
         // Add a new effect
         state.effects.push({
