cocos2d-cli 1.0.4 → 1.1.0

package/src/commands/get.js

@@ -1,12 +1,129 @@
 /**
- * get 命令 - 获取节点信息
+ * get 命令 - 获取节点信息         
+ * 返回与编辑器 Inspector 面板一致的所有属性
  */
 
 const { loadScene, buildMaps, findNodeIndex } = require('../lib/fire-utils');
 
+/**
+ * 将 _color 对象转为 #RRGGBB 字符串
+ */
+function colorToHex(color) {
+    if (!color) return '#ffffff';
+    const r = (color.r || 0).toString(16).padStart(2, '0');
+    const g = (color.g || 0).toString(16).padStart(2, '0');
+    const b = (color.b || 0).toString(16).padStart(2, '0');
+    return `#${r}${g}${b}`;
+}
+
+/**
+ * 提取组件的关键属性（对应 Inspector 面板显示）
+ */
+function extractComponentProps(comp) {
+    if (!comp) return null;
+    const type = comp.__type__;
+
+    // 只在 disabled 时才输出 enabled 字段
+    const base = comp._enabled ? { type } : { type, enabled: false };
+
+    // 清理对象中的 __type__ 字段
+    const clean = (obj) => {
+        if (!obj || typeof obj !== 'object') return obj;
+        if (Array.isArray(obj)) return obj.map(clean);
+        const result = {};
+        for (const [k, v] of Object.entries(obj)) {
+            if (k === '__type__') continue;
+            result[k] = typeof v === 'object' ? clean(v) : v;
+        }
+        return result;
+    };
+
+    switch (type) {
+        case 'cc.Sprite':
+            return {
+                ...base,
+                spriteFrame: comp._spriteFrame?.__uuid__ || null,
+                sizeMode: ['CUSTOM', 'TRIMMED', 'RAW'][comp._sizeMode] || comp._sizeMode,
+                spriteType: ['SIMPLE', 'SLICED', 'TILED', 'FILLED', 'MESH'][comp._type] || comp._type,
+                trim: comp._isTrimmedMode
+            };
+        case 'cc.Label':
+            return {
+                ...base,
+                string: comp._string,
+                fontSize: comp._fontSize,
+                lineHeight: comp._lineHeight,
+                horizontalAlign: ['LEFT', 'CENTER', 'RIGHT'][comp._N$horizontalAlign] || comp._N$horizontalAlign,
+                verticalAlign: ['TOP', 'CENTER', 'BOTTOM'][comp._N$verticalAlign] || comp._N$verticalAlign,
+                overflow: ['NONE', 'CLAMP', 'SHRINK', 'RESIZE_HEIGHT'][comp._N$overflow] || comp._N$overflow,
+                fontFamily: comp._N$fontFamily,
+                enableWrapText: comp._enableWrapText
+            };
+        case 'cc.Button':
+            return {
+                ...base,
+                interactable: comp._N$interactable,
+                transition: ['NONE', 'COLOR', 'SPRITE', 'SCALE'][comp._N$transition] || comp._N$transition,
+                zoomScale: comp.zoomScale,
+                duration: comp.duration
+            };
+        case 'cc.Widget':
+            return {
+                ...base,
+                alignMode: ['ONCE', 'ON_WINDOW_RESIZE', 'ALWAYS'][comp.alignMode] || comp.alignMode,
+                left: comp._left,
+                right: comp._right,
+                top: comp._top,
+                bottom: comp._bottom
+            };
+        case 'cc.Layout':
+            return {
+                ...base,
+                layoutType: ['NONE', 'HORIZONTAL', 'VERTICAL', 'GRID'][comp._N$layoutType] || comp._N$layoutType,
+                spacingX: comp._N$spacingX,
+                spacingY: comp._N$spacingY,
+                paddingLeft: comp._N$paddingLeft,
+                paddingRight: comp._N$paddingRight,
+                paddingTop: comp._N$paddingTop,
+                paddingBottom: comp._N$paddingBottom
+            };
+        case 'cc.Canvas':
+            return {
+                ...base,
+                designResolution: clean(comp._designResolution),
+                fitWidth: comp._fitWidth,
+                fitHeight: comp._fitHeight
+            };
+        case 'cc.Camera':
+            return {
+                ...base,
+                depth: comp._depth,
+                zoomRatio: comp._zoomRatio,
+                ortho: comp._ortho,
+                cullingMask: comp._cullingMask
+            };
+        case 'cc.ParticleSystem':
+            return {
+                ...base,
+                playOnLoad: comp.playOnLoad,
+                totalParticles: comp.totalParticles,
+                duration: comp.duration
+            };
+        default:
+            // 未知组件：返回去掉内部字段的原始属性
+            const result = { ...base };
+            for (const key of Object.keys(comp)) {
+                if (!key.startsWith('_') && key !== '__type__') {
+                    result[key] = comp[key];
+                }
+            }
+            return result;
+    }
+}
+
 function run(args) {
     if (args.length < 2) {
-        console.log(JSON.stringify({ error: '用法: cocos2.4 get <场景文件路径> <节点索引|名称>' }));
+        console.log(JSON.stringify({ error: '用法: cocos2.4 get <场景.fire | 预制体.prefab> <节点索引|名称>' }));
         return;
     }
     
@@ -30,21 +147,41 @@ function run(args) {
             console.log(JSON.stringify({ error: `节点不存在: ${nodeRef}` }));
             return;
         }
-        
-        // 返回节点信息
+
+        // 从 _trs 数组解析变换属性
+        // 格式: [x, y, z, qx, qy, qz, qw, scaleX, scaleY, scaleZ]
+        const trs = node._trs?.array || [0,0,0, 0,0,0,1, 1,1,1];
+
+        // 组件详细信息
+        const components = (node._components || []).map(ref => {
+            const comp = data[ref.__id__];
+            return extractComponentProps(comp);
+        });
+
+        // 子节点名称
+        const children = (node._children || []).map(ref => data[ref.__id__]?._name || '(unknown)');
+
         const info = indexMap[idx] || {};
-        console.log(JSON.stringify({
-            success: true,
-            index: idx,
-            ...info,
-            node: {
-                active: node._active,
-                position: node._trs?.array?.slice(0, 2) || [0, 0],
-                size: node._contentSize || { width: 0, height: 0 },
-                children: node._children?.map(c => c.__id__) || [],
-                components: node._components?.map(c => c.__id__) || []
-            }
-        }, null, 2));
+
+        // 精简 JSON 输出
+        const result = {
+            name: info.name,
+            active: node._active,
+            position: { x: trs[0], y: trs[1] },
+            rotation: node._eulerAngles?.z ?? 0,
+            scale: { x: trs[7], y: trs[8] },
+            anchor: { x: node._anchorPoint?.x ?? 0.5, y: node._anchorPoint?.y ?? 0.5 },
+            size: { w: node._contentSize?.width ?? 0, h: node._contentSize?.height ?? 0 },
+            color: colorToHex(node._color),
+            opacity: node._opacity ?? 255,
+            group: node._groupIndex ?? 0
+        };
+
+        if (children.length > 0) result.children = children;
+        if (components.length > 0) result.components = components;
+
+        console.log(JSON.stringify(result));
+
     } catch (err) {
         console.log(JSON.stringify({ error: err.message }));
     }

