【修改】 修改配置表加载

assets/script/app/AppInit.js

@@ -28,6 +28,10 @@ module.exports = {
         ns.UIMgr = require('UIMgr')
         ns.UIMgr.init();
 
+        // 配置表管理器
+        ns.CfgMgr = require('CfgMgr'); 
+        ns.CfgMgr.init();
+
         // 时间工具
         ns.TimeUtils = require('TimeUtils');
 

assets/script/app/config/ConfigBase.js

@@ -8,14 +8,16 @@ cc.Class({
         multiple:[],
         multipleCache:null,
         table:null,
+        tableName:"",
+        isLoadFinish:false,
     },
 
     ctor() {
 
     },
 
-    initTable(table, mainKey, multipleKey) {
-        this.table = table;
+    initTable(tableName, mainKey, multipleKey) {
+        this.tableName = tableName;
         this.mainKey = mainKey;
         this.multiple = multipleKey;
 
@@ -24,20 +26,19 @@ cc.Class({
         return this
     },
 
-    // getObjectValue(object, key) {
-    //     if (object.hasOwnProperty(key))
-    //     {
-    //         return object[key]
-    //     }
-    //     return undefined;
-    // },
+    setTable(table) {
+        this.table = table
+    },
 
+    // 从主键中拿某一行数据
     getByMainKey(idx) {
+        // 从缓存中拿数据
         let data = this.indexsCache[idx]
         if (data != undefined) {
             return data;
         }
         
+        // 找数据
         for (let d of this.table) {
             if (d[this.mainKey] == idx) {
                 data = d;
@@ -45,11 +46,15 @@ cc.Class({
             }
         }
 
+        // 缓存数据
         this.indexsCache[data[this.mainKey]] = data;
         return data;
     },
 
+    // 从多主键中,拿数据
     getByMultipleKey() {
+
+        // 参数跟多主键数量对应不上
         if (arguments.length != this.multiple.length) {
             if (arguments.length <= 0) {
                 cc.log("multiple key is null");
@@ -59,15 +64,18 @@ cc.Class({
             return null;
         }
 
+        // 从缓存中拿数据
         let curCache = this.findMultipleCache(arguments);
         if (curCache != null)
         {
             return curCache;
         }
 
+        // 查找数据
         return this.getAndAddMultiple(arguments);
     },
 
+    // 拿多主键数据并缓存
     getAndAddMultiple(args)
     {
         var result = [];
@@ -106,6 +114,7 @@ cc.Class({
         return result;
     },
 
+    // 从多主键缓存中拿数据
     findMultipleCache(args)
     {
         // 索引缓存

assets/script/core/model/CfgMgr.js

@@ -0,0 +1,78 @@
+/**
+ * 配置表管理
+ */
+let ConfigBase = require('ConfigBase')
+
+let CfgMgr = {
+    init () {
+        if (CC_EDITOR) {
+            return;
+        }
+        
+        this.loadFinishCb = null
+        this.updateLoadCb = null
+        this.configs = {
+            BattleBoxAwardConfig: new ConfigBase().initTable("BattleBoxAwardConfig", "", ["boxId", "itemId"]),
+            BattleBoxConfig: new ConfigBase().initTable("BattleBoxConfig", "boxId"),
+            BattleBoxTypeConfig: new ConfigBase().initTable("BattleBoxTypeConfig", "ty"),
+            BattleConstConfig: new ConfigBase().initTable("BattleConstConfig", "main_key"),
+            BlindBoxAwardConfig: new ConfigBase().initTable("BlindBoxAwardConfig", "", ["boxId", "itemId"]),
+            BlindBoxConfig: new ConfigBase().initTable("BlindBoxConfig", "boxId"),
+            BlindBoxConstConfig: new ConfigBase().initTable("BlindBoxConstConfig", "main_key"),
+            BlindBoxTypeConfig: new ConfigBase().initTable("BlindBoxTypeConfig", "ty"),
+            DreamBox: new ConfigBase().initTable("DreamBox", "dreamBoxId"),
+            DreamBoxAward: new ConfigBase().initTable("DreamBoxAward", "DreamBoxId", ["DreamBoxId"]),
+            DreamConstConfig: new ConfigBase().initTable("DreamConstConfig", "main_key"),
+            GoodsConfig: new ConfigBase().initTable("GoodsConfig", "id"),
+            ResItemConfig: new ConfigBase().initTable("ResItemConfig", "id"),
+            ResItemModelConfig: new ConfigBase().initTable("ResItemModelConfig", "id"),
+            ResItemModelTypeConfig: new ConfigBase().initTable("ResItemModelTypeConfig", "id"),
+            ResItemQualityConfig: new ConfigBase().initTable("ResItemQualityConfig", "id"),
+            ResItemQualityPrice: new ConfigBase().initTable("ResItemQualityPrice", "id"),
+            ResItemSurfaceConfig: new ConfigBase().initTable("ResItemSurfaceConfig", "id"),
+            ResItemTypeConfig: new ConfigBase().initTable("ResItemTypeConfig", "id"),
+            Sheet1: new ConfigBase().initTable("Sheet1", "id"),
+        };
+        this.curLoadingIndex = 0;
+    },
+
+    loadAllConfig() {
+        this.loadConfig();
+    },
+
+    loadConfig() {
+        for (const [key, config] of Object.entries(this.configs)) {
+            if (config.isLoadFinish) {
+                continue;
+            }
+            let self = this;
+            cc.loader.loadRes("res_json/" + config.tableName, function(err, jsonAsset) {
+                if (err) {
+                    cc.error(err);
+                    return;
+                }
+
+                config.setTable(jsonAsset.json)
+                config.isLoadFinish = true;
+                self.curLoadingIndex += 1;
+                if (self.updateLoadCb) {
+                    self.updateLoadCb();
+                }
+                self.loadConfig()
+            });
+            break
+        }
+
+        if (this.curLoadingIndex < Object.keys(this.configs).length) {
+            return
+        }
+
+        if (this.loadFinishCb) {
+            this.loadFinishCb()
+        }
+        
+        cc.game.emit('e_mgr_load_config_done');
+    },
+}
+
+module.exports = CfgMgr;

assets/script/core/model/CfgMgr.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "0e56f071-beb4-4f53-a1bb-74b6b2b081e6",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/core/utils/MgrUtils.js

@@ -47,17 +47,18 @@ module.exports = {
      * @returns
      */
     loadAllConfig () {
-        cc.loader.loadRes('res_json/AllConfig', cc.JsonAsset, (err, jsonAsset) => {
-            if (err) {
-                G.LogUtils.log('Load AllConfig err: %s', err.stack);
-                return;
-            }
+        
+        // cc.loader.loadRes('res_json/AllConfig', cc.JsonAsset, (err, jsonAsset) => {
+        //     if (err) {
+        //         G.LogUtils.log('Load AllConfig err: %s', err.stack);
+        //         return;
+        //     }
 
-            this.allConfig =  jsonAsset.json;
-            cc.loader.releaseRes('res_json/AllConfig');
+        //     this.allConfig =  jsonAsset.json;
+        //     cc.loader.releaseRes('res_json/AllConfig');
 
-            // 发送策划表更新消息
-            cc.game.emit('e_mgr_load_config_done');
-        });
+        //     // 发送策划表更新消息
+        //     cc.game.emit('e_mgr_load_config_done');
+        // });
     }
 };

assets/script/launch/ctrl/LaunchCtrl.js

@@ -120,7 +120,8 @@ cc.Class({
 
     // 加载全部的配置
     loadAllConfig () {
-        G.MgrUtils.loadAllConfig();
+        // G.MgrUtils.loadAllConfig();
+        G.CfgMgr.loadAllConfig()
     },
 
     // 更新检测，目前暂时跳过