From f28fd3a65de1083176fa3a4479d94a3fbe535bfd Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 14 Jan 2021 17:22:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=8D=A1=E6=A0=A1=E9=AA=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 3 ++- tablemanager/src/main/java/config/SLotterySetting.java | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) 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 16bee6f2d..7ed3557a6 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 @@ -266,7 +266,8 @@ public class HeroLogic{ } } if(heroManager!=null&& heroManager.getHeroMap()!=null){ - if(heroManager.getHeroMap().size() + perCount > STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting().getHeroNumlimit()){ + //只有抽英雄才校验 + if(sLotterySetting.getGainType()==1&&heroManager.getHeroMap().size() + perCount > STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting().getHeroNumlimit()){ throw new ErrorCodeException(ErrorCode.HERO_MAX); } } diff --git a/tablemanager/src/main/java/config/SLotterySetting.java b/tablemanager/src/main/java/config/SLotterySetting.java index 58d803dcb..174562443 100644 --- a/tablemanager/src/main/java/config/SLotterySetting.java +++ b/tablemanager/src/main/java/config/SLotterySetting.java @@ -37,6 +37,8 @@ public class SLotterySetting implements BaseConfig { private int activityId; + private int gainType; + public static Map> changeIds = new HashMap<>(); @Override @@ -122,4 +124,8 @@ public class SLotterySetting implements BaseConfig { public static void setChangeIds(Map> changeIds) { SLotterySetting.changeIds = changeIds; } + + public int getGainType() { + return gainType; + } } \ No newline at end of file