From 65d1405b13d0138da436ebf0e86a48ecefc2ab90 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 8 Oct 2019 16:30:00 +0800 Subject: [PATCH] hero lock & fix msg --- .../com/ljsd/jieling/config/SHeroReturn.java | 24 +++++++++---------- .../ljsd/jieling/logic/hero/HeroLogic.java | 4 ++-- .../java/com/ljsd/jieling/util/ItemUtil.java | 2 +- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SHeroReturn.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SHeroReturn.java index c8bb78290..3c8f5d436 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SHeroReturn.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SHeroReturn.java @@ -37,20 +37,18 @@ public class SHeroReturn implements BaseConfig { } Map sHeroReturnMapByStar = sheroReturnMapTmp.get(heroId); int star = sHeroReturn.getStar(); - if(sHeroReturnMapByStar.containsKey(star)){ - int[] rankupReturn = sHeroReturn.getRankupReturn(); - int[][] returnHero = sHeroReturn.getReturnHero(); - int length = 1 + returnHero.length ; - int[][] returnMaterialsTmp = new int[length][]; - for(int i=0;i heroList = new ArrayList<>(1); heroList.add(heroId); String err = ItemLogic.getInstance().checkHeroResolve(heroList, user); - if("".equals(err)){ + if(!"".equals(err)){ MessageUtil.sendErrorResponse(session,0,responseMsgId,err); return; } @@ -2084,7 +2084,7 @@ public class HeroLogic { int star = hero.getStar(); int templateId = hero.getTemplateId(); Map sHeroReturnMap = SHeroReturn.sheroReturnMap.get(templateId); - if(sHeroReturnMap == null || sHeroReturnMap.containsKey(star)){ + if(sHeroReturnMap == null || !sHeroReturnMap.containsKey(star)){ MessageUtil.sendErrorResponse(session,0,responseMsgId,"not satisfy"); return; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 3aa2962f6..1ce7a08b1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -1059,7 +1059,7 @@ public class ItemUtil { heroList.add(CBean2Proto.getHero(hero)); SCHero scHero = SCHero.getsCHero().get(hero.getTemplateId()); if (scHero.getNatural() >= 13) { - String message = SErrorCodeEerverConfig.getI18NMessage("lamp_lottery_recruit_content", new Object[]{playerInfoManager.getNickName(), scHero.getNatural(), scHero.getReadingName()}); + String message = SErrorCodeEerverConfig.getI18NMessage("lamp_lottery_content", new Object[]{playerInfoManager.getNickName(), scHero.getNatural(), scHero.getReadingName()}); if (!message.isEmpty()){ ChatLogic.getInstance().sendSysChatMessage(message,Global.LUCKY_LUCK,hero.getTemplateId(),0,0,0,0,0); }