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());