From 64e2464cf93111581a3beed16bd86e1fa6120866 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 23 Feb 2021 17:04:52 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9C=AC=E5=9C=B0=E5=8C=96=E3=80=91?= =?UTF-8?q?=E9=A2=84=E8=AE=BE=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Popup/GeneralPopup.prefab | 16 +- .../UI/Recruit/HeroPreviewPanel.prefab | 2 +- .../Prefabs/UI/Recruit/RecruitPanel.prefab | 4 +- .../Prefabs/UI/RoleInfo/RoleInfoPanel.prefab | 192 +++++++++--------- .../~Lua/Modules/RoleInfo/RoleInfoLayout.lua | 2 + 5 files changed, 109 insertions(+), 107 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index a3783fd24d..eadd846504 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -9433,8 +9433,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, y: 19.2} - m_SizeDelta: {x: 896.2, y: 159.9} + m_AnchoredPosition: {x: 0, y: -12} + m_SizeDelta: {x: 850, y: 187.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2665892594117541411 CanvasRenderer: @@ -9474,7 +9474,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u6D88\u8017" @@ -14727,7 +14727,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &952792893445881680 RectTransform: m_ObjectHideFlags: 0 @@ -24393,7 +24393,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: -94.7} + m_AnchoredPosition: {x: 0, y: -148} m_SizeDelta: {x: 284.66, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2469198455549241004 @@ -33452,7 +33452,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: 0.000030517578, y: -73.150055} + m_AnchoredPosition: {x: 0.000061035156, y: -73.150055} m_SizeDelta: {x: 0, y: 151} m_Pivot: {x: 0, y: 0.5} --- !u!114 &3467615898781068815 @@ -34871,8 +34871,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, y: 170} - m_SizeDelta: {x: 896.2, y: 141.7} + m_AnchoredPosition: {x: 0, y: 160} + m_SizeDelta: {x: 850, y: 141.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1871382871495151358 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/HeroPreviewPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/HeroPreviewPanel.prefab index f016c910ba..6bb0d40915 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/HeroPreviewPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/HeroPreviewPanel.prefab @@ -3688,7 +3688,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u7CFB\u7EDF" LanguageIndex: 0 --- !u!1 &5240942908928993334 diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab index ea8b20dbe0..85f1ed7093 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab @@ -55692,10 +55692,10 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 100/100 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab index 5ba447389b..5d5d37b65a 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab @@ -58996,7 +58996,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -91, y: -0.000030517578} - m_SizeDelta: {x: 182, y: 0} + m_SizeDelta: {x: 182, y: 120} m_Pivot: {x: 0, y: 0} --- !u!114 &7716556866937241452 MonoBehaviour: @@ -59070,9 +59070,9 @@ RectTransform: m_Father: {fileID: 7295048416073556648} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -105} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6293738349772940894 @@ -60260,7 +60260,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &840173934772304902 RectTransform: m_ObjectHideFlags: 0 @@ -61166,9 +61166,9 @@ RectTransform: m_Father: {fileID: 4541478915873727879} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -45} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3642604312009482522 @@ -61715,9 +61715,9 @@ RectTransform: m_Father: {fileID: 8132432201149559645} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -105} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7704455903665646899 @@ -62483,9 +62483,9 @@ RectTransform: m_Father: {fileID: 7295048416073556648} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -15} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7718811026139484982 @@ -64008,9 +64008,9 @@ RectTransform: m_Father: {fileID: 1380306822718338942} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -45} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6819546123054133093 @@ -65313,7 +65313,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: 122.6, y: -1.17} + m_AnchoredPosition: {x: 130.2, y: -1.17} m_SizeDelta: {x: 47.75, y: 47.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1848951108082559724 @@ -65758,9 +65758,9 @@ RectTransform: m_Father: {fileID: 8132432201149559645} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -45} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6305703403464516542 @@ -67834,9 +67834,9 @@ RectTransform: m_Father: {fileID: 3730962970155661078} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -105} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8896393016290572564 @@ -69115,7 +69115,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -91, y: -0.000030517578} - m_SizeDelta: {x: 182, y: 0} + m_SizeDelta: {x: 182, y: 120} m_Pivot: {x: 0, y: 0} --- !u!114 &8045513997360252457 MonoBehaviour: @@ -69264,9 +69264,9 @@ RectTransform: m_Father: {fileID: 3730962970155661078} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -15} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6058400795339030386 @@ -69830,9 +69830,9 @@ RectTransform: m_Father: {fileID: 8132432201149559645} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -15} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6276223281847147389 @@ -70239,9 +70239,9 @@ RectTransform: m_Father: {fileID: 1380306822718338942} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -75} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3296711350632739724 @@ -70586,7 +70586,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -91, y: -0.000030517578} - m_SizeDelta: {x: 182, y: 0} + m_SizeDelta: {x: 182, y: 120} m_Pivot: {x: 0, y: 0} --- !u!114 &6636847728002421429 MonoBehaviour: @@ -71381,9 +71381,9 @@ RectTransform: m_Father: {fileID: 4895505664369319088} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -45} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &521379369712413680 @@ -71640,9 +71640,9 @@ RectTransform: m_Father: {fileID: 7295048416073556648} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -45} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1179351883629679917 @@ -71750,9 +71750,9 @@ RectTransform: m_Father: {fileID: 3730962970155661078} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -45} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3710313158769034933 @@ -72316,7 +72316,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -91, y: -0.000030517578} - m_SizeDelta: {x: 182, y: 0} + m_SizeDelta: {x: 182, y: 120} m_Pivot: {x: 0, y: 0} --- !u!114 &7481647496055839640 MonoBehaviour: @@ -73095,9 +73095,9 @@ RectTransform: m_Father: {fileID: 4895505664369319088} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -105} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9070288074335434717 @@ -73689,9 +73689,9 @@ RectTransform: m_Father: {fileID: 4541478915873727879} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -105} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9017234893772538220 @@ -74801,9 +74801,9 @@ RectTransform: m_Father: {fileID: 4541478915873727879} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -75} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2428849437926791309 @@ -74911,9 +74911,9 @@ RectTransform: m_Father: {fileID: 4895505664369319088} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -75} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4406657073510055766 @@ -75636,9 +75636,9 @@ RectTransform: m_Father: {fileID: 4541478915873727879} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -15} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5761080816857987712 @@ -76404,7 +76404,7 @@ GameObject: - component: {fileID: 8489987792158475684} - component: {fileID: 761492748278873013} m_Layer: 5 - m_Name: Image + m_Name: Ima m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -77868,7 +77868,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -91, y: -0.000030517578} - m_SizeDelta: {x: 182, y: 0} + m_SizeDelta: {x: 182, y: 120} m_Pivot: {x: 0, y: 0} --- !u!114 &8821236652887202007 MonoBehaviour: @@ -78323,9 +78323,9 @@ RectTransform: m_Father: {fileID: 9033830650798519355} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1030, y: -216.25} m_SizeDelta: {x: 220, y: 428.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5921230247867810353 @@ -82039,9 +82039,9 @@ RectTransform: m_Father: {fileID: 9033830650798519355} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 800, y: -216.25} m_SizeDelta: {x: 220, y: 428.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7487634036415906259 @@ -82617,9 +82617,9 @@ RectTransform: m_Father: {fileID: 9033830650798519355} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 340, y: -216.25} m_SizeDelta: {x: 220, y: 428.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5176358249044919319 @@ -83973,9 +83973,9 @@ RectTransform: m_Father: {fileID: 7295048416073556648} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -75} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1661858992143867004 @@ -85671,7 +85671,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -91, y: -0.000030517578} - m_SizeDelta: {x: 182, y: 0} + m_SizeDelta: {x: 182, y: 120} m_Pivot: {x: 0, y: 0} --- !u!114 &973330831370543626 MonoBehaviour: @@ -86057,9 +86057,9 @@ RectTransform: m_Father: {fileID: 8132432201149559645} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -75} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &354964664533656476 @@ -86288,9 +86288,9 @@ RectTransform: m_Father: {fileID: 9033830650798519355} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 110, y: -216.25} m_SizeDelta: {x: 220, y: 428.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9141045300091552471 @@ -87573,9 +87573,9 @@ RectTransform: m_Father: {fileID: 1380306822718338942} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -105} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5520294438615329570 @@ -88591,9 +88591,9 @@ RectTransform: m_Father: {fileID: 1380306822718338942} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -15} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2182054039994430690 @@ -89279,9 +89279,9 @@ RectTransform: m_Father: {fileID: 3730962970155661078} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -75} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1962923238070274030 @@ -90266,9 +90266,9 @@ RectTransform: m_Father: {fileID: 4895505664369319088} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -15} m_SizeDelta: {x: 182, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6673071978378577247 @@ -90830,9 +90830,9 @@ RectTransform: m_Father: {fileID: 9033830650798519355} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 570, y: -216.25} m_SizeDelta: {x: 220, y: 428.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9198284029481265533 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index 73c5807ec5..dc0cd1e5fd 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -41,6 +41,7 @@ function RoleInfoLayout:InitComponent(gameObject) this.lv = Util.GetGameObject(gameObject,"pro/lv/proValue"):GetComponent("Text") this.skillGrid=Util.GetGameObject(gameObject,"skill") this.selsectSkillImage=Util.GetGameObject(gameObject,"selsectSkillImage") + this.baseAttri = Util.GetGameObject(gameObject,"Ima/Text"):GetComponent("Text") this.allProButton=Util.GetGameObject(gameObject,"allProButton") this.pinjieList={}--品阶预设容器 this.pinjieRoot=Util.GetGameObject(gameObject,"Pinjie") @@ -186,6 +187,7 @@ function this:UpdateHeroInfoData() --技能点击特殊处理 this.selsectSkillImage:SetActive(false) + this.baseAttri.alignment = GetCurLanguage() ~= 2 and "MiddleCenter" or "MiddleRight" this.UpdateHeroUpStarProUpSkillShow(this.skillGrid,curHeroData.skillIdList,curHeroData.passiveSkillList) end function this:ProShow(go,allAddProVal,HeroProType,nextallAddProVal)