cocos2d-cli 1.5.2 → 1.6.1

package/bin/cocos2d-cli.js

@@ -18,7 +18,8 @@ const commands = {
     'remove': '../src/commands/remove',
     build: '../src/commands/build',
     'create-prefab': '../src/commands/prefab-create',
-    'create-scene': '../src/commands/create-scene'
+    'create-scene': '../src/commands/create-scene',
+    'screenshot': '../src/commands/screenshot'
 };
 
 // 帮助信息
@@ -41,6 +42,7 @@ Cocos Creator CLI - 场景/预制体操作工具集
   build <项目目录>                              构建组件映射
   create-prefab [JSON文件路径] <输出.prefab>    创建预制体（不传JSON则创建默认）
   create-scene [JSON文件路径] <输出.fire>       创建场景（不传JSON则创建默认）
+  screenshot <json文件> [选项]                  渲染JSON并截图
 
 节点路径格式:
   Canvas                    - 根节点下的 Canvas
@@ -136,6 +138,10 @@ JSON 格式 (create-prefab / create-scene):
 
   # 创建默认预制体（不传JSON）
   cocos2d-cli create-prefab assets/NewNode.prefab
+
+  # 截图
+  cocos2d-cli screenshot data.json
+  cocos2d-cli screenshot data.json -o ./screenshots -w 1080 -h 1920
 `);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cocos2d-cli", 
-  "version": "1.5.2",
+  "version": "1.6.1",
   "description": "Command-line tools for AI to read and manipulate Cocos Creator 2.4.x project scenes",
   "main": "bin/cocos2d-cli.js",
   "bin": {
@@ -19,11 +19,15 @@
     "cocos-creator",
     "cli",
     "scene",
-    "fire"
+    "fire",
+    "screenshot"
   ],
   "author": "",
   "license": "MIT",
   "engines": {
     "node": ">=14.0.0"
+  },
+  "dependencies": {
+    "playwright": "^1.58.2"
   }
 }

package/src/commands/create-scene.js

@@ -82,8 +82,8 @@ function createDefaultScene(asset, resolution) {
     
     // Canvas 组件
     const canvasComp = new CCCanvas();
-    canvasComp.setDesignResolution(width, height);
-    canvasComp.node = canvas;
+    canvasComp._designResolution.set(width, height);
+    canvas.addChild(canvasComp);
     
     // Widget 组件
     const widget = new CCWidget();
@@ -95,11 +95,6 @@ function createDefaultScene(asset, resolution) {
     
     // 创建 Main Camera 节点
     const camera = new CCNode('Main Camera');
-    camera._contentSize.width = 0;
-    camera._contentSize.height = 0;
-    camera._anchorPoint.x = 0.5;
-    camera._anchorPoint.y = 0.5;
-    camera._is3DNode = false;
     camera._id = generateCompressedUUID();
     
     // Camera 组件

package/src/commands/screenshot.js

@@ -0,0 +1,95 @@
+/**
+ * screenshot 命令
+ * 渲染 JSON 数据并截图
+ */
+
+const path = require('path');
+const { takeScreenshot } = require('../lib/screenshot-core');
+
+function showHelp() {
+    console.log(`
+用法:
+  cocos2d-cli screenshot <json文件> [选项]
+
+选项:
+  -o, --output <目录>     输出目录，默认当前目录
+  -w, --width <数值>      视口宽度，默认 750
+  -h, --height <数值>     视口高度，默认 1334
+  --full-page             全页截图（默认）
+  --no-full-page          仅视口截图
+  --timeout <毫秒>        页面加载超时，默认 30000
+  --wait <毫秒>           截图前等待时间，默认 1000
+
+示例:
+  cocos2d-cli screenshot data.json
+  cocos2d-cli screenshot data.json -o ./screenshots
+  cocos2d-cli screenshot data.json -w 1080 -h 1920
+  cocos2d-cli screenshot data.json --no-full-page
+`);
+}
+
+function parseArgs(args) {
+    const options = {
+        jsonPath: null,
+        outputDir: '.',
+        viewport: { width: 750, height: 1334 },
+        fullPage: true,
+        timeout: 30000,
+        waitTime: 1000
+    };
+
+    let i = 0;
+    while (i < args.length) {
+        const arg = args[i];
+        
+        if (arg === '--help' || arg === '-h') {
+            showHelp();
+            process.exit(0);
+        }
+        
+        if (arg === '-o' || arg === '--output') {
+            options.outputDir = args[++i];
+        } else if (arg === '-w' || arg === '--width') {
+            options.viewport.width = parseInt(args[++i], 10);
+        } else if (arg === '-h' || arg === '--height') {
+            options.viewport.height = parseInt(args[++i], 10);
+        } else if (arg === '--full-page') {
+            options.fullPage = true;
+        } else if (arg === '--no-full-page') {
+            options.fullPage = false;
+        } else if (arg === '--timeout') {
+            options.timeout = parseInt(args[++i], 10);
+        } else if (arg === '--wait') {
+            options.waitTime = parseInt(args[++i], 10);
+        } else if (!arg.startsWith('-')) {
+            options.jsonPath = arg;
+        }
+        
+        i++;
+    }
+
+    return options;
+}
+
+async function run(args) {
+    const options = parseArgs(args);
+
+    if (!options.jsonPath) {
+        console.error('错误: 请指定 JSON 文件路径');
+        showHelp();
+        process.exit(1);
+    }
+
+    options.jsonPath = path.resolve(options.jsonPath);
+    options.outputDir = path.resolve(options.outputDir);
+
+    try {
+        const result = await takeScreenshot(options);
+        console.log(`\n截图成功: ${result.screenshotPath}`);
+    } catch (error) {
+        console.error(`\n截图失败: ${error.message}`);
+        process.exit(1);
+    }
+}
+
+module.exports = { run };

package/src/lib/cc/CCCanvas.js

@@ -8,35 +8,25 @@ class CCCanvas extends CCComponent {
     constructor() {
         super();
         this.__type__ = 'cc.Canvas';
-        
+
         this._designResolution = new CCSize(960, 640);
         this._fitWidth = false;
         this._fitHeight = true;
     }
 
-    /**
-     * 设置设计分辨率
-     */
-    setDesignResolution(width, height) {
-        this._designResolution.set(width, height);
-        return this;
-    }
-
-    /**
-     * 设置适配模式
-     */
-    setFit(fitWidth, fitHeight) {
-        this._fitWidth = fitWidth;
-        this._fitHeight = fitHeight;
+    setProp(props) {
+        super.setProp(props);
+        if (props.designResolution) {
+            this._designResolution = new CCSize(props.designResolution.width, props.designResolution.height);
+        }
+        if (props.fitWidth !== undefined) this._fitWidth = props.fitWidth;
+        if (props.fitHeight !== undefined) this._fitHeight = props.fitHeight;
         return this;
     }
 
-    /**
-     * 转换为属性面板显示格式
-     */
-    toPanelJSON() {
+    getProp() {
         return {
-            ...super.toPanelJSON(),
+            ...super.getProp(),
             designResolution: {
                 width: this._designResolution?.width ?? 960,
                 height: this._designResolution?.height ?? 640

package/src/lib/cc/CCComponent.js

@@ -8,13 +8,13 @@ class CCComponent extends CCObject {
     constructor() {
         super('');
         this.__type__ = 'cc.Component';
-        
+
         // 关联的节点
         this.node = null;
-        
+
         // 启用状态
         this._enabled = true;
-        
+
         // 唯一标识（22位压缩格式）
         this._id = generateId();
     }
@@ -27,19 +27,12 @@ class CCComponent extends CCObject {
         return this;
     }
 
-    /**
-     * 设置启用状态
-     */
-    setEnabled(enabled) {
-        this._enabled = enabled;
-        return this;
-    }
-
     /**
      * 获取属性（子类重写）
      */
     getProp() {
         return {
+            class: this.__type__,
             enabled: this._enabled
         };
     }

package/src/lib/cc/CCNode.js

@@ -12,37 +12,37 @@ class CCNode extends CCObject {
     constructor(name = 'Node') {
         super(name);
         this.__type__ = 'cc.Node';
-        
+
         // 父子关系
         this._parent = null;
         this._children = [];
-        
+
         // 激活状态
         this._active = true;
-        
+
         // 组件列表
         this._components = [];
-        
+
         // 预制体信息
         this._prefab = null;
-        
+
         // 显示属性
         this._opacity = 255;
         this._color = new CCColor();
         this._contentSize = new CCSize();
         this._anchorPoint = new CCVec2(0.5, 0.5);
-        
+
         // 变换属性
         this._trs = new CCTrs();
         this._eulerAngles = new CCVec3();
         this._skewX = 0;
         this._skewY = 0;
         this._is3DNode = false;
-        
+
         // 分组
         this._groupIndex = 0;
         this.groupIndex = 0;
-        
+
         // 唯一标识（预制体中为空，场景中生成）
         this._id = '';
     }
@@ -193,7 +193,7 @@ class CCNode extends CCObject {
             scaleY: trs[8],
             rotation: this._eulerAngles?.z ?? 0,
             opacity: this._opacity ?? 255,
-            color: this._color ? `#${this._color.r.toString(16).padStart(2,'0')}${this._color.g.toString(16).padStart(2,'0')}${this._color.b.toString(16).padStart(2,'0')}` : '#ffffff'
+            color: this._color ? `#${this._color.r.toString(16).padStart(2, '0')}${this._color.g.toString(16).padStart(2, '0')}${this._color.b.toString(16).padStart(2, '0')}` : '#ffffff'
         };
         return result;
     }
