cocos2d-cli 1.6.3 → 1.6.5

package/src/lib/cc/CCSprite.js

@@ -1,94 +1,94 @@
-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;
+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;

package/src/lib/cc/CCTrs.js

@@ -1,74 +1,74 @@
-/**
- * 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;
+/**
+ * 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;

package/src/lib/cc/CCVec2.js

@@ -1,26 +1,26 @@
-/**
- * Cocos Creator 二维向量类
- */
-class CCVec2 {
-    constructor(x = 0, y = 0) {
-        this.__type__ = 'cc.Vec2';
-        this.x = x;
-        this.y = y;
-    }
-
-    set(x, y) {
-        this.x = x;
-        this.y = y;
-        return this;
-    }
-
-    toJSON() {
-        return {
-            __type__: this.__type__,
-            x: this.x,
-            y: this.y
-        };
-    }
-}
-
-module.exports = CCVec2;
+/**
+ * Cocos Creator 二维向量类
+ */
+class CCVec2 {
+    constructor(x = 0, y = 0) {
+        this.__type__ = 'cc.Vec2';
+        this.x = x;
+        this.y = y;
+    }
+
+    set(x, y) {
+        this.x = x;
+        this.y = y;
+        return this;
+    }
+
+    toJSON() {
+        return {
+            __type__: this.__type__,
+            x: this.x,
+            y: this.y
+        };
+    }
+}
+
+module.exports = CCVec2;

package/src/lib/cc/CCVec3.js

@@ -1,29 +1,29 @@
-/**
- * Cocos Creator 三维向量类
- */
-class CCVec3 {
-    constructor(x = 0, y = 0, z = 0) {
-        this.__type__ = 'cc.Vec3';
-        this.x = x;
-        this.y = y;
-        this.z = z;
-    }
-
-    set(x, y, z = 0) {
-        this.x = x;
-        this.y = y;
-        this.z = z;
-        return this;
-    }
-
-    toJSON() {
-        return {
-            __type__: this.__type__,
-            x: this.x,
-            y: this.y,
-            z: this.z
-        };
-    }
-}
-
-module.exports = CCVec3;
+/**
+ * Cocos Creator 三维向量类
+ */
+class CCVec3 {
+    constructor(x = 0, y = 0, z = 0) {
+        this.__type__ = 'cc.Vec3';
+        this.x = x;
+        this.y = y;
+        this.z = z;
+    }
+
+    set(x, y, z = 0) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+        return this;
+    }
+
+    toJSON() {
+        return {
+            __type__: this.__type__,
+            x: this.x,
+            y: this.y,
+            z: this.z
+        };
+    }
+}
+
+module.exports = CCVec3;

package/src/lib/cc/CCWidget.js

