fast-cocos 1.1.13 → 1.1.15

package/dist/audio/src/audio.js

@@ -19,17 +19,14 @@ class Audio {
         for (const filePath of files) {
             const dir = path_1.default.dirname(filePath);
             const xlsxName = path_1.default.basename(filePath, path_1.default.extname(filePath));
-            const isAny = options.bundle == '{0}';
-            const bundle = isAny ? xlsxName : options.bundle;
-            const outAudioDir = isAny ? utils_1.utils.stringFormat(options.output, xlsxName) : path_1.default.join(options.output, xlsxName, "audio");
-            const oldMp3 = utils_1.utils.findFiles(outAudioDir, [".mp3"]);
+            const { output, script, fileName, ref } = this.getBundleInfo(options, xlsxName);
+            const oldMp3 = utils_1.utils.findFiles(output, [".mp3"]);
             const newMp3 = [];
             // 读取 Excel 文件
             const workbook = xlsx_1.default.readFile(filePath);
             const sheet = workbook.Sheets[workbook.SheetNames[0]];
             const json = xlsx_1.default.utils.sheet_to_json(sheet);
             const fileDir = path_1.default.join(dir, xlsxName);
-            const fileName = xlsxName.charAt(0).toUpperCase() + xlsxName.slice(1) + "Audio";
             let str = `export const ${fileName} = {`;
             const lastIndex = json.length - 1;
             // 将每一行配置转换成资源复制动作和 TS 映射项。
@@ -37,7 +34,7 @@ class Audio {
                 const fileName = item["文件名"];
                 const refName = item["引用名"];
                 const srcPath = path_1.default.join(fileDir, `${fileName}.mp3`);
-                const dstPath = path_1.default.join(outAudioDir, `${refName}.mp3`);
+                const dstPath = path_1.default.join(output, `${refName}.mp3`);
                 if (fs_1.default.existsSync(srcPath)) {
                     utils_1.utils.copyFileSync(srcPath, dstPath);
                     newMp3.push(dstPath);
@@ -46,13 +43,7 @@ class Audio {
                     if (key.includes(".")) {
                         key = `"${refName}"`;
                     }
-                    let value;
-                    if (isAny) {
-                        value = `"${bundle}://res/audio/${refName}"${index === lastIndex ? "" : ","} // ${fileName}`;
-                    }
-                    else {
-                        value = `"${xlsxName}://audio/${refName}"${index === lastIndex ? "" : ","} // ${fileName}`;
-                    }
+                    const value = `"${ref}/${refName}"${index === lastIndex ? "" : ","} // ${fileName}`;
                     str += `\n    ${key}: ${value}`;
                 }
                 else {
@@ -61,8 +52,7 @@ class Audio {
             });
             str += "\n};\n";
             // 导出ts配置文件
-            const tsFilePath = isAny ? utils_1.utils.stringFormat(options.script, xlsxName, fileName) : path_1.default.join(options.script, xlsxName, "config", `${fileName}.ts`);
-            utils_1.utils.writeFileSync(tsFilePath, str);
+            utils_1.utils.writeFileSync(script, str);
             // 删除未使用mp3文件
             oldMp3
                 // 找出本次导出结果中已经不存在的旧音频文件。
@@ -74,6 +64,41 @@ class Audio {
             });
         }
     }
+    /**
+     * 获取资源包信息
+     * @param options 音频导出选项
+     * @param xlsxName xlsx文件名
+     * @returns 资源包信息
+     */
+    getBundleInfo(options, xlsxName) {
+        const fileName = xlsxName.charAt(0).toUpperCase() + xlsxName.slice(1) + "Audio";
+        // 特殊指定的包
+        if (options.special[xlsxName]) {
+            const { output, script, ref } = options.special[xlsxName];
+            return {
+                ref,
+                fileName,
+                output,
+                script,
+            };
+        }
+        // 任意包
+        if (options.bundle == "{0}") {
+            return {
+                fileName,
+                ref: `${xlsxName}://res/audio/`,
+                output: utils_1.utils.stringFormat(options.output, xlsxName),
+                script: utils_1.utils.stringFormat(options.script, xlsxName, fileName),
+            };
+        }
+        // 旧版本模式
+        return {
+            fileName,
+            ref: `${options.bundle}://${xlsxName}/audio/`,
+            output: path_1.default.join(options.output, xlsxName, "audio"),
+            script: path_1.default.join(options.script, xlsxName, "config", `${fileName}.ts`),
+        };
+    }
 }
 exports.Audio = Audio;
 exports.audio = new Audio();

package/dist/audio/src/index.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
 const audio_1 = require("./audio");
+const utils_1 = require("../../utils");
 /**
  * 解析音频导出命令参数，并启动音频配置生成流程。
  */
@@ -24,13 +25,15 @@ function main() {
             .requiredOption("-o, --output <directory>", "output directory")
             .requiredOption("--script <directory>", "script directory")
             .option("-b, --bundle <bundle>", "bundle name")
+            .option("--special <special>", "special conf")
             .parse(process.argv);
         const options = commander_1.program.opts();
         audio_1.audio.parse({
             source: options.source,
             output: options.output,
             script: options.script,
-            bundle: options.bundle
+            bundle: options.bundle,
+            special: JSON.parse(utils_1.utils.decodeBase64(options.special)),
         });
     });
 }

package/dist/utils.js

@@ -246,4 +246,12 @@ var utils;
         return template;
     }
     utils.stringFormat = stringFormat;
+    function decodeBase64(base64) {
+        return Buffer.from(base64, "base64").toString("utf-8");
+    }
+    utils.decodeBase64 = decodeBase64;
+    function encodeBase64(str) {
+        return Buffer.from(str).toString("base64");
+    }
+    utils.encodeBase64 = encodeBase64;
 })(utils || (exports.utils = utils = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fast-cocos",
-  "version": "1.1.13",
+  "version": "1.1.15",
   "scripts": {
     "clean": "rm -rf dist",
     "start": "node ./dist/index.js",