update version to 1.6.0

zilongshanren · Aug 18, 2017 · f5a2ef5 · f5a2ef5
1 parent f5c08b0
commit f5a2ef5
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 13 deletions.
diff --git a/CCBoot.js b/CCBoot.js
@@ -32,7 +32,7 @@ cc._LogInfos = cc._LogInfos || {};
  * @property {String} ENGINE_VERSION
  */
 var engineVersion;
-engineVersion = '1.5.0';
+engineVersion = '1.6.0';
 window['CocosEngine'] = cc.ENGINE_VERSION = engineVersion;
 
 /**

diff --git a/cocos2d/actions/CCActionEase.js b/cocos2d/actions/CCActionEase.js
@@ -200,7 +200,6 @@ cc.EaseIn = cc.EaseRateAction.extend({
  * @param {Number} rate
  * @return {Object}
  * @example
- * // example
  * action.easing(cc.easeIn(3.0));
  */
 cc.easeIn = function (rate) {
@@ -251,7 +250,6 @@ cc.EaseOut = cc.EaseRateAction.extend({
  * @param {Number} rate
  * @return {Object}
  * @example
- * // example
  * action.easing(cc.easeOut(3.0));
  */
 cc.easeOut = function (rate) {
@@ -307,7 +305,6 @@ cc.EaseInOut = cc.EaseRateAction.extend({
  * @return {Object}
  *
  * @example
- * //The new usage
  * action.easing(cc.easeInOut(3.0));
  */
 cc.easeInOut = function (rate) {
@@ -375,7 +372,6 @@ cc._easeExponentialInObj = {
  * @method easeExponentialIn
  * @return {Object}
  * @example
- * // example
  * action.easing(cc.easeExponentialIn());
  */
 cc.easeExponentialIn = function(){
@@ -431,7 +427,6 @@ cc._easeExponentialOutObj = {
  * @method easeExponentialOut
  * @return {Object}
  * @example
- * // example
  * action.easing(cc.easeExponentialOut());
  */
 cc.easeExponentialOut = function(){
@@ -502,7 +497,6 @@ cc._easeExponentialInOutObj = {
  * @method easeExponentialInOut
  * @return {Object}
  * @example
- * // example
  * action.easing(cc.easeExponentialInOut());
  */
 cc.easeExponentialInOut = function(){
@@ -558,7 +552,6 @@ cc._easeSineInObj = {
  * @method easeSineIn
  * @return {Object}
  * @example
- * // example
  * action.easing(cc.easeSineIn());
  */
 cc.easeSineIn = function(){
@@ -615,7 +608,6 @@ cc._easeSineOutObj = {
  * @method easeSineOut
  * @return {Object}
  * @example
- * // example
  * action.easing(cc.easeSineOut());
  */
 cc.easeSineOut = function(){
@@ -672,7 +664,6 @@ cc._easeSineInOutObj = {
  * @method easeSineInOut
  * @return {Object}
  * @example
- * // example
  * action.easing(cc.easeSineInOut());
  */
 cc.easeSineInOut = function(){

diff --git a/cocos2d/actions/CCActionInterval.js b/cocos2d/actions/CCActionInterval.js
@@ -121,7 +121,6 @@ cc.ActionInterval = cc.FiniteTimeAction.extend({
     /**
      * !#en Implementation of ease motion.
      * !#zh 缓动运动。
-     * @example
      * @method easing
      * @param {Object} easeObj
      * @returns {ActionInterval}

diff --git a/index.js b/index.js
@@ -83,7 +83,7 @@
  *         "build in release mode":  CC_BUILD && !CC_DEBUG,
  *     }
  *
- * @module GLOBAL MACROS
+ * @module GLOBAL-MACROS
  */
 /**
  * @property {Boolean} CC_EDITOR - Running in the editor.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cocos-creator-js",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Cocos2d-html5 is a cross-platform 2D game engine written in Javascript, based on Cocos2d-X and licensed under MIT. It incorporates the same high level api as “Cocos2d JS-binding engine” and compatible with Cocos2d-X. It currently supports canvas and WebGL renderering.",
   "homepage": "http://www.cocos2d-x.org",
   "authors": [