back_recharge
wangyuan 2019-07-26 17:27:39 +08:00
parent 09dcb7ffe4
commit 65d65a597b
2 changed files with 4 additions and 4 deletions

View File

@ -79,8 +79,8 @@ public class MissionLoigc {
sendProgress = (doingProgress - takeTimes * finishParm) / finishParm;
}
int times = sTreasureTaskConfig.getTimes();
if(sendProgress>times){
sendProgress =times;
if( (sendProgress + takeTimes)>times){
sendProgress =times-takeTimes;
}
if(sendProgress>0){

View File

@ -83,10 +83,10 @@ public class TreasureMissionType extends AbstractMissionType{
if(takeTimes == null){
takeTimes = 0;
}
if(times!=0 && (finishParm>0 && doingProgress/finishParm>times || (doingProgress!=0 && finishParm<0 && 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);
MissionStateChangeInfo missionStateChangeInfo = new MissionStateChangeInfo(id, MissionState.FINISH,times-takeTimes,takeTimes);
missionStateChangeInfos.add(missionStateChangeInfo);
continue;
}