From f52c4f546238d5d92846f17740f6e90b99492b70 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Mon, 5 Aug 2019 15:20:12 +0800 Subject: [PATCH] fix activity flush five --- .../java/com/ljsd/jieling/logic/activity/ActivityLogic.java | 4 +++- .../ljsd/jieling/logic/mission/main/TreasureMissionType.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index 795463fac..7df493971 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -267,7 +267,9 @@ public class ActivityLogic { public void upFivePlayerActivity(User user,int activityType, PlayerInfoProto.FivePlayerUpdateIndication.Builder fBuilder){ - + if(fBuilder == null){ + return; + } ActivityManager activityManager = user.getActivityManager(); Map activityMissionMap = activityManager.getActivityMissionMap(); for(Map.Entry item : activityMissionMap.entrySet()){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/TreasureMissionType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/TreasureMissionType.java index a141a15bb..6ad7b7526 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/TreasureMissionType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/TreasureMissionType.java @@ -101,7 +101,7 @@ public class TreasureMissionType extends AbstractMissionType{ if(takeTimes == null){ takeTimes = 0; } - if(times!=0 && (finishParm>0 && (takeTimes + doingProgress)/finishParm>times || (doingProgress!=0 && finishParm<0 && (-takeTimes + doingProgress)>=finishParm) )){ + if(times!=0 && (finishParm>0 && (takeTimes + doingProgress)/finishParm>=times || (doingProgress!=0 && finishParm<0 && (-takeTimes + doingProgress)>=finishParm) )){ doingMissionIds.remove(id); getFinishMissionIds().add(id); MissionStateChangeInfo missionStateChangeInfo = new MissionStateChangeInfo(id, MissionState.FINISH,times-takeTimes,takeTimes);