Merge branch 'master' into master_test

zhangshanxue 2020-08-06 21:23:44 +08:00
commit e6c21d947e
2 changed files with 10 additions and 4 deletions

View File

@ -21,6 +21,7 @@ public class LoginEventHandler extends CommonEventHandler {
Map<String, Object> setProperties = new HashMap<>();
Map<Integer, Item> itemMap = user.getItemManager().getItemMap();
setProperties.put("role_id",String.valueOf(user.getId()));
setProperties.put("role_name",user.getPlayerInfoManager().getNickName());
setProperties.put("account",String.valueOf(user.getPlayerInfoManager().getOpenId()));
setProperties.put("fighting_capacity",user.getPlayerInfoManager().getMaxForce());
setProperties.put("friends_amount",user.getFriendManager().getFriends()==null?0:user.getFriendManager().getFriends().size());

View File

@ -533,11 +533,16 @@ public class MissionEventDistributor {
return null;
}
Map<GameMisionType, List<MissionStateChangeInfo>> missionTypeEnumListMap = threadMissionChangeList.get();
if(missionTypeEnumListMap == null){
missionTypeEnumListMap = new HashMap<>(1);
}
try {
if(missionTypeEnumListMap == null){
missionTypeEnumListMap = new HashMap<>(1);
}
processor.onGameEvent(user, missionTypeEnumListMap,event,parm );
processor.onGameEvent(user, missionTypeEnumListMap,event,parm );
}catch (Exception e){
e.printStackTrace();
LOGGER.error(e.toString());
}
return missionTypeEnumListMap;
}