更新版本号至 3.1.0

README.md

@@ -1,3 +1,3 @@
-Cocos Enhance Kit v3.0.0 引擎源码
+Cocos Enhance Kit v3.1.0 引擎源码
 
 适配 v2.4.13 引擎

adapters/VERSION.md

@@ -1 +1 @@
-3.0.0
+3.1.0

cocos2d-x/VERSION.md

@@ -1 +1 @@
-3.0.0
+3.1.0

engine/VERSION.md

@@ -1 +1 @@
-3.0.0
+3.1.0

engine/bin/cocos2d-js-for-preview.js

@@ -46384,7 +46384,7 @@
       this.version = version;
     };
     function unpackJSONs(data, classFinder) {
-      if (data[0] < 1) throw new Error(cc.debug.getError(5304, data[0]));
+      if (data[0] < SUPPORT_MIN_FORMAT_VERSION) throw new Error(cc.debug.getError(5304, data[0]));
       lookupClasses(data, true, classFinder);
       cacheMasks(data);
       var version = new FileInfo(data[0]);
@@ -46397,7 +46397,7 @@
       return sections;
     }
     function packCustomObjData(type, data, hasNativeDep) {
-      return [ 1, EMPTY_PLACEHOLDER, EMPTY_PLACEHOLDER, [ type ], EMPTY_PLACEHOLDER, hasNativeDep ? [ data, -1 ] : [ data ], [ 0 ], EMPTY_PLACEHOLDER, [], [], [] ];
+      return [ SUPPORT_MIN_FORMAT_VERSION, EMPTY_PLACEHOLDER, EMPTY_PLACEHOLDER, [ type ], EMPTY_PLACEHOLDER, hasNativeDep ? [ data, -1 ] : [ data ], [ 0 ], EMPTY_PLACEHOLDER, [], [], [] ];
     }
     function hasNativeDep(data) {
       var instances = data[5];
@@ -51143,7 +51143,7 @@
           var originalIndex = 0;
           for (var i = 0; i < this.frees.length; i++) {
             var freeLetter = this.frees[i];
-            if (freeLetter._width === width && freeLetter._height === height) {
+            if (freeLetter._width >= width && freeLetter._height >= height) {
               areaFit = freeLetter._width * freeLetter._height - width * height;
               if (areaFit < score) {
                 original = freeLetter;
@@ -51332,6 +51332,7 @@
         if (!letter) {
           if (this._enableLetterCache) {
             var canvas = Label._canvasPool.get();
+            canvas.context.font = labelInfo.fontDesc;
             this.letterCache[hash] = {
               char: _char2,
               hash: labelInfo.hash,
@@ -51339,8 +51340,8 @@
               fontDesc: labelInfo.fontDesc,
               fontSize: labelInfo.fontSize,
               margin: labelInfo.margin,
-              out: labelInfo.out.toHEX(),
+              out: labelInfo.out.toHEX("#rrggbbaa"),
-              color: labelInfo.color.toHEX(),
+              color: labelInfo.color.toHEX("#rrggbbaa"),
               isOutlined: labelInfo.isOutlined
             };
             Label._canvasPool.put(canvas);
@@ -51422,9 +51423,9 @@
     })();
     function computeHash(labelInfo) {
       var hashData = "|";
-      var color = labelInfo.color.toHEX();
+      var color = labelInfo.color.toHEX("#rrggbbaa");
       var out = "";
-      labelInfo.isOutlined && labelInfo.margin > 0 && (out = out + labelInfo.margin + labelInfo.out.toHEX());
+      labelInfo.isOutlined && labelInfo.margin > 0 && (out = out + labelInfo.margin + labelInfo.out.toHEX("#rrggbbaa"));
       return hashData + labelInfo.fontSize + labelInfo.fontFamily + color + out;
     }
     var _shareAtlas = null;
@@ -51815,9 +51816,9 @@
       _proto.packDynamicAtlasAndCheckMaterial = function packDynamicAtlasAndCheckMaterial(comp, frame) {
         var allowDynamicAtlas = comp.allowDynamicAtlas;
         if (cc.sp.allowDynamicAtlas && 0 === allowDynamicAtlas || 1 === allowDynamicAtlas) {
-          frame._texture._uuid = _fontDesc + _overflow + (_premultiply ? "P" : "NP") + comp.node.color.toHEX() + (_enableUnderline ? "UL" : "NUL") + _string;
+          frame._texture._uuid = _fontDesc + _overflow + (_premultiply ? "P" : "NP") + comp.node.color.toHEX("#rrggbbaa") + (_enableUnderline ? "UL" : "NUL") + _string;
-          _outlineComp && (frame._texture._uuid += _outlineComp.color.toHEX() + "," + _outlineComp.width + ",");
+          _outlineComp && (frame._texture._uuid += _outlineComp.color.toHEX("#rrggbbaa") + "," + _outlineComp.width + ",");
-          _shadowComp && (frame._texture._uuid += _shadowComp.color.toHEX() + _shadowComp.offset.x + "," + _shadowComp.offset.y + "," + _shadowComp.blur);
+          _shadowComp && (frame._texture._uuid += _shadowComp.color.toHEX("#rrggbbaa") + _shadowComp.offset.x + "," + _shadowComp.offset.y + "," + _shadowComp.blur);
         }
         return _Assembler2D.prototype.packDynamicAtlasAndCheckMaterial.call(this, comp, frame);
       };
@@ -57340,7 +57341,7 @@
     "use strict";
     cc.sp = {
       inited: false,
-      version: "3.0.0",
+      version: "3.1.0",
       MAX_MULTITEXTURE_NUM: -1,
       autoSwitchMaterial: true,
       allowDynamicAtlas: true,
@@ -58758,37 +58759,6 @@
   }), {} ],
   392: [ (function(require, module, exports) {
     "use strict";
-    function _createForOfIteratorHelperLoose(o, allowArrayLike) {
-      var it = "undefined" !== typeof Symbol && o[Symbol.iterator] || o["@@iterator"];
-      if (it) return (it = it.call(o)).next.bind(it);
-      if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && "number" === typeof o.length) {
-        it && (o = it);
-        var i = 0;
-        return function() {
-          if (i >= o.length) return {
-            done: true
-          };
-          return {
-            done: false,
-            value: o[i++]
-          };
-        };
-      }
-      throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-    }
-    function _unsupportedIterableToArray(o, minLen) {
-      if (!o) return;
-      if ("string" === typeof o) return _arrayLikeToArray(o, minLen);
-      var n = Object.prototype.toString.call(o).slice(8, -1);
-      "Object" === n && o.constructor && (n = o.constructor.name);
-      if ("Map" === n || "Set" === n) return Array.from(o);
-      if ("Arguments" === n || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
-    }
-    function _arrayLikeToArray(arr, len) {
-      (null == len || len > arr.length) && (len = arr.length);
-      for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-      return arr2;
-    }
     var macro = require("../../platform/CCMacro");
     var PerfCounter = require("./perf-counter");
     var _showFPS = false;
@@ -58854,25 +58824,19 @@
               sample: function sample(now) {},
               human: function human() {
                 var atlases = cc.Label._shareAtlas.atlases;
+                var chars = cc.Label._shareAtlas._fontDefDictionary._letterDefinitions;
+                var oneOfMax = atlases.reduce((function(a, b) {
+                  return a + b._width * b._height;
+                }), 0) / atlases.length;
                 var used = 0;
                 var usedLess = 0;
-                for (var _iterator = _createForOfIteratorHelperLoose(atlases), _step; !(_step = _iterator()).done; ) {
+                for (var key in chars) {
-                  var atlas = _step.value;
+                  var _char = chars[key];
-                  var max = atlas._width * atlas._height;
+                  var size = _char._height * _char._width;
-                  var _used = atlas._width * atlas._nexty;
+                  usedLess += size;
-                  for (var _iterator2 = _createForOfIteratorHelperLoose(atlas.frees), _step2; !(_step2 = _iterator2()).done; ) {
+                  _char.ref > 0 && (used += size);
-                    var area = _step2.value;
-                    _used -= area._width * area._height;
-                  }
-                  var _usedLess = _used;
-                  for (var _iterator3 = _createForOfIteratorHelperLoose(atlas.waitCleans), _step3; !(_step3 = _iterator3()).done; ) {
-                    var _area = _step3.value;
-                    0 === _area.ref && (_usedLess -= _area._width * _area._height);
-                  }
-                  used += _used / max;
-                  usedLess += _usedLess / max;
                 }
-                return (usedLess / atlases.length).toFixed(2) + " / " + (used / atlases.length).toFixed(2) + " / " + atlases.length;
+                return (used / oneOfMax).toFixed(2) + " / " + (usedLess / oneOfMax).toFixed(2) + " / " + atlases.length;
               }
             }
           });

engine/bin/cocos2d-jsb-for-preview.js

@@ -45922,7 +45922,7 @@
 
        case _mat["default"]:
         var res = new Array(17);
-        res[0] = typeId;
+        res[VALUETYPE_SETTER] = typeId;
         _mat["default"].toArray(res, obj, 1);
         return res;
 
@@ -46127,7 +46127,7 @@
     function parseInstances(data) {
       var instances = data[5];
       var instanceTypes = data[6];
-      var instanceTypesLen = 0 === instanceTypes ? 0 : instanceTypes.length;
+      var instanceTypesLen = instanceTypes === EMPTY_PLACEHOLDER ? 0 : instanceTypes.length;
       var rootIndex = instances[instances.length - 1];
       var normalObjectCount = instances.length - instanceTypesLen;
       if ("number" !== typeof rootIndex) rootIndex = 0; else {
@@ -46179,8 +46179,8 @@
         var klassLayout = classes[i];
         if ("string" !== typeof klassLayout) {
           true;
-          if ("function" === typeof klassLayout[CLASS_TYPE]) throw new Error("Can not deserialize the same JSON data again.");
+          if ("function" === typeof klassLayout[0]) throw new Error("Can not deserialize the same JSON data again.");
-          var _type5 = klassLayout[CLASS_TYPE];
+          var _type5 = klassLayout[0];
           doLookupClass(classFinder, _type5, klassLayout, CLASS_TYPE, silent, customFinder);
         } else doLookupClass(classFinder, klassLayout, classes, i, silent, customFinder);
       }
@@ -46191,7 +46191,7 @@
         var classes = data[3];
         for (var i = 0; i < masks.length; ++i) {
           var mask = masks[i];
-          mask[MASK_CLASS] = classes[mask[MASK_CLASS]];
+          mask[0] = classes[mask[0]];
         }
       }
     }
@@ -51014,7 +51014,7 @@
           var originalIndex = 0;
           for (var i = 0; i < this.frees.length; i++) {
             var freeLetter = this.frees[i];
-            if (freeLetter._width === width && freeLetter._height === height) {
+            if (freeLetter._width >= width && freeLetter._height >= height) {
               areaFit = freeLetter._width * freeLetter._height - width * height;
               if (areaFit < score) {
                 original = freeLetter;
@@ -51203,6 +51203,7 @@
         if (!letter) {
           if (this._enableLetterCache) {
             var canvas = Label._canvasPool.get();
+            canvas.context.font = labelInfo.fontDesc;
             this.letterCache[hash] = {
               char: _char2,
               hash: labelInfo.hash,
@@ -51210,8 +51211,8 @@
               fontDesc: labelInfo.fontDesc,
               fontSize: labelInfo.fontSize,
               margin: labelInfo.margin,
-              out: labelInfo.out.toHEX(),
+              out: labelInfo.out.toHEX("#rrggbbaa"),
-              color: labelInfo.color.toHEX(),
+              color: labelInfo.color.toHEX("#rrggbbaa"),
               isOutlined: labelInfo.isOutlined
             };
             Label._canvasPool.put(canvas);
@@ -51293,9 +51294,9 @@
     })();
     function computeHash(labelInfo) {
       var hashData = "|";
-      var color = labelInfo.color.toHEX();
+      var color = labelInfo.color.toHEX("#rrggbbaa");
       var out = "";
-      labelInfo.isOutlined && labelInfo.margin > 0 && (out = out + labelInfo.margin + labelInfo.out.toHEX());
+      labelInfo.isOutlined && labelInfo.margin > 0 && (out = out + labelInfo.margin + labelInfo.out.toHEX("#rrggbbaa"));
       return hashData + labelInfo.fontSize + labelInfo.fontFamily + color + out;
     }
     var _shareAtlas = null;
@@ -51687,9 +51688,9 @@
       _proto.packDynamicAtlasAndCheckMaterial = function packDynamicAtlasAndCheckMaterial(comp, frame) {
         var allowDynamicAtlas = comp.allowDynamicAtlas;
         if (cc.sp.allowDynamicAtlas && 0 === allowDynamicAtlas || 1 === allowDynamicAtlas) {
-          frame._texture._uuid = _fontDesc + _overflow + (_premultiply ? "P" : "NP") + comp.node.color.toHEX() + (_enableUnderline ? "UL" : "NUL") + _string;
+          frame._texture._uuid = _fontDesc + _overflow + (_premultiply ? "P" : "NP") + comp.node.color.toHEX("#rrggbbaa") + (_enableUnderline ? "UL" : "NUL") + _string;
-          _outlineComp && (frame._texture._uuid += _outlineComp.color.toHEX() + "," + _outlineComp.width + ",");
+          _outlineComp && (frame._texture._uuid += _outlineComp.color.toHEX("#rrggbbaa") + "," + _outlineComp.width + ",");
-          _shadowComp && (frame._texture._uuid += _shadowComp.color.toHEX() + _shadowComp.offset.x + "," + _shadowComp.offset.y + "," + _shadowComp.blur);
+          _shadowComp && (frame._texture._uuid += _shadowComp.color.toHEX("#rrggbbaa") + _shadowComp.offset.x + "," + _shadowComp.offset.y + "," + _shadowComp.blur);
         }
         return _Assembler2D.prototype.packDynamicAtlasAndCheckMaterial.call(this, comp, frame);
       };
@@ -57033,7 +57034,7 @@
     "use strict";
     cc.sp = {
       inited: false,
-      version: "3.0.0",
+      version: "3.1.0",
       MAX_MULTITEXTURE_NUM: -1,
       autoSwitchMaterial: true,
       allowDynamicAtlas: true,
@@ -58453,37 +58454,6 @@
   }), {} ],
   390: [ (function(require, module, exports) {
     "use strict";
-    function _createForOfIteratorHelperLoose(o, allowArrayLike) {
-      var it = "undefined" !== typeof Symbol && o[Symbol.iterator] || o["@@iterator"];
-      if (it) return (it = it.call(o)).next.bind(it);
-      if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && "number" === typeof o.length) {
-        it && (o = it);
-        var i = 0;
-        return function() {
-          if (i >= o.length) return {
-            done: true
-          };
-          return {
-            done: false,
-            value: o[i++]
-          };
-        };
-      }
-      throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-    }
-    function _unsupportedIterableToArray(o, minLen) {
-      if (!o) return;
-      if ("string" === typeof o) return _arrayLikeToArray(o, minLen);
-      var n = Object.prototype.toString.call(o).slice(8, -1);
-      "Object" === n && o.constructor && (n = o.constructor.name);
-      if ("Map" === n || "Set" === n) return Array.from(o);
-      if ("Arguments" === n || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
-    }
-    function _arrayLikeToArray(arr, len) {
-      (null == len || len > arr.length) && (len = arr.length);
-      for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-      return arr2;
-    }
     var macro = require("../../platform/CCMacro");
     var PerfCounter = require("./perf-counter");
     var _showFPS = false;
@@ -58549,25 +58519,19 @@
               sample: function sample(now) {},
               human: function human() {
                 var atlases = cc.Label._shareAtlas.atlases;
+                var chars = cc.Label._shareAtlas._fontDefDictionary._letterDefinitions;
+                var oneOfMax = atlases.reduce((function(a, b) {
+                  return a + b._width * b._height;
+                }), 0) / atlases.length;
                 var used = 0;
                 var usedLess = 0;
-                for (var _iterator = _createForOfIteratorHelperLoose(atlases), _step; !(_step = _iterator()).done; ) {
+                for (var key in chars) {
-                  var atlas = _step.value;
+                  var _char = chars[key];
-                  var max = atlas._width * atlas._height;
+                  var size = _char._height * _char._width;
-                  var _used = atlas._width * atlas._nexty;
+                  usedLess += size;
-                  for (var _iterator2 = _createForOfIteratorHelperLoose(atlas.frees), _step2; !(_step2 = _iterator2()).done; ) {
+                  _char.ref > 0 && (used += size);
-                    var area = _step2.value;
-                    _used -= area._width * area._height;
-                  }
-                  var _usedLess = _used;
-                  for (var _iterator3 = _createForOfIteratorHelperLoose(atlas.waitCleans), _step3; !(_step3 = _iterator3()).done; ) {
-                    var _area = _step3.value;
-                    0 === _area.ref && (_usedLess -= _area._width * _area._height);
-                  }
-                  used += _used / max;
-                  usedLess += _usedLess / max;
                 }
-                return (usedLess / atlases.length).toFixed(2) + " / " + (used / atlases.length).toFixed(2) + " / " + atlases.length;
+                return (used / oneOfMax).toFixed(2) + " / " + (usedLess / oneOfMax).toFixed(2) + " / " + atlases.length;
               }
             }
           });

engine/cocos2d/core/sp/sp.js

@@ -8,7 +8,7 @@ cc.sp = {
     /**
      * 版本号
      */
-    version: "3.0.0",
+    version: "3.1.0",
 
     /**
      * 最大纹理插槽数量

extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "enhance-kit",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "This extension provides support for cocos enhance kit.",
   "author": "SmallMain",
   "main": "main.js",

jsb-adapter/VERSION.md

@@ -1 +1 @@
-3.0.0
+3.1.0