Skip to content

Commit 4d18ad0

Browse files
Merge branch 'dev' into pr/763
2 parents 3cc90b7 + 38953b7 commit 4d18ad0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+567
-283
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Auto detect text files and perform LF normalization
2-
* text=auto
2+
* text=auto eol=lf

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ https://demo.openwebgal.com
2424

2525
#### 完整的游戏
2626

27-
[铃色☆记忆](http://hoshinasuzu.cn/) by 星奈组 [备用链接](http://hoshinasuzu.cc/)
27+
[WebGAL 官方游戏展示页](https://www.openwebgal.com/games/)
2828

2929
[Elf of Era Idols Project](https://store.steampowered.com/app/2414730/Elf_of_Era_Idols_Project/) (通过 Steam 获取)
3030

README_EN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ https://demo.openwebgal.com
2626

2727
A complete game:
2828

29-
[铃色☆记忆](http://hoshinasuzu.cn/) by Hoshinasuzu [备用链接](http://hoshinasuzu.cc/)
29+
[WebGAL games showcase](https://www.openwebgal.com/games/)
3030

3131
### Creating Games with WebGAL
3232

README_FR.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ https://demo.openwebgal.com
2727

2828
Un jeu complet :
2929

30-
[铃色☆记忆](http://hoshinasuzu.cn/) de Hoshinasuzu [Lien de secours](http://hoshinasuzu.cc/)
30+
[Présentation officielle des jeux WebGAL](https://www.openwebgal.com/games/)
3131

3232
### Créer des jeux avec WebGAL
3333

README_JP.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ https://webgal-jp-demo.onrender.com/
2626

2727
現在公開されているゲーム(中国語):
2828

29-
[ベルカラー☆メモリー](http://hoshinasuzu.cn/suzu.html) by Hoshinasuzu [代替リンク](http://hoshinasuzu.cc/)
29+
[WebGAL公式ゲーム紹介ページ](https://www.openwebgal.com/games/)
3030

3131
### WebGALでゲームを作成
3232

README_KO.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ https://demo.openwebgal.com
2626

2727
완성된 게임:
2828

29-
[铃色☆记忆](http://hoshinasuzu.cn/) by Hoshinasuzu [백업 링크](http://hoshinasuzu.cc/)
29+
[WebGAL 공식 게임 소개 페이지](https://www.openwebgal.com/games/)
3030

3131
### WebGAL로 게임 만들기
3232

packages/parser/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
22
"name": "webgal-parser",
3-
"version": "4.5.13",
3+
"version": "4.5.16",
44
"description": "WebGAL script parser",
55
"scripts": {
66
"test": "vitest",
77
"coverage": "vitest run --coverage",
88
"build": "rimraf -rf ./build && rollup --config",
9+
"prepublishOnly": "npm run build",
910
"build-ci": "rollup --config",
1011
"debug": "tsx test/debug.ts",
1112
"debug-scss-parser": "tsx test/debugCssParser.ts",

packages/parser/src/config/scriptConfig.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ export const SCRIPT_CONFIG = [
3838
{ scriptString: 'getUserInput', scriptType: commandType.getUserInput },
3939
{ scriptString: 'applyStyle', scriptType: commandType.applyStyle },
4040
{ scriptString: 'wait', scriptType: commandType.wait },
41+
{ scriptString: 'callSteam', scriptType: commandType.callSteam },
4142
];
4243
export const ADD_NEXT_ARG_LIST = [
4344
commandType.bgm,
@@ -53,6 +54,7 @@ export const ADD_NEXT_ARG_LIST = [
5354
commandType.playEffect,
5455
commandType.setTransition,
5556
commandType.applyStyle,
57+
commandType.callSteam,
5658
];
5759

5860
export type ConfigMap = Map<string, ConfigItem>;

packages/parser/src/interface/sceneInterface.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ export enum commandType {
3939
getUserInput,
4040
applyStyle,
4141
wait,
42+
callSteam, // 调用Steam功能
4243
}
4344

4445
/**

packages/parser/src/sceneParser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export const sceneParser = (
2929
ADD_NEXT_ARG_LIST: commandType[],
3030
SCRIPT_CONFIG_MAP: ConfigMap,
3131
): IScene => {
32-
const rawSentenceList = rawScene.split('\n'); // 原始句子列表
32+
const rawSentenceList = rawScene.replaceAll('\r', '').split('\n'); // 原始句子列表
3333

3434
// 去分号留到后面去做了,现在注释要单独处理
3535
const rawSentenceListWithoutEmpty = rawSentenceList;

0 commit comments

Comments
 (0)