Merge pull request #765 from OpenWebGAL/dev

4.5.15

Author: MakinoharaShoko

packages/parser/src/config/scriptConfig.ts

@@ -1,50 +1,58 @@
 import {commandType} from '../interface/sceneInterface';
 
 export const SCRIPT_CONFIG = [
-  { scriptString: 'intro', scriptType: commandType.intro },
+  { scriptString: 'say', scriptType: commandType.say },
   { scriptString: 'changeBg', scriptType: commandType.changeBg },
   { scriptString: 'changeFigure', scriptType: commandType.changeFigure },
+  { scriptString: 'bgm', scriptType: commandType.bgm },
+  { scriptString: 'playVideo', scriptType: commandType.video },
+  { scriptString: 'pixiPerform', scriptType: commandType.pixi },
+  { scriptString: 'pixiInit', scriptType: commandType.pixiInit },
+  { scriptString: 'intro', scriptType: commandType.intro },
   { scriptString: 'miniAvatar', scriptType: commandType.miniAvatar },
   { scriptString: 'changeScene', scriptType: commandType.changeScene },
   { scriptString: 'choose', scriptType: commandType.choose },
   { scriptString: 'end', scriptType: commandType.end },
-  { scriptString: 'bgm', scriptType: commandType.bgm },
-  { scriptString: 'playVideo', scriptType: commandType.video },
   {
     scriptString: 'setComplexAnimation',
     scriptType: commandType.setComplexAnimation,
   },
   { scriptString: 'setFilter', scriptType: commandType.setFilter },
-  { scriptString: 'pixiInit', scriptType: commandType.pixiInit },
-  { scriptString: 'pixiPerform', scriptType: commandType.pixi },
   { scriptString: 'label', scriptType: commandType.label },
   { scriptString: 'jumpLabel', scriptType: commandType.jumpLabel },
+  { scriptString: 'chooseLabel', scriptType: commandType.chooseLabel },
   { scriptString: 'setVar', scriptType: commandType.setVar },
+  { scriptString: 'if', scriptType: commandType.if },
   { scriptString: 'callScene', scriptType: commandType.callScene },
   { scriptString: 'showVars', scriptType: commandType.showVars },
   { scriptString: 'unlockCg', scriptType: commandType.unlockCg },
   { scriptString: 'unlockBgm', scriptType: commandType.unlockBgm },
-  { scriptString: 'say', scriptType: commandType.say },
   { scriptString: 'filmMode', scriptType: commandType.filmMode },
-  { scriptString: 'callScene', scriptType: commandType.callScene },
   { scriptString: 'setTextbox', scriptType: commandType.setTextbox },
   { scriptString: 'setAnimation', scriptType: commandType.setAnimation },
   { scriptString: 'playEffect', scriptType: commandType.playEffect },
+  { scriptString: 'setTempAnimation', scriptType: commandType.setTempAnimation },
+  // comment?
+  { scriptString: 'setTransform', scriptType: commandType.setTransform },
+  { scriptString: 'setTransition', scriptType: commandType.setTransition },
+  { scriptString: 'getUserInput', scriptType: commandType.getUserInput },
   { scriptString: 'applyStyle', scriptType: commandType.applyStyle },
   { scriptString: 'wait', scriptType: commandType.wait },
 ];
 export const ADD_NEXT_ARG_LIST = [
   commandType.bgm,
   commandType.pixi,
   commandType.pixiInit,
+  commandType.miniAvatar,
   commandType.label,
   commandType.if,
-  commandType.miniAvatar,
   commandType.setVar,
-  commandType.unlockBgm,
   commandType.unlockCg,
+  commandType.unlockBgm,
   commandType.filmMode,
   commandType.playEffect,
+  commandType.setTransition,
+  commandType.applyStyle,
 ];
 
 export type ConfigMap = Map<string, ConfigItem>;

packages/parser/test/debug.ts

