From 4b09df7f4f1fdac4b46cc23ff1393cd92b728adc Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 6 Mar 2020 18:37:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9C=E6=B5=B7=E5=AF=BB=E4=BB=99=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/hero/HeroLogic.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 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 91a0f9c4a..979226c65 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 @@ -189,16 +189,13 @@ public class HeroLogic{ } if(sLotterySetting.getLotteryType()==3){ //活动抽卡校验 - Object[] activityStatusByType = ActivityLogic.getInstance().getActivityStatusByType(user, sLotterySetting.getActivityId()); - if(activityStatusByType.length!=1){ + if(!user.getActivityManager().getActivityMissionMap().containsKey(sLotterySetting.getActivityId())){ throw new ErrorCodeException(ErrorCode.ACTIVITY_NOT_OPEN); } - if(activityStatusByType[0] instanceof SGlobalActivity){ - SGlobalActivity activity = (SGlobalActivity)activityStatusByType[0]; - long endTimeLong = ToolsUtil.getEndTimeLong(activity.getStartTimeLong(), activity.getEndTimeLong(), activity.getTime(), user.getPlayerInfoManager().getCreateTime(), activity.getGapTime()); - if(TimeUtils.now()>endTimeLong){ - throw new ErrorCodeException(ErrorCode.ACTIVITY_NOT_OPEN); - } + SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(sLotterySetting.getActivityId()); + long endTimeLong = ToolsUtil.getEndTimeLong(activity.getStartTimeLong(), activity.getEndTimeLong(), activity.getTime(), user.getPlayerInfoManager().getCreateTime(), activity.getGapTime()); + if(TimeUtils.now()>endTimeLong){ + throw new ErrorCodeException(ErrorCode.ACTIVITY_NOT_OPEN); } } //筛选卡池