From 3d923c71c61fa31825adc326c56a4b278f87bb4c Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1545929779@qq.com> Date: Thu, 16 May 2024 17:19:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E9=80=82=E9=85=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4=20=E5=90=8C=E6=AD=A5bt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/RoleInfo/RoleInfoPanel.prefab | 28 +++++++++---------- .../Modules/Battle/View/Unit/FloatNode.lua | 6 ++-- .../Modules/Fight/FightPointPassMainPanel.lua | 5 ++-- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab index ed576f3636..1b9ad41f4f 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab @@ -421,7 +421,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 58, y: 88.3} + m_AnchoredPosition: {x: 58, y: 88.29999} m_SizeDelta: {x: 116, y: 121} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222314782803893496 @@ -24671,9 +24671,9 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1920} m_Pivot: {x: 0.5, y: 0} --- !u!222 &222203291434562958 CanvasRenderer: @@ -54840,7 +54840,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 73.7, y: -132.7} + m_AnchoredPosition: {x: 73.69995, y: -132.7002} m_SizeDelta: {x: 98, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3901079369435443197 @@ -55194,7 +55194,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 242.46, y: -290.6} + m_AnchoredPosition: {x: 242.46002, y: -290.6} m_SizeDelta: {x: 163.87, y: 157.67} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &869272353418350530 @@ -55310,7 +55310,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -154} + m_AnchoredPosition: {x: 0, y: -154.00002} m_SizeDelta: {x: 156, y: 422} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7953302478879648176 @@ -56817,10 +56817,10 @@ RectTransform: m_Father: {fileID: 876807614588729422} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -560} - m_SizeDelta: {x: 1082, y: 802} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 400} + m_SizeDelta: {x: 2, y: 802} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2218897297810179238 CanvasRenderer: @@ -59716,10 +59716,10 @@ RectTransform: m_Father: {fileID: 876807614588729422} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -600} - m_SizeDelta: {x: 1082, y: 857} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 360} + m_SizeDelta: {x: 2, y: 857} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3142595953170355756 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/FloatNode.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/FloatNode.lua index 935c612e1d..6f8a9a5171 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/FloatNode.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/FloatNode.lua @@ -251,7 +251,9 @@ function FloatNode:ArtFloating(type, color, value,frameColor) end -function FloatNode:ArtFloatingOnHook(type, color, value,frameColor) +function FloatNode:ArtFloatingOnHook(type, color, value,sort) + + LogError("sort==================="..sort) local go = BattleManager.LoadAsset(floatingEffect) go.transform:SetParent(self.RootPanel.transform) go.transform.localScale = Vector3.one * 0.5 @@ -287,7 +289,7 @@ function FloatNode:ArtFloatingOnHook(type, color, value,frameColor) --主要用于给白色字体染色成其他颜色,color 参数只能填白色 -- 层级和动画 if anim then - anim:GetComponent("Canvas").sortingOrder = BattleManager.GetBattleSorting() + 100 + anim:GetComponent("Canvas").sortingOrder = sort--BattleManager.GetBattleSorting() + 100 --anim:GetComponent("Animator"):Play(ArtFloatingAnim[type]) end diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index 4b86bb9a9c..dbfd46e566 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -812,7 +812,8 @@ function this.BattleLogic() local heroPower=math.floor(power*(1+SmallSoldierManager.soliderAdd/100)+0.5) bossHp=bossHp - heroPower allAttacck=allAttacck+heroPower - this.Floater:ArtFloatingOnHook(ArtFloatingType.Damage,ArtFloatingColor.White,heroPower) + + this.Floater:ArtFloatingOnHook(ArtFloatingType.Damage,ArtFloatingColor.White,heroPower,orginLayer) --end isHit=true @@ -860,7 +861,7 @@ function this.BattleLogic() --LogError("attack============================================="..power) bossHp=bossHp-attack allAttacck=allAttacck+attack - this.Floater:ArtFloatingOnHook(ArtFloatingType.Damage,ArtFloatingColor.White,attack) + this.Floater:ArtFloatingOnHook(ArtFloatingType.Damage,ArtFloatingColor.White,attack,orginLayer) aaa.spineAni.AnimationState:SetAnimation(0, "move3",true) this.SetHp(curSoliderStageConfig.Hp,bossHp,curSoliderStageConfig.HpNumber) end)