Merge branch 'master_test_hw' into master_test_hw_monsterActivity

lvxinran 2020-11-16 20:21:10 +08:00
commit 3a9dd33fe9
2 changed files with 5 additions and 1 deletions

View File

@ -155,6 +155,7 @@ public enum ErrorCode implements IErrorCode {
HAD_TAKE(125, "已领取"), HAD_TAKE(125, "已领取"),
NOT_IN_TAKE_TIME(126, "不在领取期间"), NOT_IN_TAKE_TIME(126, "不在领取期间"),
USER_LEVE_DOWN(127,"玩家等级不够"), USER_LEVE_DOWN(127,"玩家等级不够"),
HAS_AWAKE(130,"已达最大星级"),
SERVER_DEFINE_SELF(20000,"操作失败") SERVER_DEFINE_SELF(20000,"操作失败")
; ;

View File

@ -905,6 +905,9 @@ public class HeroLogic{
int oldStar = targetHero.getStar(); int oldStar = targetHero.getStar();
SCHero scHero = SCHero.getsCHero().get(targetHero.getTemplateId()); SCHero scHero = SCHero.getsCHero().get(targetHero.getTemplateId());
if (targetHero.getStar() >= scHero.getMaxRank()) {
throw new ErrorCodeException(ErrorCode.HAS_AWAKE);
}
int[] growthSwitch = scHero.getGrowthSwitch(); int[] growthSwitch = scHero.getGrowthSwitch();
if(growthSwitch!=null&&growthSwitch.length>0){ if(growthSwitch!=null&&growthSwitch.length>0){
Set<Integer> operateSet= Arrays.stream(growthSwitch).boxed().collect(Collectors.toSet()); Set<Integer> 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)) { 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()}); 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)) { } 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()}); 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); ChatLogic.getInstance().sendSysChatMessage(message, Global.DILIGENT, targetHero.getTemplateId(), 0, 0, 0, 0, 0);