Deploy website - based on e57f6e5e9f

demo/web-desktop/assets/common/config.0ae49.json

@@ -166,24 +166,14 @@
         "6eBWFz0oVHPLIGQKf/9Thu"
     ],
     "scenes": {},
-    "redirect": [
-        "a97PGbCjtNjr/hYUBJUJ3p",
-        0,
-        "34Wm35ZlJBApgKytyVFWhX",
-        0,
-        "93dM6KrkZCf5dgNpQwf7T6",
-        0,
-        "80ThG1v09KeKxKhEPnFmvh",
-        0
-    ],
-    "deps": [
-        "main"
-    ],
+    "redirect": [],
+    "deps": [],
     "packs": {
-        "0f247028f": [
+        "0472ad032": [
             "09o3P/9gBP/Yc7AnxUBZ+Q",
             "1cijzBpFJCdoSNK98w5oUq",
             "2cDGL4OAVN0ZbEl3w2urT8",
+            "34Wm35ZlJBApgKytyVFWhX",
             "39jYWzSTREwI2OOBK5nwFe",
             "3e30KyALhNkZttyuW0A6EU",
             "45vlnzVlVDaZ6fRVyB0t3Z",
@@ -194,11 +184,14 @@
             "70JFWsm5JN17FDywI0Lb5I",
             "70VXjGE0JMUqGli0jmCmTF",
             "80AR/OlBFOoajT99htLYeJ",
+            "80ThG1v09KeKxKhEPnFmvh",
             "8029xEf4FHy49dWo6NK8c7",
             "85yTK+9shIo7RQfQ1TDEUi",
             "87/8ZHBEVIkKeNxmalrn9r",
             "92aqwImq1Ik7GrBSFnKTF2",
+            "93dM6KrkZCf5dgNpQwf7T6",
             "a7ZscqX+JCIZRS157bMyhq",
+            "a97PGbCjtNjr/hYUBJUJ3p",
             "b5ObM0rx1GDKGN3k5VlH0s",
             "b6OkwTsm1LK5cvRTwFehiy",
             "bc2ZOJo5NCbrI0FXxitEvE",
@@ -218,8 +211,8 @@
     "encrypted": false,
     "versions": {
         "import": [
-            "0f247028f",
-            "a9e3f"
+            "0472ad032",
+            "4b502"
         ],
         "native": [
             "1cijzBpFJCdoSNK98w5oUq",
@@ -238,6 +231,10 @@
             "6d3cf",
             "70JFWsm5JN17FDywI0Lb5I",
             "7b3fa",
+            "80ThG1v09KeKxKhEPnFmvh",
+            "fd38c",
+            "a97PGbCjtNjr/hYUBJUJ3p",
+            "0f278",
             "c1Hf3Sl8ZAnJwP/fpoHxap",
             "d86d7",
             "d0bST/wYpJQIL5T+PCq46W",

demo/web-desktop/assets/home/config.72e22.json

@@ -1,13 +1,13 @@
 {
-    "paths": {},
+    "paths": {
+        "e3EaADwKFP+ZmDIVTeFF63": [
+            "home",
+            "cc.Prefab"
+        ]
+    },
     "uuids": [
-        "catK9m3HRBtYgmebOjC6ma",
-        "ecpdLyjvZBwrvm+cedCcQy",
-        "a2MjXRFdtLlYQ5ouAFv/+R",
-        "5cO7kybDxGj4ipyMYdRYZB",
-        "5f5dyqtRNNxaFmVzYns6FZ",
         "e3EaADwKFP+ZmDIVTeFF63",
-        "02delMVqdBD70a/HSD99FK",
+        "ecpdLyjvZBwrvm+cedCcQy",
         "312JYturtOx74Zjp9UpOqZ",
         "e7q6FL+VZEgLJUjVeDLic/",
         "29FYIk+N1GYaeWH/q1NxQO",
@@ -16,56 +16,53 @@
         "34Wm35ZlJBApgKytyVFWhX",
         "7a/QZLET9IDreTiBfRn2PD",
         "93dM6KrkZCf5dgNpQwf7T6",
-        "d608qFRoFHwbXd0Dap056i",
-        "61cyPdEfRN047sDK9rO0W5",
-        "56fc2Ai/RFNYpaMT8crweK",
-        "71VhFCTINJM6/Ky3oX9nBT",
+        "5cO7kybDxGj4ipyMYdRYZB",
+        "5f5dyqtRNNxaFmVzYns6FZ",
+        "a2MjXRFdtLlYQ5ouAFv/+R",
         "02kcE0s9pAmLe145ftvpR/",
+        "71VhFCTINJM6/Ky3oX9nBT",
+        "56fc2Ai/RFNYpaMT8crweK",
         "d2kHe6FidKcpV5e1aiNTQM",
-        "73oJA92A5OPKpn+ZlUPAj1",
-        "a97PGbCjtNjr/hYUBJUJ3p",
-        "80ThG1v09KeKxKhEPnFmvh"
+        "73oJA92A5OPKpn+ZlUPAj1"
     ],
-    "scenes": {
-        "db://assets/main.fire": "catK9m3HRBtYgmebOjC6ma"
-    },
+    "scenes": {},
     "redirect": [
         "ecpdLyjvZBwrvm+cedCcQy",
         0,
-        "02delMVqdBD70a/HSD99FK",
-        0,
+        "34Wm35ZlJBApgKytyVFWhX",
+        1,
         "7a/QZLET9IDreTiBfRn2PD",
-        0
+        0,
+        "93dM6KrkZCf5dgNpQwf7T6",
+        1,
+        "5cO7kybDxGj4ipyMYdRYZB",
+        2,
+        "5f5dyqtRNNxaFmVzYns6FZ",
+        2,
+        "a2MjXRFdtLlYQ5ouAFv/+R",
+        2
     ],
     "deps": [
-        "internal"
+        "internal",
+        "common",
+        "main"
     ],
     "packs": {
-        "0689a141d": [
+        "025f75dc8": [
             "02kcE0s9pAmLe145ftvpR/",
             "29FYIk+N1GYaeWH/q1NxQO",
             "312JYturtOx74Zjp9UpOqZ",
-            "34Wm35ZlJBApgKytyVFWhX",
             "56fc2Ai/RFNYpaMT8crweK",
-            "5cO7kybDxGj4ipyMYdRYZB",
-            "5f5dyqtRNNxaFmVzYns6FZ",
-            "61cyPdEfRN047sDK9rO0W5",
             "68J8oyAQdFUrqy37MXmbtE",
             "71VhFCTINJM6/Ky3oX9nBT",
             "73oJA92A5OPKpn+ZlUPAj1",
-            "80ThG1v09KeKxKhEPnFmvh",
             "90AErWL21A4ZPvtxQ3XG8G",
-            "93dM6KrkZCf5dgNpQwf7T6",
-            "a2MjXRFdtLlYQ5ouAFv/+R",
-            "a97PGbCjtNjr/hYUBJUJ3p",
-            "catK9m3HRBtYgmebOjC6ma",
             "d2kHe6FidKcpV5e1aiNTQM",
-            "d608qFRoFHwbXd0Dap056i",
             "e3EaADwKFP+ZmDIVTeFF63",
             "e7q6FL+VZEgLJUjVeDLic/"
         ]
     },
-    "name": "main",
+    "name": "home",
     "importBase": "import",
     "nativeBase": "native",
     "debug": true,
@@ -73,28 +70,20 @@
     "encrypted": false,
     "versions": {
         "import": [
-            "0689a141d",
-            "2ef19"
+            "025f75dc8",
+            "515a0"
         ],
         "native": [
             "02kcE0s9pAmLe145ftvpR/",
             "b7a3e",
             "56fc2Ai/RFNYpaMT8crweK",
             "5f1d9",
-            "61cyPdEfRN047sDK9rO0W5",
-            "6d707",
             "71VhFCTINJM6/Ky3oX9nBT",
             "c06a9",
             "73oJA92A5OPKpn+ZlUPAj1",
             "7661e",
-            "80ThG1v09KeKxKhEPnFmvh",
-            "fd38c",
-            "a97PGbCjtNjr/hYUBJUJ3p",
-            "0f278",
             "d2kHe6FidKcpV5e1aiNTQM",
-            "65417",
-            "d608qFRoFHwbXd0Dap056i",
-            "d55c2"
+            "65417"
         ]
     }
 }

demo/web-desktop/assets/home/config.b7f41.json

@@ -1,30 +0,0 @@
-{
-    "paths": {
-        "e3EaADwKFP+ZmDIVTeFF63": [
-            "home",
-            "cc.Prefab"
-        ]
-    },
-    "uuids": [
-        "e3EaADwKFP+ZmDIVTeFF63"
-    ],
-    "scenes": {},
-    "redirect": [
-        "e3EaADwKFP+ZmDIVTeFF63",
-        0
-    ],
-    "deps": [
-        "main"
-    ],
-    "packs": {},
-    "name": "home",
-    "importBase": "import",
-    "nativeBase": "native",
-    "debug": true,
-    "isZip": false,
-    "encrypted": false,
-    "versions": {
-        "import": [],
-        "native": []
-    }
-}

demo/web-desktop/assets/home/index.72e22.js

@@ -85,6 +85,9 @@ window.__require = function e(t, n, r) {
           _this.enableMultiRender = toggle.isChecked;
           _this.multiRenderUpdate();
         });
+        this.objectNumSlider.progress = .02;
+        var offset = (this.nums[1] - this.nums[0]) * this.objectNumSlider.progress;
+        this.num = this.nums[0] + Math.ceil(offset);
         this.numUpdate();
         this.multiRenderUpdate();
       };
@@ -114,7 +117,7 @@ window.__require = function e(t, n, r) {
         }
         this.objects.addChild(node);
         node.position = cc.v3(Math.floor(Math.random() * this.objects.width), Math.floor(Math.random() * this.objects.height));
-        cc.tween(node).by(1, {
+        cc.tween(node).by(3, {
           angle: 360
         }).repeatForever().start();
       };

demo/web-desktop/assets/main/config.ffc79.json

@@ -0,0 +1,53 @@
+{
+    "paths": {},
+    "uuids": [
+        "catK9m3HRBtYgmebOjC6ma",
+        "ecpdLyjvZBwrvm+cedCcQy",
+        "a2MjXRFdtLlYQ5ouAFv/+R",
+        "5cO7kybDxGj4ipyMYdRYZB",
+        "5f5dyqtRNNxaFmVzYns6FZ",
+        "02delMVqdBD70a/HSD99FK",
+        "61cyPdEfRN047sDK9rO0W5",
+        "d608qFRoFHwbXd0Dap056i"
+    ],
+    "scenes": {
+        "db://assets/main.fire": "catK9m3HRBtYgmebOjC6ma"
+    },
+    "redirect": [
+        "ecpdLyjvZBwrvm+cedCcQy",
+        0,
+        "02delMVqdBD70a/HSD99FK",
+        0
+    ],
+    "deps": [
+        "internal"
+    ],
+    "packs": {
+        "0b206e9e9": [
+            "5cO7kybDxGj4ipyMYdRYZB",
+            "5f5dyqtRNNxaFmVzYns6FZ",
+            "61cyPdEfRN047sDK9rO0W5",
+            "a2MjXRFdtLlYQ5ouAFv/+R",
+            "catK9m3HRBtYgmebOjC6ma",
+            "d608qFRoFHwbXd0Dap056i"
+        ]
+    },
+    "name": "main",
+    "importBase": "import",
+    "nativeBase": "native",
+    "debug": true,
+    "isZip": false,
+    "encrypted": false,
+    "versions": {
+        "import": [
+            "0b206e9e9",
+            "4db5f"
+        ],
+        "native": [
+            "61cyPdEfRN047sDK9rO0W5",
+            "6d707",
+            "d608qFRoFHwbXd0Dap056i",
+            "d55c2"
+        ]
+    }
+}

demo/web-desktop/assets/main/index.ffc79.js

@@ -130,21 +130,14 @@ window.__require = function e(t, n, r) {
           path: "skin/spine-skin"
         } ] ]);
         this.initBtns();
+        this.switchPage(this.map.get(this.home));
       };
       LeftArea.prototype.initBtns = function() {
         var e_1, _a;
         var _this = this;
         var _loop_1 = function(node, route) {
           node.on("toggle", function(toggle) {
-            if (toggle.isChecked) {
-              var cur_1 = ++_this.tick;
-              _this.mainArea.destroyAllChildren();
-              route && cc.assetManager.loadBundle(route.bundle, function(err, bundle) {
-                err || bundle.load(route.path, cc.Prefab, function(err, prefab) {
-                  err || cur_1 !== _this.tick || _this.mainArea.addChild(cc.instantiate(prefab));
-                });
-              });
-            }
+            toggle.isChecked && _this.switchPage(route);
           });
         };
         try {
@@ -164,6 +157,18 @@ window.__require = function e(t, n, r) {
           }
         }
       };
+      LeftArea.prototype.switchPage = function(route) {
+        var _this = this;
+        var cur = ++this.tick;
+        this.mainArea.destroyAllChildren();
+        route && cc.assetManager.loadBundle("common", function() {
+          cc.assetManager.loadBundle(route.bundle, function(err, bundle) {
+            err || bundle.load(route.path, cc.Prefab, function(err, prefab) {
+              err || cur !== _this.tick || _this.mainArea.addChild(cc.instantiate(prefab));
+            });
+          });
+        });
+      };
       __decorate([ property(cc.Node) ], LeftArea.prototype, "home", void 0);
       __decorate([ property(cc.Node) ], LeftArea.prototype, "multiMaterial", void 0);
       __decorate([ property(cc.Node) ], LeftArea.prototype, "multiBatcher", void 0);

demo/web-desktop/assets/multi-render/config.67d3d.json

@@ -125,14 +125,13 @@
         "45vlnzVlVDaZ6fRVyB0t3Z",
         "d9xFMK7wVFwbAS60aG9McP",
         "e8Ueib+qJEhL6mXAHdnwbi",
-        "b4P/PCArtIdIH38t6mlw8Y"
+        "b4P/PCArtIdIH38t6mlw8Y",
+        "71VhFCTINJM6/Ky3oX9nBT"
     ],
     "scenes": {},
     "redirect": [
         "ecpdLyjvZBwrvm+cedCcQy",
         0,
-        "29FYIk+N1GYaeWH/q1NxQO",
-        1,
         "5cO7kybDxGj4ipyMYdRYZB",
         1,
         "5f5dyqtRNNxaFmVzYns6FZ",
@@ -166,18 +165,20 @@
         "common"
     ],
     "packs": {
-        "0f3f96b00": [
+        "03de068c3": [
             "0a5R1NT2lDxqcI2pwtgfb1",
             "0eAM9yHrBFe4PSAXHMHNl+",
             "10Drosz6JPsKWsqV+bRh/A",
             "14W7pBGWJJ7q7JCPsVTovy",
             "22JHeF7zBLZqnS68r2p/bo",
+            "29FYIk+N1GYaeWH/q1NxQO",
             "2dPOEW20pCTLs79c0WyZVp",
             "41Zz922rlJZZmZnFZqPxVK",
             "43jA/TdMpFA7K8IIjNbb9M",
             "44mZ0YUdFAF56mmNytjs31",
             "55URLSNf5K3IyZBezfiMKa",
             "5dz/wYuRNGDqDZXXT0zaEr",
+            "71VhFCTINJM6/Ky3oX9nBT",
             "77hE9EwNpMlKl/+sGrhEVR",
             "7aeIQwZiFL1YbOCVeiFt1p",
             "8c20Sso/ZEn7NUfNSM+EBh",
@@ -202,8 +203,8 @@
     "encrypted": false,
     "versions": {
         "import": [
-            "0f3f96b00",
-            "77865"
+            "03de068c3",
+            "a5082"
         ],
         "native": [
             "10Drosz6JPsKWsqV+bRh/A",
@@ -214,6 +215,8 @@
             "28847",
             "44mZ0YUdFAF56mmNytjs31",
             "99af5",
+            "71VhFCTINJM6/Ky3oX9nBT",
+            "c06a9",
             "77hE9EwNpMlKl/+sGrhEVR",
             "92cfc",
             "7aeIQwZiFL1YbOCVeiFt1p",

demo/web-desktop/assets/multi-render/import/03/03de068c3.a5082.json

@@ -27,6 +27,7 @@
     "8fHzmU6I5EBqjpHEb0Xl3i",
     "eahTDGUrZBV4Y+i+JslTuW",
     "c4+eoUuahAOa4lmC/4Hkdi",
+    "71VhFCTINJM6/Ky3oX9nBT",
     "10Drosz6JPsKWsqV+bRh/A",
     "22JHeF7zBLZqnS68r2p/bo",
     "7aeIQwZiFL1YbOCVeiFt1p",
@@ -2217,6 +2218,46 @@
       [],
       []
     ],
+    [
+      [
+        {
+          "name": "default_btn_disabled",
+          "rect": [
+            0,
+            0,
+            40,
+            40
+          ],
+          "offset": [
+            0,
+            0
+          ],
+          "originalSize": [
+            40,
+            40
+          ],
+          "capInsets": [
+            12,
+            12,
+            12,
+            12
+          ]
+        }
+      ],
+      [
+        0
+      ],
+      0,
+      [
+        0
+      ],
+      [
+        2
+      ],
+      [
+        26
+      ]
+    ],
     [
       [
         {
@@ -2254,7 +2295,7 @@
         2
       ],
       [
-        26
+        27
       ]
     ],
     [
@@ -2294,7 +2335,7 @@
         2
       ],
       [
-        27
+        28
       ]
     ],
     [
@@ -2360,7 +2401,7 @@
         2
       ],
       [
-        28
+        29
       ]
     ],
     [
@@ -2661,6 +2702,19 @@
       [],
       []
     ],
+    [
+      [
+        "0,9729,9729,33071,33071,0,0,1",
+        -1
+      ],
+      [
+        1
+      ],
+      0,
+      [],
+      [],
+      []
+    ],
     [
       [
         "0,9729,9729,33071,33071,0,0,0",
@@ -2764,7 +2818,7 @@
         2
       ],
       [
-        29
+        30
       ]
     ],
     [
@@ -2817,7 +2871,7 @@
         2
       ],
       [
-        30
+        31
       ]
     ],
     [
@@ -2870,7 +2924,7 @@
         2
       ],
       [
-        31
+        32
       ]
     ],
     [
@@ -4953,7 +5007,7 @@
         1,
         10,
         1,
-        32,
+        33,
         1,
         4,
         1,
@@ -4961,14 +5015,14 @@
         1,
         4,
         0,
-        33,
+        34,
         1,
         3,
         1,
         11,
         1,
         11,
-        34,
+        35,
         10,
         0,
         0,
@@ -5028,7 +5082,7 @@
         2
       ],
       [
-        35
+        36
       ]
     ],
     [
@@ -5068,7 +5122,7 @@
         2
       ],
       [
-        36
+        37
       ]
     ],
     [
@@ -5121,7 +5175,7 @@
         2
       ],
       [
-        37
+        38
       ]
     ]
   ]

