diff --git a/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab index 4a5ffb39ea..6d41cfa25e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab @@ -937,8 +937,9 @@ GameObject: - component: {fileID: 224148026194273218} - component: {fileID: 222771832541975796} - component: {fileID: 114792727300563112} + - component: {fileID: 6409426379508765791} m_Layer: 5 - m_Name: Image + m_Name: bgMask m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1000,6 +1001,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &6409426379508765791 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1510487624123812} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 114792727300563112} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &1516964800673646 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab index 9d16c17b37..a3b0823bf5 100644 --- a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab @@ -1546,6 +1546,7 @@ GameObject: - component: {fileID: 224242047069806916} - component: {fileID: 222403234580629040} - component: {fileID: 114366627383195042} + - component: {fileID: 2566092918249603807} m_Layer: 5 m_Name: mask m_TagString: Untagged @@ -1609,6 +1610,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &2566092918249603807 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1824989262578032} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 114366627383195042} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &1829168665918506 GameObject: m_ObjectHideFlags: 0 @@ -2754,10 +2797,10 @@ RectTransform: m_Father: {fileID: 224557354284231528} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -2.5, y: 1} + m_SizeDelta: {x: 850, y: 1560} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &801790505742295172 GameObject: diff --git a/Assets/ManagedResources/~Lua/Modules/Mail/MailMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Mail/MailMainPanel.lua index baa84ee8d0..9e9761f3c8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mail/MailMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mail/MailMainPanel.lua @@ -12,6 +12,7 @@ function MailMainPanel:InitComponent() allGetMail={} this.closeBtn = Util.GetGameObject(self.gameObject, "bg/closeBtn") + this.mask = Util.GetGameObject(self.gameObject, "bgMask") this.mialNum = Util.GetGameObject(self.gameObject, "bg/mialNum"):GetComponent("Text") this.DeleMialText = Util.GetGameObject(self.gameObject, "bg/DeleMialText"):GetComponent("Text") this.mailPre=Util.GetGameObject(self.gameObject, "mailPre") @@ -35,6 +36,10 @@ function MailMainPanel:BindEvent() PlaySoundWithoutClick(SoundConfig.Sound_UICancel) self:ClosePanel() end) + Util.AddClick(this.mask, function() + PlaySoundWithoutClick(SoundConfig.Sound_UICancel) + self:ClosePanel() + end) Util.AddClick(this.GetAllMailBtn, function() allGetMail={} for i = 1, #allMail do diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel.lua index b503b047c7..960c5edd71 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel.lua @@ -27,6 +27,7 @@ local redPointList function MissionDailyPanel:InitComponent() this.tabBox = Util.GetGameObject(self.gameObject, "TabBox") this.TabCtrl = TabBox.New() + this.mask = Util.GetGameObject(self.transform, "mask") this.closeBtn = Util.GetGameObject(self.transform, "bg/closeBtn") this.titleText = Util.GetGameObject(self.transform, "bg/titleText"):GetComponent("Text") this.contents = Util.GetGameObject(self.transform, "Contents") @@ -46,6 +47,9 @@ function MissionDailyPanel:BindEvent() Util.AddClick(this.closeBtn, function() self:ClosePanel() end) + Util.AddClick(this.mask, function() + self:ClosePanel() + end) for i = 1, #contentScripts do contentScripts[i].view:BindEvent() end