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 fa8bf7a4d..14be0f00c 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 @@ -402,6 +402,14 @@ public class ActivityLogic implements IEventHandler{ } } } + // 登录检测已开启的活动,商店是否开启 + int[] shopId = sGlobalActivity.getShopId(); + if (shopId != null && shopId.length > 0) { + boolean b = user.getStoreManager().getStoreInfoMap().containsKey(shopId[0]); + if (!b) { + LOGGER.info("checkActivityOfUser uid={} activityId={} reopen shopId={}", user.getId(), openActivityId, shopId[0]); + Poster.getPoster().dispatchEvent(new ActivityStateChangeEvent(user.getId(),openActivityId,1)); + } continue; } initAllActivityMission(activityManager.getActivityMissionMap(),openActivityId); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperFundActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperFundActivity.java index 442a0263d..f53f8e632 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperFundActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperFundActivity.java @@ -152,6 +152,10 @@ public class SuperFundActivity extends AbstractActivity { private void updateState(User user) throws Exception { // 活动信息 ActivityMission mission = user.getActivityManager().getActivityMissionMap().get(id); + if(mission == null){ + LOGGER.info("updateState 玩家id ={},activityId={}",user.getId(),id); + return; + } if (mission.getV() != 2){ return; }