demo/web-desktop/assets/spine/config.2adf8.json

@@ -28,7 +28,8 @@
         "87/8ZHBEVIkKeNxmalrn9r",
         "d0Bu8c2MBCKJc+mKBWzjsJ",
         "e8Ueib+qJEhL6mXAHdnwbi",
-        "b4P/PCArtIdIH38t6mlw8Y"
+        "b4P/PCArtIdIH38t6mlw8Y",
+        "71VhFCTINJM6/Ky3oX9nBT"
     ],
     "scenes": {},
     "redirect": [
@@ -39,7 +40,7 @@
         "7a/QZLET9IDreTiBfRn2PD",
         0,
         "93dM6KrkZCf5dgNpQwf7T6",
-        2,
+        1,
         "85yTK+9shIo7RQfQ1TDEUi",
         1,
         "09o3P/9gBP/Yc7AnxUBZ+Q",
@@ -50,8 +51,6 @@
         2,
         "a2MjXRFdtLlYQ5ouAFv/+R",
         2,
-        "29FYIk+N1GYaeWH/q1NxQO",
-        2,
         "70VXjGE0JMUqGli0jmCmTF",
         1,
         "87/8ZHBEVIkKeNxmalrn9r",
@@ -65,8 +64,10 @@
         "main"
     ],
     "packs": {
-        "060a34fe6": [
+        "05fa2ad10": [
             "03EprhmOVCZKUbb5XyPXQq",
+            "29FYIk+N1GYaeWH/q1NxQO",
+            "71VhFCTINJM6/Ky3oX9nBT",
             "76ZjeTsCNJMYn7/rwRXCpD",
             "b4P/PCArtIdIH38t6mlw8Y",
             "e8Ueib+qJEhL6mXAHdnwbi",
@@ -82,10 +83,12 @@
     "encrypted": false,
     "versions": {
         "import": [
-            "060a34fe6",
-            "ca473"
+            "05fa2ad10",
+            "ef553"
         ],
         "native": [
+            "71VhFCTINJM6/Ky3oX9nBT",
+            "c06a9",
             "b4P/PCArtIdIH38t6mlw8Y",
             "83fcc",
             "e8Ueib+qJEhL6mXAHdnwbi",

demo/web-desktop/assets/spine/import/05/05fa2ad10.ef553.json

@@ -16,6 +16,7 @@
     "70VXjGE0JMUqGli0jmCmTF",
     "87/8ZHBEVIkKeNxmalrn9r",
     "d0Bu8c2MBCKJc+mKBWzjsJ",
+    "71VhFCTINJM6/Ky3oX9nBT",
     "b4P/PCArtIdIH38t6mlw8Y",
     "e8Ueib+qJEhL6mXAHdnwbi"
   ],
@@ -28,10 +29,10 @@
     "_N$pressedSprite",
     "_N$hoverSprite",
     "_N$disabledSprite",
+    "_textureSetter",
     "root",
     "data",
     "_scrollView",
-    "_textureSetter",
     "boy",
     "randomChangeBtn",
     "removeBoyBtn",
@@ -109,6 +110,8 @@
       3,
       6
     ],
+    "cc.SpriteFrame",
+    "cc.Texture2D",
     [
       "cc.Label",
       [
@@ -143,8 +146,6 @@
       3,
       6
     ],
-    "cc.Texture2D",
-    "cc.SpriteFrame",
     [
       "cc.Node",
       [
@@ -416,7 +417,7 @@
       2
     ],
     [
-      4,
+      6,
       0,
       5,
       6,
@@ -581,7 +582,7 @@
       3
     ],
     [
-      4,
+      6,
       0,
       5,
       1,
@@ -670,7 +671,7 @@
       3
     ],
     [
-      4,
+      6,
       0,
       1,
       2,
@@ -680,7 +681,7 @@
       6
     ],
     [
-      5,
+      7,
       0,
       1,
       2,
@@ -692,7 +693,7 @@
       6
     ],
     [
-      5,
+      7,
       0,
       1,
       2,
@@ -705,7 +706,7 @@
       7
     ],
     [
-      5,
+      7,
       0,
       1,
       2,
@@ -1633,7 +1634,7 @@
       0,
       [
         0,
-        8,
+        9,
         1,
         0,
         0,
@@ -1783,7 +1784,7 @@
         -1,
         21,
         0,
-        9,
+        10,
         1,
         2,
         2,
@@ -1798,7 +1799,7 @@
         2,
         12,
         22,
-        10,
+        11,
         23,
         50
       ],
@@ -1914,6 +1915,59 @@
         11
       ]
     ],
+    [
+      [
+        {
+          "name": "default_btn_disabled",
+          "rect": [
+            0,
+            0,
+            40,
+            40
+          ],
+          "offset": [
+            0,
+            0
+          ],
+          "originalSize": [
+            40,
+            40
+          ],
+          "capInsets": [
+            12,
+            12,
+            12,
+            12
+          ]
+        }
+      ],
+      [
+        4
+      ],
+      0,
+      [
+        0
+      ],
+      [
+        8
+      ],
+      [
+        15
+      ]
+    ],
+    [
+      [
+        "0,9729,9729,33071,33071,0,0,1",
+        -1
+      ],
+      [
+        5
+      ],
+      0,
+      [],
+      [],
+      []
+    ],
     [
       [
         [
@@ -2853,7 +2907,7 @@
       0,
       [
         0,
-        8,
+        9,
         1,
         0,
         0,
@@ -2997,7 +3051,7 @@
         -1,
         22,
         0,
-        9,
+        10,
         1,
         2,
         2,
@@ -3006,7 +3060,7 @@
         2,
         9,
         23,
-        10,
+        11,
         24,
         48
       ],
@@ -3077,7 +3131,7 @@
         -1
       ],
       [
-        6
+        5
       ],
       0,
       [],
@@ -3090,7 +3144,7 @@
         -1
       ],
       [
-        6
+        5
       ],
       0,
       [],
@@ -3124,17 +3178,17 @@
         }
       ],
       [
-        7
+        4
       ],
       0,
       [
         0
       ],
       [
-        11
+        8
       ],
       [
-        15
+        16
       ]
     ],
     [
@@ -3164,17 +3218,17 @@
         }
       ],
       [
-        7
+        4
       ],
       0,
       [
         0
       ],
       [
-        11
+        8
       ],
       [
-        16
+        17
       ]
     ]
   ]

