From afda3018b4b817f2f20c02a28e3cdd242bde837b Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 7 Aug 2019 14:21:09 +0800 Subject: [PATCH] fix misison --- .../java/com/ljsd/jieling/logic/dao/UserMissionManager.java | 5 +++-- .../ljsd/jieling/logic/mission/main/TreasureMissionType.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java index 1b4364a7b..4693003a9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java @@ -115,14 +115,14 @@ public class UserMissionManager extends MongoBase { } break; case TREASURE_MISSION_REWARD:{ - treasureMissionIdsType.rewardMission(user,(int)parm[0], missionTypeEnumListMap.get(GameMisionType.TREASUREMISSION)); + treasureMissionIdsType.rewardMission(user,(int)parm[0], missionTypeEnumListMap.get(GameMisionType.TREASUREMISSION),treasureCumulationData); updateString("treasureMissionIdsType",treasureMissionIdsType); } break; case SEVENHAPPY_MISSION_REWARD:{ int missionId = (int) parm[0]; List missionStateChangeInfos = missionTypeEnumListMap.get(GameMisionType.SEVENMISSION); - sevenHappyMissionType.rewardMission(user,missionId, missionStateChangeInfos); + sevenHappyMissionType.rewardMission(user,missionId, missionStateChangeInfos,sevenHappyCumulationData); if(missionStateChangeInfos!=null && !missionStateChangeInfos.isEmpty()){ int takeTimes = missionStateChangeInfos.get(0).getProgress(); missionStateChangeInfos.get(0).setProgress(0); @@ -130,6 +130,7 @@ public class UserMissionManager extends MongoBase { calCumulationDataResult(user,MissionType.SENVER_HAPPY,missionTypeEnumListMap,score); } } + break; case BEGINNER_MISSION_REWARD:{ beginerTaskIdsType.rewardMission((int)parm[0], missionTypeEnumListMap.get(GameMisionType.BEGINNERMISSION)); updateString("beginerTaskIdsType",beginerTaskIdsType); 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 6ad7b7526..9aa5306ee 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 @@ -22,10 +22,10 @@ public class TreasureMissionType extends AbstractMissionType{ } - public void rewardMission(User user,int missionId, List missionTypeEnumListMap){ + public void rewardMission(User user,int missionId, List missionTypeEnumListMap, CumulationData cumulationData){ STreasureTaskConfig sTreasureTaskConfig = STreasureTaskConfig.sTreasureTaskConfigMap.get(missionId); if(sTreasureTaskConfig == null){return;} - int doingProgress = MissionLoigc.getDoingProgress(user, user.getUserMissionManager().getTreasureCumulationData(), sTreasureTaskConfig.getTaskType(), sTreasureTaskConfig.getTaskValue()[0]); + int doingProgress = MissionLoigc.getDoingProgress(user,cumulationData, sTreasureTaskConfig.getTaskType(), sTreasureTaskConfig.getTaskValue()[0]); //完成 int finishParm = sTreasureTaskConfig.getTaskValue()[1][0]; Integer takeTimes = this.takeTimes.get(missionId);