cocos2d-cli 1.6.1 → 1.6.3

package/src/commands/screenshot.js

@@ -1,5 +1,5 @@
 /**
- * screenshot 命令
+ * screenshot 命令  
  * 渲染 JSON 数据并截图
  */
 
@@ -13,17 +13,19 @@ function showHelp() {
 
 选项:
   -o, --output <目录>     输出目录，默认当前目录
-  -w, --width <数值>      视口宽度，默认 750
-  -h, --height <数值>     视口高度，默认 1334
+  --width <数值>          视口宽度，默认 750（不支持简写）
+  --height <数值>         视口高度，默认 1334（不支持简写）
   --full-page             全页截图（默认）
   --no-full-page          仅视口截图
+  --debug-bounds          叠加节点边界框和名称，方便定位布局问题
   --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 --width 1080 --height 1920
+  cocos2d-cli screenshot data.json --debug-bounds
   cocos2d-cli screenshot data.json --no-full-page
 `);
 }
@@ -34,6 +36,7 @@ function parseArgs(args) {
         outputDir: '.',
         viewport: { width: 750, height: 1334 },
         fullPage: true,
+        debugBounds: false,
         timeout: 30000,
         waitTime: 1000
     };
@@ -49,14 +52,16 @@ function parseArgs(args) {
         
         if (arg === '-o' || arg === '--output') {
             options.outputDir = args[++i];
-        } else if (arg === '-w' || arg === '--width') {
+        } else if (arg === '--width') {
             options.viewport.width = parseInt(args[++i], 10);
-        } else if (arg === '-h' || arg === '--height') {
+        } else if (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 === '--debug-bounds') {
+            options.debugBounds = true;
         } else if (arg === '--timeout') {
             options.timeout = parseInt(args[++i], 10);
         } else if (arg === '--wait') {
@@ -84,10 +89,13 @@ async function run(args) {
     options.outputDir = path.resolve(options.outputDir);
 
     try {
-        const result = await takeScreenshot(options);
-        console.log(`\n截图成功: ${result.screenshotPath}`);
+        await takeScreenshot(options);
+        console.log('成功');
     } catch (error) {
-        console.error(`\n截图失败: ${error.message}`);
+        console.error('失败');
+        if (error.logDir) {
+            console.error(`日志目录: ${error.logDir}`);
+        }
         process.exit(1);
     }
 }

package/src/lib/cc/CCLabel.js

@@ -74,6 +74,31 @@ class CCLabel extends CCComponent {
         };
     }
 
+    /**
+     * 将语义化对齐字符串转为数字
+     * horizontalAlign: left=0, center=1, right=2
+     * verticalAlign:   top=0,  center=1, bottom=2
+     */
+    static parseHAlign(value) {
+        if (typeof value === 'number') return value;
+        switch (String(value).toLowerCase()) {
+            case 'left':   return 0;
+            case 'center': return 1;
+            case 'right':  return 2;
+            default:       return 1;
+        }
+    }
+
+    static parseVAlign(value) {
+        if (typeof value === 'number') return value;
+        switch (String(value).toLowerCase()) {
+            case 'top':    return 0;
+            case 'center': return 1;
+            case 'bottom': return 2;
+            default:       return 1;
+        }
+    }
+
     /**
      * 设置属性
      */
@@ -82,8 +107,8 @@ class CCLabel extends CCComponent {
         if (props.fontSize !== undefined) this.setFontSize(props.fontSize);
         if (props.lineHeight !== undefined) this._lineHeight = props.lineHeight;
         if (props.fontFamily !== undefined) this.setFontFamily(props.fontFamily);
-        if (props.horizontalAlign !== undefined) this._N$horizontalAlign = props.horizontalAlign;
-        if (props.verticalAlign !== undefined) this._N$verticalAlign = props.verticalAlign;
+        if (props.horizontalAlign !== undefined) this._N$horizontalAlign = CCLabel.parseHAlign(props.horizontalAlign);
+        if (props.verticalAlign !== undefined) this._N$verticalAlign = CCLabel.parseVAlign(props.verticalAlign);
         return this;
     }
 

package/src/lib/cc/CCRichText.js

@@ -0,0 +1,44 @@
+const CCComponent = require('./CCComponent');
+
+/**
+ * Cocos Creator RichText 组件
+ * 支持 BBCode 标签语法：
+ *   <color=#ff0000>红色</color>
+ *   <size=30>大字</size>
+ *   <b>加粗</b>  <i>斜体</i>  <u>下划线</u>
+ *   <br/>  换行
+ */
+class CCRichText extends CCComponent {
+    constructor() {
+        super();
+        this.__type__ = 'cc.RichText';
+
+        this._string = '';
+        this._horizontalAlign = 0; // 0=LEFT 1=CENTER 2=RIGHT
+        this._fontSize = 40;
+        this._maxWidth = 0;
+        this._lineHeight = 40;
+        this._imageAtlas = null;
+        this._handleTouchEvent = true;
+    }
+
+    toJSON() {
+        return {
+            __type__: this.__type__,
+            _name: this._name,
+            _objFlags: this._objFlags,
+            node: this.node,
+            _enabled: this._enabled,
+            _string: this._string,
+            _horizontalAlign: this._horizontalAlign,
+            _fontSize: this._fontSize,
+            _maxWidth: this._maxWidth,
+            _lineHeight: this._lineHeight,
+            _imageAtlas: this._imageAtlas,
+            _handleTouchEvent: this._handleTouchEvent,
+            _id: this._id
+        };
+    }
+}
+
+module.exports = CCRichText;

package/src/lib/cc/CCSprite.js

@@ -16,7 +16,7 @@ class CCSprite extends CCComponent {
         this._dstBlendFactor = 771;
         this._spriteFrame = null;
         this._type = 0;
-        this._sizeMode = 1;
+        this._sizeMode = 0;
         this._fillType = 0;
         this._fillCenter = new CCVec2();
         this._fillStart = 0;
@@ -37,7 +37,7 @@ class CCSprite extends CCComponent {
 
     /**
      * 设置尺寸模式
-     * 0: CUSTOM, 1: RAW, 2: TRIMMED
+     * 0: CUSTOM, 1: TRIMMED, 2: RAW
      */
     setSizeMode(mode) {
         this._sizeMode = mode;

package/src/lib/cc/index.js

@@ -16,6 +16,7 @@ const CCCamera = require('./CCCamera');
 const CCSprite = require('./CCSprite');
 const CCLabel = require('./CCLabel');
 const CCButton = require('./CCButton');
+const CCRichText = require('./CCRichText');
 
 module.exports = {
     CCObject,
@@ -36,5 +37,6 @@ module.exports = {
     CCCamera,
     CCSprite,
     CCLabel,
-    CCButton
+    CCButton,
+    CCRichText
 };

package/src/lib/json-parser.js

@@ -3,7 +3,7 @@
  * 将简化JSON转换为CCNode对象树
  */
 
-const { CCNode, CCCanvas, CCWidget, CCSprite, CCLabel, CCButton, CCCamera } = require('./cc');
+const { CCNode, CCCanvas, CCWidget, CCSprite, CCLabel, CCButton, CCCamera, CCRichText } = require('./cc');
 const { parseColor } = require('./utils');
 
 /**
@@ -11,13 +11,14 @@ const { parseColor } = require('./utils');
  */
 function createComponent(type) {
     switch (type.toLowerCase()) {
-        case 'canvas': return new CCCanvas();
-        case 'widget': return new CCWidget();
-        case 'sprite': return new CCSprite();
-        case 'label': return new CCLabel();
-        case 'button': return new CCButton();
-        case 'camera': return new CCCamera();
-        default: return null;
+        case 'canvas':    return new CCCanvas();
+        case 'widget':    return new CCWidget();
+        case 'sprite':    return new CCSprite();
+        case 'label':     return new CCLabel();
+        case 'button':    return new CCButton();
+        case 'camera':    return new CCCamera();
+        case 'richtext':  return new CCRichText();
+        default:          return null;
     }
 }
 
@@ -59,7 +60,25 @@ function applyComponentProps(comp, props, node) {
             case 'sizeMode':
                 if (comp._sizeMode !== undefined) comp._sizeMode = value;
                 break;
+            case 'horizontalAlign':
+                // 支持语义化字符串：left / center / right
+                if (comp._N$horizontalAlign !== undefined) {
+                    comp._N$horizontalAlign = CCLabel.parseHAlign(value);
+                } else if (comp._horizontalAlign !== undefined) {
+                    comp._horizontalAlign = CCLabel.parseHAlign(value);
+                }
+                break;
+            case 'verticalAlign':
+                // 支持语义化字符串：top / center / bottom
+                if (comp._N$verticalAlign !== undefined) {
+                    comp._N$verticalAlign = CCLabel.parseVAlign(value);
+                } else if (comp._verticalAlign !== undefined) {
+                    comp._verticalAlign = CCLabel.parseVAlign(value);
+                }
+                break;
             case 'color':
+                // 兼容写法：组件内的 color 同步到节点颜色
+                // （Cocos 中文字/富文本颜色本质是节点颜色，不是组件属性）
                 if (node) {
                     const parsed = parseColor(value);
                     if (parsed && node._color) {