package/src/commands/prefab-create.js

@@ -0,0 +1,49 @@
+/**
+ * prefab-create 命令 - 创建新预制体文件
+ */
+
+const { saveScene, createPrefab } = require('../lib/fire-utils');
+const fs = require('fs');
+const path = require('path');
+
+function run(args) {
+    if (args.length < 2) {
+        console.log(JSON.stringify({ error: '用法: cocos2.4 prefab-create <预制体路径> <根节点名称>' }));
+        return;
+    }
+    
+    const prefabPath = args[0];
+    const rootName = args[1] || 'RootNode';
+    
+    try {
+        // 检查文件是否已存在
+        if (fs.existsSync(prefabPath)) {
+            console.log(JSON.stringify({ error: `文件已存在: ${prefabPath}` }));
+            return;
+        }
+        
+        // 确保目录存在
+        const dir = path.dirname(prefabPath);
+        if (!fs.existsSync(dir)) {
+            fs.mkdirSync(dir, { recursive: true });
+        }
+        
+        // 创建预制体数据
+        const data = createPrefab(rootName);
+        
+        // 保存文件
+        saveScene(prefabPath, data);
+        
+        console.log(JSON.stringify({ 
+            success: true, 
+            path: prefabPath,
+            rootName: rootName,
+            message: `预制体创建成功: ${rootName}`
+        }));
+        
+    } catch (err) {
+        console.log(JSON.stringify({ error: err.message }));
+    }
+}
+
+module.exports = { run };

