diff --git a/luafight/Modules/Battle/Logic/BattleLogic.lua b/luafight/Modules/Battle/Logic/BattleLogic.lua index 74e7b78ee..e7a6ca993 100644 --- a/luafight/Modules/Battle/Logic/BattleLogic.lua +++ b/luafight/Modules/Battle/Logic/BattleLogic.lua @@ -160,7 +160,9 @@ function BattleLogic.AddRole(roleData) local data = rolePool:Get() data:Init(curUid, roleData) objList:Add(curUid, data) - BattleLogic.Event:DispatchEvent(BattleEventName.AddRole, data) + if not data.isDead then + BattleLogic.Event:DispatchEvent(BattleEventName.AddRole, data) + end end function BattleLogic.InitAggro() diff --git a/luafight/Modules/Battle/Logic/RoleLogic.lua b/luafight/Modules/Battle/Logic/RoleLogic.lua index 448e97992..0f51fec0b 100644 --- a/luafight/Modules/Battle/Logic/RoleLogic.lua +++ b/luafight/Modules/Battle/Logic/RoleLogic.lua @@ -60,7 +60,7 @@ function RoleLogic:Init(uid, data) Passivity[id](self, args) end - self.isDead = false + self.isDead = self:GetRoleData(RoleDataName.Hp) == 0 self.Auto = true self.IsDebug = false self.enable = true diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java index 6febf68aa..411bdab27 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java @@ -90,7 +90,7 @@ public class BehaviorUtil { CommonProto.FightData.Builder fightData = CommonProto.FightData.newBuilder(); for (TeamPosHeroInfo teamPosHeroInfo : teamPosHeroInfos) { Hero hero = user.getHeroManager().getHero(teamPosHeroInfo.getHeroId()); - if (hero == null || hero.getCurHp() == 0) { + if (hero == null) { continue; } StringBuilder skillSb = new StringBuilder(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java index 53b34c61e..44234f837 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java @@ -190,7 +190,7 @@ public class FightDataUtil { return skill; } SSkillLogicVo sSkillLogicVo = SSkillLogicConfig.getsSkillLogicVo(Integer.valueOf(skillId)); - if (sSkillLogicVo != null) { + if (sSkillLogicVo != null && sSkillLogicVo.getSkillTargetVoList().size()>0) { skill.rawset(1, LuaValue.valueOf(sSkillLogicVo.getCd())); List effectList = getEffect(sSkillLogicVo); int size = effectList.size();