@@ -1,98 +1,98 @@
-const CCComponent = require('./CCComponent');
-
-/**
- * Cocos Creator Widget 组件
- */
-class CCWidget extends CCComponent {
-    constructor() {
-        super();
-        this.__type__ = 'cc.Widget';
-        
-        this.alignMode = 1;
-        this._target = null;
-        this._alignFlags = 45;
-        this._left = 0;
-        this._right = 0;
-        this._top = 0;
-        this._bottom = 0;
-        this._verticalCenter = 0;
-        this._horizontalCenter = 0;
-        this._isAbsLeft = true;
-        this._isAbsRight = true;
-        this._isAbsTop = true;
-        this._isAbsBottom = true;
-        this._isAbsHorizontalCenter = true;
-        this._isAbsVerticalCenter = true;
-        this._originalWidth = 0;
-        this._originalHeight = 0;
-    }
-
-    /**
-     * 设置对齐标志
-     * 45 = 左 + 右 + 上 + 下 (全对齐)
-     */
-    setAlignFlags(flags) {
-        this._alignFlags = flags;
-        return this;
-    }
-
-    /**
-     * 设置边距
-     */
-    setMargins(left, right, top, bottom) {
-        this._left = left;
-        this._right = right;
-        this._top = top;
-        this._bottom = bottom;
-        return this;
-    }
-
-    /**
-     * 转换为属性面板显示格式
-     */
-    toPanelJSON() {
-        return {
-            ...super.toPanelJSON(),
-            top: this._top,
-            bottom: this._bottom,
-            left: this._left,
-            right: this._right,
-            horizontalCenter: this._horizontalCenter,
-            verticalCenter: this._verticalCenter,
-            isAbsLeft: this._isAbsLeft,
-            isAbsRight: this._isAbsRight,
-            isAbsTop: this._isAbsTop,
-            isAbsBottom: this._isAbsBottom
-        };
-    }
-
-    toJSON() {
-        return {
-            __type__: this.__type__,
-            _name: this._name,
-            _objFlags: this._objFlags,
-            node: this.node,
-            _enabled: this._enabled,
-            alignMode: this.alignMode,
-            _target: this._target,
-            _alignFlags: this._alignFlags,
-            _left: this._left,
-            _right: this._right,
-            _top: this._top,
-            _bottom: this._bottom,
-            _verticalCenter: this._verticalCenter,
-            _horizontalCenter: this._horizontalCenter,
-            _isAbsLeft: this._isAbsLeft,
-            _isAbsRight: this._isAbsRight,
-            _isAbsTop: this._isAbsTop,
-            _isAbsBottom: this._isAbsBottom,
-            _isAbsHorizontalCenter: this._isAbsHorizontalCenter,
-            _isAbsVerticalCenter: this._isAbsVerticalCenter,
-            _originalWidth: this._originalWidth,
-            _originalHeight: this._originalHeight,
-            _id: this._id
-        };
-    }
-}
-
-module.exports = CCWidget;
+const CCComponent = require('./CCComponent');
+
+/**
+ * Cocos Creator Widget 组件
+ */
+class CCWidget extends CCComponent {
+    constructor() {
+        super();
+        this.__type__ = 'cc.Widget';
+        
+        this.alignMode = 1;
+        this._target = null;
+        this._alignFlags = 45;
+        this._left = 0;
+        this._right = 0;
+        this._top = 0;
+        this._bottom = 0;
+        this._verticalCenter = 0;
+        this._horizontalCenter = 0;
+        this._isAbsLeft = true;
+        this._isAbsRight = true;
+        this._isAbsTop = true;
+        this._isAbsBottom = true;
+        this._isAbsHorizontalCenter = true;
+        this._isAbsVerticalCenter = true;
+        this._originalWidth = 0;
+        this._originalHeight = 0;
+    }
+
+    /**
+     * 设置对齐标志
+     * 45 = 左 + 右 + 上 + 下 (全对齐)
+     */
+    setAlignFlags(flags) {
+        this._alignFlags = flags;
+        return this;
+    }
+
+    /**
+     * 设置边距
+     */
+    setMargins(left, right, top, bottom) {
+        this._left = left;
+        this._right = right;
+        this._top = top;
+        this._bottom = bottom;
+        return this;
+    }
+
+    /**
+     * 转换为属性面板显示格式
+     */
+    toPanelJSON() {
+        return {
+            ...super.toPanelJSON(),
+            top: this._top,
+            bottom: this._bottom,
+            left: this._left,
+            right: this._right,
+            horizontalCenter: this._horizontalCenter,
+            verticalCenter: this._verticalCenter,
+            isAbsLeft: this._isAbsLeft,
+            isAbsRight: this._isAbsRight,
+            isAbsTop: this._isAbsTop,
+            isAbsBottom: this._isAbsBottom
+        };
+    }
+
+    toJSON() {
+        return {
+            __type__: this.__type__,
+            _name: this._name,
+            _objFlags: this._objFlags,
+            node: this.node,
+            _enabled: this._enabled,
+            alignMode: this.alignMode,
+            _target: this._target,
+            _alignFlags: this._alignFlags,
+            _left: this._left,
+            _right: this._right,
+            _top: this._top,
+            _bottom: this._bottom,
+            _verticalCenter: this._verticalCenter,
+            _horizontalCenter: this._horizontalCenter,
+            _isAbsLeft: this._isAbsLeft,
+            _isAbsRight: this._isAbsRight,
+            _isAbsTop: this._isAbsTop,
+            _isAbsBottom: this._isAbsBottom,
+            _isAbsHorizontalCenter: this._isAbsHorizontalCenter,
+            _isAbsVerticalCenter: this._isAbsVerticalCenter,
+            _originalWidth: this._originalWidth,
+            _originalHeight: this._originalHeight,
+            _id: this._id
+        };
+    }
+}
+
+module.exports = CCWidget;