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 868d32929..2be789997 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 @@ -274,8 +274,14 @@ public class Hero extends MongoBase { */ public int getBreakIdByHongMeng(HeroManager heroManager){ // 英雄在共鸣池中 - if (heroManager.getResonances().values().contains(id) || heroManager.getHongmengGuards().values().contains(id)) { - return HeroLogic.getInstance().calRobotBreaByLevel(templateId, getLevel(heroManager)); + if (heroManager.getHongmengTablet() > 0){ + if (heroManager.getResonances().values().contains(id) || heroManager.getHongmengGuards().values().contains(id)) { + return HeroLogic.getInstance().calRobotBreaByLevel(templateId, getLevel(heroManager)); + } + }else{ + if (heroManager.getResonances().values().contains(id)) { + return HeroLogic.getInstance().calRobotBreaByLevel(templateId, getLevel(heroManager)); + } } return breakId; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index f351aa523..9a6cb42b2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -1295,7 +1295,7 @@ public class HeroLogic{ for (int i = 0; i < list.size(); i++) { Map.Entry entry = list.get(i); SCHeroRankUpConfig value = entry.getValue(); - if (heroLevel >= value.getOpenLevel()){ + if (heroLevel >= value.getLimitLevel()){ return value.getId(); }