cocos2d-cli 1.6.4 → 2.0.0

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

@@ -1,99 +1,74 @@
-const CCObject = require('./CCObject');
-const { generateFileId } = require('../fire-utils');
-
-/**
- * Cocos Creator 预制体类（只是元数据头，不管理节点树）
- */
+import CCObject from './CCObject.js';
+import { generateFileId } from '../fire-utils.js';
+import CCNode from './CCNode.js';
 class CCPrefab extends CCObject {
+    _native;
+    _root;
+    optimizationPolicy;
+    asyncLoadAssets;
+    readonly;
     constructor() {
         super('');
         this.__type__ = 'cc.Prefab';
-        
         this._native = '';
-        this._root = null; // 根节点引用
+        this._root = null;
         this.optimizationPolicy = 0;
         this.asyncLoadAssets = false;
         this.readonly = false;
     }
-
     setRoot(node) {
         this._root = node;
         return this;
     }
-
-    /**
-     * 从 JSON 解析
-     */
     static fromJSON(json) {
         const prefab = new CCPrefab();
         const objects = [];
-        
-        // 第一遍：创建所有对象
         json.forEach((item, index) => {
             objects[index] = createObject(item);
         });
-        
-        // 第二遍：建立引用关系
         json.forEach((item, index) => {
             setupReferences(objects[index], item, objects);
         });
-        
         prefab._root = objects[1];
         return prefab;
     }
-
-    /**
-     * 序列化为 JSON
-     * 顺序：Prefab头 → 节点树（节点 → 子节点们+PrefabInfo → 组件 → PrefabInfo） → 根PrefabInfo
-     */
     toJSON() {
         const result = [];
         const indexMap = new Map();
-        
-        // 0: Prefab 头
         indexMap.set(this, 0);
         result.push({
             __type__: 'cc.Prefab',
             _name: '',
             _objFlags: 0,
             _native: '',
-            data: null, // 后面填充
+            data: null,
             optimizationPolicy: this.optimizationPolicy,
             asyncLoadAssets: this.asyncLoadAssets,
             readonly: this.readonly
         });
-        
-        // 递归处理节点
         const processNode = (node, isRoot = false) => {
-            if (!node) return;
-            
-            // 添加节点
+            if (!node)
+                return;
             indexMap.set(node, result.length);
-            result.push(null); // 占位
-            
-            // 递归处理子节点（每个子节点处理完会带上它的 PrefabInfo）
+            result.push(null);
             if (node._children) {
                 node._children.forEach(child => processNode(child, false));
             }
-            
-            // 添加组件
             if (node._components) {
                 node._components.forEach(comp => {
                     indexMap.set(comp, result.length);
                     result.push(componentToJSON(comp, indexMap));
                 });
             }
-            
-            // 生成节点 JSON
             result[indexMap.get(node)] = {
                 __type__: 'cc.Node',
                 _name: node._name,
                 _objFlags: node._objFlags,
                 _parent: node._parent ? { __id__: indexMap.get(node._parent) } : null,
-                _children: (node._children || []).map(c => ({ __id__: indexMap.get(c) })),
+                _children: node._children?.map(c => ({ __id__: indexMap.get(c) })) || [],
                 _active: node._active,
-                _components: (node._components || []).map(c => ({ __id__: indexMap.get(c) })),
-                _prefab: null, // 后面填充
+                _components: node._components?.map(c => ({ __id__: indexMap.get(c) })) || [],
+                _prefab: null,
                 _opacity: node._opacity,
                 _color: node._color.toJSON(),
                 _contentSize: node._contentSize.toJSON(),
@@ -107,8 +82,6 @@ class CCPrefab extends CCObject {
                 groupIndex: node.groupIndex,
                 _id: node._id || ''
             };
-            
-            // 非根节点：立即添加 PrefabInfo
             if (!isRoot) {
                 const infoIdx = result.length;
                 result.push({
@@ -121,15 +94,11 @@ class CCPrefab extends CCObject {
                 result[indexMap.get(node)]._prefab = { __id__: infoIdx };
             }
         };
-        
-        // 处理根节点
-        processNode(this._root, true);
-        
-        // 填充 Prefab 头的 data
-        result[0].data = { __id__: indexMap.get(this._root) };
-        
-        // 最后添加根节点的 PrefabInfo
         if (this._root) {
+            processNode(this._root, true);
+        }
+        if (this._root) {
+            result[0].data = { __id__: indexMap.get(this._root) };
             const infoIdx = result.length;
             result.push({
                 __type__: 'cc.PrefabInfo',
@@ -140,11 +109,9 @@ class CCPrefab extends CCObject {
             });
             result[indexMap.get(this._root)]._prefab = { __id__: infoIdx };
         }
-        
         return result;
     }
 }
-
 function componentToJSON(comp, indexMap) {
     const json = {
         __type__: comp.__type__,
@@ -153,83 +120,94 @@ function componentToJSON(comp, indexMap) {
         node: { __id__: indexMap.get(comp.node) },
         _enabled: comp._enabled !== false
     };
-    
-    // 其他属性
     for (const key of Object.keys(comp)) {
-        if (['__type__', '_name', '_objFlags', 'node', '_enabled', '_id'].includes(key)) continue;
+        if (['__type__', '_name', '_objFlags', 'node', '_enabled', '_id'].includes(key))
+            continue;
         const val = comp[key];
-        if (val === undefined) continue;
+        if (val === undefined)
+            continue;
         json[key] = val && typeof val.toJSON === 'function' ? val.toJSON() : val;
     }
-    
-    // _id 放最后
     json._id = comp._id || '';
-    
     return json;
 }
-
 function createObject(item) {
     const type = item.__type__;
-    
-    if (type === 'cc.Prefab') return null; // 跳过，由 CCPrefab.fromJSON 处理
-    if (type === 'cc.PrefabInfo') return new CCPrefabInfo();
-    
+    if (type === 'cc.Prefab')
+        return null;
+    if (type === 'cc.PrefabInfo')
+        return new CCPrefabInfo();
     if (type === 'cc.Node') {
-        const CCNode = require('./CCNode');
         const node = new CCNode(item._name || 'Node');
         node._id = item._id || '';
         copyNodeProps(node, item);
         return node;
     }
-    
-    // 组件
     const comp = { __type__: type };
     for (const key of Object.keys(item)) {
-        if (['__type__', '_name', '_objFlags', 'node', '_enabled', '_id'].includes(key)) continue;
+        if (['__type__', '_name', '_objFlags', 'node', '_enabled', '_id'].includes(key))
+            continue;
         comp[key] = item[key];
     }
     return comp;
 }
-
 function copyNodeProps(node, item) {
-    if (item._active !== undefined) node._active = item._active;
-    if (item._opacity !== undefined) node._opacity = item._opacity;
-    if (item._is3DNode !== undefined) node._is3DNode = item._is3DNode;
-    if (item._groupIndex !== undefined) node._groupIndex = item._groupIndex;
-    if (item.groupIndex !== undefined) node.groupIndex = item.groupIndex;
-    if (item._skewX !== undefined) node._skewX = item._skewX;
-    if (item._skewY !== undefined) node._skewY = item._skewY;
-    
-    if (item._color) node._color.set(item._color.r, item._color.g, item._color.b, item._color.a);
-    if (item._contentSize) node._contentSize.set(item._contentSize.width, item._contentSize.height);
-    if (item._anchorPoint) node._anchorPoint.set(item._anchorPoint.x, item._anchorPoint.y);
-    if (item._trs?.array) item._trs.array.forEach((v, i) => node._trs.array[i] = v);
-    if (item._eulerAngles) node._eulerAngles.set(item._eulerAngles.x, item._eulerAngles.y, item._eulerAngles.z);
+    if (item._active !== undefined)
+        node._active = item._active;
+    if (item._opacity !== undefined)
+        node._opacity = item._opacity;
+    if (item._is3DNode !== undefined)
+        node._is3DNode = item._is3DNode;
+    if (item._groupIndex !== undefined)
+        node._groupIndex = item._groupIndex;
+    if (item.groupIndex !== undefined)
+        node.groupIndex = item.groupIndex;
+    if (item._skewX !== undefined)
+        node._skewX = item._skewX;
+    if (item._skewY !== undefined)
+        node._skewY = item._skewY;
+    if (item._color)
+        node._color.set(item._color.r, item._color.g, item._color.b, item._color.a);
+    if (item._contentSize)
+        node._contentSize.set(item._contentSize.width, item._contentSize.height);
+    if (item._anchorPoint)
+        node._anchorPoint.set(item._anchorPoint.x, item._anchorPoint.y);
+    if (item._trs?.array)
+        item._trs.array.forEach((v, i) => node._trs.array[i] = v);
+    if (item._eulerAngles)
+        node._eulerAngles.set(item._eulerAngles.x, item._eulerAngles.y, item._eulerAngles.z);
 }
-
 function setupReferences(obj, item, objects) {
-    if (!obj) return;
-    
+    if (!obj)
+        return;
     if (obj.__type__ === 'cc.Node') {
-        if (item._parent) obj._parent = objects[item._parent.__id__];
-        if (item._children) obj._children = item._children.map(c => objects[c.__id__]).filter(Boolean);
+        if (item._parent)
+            obj._parent = objects[item._parent.__id__];
+        if (item._children)
+            obj._children = item._children.map((c) => objects[c.__id__]).filter(Boolean);
         if (item._components) {
-            obj._components = item._components.map(c => objects[c.__id__]).filter(Boolean);
-            obj._components.forEach(c => { if (c) c.node = obj; });
+            obj._components = item._components.map((c) => objects[c.__id__]).filter(Boolean);
+            obj._components.forEach((c) => { if (c)
+                c.node = obj; });
         }
-        if (item._prefab) obj._prefab = objects[item._prefab.__id__];
-    } else if (obj.__type__ === 'cc.PrefabInfo') {
-        if (item.root) obj.root = objects[item.root.__id__];
-        if (item.asset) obj.asset = objects[item.asset.__id__];
+        if (item._prefab)
+            obj._prefab = objects[item._prefab.__id__];
+    }
+    else if (obj.__type__ === 'cc.PrefabInfo') {
+        if (item.root)
+            obj.root = objects[item.root.__id__];
+        if (item.asset)
+            obj.asset = objects[item.asset.__id__];
         obj.fileId = item.fileId || '';
         obj.sync = item.sync || false;
     }
 }
-
-/**
- * 预制体信息类
- */
 class CCPrefabInfo {
+    __type__;
+    root;
+    asset;
+    fileId;
+    sync;
     constructor() {
         this.__type__ = 'cc.PrefabInfo';
         this.root = null;
@@ -238,5 +216,4 @@ class CCPrefabInfo {
         this.sync = false;
     }
 }
-
-module.exports = { CCPrefab, CCPrefabInfo };
+export { CCPrefab, CCPrefabInfo };

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

@@ -1,7 +1,9 @@
-/**
- * Cocos Creator 矩形类
- */
-class CCRect {
+export default class CCRect {
+    __type__;
+    x;
+    y;
+    width;
+    height;
     constructor(x = 0, y = 0, width = 0, height = 0) {
         this.__type__ = 'cc.Rect';
         this.x = x;
@@ -9,7 +11,6 @@ class CCRect {
         this.width = width;
         this.height = height;
     }
-
     set(x, y, width, height) {
         this.x = x;
         this.y = y;
@@ -17,7 +18,6 @@ class CCRect {
         this.height = height;
         return this;
     }
-
     toJSON() {
         return {
             __type__: this.__type__,
@@ -28,5 +28,3 @@ class CCRect {
         };
     }
 }
-
-module.exports = CCRect;

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

@@ -1,27 +1,23 @@
-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 {
+import CCComponent from './CCComponent.js';
+export default class CCRichText extends CCComponent {
+    _string;
+    _horizontalAlign;
+    _fontSize;
+    _maxWidth;
+    _lineHeight;
+    _imageAtlas;
+    _handleTouchEvent;
     constructor() {
         super();
         this.__type__ = 'cc.RichText';
-
         this._string = '';
-        this._horizontalAlign = 0; // 0=LEFT 1=CENTER 2=RIGHT
+        this._horizontalAlign = 0;
         this._fontSize = 40;
         this._maxWidth = 0;
         this._lineHeight = 40;
         this._imageAtlas = null;
         this._handleTouchEvent = true;
     }
-
     toJSON() {
         return {
             __type__: this.__type__,
@@ -40,5 +36,3 @@ class CCRichText extends CCComponent {
         };
     }
 }
-
-module.exports = CCRichText;

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

@@ -1,22 +1,14 @@
-const CCNode = require('./CCNode');
-
-/**
- * Cocos Creator 场景类
- * 继承自 CCNode
- */
-class CCScene extends CCNode {
+import CCNode from './CCNode.js';
+export default class CCScene extends CCNode {
+    autoReleaseAssets;
     constructor(name = 'NewScene') {
         super(name);
         this.__type__ = 'cc.Scene';
-        
-        // 场景特有属性
         this._is3DNode = true;
         this._anchorPoint.set(0, 0);
         this.autoReleaseAssets = false;
     }
-
     toJSON() {
-        // 显式控制属性顺序，Scene 特有顺序
         return {
             __type__: this.__type__,
             _objFlags: this._objFlags,
@@ -38,5 +30,3 @@ class CCScene extends CCNode {
         };
     }
 }
-
-module.exports = CCScene;

package/dist/src/lib/cc/CCSceneAsset.js

@@ -0,0 +1,242 @@
+import CCObject from './CCObject.js';
+import CCScene from './CCScene.js';
+import CCNode from './CCNode.js';
+import CCCanvas from './CCCanvas.js';
+import CCWidget from './CCWidget.js';
+import CCSprite from './CCSprite.js';
+import CCLabel from './CCLabel.js';
+import CCButton from './CCButton.js';
+import CCCamera from './CCCamera.js';
+import { generateCompressedUUID } from '../utils.js';
+export default class CCSceneAsset extends CCObject {
+    _native;
+    _scene;
+    constructor() {
+        super('');
+        this.__type__ = 'cc.SceneAsset';
+        this._native = '';
+        this._scene = null;
+    }
+    getScene() {
+        return this._scene;
+    }
+    addNode(node) {
+        if (!this._scene)
+            return null;
+        node._parent = { __id__: 1 };
+        if (!this._scene._children)
+            this._scene._children = [];
+        this._scene._children.push({ __id__: 0 });
+        node._id = generateCompressedUUID();
+        return node;
+    }
+    removeNode(node) {
+        if (!node._parent)
+            return false;
+        const idx = -1;
+        if (idx > -1) {
+            return true;
+        }
+        return false;
+    }
+    static fromJSON(json) {
+        const asset = new CCSceneAsset();
+        const objects = [];
+        json.forEach((item, index) => {
+            objects[index] = createObject(item);
+        });
+        json.forEach((item, index) => {
+            setupReferences(objects[index], item, objects);
+        });
+        asset._scene = objects[1];
+        return asset;
+    }
+    toJSON() {
+        const result = [];
+        const indexMap = new Map();
+        indexMap.set(this, 0);
+        result.push({
+            __type__: 'cc.SceneAsset',
+            _name: '',
+            _objFlags: 0,
+            _native: '',
+            scene: { __id__: 1 }
+        });
+        if (this._scene) {
+            indexMap.set(this._scene, 1);
+        }
+        result.push(null);
+        const processNode = (node) => {
+            if (!node)
+                return;
+            indexMap.set(node, result.length);
+            result.push(null);
+            if (node._children) {
+                node._children.forEach(child => processNode(child));
+            }
+            if (node._components) {
+                node._components.forEach(comp => {
+                    indexMap.set(comp, result.length);
+                    result.push(componentToJSON(comp, indexMap));
+                });
+            }
+            result[indexMap.get(node)] = {
+                __type__: 'cc.Node',
+                _name: node._name,
+                _objFlags: node._objFlags,
+                _parent: node._parent ? { __id__: indexMap.get(node._parent) } : null,
+                _children: node._children?.map(c => ({ __id__: indexMap.get(c) })) || [],
+                _active: node._active,
+                _components: node._components?.map(c => ({ __id__: indexMap.get(c) })) || [],
+                _prefab: null,
+                _opacity: node._opacity,
+                _color: node._color.toJSON(),
+                _contentSize: node._contentSize.toJSON(),
+                _anchorPoint: node._anchorPoint.toJSON(),
+                _trs: node._trs.toJSON(),
+                _eulerAngles: node._eulerAngles.toJSON(),
+                _skewX: node._skewX,
+                _skewY: node._skewY,
+                _is3DNode: node._is3DNode,
+                _groupIndex: node._groupIndex,
+                groupIndex: node.groupIndex,
+                _id: node._id || ''
+            };
+        };
+        if (this._scene?._children) {
+            this._scene._children.forEach(child => processNode(child));
+        }
+        if (this._scene) {
+            result[1] = {
+                __type__: 'cc.Scene',
+                _objFlags: this._scene._objFlags,
+                _parent: null,
+                _children: this._scene._children?.map(c => ({ __id__: indexMap.get(c) })) || [],
+                _active: this._scene._active,
+                _components: [],
+                _prefab: null,
+                _opacity: this._scene._opacity,
+                _color: this._scene._color.toJSON(),
+                _contentSize: this._scene._contentSize.toJSON(),
+                _anchorPoint: this._scene._anchorPoint.toJSON(),
+                _trs: this._scene._trs.toJSON(),
+                _is3DNode: this._scene._is3DNode,
+                _groupIndex: this._scene._groupIndex,
+                groupIndex: this._scene.groupIndex,
+                autoReleaseAssets: this._scene.autoReleaseAssets || false,
+                _id: this._scene._id || ''
+            };
+        }
+        return result;
+    }
+}
+function componentToJSON(comp, indexMap) {
+    const json = {
+        __type__: comp.__type__,
+        _name: comp._name || '',
+        _objFlags: comp._objFlags || 0,
+        node: { __id__: indexMap.get(comp.node) },
+        _enabled: comp._enabled !== false
+    };
+    for (const key of Object.keys(comp)) {
+        if (['__type__', '_name', '_objFlags', 'node', '_enabled', '_id'].includes(key))
+            continue;
+        const val = comp[key];
+        if (val === undefined)
+            continue;
+        json[key] = val && typeof val.toJSON === 'function' ? val.toJSON() : val;
+    }
+    json._id = comp._id || '';
+    return json;
+}
+function createObject(item) {
+    const type = item.__type__;
+    if (type === 'cc.SceneAsset')
+        return null;
+    if (type === 'cc.Scene') {
+        const scene = new CCScene();
+        scene._id = item._id || '';
+        if (item._active !== undefined)
+            scene._active = item._active;
+        if (item.autoReleaseAssets !== undefined)
+            scene.autoReleaseAssets = item.autoReleaseAssets;
+        return scene;
+    }
+    if (type === 'cc.Node') {
+        const node = new CCNode(item._name || 'Node');
+        node._id = item._id || '';
+        copyNodeProps(node, item);
+        return node;
+    }
+    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];
+    }
+    if (item._id)
+        comp._id = item._id;
+}
+function copyNodeProps(node, item) {
+    if (item._active !== undefined)
+        node._active = item._active;
+    if (item._opacity !== undefined)
+        node._opacity = item._opacity;
+    if (item._is3DNode !== undefined)
+        node._is3DNode = item._is3DNode;
+    if (item._groupIndex !== undefined)
+        node._groupIndex = item._groupIndex;
+    if (item.groupIndex !== undefined)
+        node.groupIndex = item.groupIndex;
+    if (item._skewX !== undefined)
+        node._skewX = item._skewX;
+    if (item._skewY !== undefined)
+        node._skewY = item._skewY;
+    if (item._color)
+        node._color.set(item._color.r, item._color.g, item._color.b, item._color.a);
+    if (item._contentSize)
+        node._contentSize.set(item._contentSize.width, item._contentSize.height);
+    if (item._anchorPoint)
+        node._anchorPoint.set(item._anchorPoint.x, item._anchorPoint.y);
+    if (item._trs?.array)
+        item._trs.array.forEach((v, i) => node._trs.array[i] = v);
+    if (item._eulerAngles)
+        node._eulerAngles.set(item._eulerAngles.x, item._eulerAngles.y, item._eulerAngles.z);
+}
+function setupReferences(obj, item, objects) {
+    if (!obj)
+        return;
+    if (obj.__type__ === 'cc.Scene' || obj.__type__ === 'cc.Node') {
+        if (item._parent)
+            obj._parent = objects[item._parent.__id__];
+        if (item._children)
+            obj._children = item._children.map((c) => objects[c.__id__]).filter(Boolean);
+        if (item._components) {
+            obj._components = item._components.map((c) => objects[c.__id__]).filter(Boolean);
+            obj._components.forEach((c) => { if (c)
+                c.node = obj; });
+        }
+    }
+}

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

@@ -1,19 +1,17 @@
-/**
- * Cocos Creator 尺寸类
- */
-class CCSize {
+export default class CCSize {
+    __type__;
+    width;
+    height;
     constructor(width = 0, height = 0) {
         this.__type__ = 'cc.Size';
         this.width = width;
         this.height = height;
     }
-
     set(width, height) {
         this.width = width;
         this.height = height;
         return this;
     }
-
     toJSON() {
         return {
             __type__: this.__type__,
@@ -22,5 +20,3 @@ class CCSize {
         };
     }
 }
-
-module.exports = CCSize;