cocos2d-cli 1.6.4 → 2.0.0

package/{src → dist/src}/lib/cc/CCComponent.js

@@ -1,50 +1,31 @@
-const CCObject = require('./CCObject');
-const { generateId } = require('../utils');
-
-/**
- * Cocos Creator 组件基类
- */
-class CCComponent extends CCObject {
+import CCObject from './CCObject.js';
+import { generateId } from '../utils.js';
+export default class CCComponent extends CCObject {
+    node;
+    _enabled;
+    _id;
     constructor() {
         super('');
         this.__type__ = 'cc.Component';
-
-        // 关联的节点
         this.node = null;
-
-        // 启用状态
         this._enabled = true;
-
-        // 唯一标识（22位压缩格式）
         this._id = generateId();
     }
-
-    /**
-     * 设置节点引用
-     */
     setNode(nodeIndex) {
         this.node = { __id__: nodeIndex };
         return this;
     }
-
-    /**
-     * 获取属性（子类重写）
-     */
     getProp() {
         return {
             class: this.__type__,
             enabled: this._enabled
         };
     }
-
-    /**
-     * 设置属性（子类重写）
-     */
     setProp(props) {
-        if (props.enabled !== undefined) this._enabled = props.enabled;
+        if (props.enabled !== undefined)
+            this._enabled = props.enabled;
         return this;
     }
-
     toJSON() {
         return {
             __type__: this.__type__,
@@ -56,5 +37,3 @@ class CCComponent extends CCObject {
         };
     }
 }
-
-module.exports = CCComponent;

package/{src → dist/src}/lib/cc/CCLabel.js

@@ -1,13 +1,27 @@
-const CCComponent = require('./CCComponent');
-
-/**
- * Cocos Creator Label 组件
- */
-class CCLabel extends CCComponent {
+import CCComponent from './CCComponent.js';
+export default class CCLabel extends CCComponent {
+    _materials;
+    _srcBlendFactor;
+    _dstBlendFactor;
+    _string;
+    _N$string;
+    _fontSize;
+    _lineHeight;
+    _enableWrapText;
+    _N$file;
+    _isSystemFontUsed;
+    _spacingX;
+    _batchAsBitmap;
+    _styleFlags;
+    _underlineHeight;
+    _N$horizontalAlign;
+    _N$verticalAlign;
+    _N$fontFamily;
+    _N$overflow;
+    _N$cacheMode;
     constructor() {
         super();
         this.__type__ = 'cc.Label';
-        
         this._materials = [{ __uuid__: 'eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432' }];
         this._srcBlendFactor = 770;
         this._dstBlendFactor = 771;
@@ -28,36 +42,20 @@ class CCLabel extends CCComponent {
         this._N$overflow = 0;
         this._N$cacheMode = 0;
     }
-
-    /**
-     * 设置文本内容
-     */
     setString(str) {
         this._string = str;
         this._N$string = str;
         return this;
     }
-
-    /**
-     * 设置字体大小
-     */
     setFontSize(size) {
         this._fontSize = size;
         this._lineHeight = size;
         return this;
     }
-
-    /**
-     * 设置字体
-     */
     setFontFamily(family) {
         this._N$fontFamily = family;
         return this;
     }
-
-    /**
-     * 获取属性
-     */
     getProp() {
         const H_ALIGN = ['LEFT', 'CENTER', 'RIGHT'];
         const V_ALIGN = ['TOP', 'CENTER', 'BOTTOM'];
@@ -73,45 +71,42 @@ class CCLabel extends CCComponent {
             wrap: this._enableWrapText
         };
     }
-
-    /**
-     * 将语义化对齐字符串转为数字
-     * horizontalAlign: left=0, center=1, right=2
-     * verticalAlign:   top=0,  center=1, bottom=2
-     */
     static parseHAlign(value) {
-        if (typeof value === 'number') return value;
+        if (typeof value === 'number')
+            return value;
         switch (String(value).toLowerCase()) {
-            case 'left':   return 0;
+            case 'left': return 0;
             case 'center': return 1;
-            case 'right':  return 2;
-            default:       return 1;
+            case 'right': return 2;
+            default: return 1;
         }
     }
-
     static parseVAlign(value) {
-        if (typeof value === 'number') return value;
+        if (typeof value === 'number')
+            return value;
         switch (String(value).toLowerCase()) {
-            case 'top':    return 0;
+            case 'top': return 0;
             case 'center': return 1;
             case 'bottom': return 2;
-            default:       return 1;
+            default: return 1;
         }
     }
-
-    /**
-     * 设置属性
-     */
     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 = CCLabel.parseHAlign(props.horizontalAlign);
-        if (props.verticalAlign !== undefined) this._N$verticalAlign = CCLabel.parseVAlign(props.verticalAlign);
+        super.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 = CCLabel.parseHAlign(props.horizontalAlign);
+        if (props.verticalAlign !== undefined)
+            this._N$verticalAlign = CCLabel.parseVAlign(props.verticalAlign);
         return this;
     }
-
     toJSON() {
         return {
             __type__: this.__type__,
@@ -125,7 +120,7 @@ class CCLabel extends CCComponent {
             _string: this._string,
             _N$string: this._N$string,
             _fontSize: this._fontSize,
-            _lineHeight: this._lineHeight,
+            _lineHeight: this._fontSize,
             _enableWrapText: this._enableWrapText,
             _N$file: this._N$file,
             _isSystemFontUsed: this._isSystemFontUsed,
@@ -142,5 +137,3 @@ class CCLabel extends CCComponent {
         };
     }
 }
-
-module.exports = CCLabel;

package/{src → dist/src}/lib/cc/CCNode.js

@@ -1,186 +1,120 @@
-const CCObject = require('./CCObject');
-const CCColor = require('./CCColor');
-const CCSize = require('./CCSize');
-const CCVec2 = require('./CCVec2');
-const CCVec3 = require('./CCVec3');
-const CCTrs = require('./CCTrs');
-
-/**
- * Cocos Creator 节点类
- */
-class CCNode extends CCObject {
+import CCObject from './CCObject.js';
+import CCColor from './CCColor.js';
+import CCSize from './CCSize.js';
+import CCVec2 from './CCVec2.js';
+import CCVec3 from './CCVec3.js';
+import CCTrs from './CCTrs.js';
+export default class CCNode extends CCObject {
+    _parent;
+    _children;
+    _active;
+    _components;
+    _prefab;
+    _opacity;
+    _color;
+    _contentSize;
+    _anchorPoint;
+    _trs;
+    _eulerAngles;
+    _skewX;
+    _skewY;
+    _is3DNode;
+    _groupIndex;
+    groupIndex;
+    _id;
     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 = '';
     }
-
-    /**
-     * 设置 ID
-     */
     setId(id) {
         this._id = id;
         return this;
     }
-
-    // Position getters/setters
     get x() { return this._trs.x; }
     set x(v) { this._trs.x = v; }
-
     get y() { return this._trs.y; }
     set y(v) { this._trs.y = v; }
-
-    // Scale getters/setters
     get scaleX() { return this._trs.scaleX; }
     set scaleX(v) { this._trs.scaleX = v; }
-
     get scaleY() { return this._trs.scaleY; }
     set scaleY(v) { this._trs.scaleY = v; }
-
-    // Size getters/setters
     get width() { return this._contentSize.width; }
     set width(v) { this._contentSize.width = v; }
-
     get height() { return this._contentSize.height; }
     set height(v) { this._contentSize.height = v; }
-
-    // Anchor getters/setters
     get anchorX() { return this._anchorPoint.x; }
     set anchorX(v) { this._anchorPoint.x = v; }
-
     get anchorY() { return this._anchorPoint.y; }
     set anchorY(v) { this._anchorPoint.y = v; }
-
-    /**
-     * 设置位置
-     */
     setPosition(x, y) {
         this._trs.setPosition(x, y);
         return this;
     }
-
-    /**
-     * 设置大小
-     */
     setContentSize(width, height) {
         this._contentSize.set(width, height);
         return this;
     }
-
-    /**
-     * 设置锚点
-     */
     setAnchorPoint(x, y) {
         this._anchorPoint.set(x, y);
         return this;
     }
-
-    /**
-     * 设置缩放
-     */
     setScale(x, y = x) {
         this._trs.setScale(x, y);
         return this;
     }
-
-    /**
-     * 设置旋转（角度）
-     */
     setRotation(angle) {
         this._trs.rotZ = angle * Math.PI / 180;
         this._eulerAngles.z = angle;
         return this;
     }
-
-    /**
-     * 设置颜色
-     */
     setColor(r, g, b, a = 255) {
         this._color.set(r, g, b, a);
         return this;
     }
-
-    /**
-     * 设置透明度
-     */
     setOpacity(opacity) {
         this._opacity = opacity;
         return this;
     }
-
-    /**
-     * 设置激活状态
-     */
     setActive(active) {
         this._active = active;
         return this;
     }
-
-    /**
-     * 设置父节点
-     * @param {CCNode|number} parent - 父节点对象或索引
-     */
     setParent(parent) {
         this._parent = typeof parent === 'number' ? { __id__: parent } : parent;
         return this;
     }
-
-    /**
-     * 添加子节点
-     * @param {CCNode|number} child - 子节点对象或索引
-     */
     addChild(child) {
-        this._children.push(typeof child === 'number' ? { __id__: child } : child);
+        const childNode = typeof child === 'number' ? { __id__: child } : child;
+        this._children.push(childNode);
+        if (typeof childNode !== 'number' && childNode._parent !== undefined) {
+            childNode._parent = this;
+        }
         return this;
     }
-
-    /**
-     * 添加组件
-     * @param {CCComponent|number} comp - 组件对象或索引
-     */
     addComponent(comp) {
         this._components.push(typeof comp === 'number' ? { __id__: comp } : comp);
         return this;
     }
-
-    /**
-     * 获取属性
-     */
     getProp() {
         const trs = this._trs?.array || [0, 0, 0, 0, 0, 0, 1, 1, 1, 1];
-        const result = {
+        return {
             name: this._name,
             active: this._active,
             x: trs[0],
@@ -195,39 +129,41 @@ class CCNode extends CCObject {
             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'
         };
-        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.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;
+        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;
         const children = indexMap ? this._children.map(c => ({ __id__: indexMap.get(c) })) : this._children;
         const components = indexMap ? this._components.map(c => ({ __id__: indexMap.get(c) })) : this._components;
         const prefab = this._prefab ? (indexMap ? { __id__: indexMap.get(this._prefab) } : this._prefab) : null;
-
-        // 显式控制属性顺序
         return {
             __type__: this.__type__,
             _name: this._name,
@@ -252,5 +188,3 @@ class CCNode extends CCObject {
         };
     }
 }
-
-module.exports = CCNode;

package/{src → dist/src}/lib/cc/CCObject.js

@@ -1,16 +1,14 @@
-/**
- * Cocos Creator 对象基类
- */
-class CCObject {
+export default class CCObject {
+    __type__;
+    _name;
+    _objFlags;
     constructor(name = '') {
         this.__type__ = '';
         this._name = name;
         this._objFlags = 0;
     }
-
     toJSON() {
         const obj = { ...this };
-        // 移除 undefined 的属性
         for (const key in obj) {
             if (obj[key] === undefined) {
                 delete obj[key];
@@ -19,5 +17,3 @@ class CCObject {
         return obj;
     }
 }
-
-module.exports = CCObject;