webgal-parser 4.5.17 → 4.6.1

package/build/cjs/index.cjs

@@ -144,39 +144,39 @@ function argsParser(argsRaw, assetSetter) {
                 value: assetSetter(e, fileType.vocal),
             });
         }
+        else if (argName === 'vocal' && argValue !== undefined) {
+            returnArrayList.push({
+                key: argName,
+                value: assetSetter(argValue, fileType.vocal),
+            });
+        }
+        // 判断是不是省略参数
+        else if (argValue === undefined) {
+            returnArrayList.push({
+                key: argName,
+                value: true,
+            });
+        }
+        // 是字符串描述的布尔值
+        else if (argValue === 'true' || argValue === 'false') {
+            returnArrayList.push({
+                key: argName,
+                value: argValue === 'true',
+            });
+        }
+        // 是数字
+        else if (!isNaN(Number(argValue))) {
+            returnArrayList.push({
+                key: argName,
+                value: Number(argValue),
+            });
+        }
+        // 是普通参数
         else {
-            // 判断是不是省略参数
-            if (argValue === undefined) {
-                returnArrayList.push({
-                    key: argName,
-                    value: true,
-                });
-            }
-            else {
-                // 是字符串描述的布尔值
-                if (argValue === 'true' || argValue === 'false') {
-                    returnArrayList.push({
-                        key: argName,
-                        value: argValue === 'true',
-                    });
-                }
-                else {
-                    // 是数字
-                    if (!isNaN(Number(argValue))) {
-                        returnArrayList.push({
-                            key: argName,
-                            value: Number(argValue),
-                        });
-                    }
-                    else {
-                        // 是普通参数
-                        returnArrayList.push({
-                            key: argName,
-                            value: argValue,
-                        });
-                    }
-                }
-            }
+            returnArrayList.push({
+                key: argName,
+                value: argValue,
+            });
         }
     });
     return returnArrayList;
