Merge pull request #582 from OpenWebGAL/dev

4.5.9

Author: MakinoharaShoko

packages/webgal/package.json

@@ -1,7 +1,7 @@
 {
   "name": "webgal",
   "private": true,
-  "version": "4.5.8",
+  "version": "4.5.9",
   "scripts": {
     "dev": "vite --host --port 3000",
     "build": "cross-env NODE_ENV=production tsc && vite build --base=./",

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

@@ -1,4 +1,4 @@
 {
   "name":"Default Template",
-  "webgal-version":"4.5.8"
+  "webgal-version":"4.5.9"
 }

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';
 
 /**
  * 获取随机演出名称
@@ -18,8 +19,23 @@ export class PerformController {
   public timeoutList: Array<ReturnType<typeof setTimeout>> = [];
 
   public arrangeNewPerform(perform: IPerform, script: ISentence, syncPerformState = true) {
+    // 检查演出列表内是否有相同的演出，如果有，一定是出了什么问题
+    const dupPerformIndex = this.performList.findIndex((p) => p.performName === perform.performName);
+    if (dupPerformIndex > -1) {
+      // 结束并删除全部重复演出
+      for (let i = 0; i < this.performList.length; i++) {
+        const e = this.performList[i];
+        if (e.performName === perform.performName) {
+          e.stopFunction();
+          clearTimeout(e.stopTimeout as unknown as number);
+          this.performList.splice(i, 1);
+          i--;
+        }
+      }
+    }
+
     // 语句不执行演出
-    if (perform.performName === 'none') {
+    if (perform.performName === WEBGAL_NONE) {
       return;
     }
     // 同步演出状态
@@ -50,12 +66,19 @@ export class PerformController {
         if (!e.isHoldOn && e.performName === name) {
           e.stopFunction();
           clearTimeout(e.stopTimeout as unknown as number);
+          /**
+           * 在演出列表里删除演出对象的操作必须在调用 goNextWhenOver 之前
+           * 因为 goNextWhenOver 会调用 nextSentence，而 nextSentence 会清除目前未结束的演出
+           * 那么 nextSentence 函数就会删除这个演出，但是此时，在这个上下文，i 已经被确定了
+           * 所以 goNextWhenOver 后的代码会多删东西，解决方法就是在调用 goNextWhenOver 前先删掉这个演出对象
+           * 此问题对所有 goNextWhenOver 属性为真的演出都有影响，但只有 2 个演出有此问题
+           */
+          this.performList.splice(i, 1);
+          i--;
           if (e.goNextWhenOver) {
             // nextSentence();
             this.goNextWhenOver();
           }
-          this.performList.splice(i, 1);
-          i--;
         }
       }
     } else {

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/gamePlay/nextSentence.ts

@@ -70,7 +70,7 @@ export const nextSentence = () => {
     if (!e.isHoldOn) {
       if (e.goNextWhenOver) {
         isGoNext = true;
-      }
+      } // 先检查是不是要跳过收集
       if (!e.skipNextCollect) {
         // 由于提前结束使用的不是 unmountPerform 标准 API，所以不会触发两次 nextSentence
         e.stopFunction();

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

@@ -842,7 +842,7 @@ export default class PixiStage {
 
     const paramY = mapToZeroOne(y);
     const target = this.figureObjects.find((e) => e.key === key);
-    if (target) {
+    if (target && target.sourceType === 'live2d') {
       const container = target.pixiContainer;
       const children = container.children;
       for (const model of children) {

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 {
@@ -56,14 +72,15 @@ export const playEffect = (sentence: ISentence): IPerform => {
         const seVol = mainVol * 0.01 * (userDataState.optionData?.seVolume ?? 100) * 0.01 * volume * 0.01;
         seElement.volume = seVol;
         seElement.currentTime = 0;
-        const perform = {
+        const perform: IPerform = {
           performName: performInitName,
           duration: 1000 * 60 * 60,
           isHoldOn: isLoop,
           skipNextCollect: true,
           stopFunction: () => {
             // 演出已经结束了，所以不用播放效果音了
             seElement.pause();
+            seElement.remove();
           },
           blockingNext: () => false,
           blockingAuto: () => {

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

@@ -23,6 +23,9 @@ export const say = (sentence: ISentence): IPerform => {
   const dispatch = webgalStore.dispatch;
   let dialogKey = Math.random().toString(); // 生成一个随机的key
   let dialogToShow = sentence.content; // 获取对话内容
+  if (dialogToShow) {
+    dialogToShow = String(dialogToShow).replace(/ /g, '\u00a0'); // 替换空格
+  }
   const isConcat = getSentenceArgByKey(sentence, 'concat'); // 是否是继承语句
   const isNotend = getSentenceArgByKey(sentence, 'notend') as boolean; // 是否有 notend 参数
   const speaker = getSentenceArgByKey(sentence, 'speaker'); // 获取说话者

packages/webgal/src/config/info.ts

@@ -1,5 +1,5 @@
 export const __INFO = {
-  version: 'WebGAL 4.5.8',
+  version: 'WebGAL 4.5.9',
   contributors: [
     // 现在改为跳转到 GitHub 了
   ],