@yangrunchi/a_6 1.0.2 → 1.0.3

package/AutoCfg/A6_generate-tablemgr.js

@@ -8,11 +8,12 @@ const path = require('path');
 const { execSync } = require('child_process');
 
 // ==================== 配置 ====================
+const projectRoot = require('../Tools/project-root')();
 
 // 目录路径配置
-const csvcfgDir = path.join(__dirname, '../../../dev/GUILayout/ssrgame/csvcfg');      // CSV配置目录
-const mgrDir = path.join(__dirname, '../../../dev/GUILayout/ssrgame/mgr');            // 管理器目录
-const gameConfigDir = path.join(__dirname, '../../../dev/scripts/game_config');       // 游戏配置目录
+const csvcfgDir = path.join(projectRoot, 'dev/GUILayout/ssrgame/csvcfg');      // CSV配置目录
+const mgrDir = path.join(projectRoot, 'dev/GUILayout/ssrgame/mgr');            // 管理器目录
+const gameConfigDir = path.join(projectRoot, 'dev/scripts/game_config');       // 游戏配置目录
 const tableMgrPath = path.join(mgrDir, 'TableMgr.lua');                        // 输出文件路径
 
 // 标记定义 - 用于识别文件中需要自动更新的区域

package/AutoCfg/csvcfg.js

@@ -10,8 +10,8 @@ const iconv = require('iconv-lite');
 const { execSync } = require('child_process');
 
 // ==================== 路径配置 ====================
-const projectRoot = path.join(__dirname, '../../../../');  // 996M2_Client 目录
-const moduleTableRoot = path.join(__dirname, '../../../../ModuleTable');  // ModuleTable 目录
+const projectRoot = require('../Tools/project-root')();
+const moduleTableRoot = path.join(projectRoot, '..', 'ModuleTable');
 
 // 源文件目录（xlsx 文件）
 const tPath = path.join(moduleTableRoot, 'table');
@@ -20,10 +20,10 @@ const tPath = path.join(moduleTableRoot, 'table');
 const toolPath = path.join(moduleTableRoot, 'tool');
 
 // 服务端输出目录
-const sPath = path.join(__dirname, '../../../../MirServer/Mir200/Envir/QuestDiary/cfgcsv');
+const sPath = path.join(projectRoot, '..', 'MirServer/Mir200/Envir/QuestDiary/cfgcsv');
 
 // 客户端输出目录
-const cPath = path.join(__dirname, '../../../dev/GUILayout/ssrgame/csvcfg');
+const cPath = path.join(projectRoot, 'dev/GUILayout/ssrgame/csvcfg');
 
 // 打印路径信息
 console.log('========================================');

package/AutoCode/A2_generate-panel.js

@@ -40,8 +40,9 @@ try {
     process.exit(1);
 }
 
-const guiExportDir = path.join(__dirname, '../../../dev/GUIExport');
-const guiLayoutDir = path.join(__dirname, '../../../dev/GUILayout');
+const projectRoot = require('../Tools/project-root')();
+const guiExportDir = path.join(projectRoot, 'dev/GUIExport');
+const guiLayoutDir = path.join(projectRoot, 'dev/GUILayout');
 const author = config.author;
 
 console.log(`[DEBUG] guiExportDir: ${guiExportDir}`);

package/AutoCode/A3_watcher.js

@@ -20,7 +20,8 @@ if (config.watchEnabled === false) {
     process.exit(0);
 }
 
-const watchDir = path.join(__dirname, '../../../dev/GUIExport');
+const projectRoot = require('../Tools/project-root')();
+const watchDir = path.join(projectRoot, 'dev/GUIExport');
 const generateScript = path.join(__dirname, 'A2_generate-panel.js');
 
 console.log(`[WATCH] Directory: ${watchDir}`);

package/AutoNetMsg/A5_generate-funcdata.js

@@ -9,9 +9,10 @@ const { execSync } = require('child_process');
 const os = require('os');
 
 // ==================== 配置 ====================
+const projectRoot = require('../Tools/project-root')();
 
-const bPath = path.join(__dirname, '../../../dev/GUILayout/ssrgame/net', 'NetMsgCfg.lua');
-const ssrgameRoot = path.join(__dirname, '../../../dev/GUILayout/ssrgame');
+const bPath = path.join(projectRoot, 'dev/GUILayout/ssrgame/net/NetMsgCfg.lua');
+const ssrgameRoot = path.join(projectRoot, 'dev/GUILayout/ssrgame');
 const funcDataDir = path.join(ssrgameRoot, 'funcData');
 const mgrDir = path.join(ssrgameRoot, 'mgr');
 

package/AutoNetMsg/A5_sync-netmsg.js

@@ -9,10 +9,11 @@ const iconv = require('iconv-lite');
 const svnUtils = require('../Tools/svn-utils');
 
 // ==================== 配置 ====================
+const projectRoot = require('../Tools/project-root')();
 
