From bb9b330c50f2154a003b720d8c99b85a78b3bd1a Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 7 Nov 2019 19:53:02 +0800 Subject: [PATCH 1/4] fix monster force --- .../src/main/java/com/ljsd/jieling/util/MonsterUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/MonsterUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/MonsterUtil.java index 4b6313a66..703fbbab3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/MonsterUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/MonsterUtil.java @@ -89,7 +89,7 @@ public class MonsterUtil { for(int j = 0; j Date: Thu, 7 Nov 2019 20:39:03 +0800 Subject: [PATCH 2/4] fix mision --- .../jieling/logic/mission/data/DataManagerDistributor.java | 3 ++- .../ljsd/jieling/logic/mission/data/FightDataManager.java | 5 +---- .../jieling/logic/mission/data/FightPlayDataManager.java | 4 ++++ .../jieling/logic/mission/event/MissionEventDistributor.java | 3 ++- 4 files changed, 9 insertions(+), 6 deletions(-) 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()); From 2dd97a9988b2e2309af646cb9bc90c7be199af30 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 7 Nov 2019 20:50:54 +0800 Subject: [PATCH 3/4] fix mission --- .../ljsd/jieling/logic/mission/data/FightPlayDataManager.java | 2 +- .../jieling/logic/mission/event/MissionEventDistributor.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 525357a27..2fa92c5a7 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 @@ -7,7 +7,7 @@ public class FightPlayDataManager implements BaseDataManager{ @Override public CumulationData.Result updateData(CumulationData data, MissionType missionType, Object... parm) { int type = (int)parm[0]; - if(type == 3 && missionType == MissionType.HERO_STORY_PLAY_TIMES){ + if(type == 3 && (missionType == MissionType.HERO_STORY_PLAY_TIMES || missionType == MissionType.HERO_STORY_TIMES)){ data.heroStoryPlayTimes+=(int)parm[1]; }else if(type == 999 && missionType == MissionType.INVASIONBOSS_PLAY_TIMES){ data.invasionbossPlayTimes+=(int)parm[1]; 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 f4ab0360a..5c18a0ebd 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 @@ -123,7 +123,7 @@ public class MissionEventDistributor { typeList.add(MissionType.GENERAL_STORY_PASS); typeList.add(MissionType.HERO_STORY_PASS); - typeList.add(MissionType.HERO_STORY_TIMES); + typeList.add(MissionType.LEVEL_STORY_TIMES); @@ -135,6 +135,7 @@ public class MissionEventDistributor { typeList.add(MissionType.INVASIONBOSS_PLAY_TIMES); typeList.add(MissionType.FAST_ADVENTUREREWARD_TIMES); typeList.add(MissionType.GENERAL_STORY_TIMES); + typeList.add(MissionType.HERO_STORY_TIMES); eventEnumListMap.put(GameEvent.PlAY_STORY,typeList); eventProcessor.put(GameEvent.PlAY_STORY,new CumulationDataEventProcessor()); From f96261e7e0c204254d4b4197dff64ef23024b575 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 7 Nov 2019 21:37:19 +0800 Subject: [PATCH 4/4] FIX --- .../ljsd/jieling/logic/mission/data/DataManagerDistributor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 082b25eda..9cd3ea1e4 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 @@ -52,7 +52,7 @@ public class DataManagerDistributor { judges.put(MissionType.WORKSHOP_CREATE_EQUIP_NUMS,new WorkShopCreateEquipTimesManager()); - judges.put(MissionType.HERO_STORY_TIMES,new FightDataManager()); + judges.put(MissionType.HERO_STORY_TIMES,new FightPlayDataManager()); judges.put(MissionType.LEVEL_STORY_TIMES,new FightDataManager()); judges.put(MissionType.HERO_STORY_PLAY_TIMES,new FightPlayDataManager());