diff --git a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertRewardSortPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertRewardSortPanel.prefab index 1225ae2ec5..90d906a639 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertRewardSortPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertRewardSortPanel.prefab @@ -4529,7 +4529,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.000061035156, y: -0.000061035156} + m_AnchoredPosition: {x: 0.000061035156, y: -0.00001839889} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 1, y: 1} --- !u!114 &5240409950729245734 @@ -5310,6 +5310,7 @@ GameObject: - component: {fileID: 5346342750183418070} - component: {fileID: 5348493304844781692} - component: {fileID: 5240889170209235320} + - component: {fileID: 1245246326124368024} m_Layer: 5 m_Name: maskImage m_TagString: Untagged @@ -5373,6 +5374,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &1245246326124368024 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5272406815567640416} + 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: 5240889170209235320} + 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 &5272409199843458082 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab index ebfeb9812d..f85068d82a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab @@ -723,6 +723,7 @@ GameObject: - component: {fileID: 224919588235753188} - component: {fileID: 222693168796799722} - component: {fileID: 114531006171977222} + - component: {fileID: 5283258532198661666} m_Layer: 5 m_Name: mask m_TagString: Untagged @@ -786,6 +787,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &5283258532198661666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1976151424194446} + 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: 114531006171977222} + 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 &103147500096110501 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Ranking/RankingSingleListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Ranking/RankingSingleListPanel.prefab index ac32d8abea..7df4b1421b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Ranking/RankingSingleListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Ranking/RankingSingleListPanel.prefab @@ -5213,6 +5213,7 @@ GameObject: - component: {fileID: 6375954451362498341} - component: {fileID: 1308620328114261985} - component: {fileID: 5539810072387095614} + - component: {fileID: 1300871135971626907} m_Layer: 5 m_Name: mask m_TagString: Untagged @@ -5276,6 +5277,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &1300871135971626907 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4674859891010462116} + 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: 3 + 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: 5539810072387095614} + 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 &4733291063481934326 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab index 3646502d12..0a606878a8 100644 --- a/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab @@ -3432,6 +3432,7 @@ GameObject: - component: {fileID: 8561996631503692955} - component: {fileID: 1890673629478542019} - component: {fileID: 8351604982734357536} + - component: {fileID: 2598990547801128960} m_Layer: 5 m_Name: mask m_TagString: Untagged @@ -3495,3 +3496,45 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &2598990547801128960 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9122350590757992458} + 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: 8351604982734357536} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/ExpertRewardSortPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/ExpertRewardSortPanel.lua index da3c4e3548..36621086ea 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/ExpertRewardSortPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/ExpertRewardSortPanel.lua @@ -13,6 +13,7 @@ function ExpertRewardSortPanel:InitComponent() this.spLoader = SpriteLoader.New() self.btnBack = Util.GetGameObject(self.gameObject, "btnBack") + self.Mask = Util.GetGameObject(self.gameObject, "maskImage") self.Title = Util.GetGameObject(self.gameObject, "Title"):GetComponent("Text") --排名 self.titleTextExpert = Util.GetGameObject(self.gameObject, "Title"):GetComponent("Text") @@ -45,6 +46,9 @@ function ExpertRewardSortPanel:BindEvent() Util.AddClick(self.btnBack, function() self:ClosePanel() end) + Util.AddClick(self.Mask, function() + self:ClosePanel() + end) end --添加事件监听(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 8eaf451887..2149224515 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -19,6 +19,7 @@ function RewardItemSingleShowPopup:InitComponent() this.itemName = Util.GetGameObject(self.transform, "bg/name"):GetComponent("Text") this.BtnBack = Util.GetGameObject(self.transform, "bg/btnBack") + this.mask = Util.GetGameObject(self.transform, "mask") this.itemPos = Util.GetGameObject(self.transform, "bgPanel/armor/itemPos") this.itemView = SubUIManager.Open(SubUIConfig.ItemView,this.itemPos.transform) @@ -54,6 +55,11 @@ function RewardItemSingleShowPopup:BindEvent() PlayerManager.RewardItemSingleShowPopupIsRoleUpStarLayout2 = false self:ClosePanel() end) + Util.AddClick(this.mask, function() + PlaySoundWithoutClick(SoundConfig.Sound_UICancel) + PlayerManager.RewardItemSingleShowPopupIsRoleUpStarLayout2 = false + self:ClosePanel() + end) Util.AddClick(this.btnClose, function() PlaySoundWithoutClick(SoundConfig.Sound_UICancel) PlayerManager.RewardItemSingleShowPopupIsRoleUpStarLayout2 = false diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua index 83e63e4c74..ccee1c2d4c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua @@ -24,6 +24,7 @@ local TabDataIndex = 1 function RankingSingleListPanel:InitComponent() this.spLoader = SpriteLoader.New() this.tabBox = Util.GetGameObject(self.gameObject, "RankList/TabBox") + this.Mask = Util.GetGameObject(self.gameObject, "mask") this.TabCtrl = TabBox.New() this.backBtn=Util.GetGameObject(self.gameObject,"bg/btnBack") this.firsthead=Util.GetGameObject(self.gameObject,"firstHead") @@ -61,6 +62,10 @@ function RankingSingleListPanel:BindEvent() PlaySoundWithoutClick(SoundConfig.Sound_UICancel) self:ClosePanel() end) + Util.AddClick(this.Mask,function() + PlaySoundWithoutClick(SoundConfig.Sound_UICancel) + self:ClosePanel() + end) end --添加事件监听(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua b/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua index a910586ba4..7f1640b96d 100644 --- a/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua @@ -24,6 +24,7 @@ local goList = {}--勾选按钮列表 --初始化组件(用于子类重写) function RewardBoxPanel:InitComponent() this.spLoader = SpriteLoader.New() + this.mask = Util.GetGameObject(this.gameObject,"mask") this.btnBack = Util.GetGameObject(this.gameObject,"bg/btnBack") this.scroll = Util.GetGameObject(this.gameObject,"bg/scroll") this.itemPre = Util.GetGameObject(this.gameObject,"bg/scroll/itemPre2") @@ -54,6 +55,9 @@ function RewardBoxPanel:BindEvent() Util.AddClick(this.btnBack ,function() this:ClosePanel() end) + Util.AddClick(this.mask ,function() + this:ClosePanel() + end) Util.AddSlider(this.Slider, function(go, value) RewardBoxPanel:ShowCompoundNumData(value)