fix: An issue where multiple performance records were unexpectedly stored in the state table when loading a save; An issue where performances with ID-based sound effects were not completely cleared after stopping playback; Deduplication of performance lists in the state table and performance controller upon insertion

Author: MakinoharaShoko

packages/webgal/src/Core/Modules/perform/performController.ts

@@ -5,6 +5,7 @@ import cloneDeep from 'lodash/cloneDeep';
 import { resetStageState, stageActions } from '@/store/stageReducer';
 import { nextSentence } from '@/Core/controller/gamePlay/nextSentence';
 import { IRunPerform } from '@/store/stageInterface';
+import { WEBGAL_NONE } from '@/Core/constants';
 
 /**
  * 获取随机演出名称
@@ -34,7 +35,7 @@ export class PerformController {
     }
 
     // 语句不执行演出
-    if (perform.performName === 'none') {
+    if (perform.performName === WEBGAL_NONE) {
       return;
     }
     // 同步演出状态

packages/webgal/src/Core/constants.ts

@@ -4,3 +4,5 @@ export const STAGE_KEYS = {
   FIG_L: 'fig-left',
   FIG_R: 'fig-right',
 };
+
+export const WEBGAL_NONE = 'none';

packages/webgal/src/Core/controller/storage/jumpFromBacklog.ts

@@ -3,7 +3,7 @@ import { sceneFetcher } from '../scene/sceneFetcher';
 import { sceneParser } from '../../parser/sceneParser';
 import { IStageState } from '@/store/stageInterface';
 import { webgalStore } from '@/store/store';
-import { resetStageState } from '@/store/stageReducer';
+import { resetStageState, stageActions } from '@/store/stageReducer';
 import { setVisibility } from '@/store/GUIReducer';
 import { runScript } from '@/Core/controller/gamePlay/runScript';
 import { stopAllPerform } from '@/Core/controller/gamePlay/stopAllPerform';
@@ -18,7 +18,10 @@ import { WebGAL } from '@/Core/WebGAL';
  */
 export const restorePerform = () => {
   const stageState = webgalStore.getState().stage;
-  stageState.PerformList.forEach((e) => {
+  const performToRestore = cloneDeep(stageState.PerformList);
+  // 清除状态表中演出序列
+  webgalStore.dispatch(stageActions.removeAllPerform());
+  performToRestore.forEach((e) => {
     runScript(e.script);
   });
 };

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

@@ -5,6 +5,7 @@ import { getSentenceArgByKey } from '@/Core/util/getSentenceArg';
 import { IPerform } from '@/Core/Modules/perform/performInterface';
 import { useSelector } from 'react-redux';
 import { WebGAL } from '@/Core/WebGAL';
+import { WEBGAL_NONE } from '@/Core/constants';
 
 /**
  * 播放一段效果音
@@ -27,6 +28,21 @@ export const playEffect = (sentence: ISentence): IPerform => {
     isLoop = true;
   }
   let isOver = false;
+  if (!url || url === WEBGAL_NONE) {
+    return {
+      performName: WEBGAL_NONE,
+      duration: 0,
+      isHoldOn: false,
+      blockingAuto(): boolean {
+        return false;
+      },
+      blockingNext(): boolean {
+        return false;
+      },
+      stopFunction(): void {},
+      stopTimeout: undefined,
+    };
+  }
   return {
     performName: 'none',
     blockingAuto(): boolean {

packages/webgal/src/store/stageReducer.ts

@@ -148,6 +148,9 @@ const stageSlice = createSlice({
         }
       }
     },
+    removeAllPerform: (state) => {
+      state.PerformList.splice(0, state.PerformList.length);
+    },
     removeAllPixiPerforms: (state, action: PayloadAction<undefined>) => {
       for (let i = 0; i < state.PerformList.length; i++) {
         const performItem: IRunPerform = state.PerformList[i];
@@ -218,7 +221,6 @@ const stageSlice = createSlice({
       if (action.payload[3]) {
         if (state.figureMetaData[action.payload[0]]) delete state.figureMetaData[action.payload[0]];
       } else {
-        console.log('yeah');
         // 初始化对象
         if (!state.figureMetaData[action.payload[0]]) {
           state.figureMetaData[action.payload[0]] = {};