diff --git a/game-server/app/servers/battle/handler/pvpHandler.ts b/game-server/app/servers/battle/handler/pvpHandler.ts index 8d847f79a..80cb06647 100644 --- a/game-server/app/servers/battle/handler/pvpHandler.ts +++ b/game-server/app/servers/battle/handler/pvpHandler.ts @@ -148,7 +148,7 @@ export class PvpHandler { // 刷新次数及消耗 let { refOppCnt, refOppTime, consume } = getRefOppCnt(pvpDefense.refOppCnt, pvpDefense.refOppTime); - if (refOppCnt >= gameData.maxPvpRefreshCnt) { + if (refOppCnt >= gameData.maxPvpRefreshCnt.max) { return resResult(STATUS.PVP_REFRESH_CNT_REACH_MAX); } diff --git a/game-server/app/servers/role/handler/heroHandler.ts b/game-server/app/servers/role/handler/heroHandler.ts index 5ab4bb11c..6a428ca28 100644 --- a/game-server/app/servers/role/handler/heroHandler.ts +++ b/game-server/app/servers/role/handler/heroHandler.ts @@ -512,7 +512,8 @@ export class HeroHandler { let { favourLv: oldLv, favour: oldExp } = hero; - let maxLv = gameData.maxFriendShipLv; // 好感度最大等级 + let maxLv = gameData.maxFriendShipLv.max; // 好感度最大等级 + console.log(maxLv) if (maxLv <= oldLv) return resResult(STATUS.HERO_FAVOUR_LEVEL_REACH_MAXT); diff --git a/game-server/app/servers/role/handler/roleHandler.ts b/game-server/app/servers/role/handler/roleHandler.ts index e1541859a..3d79ad853 100644 --- a/game-server/app/servers/role/handler/roleHandler.ts +++ b/game-server/app/servers/role/handler/roleHandler.ts @@ -344,7 +344,7 @@ export class RoleHandler { update.scrollColorStar = 0; // 获取一定好感度 - let maxLv = gameData.maxFriendShipLv; + let maxLv = gameData.maxFriendShipLv.max; if (maxLv > favourLv) { update.favour += SCROLL.SCROLL_ACTIVE_FAVOUR; diff --git a/game-server/app/services/normalBattleService.ts b/game-server/app/services/normalBattleService.ts index 2845039ee..73ff0b916 100644 --- a/game-server/app/services/normalBattleService.ts +++ b/game-server/app/services/normalBattleService.ts @@ -14,7 +14,7 @@ export async function roleLevelup(roleId: string, kingExp: number, session: Back const serverId = session.get('serverId'); let role = await RoleModel.findByRoleId(roleId); let { lv = 1, exp = 0 } = role; - let canGetExp = lv < gameData.maxPlayerLv; // 当主公超过最大级后,挑战结算不再获得经验值 + let canGetExp = lv < gameData.maxPlayerLv.max; // 当主公超过最大级后,挑战结算不再获得经验值 let newExp = canGetExp ? exp + kingExp : exp; let newLv = getLvByExp(newExp); // 等级超过最高级之后,经验依然可以稍微溢出一些,以备下一次提升等级 diff --git a/shared/pubUtils/data.ts b/shared/pubUtils/data.ts index 7bdfc3065..20e353c69 100644 --- a/shared/pubUtils/data.ts +++ b/shared/pubUtils/data.ts @@ -448,7 +448,7 @@ export function getPvpBoxs() { } export function getResultMaxRank() { - return gameData.pvpRankMax; + return gameData.pvpRankMax.max; } export function getStructureConsume(structureId: number, level: number) { diff --git a/shared/pubUtils/dictionary/DicFriendShipLevel.ts b/shared/pubUtils/dictionary/DicFriendShipLevel.ts index 6fff576f2..7f405ddcc 100644 --- a/shared/pubUtils/dictionary/DicFriendShipLevel.ts +++ b/shared/pubUtils/dictionary/DicFriendShipLevel.ts @@ -13,7 +13,7 @@ export interface DicFriendShipLevel { readonly expSum: number; } -export let maxFriendShipLv = 0; +export const maxFriendShipLv = { max: 0 }; export const dicFriendShipLevelMap = new Map(); export function loadFriendShipLevel() { @@ -23,7 +23,7 @@ export function loadFriendShipLevel() { expSum += o.exp; o.expSum = expSum; dicFriendShipLevelMap.set(o.level, o); - if(o.level > maxFriendShipLv) maxFriendShipLv = o.level; + if(o.level > maxFriendShipLv.max) maxFriendShipLv.max = o.level; }); arr = undefined; } \ No newline at end of file diff --git a/shared/pubUtils/dictionary/DicKingExp.ts b/shared/pubUtils/dictionary/DicKingExp.ts index 1638f4b44..9e5134f36 100644 --- a/shared/pubUtils/dictionary/DicKingExp.ts +++ b/shared/pubUtils/dictionary/DicKingExp.ts @@ -10,7 +10,7 @@ export interface DicKingExp { } export const dicKingExp = new Map(); -export let maxPlayerLv = 0; +export const maxPlayerLv = { max: 0 }; export function loadKingExp() { @@ -18,7 +18,7 @@ export function loadKingExp() { let exp = 0; arr.forEach(o => { exp += o.exp; - if(o.level > maxPlayerLv) maxPlayerLv = o.level; + if(o.level > maxPlayerLv.max) maxPlayerLv.max = o.level; dicKingExp.set(o.level, { sum: exp, cur: o.exp }); }); arr = null; diff --git a/shared/pubUtils/dictionary/DicPvpRankReward.ts b/shared/pubUtils/dictionary/DicPvpRankReward.ts index 861788d55..d835a5dcf 100644 --- a/shared/pubUtils/dictionary/DicPvpRankReward.ts +++ b/shared/pubUtils/dictionary/DicPvpRankReward.ts @@ -12,14 +12,14 @@ export interface DicRankRewads { export const dicRankRewads = new Array(); -export let dicRankMax: DicRankRewads; +export const dicRankMax: { max: DicRankRewads } = { max: undefined }; export function loadPvpRankReward() { let arr = readFileAndParse(FILENAME.DIC_PVP_RANK_REWARD); arr.forEach(o => { o.reward = parseGoodStr(o.reward); - if (!dicRankMax||o.min > dicRankMax.min) { - dicRankMax = o; + if (!dicRankMax.max||o.min > dicRankMax.max.min) { + dicRankMax.max = o; } dicRankRewads.push(o); }); diff --git a/shared/pubUtils/dictionary/DicPvpRefreshConsume.ts b/shared/pubUtils/dictionary/DicPvpRefreshConsume.ts index 88c6c4615..2e401e371 100644 --- a/shared/pubUtils/dictionary/DicPvpRefreshConsume.ts +++ b/shared/pubUtils/dictionary/DicPvpRefreshConsume.ts @@ -13,14 +13,14 @@ export interface DicPvpRefreshConsume { } export const dicPvpRefreshConsume = new Map(); -export let maxPvpRefreshCnt = 0; +export const maxPvpRefreshCnt = { max: 0 }; export function loadPvpRefreshConsume() { let arr = readFileAndParse(FILENAME.DIC_PVP_REFRESH_CONSUME); arr.forEach(o => { o.consume = parseGoodStr(o.consume); - if(o.count > maxPvpRefreshCnt) maxPvpRefreshCnt = o.count; + if(o.count > maxPvpRefreshCnt.max) maxPvpRefreshCnt.max = o.count; dicPvpRefreshConsume.set(o.count, o.consume); }); diff --git a/shared/pubUtils/dictionary/DicStructure.ts b/shared/pubUtils/dictionary/DicStructure.ts index 7971c08d3..783251b26 100644 --- a/shared/pubUtils/dictionary/DicStructure.ts +++ b/shared/pubUtils/dictionary/DicStructure.ts @@ -156,7 +156,7 @@ export const dicTrainBase = new Map(); // 练兵场 export const dicDonateBase = new Map(); // 捐献所 export const dicWishPoolBase = new Map(); // 许愿池 export const dicStoreBase = new Map(); // 许愿池 -export let maxMemberCnt = 0; // 满配最大人数 +export const maxMemberCnt = { max: 0 }; // 满配最大人数 export function loadStructure() { @@ -169,7 +169,7 @@ export function loadStructure() { let arrCenter = readFileAndParse(FILENAME.DIC_GUILD_STRUCTURE_CENTER); arrCenter.forEach(o => { setStructureConsume(o); - if(o.peopleNum > maxMemberCnt) maxMemberCnt = o.peopleNum; + if(o.peopleNum > maxMemberCnt.max) maxMemberCnt.max = o.peopleNum; dicCenterBase.set(o.level, _.pick(o, Object.keys(DicCenterKeys))); }); arrCenter = undefined;