Merge branch 'master_test_gn_zf' into master_test_gn
commit
450ab39a7e
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue