Merge branch 'dev' into pr/764

Author: MakinoharaShoko

README.md

@@ -24,7 +24,7 @@ https://demo.openwebgal.com
 
 #### 完整的游戏
 
-[铃色☆记忆](http://hoshinasuzu.cn/) by 星奈组  [备用链接](http://hoshinasuzu.cc/)
+[WebGAL 官方游戏展示页](https://www.openwebgal.com/games/)
 
 [Elf of Era Idols Project](https://store.steampowered.com/app/2414730/Elf_of_Era_Idols_Project/) (通过 Steam 获取)
 

README_EN.md

@@ -26,7 +26,7 @@ https://demo.openwebgal.com
 
 A complete game:
 
-[铃色☆记忆](http://hoshinasuzu.cn/) by Hoshinasuzu  [备用链接](http://hoshinasuzu.cc/)
+[WebGAL games showcase](https://www.openwebgal.com/games/)
 
 ### Creating Games with WebGAL
 

README_FR.md

@@ -27,7 +27,7 @@ https://demo.openwebgal.com
 
 Un jeu complet :
 
-[铃色☆记忆](http://hoshinasuzu.cn/) de Hoshinasuzu [Lien de secours](http://hoshinasuzu.cc/)
+[Présentation officielle des jeux WebGAL](https://www.openwebgal.com/games/)
 
 ### Créer des jeux avec WebGAL
 

README_JP.md

@@ -26,7 +26,7 @@ https://webgal-jp-demo.onrender.com/
 
 現在公開されているゲーム（中国語）:
 
-[ベルカラー☆メモリー](http://hoshinasuzu.cn/suzu.html) by Hoshinasuzu  [代替リンク](http://hoshinasuzu.cc/)
+[WebGAL公式ゲーム紹介ページ](https://www.openwebgal.com/games/)
 
 ### WebGALでゲームを作成
 

README_KO.md

@@ -26,7 +26,7 @@ https://demo.openwebgal.com
 
 완성된 게임:
 
-[铃色☆记忆](http://hoshinasuzu.cn/) by Hoshinasuzu  [백업 링크](http://hoshinasuzu.cc/)
+[WebGAL 공식 게임 소개 페이지](https://www.openwebgal.com/games/)
 
 ### WebGAL로 게임 만들기
 

packages/parser/package.json

@@ -1,11 +1,12 @@
 {
   "name": "webgal-parser",
-  "version": "4.5.13",
+  "version": "4.5.16",
   "description": "WebGAL script parser",
   "scripts": {
     "test": "vitest",
     "coverage": "vitest run --coverage",
     "build": "rimraf -rf ./build && rollup --config",
+    "prepublishOnly": "npm run build",
     "build-ci": "rollup --config",
     "debug": "tsx test/debug.ts",
     "debug-scss-parser": "tsx test/debugCssParser.ts",

packages/parser/src/sceneParser.ts

@@ -29,7 +29,7 @@ export const sceneParser = (
   ADD_NEXT_ARG_LIST: commandType[],
   SCRIPT_CONFIG_MAP: ConfigMap,
 ): IScene => {
-  const rawSentenceList = rawScene.split('\n'); // 原始句子列表
+  const rawSentenceList = rawScene.replaceAll('\r', '').split('\n'); // 原始句子列表
 
   // 去分号留到后面去做了，现在注释要单独处理
   const rawSentenceListWithoutEmpty = rawSentenceList;

packages/parser/src/scriptParser/argsParser.ts

@@ -23,10 +23,10 @@ export function argsParser(
   });
   rawArgsList.forEach((e) => {
     const equalSignIndex = e.indexOf('=');
-    let argName = e.slice(0, equalSignIndex);
-    let argValue: string | undefined = e.slice(equalSignIndex + 1);
+    let argName = e.slice(0, equalSignIndex).trim();
+    let argValue: string | undefined = e.slice(equalSignIndex + 1).trim();
     if (equalSignIndex < 0) {
-      argName = e;
+      argName = e.trim();
       argValue = undefined;
     }
     // 判断是不是语音参数

packages/parser/src/scriptParser/scriptParser.ts

@@ -36,14 +36,16 @@ export const scriptParser = (
   // 正式开始解析
 
   // 去分号
-  let newSentenceRaw = sentenceRaw.split(/(?<!\\);/)[0];
+  const commentSplit = sentenceRaw.split(/(?<!\\);/);
+  let newSentenceRaw = commentSplit[0].trim();
   newSentenceRaw = newSentenceRaw.replaceAll('\\;',';');
+  const sentenceComment = commentSplit[1] ?? '';
   if (newSentenceRaw === '') {
     // 注释提前返回
     return {
       command: commandType.comment, // 语句类型
       commandRaw: 'comment', // 命令原始内容，方便调试
-      content: sentenceRaw.split(';')[1] ?? '', // 语句内容
+      content: sentenceComment.trim(), // 语句内容
       args: [{ key: 'next', value: true }], // 参数列表
       sentenceAssets: [], // 语句携带的资源列表
       subScene: [], // 语句携带的子场景

packages/webgal/package.json

@@ -1,19 +1,21 @@
 {
   "name": "webgal-engine",
-  "version": "4.5.14",
+  "version": "4.5.16",
   "scripts": {
     "dev": "vite --host --port 3000",
     "build": "cross-env NODE_ENV=production tsc && vite build --base=./",
     "preview": "vite preview",
-    "lint": "eslint src/** --fix"
+    "lint": "eslint src/** --fix",
+    "prepublishOnly": "npm run build"
   },
   "dependencies": {
     "@emotion/css": "^11.11.2",
     "@icon-park/react": "^1.4.2",
     "@reduxjs/toolkit": "^1.8.1",
     "angular-expressions": "^1.4.3",
-    "axios": "^0.28.0",
+    "axios": "^0.30.2",
     "cloudlogjs": "^1.0.9",
+    "gifuct-js": "^2.1.2",
     "i18next": "^22.4.15",
     "localforage": "^1.10.0",
     "lodash": "^4.17.21",