From 31ae65a99cb3c700b631267b9f3f7d3156fe34a4 Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Mon, 29 Jul 2024 18:28:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E5=8A=A9=E9=98=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/hero/AssistLogic.java | 81 ++++++++----------- 1 file changed, 34 insertions(+), 47 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/AssistLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/AssistLogic.java index f94138160..408b1fed2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/AssistLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/AssistLogic.java @@ -132,59 +132,46 @@ public class AssistLogic { User user = UserManager.getUser(iSession.getUid()); HeroManager heroManager = user.getHeroManager(); Map assistBoxMap = heroManager.getAssistBoxMap(); - int operate = proto.getOperate(); - List boxsList = proto.getBoxsList(); - // 穿戴 - if (operate == 1){ - for (CommonProto.AssistBox box : boxsList) { - int id = box.getId(); - String heroId = box.getHeroId(); - AssistBox assistBox = assistBoxMap.get(id); - if (assistBox == null || assistBox.getState() == 0){ - throw new ErrorTableException(162);//格子未开启 - } - if (heroManager.getAssistHeroIds().containsKey(heroId)){ - throw new ErrorTableException(163);//英雄已助阵 - } - if (!StringUtil.isEmpty(assistBox.getHeroId())){ - throw new ErrorTableException(164);//格子有助阵 - } - Hero hero = heroManager.getHero(heroId); - if (hero == null){ - throw new ErrorCodeException(ErrorCode.CFG_NULL);//配置不存在 - } - SCHero scHero = SCHero.getSCHero(hero.getTemplateId()); - if (scHero == null){ - throw new ErrorCodeException(ErrorCode.CFG_NULL);//配置不存在 - } - SAssistanceConfig assistanceConfig = SAssistanceConfig.map.get(id); - if (assistanceConfig == null){ - throw new ErrorCodeException(ErrorCode.CFG_NULL);//配置不存在 - } - if (scHero.getPropertyName() != assistanceConfig.getProfessionLimit() || scHero.getNatural() != assistanceConfig.getQuality()){ - throw new ErrorTableException(167);//条件不满足 - } - assistBox.setHeroId(heroId); - assistBoxMap.put(id, assistBox); - } - + for (AssistBox box : assistBoxMap.values()) { + box.setHeroId(""); } - // 卸下 - else { - for (CommonProto.AssistBox box : boxsList) { - int id = box.getId(); - AssistBox assistBox = assistBoxMap.get(id); - if (assistBox == null || assistBox.getState() == 0){ - throw new ErrorTableException(162);//格子未开启 - } - assistBox.setHeroId(""); - assistBoxMap.put(id, assistBox); +// int operate = proto.getOperate(); + List boxsList = proto.getBoxsList(); + for (CommonProto.AssistBox box : boxsList) { + int id = box.getId(); + String heroId = box.getHeroId(); + AssistBox assistBox = assistBoxMap.get(id); + if (assistBox == null || assistBox.getState() == 0){ + throw new ErrorTableException(162);//格子未开启 } + if (heroManager.getAssistHeroIds().containsKey(heroId)){ + throw new ErrorTableException(163);//英雄已助阵 + } + if (!StringUtil.isEmpty(assistBox.getHeroId())){ + throw new ErrorTableException(164);//格子有助阵 + } + Hero hero = heroManager.getHero(heroId); + if (hero == null){ + throw new ErrorCodeException(ErrorCode.CFG_NULL);//配置不存在 + } + SCHero scHero = SCHero.getSCHero(hero.getTemplateId()); + if (scHero == null){ + throw new ErrorCodeException(ErrorCode.CFG_NULL);//配置不存在 + } + SAssistanceConfig assistanceConfig = SAssistanceConfig.map.get(id); + if (assistanceConfig == null){ + throw new ErrorCodeException(ErrorCode.CFG_NULL);//配置不存在 + } + if (scHero.getPropertyName() != assistanceConfig.getProfessionLimit() || scHero.getNatural() != assistanceConfig.getQuality()){ + throw new ErrorTableException(167);//条件不满足 + } + assistBox.setHeroId(heroId); + assistBoxMap.put(id, assistBox); } heroManager.setAssistBoxMap(assistBoxMap); // 更新战力 Poster.getPoster().dispatchEvent(new SaveHeroForceEvent(user.getId(),"")); - MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.AssistUpDownResponse_VALUE, null, true); + MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.AssistBatchUpDownResponse_VALUE, null, true); } /**