@@ -349,7 +349,7 @@ function getChooseContent(contentRaw, assetSetter) {
  * @param args 参数列表
  * @return {Array<IAsset>} 语句携带的参数列表
  */
-const assetsScanner = (command, content, args) => {
+const assetsScanner = (command, content, args, lineNumber) => {
     const returnAssetsList = [];
     if (command === commandType.say) {
         args.forEach((e) => {
@@ -357,7 +357,7 @@ const assetsScanner = (command, content, args) => {
                 returnAssetsList.push({
                     name: e.value,
                     url: e.value,
-                    lineNumber: 0,
+                    lineNumber,
                     type: fileType.vocal,
                 });
             }
@@ -371,7 +371,7 @@ const assetsScanner = (command, content, args) => {
         returnAssetsList.push({
             name: content,
             url: content,
-            lineNumber: 0,
+            lineNumber,
             type: fileType.background,
         });
     }
@@ -379,7 +379,7 @@ const assetsScanner = (command, content, args) => {
         returnAssetsList.push({
             name: content,
             url: content,
-            lineNumber: 0,
+            lineNumber,
             type: fileType.figure,
         });
     }
@@ -387,7 +387,7 @@ const assetsScanner = (command, content, args) => {
         returnAssetsList.push({
             name: content,
             url: content,
-            lineNumber: 0,
+            lineNumber,
             type: fileType.figure,
         });
     }
@@ -395,7 +395,7 @@ const assetsScanner = (command, content, args) => {
         returnAssetsList.push({
             name: content,
             url: content,
-            lineNumber: 0,
+            lineNumber,
             type: fileType.video,
         });
     }
@@ -403,7 +403,7 @@ const assetsScanner = (command, content, args) => {
         returnAssetsList.push({
             name: content,
             url: content,
-            lineNumber: 0,
+            lineNumber,
             type: fileType.bgm,
         });
     }
@@ -440,7 +440,7 @@ const subSceneScanner = (command, content) => {
  * @param ADD_NEXT_ARG_LIST
  * @param SCRIPT_CONFIG_MAP
  */
-const scriptParser = (sentenceRaw, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG_MAP) => {
+const scriptParser = (sentenceRaw, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG_MAP, lineNumber = 0) => {
     let command; // 默认为对话
     let content; // 语句内容
     let subScene; // 语句携带的子场景（可能没有）
@@ -462,7 +462,8 @@ const scriptParser = (sentenceRaw, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG
             content: sentenceComment.trim(),
             args: [{ key: 'next', value: true }],
             sentenceAssets: [],
-            subScene: [], // 语句携带的子场景
+            subScene: [],
+            inlineComment: '', // 行内注释
         };
     }
     // 截取命令
@@ -504,7 +505,7 @@ const scriptParser = (sentenceRaw, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG
         }
     }
     content = contentParser(newSentenceRaw.trim(), command, assetSetter); // 将语句内容里的文件名转为相对或绝对路径
-    sentenceAssets = assetsScanner(command, content, args); // 扫描语句携带资源
+    sentenceAssets = assetsScanner(command, content, args, lineNumber); // 扫描语句携带资源
     subScene = subSceneScanner(command, content); // 扫描语句携带子场景
     return {
         command: command,
@@ -512,7 +513,8 @@ const scriptParser = (sentenceRaw, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG
         content: content,
         args: args,
         sentenceAssets: sentenceAssets,
-        subScene: subScene, // 语句携带的子场景
+        subScene: subScene,
+        inlineComment: sentenceComment.trim(), // 行内注释
     };
 };
 
@@ -1783,8 +1785,8 @@ const sceneParser = (rawScene, sceneName, sceneUrl, assetsPrefetcher, assetSette
     // .filter((sentence) => sentence.trim() !== "");
     let assetsList = []; // 场景资源列表
     let subSceneList = []; // 子场景列表
-    const sentenceList = rawSentenceListWithoutEmpty.map((sentence) => {
-        const returnSentence = scriptParser(sentence, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG_MAP);
+    const sentenceList = rawSentenceListWithoutEmpty.map((sentence, index) => {
+        const returnSentence = scriptParser(sentence, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG_MAP, index);
         // 在这里解析出语句可能携带的资源和场景，合并到 assetsList 和 subSceneList
         assetsList = [...assetsList, ...returnSentence.sentenceAssets];
         subSceneList = [...subSceneList, ...returnSentence.subScene];

package/build/cjs/interface/sceneInterface.d.ts

@@ -69,6 +69,7 @@ export interface ISentence {
     args: Array<arg>;
     sentenceAssets: Array<IAsset>;
     subScene: Array<string>;
+    inlineComment: string;
 }
 /**
  * 场景接口

package/build/cjs/scriptParser/assetsScanner.d.ts

@@ -6,4 +6,4 @@ import { arg, commandType, IAsset } from '../interface/sceneInterface';
  * @param args 参数列表
  * @return {Array<IAsset>} 语句携带的参数列表
  */
-export declare const assetsScanner: (command: commandType, content: string, args: Array<arg>) => Array<IAsset>;
+export declare const assetsScanner: (command: commandType, content: string, args: Array<arg>, lineNumber: number) => Array<IAsset>;

package/build/cjs/scriptParser/scriptParser.d.ts

@@ -7,4 +7,4 @@ import { ConfigMap } from '../config/scriptConfig';
  * @param ADD_NEXT_ARG_LIST
  * @param SCRIPT_CONFIG_MAP
  */
-export declare const scriptParser: (sentenceRaw: string, assetSetter: any, ADD_NEXT_ARG_LIST: commandType[], SCRIPT_CONFIG_MAP: ConfigMap) => ISentence;
+export declare const scriptParser: (sentenceRaw: string, assetSetter: any, ADD_NEXT_ARG_LIST: commandType[], SCRIPT_CONFIG_MAP: ConfigMap, lineNumber?: number) => ISentence;

package/build/es/index.js

@@ -140,39 +140,39 @@ function argsParser(argsRaw, assetSetter) {
                 value: assetSetter(e, fileType.vocal),
             });
         }
+        else if (argName === 'vocal' && argValue !== undefined) {
+            returnArrayList.push({
+                key: argName,
+                value: assetSetter(argValue, fileType.vocal),
+            });
+        }
+        // 判断是不是省略参数
+        else if (argValue === undefined) {
+            returnArrayList.push({
+                key: argName,
+                value: true,
+            });
+        }
+        // 是字符串描述的布尔值
+        else if (argValue === 'true' || argValue === 'false') {
+            returnArrayList.push({
+                key: argName,
+                value: argValue === 'true',
+            });
+        }
+        // 是数字
+        else if (!isNaN(Number(argValue))) {
+            returnArrayList.push({
+                key: argName,
+                value: Number(argValue),
+            });
+        }
+        // 是普通参数
         else {
-            // 判断是不是省略参数
-            if (argValue === undefined) {
-                returnArrayList.push({
-                    key: argName,
-                    value: true,
-                });
-            }
-            else {
-                // 是字符串描述的布尔值
-                if (argValue === 'true' || argValue === 'false') {
-                    returnArrayList.push({
-                        key: argName,
-                        value: argValue === 'true',
-                    });
-                }
-                else {
-                    // 是数字
-                    if (!isNaN(Number(argValue))) {
-                        returnArrayList.push({
-                            key: argName,
-                            value: Number(argValue),
-                        });
-                    }
-                    else {
-                        // 是普通参数
-                        returnArrayList.push({
-                            key: argName,
-                            value: argValue,
-                        });
-                    }
-                }
-            }
+            returnArrayList.push({
+                key: argName,
+                value: argValue,
+            });
         }
     });
     return returnArrayList;
@@ -345,7 +345,7 @@ function getChooseContent(contentRaw, assetSetter) {
  * @param args 参数列表
  * @return {Array<IAsset>} 语句携带的参数列表
  */
-const assetsScanner = (command, content, args) => {
+const assetsScanner = (command, content, args, lineNumber) => {
     const returnAssetsList = [];
     if (command === commandType.say) {
         args.forEach((e) => {
@@ -353,7 +353,7 @@ const assetsScanner = (command, content, args) => {
                 returnAssetsList.push({
                     name: e.value,
                     url: e.value,
-                    lineNumber: 0,
+                    lineNumber,
                     type: fileType.vocal,
                 });
             }
@@ -367,7 +367,7 @@ const assetsScanner = (command, content, args) => {
         returnAssetsList.push({
             name: content,
             url: content,
-            lineNumber: 0,
+            lineNumber,
             type: fileType.background,
         });
     }
@@ -375,7 +375,7 @@ const assetsScanner = (command, content, args) => {
         returnAssetsList.push({
             name: content,
             url: content,
-            lineNumber: 0,
+            lineNumber,
             type: fileType.figure,
         });
     }
@@ -383,7 +383,7 @@ const assetsScanner = (command, content, args) => {
         returnAssetsList.push({
             name: content,
             url: content,
-            lineNumber: 0,
+            lineNumber,
             type: fileType.figure,
         });
     }
@@ -391,7 +391,7 @@ const assetsScanner = (command, content, args) => {
         returnAssetsList.push({
             name: content,
             url: content,
-            lineNumber: 0,
+            lineNumber,
             type: fileType.video,
         });
     }
@@ -399,7 +399,7 @@ const assetsScanner = (command, content, args) => {
         returnAssetsList.push({
             name: content,
             url: content,
-            lineNumber: 0,
+            lineNumber,
             type: fileType.bgm,
         });
     }
@@ -436,7 +436,7 @@ const subSceneScanner = (command, content) => {
  * @param ADD_NEXT_ARG_LIST
  * @param SCRIPT_CONFIG_MAP
  */
-const scriptParser = (sentenceRaw, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG_MAP) => {
+const scriptParser = (sentenceRaw, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG_MAP, lineNumber = 0) => {
     let command; // 默认为对话
     let content; // 语句内容
     let subScene; // 语句携带的子场景（可能没有）
@@ -458,7 +458,8 @@ const scriptParser = (sentenceRaw, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG
             content: sentenceComment.trim(),
             args: [{ key: 'next', value: true }],
             sentenceAssets: [],
-            subScene: [], // 语句携带的子场景
+            subScene: [],
+            inlineComment: '', // 行内注释
         };
     }
     // 截取命令
@@ -500,7 +501,7 @@ const scriptParser = (sentenceRaw, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG
         }
     }
     content = contentParser(newSentenceRaw.trim(), command, assetSetter); // 将语句内容里的文件名转为相对或绝对路径
-    sentenceAssets = assetsScanner(command, content, args); // 扫描语句携带资源
+    sentenceAssets = assetsScanner(command, content, args, lineNumber); // 扫描语句携带资源
     subScene = subSceneScanner(command, content); // 扫描语句携带子场景
     return {
         command: command,
@@ -508,7 +509,8 @@ const scriptParser = (sentenceRaw, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG
         content: content,
         args: args,
         sentenceAssets: sentenceAssets,
-        subScene: subScene, // 语句携带的子场景
+        subScene: subScene,
+        inlineComment: sentenceComment.trim(), // 行内注释
     };
 };
 
@@ -1779,8 +1781,8 @@ const sceneParser = (rawScene, sceneName, sceneUrl, assetsPrefetcher, assetSette
     // .filter((sentence) => sentence.trim() !== "");
     let assetsList = []; // 场景资源列表
     let subSceneList = []; // 子场景列表
-    const sentenceList = rawSentenceListWithoutEmpty.map((sentence) => {
-        const returnSentence = scriptParser(sentence, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG_MAP);
+    const sentenceList = rawSentenceListWithoutEmpty.map((sentence, index) => {
+        const returnSentence = scriptParser(sentence, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG_MAP, index);
         // 在这里解析出语句可能携带的资源和场景，合并到 assetsList 和 subSceneList
         assetsList = [...assetsList, ...returnSentence.sentenceAssets];
         subSceneList = [...subSceneList, ...returnSentence.subScene];

package/build/es/interface/sceneInterface.d.ts

@@ -69,6 +69,7 @@ export interface ISentence {
     args: Array<arg>;
     sentenceAssets: Array<IAsset>;
     subScene: Array<string>;
+    inlineComment: string;
 }
 /**
  * 场景接口

package/build/es/scriptParser/assetsScanner.d.ts

@@ -6,4 +6,4 @@ import { arg, commandType, IAsset } from '../interface/sceneInterface';
  * @param args 参数列表
  * @return {Array<IAsset>} 语句携带的参数列表
  */
-export declare const assetsScanner: (command: commandType, content: string, args: Array<arg>) => Array<IAsset>;
+export declare const assetsScanner: (command: commandType, content: string, args: Array<arg>, lineNumber: number) => Array<IAsset>;

package/build/es/scriptParser/scriptParser.d.ts

@@ -7,4 +7,4 @@ import { ConfigMap } from '../config/scriptConfig';
  * @param ADD_NEXT_ARG_LIST
  * @param SCRIPT_CONFIG_MAP
  */
-export declare const scriptParser: (sentenceRaw: string, assetSetter: any, ADD_NEXT_ARG_LIST: commandType[], SCRIPT_CONFIG_MAP: ConfigMap) => ISentence;
+export declare const scriptParser: (sentenceRaw: string, assetSetter: any, ADD_NEXT_ARG_LIST: commandType[], SCRIPT_CONFIG_MAP: ConfigMap, lineNumber?: number) => ISentence;

package/build/types/interface/sceneInterface.d.ts

@@ -69,6 +69,7 @@ export interface ISentence {
     args: Array<arg>;
     sentenceAssets: Array<IAsset>;
     subScene: Array<string>;
+    inlineComment: string;
 }
 /**
  * 场景接口

package/build/types/scriptParser/assetsScanner.d.ts

@@ -6,4 +6,4 @@ import { arg, commandType, IAsset } from '../interface/sceneInterface';
  * @param args 参数列表
  * @return {Array<IAsset>} 语句携带的参数列表
  */
-export declare const assetsScanner: (command: commandType, content: string, args: Array<arg>) => Array<IAsset>;
+export declare const assetsScanner: (command: commandType, content: string, args: Array<arg>, lineNumber: number) => Array<IAsset>;

package/build/types/scriptParser/scriptParser.d.ts

@@ -7,4 +7,4 @@ import { ConfigMap } from '../config/scriptConfig';
  * @param ADD_NEXT_ARG_LIST
  * @param SCRIPT_CONFIG_MAP
  */
-export declare const scriptParser: (sentenceRaw: string, assetSetter: any, ADD_NEXT_ARG_LIST: commandType[], SCRIPT_CONFIG_MAP: ConfigMap) => ISentence;
+export declare const scriptParser: (sentenceRaw: string, assetSetter: any, ADD_NEXT_ARG_LIST: commandType[], SCRIPT_CONFIG_MAP: ConfigMap, lineNumber?: number) => ISentence;

package/build/umd/index.global.js

@@ -143,39 +143,39 @@ var webgalParser = (function (exports) {
                   value: assetSetter(e, fileType.vocal),
               });
           }
+          else if (argName === 'vocal' && argValue !== undefined) {
+              returnArrayList.push({
+                  key: argName,
+                  value: assetSetter(argValue, fileType.vocal),
+              });
+          }
+          // 判断是不是省略参数
+          else if (argValue === undefined) {
+              returnArrayList.push({
+                  key: argName,
+                  value: true,
+              });
+          }
+          // 是字符串描述的布尔值
+          else if (argValue === 'true' || argValue === 'false') {
+              returnArrayList.push({
+                  key: argName,
+                  value: argValue === 'true',
+              });
+          }
+          // 是数字
+          else if (!isNaN(Number(argValue))) {
+              returnArrayList.push({
+                  key: argName,
+                  value: Number(argValue),
+              });
+          }
+          // 是普通参数
           else {
-              // 判断是不是省略参数
-              if (argValue === undefined) {
-                  returnArrayList.push({
-                      key: argName,
-                      value: true,
-                  });
-              }
-              else {
-                  // 是字符串描述的布尔值
-                  if (argValue === 'true' || argValue === 'false') {
-                      returnArrayList.push({
-                          key: argName,
-                          value: argValue === 'true',
-                      });
-                  }
-                  else {
-                      // 是数字
-                      if (!isNaN(Number(argValue))) {
-                          returnArrayList.push({
-                              key: argName,
-                              value: Number(argValue),
-                          });
-                      }
-                      else {
-                          // 是普通参数
-                          returnArrayList.push({
-                              key: argName,
-                              value: argValue,
-                          });
-                      }
-                  }
-              }
+              returnArrayList.push({
+                  key: argName,
+                  value: argValue,
+              });
           }
       });
       return returnArrayList;
@@ -348,7 +348,7 @@ var webgalParser = (function (exports) {
    * @param args 参数列表
    * @return {Array<IAsset>} 语句携带的参数列表
    */
-  const assetsScanner = (command, content, args) => {
+  const assetsScanner = (command, content, args, lineNumber) => {
       const returnAssetsList = [];
       if (command === commandType.say) {
           args.forEach((e) => {
@@ -356,7 +356,7 @@ var webgalParser = (function (exports) {
                   returnAssetsList.push({
                       name: e.value,
                       url: e.value,
-                      lineNumber: 0,
+                      lineNumber,
                       type: fileType.vocal,
                   });
               }
@@ -370,7 +370,7 @@ var webgalParser = (function (exports) {
           returnAssetsList.push({
               name: content,
               url: content,
-              lineNumber: 0,
+              lineNumber,
               type: fileType.background,
           });
       }
@@ -378,7 +378,7 @@ var webgalParser = (function (exports) {
           returnAssetsList.push({
               name: content,
               url: content,
-              lineNumber: 0,
+              lineNumber,
               type: fileType.figure,
           });
       }
@@ -386,7 +386,7 @@ var webgalParser = (function (exports) {
           returnAssetsList.push({
               name: content,
               url: content,
-              lineNumber: 0,
+              lineNumber,
               type: fileType.figure,
           });
       }
@@ -394,7 +394,7 @@ var webgalParser = (function (exports) {
           returnAssetsList.push({
               name: content,
               url: content,
-              lineNumber: 0,
+              lineNumber,
               type: fileType.video,
           });
       }
@@ -402,7 +402,7 @@ var webgalParser = (function (exports) {
           returnAssetsList.push({
               name: content,
               url: content,
-              lineNumber: 0,
+              lineNumber,
               type: fileType.bgm,
           });
       }
@@ -439,7 +439,7 @@ var webgalParser = (function (exports) {
    * @param ADD_NEXT_ARG_LIST
    * @param SCRIPT_CONFIG_MAP
    */
-  const scriptParser = (sentenceRaw, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG_MAP) => {
+  const scriptParser = (sentenceRaw, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG_MAP, lineNumber = 0) => {
       let command; // 默认为对话
       let content; // 语句内容
       let subScene; // 语句携带的子场景（可能没有）
@@ -461,7 +461,8 @@ var webgalParser = (function (exports) {
               content: sentenceComment.trim(),
               args: [{ key: 'next', value: true }],
               sentenceAssets: [],
-              subScene: [], // 语句携带的子场景
+              subScene: [],
+              inlineComment: '', // 行内注释
           };
       }
       // 截取命令
@@ -503,7 +504,7 @@ var webgalParser = (function (exports) {
           }
       }
       content = contentParser(newSentenceRaw.trim(), command, assetSetter); // 将语句内容里的文件名转为相对或绝对路径
-      sentenceAssets = assetsScanner(command, content, args); // 扫描语句携带资源
+      sentenceAssets = assetsScanner(command, content, args, lineNumber); // 扫描语句携带资源
       subScene = subSceneScanner(command, content); // 扫描语句携带子场景
       return {
           command: command,
@@ -511,7 +512,8 @@ var webgalParser = (function (exports) {
           content: content,
           args: args,
           sentenceAssets: sentenceAssets,
-          subScene: subScene, // 语句携带的子场景
+          subScene: subScene,
+          inlineComment: sentenceComment.trim(), // 行内注释
       };
   };
 
@@ -1782,8 +1784,8 @@ var webgalParser = (function (exports) {
       // .filter((sentence) => sentence.trim() !== "");
       let assetsList = []; // 场景资源列表
       let subSceneList = []; // 子场景列表
-      const sentenceList = rawSentenceListWithoutEmpty.map((sentence) => {
-          const returnSentence = scriptParser(sentence, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG_MAP);
+      const sentenceList = rawSentenceListWithoutEmpty.map((sentence, index) => {
+          const returnSentence = scriptParser(sentence, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG_MAP, index);
           // 在这里解析出语句可能携带的资源和场景，合并到 assetsList 和 subSceneList
           assetsList = [...assetsList, ...returnSentence.sentenceAssets];
           subSceneList = [...subSceneList, ...returnSentence.subScene];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webgal-parser",
-  "version": "4.5.17",
+  "version": "4.6.1",
   "description": "WebGAL script parser",
   "scripts": {
     "test": "vitest",
@@ -20,7 +20,7 @@
   "dependencies": {
     "chevrotain": "^10.5.0",
     "cloudlogjs": "^1.0.11",
-    "lodash": "^4.17.21",
+    "lodash": "^4.17.23",
     "tsx": "^3.12.7"
   },
   "devDependencies": {

package/src/interface/sceneInterface.ts

@@ -73,6 +73,7 @@ export interface ISentence {
   args: Array<arg>; // 参数列表
   sentenceAssets: Array<IAsset>; // 语句携带的资源列表
   subScene: Array<string>; // 语句包含子场景列表
+  inlineComment: string; // 行内注释
 }
 
 /**

package/src/sceneParser.ts

@@ -38,12 +38,13 @@ export const sceneParser = (
   let assetsList: Array<IAsset> = []; // 场景资源列表
   let subSceneList: Array<string> = []; // 子场景列表
   const sentenceList: Array<ISentence> = rawSentenceListWithoutEmpty.map(
-    (sentence) => {
+    (sentence, index) => {
       const returnSentence: ISentence = scriptParser(
         sentence,
         assetSetter,
         ADD_NEXT_ARG_LIST,
         SCRIPT_CONFIG_MAP,
+        index,
       );
       // 在这里解析出语句可能携带的资源和场景，合并到 assetsList 和 subSceneList
       assetsList = [...assetsList, ...returnSentence.sentenceAssets];

package/src/scriptParser/argsParser.ts

@@ -35,36 +35,39 @@ export function argsParser(
         key: 'vocal',
         value: assetSetter(e, fileType.vocal),
       });
-    } else {
-      // 判断是不是省略参数
-      if (argValue === undefined) {
-        returnArrayList.push({
-          key: argName,
-          value: true,
-        });
-      } else {
-        // 是字符串描述的布尔值
-        if (argValue === 'true' || argValue === 'false') {
-          returnArrayList.push({
-            key: argName,
-            value: argValue === 'true',
-          });
-        } else {
-          // 是数字
-          if (!isNaN(Number(argValue))) {
-            returnArrayList.push({
-              key: argName,
-              value: Number(argValue),
-            });
-          } else {
-            // 是普通参数
-            returnArrayList.push({
-              key: argName,
-              value: argValue,
-            });
-          }
-        }
-      }
+    } else if (argName === 'vocal' && argValue !== undefined) {
+      returnArrayList.push({
+        key: argName,
+        value: assetSetter(argValue, fileType.vocal),
+      });
+    }
+    // 判断是不是省略参数
+    else if (argValue === undefined) {
+      returnArrayList.push({
+        key: argName,
+        value: true,
+      });
+    }
+    // 是字符串描述的布尔值
+    else if (argValue === 'true' || argValue === 'false') {
+      returnArrayList.push({
+        key: argName,
+        value: argValue === 'true',
+      });
+    }
+    // 是数字
+    else if (!isNaN(Number(argValue))) {
+      returnArrayList.push({
+        key: argName,
+        value: Number(argValue),
+      });
+    }
+    // 是普通参数
+    else {
+      returnArrayList.push({
+        key: argName,
+        value: argValue,
+      });
     }
   });
   return returnArrayList;

package/src/scriptParser/assetsScanner.ts

@@ -12,6 +12,7 @@ export const assetsScanner = (
   command: commandType,
   content: string,
   args: Array<arg>,
+  lineNumber: number,
 ): Array<IAsset> => {
   let hasVocalArg = false;
   const returnAssetsList: Array<IAsset> = [];
@@ -22,7 +23,7 @@ export const assetsScanner = (
         returnAssetsList.push({
           name: e.value as string,
           url: e.value as string,
-          lineNumber: 0,
+          lineNumber,
           type: fileType.vocal,
         });
       }
@@ -36,7 +37,7 @@ export const assetsScanner = (
     returnAssetsList.push({
       name: content,
       url: content,
-      lineNumber: 0,
+      lineNumber,
       type: fileType.background,
     });
   }
@@ -44,7 +45,7 @@ export const assetsScanner = (
     returnAssetsList.push({
       name: content,
       url: content,
-      lineNumber: 0,
+      lineNumber,
       type: fileType.figure,
     });
   }
@@ -52,7 +53,7 @@ export const assetsScanner = (
     returnAssetsList.push({
       name: content,
       url: content,
-      lineNumber: 0,
+      lineNumber,
       type: fileType.figure,
     });
   }
@@ -60,7 +61,7 @@ export const assetsScanner = (
     returnAssetsList.push({
       name: content,
       url: content,
-      lineNumber: 0,
+      lineNumber,
       type: fileType.video,
     });
   }
@@ -68,7 +69,7 @@ export const assetsScanner = (
     returnAssetsList.push({
       name: content,
       url: content,
-      lineNumber: 0,
+      lineNumber,
       type: fileType.bgm,
     });
   }

package/src/scriptParser/scriptParser.ts

@@ -24,6 +24,7 @@ export const scriptParser = (
   assetSetter: any,
   ADD_NEXT_ARG_LIST: commandType[],
   SCRIPT_CONFIG_MAP: ConfigMap,
+  lineNumber = 0,
 ): ISentence => {
   let command: commandType; // 默认为对话
   let content: string; // 语句内容
@@ -49,6 +50,7 @@ export const scriptParser = (
       args: [{ key: 'next', value: true }], // 参数列表
       sentenceAssets: [], // 语句携带的资源列表
       subScene: [], // 语句携带的子场景
+      inlineComment: '', // 行内注释
     };
   }
   // 截取命令
@@ -102,8 +104,9 @@ export const scriptParser = (
       args.push(e);
     }
   }
+
   content = contentParser(newSentenceRaw.trim(), command, assetSetter); // 将语句内容里的文件名转为相对或绝对路径
-  sentenceAssets = assetsScanner(command, content, args); // 扫描语句携带资源
+  sentenceAssets = assetsScanner(command, content, args, lineNumber); // 扫描语句携带资源
   subScene = subSceneScanner(command, content); // 扫描语句携带子场景
   return {
     command: command, // 语句类型
@@ -112,5 +115,6 @@ export const scriptParser = (
     args: args, // 参数列表
     sentenceAssets: sentenceAssets, // 语句携带的资源列表
     subScene: subScene, // 语句携带的子场景
+    inlineComment: sentenceComment.trim(), // 行内注释
   };
 };