diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index c16666954..df375979d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -23,13 +23,10 @@ import com.ljsd.jieling.logic.activity.event.NewWelfareEvent; import com.ljsd.jieling.logic.activity.event.NewWelfareTypeEnum; import com.ljsd.jieling.logic.activity.event.Poster; import com.ljsd.jieling.logic.activity.event.SecretEvent; -import com.ljsd.jieling.logic.activity.fourChallenge.FourChallengeLogic; import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.fight.passiveSkillCal.PassiveskillCalEnum; import com.ljsd.jieling.logic.fight.result.FightResult; -import com.ljsd.jieling.logic.help.HelpHero; -import com.ljsd.jieling.logic.help.HelpHeroLogic; import com.ljsd.jieling.logic.hero.HeroAttributeEnum; import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.logic.mail.MailLogic; @@ -38,9 +35,6 @@ import com.ljsd.jieling.logic.mission.MissionType; import com.ljsd.jieling.logic.player.PlayerLogic; import com.ljsd.jieling.logic.store.StoreLogic; import com.ljsd.jieling.network.session.ISession; -import rpc.protocols.CommonProto; -import rpc.protocols.FightInfoProto; -import rpc.protocols.MessageTypeProto; import com.ljsd.jieling.util.*; import config.*; import manager.STableManager; @@ -48,6 +42,9 @@ import org.luaj.vm2.LuaValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.redis.core.ZSetOperations; +import rpc.protocols.CommonProto; +import rpc.protocols.FightInfoProto; +import rpc.protocols.MessageTypeProto; import util.MathUtils; import util.StringUtil; import util.TimeUtils; @@ -765,6 +762,9 @@ public class CombatLogic { } List teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(teamId); + if (teamPosHeroInfos == null){ + return passiveskillEffect; + } List passiveTeamskillEffect = new ArrayList<>(); for(TeamPosHeroInfo teamPosHeroInfo :teamPosHeroInfos){ Hero hero = user.getHeroManager().getHero(teamPosHeroInfo.getHeroId()); @@ -776,14 +776,6 @@ public class CombatLogic { }else { continue; } - }else if (FourChallengeLogic.isFourChallengeTeam(teamId)){ - // 四灵试炼,助战 - HelpHero helpHero = HelpHeroLogic.getHelpHeroByHeroId(user.getId(), teamPosHeroInfo.getHeroId()); - if (helpHero != null){ - hero = helpHero.getHero(); - }else { - continue; - } } } if (hero == null) { @@ -815,14 +807,15 @@ public class CombatLogic { public int[][] elementEffect(User user,int teamId){ int[][] teamParm = user.getTeamPosManager().getCacheTeamPro().get(teamId); - if(teamParm!=null){ + if(teamParm != null){ return teamParm; } Map configMap = SElementalResonanceConfig.configMap; - - List teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(teamId); + if (teamPosHeroInfos == null){ + return null; + } //找出上场的Id List heroFind = new ArrayList<>(teamPosHeroInfos.size()); @@ -832,14 +825,6 @@ public class CombatLogic { heroFind.add(user.getExpeditionManager().getHeroMap().get(key.getHeroId())); continue; } - // 四灵试炼 - if (FourChallengeLogic.isFourChallengeTeam(teamId)){ - HelpHero helpHero = HelpHeroLogic.getHelpHeroByHeroId(user.getId(), key.getHeroId()); - if (helpHero != null){ - heroFind.add(helpHero.getHero()); - continue; - } - } Hero hero = user.getHeroManager().getHero(key.getHeroId()); heroFind.add(hero); }