From 71d6f9ac907f520934daab9cd17f07f71fba8101 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 29 Jul 2020 19:07:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=94=A8=E6=88=B7=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/ktbeans/reportEvent/LoginEventHandler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/reportEvent/LoginEventHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/reportEvent/LoginEventHandler.java index dcfd0f09b..1d1d39f6f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/reportEvent/LoginEventHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/reportEvent/LoginEventHandler.java @@ -21,6 +21,7 @@ public class LoginEventHandler extends CommonEventHandler { Map setProperties = new HashMap<>(); Map 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()); From 4960916a72092c6f2fbed6ed415f9ca17c260ca7 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Thu, 6 Aug 2020 21:22:54 +0800 Subject: [PATCH 2/2] bug --- .../mission/event/MissionEventDistributor.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java index b62a19322..8662e6afe 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java @@ -533,11 +533,16 @@ public class MissionEventDistributor { return null; } Map> 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; }