Merge pull request #970 from OpenWebGAL/dev

4.6.1

Author: MakinoharaShoko

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webgal/base",
-  "version": "4.6.0",
+  "version": "4.6.1",
   "description": "A brand new web Visual Novel engine.",
   "repository": "https://github.com/OpenWebGAL/WebGAL.git",
   "author": "Mahiru <Mahiru_@outlook.com>",

packages/parser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webgal-parser",
-  "version": "4.5.18",
+  "version": "4.6.1",
   "description": "WebGAL script parser",
   "scripts": {
     "test": "vitest",

packages/parser/src/scriptParser/argsParser.ts

@@ -35,36 +35,39 @@ export function argsParser(
         key: 'vocal',
         value: assetSetter(e, fileType.vocal),
       });
-    } else {
-      // 判断是不是省略参数
-      if (argValue === undefined) {
-        returnArrayList.push({
-          key: argName,
-          value: true,
-        });
-      } else {
-        // 是字符串描述的布尔值
-        if (argValue === 'true' || argValue === 'false') {
-          returnArrayList.push({
-            key: argName,
-            value: argValue === 'true',
-          });
-        } else {
-          // 是数字
-          if (!isNaN(Number(argValue))) {
-            returnArrayList.push({
-              key: argName,
-              value: Number(argValue),
-            });
-          } else {
-            // 是普通参数
-            returnArrayList.push({
-              key: argName,
-              value: argValue,
-            });
-          }
-        }
-      }
+    } else if (argName === 'vocal' && argValue !== undefined) {
+      returnArrayList.push({
+        key: argName,
+        value: assetSetter(argValue, fileType.vocal),
+      });
+    }
+    // 判断是不是省略参数
+    else if (argValue === undefined) {
+      returnArrayList.push({
+        key: argName,
+        value: true,
+      });
+    }
+    // 是字符串描述的布尔值
+    else if (argValue === 'true' || argValue === 'false') {
+      returnArrayList.push({
+        key: argName,
+        value: argValue === 'true',
+      });
+    }
+    // 是数字
+    else if (!isNaN(Number(argValue))) {
+      returnArrayList.push({
+        key: argName,
+        value: Number(argValue),
+      });
+    }
+    // 是普通参数
+    else {
+      returnArrayList.push({
+        key: argName,
+        value: argValue,
+      });
     }
   });
   return returnArrayList;

packages/parser/test/parser.test.ts

@@ -202,6 +202,27 @@ test("say statement", async () => {
   expect(result.sentenceList).toContainEqual(expectSentenceItem);
 });
 
+test("say statement applies asset setter to vocal named argument", async () => {
+  const parser = new SceneParser((assetList) => {
+  }, (fileName, assetType) => {
+    if (assetType === fileType.vocal) {
+      return `./game/vocal/${fileName}`;
+    }
+    return fileName;
+  }, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG);
+
+  const result = parser.parse(`say:123 -speaker=xx -vocal=a.mp3;`, 'test', 'test');
+  const sentence = result.sentenceList[0];
+
+  expect(sentence.args).toContainEqual({ key: 'vocal', value: './game/vocal/a.mp3' });
+  expect(sentence.sentenceAssets).toContainEqual({
+    name: './game/vocal/a.mp3',
+    url: './game/vocal/a.mp3',
+    type: fileType.vocal,
+    lineNumber: 0,
+  });
+});
+
 test("wait command", async () => {
   const parser = new SceneParser((assetList) => {
   }, (fileName, assetType) => {

packages/webgal/package.json

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

packages/webgal/public/game/config.txt

@@ -4,3 +4,4 @@ Title_img:WebGAL_New_Enter_Image.webp;
 Title_bgm:s_Title.mp3;
 Game_Logo:WebGalEnter.webp;
 Enable_Appreciation:true;
+Enable_Continue:true;

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

@@ -6,7 +6,8 @@ setTransition: -target=bg-main -exit=shockwaveOut;
 :你好|欢迎来到 {engine} 的世界;
 changeBg:bg.webp -next;
 setTransition: -target=bg-main -enter=shockwaveIn -next;
-unlockCg:bg.webp -name=良い夜; // 解锁CG并赋予名称
+unlockCg:bg.webp -name=良い夜 -series=op; // 解锁CG并赋予名称
+unlockCg:WebGAL_New_Enter_Image.webp -name=Enter -series=op; // 解锁CG并赋予名称
 changeFigure:stand.webp -left -enter=enter-from-left -animationFlag=on -eyesOpen=stand.webp -eyesClose=stand.webp -mouthOpen=open_mouth.webp -mouthHalfOpen=open_mouth.webp -mouthClose=stand.webp -next;
 miniAvatar:miniavatar.webp;
 {heroine}:欢迎使用 {engine}！这是一款全新的网页端视觉小说引擎。 -v1.wav -left;

packages/webgal/public/game/template/Stage/TextBox/textbox.scss

@@ -182,5 +182,4 @@
   background-clip: border-box;
   -webkit-background-clip: border-box;
   color: #C0C0C0;
-  -webkit-text-fill-color: #C0C0C0;
 }

packages/webgal/public/game/template/UI/Title/title.scss

@@ -69,7 +69,6 @@
   background-clip: border-box;
   -webkit-background-clip: border-box;
   color: #ffffff;
-  -webkit-text-fill-color: #ffffff;
   z-index: 2;
   text-shadow:
     0 2px 6px rgba(7, 12, 20, 0.15),

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

@@ -1,4 +1,4 @@
 {
   "name":"WebGAL Refine 2026",
-  "webgal-version":"4.6.0"
+  "webgal-version":"4.6.1"
 }