@@ -220,37 +220,6 @@ class CCNode extends CCObject {
         return this;
     }
 
-    /**
-     * 转换为属性面板显示格式（人类可读）
-     */
-    toPanelJSON() {
-        const trs = this._trs?.array || [0, 0, 0, 0, 0, 0, 1, 1, 1, 1];
-        const result = {
-            name: this._name,
-            active: this._active,
-            position: { x: trs[0], y: trs[1] },
-            rotation: this._eulerAngles?.z ?? 0,
-            scale: { x: trs[7], y: trs[8] },
-            anchor: { x: this._anchorPoint?.x ?? 0.5, y: this._anchorPoint?.y ?? 0.5 },
-            size: { w: this._contentSize?.width ?? 0, h: this._contentSize?.height ?? 0 },
-            color: this._color ? `#${this._color.r.toString(16).padStart(2,'0')}${this._color.g.toString(16).padStart(2,'0')}${this._color.b.toString(16).padStart(2,'0')}` : '#ffffff',
-            opacity: this._opacity ?? 255,
-            skew: { x: this._skewX ?? 0, y: this._skewY ?? 0 },
-            group: this._groupIndex ?? 0
-        };
-        
-        // 组件列表
-        if (this._components && this._components.length > 0) {
-            result.components = {};
-            this._components.forEach(c => {
-                const typeName = c.__type__.replace('cc.', '');
-                result.components[typeName] = c.getProp ? c.getProp() : {};
-            });
-        }
-        
-        return result;
-    }
-
     toJSON(indexMap) {
         // 处理引用
         const parent = this._parent ? (indexMap ? { __id__: indexMap.get(this._parent) } : this._parent) : null;

package/src/lib/cc/CCSprite.js

@@ -1,7 +1,8 @@
 const CCComponent = require('./CCComponent');
-const CCColor = require('./CCColor');
 const CCVec2 = require('./CCVec2');
 
+const default_sprite_splash = 'a23235d1-15db-4b95-8439-a2e005bfff91';
+
 /**
  * Cocos Creator Sprite 组件
  */
@@ -9,7 +10,7 @@ class CCSprite extends CCComponent {
     constructor() {
         super();
         this.__type__ = 'cc.Sprite';
-        
+
         this._materials = [{ __uuid__: 'eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432' }];
         this._srcBlendFactor = 770;
         this._dstBlendFactor = 771;
@@ -22,6 +23,8 @@ class CCSprite extends CCComponent {
         this._fillRange = 0;
         this._isTrimmedMode = true;
         this._atlas = null;
+
+        this.setSpriteFrame(default_sprite_splash);
     }
 
     /**