diff --git a/Assets/ManagedResources/Prefabs/UI/Mail/MainSingleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Mail/MainSingleInfoPanel.prefab index 7717e5e422..640ba60173 100644 --- a/Assets/ManagedResources/Prefabs/UI/Mail/MainSingleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Mail/MainSingleInfoPanel.prefab @@ -33,7 +33,7 @@ RectTransform: m_Children: - {fileID: 224844119586139480} m_Father: {fileID: 224352509590574532} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -357,7 +357,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &224211946037199562 RectTransform: m_ObjectHideFlags: 0 @@ -371,7 +371,7 @@ RectTransform: m_Children: - {fileID: 224590269023440768} m_Father: {fileID: 224352509590574532} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -866,8 +866,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 51.99829, y: 0.000010692089} - m_SizeDelta: {x: 837.9, y: 11.82} + m_AnchoredPosition: {x: 51.99829, y: -0.000019782978} + m_SizeDelta: {x: 837.9, y: 0} m_Pivot: {x: -9.313226e-10, y: -0.00000009685755} --- !u!114 &114856704771779596 MonoBehaviour: @@ -1186,6 +1186,7 @@ RectTransform: - {fileID: 224787721365717512} - {fileID: 224771781814760738} - {fileID: 224593020912391396} + - {fileID: 1973047851017621686} - {fileID: 224211946037199562} - {fileID: 224801584438335912} - {fileID: 3870214860758081861} @@ -1517,7 +1518,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.000061035156, y: -0.00007426977} + m_AnchoredPosition: {x: -0.000061035156, y: -0.000036707417} m_SizeDelta: {x: 857, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &4820645118571433122 @@ -1754,7 +1755,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224352509590574532} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1831,7 +1832,7 @@ RectTransform: m_Children: - {fileID: 3635776725646956425} m_Father: {fileID: 224352509590574532} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1937,3 +1938,77 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &8506394037060393049 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1973047851017621686} + - component: {fileID: 873176990563179154} + - component: {fileID: 3063341330409987123} + m_Layer: 5 + m_Name: LINE + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1973047851017621686 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8506394037060393049} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224352509590574532} + m_RootOrder: 9 + 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.56073, y: -89.29999} + m_SizeDelta: {x: 912.8, y: 4.4400024} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &873176990563179154 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8506394037060393049} + m_CullTransparentMesh: 0 +--- !u!114 &3063341330409987123 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8506394037060393049} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 19d5542f3ad36154883cfc2022d17e0a, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Mail/MainSingleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Mail/MainSingleInfoPanel.lua index 6aecf164d7..31c60106a5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mail/MainSingleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mail/MainSingleInfoPanel.lua @@ -22,6 +22,7 @@ function MainSingleInfoPanel:InitComponent() self.btnSure=Util.GetGameObject(self.gameObject, "bg/btnSure") self.btnDel = Util.GetGameObject(self.gameObject, "bg/btnDel") self.root = Util.GetGameObject(self.gameObject, "bg/newScroll") + self.line = Util.GetGameObject(self.gameObject, "bg/line") local v21 = Util.GetGameObject(self.gameObject, "bg/newScroll"):GetComponent("RectTransform").rect self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(self.gameObject, "bg/newScroll").transform, self.itemPre, nil, Vector2.New(v21.width, v21.height), 1, 5, Vector2.New(20,15)) @@ -181,10 +182,12 @@ function MainSingleInfoPanel:OnShowMailData(mailData) -- 根据是否有附件动态修改邮件内容显示状态 if #rewardStr > 0 then self.root:SetActive(true) + self.line:SetActive(true) self.mialInfoRoot.transform.sizeDelta = Vector2.New(857, 526) self.mialInfoRoot.transform.localPosition = Vector2.New(0, 173) else self.root:SetActive(false) + self.line:SetActive(false) self.mialInfoRoot.transform.sizeDelta = Vector2.New(857, 898) self.mialInfoRoot.transform.localPosition = Vector2.New(0, 0) end