From 262fd27218fbc6fc86df400e86c8035818d2b859 Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 12 Mar 2021 16:40:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=B8=BF=E8=92=99=E9=98=B5,=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E7=AA=81=E7=A0=B4=E9=97=AE=E9=A2=98?= 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 | 10 ++++++++-- .../java/com/ljsd/jieling/logic/hero/HeroLogic.java | 2 +- 2 files changed, 9 insertions(+), 3 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 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(); }