From e55c2e593dfc2458a3ceaae1a6365748fc19ce96 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Thu, 20 Jul 2023 15:28:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E5=B0=BD=E5=89=AF?= =?UTF-8?q?=E6=9C=AC=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/dao/UserMissionManager.java | 94 ++++++++----------- .../jieling/logic/mission/MissionLoigc.java | 92 +++++++++--------- 2 files changed, 83 insertions(+), 103 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 352ffbc6e..1b6272088 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 @@ -67,7 +67,7 @@ public class UserMissionManager extends MongoBase { private AchieveMissionIdsType achievementMissionTypMap = new AchieveMissionIdsType(); private JadeDynastyMissionType jadeDynastyMissionType = new JadeDynastyMissionType();//破阵诛仙任务 private CowFlySkyMissionType cowFlySkyMissionType = new CowFlySkyMissionType();// 牛气冲天活动任务 - private EndlessMissionType endlessMissionType = new EndlessMissionType();//无尽副本 +// private EndlessMissionType endlessMissionType = new EndlessMissionType();//无尽副本 private MistyTripMissionType mistyTripMissionType = new MistyTripMissionType();//缥缈之旅 private HomeMissionType homeMissionType = new HomeMissionType();//家园任务 private DonghaiXunxianMissionType donghaiXunxianMission = new DonghaiXunxianMissionType();//东海寻仙 @@ -84,7 +84,7 @@ public class UserMissionManager extends MongoBase { private CumulationData achievementMap = new CumulationData(); private CumulationData jadeDynastyCumulationData = new CumulationData();//破阵诛仙日数据 private CumulationData jadeDynastyWeekCumulationData = new CumulationData();//破阵诛仙周数据 - private CumulationData endlessTask = new CumulationData();//无尽副本任务数据 +// private CumulationData endlessTask = new CumulationData();//无尽副本任务数据 private CumulationData mistyTripCumulationData = new CumulationData();//缥缈之旅数据 private CumulationData donghaiXunxianData = new CumulationData();//东海寻仙数据 @@ -251,26 +251,26 @@ public class UserMissionManager extends MongoBase { cowFlySkyMissionType.getDoingMissionIds().addAll(arro); updateString("cowFlySkyMissionType", cowFlySkyMissionType); break; - case ENDLESS_MISSION_REFRESH: - - Set endlessTask; - if(TimeUtils.isSameMonth2(GameApplication.serverConfig.getCacheOpenTime(),TimeUtils.now())){ - int days = new Date(GameApplication.serverConfig.getCacheOpenTime()).getDate();//当月第几天 - endlessTask = STableManager.getConfig(SEndlessTask.class).values().stream().filter(n->days >=n. - getViewDateUp()&& days <=n.getViewDataDown()).map(SEndlessTask::getId).collect(Collectors.toSet()); - }else{ - endlessTask = STableManager.getConfig(SEndlessTask.class).values().stream().filter(n->n.getViewDateUp() == 1). - map(SEndlessTask::getId).collect(Collectors.toSet()); - } - endlessMissionType.getDoingMissionIds().clear(); - endlessMissionType.getFinishMissionIds().clear(); - endlessMissionType.getRewardedMissionIds().clear(); - endlessMissionType.getDoingMissionIds().addAll(endlessTask); - this.endlessTask= new CumulationData(); - updateString("endlessMissionType", endlessMissionType); - updateString("endlessTask", this.endlessTask); - - break; +// case ENDLESS_MISSION_REFRESH: +// +// Set endlessTask; +// if(TimeUtils.isSameMonth2(GameApplication.serverConfig.getCacheOpenTime(),TimeUtils.now())){ +// int days = new Date(GameApplication.serverConfig.getCacheOpenTime()).getDate();//当月第几天 +// endlessTask = STableManager.getConfig(SEndlessTask.class).values().stream().filter(n->days >=n. +// getViewDateUp()&& days <=n.getViewDataDown()).map(SEndlessTask::getId).collect(Collectors.toSet()); +// }else{ +// endlessTask = STableManager.getConfig(SEndlessTask.class).values().stream().filter(n->n.getViewDateUp() == 1). +// map(SEndlessTask::getId).collect(Collectors.toSet()); +// } +// endlessMissionType.getDoingMissionIds().clear(); +// endlessMissionType.getFinishMissionIds().clear(); +// endlessMissionType.getRewardedMissionIds().clear(); +// endlessMissionType.getDoingMissionIds().addAll(endlessTask); +// this.endlessTask= new CumulationData(); +// updateString("endlessMissionType", endlessMissionType); +// updateString("endlessTask", this.endlessTask); +// +// break; case MISTY_TRIP_REFRESH: //任务开始 Set journeyWithWind = STableManager.getConfig(SJourneyWithWind.class).keySet(); @@ -492,10 +492,10 @@ public class UserMissionManager extends MongoBase { updateString("cowFlySkyMissionType",cowFlySkyMissionType); break; } - case ENDLESS_MISSION_REWARD:{ - endlessMissionType.rewardMission((int)parm[0], missionTypeEnumListMap.get(GameMisionType.ENDLESS_MISSION)); - updateString("endlessMissionType",endlessMissionType); - } +// case ENDLESS_MISSION_REWARD:{ +// endlessMissionType.rewardMission((int)parm[0], missionTypeEnumListMap.get(GameMisionType.ENDLESS_MISSION)); +// updateString("endlessMissionType",endlessMissionType); +// } case EXPLORE_REWARD:{ exploreMissionType.rewardMission((int)parm[0], missionTypeEnumListMap.get(GameMisionType.EXPLORE)); updateString("exploreMissionType",exploreMissionType); @@ -621,17 +621,17 @@ public class UserMissionManager extends MongoBase { } } - if(!endlessMissionType.getDoingMissionIds().isEmpty() ){ - Map endlessConfig = STableManager.getConfig(SEndlessTask.class); - if(endlessConfig!=null&&endlessConfig.size()!=0){ - CumulationData.Result result= endlessTask.updateData(missionType, parm); - if(result!=null){ - endlessMissionType.calCumulationDataResult(user,result,missionTypeEnumListMap.get(GameMisionType.ENDLESS_MISSION),endlessTask); - updateString("endlessTask",endlessTask); - updateString("endlessMissionType",endlessMissionType); - } - } - } +// if(!endlessMissionType.getDoingMissionIds().isEmpty() ){ +// Map endlessConfig = STableManager.getConfig(SEndlessTask.class); +// if(endlessConfig!=null&&endlessConfig.size()!=0){ +// CumulationData.Result result= endlessTask.updateData(missionType, parm); +// if(result!=null){ +// endlessMissionType.calCumulationDataResult(user,result,missionTypeEnumListMap.get(GameMisionType.ENDLESS_MISSION),endlessTask); +// updateString("endlessTask",endlessTask); +// updateString("endlessMissionType",endlessMissionType); +// } +// } +// } // 东海寻仙 if (!donghaiXunxianMission.getDoingMissionIds().isEmpty()){ CumulationData.Result result = donghaiXunxianData.updateData(missionType, parm); @@ -928,14 +928,6 @@ public class UserMissionManager extends MongoBase { return cowFlySkyMissionType; } - public EndlessMissionType getEndlessMissionType() { - return endlessMissionType; - } - - public CumulationData getEndlessTask() { - return endlessTask; - } - public MistyTripMissionType getMistyTripMissionType() { return mistyTripMissionType; } @@ -952,23 +944,11 @@ public class UserMissionManager extends MongoBase { return donghaiXunxianMission; } - public void setDonghaiXunxianMission(DonghaiXunxianMissionType donghaiXunxianMission) { - this.donghaiXunxianMission = donghaiXunxianMission; - } - public CumulationData getDonghaiXunxianData() { return donghaiXunxianData; } - public void setDonghaiXunxianData(CumulationData donghaiXunxianData) { - this.donghaiXunxianData = donghaiXunxianData; - } - public ExploreMissionType getExploreMissionType() { return exploreMissionType; } - - public void setExploreMissionType(ExploreMissionType exploreMissionType) { - this.exploreMissionType = exploreMissionType; - } } 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 83c561a82..aa877348c 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 @@ -524,52 +524,52 @@ public class MissionLoigc { } public static void getEndlessMission(User user,List missionList){ - EndlessMissionType missionType = user.getUserMissionManager().getEndlessMissionType(); - - // 进行中 - Set doingMissionIds = missionType.getDoingMissionIds(); - // 可领取 - Set finishMissionIds = missionType.getFinishMissionIds(); - // 已领取 - BitSet rewardedMissionIds = missionType.getRewardedMissionIds(); - - Collection values = STableManager.getConfig(SEndlessTask.class).values(); - CumulationData treasureCumulationData = user.getUserMissionManager().getEndlessTask(); - - values.forEach(v->{ - int id = v.getId(); - SEndlessTask config = STableManager.getConfig(SEndlessTask.class).get(id); - int day =new Date(GameApplication.serverConfig.getCacheOpenTime()).getDate();//当月第几天 - boolean isAdd = false; - if(TimeUtils.isSameMonth2(GameApplication.serverConfig.getCacheOpenTime(),TimeUtils.now())){ - if(day >= config.getViewDateUp() && day <= config.getViewDataDown()){ - isAdd = true; - } - }else{ - if(1 == config.getViewDateUp()){ - isAdd = true; - } - } - if(isAdd){ - CommonProto.UserMissionInfo.Builder info = CommonProto.UserMissionInfo.newBuilder(); - info.setMissionId(id); - info.setType(GameMisionType.ENDLESS_MISSION.getType()); - if (doingMissionIds.contains(id)){ - info.setState(MissionState.DOING.getState()); - int doingProgress = getDoingProgress(user, treasureCumulationData, config.getType(), config.getValues()[0]); - info.setProgress(doingProgress); - } - if (finishMissionIds.contains(id)){ - int finishProgress = config.getValues()[1][0]; - info.setState(MissionState.FINISH.getState()); - info.setProgress(finishProgress); - } - if (rewardedMissionIds.get(id)){ - info.setState(MissionState.REWARD.getState()); - } - missionList.add(info.build()); - } - }); +// EndlessMissionType missionType = user.getUserMissionManager().getEndlessMissionType(); +// +// // 进行中 +// Set doingMissionIds = missionType.getDoingMissionIds(); +// // 可领取 +// Set finishMissionIds = missionType.getFinishMissionIds(); +// // 已领取 +// BitSet rewardedMissionIds = missionType.getRewardedMissionIds(); +// +// Collection values = STableManager.getConfig(SEndlessTask.class).values(); +// CumulationData treasureCumulationData = user.getUserMissionManager().getEndlessTask(); +// +// values.forEach(v->{ +// int id = v.getId(); +// SEndlessTask config = STableManager.getConfig(SEndlessTask.class).get(id); +// int day =new Date(GameApplication.serverConfig.getCacheOpenTime()).getDate();//当月第几天 +// boolean isAdd = false; +// if(TimeUtils.isSameMonth2(GameApplication.serverConfig.getCacheOpenTime(),TimeUtils.now())){ +// if(day >= config.getViewDateUp() && day <= config.getViewDataDown()){ +// isAdd = true; +// } +// }else{ +// if(1 == config.getViewDateUp()){ +// isAdd = true; +// } +// } +// if(isAdd){ +// CommonProto.UserMissionInfo.Builder info = CommonProto.UserMissionInfo.newBuilder(); +// info.setMissionId(id); +// info.setType(GameMisionType.ENDLESS_MISSION.getType()); +// if (doingMissionIds.contains(id)){ +// info.setState(MissionState.DOING.getState()); +// int doingProgress = getDoingProgress(user, treasureCumulationData, config.getType(), config.getValues()[0]); +// info.setProgress(doingProgress); +// } +// if (finishMissionIds.contains(id)){ +// int finishProgress = config.getValues()[1][0]; +// info.setState(MissionState.FINISH.getState()); +// info.setProgress(finishProgress); +// } +// if (rewardedMissionIds.get(id)){ +// info.setState(MissionState.REWARD.getState()); +// } +// missionList.add(info.build()); +// } +// }); } public static void getMistyTripMission(User user,List missionList){