Merge branch 'dev' into dependabot/npm_and_yarn/js-yaml-4.1.1

Author: MakinoharaShoko

.gitattributes

@@ -1,2 +1,2 @@
 # Auto detect text files and perform LF normalization
-* text=auto
+* text=auto eol=lf

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/config/scriptConfig.ts

@@ -38,6 +38,7 @@ export const SCRIPT_CONFIG = [
   { scriptString: 'getUserInput', scriptType: commandType.getUserInput },
   { scriptString: 'applyStyle', scriptType: commandType.applyStyle },
   { scriptString: 'wait', scriptType: commandType.wait },
+  { scriptString: 'callSteam', scriptType: commandType.callSteam },
 ];
 export const ADD_NEXT_ARG_LIST = [
   commandType.bgm,
@@ -53,6 +54,7 @@ export const ADD_NEXT_ARG_LIST = [
   commandType.playEffect,
   commandType.setTransition,
   commandType.applyStyle,
+  commandType.callSteam,
 ];
 
 export type ConfigMap = Map<string, ConfigItem>;

packages/parser/src/interface/sceneInterface.ts

@@ -39,6 +39,7 @@ export enum commandType {
   getUserInput,
   applyStyle,
   wait,
+  callSteam, // 调用Steam功能
 }
 
 /**

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];
   newSentenceRaw = newSentenceRaw.replaceAll('\\;',';');
-  if (newSentenceRaw === '') {
+  const sentenceComment = commentSplit[1] ?? '';
+  if (newSentenceRaw.trim() === '') {
     // 注释提前返回
     return {
       command: commandType.comment, // 语句类型
       commandRaw: 'comment', // 命令原始内容，方便调试
-      content: sentenceRaw.split(';')[1] ?? '', // 语句内容
+      content: sentenceComment.trim(), // 语句内容
       args: [{ key: 'next', value: true }], // 参数列表
       sentenceAssets: [], // 语句携带的资源列表
       subScene: [], // 语句携带的子场景

packages/webgal/package.json

@@ -5,7 +5,8 @@
     "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",
@@ -14,6 +15,7 @@
     "angular-expressions": "^1.4.3",
     "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",

packages/webgal/src/Core/Modules/animationFunctions.ts

@@ -7,7 +7,12 @@ import { baseTransform } from '@/store/stageInterface';
 import { generateTimelineObj } from '@/Core/controller/stage/pixi/animations/timeline';
 import { WebGAL } from '@/Core/WebGAL';
 import PixiStage, { IAnimationObject } from '@/Core/controller/stage/pixi/PixiController';
-import { DEFALUT_FIG_IN_DURATION, DEFALUT_FIG_OUT_DURATION } from '../constants';
+import {
+  DEFAULT_BG_IN_DURATION,
+  DEFAULT_BG_OUT_DURATION,
+  DEFAULT_FIG_IN_DURATION,
+  DEFAULT_FIG_OUT_DURATION,
+} from '../constants';
 
 // eslint-disable-next-line max-params
 export function getAnimationObject(animationName: string, target: string, duration: number, writeDefault: boolean) {
@@ -57,40 +62,46 @@ export function getEnterExitAnimation(
   animation: IAnimationObject | null;
 } {
   if (type === 'enter') {
-    let duration = DEFALUT_FIG_IN_DURATION;
+    let duration = DEFAULT_FIG_IN_DURATION;
     if (isBg) {
-      duration = 1500;
+      duration = DEFAULT_BG_IN_DURATION;
     }
+    duration =
+      webgalStore.getState().stage.animationSettings.find((setting) => setting.target === target)?.enterDuration ??
+      duration;
     // 走默认动画
     let animation: IAnimationObject | null = generateUniversalSoftInAnimationObj(realTarget ?? target, duration);
 
     const transformState = webgalStore.getState().stage.effects;
     const targetEffect = transformState.find((effect) => effect.target === target);
 
-    const animarionName = WebGAL.animationManager.nextEnterAnimationName.get(target);
-    if (animarionName && !targetEffect) {
+    const animationName = webgalStore
+      .getState()
+      .stage.animationSettings.find((setting) => setting.target === target)?.enterAnimationName;
+    if (animationName && !targetEffect) {
       logger.debug('取代默认进入动画', target);
-      animation = getAnimationObject(animarionName, realTarget ?? target, getAnimateDuration(animarionName), false);
-      duration = getAnimateDuration(animarionName);
-      // 用后重置
-      WebGAL.animationManager.nextEnterAnimationName.delete(target);
+      animation = getAnimationObject(animationName, realTarget ?? target, getAnimateDuration(animationName), false);
+      duration = getAnimateDuration(animationName);
     }
     return { duration, animation };
   } else {
     // exit
-    let duration = DEFALUT_FIG_OUT_DURATION;
+    let duration = DEFAULT_FIG_OUT_DURATION;
     if (isBg) {
-      duration = 1500;
+      duration = DEFAULT_BG_OUT_DURATION;
     }
+    duration =
+      webgalStore.getState().stage.animationSettings.find((setting) => setting.target + '-off' === target)
+        ?.exitDuration ?? duration;
     // 走默认动画
     let animation: IAnimationObject | null = generateUniversalSoftOffAnimationObj(realTarget ?? target, duration);
-    const animarionName = WebGAL.animationManager.nextExitAnimationName.get(target);
-    if (animarionName) {
+    const animationName = webgalStore
+      .getState()
+      .stage.animationSettings.find((setting) => setting.target + '-off' === target)?.exitAnimationName;
+    if (animationName) {
       logger.debug('取代默认退出动画', target);
-      animation = getAnimationObject(animarionName, realTarget ?? target, getAnimateDuration(animarionName), false);
-      duration = getAnimateDuration(animarionName);
-      // 用后重置
-      WebGAL.animationManager.nextExitAnimationName.delete(target);
+      animation = getAnimationObject(animationName, realTarget ?? target, getAnimateDuration(animationName), false);
+      duration = getAnimateDuration(animationName);
     }
     return { duration, animation };
   }

packages/webgal/src/Core/Modules/animations.ts

@@ -8,8 +8,8 @@ export interface IUserAnimation {
 export type AnimationFrame = ITransform & { duration: number; ease: string };
 
 export class AnimationManager {
-  public nextEnterAnimationName: Map<string, string> = new Map();
-  public nextExitAnimationName: Map<string, string> = new Map();
+  // public nextEnterAnimationName: Map<string, string> = new Map();
+  // public nextExitAnimationName: Map<string, string> = new Map();
   private animations: Array<IUserAnimation> = [];
 
   public addAnimation(animation: IUserAnimation) {