From fb2139ffefce9ac71069584e15e7090ef14d5a61 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 27 Apr 2021 22:30:17 +0800 Subject: [PATCH] =?UTF-8?q?=20=E3=80=90=E8=B8=8F=E7=A2=8E=E5=87=8C?= =?UTF-8?q?=E9=9C=84=E3=80=91=E6=88=98=E6=96=97=E4=B8=AD=E6=8E=89=E8=90=BD?= =?UTF-8?q?=E7=9A=84=E5=AE=9D=E7=AE=B1=E7=89=B9=E6=95=88=EF=BC=8C=E4=BC=9A?= =?UTF-8?q?=E5=9C=A8=E7=BB=93=E7=AE=97=E7=95=8C=E9=9D=A2=E7=A9=BF=E9=80=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab | 8 ++++---- .../~Lua/Modules/Battle/View/BattlePanel.lua | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab index 4b34fe6286..8e36e3b862 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab @@ -44371,7 +44371,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &803833580 RectTransform: m_ObjectHideFlags: 0 @@ -93233,7 +93233,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 410 + m_SortingOrder: 1 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -98506,7 +98506,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 410 + m_SortingOrder: 1 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -213853,7 +213853,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 410 + m_SortingOrder: 1 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index e05b0fc9d5..2544e83b58 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -212,6 +212,9 @@ end function this:OnSortingOrderChange() Util.AddParticleSortLayer(this.gameObject, this.sortingOrder - orginLayer) + for _, v in pairs(boxList2) do + Util.AddParticleSortLayer(v.obj, this.sortingOrder - orginLayer) + end orginLayer = this.sortingOrder BattleView:OnSortingOrderChange(this.sortingOrder) @@ -801,7 +804,9 @@ function this.RefreshMyDamageShow(role) this.dmg3Text.text = string.format("%s/%s",num1,num2) this.dmg3Progress.fillAmount = num1/num2 + LogGreen(#boxs) for i = 1, #boxs do + LogGreen(tostring(myDamage).."|"..tostring(boxs[i][1])) if myDamage >= boxs[i][1] then if boxList2[i+1] then boxList2[i+1].obj:SetActive(true)