From 307768615b8cc3d747cb5155c6b2b471ab45c1a7 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 26 Nov 2019 17:22:31 +0800 Subject: [PATCH] fix activity --- .../jieling/logic/activity/ActivityLogic.java | 6 ++++- .../logic/activity/FightMainEventHandler.java | 24 +++++++++---------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index 01180ef7c..de17d78ad 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -420,7 +420,11 @@ public class ActivityLogic { if(user.getMainLevelManager().getState() == 2 ){ mineMainLevelConfig = SMainLevelConfig.config.get(user.getMainLevelManager().getFightId()); } - if(mineMainLevelConfig!=null && virtureId > mineMainLevelConfig.getVirtureId()){ + int myVirtureId =0; + if(mineMainLevelConfig != null){ + myVirtureId =mineMainLevelConfig.getVirtureId(); + } + if(virtureId > myVirtureId){ state = ActivityType.UNOPEN_STATE; } }else{ 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 d352f741e..8b40ad034 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 @@ -31,19 +31,9 @@ public class FightMainEventHandler implements IEventHandler{ return; FightMainEvent fightMainEvent = (FightMainEvent) event; int fightId = fightMainEvent.getFightId(); - List sGlobalSystemConfigs = STableManager.getFigureConfig(CommonStaticConfig.class).getsGlobalSystemConfigMapByTypeAndConditionMap().get(1).get(fightId); - if(sGlobalSystemConfigs == null){ - return; - } + int uid = fightMainEvent.getUid(); User user = UserManager.getUser(uid); - for(SGlobalSystemConfig sGlobalSystemConfig : sGlobalSystemConfigs){ - int[][] openGifts = sGlobalSystemConfig.getOpenGifts(); - if(openGifts!=null && openGifts.length>0){ - ItemUtil.drop(user,openGifts, BIReason.SYSTERM_OPEN_REWARD); - } - } - for(SGlobalActivity sGlobalActivity : SGlobalActivity.getsGlobalActivityMap().values()){ int[] openRules = sGlobalActivity.getOpenRules(); if(openRules!=null && openRules.length>0 && openRules[0] == 1){ @@ -54,7 +44,7 @@ public class FightMainEventHandler implements IEventHandler{ if(user.getMainLevelManager().getState() == 2 ){ mineMainLevelConfig = SMainLevelConfig.config.get(user.getMainLevelManager().getFightId()); } - if(mineMainLevelConfig!=null && virtureId > mineMainLevelConfig.getVirtureId()){ + if(mineMainLevelConfig!=null && virtureId <= mineMainLevelConfig.getVirtureId()){ activityMission.updateActivityState(ActivityType.OPEN_STATE); ActivityLogic.getInstance().sendActivityInfo(user,sGlobalActivity.getId()); } @@ -62,6 +52,16 @@ public class FightMainEventHandler implements IEventHandler{ } } + List sGlobalSystemConfigs = STableManager.getFigureConfig(CommonStaticConfig.class).getsGlobalSystemConfigMapByTypeAndConditionMap().get(1).get(fightId); + if(sGlobalSystemConfigs == null){ + return; + } + for(SGlobalSystemConfig sGlobalSystemConfig : sGlobalSystemConfigs){ + int[][] openGifts = sGlobalSystemConfig.getOpenGifts(); + if(openGifts!=null && openGifts.length>0){ + ItemUtil.drop(user,openGifts, BIReason.SYSTERM_OPEN_REWARD); + } + } } }