Merge branch 'master_test_gn_zf' into master_test_gn

back_recharge
jiahuiwen 2021-12-13 11:38:56 +08:00
commit 450ab39a7e
2 changed files with 12 additions and 0 deletions

View File

@ -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; continue;
} }
initAllActivityMission(activityManager.getActivityMissionMap(),openActivityId); initAllActivityMission(activityManager.getActivityMissionMap(),openActivityId);

View File

@ -152,6 +152,10 @@ public class SuperFundActivity extends AbstractActivity {
private void updateState(User user) throws Exception { private void updateState(User user) throws Exception {
// 活动信息 // 活动信息
ActivityMission mission = user.getActivityManager().getActivityMissionMap().get(id); ActivityMission mission = user.getActivityManager().getActivityMissionMap().get(id);
if(mission == null){
LOGGER.info("updateState 玩家id ={},activityId={}",user.getId(),id);
return;
}
if (mission.getV() != 2){ if (mission.getV() != 2){
return; return;
} }