webgal-parser 4.4.9 → 4.4.14-2

package/src/configParser/configParser.ts

@@ -1,29 +1,28 @@
-import {argsParser} from "../scriptParser/argsParser";
+import { argsParser } from '../scriptParser/argsParser';
 
-interface IOptionItem{
-  key:string;
-  value:string | number | boolean;
+interface IOptionItem {
+  key: string;
+  value: string | number | boolean;
 }
-interface IConfigItem{
-  command:string;
-  args:string[]
-  options:IOptionItem[];
+interface IConfigItem {
+  command: string;
+  args: string[];
+  options: IOptionItem[];
 }
 
-export type WebgalConfig = IConfigItem[]
+export type WebgalConfig = IConfigItem[];
 
-
-function configLineParser(inputLine:string):IConfigItem{
-  const options:Array<IOptionItem> = [];
+function configLineParser(inputLine: string): IConfigItem {
+  const options: Array<IOptionItem> = [];
   let command: string;
 
-  let newSentenceRaw = inputLine.split(";")[0];
-  if (newSentenceRaw === "") {
+  let newSentenceRaw = inputLine.split(';')[0];
+  if (newSentenceRaw === '') {
     // 注释提前返回
     return {
-      command:'',
-      args:[],
-      options:[]
+      command: '',
+      args: [],
+      options: [],
     };
   }
   // 截取命令
@@ -35,26 +34,39 @@ function configLineParser(inputLine:string):IConfigItem{
   } else {
     command = newSentenceRaw.substring(0, getCommandResult.index);
     // 划分命令区域和content区域
-    newSentenceRaw = newSentenceRaw.substring(getCommandResult.index + 1, newSentenceRaw.length);
+    newSentenceRaw = newSentenceRaw.substring(
+      getCommandResult.index + 1,
+      newSentenceRaw.length,
+    );
   }
   // 截取 Options 区域
   const getOptionsResult = / -/.exec(newSentenceRaw);
   // 获取到参数
   if (getOptionsResult) {
-    const optionsRaw = newSentenceRaw.substring(getOptionsResult.index, newSentenceRaw.length);
+    const optionsRaw = newSentenceRaw.substring(
+      getOptionsResult.index,
+      newSentenceRaw.length,
+    );
     newSentenceRaw = newSentenceRaw.substring(0, getOptionsResult.index);
-    for (const e of argsParser(optionsRaw, (name,_)=>{return name})) {
+    for (const e of argsParser(optionsRaw, (name, _) => {
+      return name;
+    })) {
       options.push(e);
     }
   }
   return {
     command,
-    args:newSentenceRaw.split('|').map(e=>e.trim()).filter(e=>e!==''),
-    options
+    args: newSentenceRaw
+      .split('|')
+      .map((e) => e.trim())
+      .filter((e) => e !== ''),
+    options,
   };
 }
 
-export function configParser(configText:string):WebgalConfig{
-  const configLines = configText.replaceAll(`\r`,'').split('\n');
-  return configLines.map(e=>configLineParser(e)).filter(e=>e.command!=='');
+export function configParser(configText: string): WebgalConfig {
+  const configLines = configText.replaceAll(`\r`, '').split('\n');
+  return configLines
+    .map((e) => configLineParser(e))
+    .filter((e) => e.command !== '');
 }

package/src/index.ts

@@ -1,42 +1,78 @@
-import {commandType, IAsset} from "./interface/sceneInterface";
-import {fileType} from "./interface/assets";
-import {sceneParser} from "./sceneParser";
-import {ADD_NEXT_ARG_LIST, SCRIPT_CONFIG} from "./config/scriptConfig";
-import {configParser, WebgalConfig} from "./configParser/configParser";
+import {
+  ADD_NEXT_ARG_LIST,
+  SCRIPT_CONFIG,
+  ConfigMap,
+  ConfigItem,
+} from './config/scriptConfig';
+import { configParser, WebgalConfig } from './configParser/configParser';
+import { fileType } from './interface/assets';
+import { IAsset } from './interface/sceneInterface';
+import { sceneParser } from './sceneParser';
+import {IWebGALStyleObj, scss2cssinjsParser} from "./styleParser";
 
 export default class SceneParser {
-
-  private readonly assetsPrefetcher;
-  private readonly assetSetter;
-  private readonly ADD_NEXT_ARG_LIST;
-  private readonly SCRIPT_CONFIG;
-
-  constructor(assetsPrefetcher: ((assetList: Array<IAsset>) => void),
-              assetSetter: (fileName: string, assetType: fileType) => string,
-              ADD_NEXT_ARG_LIST: Array<number>, SCRIPT_CONFIG: Array<any>) {
-    this.assetsPrefetcher = assetsPrefetcher;
-    this.assetSetter = assetSetter;
-    this.ADD_NEXT_ARG_LIST = ADD_NEXT_ARG_LIST;
-    this.SCRIPT_CONFIG = SCRIPT_CONFIG;
-  }
-
-  parse(rawScene: string, sceneName: string, sceneUrl: string
+  private readonly SCRIPT_CONFIG_MAP: ConfigMap;
+  constructor(
+    private readonly assetsPrefetcher: (assetList: IAsset[]) => void,
+    private readonly assetSetter: (
+      fileName: string,
+      assetType: fileType,
+    ) => string,
+    private readonly ADD_NEXT_ARG_LIST: number[],
+    SCRIPT_CONFIG_INPUT: ConfigItem[] | ConfigMap,
   ) {
-    return sceneParser(rawScene, sceneName, sceneUrl, this.assetsPrefetcher, this.assetSetter, this.ADD_NEXT_ARG_LIST, this.SCRIPT_CONFIG);
+    if (Array.isArray(SCRIPT_CONFIG_INPUT)) {
+      this.SCRIPT_CONFIG_MAP = new Map();
+      SCRIPT_CONFIG_INPUT.forEach((config) => {
+        this.SCRIPT_CONFIG_MAP.set(config.scriptString, config);
+      });
+    } else {
+      this.SCRIPT_CONFIG_MAP = SCRIPT_CONFIG_INPUT;
+    }
+  }
+  /**
+   * 解析场景
+   * @param rawScene 原始场景
+   * @param sceneName 场景名称
+   * @param sceneUrl 场景url
+   * @return 解析后的场景
+   */
+  parse(rawScene: string, sceneName: string, sceneUrl: string) {
+    return sceneParser(
+      rawScene,
+      sceneName,
+      sceneUrl,
+      this.assetsPrefetcher,
+      this.assetSetter,
+      this.ADD_NEXT_ARG_LIST,
+      this.SCRIPT_CONFIG_MAP,
+    );
   }
 
   parseConfig(configText: string) {
-    return configParser(configText)
+    return configParser(configText);
   }
 
   stringifyConfig(config: WebgalConfig) {
-    return config
-      .reduce(
-        (previousValue, curr) =>
-          (previousValue + `${curr.command}:${curr.args.join('|')}${curr.options.length <= 0 ? '' : curr.options.reduce((p, c) => (p + ' -' + c.key + '=' + c.value), '')};\n`),
-        ''
-      )
+    return config.reduce(
+      (previousValue, curr) =>
+        previousValue +
+        `${curr.command}:${curr.args.join('|')}${
+          curr.options.length <= 0
+            ? ''
+            : curr.options.reduce(
+                (p, c) => p + ' -' + c.key + '=' + c.value,
+                '',
+              )
+        };\n`,
+      '',
+    );
+  }
+
+  parseScssToWebgalStyleObj(scssString: string): IWebGALStyleObj{
+    return scss2cssinjsParser(scssString);
   }
+
 }
 
-export {ADD_NEXT_ARG_LIST, SCRIPT_CONFIG};
+export { ADD_NEXT_ARG_LIST, SCRIPT_CONFIG };

package/src/interface/sceneInterface.ts

@@ -1,8 +1,8 @@
 /**
  * 语句类型
  */
-import {sceneEntry} from "./runtimeInterface";
-import {fileType} from "./assets";
+import { sceneEntry } from './runtimeInterface';
+import { fileType } from './assets';
 
 export enum commandType {
   say, // 对话
@@ -36,7 +36,8 @@ export enum commandType {
   comment,
   setTransform,
   setTransition,
-  getUserInput
+  getUserInput,
+  applyStyle
 }
 
 /**

package/src/parser4/index.ts

@@ -155,4 +155,4 @@
 //     defaultRule: "scene"
 //   };
 // }());
-export const parser4 = 'unreleased'
+export const parser4 = 'unreleased';

package/src/sceneParser.ts

@@ -1,7 +1,13 @@
-import { IAsset, IScene, ISentence } from "./interface/sceneInterface";
-import { scriptParser } from "./scriptParser/scriptParser";
-import uniqWith from "lodash/uniqWith";
-import { fileType } from "./interface/assets";
+import {
+  commandType,
+  IAsset,
+  IScene,
+  ISentence,
+} from './interface/sceneInterface';
+import { scriptParser } from './scriptParser/scriptParser';
+import uniqWith from 'lodash/uniqWith';
+import { fileType } from './interface/assets';
+import { ConfigMap } from './config/scriptConfig';
 
 /**
  * 场景解析器
@@ -11,13 +17,19 @@ import { fileType } from "./interface/assets";
  * @param assetsPrefetcher
  * @param assetSetter
  * @param ADD_NEXT_ARG_LIST
- * @param SCRIPT_CONFIG
+ * @param SCRIPT_CONFIG_MAP
  * @return {IScene} 解析后的场景
  */
-export const sceneParser = (rawScene: string, sceneName: string, sceneUrl: string
-  , assetsPrefetcher: ((assetList: Array<IAsset>) => void), assetSetter: (fileName: string, assetType: fileType) => string
-  , ADD_NEXT_ARG_LIST: any, SCRIPT_CONFIG: any): IScene => {
-  const rawSentenceList = rawScene.split("\n"); // 原始句子列表
+export const sceneParser = (
+  rawScene: string,
+  sceneName: string,
+  sceneUrl: string,
+  assetsPrefetcher: (assetList: Array<IAsset>) => void,
+  assetSetter: (fileName: string, assetType: fileType) => string,
+  ADD_NEXT_ARG_LIST: commandType[],
+  SCRIPT_CONFIG_MAP: ConfigMap,
+): IScene => {
+  const rawSentenceList = rawScene.split('\n'); // 原始句子列表
 
   // 去分号留到后面去做了，现在注释要单独处理
   const rawSentenceListWithoutEmpty = rawSentenceList;
@@ -25,13 +37,20 @@ export const sceneParser = (rawScene: string, sceneName: string, sceneUrl: strin
   // .filter((sentence) => sentence.trim() !== "");
   let assetsList: Array<IAsset> = []; // 场景资源列表
   let subSceneList: Array<string> = []; // 子场景列表
-  const sentenceList: Array<ISentence> = rawSentenceListWithoutEmpty.map((sentence) => {
-    const returnSentence: ISentence = scriptParser(sentence, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG);
-    // 在这里解析出语句可能携带的资源和场景，合并到 assetsList 和 subSceneList
-    assetsList = [...assetsList, ...returnSentence.sentenceAssets];
-    subSceneList = [...subSceneList, ...returnSentence.subScene];
-    return returnSentence;
-  });
+  const sentenceList: Array<ISentence> = rawSentenceListWithoutEmpty.map(
+    (sentence) => {
+      const returnSentence: ISentence = scriptParser(
+        sentence,
+        assetSetter,
+        ADD_NEXT_ARG_LIST,
+        SCRIPT_CONFIG_MAP,
+      );
+      // 在这里解析出语句可能携带的资源和场景，合并到 assetsList 和 subSceneList
+      assetsList = [...assetsList, ...returnSentence.sentenceAssets];
+      subSceneList = [...subSceneList, ...returnSentence.subScene];
+      return returnSentence;
+    },
+  );
 
   // 开始资源的预加载
   assetsList = uniqWith(assetsList); // 去重
@@ -42,6 +61,6 @@ export const sceneParser = (rawScene: string, sceneName: string, sceneUrl: strin
     sceneUrl: sceneUrl,
     sentenceList: sentenceList, // 语句列表
     assetsList: assetsList, // 资源列表
-    subSceneList: subSceneList // 子场景列表
+    subSceneList: subSceneList, // 子场景列表
   };
 };

package/src/scriptParser/argsParser.ts

@@ -1,5 +1,5 @@
-import {arg} from "../interface/sceneInterface";
-import {fileType} from "../interface/assets";
+import { arg } from '../interface/sceneInterface';
+import { fileType } from '../interface/assets';
 
 /**
  * 参数解析器
@@ -7,16 +7,19 @@ import {fileType} from "../interface/assets";
  * @param assetSetter
  * @return {Array<arg>} 解析后的参数列表
  */
-export function argsParser(argsRaw: string, assetSetter: (fileName: string, assetType: fileType) => string): Array<arg> {
+export function argsParser(
+  argsRaw: string,
+  assetSetter: (fileName: string, assetType: fileType) => string,
+): Array<arg> {
   const returnArrayList: Array<arg> = [];
   // 处理参数
   // 不要去空格
-  let newArgsRaw = argsRaw.replace(/ /g, " ");
+  let newArgsRaw = argsRaw.replace(/ /g, ' ');
   // 分割参数列表
-  let rawArgsList: Array<string> = newArgsRaw.split(" -");
+  let rawArgsList: Array<string> = newArgsRaw.split(' -');
   // 去除空字符串
   rawArgsList = rawArgsList.filter((e) => {
-    return e !== "";
+    return e !== '';
   });
   rawArgsList.forEach((e) => {
     const equalSignIndex = e.indexOf('=');
@@ -29,35 +32,35 @@ export function argsParser(argsRaw: string, assetSetter: (fileName: string, asse
     // 判断是不是语音参数
     if (argName.toLowerCase().match(/.ogg|.mp3|.wav/)) {
       returnArrayList.push({
-        key: "vocal",
-        value: assetSetter(e, fileType.vocal)
+        key: 'vocal',
+        value: assetSetter(e, fileType.vocal),
       });
     } else {
       // 判断是不是省略参数
       if (argValue === undefined) {
         returnArrayList.push({
           key: argName,
-          value: true
+          value: true,
         });
       } else {
         // 是字符串描述的布尔值
-        if (argValue === "true" || argValue === "false") {
+        if (argValue === 'true' || argValue === 'false') {
           returnArrayList.push({
             key: argName,
-            value: argValue === "true"
+            value: argValue === 'true',
           });
         } else {
           // 是数字
           if (!isNaN(Number(argValue))) {
             returnArrayList.push({
               key: argName,
-              value: Number(argValue)
+              value: Number(argValue),
             });
           } else {
             // 是普通参数
             returnArrayList.push({
               key: argName,
-              value: argValue
+              value: argValue,
             });
           }
         }
@@ -65,4 +68,4 @@ export function argsParser(argsRaw: string, assetSetter: (fileName: string, asse
     }
   });
   return returnArrayList;
-};
+}

package/src/scriptParser/assetsScanner.ts

@@ -8,7 +8,11 @@ import { fileType } from '../interface/assets';
  * @param args 参数列表
  * @return {Array<IAsset>} 语句携带的参数列表
  */
-export const assetsScanner = (command: commandType, content: string, args: Array<arg>): Array<IAsset> => {
+export const assetsScanner = (
+  command: commandType,
+  content: string,
+  args: Array<arg>,
+): Array<IAsset> => {
   let hasVocalArg = false;
   const returnAssetsList: Array<IAsset> = [];
   if (command === commandType.say) {

package/src/scriptParser/commandParser.ts

@@ -1,25 +1,34 @@
-import { commandType, parsedCommand } from "../interface/sceneInterface";
+import { ConfigMap } from '../config/scriptConfig';
+import { commandType, parsedCommand } from '../interface/sceneInterface';
 
 /**
  * 处理命令
  * @param commandRaw
  * @param ADD_NEXT_ARG_LIST
- * @param SCRIPT_CONFIG
+ * @param SCRIPT_CONFIG_MAP
  * @return {parsedCommand} 处理后的命令
  */
-export const commandParser = (commandRaw: string, ADD_NEXT_ARG_LIST:any, SCRIPT_CONFIG:any): parsedCommand => {
+export const commandParser = (
+  commandRaw: string,
+  ADD_NEXT_ARG_LIST: commandType[],
+  SCRIPT_CONFIG_MAP: ConfigMap,
+): parsedCommand => {
   let returnCommand: parsedCommand = {
     type: commandType.say, // 默认是say
-    additionalArgs: []
+    additionalArgs: [],
   };
   // 开始处理命令内容
-  const type: commandType = getCommandType(commandRaw, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG);
+  const type: commandType = getCommandType(
+    commandRaw,
+    ADD_NEXT_ARG_LIST,
+    SCRIPT_CONFIG_MAP,
+  );
   returnCommand.type = type;
   // 如果是对话，加上额外的参数
-  if (type === commandType.say && commandRaw!== 'say') {
+  if (type === commandType.say && commandRaw !== 'say') {
     returnCommand.additionalArgs.push({
-      key: "speaker",
-      value: commandRaw
+      key: 'speaker',
+      value: commandRaw,
     });
   }
   returnCommand = addNextArg(returnCommand, type, ADD_NEXT_ARG_LIST);
@@ -30,27 +39,26 @@ export const commandParser = (commandRaw: string, ADD_NEXT_ARG_LIST:any, SCRIPT_
  * 根据command原始值判断是什么命令
  * @param command command原始值
  * @param ADD_NEXT_ARG_LIST
- * @param SCRIPT_CONFIG
+ * @param SCRIPT_CONFIG_MAP
  * @return {commandType} 得到的command类型
  */
-function getCommandType(command: string, ADD_NEXT_ARG_LIST:any, SCRIPT_CONFIG:any): commandType {
-  // if (command.match(/if/)) {
-  //   return commandType.if;
-  // }
-  const commandMap = new Map();
-  SCRIPT_CONFIG.forEach((e:any) => {
-    commandMap.set(e.scriptString, e.scriptType);
-  });
-  if (commandMap.has(command)) {
-    return commandMap.get(command);
-  } else return commandType.say;
+function getCommandType(
+  command: string,
+  ADD_NEXT_ARG_LIST: commandType[],
+  SCRIPT_CONFIG_MAP: ConfigMap,
+): commandType {
+  return SCRIPT_CONFIG_MAP.get(command)?.scriptType ?? commandType.say;
 }
 
-function addNextArg(commandToParse: parsedCommand, thisCommandType: commandType, ADD_NEXT_ARG_LIST:any) {
+function addNextArg(
+  commandToParse: parsedCommand,
+  thisCommandType: commandType,
+  ADD_NEXT_ARG_LIST: commandType[],
+) {
   if (ADD_NEXT_ARG_LIST.includes(thisCommandType)) {
     commandToParse.additionalArgs.push({
-      key: "next",
-      value: true
+      key: 'next',
+      value: true,
     });
   }
   return commandToParse;

package/src/scriptParser/contentParser.ts

@@ -1,5 +1,5 @@
-import { commandType } from "../interface/sceneInterface";
-import { fileType } from "../interface/assets";
+import { commandType } from '../interface/sceneInterface';
+import { fileType } from '../interface/assets';
 
 /**
  * 解析语句内容的函数，主要作用是把文件名改为绝对地址或相对地址（根据使用情况而定）
@@ -8,9 +8,13 @@ import { fileType } from "../interface/assets";
  * @param assetSetter
  * @return {string} 解析后的语句内容
  */
-export const contentParser = (contentRaw: string, type: commandType, assetSetter: any) => {
-  if (contentRaw === "none" || contentRaw === "") {
-    return "";
+export const contentParser = (
+  contentRaw: string,
+  type: commandType,
+  assetSetter: any,
+) => {
+  if (contentRaw === 'none' || contentRaw === '') {
+    return '';
   }
   switch (type) {
     case commandType.playEffect:
@@ -41,12 +45,12 @@ export const contentParser = (contentRaw: string, type: commandType, assetSetter
 };
 
 function getChooseContent(contentRaw: string, assetSetter: any): string {
-  const chooseList = contentRaw.split("|");
+  const chooseList = contentRaw.split('|');
   const chooseKeyList: Array<string> = [];
   const chooseValueList: Array<string> = [];
   for (const e of chooseList) {
-    chooseKeyList.push(e.split(":")[0] ?? "");
-    chooseValueList.push(e.split(":")[1] ?? "");
+    chooseKeyList.push(e.split(':')[0] ?? '');
+    chooseValueList.push(e.split(':')[1] ?? '');
   }
   const parsedChooseList = chooseValueList.map((e) => {
     if (e.match(/\./)) {
@@ -55,10 +59,10 @@ function getChooseContent(contentRaw: string, assetSetter: any): string {
       return e;
     }
   });
-  let ret = "";
+  let ret = '';
   for (let i = 0; i < chooseKeyList.length; i++) {
     if (i !== 0) {
-      ret = ret + "|";
+      ret = ret + '|';
     }
     ret = ret + `${chooseKeyList[i]}:${parsedChooseList[i]}`;
   }

package/src/scriptParser/scriptParser.ts

@@ -1,18 +1,30 @@
-import { arg, commandType, IAsset, ISentence, parsedCommand } from "../interface/sceneInterface";
-import { commandParser } from "./commandParser";
-import { argsParser } from "./argsParser";
-import { contentParser } from "./contentParser";
-import { assetsScanner } from "./assetsScanner";
-import { subSceneScanner } from "./subSceneScanner";
+import {
+  arg,
+  commandType,
+  IAsset,
+  ISentence,
+  parsedCommand,
+} from '../interface/sceneInterface';
+import { commandParser } from './commandParser';
+import { argsParser } from './argsParser';
+import { contentParser } from './contentParser';
+import { assetsScanner } from './assetsScanner';
+import { subSceneScanner } from './subSceneScanner';
+import { ConfigMap } from '../config/scriptConfig';
 
 /**
  * 语句解析器
  * @param sentenceRaw 原始语句
  * @param assetSetter
  * @param ADD_NEXT_ARG_LIST
- * @param SCRIPT_CONFIG
+ * @param SCRIPT_CONFIG_MAP
  */
-export const scriptParser = (sentenceRaw: string, assetSetter: any, ADD_NEXT_ARG_LIST: any, SCRIPT_CONFIG: any): ISentence => {
+export const scriptParser = (
+  sentenceRaw: string,
+  assetSetter: any,
+  ADD_NEXT_ARG_LIST: commandType[],
+  SCRIPT_CONFIG_MAP: ConfigMap,
+): ISentence => {
   let command: commandType; // 默认为对话
   let content: string; // 语句内容
   let subScene: Array<string>; // 语句携带的子场景（可能没有）
@@ -24,16 +36,16 @@ export const scriptParser = (sentenceRaw: string, assetSetter: any, ADD_NEXT_ARG
   // 正式开始解析
 
   // 去分号，前面已做，这里不再需要
-  let newSentenceRaw = sentenceRaw.split(";")[0];
-  if (newSentenceRaw === "") {
+  let newSentenceRaw = sentenceRaw.split(';')[0];
+  if (newSentenceRaw === '') {
     // 注释提前返回
     return {
       command: commandType.comment, // 语句类型
-      commandRaw: "comment", // 命令原始内容，方便调试
-      content: sentenceRaw.split(";")[1] ?? "", // 语句内容
-      args: [{ key: "next", value: true }], // 参数列表
+      commandRaw: 'comment', // 命令原始内容，方便调试
+      content: sentenceRaw.split(';')[1] ?? '', // 语句内容
+      args: [{ key: 'next', value: true }], // 参数列表
       sentenceAssets: [], // 语句携带的资源列表
-      subScene: [] // 语句携带的子场景
+      subScene: [], // 语句携带的子场景
     };
   }
   // 截取命令
@@ -44,11 +56,11 @@ export const scriptParser = (sentenceRaw: string, assetSetter: any, ADD_NEXT_ARG
   // 没有command，说明这是一条连续对话或单条语句
   if (getCommandResult === null) {
     commandRaw = newSentenceRaw;
-    parsedCommand = commandParser(commandRaw, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG);
+    parsedCommand = commandParser(commandRaw, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG_MAP);
     command = parsedCommand.type;
     for (const e of parsedCommand.additionalArgs) {
       // 由于是连续对话，所以我们去除 speaker 参数。
-      if (command === commandType.say && e.key === "speaker") {
+      if (command === commandType.say && e.key === 'speaker') {
         continue;
       }
       args.push(e);
@@ -56,8 +68,11 @@ export const scriptParser = (sentenceRaw: string, assetSetter: any, ADD_NEXT_ARG
   } else {
     commandRaw = newSentenceRaw.substring(0, getCommandResult.index);
     // 划分命令区域和content区域
-    newSentenceRaw = newSentenceRaw.substring(getCommandResult.index + 1, newSentenceRaw.length);
-    parsedCommand = commandParser(commandRaw, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG);
+    newSentenceRaw = newSentenceRaw.substring(
+      getCommandResult.index + 1,
+      newSentenceRaw.length,
+    );
+    parsedCommand = commandParser(commandRaw, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG_MAP);
     command = parsedCommand.type;
     for (const e of parsedCommand.additionalArgs) {
       args.push(e);
@@ -67,7 +82,10 @@ export const scriptParser = (sentenceRaw: string, assetSetter: any, ADD_NEXT_ARG
   const getArgsResult = / -/.exec(newSentenceRaw);
   // 获取到参数
   if (getArgsResult) {
-    const argsRaw = newSentenceRaw.substring(getArgsResult.index, sentenceRaw.length);
+    const argsRaw = newSentenceRaw.substring(
+      getArgsResult.index,
+      sentenceRaw.length,
+    );
     newSentenceRaw = newSentenceRaw.substring(0, getArgsResult.index);
     for (const e of argsParser(argsRaw, assetSetter)) {
       args.push(e);
@@ -82,6 +100,6 @@ export const scriptParser = (sentenceRaw: string, assetSetter: any, ADD_NEXT_ARG
     content: content, // 语句内容
     args: args, // 参数列表
     sentenceAssets: sentenceAssets, // 语句携带的资源列表
-    subScene: subScene // 语句携带的子场景
+    subScene: subScene, // 语句携带的子场景
   };
 };