@@ -16,7 +16,7 @@ async function debug() {
   const configFesult = parser.parseConfig(`
 Game_name:欢迎使用WebGAL！;
 Game_key:0f86dstRf;
-Title_img:WebGAL_New_Enter_Image.png;
+Title_img:WebGAL_New_Enter_Image.webp;
 Title_bgm:s_Title.mp3;
 Title_logos: 1.png | 2.png | Image Logo.png| -show -active=false -add=op! -count=3;This is a fake config, do not reference anything.
   `)

packages/parser/test/parser.test.ts

@@ -134,7 +134,7 @@ test("config", async () => {
   const configFesult = parser.parseConfig(`
 Game_name:欢迎使用WebGAL！;
 Game_key:0f86dstRf;
-Title_img:WebGAL_New_Enter_Image.png;
+Title_img:WebGAL_New_Enter_Image.webp;
 Title_bgm:s_Title.mp3;
 Title_logos: 1.png | 2.png | Image Logo.png| -show -active=false -add=op! -count=3;This is a fake config, do not reference anything.
   `);
@@ -159,7 +159,7 @@ test("config-stringify", async () => {
   const configFesult = parser.parseConfig(`
 Game_name:欢迎使用WebGAL！;
 Game_key:0f86dstRf;
-Title_img:WebGAL_New_Enter_Image.png;
+Title_img:WebGAL_New_Enter_Image.webp;
 Title_bgm:s_Title.mp3;
 Title_logos: 1.png | 2.png | Image Logo.png| -show -active=false -add=op! -count=3;This is a fake config, do not reference anything.
   `);
@@ -218,17 +218,17 @@ test("changeFigure with duration and animation args", async () => {
     return fileName;
   }, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG);
 
-  const result = parser.parse(`changeFigure:stand.png -duration=1000 -enter=fadeIn -exit=fadeOut;`, 'test', 'test');
+  const result = parser.parse(`changeFigure:stand.webp -duration=1000 -enter=fadeIn -exit=fadeOut;`, 'test', 'test');
   expect(result.sentenceList).toContainEqual({
     command: commandType.changeFigure,
     commandRaw: "changeFigure",
-    content: "stand.png",
+    content: "stand.webp",
     args: [
       { key: 'duration', value: 1000 },
       { key: 'enter', value: 'fadeIn' },
       { key: 'exit', value: 'fadeOut' }
     ],
-    sentenceAssets: [{ name: "stand.png", url: 'stand.png', type: fileType.figure, lineNumber: 0 }],
+    sentenceAssets: [{ name: "stand.webp", url: 'stand.webp', type: fileType.figure, lineNumber: 0 }],
     subScene: []
   });
 });

packages/parser/test/parserMultiline.test.ts

@@ -85,14 +85,14 @@ bgm:s_Title.mp3;
 unlockBgm:s_Title.mp3 -name=雲を追いかけて;
 intro:你好
 |欢迎来到 WebGAL 的世界;
-changeBg:bg.png -next;
-unlockCg:bg.png -name=良夜; // 解锁CG并赋予名称
-changeFigure:stand.png -left -next;
+changeBg:bg.webp -next;
+unlockCg:bg.webp -name=良夜; // 解锁CG并赋予名称
+changeFigure:stand.webp -left -next;
 setAnimation:enter-from-left
   -target=fig-left -next;
 WebGAL:欢迎使用 WebGAL！这是一款全新的网页端视觉小说引擎。
   -v1.wav;
-changeFigure:stand2.png
+changeFigure:stand2.webp
   -right -next;
 WebGAL 是使用 Web 技术开发的引擎，因此在网页端有良好的表现。 -v2.wav;
 由于这个特性，如果你将 WebGAL 部署到服务器或网页托管平台上，玩家只需要一串链接就可以开始游玩！ -v3.wav;
@@ -121,14 +121,14 @@ bgm:s_Title.mp3;
 unlockBgm:s_Title.mp3 -name=雲を追いかけて;
 intro:你好
 |欢迎来到 WebGAL 的世界;
-changeBg:bg.png -next;
-unlockCg:bg.png -name=良夜; // 解锁CG并赋予名称
-changeFigure:stand.png -left -next;
+changeBg:bg.webp -next;
+unlockCg:bg.webp -name=良夜; // 解锁CG并赋予名称
+changeFigure:stand.webp -left -next;
 setAnimation:enter-from-left -target=fig-left -next;
 ;_WEBGAL_LINE_BREAK_  -target=fig-left -next;
 WebGAL:欢迎使用 WebGAL！这是一款全新的网页端视觉小说引擎。 -v1.wav;
 ;_WEBGAL_LINE_BREAK_  -v1.wav;
-changeFigure:stand2.png -right -next;
+changeFigure:stand2.webp -right -next;
 ;_WEBGAL_LINE_BREAK_  -right -next;
 WebGAL 是使用 Web 技术开发的引擎，因此在网页端有良好的表现。 -v2.wav;
 由于这个特性，如果你将 WebGAL 部署到服务器或网页托管平台上，玩家只需要一串链接就可以开始游玩！ -v3.wav;

packages/parser/test/test-resources/line-break.txt

@@ -14,14 +14,14 @@ bgm:s_Title.mp3;
 unlockBgm:s_Title.mp3 -name=雲を追いかけて;
 intro:你好
 |欢迎来到 WebGAL 的世界;
-changeBg:bg.png -next;
-unlockCg:bg.png -name=良夜; // 解锁CG并赋予名称
-changeFigure:stand.png -left -next;
+changeBg:bg.webp -next;
+unlockCg:bg.webp -name=良夜; // 解锁CG并赋予名称
+changeFigure:stand.webp -left -next;
 setAnimation:enter-from-left
   -target=fig-left -next;
 WebGAL:欢迎使用 WebGAL！这是一款全新的网页端视觉小说引擎。
   -v1.wav;
-changeFigure:stand2.png
+changeFigure:stand2.webp
   -right -next;
 WebGAL 是使用 Web 技术开发的引擎，因此在网页端有良好的表现。 -v2.wav;
 由于这个特性，如果你将 WebGAL 部署到服务器或网页托管平台上，玩家只需要一串链接就可以开始游玩！ -v3.wav;