diff --git a/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab index 0a658a291b..0bd888a303 100644 --- a/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 224249709583148838} + - component: {fileID: 3765620217300548415} m_Layer: 5 m_Name: mailPre m_TagString: Untagged @@ -27,13 +28,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 224641576800555120} - - {fileID: 224596848758119680} - - {fileID: 224749719201458772} - - {fileID: 224464373122792786} - - {fileID: 224387174808530490} - - {fileID: 224600226821235800} - - {fileID: 224601890368300056} + - {fileID: 4390395259753156055} m_Father: {fileID: 224524448404337356} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -42,6 +37,35 @@ RectTransform: m_AnchoredPosition: {x: -3886, y: 381} m_SizeDelta: {x: 834.5, y: 129.3} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3765620217300548415 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1003527697014530} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenSequeue: + - initV3: {x: 230, y: -20, z: 0} + initFloat: 0 + isInit: 1 + changeV3: {x: 0, y: 0, z: 0} + changeFloat: 0 + duration: 0.15 + delay: 0 + curveType: 11 + changeType: 0 + sequeueType: 1 + loop: 0 + loopType: 0 + targetObj: {fileID: 4390395259753156055} + isPlayAudio: 1 + isHaveCloseBtn: 0 + isPlayOnOpen: 0 --- !u!1 &1022699947302402 GameObject: m_ObjectHideFlags: 0 @@ -71,7 +95,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224249709583148838} + m_Father: {fileID: 4390395259753156055} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -478,7 +502,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224249709583148838} + m_Father: {fileID: 4390395259753156055} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -1142,7 +1166,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224249709583148838} + m_Father: {fileID: 4390395259753156055} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1305,11 +1329,11 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1658713326269208} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 224249709583148838} + m_Father: {fileID: 4390395259753156055} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} @@ -1384,7 +1408,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 224198319409108386} - m_Father: {fileID: 224249709583148838} + m_Father: {fileID: 4390395259753156055} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} @@ -1459,7 +1483,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224249709583148838} + m_Father: {fileID: 4390395259753156055} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1649,7 +1673,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224249709583148838} + m_Father: {fileID: 4390395259753156055} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} @@ -1848,6 +1872,48 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u90AE\u4EF6" LanguageIndex: 10961 +--- !u!1 &439094511038070569 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4390395259753156055} + m_Layer: 5 + m_Name: mailPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4390395259753156055 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 439094511038070569} + 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: + - {fileID: 224641576800555120} + - {fileID: 224596848758119680} + - {fileID: 224749719201458772} + - {fileID: 224464373122792786} + - {fileID: 224387174808530490} + - {fileID: 224600226821235800} + - {fileID: 224601890368300056} + m_Father: {fileID: 224249709583148838} + m_RootOrder: 0 + 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, y: 0} + m_SizeDelta: {x: 834.5, y: 129.3} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2009620161177097895 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Mail/MailMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Mail/MailMainPanel.lua index 131ca678c3..a7cc91e461 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mail/MailMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mail/MailMainPanel.lua @@ -5,6 +5,7 @@ local allMail local openPanel local allGetMail local allDrop = {} +local isPlayAnim = true --初始化组件(用于子类重写) function MailMainPanel:InitComponent() @@ -117,6 +118,7 @@ function MailMainPanel:OnOpen(...) end function MailMainPanel:OnShow() Log("MailMainPanel:OnShow") + isPlayAnim = true allMail={} NetManager.GetAllMailData(function () this.OnShowMailListData(MailManager.mialDataList) @@ -138,6 +140,10 @@ function this.OnShowMailListData(_allMail) this.ScrollView:SetData(allMail, function (index, go) this.SingleMialDataShow(go, allMail[index]) end) + if isPlayAnim then + SecTorPlayAnimByScroll(this.ScrollView) + isPlayAnim = false + end end function this.SingleMialDataShow(_go,_mailData) local mailImage = Util.GetGameObject(_go.transform, "mailImage") @@ -182,7 +188,13 @@ function this.SingleMialDataShow(_go,_mailData) end UIManager.OpenPanel(UIName.MainSingleInfoPanel,_mailData,this) end) + Util.GetGameObject(_go.transform, "mialRedPoint"):SetActive( _mailData.state==0) + if isPlayAnim then + _go:SetActive(false) + else + _go:SetActive(true) + end end function this.UpdateMailData() this.OnShowMailListData(MailManager.mialDataList)