From 60231a23a55ba3aedde1804eeaf94547815283c3 Mon Sep 17 00:00:00 2001 From: duhui Date: Thu, 25 Feb 2021 11:11:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=B8=BF=E8=92=99=E9=98=B5=EF=BC=8C=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E6=9C=80=E5=A4=A7=E6=98=9F=E7=BA=A7=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=9C=80=E5=A4=A7=E7=AD=89=E7=BA=A7=EF=BC=8C=E8=B5=B0=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/dao/Hero.java | 8 ++++---- tablemanager/src/main/java/config/SCHero.java | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java index 15851254d..868d32929 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java @@ -165,18 +165,18 @@ public class Hero extends MongoBase { public int getLevel(HeroManager heroManager) { // 英雄 配置表信息 SCHero scHero = SCHero.getsCHero().get(templateId); - SCHeroRankUpConfig config = STableManager.getConfig(SCHeroRankUpConfig.class).get(scHero.getMaxRank()); + int maxLevel = scHero.getMaxLevel(); // 如果鸿蒙碑开启 返回鸿蒙系统中神将返回鸿蒙碑等级 if (heroManager.getHongmengTablet() > 0){ // 存在共鸣或者使者 if (heroManager.getResonances().values().contains(id) || heroManager.getHongmengGuards().values().contains(id)) { // 鸿蒙碑超过等级上限,返回鸿蒙碑等级 - if (heroManager.getHongmengTablet() <= config.getOpenLevel()){ + if (heroManager.getHongmengTablet() <= maxLevel){ return heroManager.getHongmengTablet(); } // 最高品质大于等于10的英雄,返回鸿蒙碑等级,否则返回上限等级 - return scHero.getMaxRank() >= 10?heroManager.getHongmengTablet():config.getOpenLevel(); + return scHero.getMaxRank() >= 10?heroManager.getHongmengTablet():maxLevel; } } if (heroManager.getResonances().values().contains(id)) { @@ -184,7 +184,7 @@ public class Hero extends MongoBase { HongMengAddAttribute hongMengAddAttribute = heroManager.getResonanceAddition().get(HongMengAttributeEnum.LEVEL); if (hongMengAddAttribute != null) { // 是否达到限制等级 - return hongMengAddAttribute.value >= config.getOpenLevel() ? config.getOpenLevel():hongMengAddAttribute.value; + return hongMengAddAttribute.value >= maxLevel ? maxLevel:hongMengAddAttribute.value; } } return level; diff --git a/tablemanager/src/main/java/config/SCHero.java b/tablemanager/src/main/java/config/SCHero.java index 97c3ddac0..85a58e83e 100644 --- a/tablemanager/src/main/java/config/SCHero.java +++ b/tablemanager/src/main/java/config/SCHero.java @@ -58,6 +58,8 @@ public class SCHero implements BaseConfig{ private int job; + private int maxLevel; + private Map secondaryFactorMap; private Map> skillListByStar; @@ -342,4 +344,8 @@ public class SCHero implements BaseConfig{ public int getJob() { return job; } + + public int getMaxLevel() { + return maxLevel; + } }