diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index 343fd63436..60eeff7b8e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -114,7 +114,7 @@ function this.GetSkillData(skillId,skinId) skill[3] = EffectCombat.SkillDuration/1000 skill[4] = EffectCombat.SkillNumber skill[5] = EffectCombat.SkillNumbetTime - skill[6] = EffectCombat.AttackDisplaceoffset==nil and {[1]={[1]=0.4,[2]=-0.2}} or EffectCombat.AttackDisplaceoffset + skill[6] = EffectCombat.AttackDisplaceoffset==nil and {[1]=0.4,[2]=-0.2} or EffectCombat.AttackDisplaceoffset local index = 1 for i = 1, #effectList do diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua index eb6fec3b83..332333f139 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua @@ -105,7 +105,7 @@ function Skill:Cast(func) -- if self.id==1282 then -- time=1 -- end - BattleLogic.WaitForTrigger(duration + time+(self.skillnumberTime[1][1]==0 and 0 or self.skillnumberTime[#self.skillnumberTime][2])/1000, function() + BattleLogic.WaitForTrigger(duration + time+((tonumber(self.skillnumberTime)==nil or self.skillnumberTime[1][1]==0) and 0 or self.skillnumberTime[#self.skillnumberTime][2])/1000, function() self.owner.Event:DispatchEvent(BattleEventName.SkillCastEnd, self) BattleLogic.Event:DispatchEvent(BattleEventName.SkillCastEnd, self) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua index e6d099b877..a7a0ce3890 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua @@ -155,7 +155,7 @@ function SkillCaster:OnSkillCast(skill) -- 调用上层接口 if combat.AttackDisplacement ==1 then - self.owner:DelayFunc(combat.AttackDisplaceBackTime/1000+(combat.SkillNumbetTime[1][1]==0 and 0 or combat.SkillNumbetTime[#combat.SkillNumbetTime][2])/1000+1.3, function() + self.owner:DelayFunc(combat.AttackDisplaceBackTime/1000+((tonumber( combat.SkillNumbetTime)==nil or combat.SkillNumbetTime[1][1]==0) and 0 or combat.SkillNumbetTime[#combat.SkillNumbetTime][2])/1000+1.3, function() self.owner.RoleLiveGO.transform:DOMove(startPos, combat.AttackDisplaceTime/1000, false):OnComplete(function () self.owner.GameObject:SetActive(true) self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder= self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder-50