From f7afb86cd1c96e4744b193255076bfbcb94c1ae7 Mon Sep 17 00:00:00 2001 From: xiejun <467745540@qq.com> Date: Sun, 18 Feb 2024 16:18:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=A5=E4=B9=89=E5=8D=A1=EF=BC=8C=E9=82=AE?= =?UTF-8?q?=E4=BB=B6=E7=BD=AE=E9=A1=B6=E5=9B=BE=E7=89=87=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Mail/MailMainPanel.prefab | 2 +- .../UI/Popup/RewardItemSingleShowPopup.prefab | 18 +++++++++--------- .../Popup/RewardItemSingleShowPopup.lua | 1 + 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab index 9db5b40a31..fc4b32282f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab @@ -2005,7 +2005,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: -358.3, y: -36.3} + m_AnchoredPosition: {x: -320, y: -36.3} m_SizeDelta: {x: 77, y: 41} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1271770663175238432 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab index 716888dda3..e5a2e14084 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab @@ -646,7 +646,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4810780399059350171 RectTransform: m_ObjectHideFlags: 0 @@ -687,7 +687,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6117647, g: 0.53333336, b: 0.4117647, a: 1} + m_Color: {r: 0.19215688, g: 0.19215688, b: 0.19215688, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -695,11 +695,11 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 32 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 + m_MinSize: 2 m_MaxSize: 40 m_Alignment: 0 m_AlignByGeometry: 0 @@ -2573,7 +2573,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7355408683318342882 RectTransform: m_ObjectHideFlags: 0 @@ -2608,14 +2608,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 + m_Left: 14 m_Right: 0 m_Top: 20 m_Bottom: 0 m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 920, y: 110} + m_CellSize: {x: 902.3, y: 110} m_Spacing: {x: 30, y: 0} m_Constraint: 2 m_ConstraintCount: 1 @@ -2738,7 +2738,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 897.5, y: 299.53} + m_SizeDelta: {x: 897.5, y: 298.52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5816756568334527 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index af76cb9603..7053527319 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -410,6 +410,7 @@ function RewardItemSingleShowPopup:OnShow() end if skillId~=0 then this.infoBar:SetActive(true) + this.infoBarTxt.gameObject:SetActive(true) this.infoBarTxt.text="奥义卡技能:"..IncarnationManager.GetSkillDesStr(skillId,5) else this.infoBar:SetActive(false)