From 71d02b86d5367b8f1c16fc7947b9153fa71b177f Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Fri, 21 Jul 2023 18:58:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E5=AE=9D=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 | 6 ++-- .../jieling/logic/mission/MissionLoigc.java | 2 +- .../mission/data/DataManagerDistributor.java | 2 +- .../mission/event/BaseGameEventProcessor.java | 2 +- .../event/BeginneRefreshEventProcessor.java | 16 ---------- ...s.java => DefaultRefreshEventProcess.java} | 2 +- .../event/EndlessMissionRefreshProcess.java | 21 ------------- .../event/JadeDynastyRefreshEventProcess.java | 17 ----------- .../event/MissionEventDistributor.java | 30 +++++++++---------- .../event/MistyTripMissionRefreshProcess.java | 17 ----------- .../event/TreasureRefreshEventProcess.java | 16 ---------- .../event/UserLevelEventProcessor.java | 1 - .../mission/main/JadeDynastyMissionType.java | 12 +++----- 13 files changed, 26 insertions(+), 118 deletions(-) delete mode 100644 serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/BeginneRefreshEventProcessor.java rename serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/{CowFlySkyEventProcess.java => DefaultRefreshEventProcess.java} (88%) delete mode 100644 serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/EndlessMissionRefreshProcess.java delete mode 100644 serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/JadeDynastyRefreshEventProcess.java delete mode 100644 serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MistyTripMissionRefreshProcess.java delete mode 100644 serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/TreasureRefreshEventProcess.java 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 254ddf866..b2d634163 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 @@ -122,10 +122,10 @@ public class UserMissionManager extends MongoBase { if(TimeUtils.isSameMonth2(GameApplication.serverConfig.getCacheOpenTime(),TimeUtils.now())){ int days = new Date(GameApplication.serverConfig.getCacheOpenTime()).getDate();//当月第几天 missionIds = STableManager.getConfig(SDailyTasksConfig.class).values().stream().filter(n->days >=n. - getViewDateUp()&& days <=n.getViewDataDown()).map(n ->n.getId()).collect(Collectors.toSet()); + getViewDateUp()&& days <=n.getViewDataDown()).map(SDailyTasksConfig::getId).collect(Collectors.toSet()); }else{ missionIds = STableManager.getConfig(SDailyTasksConfig.class).values().stream().filter(n->n.getViewDateUp() == 1). - map(n ->n.getId()).collect(Collectors.toSet()); + map(SDailyTasksConfig::getId).collect(Collectors.toSet()); } int type = (int) parm[0]; if (type == 0) { @@ -450,7 +450,7 @@ public class UserMissionManager extends MongoBase { } break; case JADE_DYNASTY_MISSION_REWARD:{ - jadeDynastyMissionType.rewardMission(user, (int) parm[0], missionTypeEnumListMap.get(GameMisionType.JADE_DYNASTY_MISSION), jadeDynastyCumulationData); + jadeDynastyMissionType.rewardMission((int) parm[0], missionTypeEnumListMap.get(GameMisionType.JADE_DYNASTY_MISSION)); updateString("jadeDynastyMissionType",jadeDynastyMissionType); } break; 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 85c5f942a..49e38f8ce 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 @@ -789,7 +789,7 @@ public class MissionLoigc { } } - // 破阵诛仙任务 + // 破阵诛仙任务/主题活动任务 if(type == GameMisionType.JADE_DYNASTY_MISSION.getType()){ Map> gameMisionTypeListMap = userMissionManager.onGameEvent(user, GameEvent.JADE_DYNASTY_MISSION_REWARD, missionId); missionStateChangeInfos = gameMisionTypeListMap.get(GameMisionType.JADE_DYNASTY_MISSION); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/DataManagerDistributor.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/DataManagerDistributor.java index 3b31c8de1..362d610e7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/DataManagerDistributor.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/DataManagerDistributor.java @@ -11,7 +11,7 @@ import java.util.Map; * 任务子类添加,missionType */ public class DataManagerDistributor { - private static Map judges = new HashMap<>(); + private static final Map judges = new HashMap<>(); public static void init(){ judges.put(MissionType.RECRUITMENT_RANDOM_HEROES,new RandomHeroDataManager()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/BaseGameEventProcessor.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/BaseGameEventProcessor.java index 4e2d42edd..4835f5b61 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/BaseGameEventProcessor.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/BaseGameEventProcessor.java @@ -11,5 +11,5 @@ import java.util.Map; public interface BaseGameEventProcessor { - public void onGameEvent(User user, Map> misionTypeListMap, GameEvent event, Object ...parm) throws Exception; + void onGameEvent(User user, Map> misionTypeListMap, GameEvent event, Object ...parm) throws Exception; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/BeginneRefreshEventProcessor.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/BeginneRefreshEventProcessor.java deleted file mode 100644 index dd62635a5..000000000 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/BeginneRefreshEventProcessor.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ljsd.jieling.logic.mission.event; - -import com.ljsd.jieling.logic.dao.root.User; -import com.ljsd.jieling.logic.mission.GameEvent; -import com.ljsd.jieling.logic.mission.GameMisionType; -import com.ljsd.jieling.logic.mission.main.MissionStateChangeInfo; - -import java.util.List; -import java.util.Map; - -public class BeginneRefreshEventProcessor implements BaseGameEventProcessor{ - @Override - public void onGameEvent(User user, Map> misionTypeListMap, GameEvent event, Object... parm) throws Exception { - user.getUserMissionManager().openMission(user,event,misionTypeListMap, parm); - } -} \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/CowFlySkyEventProcess.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/DefaultRefreshEventProcess.java similarity index 88% rename from serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/CowFlySkyEventProcess.java rename to serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/DefaultRefreshEventProcess.java index cd6c5cb7b..a26a91a9b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/CowFlySkyEventProcess.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/DefaultRefreshEventProcess.java @@ -8,7 +8,7 @@ import com.ljsd.jieling.logic.mission.main.MissionStateChangeInfo; import java.util.List; import java.util.Map; -public class CowFlySkyEventProcess implements BaseGameEventProcessor { +public class DefaultRefreshEventProcess implements BaseGameEventProcessor { @Override public void onGameEvent(User user, Map> misionTypeListMap, GameEvent event, Object... parm) throws Exception { user.getUserMissionManager().openMission(user,event,misionTypeListMap,parm); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/EndlessMissionRefreshProcess.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/EndlessMissionRefreshProcess.java deleted file mode 100644 index 0af2e2928..000000000 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/EndlessMissionRefreshProcess.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.ljsd.jieling.logic.mission.event; - -import com.ljsd.jieling.logic.dao.root.User; -import com.ljsd.jieling.logic.mission.GameEvent; -import com.ljsd.jieling.logic.mission.GameMisionType; -import com.ljsd.jieling.logic.mission.main.MissionStateChangeInfo; - -import java.util.List; -import java.util.Map; - -/** - * @author lvxinran - * @date 2021/5/19 - * @discribe - */ -public class EndlessMissionRefreshProcess implements BaseGameEventProcessor{ - @Override - public void onGameEvent(User user, Map> misionTypeListMap, GameEvent event, Object... parm) throws Exception { - user.getUserMissionManager().openMission(user,event,misionTypeListMap,parm); - } -} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/JadeDynastyRefreshEventProcess.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/JadeDynastyRefreshEventProcess.java deleted file mode 100644 index 9a5172037..000000000 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/JadeDynastyRefreshEventProcess.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.ljsd.jieling.logic.mission.event; - -import com.ljsd.jieling.logic.dao.root.User; -import com.ljsd.jieling.logic.mission.GameEvent; -import com.ljsd.jieling.logic.mission.GameMisionType; -import com.ljsd.jieling.logic.mission.main.MissionStateChangeInfo; - -import java.util.List; -import java.util.Map; - -public class JadeDynastyRefreshEventProcess implements BaseGameEventProcessor { - - @Override - public void onGameEvent(User user, Map> misionTypeListMap, GameEvent event, Object... parm) throws Exception { - user.getUserMissionManager().openMission(user,event,misionTypeListMap,parm); - } -} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java index 598b92ca0..6fa0b181d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java @@ -29,7 +29,7 @@ public class MissionEventDistributor { /** * 任务刷新 */ - private static Map eventProcessor = new HashMap<>(); + private static final Map eventProcessor = new HashMap<>(); /** * 多条件使用,修改任务状态,存在多任务用同一方法时,需要在eventProcessor中使用 */ @@ -60,21 +60,21 @@ public class MissionEventDistributor { typeList.add(MissionType.HAVE_ID_STAR_LV_POKEMON_NUM); eventEnumListMap.put(GameEvent.DONGHAIXUNXIAN_UPDATE,typeList); - // 刷新任务 eventProcessor.put(GameEvent.MISSING_ROOM_REFRESH,new CumulationDataEventProcessor()); - eventProcessor.put(GameEvent.DAILY_REFRESH,new DailyRefreshEventProcess()); - eventProcessor.put(GameEvent.BLOODY_REFRESH,new DailyRefreshEventProcess()); - eventProcessor.put(GameEvent.TREASH_REFRESH,new TreasureRefreshEventProcess()); - eventProcessor.put(GameEvent.TREASH_WEEK_REFRESH,new TreasureRefreshEventProcess()); - eventProcessor.put(GameEvent.ACHIEVE_REFRESH,new DailyRefreshEventProcess()); - eventProcessor.put(GameEvent.TREASH_MONTH_REFRESH,new TreasureRefreshEventProcess()); - eventProcessor.put(GameEvent.SERVENHAPPY_REFRESH,new TreasureRefreshEventProcess()); - eventProcessor.put(GameEvent.BEGINNER,new BeginneRefreshEventProcessor()); - eventProcessor.put(GameEvent.JADE_DYNASTY_REFRESH,new JadeDynastyRefreshEventProcess()); - eventProcessor.put(GameEvent.JADE_DYNASTY_WEEK_REFRESH,new JadeDynastyRefreshEventProcess()); - eventProcessor.put(GameEvent.COW_FLY_SKY_REFRESH,new CowFlySkyEventProcess()); - eventProcessor.put(GameEvent.ENDLESS_MISSION_REFRESH,new EndlessMissionRefreshProcess()); - eventProcessor.put(GameEvent.MISTY_TRIP_REFRESH,new MistyTripMissionRefreshProcess());//缥缈之旅刷新开始 + // 刷新任务 + eventProcessor.put(GameEvent.DAILY_REFRESH,new DefaultRefreshEventProcess()); + eventProcessor.put(GameEvent.BLOODY_REFRESH,new DefaultRefreshEventProcess()); + eventProcessor.put(GameEvent.ACHIEVE_REFRESH,new DefaultRefreshEventProcess()); + eventProcessor.put(GameEvent.TREASH_REFRESH,new DefaultRefreshEventProcess()); + eventProcessor.put(GameEvent.TREASH_WEEK_REFRESH,new DefaultRefreshEventProcess()); + eventProcessor.put(GameEvent.TREASH_MONTH_REFRESH,new DefaultRefreshEventProcess()); + eventProcessor.put(GameEvent.SERVENHAPPY_REFRESH,new DefaultRefreshEventProcess()); + eventProcessor.put(GameEvent.BEGINNER,new DefaultRefreshEventProcess()); + eventProcessor.put(GameEvent.JADE_DYNASTY_REFRESH,new DefaultRefreshEventProcess()); + eventProcessor.put(GameEvent.JADE_DYNASTY_WEEK_REFRESH,new DefaultRefreshEventProcess()); + eventProcessor.put(GameEvent.COW_FLY_SKY_REFRESH,new DefaultRefreshEventProcess()); + eventProcessor.put(GameEvent.ENDLESS_MISSION_REFRESH,new DefaultRefreshEventProcess()); + eventProcessor.put(GameEvent.MISTY_TRIP_REFRESH,new DefaultRefreshEventProcess());//缥缈之旅刷新开始 typeList = new ArrayList<>(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MistyTripMissionRefreshProcess.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MistyTripMissionRefreshProcess.java deleted file mode 100644 index 8db406cea..000000000 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MistyTripMissionRefreshProcess.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.ljsd.jieling.logic.mission.event; - -import com.ljsd.jieling.logic.dao.root.User; -import com.ljsd.jieling.logic.mission.GameEvent; -import com.ljsd.jieling.logic.mission.GameMisionType; -import com.ljsd.jieling.logic.mission.main.MissionStateChangeInfo; - -import java.util.List; -import java.util.Map; - -public class MistyTripMissionRefreshProcess implements BaseGameEventProcessor{ - - @Override - public void onGameEvent(User user, Map> misionTypeListMap, GameEvent event, Object... parm) throws Exception { - user.getUserMissionManager().openMission(user,event,misionTypeListMap,parm); - } -} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/TreasureRefreshEventProcess.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/TreasureRefreshEventProcess.java deleted file mode 100644 index 8472bb72b..000000000 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/TreasureRefreshEventProcess.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ljsd.jieling.logic.mission.event; - -import com.ljsd.jieling.logic.dao.root.User; -import com.ljsd.jieling.logic.mission.GameEvent; -import com.ljsd.jieling.logic.mission.GameMisionType; -import com.ljsd.jieling.logic.mission.main.MissionStateChangeInfo; - -import java.util.List; -import java.util.Map; - -public class TreasureRefreshEventProcess implements BaseGameEventProcessor { - @Override - public void onGameEvent(User user, Map> misionTypeListMap, GameEvent event, Object... parm) throws Exception { - user.getUserMissionManager().openMission(user,event,misionTypeListMap,parm); - } -} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/UserLevelEventProcessor.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/UserLevelEventProcessor.java index 7ebb28ad6..583505856 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/UserLevelEventProcessor.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/UserLevelEventProcessor.java @@ -23,7 +23,6 @@ public class UserLevelEventProcessor implements BaseGameEventProcessor{ for (MissionType type : typeList) { user.getUserMissionManager().calCumulationDataResult(user,type,misionTypeListMap,parm); } - int oldLevel = (int)parm[0]; int upLevel = (int)parm[1]; ISession session = OnlineUserManager.getSessionByUid(user.getId()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/JadeDynastyMissionType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/JadeDynastyMissionType.java index e0ffcc1aa..a661933f3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/JadeDynastyMissionType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/JadeDynastyMissionType.java @@ -9,11 +9,8 @@ import com.ljsd.jieling.logic.mission.data.AbstractDataManager; import com.ljsd.jieling.logic.mission.data.BaseDataManager; import com.ljsd.jieling.logic.mission.data.DataManagerDistributor; import config.SThemeActivityTaskConfig; -import config.STreasureSunlongTaskConfig; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Set; public class JadeDynastyMissionType extends AbstractMissionType{ @@ -33,13 +30,12 @@ public class JadeDynastyMissionType extends AbstractMissionType{ } - public void rewardMission(User user,int missionId, List missionTypeEnumListMap, CumulationData cumulationData) throws Exception { + public void rewardMission(int missionId, List missionTypeEnumListMap) { SThemeActivityTaskConfig taskConfig = SThemeActivityTaskConfig.idTaskConfig.get(missionId); - if(taskConfig == null){return;} - if (!getFinishMissionIds().contains(missionId)) { - return ; + if (taskConfig == null || !getFinishMissionIds().contains(missionId)) { + return; } - MissionStateChangeInfo stateChangeInfo = new MissionStateChangeInfo(missionId, MissionState.REWARD,taskConfig.getIntegral()); + MissionStateChangeInfo stateChangeInfo = new MissionStateChangeInfo(missionId, MissionState.REWARD,taskConfig.getIntegral()); missionTypeEnumListMap.add(stateChangeInfo); getFinishMissionIds().remove(missionId); getRewardedMissionIds().set(missionId);