修改resource资源结构

game-server/app/util/gamedata.ts

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 
-var gamedata = {};
+let gamedata = {};
 const wars = ['dic_zyz_gk_main', 'dic_zyz_gk_mainElite', 'dic_zyz_gk_daily', 'dic_zyz_gk_event', 'dic_zyz_gk_tower']; // 关卡相关的表
 const allWarInfos = new Map<number, any>();
 const towerInfos = new Map<number, any>();
@@ -9,7 +9,7 @@ const towerInfos = new Map<number, any>();
 function parseWarData() {
     let result = null;
     for (let filename of wars) {
-        let warInfo = gamedata[filename]||[];
+        let warInfo = gamedata['jsons'][filename]||[];
         for(let war of warInfo) {
             if(war.war_id) {
                 allWarInfos.set(war.war_id, war);
@@ -21,7 +21,7 @@ function parseWarData() {
 
 function parseTowerData() {
     const towerFile = 'dic_zyz_tower';
-    const towerData = gamedata[towerFile] || [];
+    const towerData = gamedata['jsons'][towerFile] || [];
     towerData.forEach(elem => {
         if (elem.towerFloor) {
             towerInfos.set(elem.towerFloor, elem);
@@ -29,8 +29,12 @@ function parseTowerData() {
     });
 }
 
-function initData () {
-    fs.readdirSync(__dirname + '/../resource')
+function initData (folder) {
+    console.log('加载文件夹：', folder);
+    if(!gamedata.hasOwnProperty(folder)) {
+        gamedata[folder] = {};
+    }
+    fs.readdirSync(__dirname + '/../resource/' + folder)
     .filter(function(file) {
         return (file.indexOf(".") !== 0) && (file !== "index.js");
     })
@@ -38,12 +42,12 @@ function initData () {
     .forEach(function(file) {
         var name = file.split('.')[0];
         try {
-            gamedata[name] = JSON.parse(
-                fs.readFileSync(path.resolve(__dirname, "../resource/" + file))
+            gamedata[folder][name] = JSON.parse(
+                fs.readFileSync(path.resolve(__dirname, "../resource/" + folder + "/" + file))
             );
         } catch(e) {
             console.error('【文件缺少】：' + file);
-            gamedata[name] = [];
+            gamedata[folder][name] = [];
         }
 
     });
@@ -54,11 +58,17 @@ function parseData() {
     parseTowerData();
 }
 
-initData();
+initData('jsons'); // 加载一般json
+initData('warJsons'); // 加载出兵表
 parseData();
 
 export function getGamedata(key) {
-    return gamedata[key];
+    return gamedata['jsons'][key];
+}
+
+// 获取出兵表
+export function getWarJsons(key: string) {
+    return gamedata['warJsons'][key];
 }
 
 export function getWarById(warid: number) {
@@ -66,8 +76,7 @@ export function getWarById(warid: number) {
 }
 
 export function getGoodById(gid) {
-    console.log(gid)
-    let goodsInfo = gamedata['dic_goods']||[];
+    let goodsInfo = gamedata['jsons']['dic_goods']||[];
     return goodsInfo.find(cur => {
         return cur.good_id == gid
     });