全局：加载json方法全部改为最新

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

@@ -1,7 +1,6 @@
 import { Application, BackendSession } from 'pinus';
 import { BattleRecordModel } from '../../../db/BattleRecord';
 import { BattleSweepRecordModel } from '../../../db/BattleSweepRecord';
-import { getWarById,  } from '../../../pubUtils/gamedata';
 import { genCode } from '../../../pubUtils/util';
 import { WAR_TYPE, EVENT_STATUS, FUNC_OPT_TYPE, MSG_SOURCE, REDIS_KEY, TASK_TYPE } from '../../../consts';
 import { checkDaily, checkDailyAndIncrease } from '../../../services/dailyBattleService';
@@ -35,14 +34,10 @@ export class NormalBattleHandler {
         const { battleId, heroes: seqIds = [] } = msg;
         let roleId = session.get('roleId');
         let roleName = session.get('roleName');
-        let warInfo = getWarById(battleId);
+        let warInfo = gameData.war.get(battleId);
         if(!warInfo) {
             return resResult(STATUS.BATTLE_MISS_INFO);
         }
-        if(!warInfo.hasOwnProperty('cost')) {
-            warInfo['cost'] = 0;
-        }
-
         let apJson = await getAp(Date.now(), roleId);
         let {ap} = apJson;
         if(ap < warInfo.cost) {
@@ -289,7 +284,7 @@ export class NormalBattleHandler {
         let roleName = session.get('roleName');
         let sid = session.get('sid');
         let funcs: number[] = session.get('funcs');
-        let warInfo = getWarById(battleId);
+        let warInfo = gameData.war.get(battleId);
         if(!warInfo) {
             return resResult(STATUS.BATTLE_MISS_INFO);
         }
@@ -301,9 +296,6 @@ export class NormalBattleHandler {
         }
 
         // 扣体力
-        if(!warInfo.hasOwnProperty('cost')) {
-            warInfo['cost'] = 0;
-        }
         const now = Date.now(); // 当前时间戳
         let apJson = await setAp(now, roleId, sid, funcs, -1 * warInfo.cost * count); // 扣除体力
         if(!apJson) {
@@ -359,7 +351,7 @@ export class NormalBattleHandler {
 
         const { battleId, type, script } = msg;
         let roleId = session.get('roleId');
-        let warInfo = getWarById(battleId);
+        let warInfo = gameData.war.get(battleId);
         let result = await RScriptRecordModel.setScript(roleId, battleId, warInfo.warType, type, script);
         if(result) {
             if(!result.scriptBefore) result.scriptBefore = '';