fix activity flush five

back_recharge
wangyuan 2019-08-05 15:20:12 +08:00
parent 7f5ccf558b
commit f52c4f5462
2 changed files with 4 additions and 2 deletions

View File

@ -267,7 +267,9 @@ public class ActivityLogic {
public void upFivePlayerActivity(User user,int activityType, PlayerInfoProto.FivePlayerUpdateIndication.Builder fBuilder){ public void upFivePlayerActivity(User user,int activityType, PlayerInfoProto.FivePlayerUpdateIndication.Builder fBuilder){
if(fBuilder == null){
return;
}
ActivityManager activityManager = user.getActivityManager(); ActivityManager activityManager = user.getActivityManager();
Map<Integer, ActivityMission> activityMissionMap = activityManager.getActivityMissionMap(); Map<Integer, ActivityMission> activityMissionMap = activityManager.getActivityMissionMap();
for(Map.Entry<Integer,ActivityMission> item : activityMissionMap.entrySet()){ for(Map.Entry<Integer,ActivityMission> item : activityMissionMap.entrySet()){

View File

@ -101,7 +101,7 @@ public class TreasureMissionType extends AbstractMissionType{
if(takeTimes == null){ if(takeTimes == null){
takeTimes = 0; 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); doingMissionIds.remove(id);
getFinishMissionIds().add(id); getFinishMissionIds().add(id);
MissionStateChangeInfo missionStateChangeInfo = new MissionStateChangeInfo(id, MissionState.FINISH,times-takeTimes,takeTimes); MissionStateChangeInfo missionStateChangeInfo = new MissionStateChangeInfo(id, MissionState.FINISH,times-takeTimes,takeTimes);