demo/web-desktop/cocos2d-js.76b90.js

@@ -16140,7 +16140,7 @@
           tooltip: false,
           notify: function notify(oldValue) {
             if (this.cacheMode === oldValue) return;
-            oldValue !== CacheMode.BITMAP || this.font instanceof cc.BitmapFont || this._frame && this._frame._resetDynamicAtlasFrame();
+            oldValue !== CacheMode.BITMAP || this.font instanceof cc.BitmapFont || deleteFromDynamicAtlas(this, this._frame);
             if (oldValue === CacheMode.CHAR) {
               this._ttfTexture = null;
               var material = this._materials[0];
@@ -16257,9 +16257,11 @@
         this._assemblerData = null;
         this._letterTexture = null;
         if (this._ttfTexture) {
+          this._ttfTexture._packable = false;
           this._ttfTexture.destroy();
           this._ttfTexture = null;
         }
+        this._resetFrame();
         this._super();
       },
       _nodeSizeChanged: function _nodeSizeChanged() {
@@ -16334,7 +16336,7 @@
               this._ttfTexture.initWithElement(this._assemblerData.canvas);
             }
             if (this.cacheMode !== CacheMode.CHAR) {
-              this._frame._resetDynamicAtlasFrame();
+              deleteFromDynamicAtlas(this, this._frame);
               this._frame._refreshTexture(this._ttfTexture);
               this._srcBlendFactor === cc.macro.BlendFactor.ONE && true && this._ttfTexture.setPremultiplyAlpha(true);
             }
@@ -25556,14 +25558,14 @@
       }
     }
     function deserializeCCObject(data, objectData) {
-      var mask = data[4][objectData[OBJ_DATA_MASK]];
-      var clazz = mask[MASK_CLASS];
-      var ctor = clazz[CLASS_TYPE];
+      var mask = data[4][objectData[0]];
+      var clazz = mask[0];
+      var ctor = clazz[0];
       var obj = new ctor();
-      var keys = clazz[CLASS_KEYS];
-      var classTypeOffset = clazz[CLASS_PROP_TYPE_OFFSET];
+      var keys = clazz[1];
+      var classTypeOffset = clazz[2];
       var maskTypeOffset = mask[mask.length - 1];
-      var i = MASK_CLASS + 1;
+      var i = 1;
       for (;i < maskTypeOffset; ++i) {
         var _key = keys[mask[i]];
         obj[_key] = objectData[i];
@@ -25601,15 +25603,15 @@
       owner[key] = deserializeCCObject(data, value);
     }
     function parseCustomClass(data, owner, key, value) {
-      var ctor = data[3][value[CUSTOM_OBJ_DATA_CLASS]];
-      owner[key] = deserializeCustomCCObject(data, ctor, value[CUSTOM_OBJ_DATA_CONTENT]);
+      var ctor = data[3][value[0]];
+      owner[key] = deserializeCustomCCObject(data, ctor, value[1]);
     }
     function parseValueTypeCreated(data, owner, key, value) {
-      BuiltinValueTypeSetters[value[VALUETYPE_SETTER]](owner[key], value);
+      BuiltinValueTypeSetters[value[0]](owner[key], value);
     }
     function parseValueType(data, owner, key, value) {
-      var val = new BuiltinValueTypes[value[VALUETYPE_SETTER]]();
-      BuiltinValueTypeSetters[value[VALUETYPE_SETTER]](val, value);
+      var val = new BuiltinValueTypes[value[0]]();
+      BuiltinValueTypeSetters[value[0]](val, value);
       owner[key] = val;
     }
     function parseTRS(data, owner, key, value) {
@@ -25617,9 +25619,9 @@
       typedArray.set(value);
     }
     function parseDict(data, owner, key, value) {
-      var dict = value[DICT_JSON_LAYOUT];
+      var dict = value[0];
       owner[key] = dict;
-      for (var i = DICT_JSON_LAYOUT + 1; i < value.length; i += 3) {
+      for (var i = 1; i < value.length; i += 3) {
         var _key3 = value[i];
         var _type2 = value[i + 1];
         var subValue = value[i + 2];
@@ -25628,7 +25630,7 @@
       }
     }
     function parseArray(data, owner, key, value) {
-      var array = value[ARRAY_ITEM_VALUES];
+      var array = value[0];
       owner[key] = array;
       for (var i = 0; i < array.length; ++i) {
         var subValue = array[i];
@@ -25656,7 +25658,7 @@
     function parseInstances(data) {
       var instances = data[5];
       var instanceTypes = data[6];
-      var instanceTypesLen = instanceTypes === EMPTY_PLACEHOLDER ? 0 : instanceTypes.length;
+      var instanceTypesLen = 0 === instanceTypes ? 0 : instanceTypes.length;
       var rootIndex = instances[instances.length - 1];
       var normalObjectCount = instances.length - instanceTypesLen;
       if ("number" !== typeof rootIndex) rootIndex = 0; else {
@@ -25708,8 +25710,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.");
-          var _type5 = klassLayout[CLASS_TYPE];
+          if ("function" === typeof klassLayout[0]) throw new Error("Can not deserialize the same JSON data again.");
+          var _type5 = klassLayout[0];
           doLookupClass(classFinder, _type5, klassLayout, CLASS_TYPE, silent, customFinder);
         } else doLookupClass(classFinder, klassLayout, classes, i, silent, customFinder);
       }
@@ -25720,7 +25722,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]];
         }
       }
     }
