Merge branch 'master' into master_test
commit
e6c21d947e
|
@ -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());
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue