cocos2d-cli 1.5.1 → 1.6.1

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();
     }
@@ -28,21 +28,21 @@ class CCComponent extends CCObject {
     }
 
     /**
-     * 设置启用状态
+     * 获取属性（子类重写）
      */
-    setEnabled(enabled) {
-        this._enabled = enabled;
-        return this;
+    getProp() {
+        return {
+            class: this.__type__,
+            enabled: this._enabled
+        };
     }
 
     /**
-     * 转换为属性面板显示格式（子类重写）
+     * 设置属性（子类重写）
      */
-    toPanelJSON() {
-        return {
-            type: this.__type__,
-            enabled: this._enabled
-        };
+    setProp(props) {
+        if (props.enabled !== undefined) this._enabled = props.enabled;
+        return this;
     }
 
     toJSON() {

package/src/lib/cc/CCLabel.js

@@ -56,14 +56,13 @@ class CCLabel extends CCComponent {
     }
 
     /**
-     * 转换为属性面板显示格式
+     * 获取属性
      */
-    toPanelJSON() {
+    getProp() {
         const H_ALIGN = ['LEFT', 'CENTER', 'RIGHT'];
         const V_ALIGN = ['TOP', 'CENTER', 'BOTTOM'];
         const OVERFLOW = ['NONE', 'CLAMP', 'SHRINK', 'RESIZE_HEIGHT'];
         return {
-            ...super.toPanelJSON(),
             string: this._string,
             fontSize: this._fontSize,
             lineHeight: this._lineHeight,
@@ -75,6 +74,19 @@ class CCLabel extends CCComponent {
         };
     }
 
+    /**
+     * 设置属性
+     */
+    setProp(props) {
+        if (props.string !== undefined) this.setString(props.string);
+        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;
+        return this;
+    }
+
     toJSON() {
         return {
             __type__: this.__type__,

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 = '';
     }
@@ -176,36 +176,50 @@ class CCNode extends CCObject {
     }
 
     /**
-     * 转换为属性面板显示格式（人类可读）
+     * 获取属性
      */
-    toPanelJSON() {
+    getProp() {
         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] },
+            x: trs[0],
+            y: trs[1],
+            width: this._contentSize?.width ?? 0,
+            height: this._contentSize?.height ?? 0,
+            anchorX: this._anchorPoint?.x ?? 0.5,
+            anchorY: this._anchorPoint?.y ?? 0.5,
+            scaleX: trs[7],
+            scaleY: trs[8],
             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
+            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'
         };
-        
-        // 组件列表
-        if (this._components && this._components.length > 0) {
-            result.components = {};
-            this._components.forEach(c => {
-                const typeName = c.__type__.replace('cc.', '');
-                result.components[typeName] = c.toPanelJSON ? c.toPanelJSON() : {};
-            });
-        }
-        
         return result;
     }
 
+    /**
+     * 设置属性
+     */
+    setProp(props) {
+        if (props.name !== undefined) this._name = props.name;
+        if (props.active !== undefined) this._active = props.active;
+        if (props.x !== undefined) this._trs.array[0] = props.x;
+        if (props.y !== undefined) this._trs.array[1] = props.y;
+        if (props.width !== undefined) this._contentSize.width = props.width;
+        if (props.height !== undefined) this._contentSize.height = props.height;
+        if (props.anchorX !== undefined) this._anchorPoint.x = props.anchorX;
+        if (props.anchorY !== undefined) this._anchorPoint.y = props.anchorY;
+        if (props.scaleX !== undefined) this._trs.array[7] = props.scaleX;
+        if (props.scaleY !== undefined) this._trs.array[8] = props.scaleY;
+        if (props.rotation !== undefined) {
+            this._trs.array[5] = props.rotation * Math.PI / 180;
+            this._eulerAngles.z = props.rotation;
+        }
+        if (props.opacity !== undefined) this._opacity = props.opacity;
+        return this;
+    }
+
     toJSON(indexMap) {
         // 处理引用
         const parent = this._parent ? (indexMap ? { __id__: indexMap.get(this._parent) } : this._parent) : null;

package/src/lib/cc/CCSceneAsset.js

@@ -1,6 +1,12 @@
 const CCObject = require('./CCObject');
 const CCScene = require('./CCScene');
 const CCNode = require('./CCNode');
+const CCCanvas = require('./CCCanvas');
+const CCWidget = require('./CCWidget');
+const CCSprite = require('./CCSprite');
+const CCLabel = require('./CCLabel');
+const CCButton = require('./CCButton');
+const CCCamera = require('./CCCamera');
 const { generateCompressedUUID } = require('../utils');
 
 /**
@@ -230,13 +236,39 @@ function createObject(item) {
         return node;
     }
     
-    // 组件
-    const comp = { __type__: type };
+    // 组件 - 创建类实例
+    const comp = createComponentInstance(type);
+    if (comp) {
+        copyComponentProps(comp, item);
+        return comp;
+    }
+    
+    // 未知类型，返回普通对象
+    const obj = { __type__: type };
+    for (const key of Object.keys(item)) {
+        obj[key] = item[key];
+    }
+    return obj;
+}
+
+function createComponentInstance(type) {
+    switch (type) {
+        case 'cc.Canvas': return new CCCanvas();
+        case 'cc.Widget': return new CCWidget();
+        case 'cc.Sprite': return new CCSprite();
+        case 'cc.Label': return new CCLabel();
+        case 'cc.Button': return new CCButton();
+        case 'cc.Camera': return new CCCamera();
+        default: return null;
+    }
+}
+
+function copyComponentProps(comp, item) {
     for (const key of Object.keys(item)) {
         if (['__type__', '_name', '_objFlags', 'node', '_enabled', '_id'].includes(key)) continue;
         comp[key] = item[key];
     }
-    return comp;
+    if (item._id) comp._id = item._id;
 }
 
 function copyNodeProps(node, item) {

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);
     }
 
     /**
@@ -42,19 +45,28 @@ class CCSprite extends CCComponent {
     }
 
     /**
-     * 转换为属性面板显示格式
+     * 获取属性
      */
-    toPanelJSON() {
+    getProp() {
         const SIZE_MODE = ['CUSTOM', 'RAW', 'TRIMMED'];
         const SPRITE_TYPE = ['SIMPLE', 'SLICED', 'TILED', 'FILLED', 'MESH'];
         return {
-            ...super.toPanelJSON(),
             sizeMode: SIZE_MODE[this._sizeMode] || this._sizeMode,
             type: SPRITE_TYPE[this._type] || this._type,
             trim: this._isTrimmedMode
         };
     }
 
+    /**
+     * 设置属性
+     */
+    setProp(props) {
+        if (props.sizeMode !== undefined) this.setSizeMode(props.sizeMode);
+        if (props.spriteFrame !== undefined) this.setSpriteFrame(props.spriteFrame);
+        if (props.type !== undefined) this._type = props.type;
+        return this;
+    }
+
     toJSON() {
         return {
             __type__: this.__type__,