@@ -28927,6 +28929,7 @@
         this._texture.handleLoadedTexture();
       },
       destroy: function destroy() {
+        this._texture._packable = false;
         this._texture.destroy();
         this._texture = null;
         Label._canvasPool.put(this._data);

demo/web-desktop/main.73020.js

@@ -123,7 +123,7 @@ window.boot = function () {
 if (window.jsb) {
     var isRuntime = (typeof loadRuntime === 'function');
     if (isRuntime) {
-        require('src/settings.1e91a.js');
+        require('src/settings.111b8.js');
         require('src/cocos2d-runtime.js');
         if (CC_PHYSICS_BUILTIN || CC_PHYSICS_CANNON) {
             require('src/physics.js');
@@ -131,7 +131,7 @@ if (window.jsb) {
         require('jsb-adapter/engine/index.js');
     }
     else {
-        require('src/settings.1e91a.js');
+        require('src/settings.111b8.js');
         require('src/cocos2d-jsb.js');
         if (CC_PHYSICS_BUILTIN || CC_PHYSICS_CANNON) {
             require('src/physics.js');

demo/web-desktop/src/settings.111b8.js

@@ -19,11 +19,11 @@ window._CCSettings = {
     bundleVers: {
         sp: "de22b",
         internal: "8360b",
-        common: "0362f",
-        home: "b7f41",
-        "multi-render": "5bb28",
-        spine: "039fb",
+        common: "0ae49",
+        home: "72e22",
+        "multi-render": "67d3d",
+        spine: "2adf8",
         "text-render": "2db47",
-        main: "1c467"
+        main: "ffc79"
     }
 };