From eed480f7113349162b802eedc4adb6753a936d10 Mon Sep 17 00:00:00 2001 From: "DESKTOP-MMO982B\\User" <752966621@qq.com> Date: Wed, 6 Aug 2025 23:39:30 +0700 Subject: [PATCH] 1 --- .../~Lua/Modules/Battle/View/Unit/EnemyView.lua | 7 ++++--- .../~Lua/Modules/Battle/View/Unit/PlayerView.lua | 4 ++-- .../~Lua/Modules/Formation/FormationPanelV2.lua | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua index d3fe0a6b9f..744ad6535a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua @@ -479,7 +479,7 @@ function EnemyView:PlaySpineAnim(gog, time, name, isLoop) local _complete = nil _complete = function(state) gog.AnimationState.Complete = gog.AnimationState.Complete - _complete - if endWith(gog.gameObject.name, "skill") then + if endWith(gog.gameObject.name, "skill") or endWith(gog.gameObject.name, "gx") then gog.gameObject:SetActive(false) else gog.AnimationState:SetAnimation(0, "idle", true) @@ -722,8 +722,9 @@ function EnemyView:OnceDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotTyp --if self.isDead then return end if dotType then if dotType == DotType.Poison then - self.Floater:ArtFloating(ArtFloatingType.PoisonDamage, ArtFloatingColor.Poison, dmg, - TextFloatingColor.DarkGreen, t, pos) + --self.Floater:ArtFloating(ArtFloatingType.PoisonDamage, ArtFloatingColor.Poison, dmg, + --TextFloatingColor.DarkGreen, t, pos) + self.Floater:ArtFloating(ArtFloatingType.PoisonDamage, ArtFloatingColor.Poison, dmg, t, pos) elseif dotType == DotType.Burn then self.Floater:ArtFloating(ArtFloatingType.FireDamage, ArtFloatingColor.Fire, dmg, t, pos) elseif dotType == DotType.Blooding then diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua index f0eaa49fd7..e7b12ee422 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua @@ -533,7 +533,7 @@ function PlayerView:PlaySpineAnim(gog, time, name, isLoop) gog.AnimationState.Complete = gog.AnimationState.Complete - _complete self.currAniName="idle" - if endWith(gog.gameObject.name,"skill") then + if endWith(gog.gameObject.name,"skill") or endWith(gog.gameObject.name,"gx") then gog.gameObject:SetActive(false) else gog.AnimationState:SetAnimation(0, "idle", true) @@ -640,7 +640,7 @@ function PlayerView:OnSkillCastingStart(type) -- coroutine.start(function() -- coroutine.wait(1.1) -- end) - + self:PlaySpineAnim(self.RoleLiveGOGraphic2, 0,name, false) end diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index b09549b08b..3f434ee572 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -1237,7 +1237,7 @@ function this.OnEndDrag(Pointgo,data)--结束拖动 local heroObj=Util.GetGameObject(this.gameObject,"Hero".._j) heroObj:GetComponent("Image").raycastTarget = true heroObj.transform:DOScale(Vector3.one * 1, 0.15) - heroObj.transform:DOAnchorPos(Vector3.one,0) + heroObj.transform:DOAnchorPos(Vector3.New(0,122,0),0) heroObj.transform:SetParent(bgListGo[_j].transform) heroObj.transform:SetSiblingIndex(1)