From 6084f9aa96c2ad71885a2273da914d3d719a6291 Mon Sep 17 00:00:00 2001 From: duhui Date: Tue, 5 Jan 2021 12:15:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=B8=BF=E8=92=99=E9=98=B52.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/dao/Hero.java | 23 ++++++++++++------- .../java/config/SErrorCodeEerverConfig.java | 5 ++++ 2 files changed, 20 insertions(+), 8 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 a27856d0c..6694c6031 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 @@ -162,19 +162,26 @@ public class Hero extends MongoBase { * @return */ public int getLevel(HeroManager heroManager) { + // 英雄 配置表信息 + SCHero scHero = SCHero.getsCHero().get(templateId); + SCHeroRankUpConfig config = STableManager.getConfig(SCHeroRankUpConfig.class).get(scHero.getMaxRank()); + // 如果鸿蒙碑开启 返回鸿蒙系统中神将返回鸿蒙碑等级 - if (heroManager.getHongmengTablet() > 0 && (heroManager.getResonances().values().contains(id) || - heroManager.getHongmengGuards().values().contains(id))) { - return heroManager.getHongmengTablet(); + if (heroManager.getHongmengTablet() > 0){ + // 存在共鸣或者使者 + if (heroManager.getResonances().values().contains(id) ||heroManager.getHongmengGuards().values().contains(id)) { + // 鸿蒙碑超过等级上限,返回鸿蒙碑等级 + if (heroManager.getHongmengTablet() <= config.getOpenLevel()){ + return heroManager.getHongmengTablet(); + } + // 最高品质大于等于10的英雄,返回鸿蒙碑等级,否则返回上限等级 + return scHero.getMaxRank() >= 10?heroManager.getHongmengTablet():config.getOpenLevel(); + } } if (heroManager.getResonances().values().contains(id)) { - // 模板,取装备 + // 模板 HongMengAddAttribute hongMengAddAttribute = heroManager.getResonanceAddition().get(HongMengAttributeEnum.LEVEL); if (hongMengAddAttribute != null) { - - SCHero scHero = SCHero.getsCHero().get(templateId); - - SCHeroRankUpConfig config = STableManager.getConfig(SCHeroRankUpConfig.class).get(scHero.getMaxRank()); // 是否达到限制等级 return hongMengAddAttribute.value >= config.getOpenLevel() ? config.getOpenLevel():hongMengAddAttribute.value; } diff --git a/tablemanager/src/main/java/config/SErrorCodeEerverConfig.java b/tablemanager/src/main/java/config/SErrorCodeEerverConfig.java index 1bcd22847..503caa7dd 100644 --- a/tablemanager/src/main/java/config/SErrorCodeEerverConfig.java +++ b/tablemanager/src/main/java/config/SErrorCodeEerverConfig.java @@ -16,6 +16,7 @@ public class SErrorCodeEerverConfig implements BaseConfig { private String value; + private String englishValue; @Override public void init() throws Exception { @@ -41,6 +42,10 @@ public class SErrorCodeEerverConfig implements BaseConfig { return value; } + public String getEnglishValue() { + return englishValue; + } + public static String getI18NMessage(String key){ String value = errorCodeMap.get(key); if (value == null) {