diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua index 08c724aba7..b61ae0d3ec 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua @@ -174,7 +174,7 @@ function BattleLogic.InitOrder() local playerWeaPonList = fightData.playerData.weaponList if playerWeaPonList then for i=1, #playerWeaPonList do - LogError("创建一个神兵") + --LogError("创建一个神兵") FightWeaponManager.AddWeapon(playerWeaPonList[i]) end end @@ -212,7 +212,7 @@ function BattleLogic.InitOrder() local enemyWeaponList = orderList.weaponList if enemyWeaponList then for i=1, #enemyWeaponList do - LogError("创建一个神兵") + --LogError("创建一个神兵") FightWeaponManager.AddWeapon(enemyWeaponList[i]) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Weapon/FightWeapon.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Weapon/FightWeapon.lua index bafde2216c..5ac2b96fc3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Weapon/FightWeapon.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Weapon/FightWeapon.lua @@ -31,7 +31,7 @@ function FightWeapon:Init(data) self.Event:ClearEvent() self.exileTargets={}--已经被放逐过的目标 -- self.skillGroup = MSkillManager.CreateMSkillGroup(self, data.skill) - LogError("神兵初始化=============================") + --LogError("神兵初始化=============================") -- self.skillList=data.skill self.skillNum=#data.skill self.skillGroupList = {} @@ -112,7 +112,9 @@ function FightWeapon:GetStar() return self.star end - +function FightWeapon:IsRealDead() + return false +end -- 数据回收 function FightWeapon:Dispose() diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Weapon/WeaponCondition.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Weapon/WeaponCondition.lua index ea42961e0e..71d89c4652 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Weapon/WeaponCondition.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Weapon/WeaponCondition.lua @@ -181,14 +181,14 @@ local _ConditionConfig = { local comType = condition[2] local comValue = condition[3] if skill.ownHero==nil or skill.ownHero:IsDead() then - LogError("没有持有者") + --LogError("没有持有者") return false end -- 判断 local hpf = skill.ownHero:GetRoleData(RoleDataName.Hp) / skill.ownHero:GetRoleData(RoleDataName.MaxHp) - LogError("hpf==="..hpf) + --LogError("hpf==="..hpf) if BattleUtil.CompareValue(hpf, comValue/10000, comType) then - LogError("触发技能"..hpf) + --LogError("触发技能"..hpf) return true end return false @@ -198,14 +198,14 @@ local _ConditionConfig = { -- 条件检测 function WeaponCondition.CheckCondition(skill, condition) if not condition then - LogError("condition==") + --LogError("condition==") return true end local conId = condition[1] local comType = condition[2] local comValue = condition[3] - LogError("conid=="..conId.." comtype=="..comType.." comvalue=="..comValue) + --LogError("conid=="..conId.." comtype=="..comType.." comvalue=="..comValue) return _ConditionConfig[conId](skill, condition) end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Weapon/WeaponSkillManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Weapon/WeaponSkillManager.lua index 7ee0f2dff8..b8ec6665bf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Weapon/WeaponSkillManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Weapon/WeaponSkillManager.lua @@ -13,7 +13,7 @@ end -- 创建一个技能组 function this.CreateMSkillGroup(monster, groupIndex, skillGroupData) - LogError("创建神兵技能组====================") + --LogError("创建神兵技能组====================") local position = monster:GetCamp() * 6 + monster:GetPosition() if not this.MSkillGroupList then this.MSkillGroupList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua index 447c003e72..82419abb05 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua @@ -856,7 +856,10 @@ function this.SetRoleHighLight(caster, targets, func) for _, data in ipairs(targets) do if caster ~= tbRole[data] then max = max - 1 - tbRole[data]:SetHighLight(true, 1, 0.2) + if tbRole[data] then + tbRole[data]:SetHighLight(true, 1, 0.2) + end + end end end