From d4f33737065e27c3fcff23dc2e09f4a697dc1e59 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Thu, 11 Jan 2024 10:37:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=B8=E6=B0=94=E5=9B=BE=E9=89=B4=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Popup/SoulPrintPopUp.prefab | 12 ++++++------ .../Prefabs/UI/SoulPrint/SoulPrintHandBook.prefab | 10 +++++----- .../~Lua/Modules/Popup/SoulPrintPopUp.lua | 6 +++++- .../~Lua/Modules/SoulPrint/SoulPrintHandBook.lua | 3 +++ 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/SoulPrintPopUp.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/SoulPrintPopUp.prefab index 637ab5f6b1..1007f267fa 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/SoulPrintPopUp.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/SoulPrintPopUp.prefab @@ -609,7 +609,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.92549026, g: 0.8588236, b: 0.74509805, a: 1} + m_Color: {r: 0.9716981, g: 0.9700042, b: 0.9671146, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1513,7 +1513,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.9811321, g: 0.9795586, b: 0.9765041, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1638,7 +1638,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.9811321, g: 0.9732645, b: 0.9579922, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1934,7 +1934,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.9716981, g: 0.96702296, b: 0.9579477, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3138,7 +3138,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 845, y: 133} + m_SizeDelta: {x: 851, y: 133} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4182130950397580521 CanvasRenderer: @@ -3190,7 +3190,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 34 + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 diff --git a/Assets/ManagedResources/Prefabs/UI/SoulPrint/SoulPrintHandBook.prefab b/Assets/ManagedResources/Prefabs/UI/SoulPrint/SoulPrintHandBook.prefab index c3b113fe44..766ccf973b 100644 --- a/Assets/ManagedResources/Prefabs/UI/SoulPrint/SoulPrintHandBook.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SoulPrint/SoulPrintHandBook.prefab @@ -4778,7 +4778,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: 346.2, y: -1.86} + m_AnchoredPosition: {x: 171.90001, y: -1.86} m_SizeDelta: {x: 170, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9117289385834835274 @@ -4989,7 +4989,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.30000496, y: -1.86} + m_AnchoredPosition: {x: -177.6, y: -1.86} m_SizeDelta: {x: 170, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8810865969322935354 @@ -10091,7 +10091,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7944063180594429838 RectTransform: m_ObjectHideFlags: 0 @@ -10227,7 +10227,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: 171.6, y: -1.86} + m_AnchoredPosition: {x: -2.6999934, y: -1.86} m_SizeDelta: {x: 170, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1894056258663438587 @@ -26189,7 +26189,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &695924364943959042 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua index 5b52ae05a3..0126dc1143 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua @@ -288,7 +288,7 @@ function SoulPrintPopUp:RefreshShow(type) self.scroll_2:SetActive(false) self.trialScopeText.text = "以下英雄可装备:所有英雄" end - + LayoutRebuilder.ForceRebuildLayoutImmediate(self.midBar.transform) --获取途径 self.howGet:SetActive(type==Type.Access) --获取途径 @@ -306,6 +306,10 @@ function SoulPrintPopUp:RefreshShow(type) end,true,true) end end + + + LayoutRebuilder.ForceRebuildLayoutImmediate(self.gameObject.transform) + end --优化滚动条数据赋值 diff --git a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintHandBook.lua b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintHandBook.lua index b027afe113..e472dbb6ea 100644 --- a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintHandBook.lua +++ b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintHandBook.lua @@ -22,6 +22,9 @@ function SoulPrintHandBook:InitComponent() this.mask = Util.GetGameObject(this.gameObject, "mask") for i = 1, 5 do tabs[i] = Util.GetGameObject(this.gameObject, "Tabs/Btn" .. i) + if i<3 then + tabs[i]:SetActive(false) + end end this.selectBtn = Util.GetGameObject(this.gameObject, "Tabs/selectBtn") this.selectBtnText = Util.GetGameObject(this.selectBtn.transform, "Text"):GetComponent("Text")