diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/GuildFindPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/GuildFindPopup.prefab index 6cd7b23e10..9907ea0a1b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/GuildFindPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/GuildFindPopup.prefab @@ -677,7 +677,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: 2.8, y: 0.81} + m_AnchoredPosition: {x: 2.800003, y: 0.8100014} m_SizeDelta: {x: -52.17, y: -10.23} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6076602248896240522 @@ -734,6 +734,7 @@ GameObject: - component: {fileID: 1551124923903263872} - component: {fileID: 5518577952834146698} - component: {fileID: 8053230052371672364} + - component: {fileID: 1241707471933850612} m_Layer: 5 m_Name: maskImage m_TagString: Untagged @@ -797,6 +798,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &1241707471933850612 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2346643742048131112} + 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: 8053230052371672364} + 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 &2564905656449923830 GameObject: m_ObjectHideFlags: 0 @@ -1122,7 +1165,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.78, y: 0.7} + m_AnchoredPosition: {x: 0.7799988, y: 0.70000076} m_SizeDelta: {x: -51.75, y: -9.76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2470421610833348116 diff --git a/Assets/ManagedResources/Prefabs/UI/Login/NoticePopup.prefab b/Assets/ManagedResources/Prefabs/UI/Login/NoticePopup.prefab index 450102abb3..ac6e71b31c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Login/NoticePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Login/NoticePopup.prefab @@ -346,7 +346,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -3.7, y: -0.00012207031} + m_AnchoredPosition: {x: -3.7, y: -0.00008449847} m_SizeDelta: {x: 898.6, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &759258889793061984 @@ -479,6 +479,7 @@ GameObject: - component: {fileID: 6337288949012346558} - component: {fileID: 6339701993546208972} - component: {fileID: 6159164738095559468} + - component: {fileID: 7313770389180915908} m_Layer: 5 m_Name: BackMask m_TagString: Untagged @@ -542,6 +543,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &7313770389180915908 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6118186219131728448} + 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: 6159164738095559468} + 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 &6118725360518910644 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Login/ServerListSelectPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Login/ServerListSelectPanel.prefab index a79f9b06ed..bbf3268226 100644 --- a/Assets/ManagedResources/Prefabs/UI/Login/ServerListSelectPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Login/ServerListSelectPanel.prefab @@ -3355,7 +3355,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.0000063251046} + m_AnchoredPosition: {x: 0, y: -0.00000058792324} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &749186115632240796 @@ -3723,6 +3723,7 @@ GameObject: - component: {fileID: 1056617385937395925} - component: {fileID: 5092693943284537383} - component: {fileID: 9220261166419935181} + - component: {fileID: 4212146210941725067} m_Layer: 5 m_Name: frame m_TagString: Untagged @@ -3787,6 +3788,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &4212146210941725067 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8323960813853220159} + 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: 9220261166419935181} + 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 &8507442696314200090 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab index 3176a41d8a..fae0cdc94a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab @@ -1443,6 +1443,7 @@ GameObject: - component: {fileID: 224907542216859288} - component: {fileID: 222404820339158960} - component: {fileID: 114681982393793076} + - component: {fileID: 7860757043274761300} m_Layer: 5 m_Name: BackMask m_TagString: Untagged @@ -1506,6 +1507,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &7860757043274761300 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1828262640871652} + 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: 114681982393793076} + 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 &1911944233478140 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab index 149d29805a..d2c01a80f7 100644 --- a/Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab @@ -1530,6 +1530,7 @@ GameObject: - component: {fileID: 7406068417037182427} - component: {fileID: 7733559020260124321} - component: {fileID: 3292195434044305743} + - component: {fileID: 9065311795713101088} m_Layer: 5 m_Name: mask m_TagString: Untagged @@ -1593,6 +1594,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &9065311795713101088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4681850522529785555} + 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: 3292195434044305743} + 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 &4865026749651062015 GameObject: m_ObjectHideFlags: 0 @@ -1850,7 +1893,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0.00001513958, y: 0} + m_AnchoredPosition: {x: 0.00001513958, y: 0.000022896103} m_SizeDelta: {x: 1003, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &4770267391901505225 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua index ef2a4b0998..edf8e13c50 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua @@ -14,6 +14,7 @@ function GuildFindPopup:InitComponent() this.spLoader = SpriteLoader.New() this.title2 = Util.GetGameObject(self.transform, "bgImage/Title2/text"):GetComponent("Text") this.btnBack = Util.GetGameObject(self.transform, "btnBack") + this.mask = Util.GetGameObject(self.transform, "maskImage") this.btnSearch = Util.GetGameObject(self.transform, "bottomImage/searchButton") this.btnRefresh = Util.GetGameObject(self.transform, "bottomImage/refreshButton") this.btnCreate = Util.GetGameObject(self.transform, "bottomImage/createBtn") @@ -42,6 +43,10 @@ function GuildFindPopup:BindEvent() PlaySoundWithoutClick(SoundConfig.Sound_UICancel) this:ClosePanel() end) + Util.AddClick(this.mask, function() + PlaySoundWithoutClick(SoundConfig.Sound_UICancel) + this:ClosePanel() + end) -- 搜索 Util.AddClick(this.btnSearch, function() diff --git a/Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua b/Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua index efb5746282..dc3b732b14 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua @@ -7,6 +7,7 @@ function NoticePopup:InitComponent() this.spLoader = SpriteLoader.New() this.BtnBack = Util.GetGameObject(self.transform, "bg/bg/btnBack") + this.mask = Util.GetGameObject(self.transform, "BackMask") this.TitleText=Util.GetGameObject(self.transform,"bg/bg/title"):GetComponent("Text") this.ContentText=Util.GetGameObject(self.transform,"bg/bg/rect/GameObject"):GetComponent("Text") this.content=Util.GetGameObject(self.transform,"bg/bg/rect/content") @@ -15,7 +16,9 @@ end --绑定事件(用于子类重写) function NoticePopup:BindEvent() - + Util.AddClick(this.mask, function() + self:ClosePanel() + end) Util.AddClick(this.BtnBack, function() self:ClosePanel() end) diff --git a/Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua index 0a1fe4297f..c711c2b8de 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua @@ -12,6 +12,7 @@ local ServerListSelectPanel = quick_class("ServerListSelectPanel", BasePanel) function ServerListSelectPanel:InitComponent() self.spLoader = SpriteLoader.New() self.closeBtn = Util.GetGameObject(self.transform, "frame/bg/closeBtn") + self.mask = Util.GetGameObject(self.transform, "frame") self.serverContent = Util.GetGameObject(self.transform, "frame/bg/serverList/mask/content") self.serverPrototype = Util.GetGameObject(self.serverContent, "serverItemPref") @@ -48,6 +49,9 @@ function ServerListSelectPanel:BindEvent() Util.AddClick(self.closeBtn, function() self:ClosePanel() end) + Util.AddClick(self.mask, function() + self:ClosePanel() + end) end --serverList,myServerList,lastServer function ServerListSelectPanel:OnOpen(context) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua index 20780439de..06349765b4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua @@ -13,6 +13,7 @@ local breakId,upStarId function RoleGetInfoPopup:InitComponent() this.spLoader = SpriteLoader.New() + this.mask=Util.GetGameObject(self.transform, "BackMask") this.BtnBack=Util.GetGameObject(self.transform, "bg/btnBack") this.liveRoot=Util.GetGameObject(self.transform, "bg/liveRoot") this.heroName = Util.GetGameObject(self.transform, "RoleInfo/nameAndPossLayout/heroName"):GetComponent("Text") @@ -84,6 +85,10 @@ function RoleGetInfoPopup:BindEvent() PlaySoundWithoutClick(SoundConfig.Sound_UICancel) self:ClosePanel() end) + Util.AddClick(this.mask, function() + PlaySoundWithoutClick(SoundConfig.Sound_UICancel) + self:ClosePanel() + end) -- Util.AddClick(this.skill1, function() diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua index 88bfb0c86f..d7f1cf18c1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua @@ -21,6 +21,7 @@ function RankingListMainPanel:InitComponent() this.tabBox = Util.GetGameObject(self.gameObject, "TabBox") this.TabCtrl = TabBox.New() this.BackBtn = Util.GetGameObject(self.gameObject, "bg/btnBack") + this.mask = Util.GetGameObject(self.gameObject, "mask") this.ItemPre = Util.GetGameObject(self.gameObject, "bg/panel/ItemPre") this.grid = Util.GetGameObject(self.gameObject, "bg/panel/ScrollParentView/grid") end @@ -30,6 +31,9 @@ function RankingListMainPanel:BindEvent() Util.AddClick(this.BackBtn, function() self:ClosePanel() end) + Util.AddClick(this.mask, function() + self:ClosePanel() + end) end --添加事件监听(用于子类重写)