战斗部分修改
parent
10b4329744
commit
dd16083da3
|
@ -3146,8 +3146,8 @@ local effectList = {
|
|||
local dt = args[2]
|
||||
|
||||
caster.Event:DispatchEvent(BattleEventName.RoleViewBullet, skill, target)
|
||||
local skillNumberTime=skill.skillnumberTime or nil
|
||||
if skillNumberTime and (tonumber(skillNumberTime)~=nil and skillNumberTime[1][1]~=0) then
|
||||
local skillNumberTime=skill.skillnumberTime or nil
|
||||
if skillNumberTime and (type(skillNumberTime[1][1]) ~= "userdata" and skillNumberTime[1][1]~=0) then
|
||||
for i = 1, #skillNumberTime do
|
||||
local index=i
|
||||
BattleLogic.WaitForTrigger(skillNumberTime[index][2]/1000, function ()
|
||||
|
|
|
@ -105,7 +105,7 @@ function Skill:Cast(func)
|
|||
-- if self.id==1282 then
|
||||
-- time=1
|
||||
-- end
|
||||
BattleLogic.WaitForTrigger(duration + time+((tonumber(self.skillnumberTime)==nil or self.skillnumberTime[1][1]==0) and 0 or self.skillnumberTime[#self.skillnumberTime][2])/1000, function()
|
||||
BattleLogic.WaitForTrigger(duration + time+((type(self.skillnumberTime[1][1]) == "userdata" 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)
|
||||
|
||||
|
|
|
@ -87,7 +87,7 @@ function SkillSetView:Show(camp, pos, BattleView)
|
|||
self.nt9.text = nCombat.AttackDisplacement
|
||||
self.nt10.text = nCombat.AttackDisplaceoffset==nil and "" or (nCombat.AttackDisplaceoffset[1].."#"..nCombat.AttackDisplaceoffset[2])
|
||||
self.nt11.text = nCombat.ActionTime
|
||||
self.nt12.text = (tonumber(nCombat.SkillNumbetTime)==nil or nCombat.SkillNumbetTime[1][1]==0) and "" or self:SetStr(nCombat.SkillNumbetTime)
|
||||
self.nt12.text = (type(nCombat.SkillNumbetTime[1][1]) == "userdata" or nCombat.SkillNumbetTime[1][1]==0) and "" or self:SetStr(nCombat.SkillNumbetTime)
|
||||
self.nt14.text = nCombat.EffectType
|
||||
-- self.nt13.text = nCombat.Offset and nCombat.Offset[1].."#"..nCombat.Offset[2] or ""
|
||||
|
||||
|
@ -104,7 +104,7 @@ function SkillSetView:Show(camp, pos, BattleView)
|
|||
self.st9.text = sCombat.AttackDisplacement
|
||||
self.st10.text = sCombat.AttackDisplaceoffset==nil and "" or (sCombat.AttackDisplaceoffset[1].."#"..sCombat.AttackDisplaceoffset[2])
|
||||
self.st11.text = sCombat.ActionTime
|
||||
self.st12.text =(tonumber(sCombat.SkillNumbetTime)==nil or sCombat.SkillNumbetTime[1][1]==0 )and "" or self:SetStr(sCombat.SkillNumbetTime)
|
||||
self.st12.text =(type(sCombat.SkillNumbetTime[1][1]) == "userdata" or sCombat.SkillNumbetTime[1][1]==0 )and "" or self:SetStr(sCombat.SkillNumbetTime)
|
||||
self.st14.text = sCombat.EffectType
|
||||
-- self.st13.text = sCombat.Offset and sCombat.Offset[1].."#"..sCombat.Offset[2] or ""
|
||||
end
|
||||
|
|
|
@ -55,12 +55,12 @@ function SkillCaster:OnSkillCast(skill)
|
|||
if IsNull(self.owner.GameObject) then
|
||||
return
|
||||
end
|
||||
local type=0
|
||||
local localtype=0
|
||||
if self.roleConfig and self.roleConfig.ReadyAction and (self.roleConfig.ReadyAction>0) and (skill.type==BattleSkillType.Special or skill.type==BattleSkillType.Extra or skill.type==BattleSkillType.DeadSkill)then
|
||||
-- type=1
|
||||
-- self.actionTime=self.roleConfig.ReadyAction/1000
|
||||
end
|
||||
type=skill.type==BattleSkillType.Special and BattleSkillType.Special or 0
|
||||
localtype=skill.type==BattleSkillType.Special and BattleSkillType.Special or 0
|
||||
-- if self.owner.role.readyAction~=0 then
|
||||
|
||||
-- self.actionTime=self.owner.role.readyAction/1000
|
||||
|
@ -77,7 +77,7 @@ function SkillCaster:OnSkillCast(skill)
|
|||
-- elseif self.owner.SkillAttackDisplaceoffset then
|
||||
-- displaceoffset=self.owner.SkillAttackDisplaceoffset
|
||||
-- end
|
||||
if skill.AttackDisplaceOffset and tonumber(skill.AttackDisplaceOffset) ~= nil then
|
||||
if skill.AttackDisplaceOffset then
|
||||
displaceoffset=skill.AttackDisplaceOffset
|
||||
end
|
||||
self.owner.GameObject:SetActive(false)
|
||||
|
@ -86,7 +86,7 @@ function SkillCaster:OnSkillCast(skill)
|
|||
local t= self.owner.RootPanel.GetRoleView(target)
|
||||
self.owner.RoleLiveGO.transform:DOMove(Vector3.New(t.GameObject.transform.position.x-(self.owner.camp==0 and displaceoffset[1] or(-displaceoffset[1])),t.GameObject.transform.position.y+displaceoffset[2],t.GameObject.transform.position.z), combat.AttackDisplaceTime/1000, false):OnComplete(function ()
|
||||
if self.owner.OnSkillPlay then
|
||||
self.owner:OnSkillPlay(type,combat)
|
||||
self.owner:OnSkillPlay(localtype,combat)
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
@ -104,7 +104,7 @@ function SkillCaster:OnSkillCast(skill)
|
|||
-- elseif self.owner.SkillAttackDisplaceoffset then
|
||||
-- displaceoffset=self.owner.SkillAttackDisplaceoffset
|
||||
-- end
|
||||
if skill.AttackDisplaceOffset and tonumber(skill.AttackDisplaceOffset) ~= nil then
|
||||
if skill.AttackDisplaceOffset then
|
||||
displaceoffset=skill.AttackDisplaceOffset
|
||||
end
|
||||
self.owner.GameObject:SetActive(false)
|
||||
|
@ -155,7 +155,7 @@ function SkillCaster:OnSkillCast(skill)
|
|||
-- 调用上层接口
|
||||
|
||||
if combat.AttackDisplacement ==1 then
|
||||
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:DelayFunc(combat.AttackDisplaceBackTime/1000+((type(combat.SkillNumbetTime[1][1]) == "userdata" 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
|
||||
|
|
Loading…
Reference in New Issue