修改字段

game-server/app/servers/battle/handler/battleUtils.ts

@@ -129,7 +129,7 @@ export class WarReward {
         let returnGoods = new Array();
         for(let goods of this.rewards) {
             let goodInfo = getGoodById(goods.gid);
-            if(goodInfo.good_type == GOOD_TYPE.EQUIP) { // 装备
+            if(goodInfo.goodType == GOOD_TYPE.EQUIP) { // 装备
                 let result = await this.rewardWeapons(goodInfo, {id: goods.gid, cnt: goods.count });
                 for(let obj of result) {
                     returnGoods.push({dropType: goods.type, ...obj})
@@ -154,7 +154,7 @@ export class WarReward {
                 eName: dicGood.name,
                 seqId,
                 quality: dicGood.lv,
-                type: dicGood.good_type
+                type: dicGood.goodType
             }
             const equip = await EquipModel.createEquip(equipInfo);
             cnt -= 1;

game-server/app/servers/battle/handler/dailyBattleHandler.ts

@@ -18,16 +18,16 @@ export class DailyBattleHandler {
 
         const BattleRecord = await BattleRecordModel.getBattleList(roleId, WAR_TYPE.DAILY);
 
-        let dicDaily = getGamedata('dic_daily');
+        let dicDaily = getGamedata('dic_zyz_daily');
-        let dicDailyWar = getGamedata('dic_daily_war');
+        let dicDailyWar = getGamedata('dic_zyz_gk_daily');
 
         let result = new Array();
-        for(let {type, name, sum} of dicDaily) {
+        for(let {dailyType: type, name, timesPerDay: sum} of dicDaily) {
             let refreshResult = await DailyRecordModel.refreshRecord(roleId, type);
             let {count} = refreshResult;
             let wars = new Array();
-            for(let {war_id, daily_type, difficulty, cost, gk_name, previousGk } of dicDailyWar) {
+            for(let {war_id, dailyType, cost, gk_name, previousGk } of dicDailyWar) {
-                if(daily_type == type) {
+                if(dailyType == type) {
                     let status = 0, star = 0;
                     let curBattle = BattleRecord.find(cur => cur.battleId == war_id);
                     if(curBattle) {
@@ -46,7 +46,7 @@ export class DailyBattleHandler {
                         }
                     }
                     wars.push({
-                        battleId: war_id, difficulty, cost, star, status, name: gk_name 
+                        battleId: war_id, cost, star, status, name: gk_name 
                     });
                 }
             }
@@ -65,13 +65,13 @@ export class DailyBattleHandler {
 
 // 检查每日本次数checkBattle使用
 export async function checkDaily(roleId: string, battleId: number, inc: number) {
-    let dicDaily = getGamedata('dic_daily');
+    let dicDaily = getGamedata('dic_zyz_daily');
-    let dicDailyWar = getGamedata('dic_daily_war');
+    let dicDailyWar = getGamedata('dic_zyz_gk_daily');
     let dailyWar = dicDailyWar.find(cur => cur.war_id == battleId);
     if(!dailyWar) return { status: -1, msg: '未找到该关卡' };
-    let type = dailyWar.daily_type;
+    let type = dailyWar.dailyType;
 
-    let curDaily = dicDaily.find(cur => cur.type == type);
+    let curDaily = dicDaily.find(cur => cur.dailyType == type);
     if(!curDaily) return { status: -1, msg: '未找到该类型' };
     let dailyRecord = await DailyRecordModel.refreshRecord(roleId, type);
     let { count } = dailyRecord;
@@ -83,13 +83,13 @@ export async function checkDaily(roleId: string, battleId: number, inc: number)
 
 // 检查每日本次数warEnd和warSweep使用
 export async function checkDailyAndIncrease(roleId: string, battleId: number, inc: number, isRef: boolean) {
-    let dicDaily = getGamedata('dic_daily');
+    let dicDaily = getGamedata('dic_zyz_daily');
-    let dicDailyWar = getGamedata('dic_daily_war');
+    let dicDailyWar = getGamedata('dic_zyz_gk_daily');
     let dailyWar = dicDailyWar.find(cur => cur.war_id == battleId);
     if(!dailyWar) return { status: -1, msg: '未找到该关卡' };
-    let type = dailyWar.daily_type;
+    let type = dailyWar.dailyType;
 
-    let curDaily = dicDaily.find(cur => cur.type == type);
+    let curDaily = dicDaily.find(cur => cur.dailyType == type);
     if(!curDaily) return { status: -1, msg: '未找到该类型' };
 
     let dailyRecord;

game-server/app/servers/battle/handler/normalBattleHandler.ts

@@ -42,7 +42,7 @@ export class NormalBattleHandler {
         }
 
         let dailyNum = {};
-        if(warInfo.war_type == WAR_TYPE.DAILY) {
+        if(warInfo.warType == WAR_TYPE.DAILY) {
             let checkResult = await checkDaily(roleId, battleId, 1);
             if(checkResult.status == -1) {
                 return {code: 202, data: checkResult.msg}
@@ -55,7 +55,7 @@ export class NormalBattleHandler {
                 roleId, roleName, battleId,
                 status: 0,
                 warName: warInfo.gk_name,
-                warType: warInfo.war_type,
+                warType: warInfo.warType,
                 record: { heroes }
             }
         }, true);
@@ -123,7 +123,7 @@ export class NormalBattleHandler {
         }
 
         let dailyNum = {};
-        if(warInfo.war_type == WAR_TYPE.DAILY) {
+        if(warInfo.warType == WAR_TYPE.DAILY) {
             let checkResult = await checkDailyAndIncrease(roleId, battleId, 1, false);
             if(checkResult.status == -1) {
                 return {code: 202, data: checkResult.msg}
@@ -203,7 +203,7 @@ export class NormalBattleHandler {
 
         // 扫荡次数
         let dailyNum = {};
-        if(warInfo.war_type == WAR_TYPE.DAILY) {
+        if(warInfo.warType == WAR_TYPE.DAILY) {
             let checkResult = await checkDailyAndIncrease(roleId, battleId, count, true);
             if(checkResult.status == -1) {
                 return {code: 202, data: checkResult.msg}
@@ -220,7 +220,7 @@ export class NormalBattleHandler {
             $set: {
                 roleName, 
                 warName: warInfo.gk_name,
-                warType: warInfo.war_type
+                warType: warInfo.warType
             },
             $inc: { count }
         });

game-server/app/util/gamedata.ts

@@ -29,7 +29,7 @@ export function getGamedata(key) {
 }
 
 export function getWarById(warid) {
-    const wars = ['dic_zyz_gk', 'dic_daily_war', 'dic_event_war']; // 关卡相关的表
+    const wars = ['dic_zyz_gk_main', 'dic_zyz_gk_mainElite', 'dic_zyz_gk_daily', 'dic_zyz_gk_event']; // 关卡相关的表
     let result;
     for(let filename of wars) {
         let warInfo = gamedata[filename]||[];

gm-server/app/service/Utils.ts

@@ -77,10 +77,18 @@ export default class Utils extends Service {
     });
   }
   public getWarById(warid) {
-    let warInfo = gamedata['dic_zyz_gk']||[];
+    const wars = ['dic_zyz_gk_main', 'dic_zyz_gk_mainElite', 'dic_zyz_gk_daily', 'dic_zyz_gk_event']; // 关卡相关的表
-    return warInfo.find(cur => {
+    let result;
-        return cur.war_id == warid
+    for(let filename of wars) {
-    });
+        let warInfo = gamedata[filename]||[];
+        for(let war of warInfo) {
+            if(war.war_id == warid) {
+                result = war; break;
+            }
+        }
+        if(result) break;
+    }
+    return result||[];
   }
 
   public getGoodById(gid) {

shared/resource/dic_daily.json

@@ -1,7 +0,0 @@
-[
-    {
-        "type": 1,
-        "name": "资源本",
-        "sum": 3
-    }
-]

shared/resource/dic_daily_war.json

@@ -1,24 +0,0 @@
-[
-    {
-        "war_id": 1000,
-        "war_type": 2,
-        "daily_type": 1,
-        "difficulty": 1,
-        "gk_name": "每日资源本A",
-        "cost": 1,
-        "fixReward": "1&1",
-        "conditionReward": "2&1&1|1&1&0",
-        "randomReward": "3&1&2"
-    },
-    {
-        "war_id": 1001,
-        "war_type": 2,
-        "daily_type": 1,
-        "difficulty": 2,
-        "gk_name": "每日资源本B",
-        "cost": 1,
-        "fixReward": "1&50",
-        "conditionReward": "2&1&1|1&1&0",
-        "randomReward": "3&1&2"
-    }
-]

shared/resource/dic_event.json

@@ -1,8 +0,0 @@
-[
-    {
-        "event_id": 1,
-        "type": 1,
-        "quality": 1,
-        "war_id": 2000
-    }
-]

shared/resource/dic_event_war.json

@@ -1,10 +0,0 @@
-[
-    {
-        "war_id": 2000,
-        "war_type": 3,
-        "gk_name": "奇遇",
-        "fixReward": "1&50",
-        "conditionReward": "2&10&1|1&10&0",
-        "randomReward": "3&10&2"
-    }
-]

shared/resource/dic_zyz_daily.json

@@ -0,0 +1 @@
+[{"dailyType":1,"name":"护送商人","timesPerDay":1,"description":"内有不同难度，可获得大量铜钱"},{"dailyType":2,"name":"守卫城池","timesPerDay":1,"description":"内有不同难度，可获得大量武将经验书"},{"dailyType":3,"name":"保护矿产","timesPerDay":1,"description":"内有不同难度，可获得大量装备材料"}]

shared/resource/dic_zyz_event.json

@@ -0,0 +1 @@
+[{"eventID":1,"eventType":1,"quality":1,"name":"天降宝箱*铜币","sSpineInUI":0,"rScriptId":0,"winReward":0,"loseReward":0,"suitLevel":"1&20","warId":0,"__EMPTY":0,"__EMPTY_1":0,"__EMPTY_2":0,"__EMPTY_3":0,"__EMPTY_4":0,"__EMPTY_5":0,"fobiddenCharactor":0,"victoryInfoInUI":0,"loseInfoInUI":0,"starInfoInUI":0,"cost":0,"recommendedPower":0,"previousGk":0},{"eventID":2,"eventType":1,"quality":1,"name":"天降宝箱*元宝","sSpineInUI":0,"rScriptId":0,"winReward":0,"loseReward":0,"suitLevel":"1&20","warId":0,"__EMPTY":0,"__EMPTY_1":0,"__EMPTY_2":0,"__EMPTY_3":0,"__EMPTY_4":0,"__EMPTY_5":0,"fobiddenCharactor":0,"victoryInfoInUI":0,"loseInfoInUI":0,"starInfoInUI":0,"cost":0,"recommendedPower":0,"previousGk":0},{"eventID":3,"eventType":1,"quality":1,"name":"天降宝箱*材料","sSpineInUI":0,"rScriptId":0,"winReward":0,"loseReward":0,"suitLevel":"1&20","warId":0,"__EMPTY":0,"__EMPTY_1":0,"__EMPTY_2":0,"__EMPTY_3":0,"__EMPTY_4":0,"__EMPTY_5":0,"fobiddenCharactor":0,"victoryInfoInUI":0,"loseInfoInUI":0,"starInfoInUI":0,"cost":0,"recommendedPower":0,"previousGk":0},{"eventID":4,"eventType":2,"quality":1,"name":"答题*体力","sSpineInUI":0,"rScriptId":0,"winReward":0,"loseReward":0,"suitLevel":"1&20","warId":0,"__EMPTY":0,"__EMPTY_1":0,"__EMPTY_2":0,"__EMPTY_3":0,"__EMPTY_4":0,"__EMPTY_5":0,"fobiddenCharactor":0,"victoryInfoInUI":0,"loseInfoInUI":0,"starInfoInUI":0,"cost":0,"recommendedPower":0,"previousGk":0},{"eventID":5,"eventType":2,"quality":1,"name":"答题*将魂","sSpineInUI":0,"rScriptId":0,"winReward":0,"loseReward":0,"suitLevel":"1&20","warId":0,"__EMPTY":0,"__EMPTY_1":0,"__EMPTY_2":0,"__EMPTY_3":0,"__EMPTY_4":0,"__EMPTY_5":0,"fobiddenCharactor":0,"victoryInfoInUI":0,"loseInfoInUI":0,"starInfoInUI":0,"cost":0,"recommendedPower":0,"previousGk":0},{"eventID":6,"eventType":2,"quality":1,"name":"答题*经验书","sSpineInUI":0,"rScriptId":0,"winReward":0,"loseReward":0,"suitLevel":"1&20","warId":0,"__EMPTY":0,"__EMPTY_1":0,"__EMPTY_2":0,"__EMPTY_3":0,"__EMPTY_4":0,"__EMPTY_5":0,"fobiddenCharactor":0,"victoryInfoInUI":0,"loseInfoInUI":0,"starInfoInUI":0,"cost":0,"recommendedPower":0,"previousGk":0},{"eventID":7,"eventType":3,"quality":1,"name":"山贼拦路*待定","sSpineInUI":0,"rScriptId":0,"winReward":0,"loseReward":0,"suitLevel":"1&20","warId":2001,"__EMPTY":0,"__EMPTY_1":0,"__EMPTY_2":0,"__EMPTY_3":0,"__EMPTY_4":0,"__EMPTY_5":0,"fobiddenCharactor":0,"victoryInfoInUI":0,"loseInfoInUI":0,"starInfoInUI":0,"cost":0,"recommendedPower":0,"previousGk":0},{"eventID":8,"eventType":3,"quality":1,"name":"救援村落*待定","sSpineInUI":0,"rScriptId":0,"winReward":0,"loseReward":0,"suitLevel":"1&20","warId":2002,"__EMPTY":0,"__EMPTY_1":0,"__EMPTY_2":0,"__EMPTY_3":0,"__EMPTY_4":0,"__EMPTY_5":0,"fobiddenCharactor":0,"victoryInfoInUI":0,"loseInfoInUI":0,"starInfoInUI":0,"cost":0,"recommendedPower":0,"previousGk":0},{"eventID":9,"eventType":3,"quality":1,"name":"比武切磋*待定","sSpineInUI":0,"rScriptId":0,"winReward":0,"loseReward":0,"suitLevel":"1&20","warId":2003,"__EMPTY":0,"__EMPTY_1":0,"__EMPTY_2":0,"__EMPTY_3":0,"__EMPTY_4":0,"__EMPTY_5":0,"fobiddenCharactor":0,"victoryInfoInUI":0,"loseInfoInUI":0,"starInfoInUI":0,"cost":0,"recommendedPower":0,"previousGk":0}]

shared/resource/dic_zyz_gk_daily.json

@@ -0,0 +1 @@
+[{"war_id":3001,"dispatchJsonId":3001,"bg_img_id":3001,"script_id":0,"fixReward":"&","conditionReward":"&","RandomReward":"&","warType":4,"gk_name":"每日&护送商人","kingExp":100,"lvLimted":10,"turnLimted":20,"forcedCharactor":"&","fobiddenCharactor":"&","victoryInfoInUI":"商人到达安全地区","loseInfoInUI":"商人死亡\n我方全部阵亡","starInfoInUI":"无","cost":15,"sSpineInUI":"1&daobing|1&gongbing","detailUIBg":"zhending","recommendedPower":10008,"previousGk":0,"dailyType":1},{"war_id":3002,"dispatchJsonId":3002,"bg_img_id":3002,"script_id":0,"fixReward":"&","conditionReward":"&","RandomReward":"&","warType":4,"gk_name":"每日&护送商人","kingExp":100,"lvLimted":10,"turnLimted":20,"forcedCharactor":"&","fobiddenCharactor":"&","victoryInfoInUI":"商人到达安全地区","loseInfoInUI":"商人死亡\n我方全部阵亡","starInfoInUI":"无","cost":15,"sSpineInUI":"1&daobing|1&gongbing","detailUIBg":"zhending","recommendedPower":10008,"previousGk":3001,"dailyType":1},{"war_id":3003,"dispatchJsonId":3003,"bg_img_id":3003,"script_id":0,"fixReward":"&","conditionReward":"&","RandomReward":"&","warType":4,"gk_name":"每日&护送商人","kingExp":100,"lvLimted":10,"turnLimted":20,"forcedCharactor":"&","fobiddenCharactor":"&","victoryInfoInUI":"商人到达安全地区","loseInfoInUI":"商人死亡\n我方全部阵亡","starInfoInUI":"无","cost":15,"sSpineInUI":"1&daobing|1&gongbing","detailUIBg":"zhending","recommendedPower":10008,"previousGk":3002,"dailyType":1},{"war_id":3004,"dispatchJsonId":3004,"bg_img_id":3004,"script_id":0,"fixReward":"&","conditionReward":"&","RandomReward":"&","warType":4,"gk_name":"每日&护送商人","kingExp":100,"lvLimted":10,"turnLimted":20,"forcedCharactor":"&","fobiddenCharactor":"&","victoryInfoInUI":"商人到达安全地区","loseInfoInUI":"商人死亡\n我方全部阵亡","starInfoInUI":"无","cost":15,"sSpineInUI":"1&daobing|1&gongbing","detailUIBg":"zhending","recommendedPower":10008,"previousGk":3003,"dailyType":1},{"war_id":3005,"dispatchJsonId":3005,"bg_img_id":3005,"script_id":0,"fixReward":"&","conditionReward":"&","RandomReward":"&","warType":4,"gk_name":"每日&护送商人","kingExp":100,"lvLimted":10,"turnLimted":20,"forcedCharactor":"&","fobiddenCharactor":"&","victoryInfoInUI":"商人到达安全地区","loseInfoInUI":"商人死亡\n我方全部阵亡","starInfoInUI":"无","cost":15,"sSpineInUI":"1&daobing|1&gongbing","detailUIBg":"zhending","recommendedPower":10008,"previousGk":3004,"dailyType":1}]

shared/resource/dic_zyz_gk_event.json

@@ -0,0 +1 @@
+[{"war_id":2001,"dispatchJsonId":2001,"bg_img_id":2001,"script_id":0,"fixReward":"&","warType":4,"gk_name":"奇遇&拦路山贼","kingExp":100,"lvLimted":1,"turnLimted":20,"forcedCharactor":"&","fobiddenCharactor":"&","victoryInfoInUI":"消失所有敌军","loseInfoInUI":"我方全部阵亡","cost":15,"recommendedPower":10008},{"war_id":2002,"dispatchJsonId":2002,"bg_img_id":2002,"script_id":0,"fixReward":"&","warType":4,"gk_name":"奇遇&比武切磋","kingExp":100,"lvLimted":1,"turnLimted":20,"forcedCharactor":"&","fobiddenCharactor":"&","victoryInfoInUI":"消失所有敌军","loseInfoInUI":"我方全部阵亡","cost":15,"recommendedPower":10008},{"war_id":2003,"dispatchJsonId":0,"bg_img_id":0,"script_id":0,"fixReward":0,"warType":0,"gk_name":0,"kingExp":0,"lvLimted":0,"turnLimted":0,"forcedCharactor":0,"fobiddenCharactor":0,"victoryInfoInUI":0,"loseInfoInUI":0,"cost":0,"recommendedPower":0}]

shared/resource/dic_zyz_gk_mainElite.json

@@ -0,0 +1 @@
+[{"war_id":9001,"dispatchJsonId":9001,"bg_img_id":107,"script_id":9001,"fixReward":"&","conditionReward":"&","RandomReward":"&","warType":12,"gk_name":"第一章&真定之战(精英)","kingExp":100,"lvLimted":3,"turnLimted":30,"forcedCharactor":"&","fobiddenCharactor":"&","victoryInfoInUI":"消灭所有敌军","loseInfoInUI":"我方全部阵亡","starInfoInUI":"1.我方无人阵亡；\n2.在5回合内获得胜利","cost":3,"sSpineInUI":"1&daobing|1&gongbing|2&lidian","recommendedPower":20000,"previousGk":107,"relatednormalGk":107}]