From 60041a05f2146b346f6fb972db6eaf84df6e082b Mon Sep 17 00:00:00 2001 From: xiejun <467745540@qq.com> Date: Mon, 22 Jan 2024 14:35:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9D=E7=89=A9=E7=B2=BE=E7=82=BC=E7=AD=89?= =?UTF-8?q?=E7=BA=A7=E9=A2=84=E5=88=B6=E4=BD=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/ItemView/ItemView.prefab | 28 +++++++++---------- .../~Lua/Modules/RoleInfo/RoleInfoPanel.lua | 2 ++ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab b/Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab index 6ea1805812..f14ed2c479 100644 --- a/Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab @@ -4835,7 +4835,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: -36.2, y: 48.1} + m_AnchoredPosition: {x: -36.2, y: -50.7} m_SizeDelta: {x: 61.84, y: 27.336} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222622639373068266 @@ -4879,7 +4879,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: +88 + m_Text: --- !u!114 &4864852440456619184 MonoBehaviour: m_ObjectHideFlags: 0 @@ -45319,7 +45319,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: 30.74999, y: -47} + m_AnchoredPosition: {x: 33.8, y: -47} m_SizeDelta: {x: 58.9, y: 33.35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7700085593771067834 @@ -74239,27 +74239,27 @@ PrefabInstance: propertyPath: m_MaskInteraction value: 1 objectReference: {fileID: 0} - - target: {fileID: 8904198713800480830, guid: bd194af093bc5564ba7ae00a6f664c2d, - type: 3} - propertyPath: m_MaskInteraction - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8904198714661017609, guid: bd194af093bc5564ba7ae00a6f664c2d, - type: 3} - propertyPath: m_MaskInteraction - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8904198713310030723, guid: bd194af093bc5564ba7ae00a6f664c2d, type: 3} propertyPath: m_MaskInteraction value: 1 objectReference: {fileID: 0} + - target: {fileID: 8904198713654882537, guid: bd194af093bc5564ba7ae00a6f664c2d, + type: 3} + propertyPath: m_MaskInteraction + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8904198713641915434, guid: bd194af093bc5564ba7ae00a6f664c2d, type: 3} propertyPath: m_MaskInteraction value: 1 objectReference: {fileID: 0} - - target: {fileID: 8904198713654882537, guid: bd194af093bc5564ba7ae00a6f664c2d, + - target: {fileID: 8904198713800480830, guid: bd194af093bc5564ba7ae00a6f664c2d, + type: 3} + propertyPath: m_MaskInteraction + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8904198714661017609, guid: bd194af093bc5564ba7ae00a6f664c2d, type: 3} propertyPath: m_MaskInteraction value: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index d55192dae7..4d79f3a345 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -494,6 +494,7 @@ function this:RightBtnOnClick() isClickLeftOrRightBtn = true this:UpdateHeroInfoData() this.btnMask.gameObject:SetActive(false) + LayoutRebuilder.ForceRebuildLayoutImmediate(this.nameAndPossLayout.transform) end):SetEase(Ease.Linear) this:SetPanelBg(curHeroData.changeProId) @@ -563,6 +564,7 @@ function this:LeftBtnOnClick() isClickLeftOrRightBtn = true this:UpdateHeroInfoData() this.btnMask.gameObject:SetActive(false) + LayoutRebuilder.ForceRebuildLayoutImmediate(this.nameAndPossLayout.transform) end):SetEase(Ease.Linear) this:SetPanelBg(curHeroData.changeProId)