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 c3e53edc5..56a7862e5 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 @@ -3,7 +3,6 @@ package com.ljsd.jieling.logic.mission.data; import com.ljsd.jieling.logic.dao.CumulationData; import com.ljsd.jieling.logic.mission.MissionType; import config.SChallengeConfig; -import config.SMainLevelConfig; public class FightDataManager implements BaseDataManager{ @Override @@ -24,22 +23,18 @@ public class FightDataManager implements BaseDataManager{ if(fightType == 1){ if(missionType == MissionType.HERO_LEVLE_TIMES){ data.heroStoryTimes+=fightTimes; - result = new CumulationData.Result(missionType); + result = new CumulationData.Result(missionType); }else if(missionType == MissionType.GENERAL_STORY_PASS){ - SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(fightId); - if(sChallengeConfig.getType() == 1){ - result = new CumulationData.Result(missionType); - } - result = new CumulationData.Result(missionType); + result = new CumulationData.Result(missionType); }else if(missionType == MissionType.HERO_STORY_PASS){ SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(fightId); if(sChallengeConfig.getType() == 3){ - result = new CumulationData.Result(missionType); + result = new CumulationData.Result(missionType); } }else if(missionType ==MissionType.COMHERO_STORY_PASS){ SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(fightId); if(sChallengeConfig.getType() == 3||sChallengeConfig.getType() == 1){ - result = new CumulationData.Result(missionType); + result = new CumulationData.Result(missionType); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MistyTripEventProcessor.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MistyTripEventProcessor.java index a80a7f265..f84ad8f5e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MistyTripEventProcessor.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MistyTripEventProcessor.java @@ -21,7 +21,7 @@ public class MistyTripEventProcessor implements BaseGameEventProcessor{ if(type == MissionType.FINISH_EXPEDITION_HERO_TIMES){ continue; } - if(type!= MissionType.LEVEL_STORY_PASS ){ + if(type != MissionType.LEVEL_STORY_PASS){ user.getUserMissionManager().calCumulationDataResult(user,type,misionTypeListMap,parm); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/soldier/SoldierLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/soldier/SoldierLogic.java index 1408ae60d..5253b83fe 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/soldier/SoldierLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/soldier/SoldierLogic.java @@ -291,7 +291,7 @@ public class SoldierLogic { mainLevelManager.setSoldierLayerId(stageConfig.getNextId()); mainLevelManager.putSoldierState(stageConfig.getId(), TimeUtils.nowInt()); // 通关奖励 - CommonProto.Drop.Builder drop = ItemUtil.drop(user, stageConfig.getReward(), BIReason.SOLDIER_MIAN_LEVEL_REWARD, 0); + CommonProto.Drop.Builder drop = ItemUtil.drop(user, stageConfig.getReward(), 1, BIReason.SOLDIER_MIAN_LEVEL_REWARD); builder.setDrop(drop); builder.setResult(1); }