diff --git a/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java b/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java index fdc5861f2..255754601 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java @@ -155,6 +155,7 @@ public enum ErrorCode implements IErrorCode { HAD_TAKE(125, "已领取"), NOT_IN_TAKE_TIME(126, "不在领取期间"), USER_LEVE_DOWN(127,"玩家等级不够"), + HAS_AWAKE(130,"已达最大星级"), SERVER_DEFINE_SELF(20000,"操作失败") ; 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 9266da008..d74d144e1 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 @@ -905,6 +905,9 @@ public class HeroLogic{ int oldStar = targetHero.getStar(); SCHero scHero = SCHero.getsCHero().get(targetHero.getTemplateId()); + if (targetHero.getStar() >= scHero.getMaxRank()) { + throw new ErrorCodeException(ErrorCode.HAS_AWAKE); + } int[] growthSwitch = scHero.getGrowthSwitch(); if(growthSwitch!=null&&growthSwitch.length>0){ Set operateSet= Arrays.stream(growthSwitch).boxed().collect(Collectors.toSet()); @@ -1035,7 +1038,7 @@ public class HeroLogic{ // 觉醒飘字 if (targetHero.getStar() >= SSpecialConfig.getIntegerValue(SSpecialConfig.lamp_awaken_hero_content_parm)) { String message = SErrorCodeEerverConfig.getI18NMessage("animal_awaken_broadcast_content", new Object[]{user.getPlayerInfoManager().getNickName(), scHero.getReadingName()}); - ChatLogic.getInstance().sendSysChatMessage(message, Global.DILIGENT, targetHero.getTemplateId(), 0, 0, 0, 0, 1); + ChatLogic.getInstance().sendSysChatMessage(message, Global.DILIGENT, targetHero.getTemplateId(), 0, 0, 0, 0, 0); } else if (targetHero.getStar() >= SSpecialConfig.getIntegerValue(SSpecialConfig.lamp_rankup_hero_content_parm)) { String message = SErrorCodeEerverConfig.getI18NMessage("lamp_rankup_hero_content", new Object[]{user.getPlayerInfoManager().getNickName(), scHero.getReadingName(), targetHero.getStar()}); ChatLogic.getInstance().sendSysChatMessage(message, Global.DILIGENT, targetHero.getTemplateId(), 0, 0, 0, 0, 0);