From 49ac978e36a141214882d26b7af30d9e5b33c782 Mon Sep 17 00:00:00 2001 From: duhui Date: Tue, 21 Feb 2023 14:25:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E7=9B=B8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/equip/EquipLogic.java | 4 +++- tablemanager/src/main/java/config/SFaxiangConfig.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/equip/EquipLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/equip/EquipLogic.java index 8b7dcd2df..a5441572e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/equip/EquipLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/equip/EquipLogic.java @@ -27,6 +27,7 @@ import rpc.protocols.PlayerInfoProto; import util.StringUtil; import java.util.*; +import java.util.stream.Collectors; public class EquipLogic { private static final Logger LOGGER = LoggerFactory.getLogger(EquipLogic.class); @@ -95,7 +96,8 @@ public class EquipLogic { if (faxiangConfig.getProfession() != 0 && faxiangConfig.getProfession() != scHero.getProfession()){ throw new ErrorCodeException(ErrorCode.HERO_EQUIP_ERR,"英雄职业不符合"); } - if (faxiangConfig.getJob() != 0 && faxiangConfig.getJob() != scHero.getJob()){ + List jobs = Arrays.stream(faxiangConfig.getJob()).boxed().collect(Collectors.toList()); + if (!jobs.contains(0) && !jobs.contains(scHero.getJob())){ throw new ErrorCodeException(ErrorCode.HERO_EQUIP_ERR,"英雄细分职业不符合"); } } diff --git a/tablemanager/src/main/java/config/SFaxiangConfig.java b/tablemanager/src/main/java/config/SFaxiangConfig.java index 440ac3f82..11becca59 100644 --- a/tablemanager/src/main/java/config/SFaxiangConfig.java +++ b/tablemanager/src/main/java/config/SFaxiangConfig.java @@ -12,7 +12,7 @@ public class SFaxiangConfig implements BaseConfig { private int profession; - private int job; + private int[] job; private int type; @@ -46,7 +46,7 @@ public class SFaxiangConfig implements BaseConfig { return profession; } - public int getJob() { + public int[] getJob() { return job; }