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 0b074d769..082b25eda 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 @@ -51,13 +51,14 @@ public class DataManagerDistributor { judges.put(MissionType.WORKSHOP_CREATE_EQUIP_NUMS,new WorkShopCreateEquipTimesManager()); - judges.put(MissionType.GENERAL_STORY_TIMES,new FightDataManager()); + judges.put(MissionType.HERO_STORY_TIMES,new FightDataManager()); judges.put(MissionType.LEVEL_STORY_TIMES,new FightDataManager()); judges.put(MissionType.HERO_STORY_PLAY_TIMES,new FightPlayDataManager()); judges.put(MissionType.INVASIONBOSS_PLAY_TIMES,new FightPlayDataManager()); judges.put(MissionType.FAST_ADVENTUREREWARD_TIMES,new FightPlayDataManager()); + judges.put(MissionType.GENERAL_STORY_TIMES,new FightPlayDataManager()); judges.put(MissionType.HERO_LEVLE_TIMES,new HeroLevelUpManager()); judges.put(MissionType.ARENA_FIGHTSUCCES_TIMES,new ArenaChallengeManager()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/FightDataManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/FightDataManager.java index 79c5b6525..f297d6718 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/FightDataManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/FightDataManager.java @@ -34,10 +34,7 @@ public class FightDataManager implements BaseDataManager{ } if(fightType == 1){ - if(missionType == MissionType.GENERAL_STORY_TIMES){ - data.generalStoryTimes+=fightTimes; - result = new CumulationData.Result(missionType); - }else if(missionType == MissionType.HERO_LEVLE_TIMES){ + if(missionType == MissionType.HERO_LEVLE_TIMES){ data.heroStoryTimes+=fightTimes; result = new CumulationData.Result(missionType); }else if(missionType == MissionType.GENERAL_STORY_PASS){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/FightPlayDataManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/FightPlayDataManager.java index 3550a3650..525357a27 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/FightPlayDataManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/FightPlayDataManager.java @@ -13,6 +13,10 @@ public class FightPlayDataManager implements BaseDataManager{ data.invasionbossPlayTimes+=(int)parm[1]; }else if(type == 9999 && missionType == MissionType.FAST_ADVENTUREREWARD_TIMES){ data.fastAdventurerewardTimes+=(int)parm[1]; + }else if(type==1 && missionType == MissionType.GENERAL_STORY_TIMES){ + data.generalStoryTimes+=(int)parm[1]; + }else{ + return null; } return new CumulationData.Result(missionType); } 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 eb646b63a..f4ab0360a 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 @@ -125,7 +125,7 @@ public class MissionEventDistributor { typeList.add(MissionType.HERO_STORY_TIMES); typeList.add(MissionType.LEVEL_STORY_TIMES); - typeList.add(MissionType.GENERAL_STORY_TIMES); + eventEnumListMap.put(GameEvent.STORY_FIGHT,typeList); eventProcessor.put(GameEvent.STORY_FIGHT,new CumulationDataEventProcessor()); @@ -134,6 +134,7 @@ public class MissionEventDistributor { typeList.add(MissionType.HERO_STORY_PLAY_TIMES); typeList.add(MissionType.INVASIONBOSS_PLAY_TIMES); typeList.add(MissionType.FAST_ADVENTUREREWARD_TIMES); + typeList.add(MissionType.GENERAL_STORY_TIMES); eventEnumListMap.put(GameEvent.PlAY_STORY,typeList); eventProcessor.put(GameEvent.PlAY_STORY,new CumulationDataEventProcessor());