From eb1fba0c1fed30d92b8fa785039112ac48221cae Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 29 Jan 2019 10:16:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E6=95=88=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/hero/HeroLogic.java | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) 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 c1f6e291b..4f574dd32 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 @@ -221,16 +221,20 @@ public class HeroLogic { int oldLevel = hero.getLevel(); //判断需要进行升级还是进行突破 Map scHeroRankUpConfigByType = SCHeroRankUpConfig.getScHeroRankUpConfigByType(GlobalsDef.BREAK_TYPE,scHero.getStar()); - SCHeroRankUpConfig scHeroRankUpConfig = scHeroRankUpConfigByType.get(oldLevel); + SCHeroRankUpConfig scHeroRankUpConfig = null; + if(scHeroRankUpConfigByType!=null){ + scHeroRankUpConfig = scHeroRankUpConfigByType.get(oldLevel); + if(scHeroRankUpConfig!=null ){ + if(hero.getStar() < scHeroRankUpConfig.getLimitStar()){ + MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.UP_HERO_LEVEL_RESPONSE_VALUE,"max level"); + return; + } + } + } boolean isBreak =false; int[][] consume; int breakId = hero.getBreakId(); - if(scHeroRankUpConfig!=null ){ - if(hero.getStar() < scHeroRankUpConfig.getLimitStar()){ - MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.UP_HERO_LEVEL_RESPONSE_VALUE,"max level"); - return; - } - } + if(scHeroRankUpConfig!=null && breakId!=scHeroRankUpConfig.getId()){ isBreak =true; consume = scHeroRankUpConfig.getConsumeMaterial(); @@ -257,7 +261,7 @@ public class HeroLogic { } Map heroAllAttribute = calHeroAllAttribute(hero); for(Map.Entry item : heroAllAttribute.entrySet() ){ - LOGGER.info("the hero={},the attID is={},attValue={}",hero.getTemplateId(),item.getKey(),item.getValue() ); + LOGGER.info("the heroTdd={},the heroLevel={},the attID is={},attValue={}",hero.getTemplateId(),hero.getLevel(),item.getKey(),item.getValue() ); } //发送成功消息 @@ -407,7 +411,6 @@ public class HeroLogic { } private Map getParaForHero(Hero hero){ - System.out.println(hero.getTemplateId()); Map result = new HashMap<>(2); SCHero scHero = SCHero.getsCHero().get(hero.getTemplateId()); float rankupPara =0.0f; @@ -521,6 +524,8 @@ public class HeroLogic { hero.updateEquipPositionMap(position,equipId); + LOGGER.info("the heroTid={},the force={}",calHeoForce(user,hero)); + //发送成功消息 MessageUtil.sendMessage(session,1,MessageTypeProto.MessageType.EQUIP_WEAR_REQUEST_VALUE,null,true);