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

game-server/app/servers/role/handler/heroHandler.ts

@@ -1,7 +1,7 @@
 import { Application, BackendSession, ChannelService } from 'pinus';
 import { handleCost, addItems, unlockFigure, createHero } from '../../../services/rewardService';
 import { calPlayerCeAndSave, calAllHeroCe } from '../../../services/playerCeService';
-import { resResult, returnHeroCeRatio, deepCopy } from '../../../pubUtils/util';
+import { resResult, deepCopy } from '../../../pubUtils/util';
 import { STATUS } from '../../../consts/statusCode';
 import { HeroModel, Connect } from '../../../db/Hero';
 import { CURRENCY_BY_TYPE, CURRENCY_TYPE, CONSUME_TYPE, HERO_GROW_MAX, HERO_SYSTEM_TYPE, ABI_STAGE, DEBUG_MAGIC_WORD, HERO_INITIAL_QUALITY, REDIS_KEY, TASK_TYPE } from '../../../consts';
@@ -14,8 +14,6 @@ import { pushComposeOrangeHero, pushHeroQualityUpMsg, pushHeroStarMax, pushHeroW
 import { calculatetopLineup } from '../../../pubUtils/playerCe';
 import { PvpDefenseModel } from '../../../db/PvpDefense';
 import { Attribute } from '../../../domain/roleField/attribute';
-import { nowSeconds } from '../../../pubUtils/timeUtil';
-import { Rank } from '../../../services/rankService';
 import { checkTaskWithHero, checkTask } from '../../../services/taskService';
 
 export default function (app: Application) {
@@ -26,8 +24,6 @@ export class HeroHandler {
     constructor(private app: Application) {
     }
 
-    private channelService: ChannelService = this.app.get('channelService');
-
     public async test(msg: {}, session: BackendSession) {
         let roles = await RoleModel.find({}).lean();
         for (let role of roles) {

game-server/app/servers/role/handler/roleHandler.ts

@@ -1,5 +1,5 @@
 import { STATUS } from '../../../consts/statusCode';
-import Role, { RoleModel } from './../../../db/Role';
+import { RoleModel } from './../../../db/Role';
 import { HeroModel } from '../../../db/Hero';
 import { resResult, decodeIdCntArrayStr, parseGoodStr } from '../../../pubUtils/util';
 import { Application, BackendSession, pinus } from 'pinus';
@@ -19,7 +19,6 @@ import { updateUserInfo } from '../../../services/redisService';
 import { checkTaskWithHero, checkTask, checkTaskWithArgs } from '../../../services/taskService';
 import { accomplishTask } from '../../../pubUtils/taskUtil';
 import { getGoldObject, getCoinObject } from '../../../pubUtils/itemUtils';
-import { getWarById } from '../../../pubUtils/gamedata';
 import { RScriptRecordModel } from '../../../db/RScriptRecord';
 
 export default function (app: Application) {
@@ -60,7 +59,7 @@ export class RoleHandler {
         role = await RoleModel.updateRoleInfo(roleId, { hasInit: true, roleName })
 
         let battleId = SCRIPT.SCRIPT_BATTLE_ID;
-        let warInfo = getWarById(battleId);
+        let warInfo = gameData.war.get(battleId);
         await RScriptRecordModel.setScript(roleId, battleId, warInfo.warType, 2, SCRIPT.SCRIPT_NAME);
 
         return resResult(STATUS.SUCCESS, {

game-server/app/servers/role/handler/taskHandler.ts

@@ -1,5 +1,5 @@
 import { Application, BackendSession, pinus } from "pinus";
-import { resResult, parseGoodStr, getRandEelm } from "../../../pubUtils/util";
+import { resResult, parseGoodStr, getRandSingleEelm } from "../../../pubUtils/util";
 import { STATUS, TASK_FUN_TYPE } from "../../../consts";
 import { gameData } from "../../../pubUtils/data";
 import { UserTaskRecModel } from "../../../db/UserTaskRec";
@@ -7,7 +7,7 @@ import { addItems } from "../../../services/rewardService";
 import { UserTaskModel } from "../../../db/UserTask";
 import { getCurWeekDate, nowSeconds } from "../../../pubUtils/timeUtil";
 import { DicDailyTask, DicAchievement, DicMainTask } from "../../../pubUtils/dictionary/DicTask";
-import { getMainTask, refDailyTaskBox, removeHistoryTask, getDailyTask, getCurTask, checkTask } from "../../../services/taskService";
+import { getMainTask, refDailyTaskBox, removeHistoryTask, getCurTask, checkTask } from "../../../services/taskService";
 import { TASK } from "../../../pubUtils/dicParam";
 
 export default function(app: Application) {
@@ -194,7 +194,7 @@ export class ShopHandler {
         for(let [_id, task] of gameData.tasks.get(type)) {
             tasks.push(task);
         }
-        let task = getRandEelm(tasks, 1)[0];
+        let task = getRandSingleEelm(tasks);
         await checkTask(roleId, sid, [1,2,3,4,5], task.taskType, task.condition, false, { isDebug: true });
         return resResult(STATUS.SUCCESS, {
             task