From c86865b3dd0d16f44693f445f7132bb50aa7cb75 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sun, 7 Mar 2021 17:52:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EquipTreasureResonancePanel.prefab | 134 +++++++++--------- .../RoleInfo/EquipTreasureStrongPopup.prefab | 32 ++--- .../UI/RoleInfo/RoleEquipChangePopup.prefab | 86 +++++------ .../RoleEquipTreasureChangePopup.prefab | 84 +++++------ .../Modules/RoleInfo/RoleEquipChangePopup.lua | 12 +- 5 files changed, 176 insertions(+), 172 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/EquipTreasureResonancePanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/EquipTreasureResonancePanel.prefab index 93ca6bdfae..91a137276c 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/EquipTreasureResonancePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/EquipTreasureResonancePanel.prefab @@ -771,8 +771,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: 135, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 93.09, y: 2.3} + m_SizeDelta: {x: 118.1, y: 50.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7846450353668225988 CanvasRenderer: @@ -806,14 +806,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 37 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 3 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 37 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 0 --- !u!1 &1173165238566533252 @@ -1141,8 +1141,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: 135, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 93.09, y: 0} + m_SizeDelta: {x: 111.5, y: 50.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3038394019601487931 CanvasRenderer: @@ -1176,14 +1176,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 37 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 3 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 37 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 0 --- !u!1 &1462295839147003418 @@ -2566,9 +2566,9 @@ RectTransform: m_Father: {fileID: 8767639356816381600} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -104} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4250862874450285767 @@ -2966,8 +2966,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: -45.5, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: -48.6, y: -0.00001663} + m_SizeDelta: {x: 197.2, y: 50.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6721472716048637500 CanvasRenderer: @@ -3045,9 +3045,9 @@ RectTransform: m_Father: {fileID: 2885159925097864399} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -104} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4803334969294936605 @@ -3517,9 +3517,9 @@ RectTransform: m_Father: {fileID: 2885159925097864399} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5231607849210986676 @@ -3776,9 +3776,9 @@ RectTransform: m_Father: {fileID: 8767639356816381600} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5648006673798275440 @@ -3895,8 +3895,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: -45.5, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: -44.2, y: 0} + m_SizeDelta: {x: 202.7, y: 50.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5914483257341583055 CanvasRenderer: @@ -3930,14 +3930,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 37 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 37 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u653B\u51FB\u529B:" LanguageIndex: 0 @@ -4329,8 +4329,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: -45.5, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: -48.59999, y: 2.3} + m_SizeDelta: {x: 197.2, y: 50.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &974897430629129815 CanvasRenderer: @@ -4364,14 +4364,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 37 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 37 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u653B\u51FB\u529B:" LanguageIndex: 0 @@ -4483,8 +4483,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: -45.5, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: -44.2, y: 0} + m_SizeDelta: {x: 202.7, y: 50.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1340881558354199888 CanvasRenderer: @@ -4518,14 +4518,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 37 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 37 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u653B\u51FB\u529B:" LanguageIndex: 0 @@ -4680,8 +4680,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: 135, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 93.09, y: 1.15} + m_SizeDelta: {x: 112, y: 48.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5295146619198084385 CanvasRenderer: @@ -4715,14 +4715,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 37 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 3 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 37 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 0 --- !u!1 &6655121265301250469 @@ -4759,8 +4759,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: 135, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 93.09, y: 1.15} + m_SizeDelta: {x: 110.1, y: 48.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3148507535589573366 CanvasRenderer: @@ -4794,14 +4794,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 37 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 3 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 37 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 0 --- !u!1 &6679676090606940566 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/EquipTreasureStrongPopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/EquipTreasureStrongPopup.prefab index f19eb8ddaa..575a0ba7fb 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/EquipTreasureStrongPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/EquipTreasureStrongPopup.prefab @@ -820,10 +820,10 @@ RectTransform: m_Father: {fileID: 5073002665743333441} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -112.98001, y: -59.05} - m_SizeDelta: {x: 260, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222139857334499600 CanvasRenderer: @@ -2123,10 +2123,10 @@ RectTransform: m_Father: {fileID: 5073002665743333441} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 212.97998, y: -59.05} - m_SizeDelta: {x: 260, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1526903336700493124 CanvasRenderer: @@ -2483,8 +2483,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: 326, y: 8.6} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 343.89, y: 12.604} + m_SizeDelta: {x: 309.41, y: 47.435} m_Pivot: {x: 0.6427968, y: 0.7175935} --- !u!222 &2798314743829266872 CanvasRenderer: @@ -2518,14 +2518,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 38 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 3 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 38 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 1/11 --- !u!1 &3303996978115537919 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipChangePopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipChangePopup.prefab index 7e74bb2464..55951d3a5e 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipChangePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipChangePopup.prefab @@ -2593,8 +2593,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 86, y: -14} - m_SizeDelta: {x: 630, y: 8.06} + m_AnchoredPosition: {x: 4.9, y: -57.5} + m_SizeDelta: {x: 741.5, y: 8.06} m_Pivot: {x: 0.5, y: 1} --- !u!114 &114535233482135506 MonoBehaviour: @@ -2767,8 +2767,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.9, y: -443.50998} - m_SizeDelta: {x: 389.8, y: 53.6} + m_AnchoredPosition: {x: 194.9, y: -0} + m_SizeDelta: {x: 389.8, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1512618919170776 GameObject: @@ -4442,7 +4442,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: 371.48, y: -13.795} + m_AnchoredPosition: {x: 411.48, y: -43.795} m_SizeDelta: {x: 742.96, y: 17.59} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4544694299353968152 @@ -4525,7 +4525,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: 371.48, y: -2.5} + m_AnchoredPosition: {x: 411.48, y: -2.5} m_SizeDelta: {x: 742.96, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5927330914771990928 @@ -4686,8 +4686,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 398, y: -1039.1849} - m_SizeDelta: {x: 796, y: 692.79} + m_AnchoredPosition: {x: 398, y: -1084.1849} + m_SizeDelta: {x: 796, y: 722.79} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &880997212094141995 CanvasRenderer: @@ -5095,7 +5095,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: 121, y: -20} + m_AnchoredPosition: {x: 130, y: -20} m_SizeDelta: {x: 180, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4475867523742933269 @@ -5213,7 +5213,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: 402.48, y: -2.5} + m_AnchoredPosition: {x: 411.48, y: -2.5} m_SizeDelta: {x: 742.96, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6386485330199981941 @@ -5455,7 +5455,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: 112, y: -32} + m_AnchoredPosition: {x: 120, y: -20} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2421964854514802166 @@ -5539,9 +5539,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 398, y: -374.095} + m_AnchoredPosition: {x: 398, y: -345.29996} m_SizeDelta: {x: 796, y: 57.59} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0.5, y: 1} --- !u!114 &4965034400312963828 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6206,9 +6206,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 398, y: -359.095} - m_SizeDelta: {x: 796, y: 27.59} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 398, y: -345.29996} + m_SizeDelta: {x: 796, y: 57.59} + m_Pivot: {x: 0.5, y: 1} --- !u!114 &3452469365111386092 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6360,7 +6360,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: 402.48, y: -55.09} + m_AnchoredPosition: {x: 411.48, y: -55.09} m_SizeDelta: {x: 742.96, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3557616758434194268 @@ -6769,8 +6769,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 86, y: -14} - m_SizeDelta: {x: 630, y: 8.06} + m_AnchoredPosition: {x: 0.2, y: -60.4} + m_SizeDelta: {x: 732.1, y: 8.06} m_Pivot: {x: 0.5, y: 1} --- !u!114 &5008104470592116029 MonoBehaviour: @@ -6844,9 +6844,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 398, y: -394.785} + m_AnchoredPosition: {x: 398, y: -368.99997} m_SizeDelta: {x: 796, y: 51.57} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0.5, y: 1} --- !u!1 &5355357851419272022 GameObject: m_ObjectHideFlags: 0 @@ -7972,8 +7972,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: 294, y: 5} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 294, y: 15.65} + m_SizeDelta: {x: 160, y: 31.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5279542354912768318 CanvasRenderer: @@ -8007,14 +8007,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 32 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 32 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: +4 --- !u!1 &5356109218512395812 @@ -8518,8 +8518,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: -29.599998, y: 7.6260433} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 42.65, y: 15.65} + m_SizeDelta: {x: 304.5, y: 31.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5280220808285712660 CanvasRenderer: @@ -8553,14 +8553,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 32 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 32 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u653B\u51FB" LanguageIndex: 10886 @@ -9009,8 +9009,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 118.20001, y: -40} - m_SizeDelta: {x: 172.1, y: 53.6} + m_AnchoredPosition: {x: 118.20001, y: -35.349976} + m_SizeDelta: {x: 172.1, y: 44.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5279431555831353116 CanvasRenderer: @@ -11017,8 +11017,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 118.20001, y: -40} - m_SizeDelta: {x: 172.1, y: 53.6} + m_AnchoredPosition: {x: 118.20001, y: -34.2} + m_SizeDelta: {x: 172.1, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6593695915443171924 CanvasRenderer: @@ -11098,7 +11098,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: 402.48, y: -43.795} + m_AnchoredPosition: {x: 411.48, y: -43.795} m_SizeDelta: {x: 742.96, y: 17.59} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3101147346664826319 @@ -11255,7 +11255,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: 371.48, y: -25.09} + m_AnchoredPosition: {x: 411.48, y: -55.09} m_SizeDelta: {x: 742.96, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3413381989438560798 @@ -11786,7 +11786,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: 336.37863, y: -670.5827} + m_AnchoredPosition: {x: 336.37863, y: -700.5827} m_SizeDelta: {x: 796, y: 127} m_Pivot: {x: 0.4225862, y: 0.17486048} --- !u!1 &8982998037421818740 @@ -12041,7 +12041,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: 398, y: -372.88998} + m_AnchoredPosition: {x: 398, y: -402.88998} m_SizeDelta: {x: 796, y: 192.9} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8333415249294270727 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab index 9e706a356f..28715534cf 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab @@ -36,7 +36,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 400, y: 50} + m_SizeDelta: {x: 400, y: 50.477} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &802499989 CanvasRenderer: @@ -73,7 +73,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -3064,8 +3064,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 124, y: -6} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 110, y: -5.15} + m_SizeDelta: {x: 188, y: 64.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5670020866592195365 CanvasRenderer: @@ -3099,14 +3099,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 36 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 0 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 36 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u57FA\u7840\u5C5E\u6027\uFF1A" LanguageIndex: 0 @@ -3144,8 +3144,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 124, y: -89} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 108.44, y: -92.1} + m_SizeDelta: {x: 191.1, y: 56.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5340354087378871893 CanvasRenderer: @@ -3179,14 +3179,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 36 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 0 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 36 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u7CBE\u70BC\u5C5E\u6027\uFF1A" LanguageIndex: 0 @@ -3224,8 +3224,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 124, y: -89} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 110, y: -92.75} + m_SizeDelta: {x: 188, y: 61.53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7953384418268341864 CanvasRenderer: @@ -3259,14 +3259,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 36 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 0 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 36 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u7CBE\u70BC\u5C5E\u6027\uFF1A" LanguageIndex: 0 @@ -4756,8 +4756,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 124, y: -6} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 108.44, y: -5.1} + m_SizeDelta: {x: 191.1, y: 64.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5280244052260738678 CanvasRenderer: @@ -4791,14 +4791,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 36 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 0 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 36 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u57FA\u7840\u5C5E\u6027\uFF1A" LanguageIndex: 0 @@ -5458,8 +5458,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: -120, y: 3.2} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: -77.77, y: -0.11924} + m_SizeDelta: {x: 244.46, y: 50.24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1193572887044614810 CanvasRenderer: @@ -5493,14 +5493,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 36 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 0 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 36 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: New Text --- !u!1 &7014630098933005139 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua index 1537916f4e..6c9f474d84 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua @@ -20,16 +20,16 @@ local _NextProList = {} function RoleEquipChangePopup:InitComponent() this.btnBack= Util.GetGameObject(self.transform, "btnBack") - local go = Util.GetGameObject(self.transform, "GameObject") - this.mainProItem = Util.GetGameObject(go,"curProName") + this.go = Util.GetGameObject(self.transform, "GameObject") + this.mainProItem = Util.GetGameObject(this.go,"curProName") this.mainProItem:SetActive(false) - this.otherProPre=Util.GetGameObject(go,"otherPro") + this.otherProPre=Util.GetGameObject(this.go,"otherPro") this.otherProPre:SetActive(false) this.equipPanel = {} for i = 1 ,2 do if not this.equipPanel[i] then this.equipPanel[i] = {} - this.equipPanel[i].bg = Util.GetGameObject(go, "bg"..i) + this.equipPanel[i].bg = Util.GetGameObject(this.go, "bg"..i) this.equipPanel[i].equipInfo = Util.GetGameObject(this.equipPanel[i].bg,"equipInfo") this.equipPanel[i].desc= Util.GetGameObject(this.equipPanel[i].equipInfo,"Text"):GetComponent("Text") this.equipPanel[i].curEquipName=Util.GetGameObject(this.equipPanel[i].equipInfo,"name/text"):GetComponent("Text") @@ -162,6 +162,10 @@ function RoleEquipChangePopup:OnShow() this.ShowCurEquipData(2) this.NextCurEquipData() end + for i = 1,#this.equipPanel do + LayoutRebuilder.ForceRebuildLayoutImmediate(this.equipPanel[i].bg.transform) + end + LayoutRebuilder.ForceRebuildLayoutImmediate(this.go.transform) end function this.SetEquipData(index,data,equipConfigData,itemConfigData) this.equipPanel[index].powerNum1.text=EquipManager.CalculateWarForce(data.id)