cocos2d-cli 1.6.5 → 2.1.0

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

@@ -1,42 +1,32 @@
-const CCNode = require('./CCNode');
-
-/**
- * Cocos Creator 场景类
- * 继承自 CCNode
- */
-class CCScene extends CCNode {
-    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,
-            _parent: this._parent,
-            _children: this._children,
-            _active: this._active,
-            _components: this._components,
-            _prefab: this._prefab,
-            _opacity: this._opacity,
-            _color: this._color.toJSON(),
-            _contentSize: this._contentSize.toJSON(),
-            _anchorPoint: this._anchorPoint.toJSON(),
-            _trs: this._trs.toJSON(),
-            _is3DNode: this._is3DNode,
-            _groupIndex: this._groupIndex,
-            groupIndex: this.groupIndex,
-            autoReleaseAssets: this.autoReleaseAssets,
-            _id: this._id
-        };
-    }
-}
-
-module.exports = CCScene;
+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() {
+        return {
+            __type__: this.__type__,
+            _objFlags: this._objFlags,
+            _parent: this._parent,
+            _children: this._children,
+            _active: this._active,
+            _components: this._components,
+            _prefab: this._prefab,
+            _opacity: this._opacity,
+            _color: this._color.toJSON(),
+            _contentSize: this._contentSize.toJSON(),
+            _anchorPoint: this._anchorPoint.toJSON(),
+            _trs: this._trs.toJSON(),
+            _is3DNode: this._is3DNode,
+            _groupIndex: this._groupIndex,
+            groupIndex: this.groupIndex,
+            autoReleaseAssets: this.autoReleaseAssets,
+            _id: this._id
+        };
+    }
+}

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,26 +1,22 @@
-/**
- * Cocos Creator 尺寸类
- */
-class CCSize {
-    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__,
-            width: this.width,
-            height: this.height
-        };
-    }
-}
-
-module.exports = 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__,
+            width: this.width,
+            height: this.height
+        };
+    }
+}

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

@@ -1,94 +1,82 @@
-const CCComponent = require('./CCComponent');
-const CCVec2 = require('./CCVec2');
-
-const default_sprite_splash = 'a23235d1-15db-4b95-8439-a2e005bfff91';
-
-/**
- * Cocos Creator Sprite 组件
- */
-class CCSprite extends CCComponent {
-    constructor() {
-        super();
-        this.__type__ = 'cc.Sprite';
-
-        this._materials = [{ __uuid__: 'eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432' }];
-        this._srcBlendFactor = 770;
-        this._dstBlendFactor = 771;
-        this._spriteFrame = null;
-        this._type = 0;
-        this._sizeMode = 0;
-        this._fillType = 0;
-        this._fillCenter = new CCVec2();
-        this._fillStart = 0;
-        this._fillRange = 0;
-        this._isTrimmedMode = true;
-        this._atlas = null;
-
-        this.setSpriteFrame(default_sprite_splash);
-    }
-
-    /**
-     * 设置精灵帧
-     */
-    setSpriteFrame(uuid) {
-        this._spriteFrame = { __uuid__: uuid };
-        return this;
-    }
-
-    /**
-     * 设置尺寸模式
-     * 0: CUSTOM, 1: TRIMMED, 2: RAW
-     */
-    setSizeMode(mode) {
-        this._sizeMode = mode;
-        return this;
-    }
-
-    /**
-     * 获取属性
-     */
-    getProp() {
-        const SIZE_MODE = ['CUSTOM', 'RAW', 'TRIMMED'];
-        const SPRITE_TYPE = ['SIMPLE', 'SLICED', 'TILED', 'FILLED', 'MESH'];
-        return {
-            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__,
-            _name: this._name,
-            _objFlags: this._objFlags,
-            node: this.node,
-            _enabled: this._enabled,
-            _materials: this._materials,
-            _srcBlendFactor: this._srcBlendFactor,
-            _dstBlendFactor: this._dstBlendFactor,
-            _spriteFrame: this._spriteFrame,
-            _type: this._type,
-            _sizeMode: this._sizeMode,
-            _fillType: this._fillType,
-            _fillCenter: this._fillCenter.toJSON(),
-            _fillStart: this._fillStart,
-            _fillRange: this._fillRange,
-            _isTrimmedMode: this._isTrimmedMode,
-            _atlas: this._atlas,
-            _id: this._id
-        };
-    }
-}
-
-module.exports = CCSprite;
+import CCComponent from './CCComponent.js';
+import CCVec2 from './CCVec2.js';
+const default_sprite_splash = 'a23235d1-15db-4b95-8439-a2e005bfff91';
+export default class CCSprite extends CCComponent {
+    _materials;
+    _srcBlendFactor;
+    _dstBlendFactor;
+    _spriteFrame;
+    _type;
+    _sizeMode;
+    _fillType;
+    _fillCenter;
+    _fillStart;
+    _fillRange;
+    _isTrimmedMode;
+    _atlas;
+    constructor() {
+        super();
+        this.__type__ = 'cc.Sprite';
+        this._materials = [{ __uuid__: 'eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432' }];
+        this._srcBlendFactor = 770;
+        this._dstBlendFactor = 771;
+        this._spriteFrame = null;
+        this._type = 0;
+        this._sizeMode = 0;
+        this._fillType = 0;
+        this._fillCenter = new CCVec2();
+        this._fillStart = 0;
+        this._fillRange = 0;
+        this._isTrimmedMode = true;
+        this._atlas = null;
+        this.setSpriteFrame(default_sprite_splash);
+    }
+    setSpriteFrame(uuid) {
+        this._spriteFrame = { __uuid__: uuid };
+        return this;
+    }
+    setSizeMode(mode) {
+        this._sizeMode = mode;
+        return this;
+    }
+    getProp() {
+        const SIZE_MODE = ['CUSTOM', 'RAW', 'TRIMMED'];
+        const SPRITE_TYPE = ['SIMPLE', 'SLICED', 'TILED', 'FILLED', 'MESH'];
+        return {
+            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__,
+            _name: this._name,
+            _objFlags: this._objFlags,
+            node: this.node,
+            _enabled: this._enabled,
+            _materials: this._materials,
+            _srcBlendFactor: this._srcBlendFactor,
+            _dstBlendFactor: this._dstBlendFactor,
+            _spriteFrame: this._spriteFrame,
+            _type: this._type,
+            _sizeMode: this._sizeMode,
+            _fillType: this._fillType,
+            _fillCenter: this._fillCenter.toJSON(),
+            _fillStart: this._fillStart,
+            _fillRange: this._fillRange,
+            _isTrimmedMode: this._isTrimmedMode,
+            _atlas: this._atlas,
+            _id: this._id
+        };
+    }
+}

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