-const NetMsgrPath = path.join(__dirname, '../../../../NetMsg');
-const aPath = path.join(__dirname, '../../../../MirServer/Mir200/Envir/QuestDiary/net/', 'NetMsgCfg.lua');
-const bPath = path.join(__dirname, '../../../dev/GUILayout/ssrgame/net', 'NetMsgCfg.lua');
+const NetMsgrPath = path.join(projectRoot, '..', 'NetMsg');
+const aPath = path.join(projectRoot, '..', 'MirServer/Mir200/Envir/QuestDiary/net/NetMsgCfg.lua');
+const bPath = path.join(projectRoot, 'dev/GUILayout/ssrgame/net/NetMsgCfg.lua');
 
 // 标记定义（统一管理，避免硬编码）
 const MARKERS = {

package/SVNUpdate/svn_996.js

@@ -8,8 +8,9 @@ const iconv = require('iconv-lite');
 const svnUtils = require('../Tools/svn-utils');
 
 // ==================== 配置 ====================
+const projectRoot = require('../Tools/project-root')();
 
-const ProjecPath = path.join(__dirname, '../../../../../Project');
+const ProjecPath = path.join(projectRoot, '..', 'Project');
 
 console.log('🚀 开始执行协议同步流程...');
 console.log('📁 当前工作目录:', __dirname);

package/Tools/project-root.js

@@ -0,0 +1,41 @@
+/**
+ * 项目根路径查找模块
+ * 通过查找 996M2_Client.exe 或 env.json 定位项目根目录
+ */
+const path = require('path');
+const fs = require('fs');
+
+let _cachedRoot = null;
+
+function findProjectRoot() {
+    if (_cachedRoot) return _cachedRoot;
+
+    // 优先从环境变量获取（cli.js 会设置）
+    if (process.env.M2_PROJECT_ROOT) {
+        _cachedRoot = process.env.M2_PROJECT_ROOT;
+        return _cachedRoot;
+    }
+
+    // 从当前工作目录向上查找
+    let cwd = process.cwd();
+    const markers = ['996M2_Client.exe', 'env.json', 'game.dat'];
+
+    for (let i = 0; i < 6; i++) {
+        for (const marker of markers) {
+            if (fs.existsSync(path.join(cwd, marker))) {
+                _cachedRoot = cwd;
+                return _cachedRoot;
+            }
+        }
+        const parent = path.dirname(cwd);
+        if (parent === cwd) break;
+        cwd = parent;
+    }
+
+    // 找不到则报错
+    console.error('错误: 找不到 996M2_Client 项目根目录');
+    console.error('请在 996M2_Client 项目目录下运行此命令');
+    process.exit(1);
+}
+
+module.exports = findProjectRoot;

package/cli.js

@@ -24,30 +24,35 @@ if (!commands[action]) {
     process.exit(0);
 }
 
-const cmd = commands[action];
-
-// 特殊处理：启动客户端需要找到项目根目录的 exe
-if (action === '1') {
-    console.log(`🚀 执行: ${cmd.desc}`);
-    // 从当前工作目录向上查找 996M2_Client.exe
+// 从当前工作目录向上查找项目根目录
+function findProjectRoot() {
     let cwd = process.cwd();
-    let exePath = null;
-    for (let i = 0; i < 5; i++) {
-        const testPath = path.join(cwd, '996M2_Client.exe');
-        if (fs.existsSync(testPath)) {
-            exePath = testPath;
-            break;
+    const markers = ['996M2_Client.exe', 'env.json', 'game.dat'];
+    for (let i = 0; i < 6; i++) {
+        for (const marker of markers) {
+            if (fs.existsSync(path.join(cwd, marker))) {
+                return cwd;
+            }
         }
         const parent = path.dirname(cwd);
-        if (parent === cwd) break; // 到达根目录
+        if (parent === cwd) break;
         cwd = parent;
     }
-    if (!exePath) {
-        console.error('错误: 找不到 996M2_Client.exe');
-        console.error('请在 996M2_Client 项目目录下运行 a_6 1');
-        console.error('或者 cd 到包含 996M2_Client.exe 的目录');
+    return null;
+}
+
+const projectRoot = findProjectRoot();
+const cmd = commands[action];
+
+if (action === '1') {
+    // 特殊处理：启动客户端
+    if (!projectRoot) {
+        console.error('错误: 找不到 996M2_Client 项目目录');
+        console.error('请在项目目录下运行 a_6 1');
         process.exit(1);
     }
+    const exePath = path.join(projectRoot, '996M2_Client.exe');
+    console.log(`🚀 执行: ${cmd.desc}`);
     console.log(`启动 996M2 客户端...`);
     console.log(`路径: ${exePath}`);
     exec(`start "" "${exePath}"`, (err) => {
@@ -57,10 +62,14 @@ if (action === '1') {
         }
         console.log('客户端已启动');
     });
-    // 给异步回调一点时间
     setTimeout(() => process.exit(0), 2000);
 } else {
+    // 设置环境变量，让子脚本也能找到项目根目录
+    const env = { ...process.env };
+    if (projectRoot) {
+        env.M2_PROJECT_ROOT = projectRoot;
+    }
     const batFile = path.join(__dirname, cmd.file);
     console.log(`🚀 执行: ${cmd.desc}`);
-    execSync(`"${batFile}"`, { stdio: 'inherit', shell: true });
+    execSync(`"${batFile}"`, { stdio: 'inherit', shell: true, env });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yangrunchi/a_6",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "996M2 客户端 Node.js 工具集 — 协议同步、自动生成代码、CSV配置、SVN管理、BAT脚本管理器",
   "main": "index.js",
   "bin": {