From e1786b61f7b62f3517b3565007ddd07a1c8cc866 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Wed, 27 Nov 2019 09:30:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E5=8D=A1=E9=99=90=E5=88=B6=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/activity/FightMainEventHandler.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/FightMainEventHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/FightMainEventHandler.java index 8b40ad034..900ec3398 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/FightMainEventHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/FightMainEventHandler.java @@ -37,13 +37,13 @@ public class FightMainEventHandler implements IEventHandler{ for(SGlobalActivity sGlobalActivity : SGlobalActivity.getsGlobalActivityMap().values()){ int[] openRules = sGlobalActivity.getOpenRules(); if(openRules!=null && openRules.length>0 && openRules[0] == 1){ - ActivityMission activityMission = user.getActivityManager().getActivityMissionMap().get(sGlobalActivity.getId()); + ActivityMission activityMission = user.getActivityManager().getGGActivityMissionMap().get(sGlobalActivity.getId()); if(activityMission!=null && activityMission.getActivityState() == ActivityType.UNOPEN_STATE){ int virtureId = SMainLevelConfig.config.get( openRules[1]).getVirtureId(); - SMainLevelConfig mineMainLevelConfig = SMainLevelConfig.fightPreMap.get(fightId); - if(user.getMainLevelManager().getState() == 2 ){ - mineMainLevelConfig = SMainLevelConfig.config.get(user.getMainLevelManager().getFightId()); - } + SMainLevelConfig mineMainLevelConfig = SMainLevelConfig.config.get(fightId); +// if(user.getMainLevelManager().getState() == 2 ){ +// mineMainLevelConfig = SMainLevelConfig.config.get(user.getMainLevelManager().getFightId()); +// } if(mineMainLevelConfig!=null && virtureId <= mineMainLevelConfig.getVirtureId()){ activityMission.updateActivityState(ActivityType.OPEN_STATE); ActivityLogic.getInstance().sendActivityInfo(user,sGlobalActivity.getId());