@@ -1,74 +1,49 @@
-/**
- * Cocos Creator 变换数据类 (TRS = Translation, Rotation, Scale)
- * array: [posX, posY, posZ, rotX, rotY, rotZ, rotW, scaleX, scaleY, scaleZ]
- */
-class CCTrs {
-    constructor() {
-        this.__type__ = 'TypedArray';
-        this.ctor = 'Float64Array';
-        this.array = [0, 0, 0, 0, 0, 0, 1, 1, 1, 1];
-    }
-
-    // Position
-    get x() { return this.array[0]; }
-    set x(v) { this.array[0] = v; }
-
-    get y() { return this.array[1]; }
-    set y(v) { this.array[1] = v; }
-
-    get z() { return this.array[2]; }
-    set z(v) { this.array[2] = v; }
-
-    // Scale
-    get scaleX() { return this.array[7]; }
-    set scaleX(v) { this.array[7] = v; }
-
-    get scaleY() { return this.array[8]; }
-    set scaleY(v) { this.array[8] = v; }
-
-    get scaleZ() { return this.array[9]; }
-    set scaleZ(v) { this.array[9] = v; }
-
-    // Rotation (四元数)
-    get rotX() { return this.array[3]; }
-    set rotX(v) { this.array[3] = v; }
-
-    get rotY() { return this.array[4]; }
-    set rotY(v) { this.array[4] = v; }
-
-    get rotZ() { return this.array[5]; }
-    set rotZ(v) { this.array[5] = v; }
-
-    get rotW() { return this.array[6]; }
-    set rotW(v) { this.array[6] = v; }
-
-    /**
-     * 设置位置
-     */
-    setPosition(x, y, z = 0) {
-        this.array[0] = x;
-        this.array[1] = y;
-        this.array[2] = z;
-        return this;
-    }
-
-    /**
-     * 设置缩放
-     */
-    setScale(x, y = x, z = 1) {
-        this.array[7] = x;
-        this.array[8] = y;
-        this.array[9] = z;
-        return this;
-    }
-
-    toJSON() {
-        return {
-            __type__: this.__type__,
-            ctor: this.ctor,
-            array: [...this.array]
-        };
-    }
-}
-
-module.exports = CCTrs;
+export default class CCTrs {
+    __type__;
+    ctor;
+    array;
+    constructor() {
+        this.__type__ = 'TypedArray';
+        this.ctor = 'Float64Array';
+        this.array = [0, 0, 0, 0, 0, 0, 1, 1, 1, 1];
+    }
+    get x() { return this.array[0]; }
+    set x(v) { this.array[0] = v; }
+    get y() { return this.array[1]; }
+    set y(v) { this.array[1] = v; }
+    get z() { return this.array[2]; }
+    set z(v) { this.array[2] = v; }
+    get scaleX() { return this.array[7]; }
+    set scaleX(v) { this.array[7] = v; }
+    get scaleY() { return this.array[8]; }
+    set scaleY(v) { this.array[8] = v; }
+    get scaleZ() { return this.array[9]; }
+    set scaleZ(v) { this.array[9] = v; }
+    get rotX() { return this.array[3]; }
+    set rotX(v) { this.array[3] = v; }
+    get rotY() { return this.array[4]; }
+    set rotY(v) { this.array[4] = v; }
+    get rotZ() { return this.array[5]; }
+    set rotZ(v) { this.array[5] = v; }
+    get rotW() { return this.array[6]; }
+    set rotW(v) { this.array[6] = v; }
+    setPosition(x, y, z = 0) {
+        this.array[0] = x;
+        this.array[1] = y;
+        this.array[2] = z;
+        return this;
+    }
+    setScale(x, y = x, z = 1) {
+        this.array[7] = x;
+        this.array[8] = y;
+        this.array[9] = z;
+        return this;
+    }
+    toJSON() {
+        return {
+            __type__: this.__type__,
+            ctor: this.ctor,
+            array: [...this.array]
+        };
+    }
+}