diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/TalismanInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/TalismanInfoPopup.prefab index 65a87c085a..ebcd234140 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/TalismanInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/TalismanInfoPopup.prefab @@ -245,6 +245,7 @@ GameObject: - component: {fileID: 2325927520243488187} - component: {fileID: 4528946508881743800} - component: {fileID: 3002483324281862553} + - component: {fileID: 42908252903026395} m_Layer: 5 m_Name: Mask m_TagString: Untagged @@ -308,6 +309,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &42908252903026395 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1170967358714303946} + 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: 1 + 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: 3002483324281862553} + 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 &1201628220047059380 GameObject: m_ObjectHideFlags: 0 @@ -1220,7 +1263,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} + m_AnchoredPosition: {x: 0, y: -0.000061035156} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &2956367096041833174 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua index 0424bf9d05..9059fce4f8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua @@ -17,6 +17,7 @@ local TypeLv=0 function TalismanInfoPopup:InitComponent() this.spLoader = SpriteLoader.New() this.backBtn=Util.GetGameObject(this.gameObject,"Panel/BackBtn") + this.backBtn2=Util.GetGameObject(this.gameObject,"Mask") this.title=Util.GetGameObject(this.gameObject,"Panel/Title"):GetComponent("Text") --滚动条 @@ -41,7 +42,11 @@ function TalismanInfoPopup:BindEvent() --返回按钮 Util.AddClick(this.backBtn,function() self:ClosePanel() - end) + end) + + Util.AddClick(this.backBtn2,function() + self:ClosePanel() + end) end function TalismanInfoPopup:AddListener()