diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CumulationData.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CumulationData.java index 337eeb5dd..04f537993 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CumulationData.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CumulationData.java @@ -36,8 +36,6 @@ public class CumulationData { */ private Map heroLevleCountMap = new HashMap<>(); - public Map levlePassMap = new HashMap<>(); - /** * key:副本类型 value:战斗次数 */ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java index f0021b027..bb1bdf431 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java @@ -513,8 +513,8 @@ public class FriendLogic { if(check){ friendManager1.updateHaveRewardMap(uid,1); sendFriendStatedication(uid,friendId,2); - times++; } + times++; }else{ //赠送全部好友 for (Integer friendUserId : friends) { if (giveMap.get(friendUserId) == 1) { @@ -527,12 +527,12 @@ public class FriendLogic { continue; } friendManager.updateGiveMap(friendUserId,1); - boolean check = friendUser.getPlayerInfoManager().check(STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting().getMaxEnergyGet(), 0); + boolean check = friendUser.getPlayerInfoManager().check(STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting().getMaxEnergyGet(), 1); if(check){ friendManager1.updateHaveRewardMap(uid,1); sendFriendStatedication(uid,friendUserId,2); - times++; } + times++; } } user.getUserMissionManager().onGameEvent(user, GameEvent.GIVE_PRESENT,times); 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 ee34efd63..cf01c0c90 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 @@ -443,12 +443,9 @@ public class MissionLoigc { break; case LEVEL_STORY_PASS: if(SMainLevelConfig.config.containsKey(missionSubType[0])){ - int type = SMainLevelConfig.config.get(missionSubType[0]).getDifficulty(); - if(cumulationData.levlePassMap.containsKey(type)){ - count =missionSubType[0] <=cumulationData.levlePassMap.get(type) ?1:0; - } + int virtureId = SMainLevelConfig.config.get(missionSubType[0]).getVirtureId(); + count =virtureId <= SMainLevelConfig.config.get(user.getMainLevelManager().getFightId()).getVirtureId() ?1:0; } - break; case GENERAL_STORY_PASS: count = cumulationData.getExploreFight().get(missionSubType[0])?1:0; 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 f297d6718..b7656d76a 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 @@ -17,20 +17,8 @@ public class FightDataManager implements BaseDataManager{ data.levelStoryTimes+=fightTimes; result = new CumulationData.Result(missionType); }else if(missionType == MissionType.LEVEL_STORY_PASS){ - SMainLevelConfig sMainLevelConfig = SMainLevelConfig.config.get(fightId); - int type = sMainLevelConfig.getDifficulty(); - Integer maxFightId = data.levlePassMap.get(type); - if(maxFightId!=null){ - if(fightId>maxFightId){ - data.levlePassMap.put(type,fightId); - result = new CumulationData.Result(missionType); - } - }else{ - data.levlePassMap.put(type,fightId); - result = new CumulationData.Result(missionType); - } + result = new CumulationData.Result(missionType); } - } if(fightType == 1){