From 725910f363beeab2996a06f83a751eeca7dbdf55 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 16 Aug 2019 17:33:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9B=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/mission/MissionLoigc.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java index 9ce1544f9..b82820248 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java @@ -90,13 +90,18 @@ public class MissionLoigc { if(progrss<0){ progrss=1; } - if(state!=2 && sTreasureTaskConfig.getTaskType() == MissionType.SENVER_HAPPY.getMissionTypeValue()){ - if(progrss>0 && System.currentTimeMillis()>user.getActivityManager().getSenvenTime()){ - state=1; - }else { - state =0; + if(sTreasureTaskConfig.getTaskType() == MissionType.SENVER_HAPPY.getMissionTypeValue()){ + if(state!=2){ + if(progrss>0 && System.currentTimeMillis()>user.getActivityManager().getSenvenTime()){ + state=1; + }else { + state =0; + } + }else{ + progrss = getDoingProgress(user,dailyCumulationData,sTreasureTaskConfig.getTaskType(),sTreasureTaskConfig.getTaskValue()[0]); } } + missionList.add(CommonProto.UserMissionInfo.newBuilder().setMissionId(missionId).setState(state).setType(missionType).setProgress(progrss).build()); } }