Fixed issues for CCLoaderLayer

Author: pandamicro

cocos2d/core/platform/CCSAXParser.js

@@ -88,8 +88,10 @@ cc.PlistParser = cc.SAXParser.extend(/** @lends cc.plistParser# */{
     parse : function (xmlTxt) {
         var xmlDoc = this._parseXML(xmlTxt);
         var plist = xmlDoc.documentElement;
-        if (plist.tagName !== 'plist')
-            throw new Error("Not a plist file!");
+        if (plist.tagName !== 'plist') {
+            cc.warn("Not a plist file!");
+            return {};
+        }
 
         // Get first real node
         var node = null;
@@ -164,4 +166,4 @@ cc.saxParser = new cc.SAXParser();
  * @name cc.plistParser
  * A Plist Parser
  */
-cc.plistParser = new cc.PlistParser();
+cc.plistParser = new cc.PlistParser();

extensions/runtime/CCLoaderLayer.js

@@ -206,9 +206,10 @@ cc.LoaderLayer = cc.Layer.extend({
             res = [];
             for (var i = 0; i < this._groupname.length; i++) {
                 var group = groups[this._groupname[i]];
+                var files = group && group.files;
                 var preCount = i > 0 ? groupIndex[i - 1] : 0;
-                groupIndex.push(preCount + group.length);
-                res = res.concat(group);
+                groupIndex.push(preCount + files ? files.length : 0);
+                res = res.concat(files);
             }
         }
         var self = this;
@@ -462,13 +463,14 @@ cc.LoaderLayer.preload = function (groupname, callback, target) {
             else {
                 cc.warn("Group versions haven't been loaded, you can also set group data with 'cc.LoaderLayer.groups'");
             }
+            res_engine_loaded = true;
             callPreload();
         });
 };
 
 cc.LoaderLayer._useDefaultSource = true;
 cc.LoaderLayer._isDefaultProgress = true;
-cc.LoaderLayer._finalConfig = null;
+cc.LoaderLayer._finalConfig = cc.LoaderLayer._confg;
 cc.LoaderLayer.groups = {};
 cc.LoaderLayer.setUseDefaultSource = function (status) {
     cc.LoaderLayer._useDefaultSource = status;
@@ -771,6 +773,7 @@ cc.Dialog._defaultConfig = {
         cc.log("dialog call onExit");
     }
 };
+cc.Dialog._finalConfig = cc.Dialog._defaultConfig;
 cc.Dialog.setConfig = function (config) {
     this._initData(config);
 };
@@ -968,4 +971,4 @@ cc.network.preloadstatus = {
 }
 cc.runtime.network = cc.network;
 
-})();
+})();