From a692f8d9d4b40200febc4cf135e4d550d8fe3432 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 26 Oct 2021 14:45:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E6=9C=AC=E5=9C=BA=E6=9C=80?= =?UTF-8?q?=E4=BD=B3=E3=80=91=E4=B8=BB=E8=A7=92=E5=90=8D=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BF=AE=E8=A1=8C=E7=AD=89=E7=BA=A7=E6=94=B9?= =?UTF-8?q?=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/View/BattleBestPopup.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBestPopup.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBestPopup.lua index 0fc2cfcbd8..f90ae46c24 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBestPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBestPopup.lua @@ -58,7 +58,7 @@ function this:OnOpen(heroTId, skinId, damageValue, allDamage, func,_func2) heroTData.Scale = 0.6 heroTData.Position = {127, -340} end - heroTData.Name = NameManager.roleName + heroTData.Name = PracticeManager.SetNameColor(NameManager.roleName, PracticeManager.PracticeLevel) end this.liveName = heroTData.Live From c48a16bb6cef813061bda70cc897a88f82ccef35 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 26 Oct 2021 15:17:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E4=B8=BB=E8=A7=92=E6=8A=80=E8=83=BD]=3D?= =?UTF-8?q?=3D=3D=3D=3D=E6=8A=80=E8=83=BD=E5=8D=87=E7=BA=A7=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E9=A2=84=E8=AE=BE=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Practice/PracticeSkillInfoPanel.prefab | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Practice/PracticeSkillInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Practice/PracticeSkillInfoPanel.prefab index 76f862a417..0c4b621d1b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Practice/PracticeSkillInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Practice/PracticeSkillInfoPanel.prefab @@ -34,7 +34,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: -131} + m_AnchoredPosition: {x: 0, y: -148} m_SizeDelta: {x: 827.3, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1016765218 @@ -72,7 +72,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -425,8 +425,8 @@ 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.0024674796, y: -29.9} - m_SizeDelta: {x: 934.5, y: 741.5} + m_AnchoredPosition: {x: -0.0024674796, y: -50.5} + m_SizeDelta: {x: 934.5, y: 782.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6456508445828842645 CanvasRenderer: @@ -573,7 +573,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: 7} + m_AnchoredPosition: {x: 0, y: 24} m_SizeDelta: {x: 827.3, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2083990477332016980 @@ -611,7 +611,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -731,7 +731,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: -247.00005} + m_AnchoredPosition: {x: 0, y: -309} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &204185013497269125 @@ -5831,8 +5831,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -70.935} - m_SizeDelta: {x: -26, y: -448.67} + m_AnchoredPosition: {x: 0, y: -93.79999} + m_SizeDelta: {x: -26, y: -413.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5908738705246960078 CanvasRenderer: @@ -15527,7 +15527,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: -332.00003} + m_AnchoredPosition: {x: 0, y: -386} m_SizeDelta: {x: 260, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1237362095978058062 @@ -20658,7 +20658,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: -34.8, y: -247} + m_AnchoredPosition: {x: -34.8, y: -308.99994} m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5612938726750989706