战斗添加空判断,结算界面修改

wangzhenxing 2023-11-09 17:29:29 +08:00
parent 437d083f68
commit 477f3356d8
4 changed files with 14 additions and 32 deletions

View File

@ -7085,7 +7085,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 152}
m_AnchoredPosition: {x: 0, y: 100}
m_SizeDelta: {x: 252.3, y: 0}
m_Pivot: {x: 1, y: 0}
--- !u!114 &1414705437977451223
@ -75123,32 +75123,6 @@ MonoBehaviour:
loop: 0
loopType: 0
targetObj: {fileID: 8831099743542526053}
- initV3: {x: 461, y: 50, z: 0}
initFloat: 0
isInit: 1
changeV3: {x: -50, y: 50, z: 0}
changeFloat: 0
duration: 0.2
delay: 0
curveType: 1
changeType: 0
sequeueType: 1
loop: 0
loopType: 0
targetObj: {fileID: 7019400324678272696}
- initV3: {x: 0, y: 0, z: 0}
initFloat: 0
isInit: 1
changeV3: {x: 0, y: 0, z: 0}
changeFloat: 1
duration: 0.5
delay: 0
curveType: 1
changeType: 6
sequeueType: 1
loop: 999999999
loopType: 1
targetObj: {fileID: 19914098443950123}
isPlayAudio: 0
isHaveCloseBtn: 0
isPlayOnOpen: 1

View File

@ -106,7 +106,11 @@ function Skill:Cast(func)
-- time=1
-- end
-- LogError("Pasue"..os.date())
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()
local addTime=0
if self.skillnumberTime and self.skillnumberTime[1] then
addTime=((type(self.skillnumberTime[1][1]) == "userdata" or self.skillnumberTime[1][1]==0) and 0 or self.skillnumberTime[#self.skillnumberTime][2])/1000
end
BattleLogic.WaitForTrigger(duration + time+addTime, function()
self.owner.Event:DispatchEvent(BattleEventName.SkillCastEnd, self)
BattleLogic.Event:DispatchEvent(BattleEventName.SkillCastEnd, self)
-- LogError("End"..os.date())

View File

@ -38,6 +38,7 @@ function this:OnOpen(heroTId, skinId, damageValue, allDamage, func,_func2)
-- 创建立绘
local heroTData = {}
local toward=0
LogError("heroTId======================="..heroTId)
if heroTId > 0 then
--如果有皮肤读取皮肤表里面的数据没有读取hero表
local data = nil
@ -59,17 +60,20 @@ function this:OnOpen(heroTId, skinId, damageValue, allDamage, func,_func2)
else
if NameManager.roleSex == ROLE_SEX.BOY then
heroTData.Live = "live2d_npc_boy"
heroTData.Painting="live2d_npc_boy"
heroTData.Scale = 0.6
heroTData.Position = {127, -164}
else
heroTData.Live = "live2d_npc_girl"
heroTData.Painting="live2d_npc_girl"
heroTData.Scale = 0.6
heroTData.Position = {127, -340}
end
heroTData.Name = PracticeManager.SetNameColor(NameManager.roleName, PracticeManager.PracticeLevel)
end
this.liveName = heroTData.Painting
LogError("this.liveName================="..this.liveName)
this.liveNode = poolManager:LoadLive(this.liveName, this.firstRole.transform, Vector3.one * heroTData.Scale, Vector3.New(heroTData.Position[1], heroTData.Position[2]+300))
this.liveNode.transform.sizeDelta = Vector2.New(10, 10)
SetHEeroLiveToward(this.liveNode,toward)

View File

@ -70,7 +70,7 @@ function SkillCaster:OnSkillCast(skill)
-- if self.owner.OnSkillPlay then
-- self.owner:OnSkillPlay(type)
-- end
self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder= self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder+50
--self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder= self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder+50
if combat.AttackDisplacement ==1 then
local displaceoffset={[1]=0.4,[2]=-0.2}
-- if skill.type==2 and self.owner.superSkillAttackDisplaceoffset then
@ -161,7 +161,7 @@ function SkillCaster:OnSkillCast(skill)
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, 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
--self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder= self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder-50
if self.owner.OnSkillEnd then
self.owner:OnSkillEnd()
end
@ -170,7 +170,7 @@ function SkillCaster:OnSkillCast(skill)
LogError("combat.AttackDisplaceBackTime"..combat.AttackDisplaceBackTime)
end)
else
self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder= self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder-50
--self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder= self.owner.RoleLiveGO.transform.parent.gameObject:GetComponent("Canvas").sortingOrder-50
if self.owner.OnSkillEnd then
self.owner:OnSkillEnd()
end