package/src/commands/remove.js

@@ -2,96 +2,31 @@
  * remove 命令 - 删除节点或组件
  */
 
-const { loadScene, saveScene, buildMaps, collectNodeAndChildren, rebuildReferences, refreshEditor, installPlugin } = require('../lib/fire-utils');
-const fs = require('fs');
-const path = require('path');
-
-// 加载脚本映射
-function loadScriptMap(scenePath) {
-    const projectPath = path.dirname(path.dirname(scenePath));
-    const mapPath = path.join(projectPath, 'data', 'script_map.json');
-    try {
-        if (fs.existsSync(mapPath)) {
-            return JSON.parse(fs.readFileSync(mapPath, 'utf-8'));
-        }
-    } catch (e) {}
-    return {};
-}
-
-// 构建树形结构
-function buildTree(data, scriptMap, nodeIndex, prefix = '', isLast = true, isRoot = true) {
-    const node = data[nodeIndex];
-    if (!node) return '';
-    
-    const nodeName = isRoot ? 'Root' : (node._name || '(unnamed)');
-    const active = node._active !== false ? '●' : '○';
-    const uuidRegex = /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i;
-    
-    let result = prefix + (isRoot ? '' : active + ' ') + nodeName + ' #' + nodeIndex;
-    
-    // 添加组件信息
-    if (node._components && node._components.length > 0) {
-        const comps = node._components.map(c => {
-            const comp = data[c.__id__];
-            if (!comp) return `? #${c.__id__}`;
-            const typeName = comp.__type__;
-            let displayName;
-            if (uuidRegex.test(typeName)) {
-                const scriptInfo = scriptMap[typeName];
-                if (scriptInfo && scriptInfo.name) {
-                    displayName = scriptInfo.name;
-                } else {
-                    displayName = '⚠️MissingScript';
-                }
-            } else if (typeName === 'MissingScript') {
-                displayName = '⚠️MissingScript';
-            } else {
-                displayName = typeName.replace('cc.', '');
-            }
-            return `${displayName} #${c.__id__}`;
-        }).join(', ');
-        result += ` (${comps})`;
-    }
-    
-    result += '\n';
-    
-    // 处理子节点
-    if (node._children && node._children.length > 0) {
-        node._children.forEach((childRef, idx) => {
-            const childIsLast = idx === node._children.length - 1;
-            const childPrefix = prefix + (isRoot ? '' : (isLast ? '    ' : '│   '));
-            result += buildTree(data, scriptMap, childRef.__id__, childPrefix, childIsLast, false);
-        });
-    }
-    
-    return result;
-}
+const { loadScene, saveScene, collectNodeAndChildren, rebuildReferences, refreshEditor, loadScriptMap, buildTree } = require('../lib/fire-utils');
 
 function run(args) {
     if (args.length < 2) {
-        console.log('用法: cocos2.4 remove <场景文件路径> <索引>');
+        console.log(JSON.stringify({ error: '用法: cocos2.4 remove <场景文件路径> <索引>' }));
         return;
     }
     
     const scenePath = args[0];
     
-    // 安装 CLI Helper 插件（如果不存在）
-    installPlugin(scenePath);
-    
-    const index = parseInt(args[1]);
-    
-    if (isNaN(index)) {
-        console.log('错误: 索引必须是数字');
+    // 索引必须是数字
+    if (!/^\d+$/.test(args[1])) {
+        console.log(JSON.stringify({ error: '索引必须是数字，请先用 tree 命令查看节点索引' }));
         return;
     }
     
+    const index = parseInt(args[1]);
+    
     try {
         let data = loadScene(scenePath);
         const scriptMap = loadScriptMap(scenePath);
         
         // 检查索引是否存在
         if (!data[index]) {
-            console.log(`错误: 索引 ${index} 不存在`);
+            console.log(JSON.stringify({ error: `索引 ${index} 不存在` }));
             return;
         }
         
@@ -103,7 +38,7 @@ function run(args) {
         const isComponent = item.node !== undefined;
         
         if (isNode && index <= 1) {
-            console.log('错误: 不能删除根节点');
+            console.log(JSON.stringify({ error: '不能删除根节点' }));
             return;
         }
         
@@ -156,8 +91,8 @@ function run(args) {
         console.log(buildTree(data, scriptMap, 1));
         
     } catch (err) {
-        console.log(`错误: ${err.message}`);
+        console.log(JSON.stringify({ error: err.message }));
     }
 }
 
-module.exports = { run };
+module.exports = { run };

package/src/commands/set.js

@@ -1,9 +1,122 @@
 /**
- * set 命令 - 修改节点属性
+ * set 命令 - 修改节点属性 
+ * 修改成功后返回节点最终状态（与 get 命令格式一致）
  */
 
 const { loadScene, saveScene, buildMaps, findNodeIndex, refreshEditor } = require('../lib/fire-utils');
 
+/**
+ * 将 _color 对象转为 #RRGGBB 字符串
+ */
+function colorToHex(color) {
+    if (!color) return '#ffffff';
+    const r = (color.r || 0).toString(16).padStart(2, '0');
+    const g = (color.g || 0).toString(16).padStart(2, '0');
+    const b = (color.b || 0).toString(16).padStart(2, '0');
+    return `#${r}${g}${b}`;
+}
+
+/**
+ * 提取组件的关键属性（对应 Inspector 面板显示）
+ */
+function extractComponentProps(comp) {
+    if (!comp) return null;
+    const type = comp.__type__;
+    const base = comp._enabled ? { type } : { type, enabled: false };
+
+    const clean = (obj) => {
+        if (!obj || typeof obj !== 'object') return obj;
+        if (Array.isArray(obj)) return obj.map(clean);
+        const result = {};
+        for (const [k, v] of Object.entries(obj)) {
+            if (k === '__type__') continue;
+            result[k] = typeof v === 'object' ? clean(v) : v;
+        }
+        return result;
+    };
+
+    switch (type) {
+        case 'cc.Sprite':
+            return {
+                ...base,
+                spriteFrame: comp._spriteFrame?.__uuid__ || null,
+                sizeMode: ['CUSTOM', 'TRIMMED', 'RAW'][comp._sizeMode] || comp._sizeMode,
+                spriteType: ['SIMPLE', 'SLICED', 'TILED', 'FILLED', 'MESH'][comp._type] || comp._type,
+                trim: comp._isTrimmedMode
+            };
+        case 'cc.Label':
+            return {
+                ...base,
+                string: comp._string,
+                fontSize: comp._fontSize,
+                lineHeight: comp._lineHeight,
+                horizontalAlign: ['LEFT', 'CENTER', 'RIGHT'][comp._N$horizontalAlign] || comp._N$horizontalAlign,
+                verticalAlign: ['TOP', 'CENTER', 'BOTTOM'][comp._N$verticalAlign] || comp._N$verticalAlign,
+                overflow: ['NONE', 'CLAMP', 'SHRINK', 'RESIZE_HEIGHT'][comp._N$overflow] || comp._N$overflow,
+                fontFamily: comp._N$fontFamily,
+                enableWrapText: comp._enableWrapText
+            };
+        case 'cc.Button':
+            return {
+                ...base,
+                interactable: comp._N$interactable,
+                transition: ['NONE', 'COLOR', 'SPRITE', 'SCALE'][comp._N$transition] || comp._N$transition,
+                zoomScale: comp.zoomScale,
+                duration: comp.duration
+            };
+        case 'cc.Widget':
+            return {
+                ...base,
+                alignMode: ['ONCE', 'ON_WINDOW_RESIZE', 'ALWAYS'][comp.alignMode] || comp.alignMode,
+                left: comp._left,
+                right: comp._right,
+                top: comp._top,
+                bottom: comp._bottom
+            };
+        case 'cc.Layout':
+            return {
+                ...base,
+                layoutType: ['NONE', 'HORIZONTAL', 'VERTICAL', 'GRID'][comp._N$layoutType] || comp._N$layoutType,
+                spacingX: comp._N$spacingX,
+                spacingY: comp._N$spacingY,
+                paddingLeft: comp._N$paddingLeft,
+                paddingRight: comp._N$paddingRight,
+                paddingTop: comp._N$paddingTop,
+                paddingBottom: comp._N$paddingBottom
+            };
+        case 'cc.Canvas':
+            return {
+                ...base,
+                designResolution: clean(comp._designResolution),
+                fitWidth: comp._fitWidth,
+                fitHeight: comp._fitHeight
+            };
+        case 'cc.Camera':
+            return {
+                ...base,
+                depth: comp._depth,
+                zoomRatio: comp._zoomRatio,
+                ortho: comp._ortho,
+                cullingMask: comp._cullingMask
+            };
+        case 'cc.ParticleSystem':
+            return {
+                ...base,
+                playOnLoad: comp.playOnLoad,
+                totalParticles: comp.totalParticles,
+                duration: comp.duration
+            };
+        default:
+            const result = { ...base };
+            for (const key of Object.keys(comp)) {
+                if (!key.startsWith('_') && key !== '__type__') {
+                    result[key] = comp[key];
+                }
+            }
+            return result;
+    }
+}
+
 // 解析颜色
 function parseColor(colorStr) {
     if (!colorStr) return null;
@@ -22,9 +135,36 @@ function parseColor(colorStr) {
     return null;
 }
 
+/**
+ * 获取节点的完整状态（与 get 命令一致）
+ */
+function getNodeState(data, node, nodeIndex) {
+    const trs = node._trs?.array || [0,0,0, 0,0,0,1, 1,1,1];
+    const components = (node._components || []).map(ref => extractComponentProps(data[ref.__id__]));
+    const children = (node._children || []).map(ref => data[ref.__id__]?._name || '(unknown)');
+
+    const result = {
+        name: node._name,
+        active: node._active,
+        position: { x: trs[0], y: trs[1] },
+        rotation: node._eulerAngles?.z ?? 0,
+        scale: { x: trs[7], y: trs[8] },
+        anchor: { x: node._anchorPoint?.x ?? 0.5, y: node._anchorPoint?.y ?? 0.5 },
+        size: { w: node._contentSize?.width ?? 0, h: node._contentSize?.height ?? 0 },
+        color: colorToHex(node._color),
+        opacity: node._opacity ?? 255,
+        group: node._groupIndex ?? 0
+    };
+
+    if (children.length > 0) result.children = children;
+    if (components.length > 0) result.components = components;
+
+    return result;
+}
+
 function run(args) {
     if (args.length < 2) {
-        console.log(JSON.stringify({ error: '用法: cocos2.4 set <场景文件路径> <节点索引|名称> [选项]' }));
+        console.log(JSON.stringify({ error: '用法: cocos2.4 set <场景.fire | 预制体.prefab> <节点索引|名称> [选项]' }));
         return;
     }
     
@@ -53,20 +193,15 @@ function run(args) {
         }
         
         const node = data[nodeIndex];
-        const changes = {};
         
         // 修改名称
         if (options.name !== undefined) {
-            const oldName = node._name;
             node._name = options.name;
-            changes.name = { from: oldName, to: options.name };
         }
         
         // 修改激活状态
         if (options.active !== undefined) {
-            const oldActive = node._active;
             node._active = options.active !== 'false';
-            changes.active = { from: oldActive, to: node._active };
         }
         
         // 修改位置
@@ -74,11 +209,8 @@ function run(args) {
             if (!node._trs) {
                 node._trs = { "__type__": "TypedArray", "ctor": "Float64Array", "array": [0, 0, 0, 0, 0, 0, 1, 1, 1, 1] };
             }
-            const oldX = node._trs.array[0];
-            const oldY = node._trs.array[1];
             if (options.x !== undefined) node._trs.array[0] = parseFloat(options.x);
             if (options.y !== undefined) node._trs.array[1] = parseFloat(options.y);
-            changes.position = { from: [oldX, oldY], to: [node._trs.array[0], node._trs.array[1]] };
         }
         
         // 修改大小
@@ -86,11 +218,8 @@ function run(args) {
             if (!node._contentSize) {
                 node._contentSize = { "__type__": "cc.Size", width: 0, height: 0 };
             }
-            const oldW = node._contentSize.width;
-            const oldH = node._contentSize.height;
             if (options.width !== undefined) node._contentSize.width = parseFloat(options.width);
             if (options.height !== undefined) node._contentSize.height = parseFloat(options.height);
-            changes.size = { from: { width: oldW, height: oldH }, to: { width: node._contentSize.width, height: node._contentSize.height } };
         }
         
         // 修改锚点
@@ -98,18 +227,13 @@ function run(args) {
             if (!node._anchorPoint) {
                 node._anchorPoint = { "__type__": "cc.Vec2", x: 0.5, y: 0.5 };
             }
-            const oldX = node._anchorPoint.x;
-            const oldY = node._anchorPoint.y;
             if (options.anchorX !== undefined) node._anchorPoint.x = parseFloat(options.anchorX);
             if (options.anchorY !== undefined) node._anchorPoint.y = parseFloat(options.anchorY);
-            changes.anchor = { from: [oldX, oldY], to: [node._anchorPoint.x, node._anchorPoint.y] };
         }
         
         // 修改透明度
         if (options.opacity !== undefined) {
-            const oldOpacity = node._opacity;
             node._opacity = Math.max(0, Math.min(255, parseInt(options.opacity)));
-            changes.opacity = { from: oldOpacity, to: node._opacity };
         }
         
         // 修改颜色
@@ -117,7 +241,6 @@ function run(args) {
             const color = parseColor(options.color);
             if (color) {
                 node._color = color;
-                changes.color = { to: options.color };
             }
         }
         
@@ -126,9 +249,7 @@ function run(args) {
             if (!node._eulerAngles) {
                 node._eulerAngles = { "__type__": "cc.Vec3", x: 0, y: 0, z: 0 };
             }
-            const oldRotation = node._eulerAngles.z;
             node._eulerAngles.z = parseFloat(options.rotation);
-            changes.rotation = { from: oldRotation, to: node._eulerAngles.z };
         }
         
         // 修改缩放
@@ -136,25 +257,18 @@ function run(args) {
             if (!node._trs) {
                 node._trs = { "__type__": "TypedArray", "ctor": "Float64Array", "array": [0, 0, 0, 0, 0, 0, 1, 1, 1, 1] };
             }
-            const oldScaleX = node._trs.array[7];
-            const oldScaleY = node._trs.array[8];
             if (options.scaleX !== undefined) node._trs.array[7] = parseFloat(options.scaleX);
             if (options.scaleY !== undefined) node._trs.array[8] = parseFloat(options.scaleY);
-            changes.scale = { from: [oldScaleX, oldScaleY], to: [node._trs.array[7], node._trs.array[8]] };
         }
         
         // 保存场景
         saveScene(scenePath, data);
         
-        // 触发编辑器刷新（传入场景路径以重新打开场景）
+        // 触发编辑器刷新
         refreshEditor(scenePath);
         
-        console.log(JSON.stringify({
-            success: true,
-            index: nodeIndex,
-            name: node._name,
-            changes
-        }, null, 2));
+        // 返回节点最终状态（与 get 命令格式一致）
+        console.log(JSON.stringify(getNodeState(data, node, nodeIndex)));
     } catch (err) {
         console.log(JSON.stringify({ error: err.message }));
     }