diff --git a/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelSingleChapterPanel.prefab b/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelSingleChapterPanel.prefab index 8d3d31e34c..e0116aa305 100644 --- a/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelSingleChapterPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelSingleChapterPanel.prefab @@ -1193,7 +1193,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -0.000000020563313, y: -14.779999} + m_AnchoredPosition: {x: 0, y: -14.779999} m_SizeDelta: {x: 20, y: 100} m_Pivot: {x: 0, y: 1} --- !u!114 &657127456868829156 @@ -1680,8 +1680,8 @@ RectTransform: 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: -40} - m_SizeDelta: {x: 475, y: 120} + m_AnchoredPosition: {x: 33.1, y: -40} + m_SizeDelta: {x: 381.3, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5503814208690857720 MonoBehaviour: diff --git a/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelSingleLevelInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelSingleLevelInfoPopup.prefab index 72ef3435c8..f86cb37ebb 100644 --- a/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelSingleLevelInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelSingleLevelInfoPopup.prefab @@ -703,7 +703,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1258,6 +1258,7 @@ GameObject: - component: {fileID: 959573497841823393} - component: {fileID: 6699426258124730411} - component: {fileID: 3775749191809282311} + - component: {fileID: 4634090645142763958} m_Layer: 5 m_Name: BgMask m_TagString: Untagged @@ -1321,6 +1322,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &4634090645142763958 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1910642579887335051} + 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: 3775749191809282311} + 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 &1913337183998506743 GameObject: m_ObjectHideFlags: 0 @@ -3805,17 +3848,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3156151473031480662} - m_LocalRotation: {x: -0, y: -0, z: 0.004054589, w: -0.99999183} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.89285713, y: 0.89285713, z: 0.8333336} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5255812259340674406} m_RootOrder: 4 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: 17.771, y: -468} - m_SizeDelta: {x: 638.3, y: 156.8} + m_AnchoredPosition: {x: 0, y: -439} + m_SizeDelta: {x: 700, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3156151473031480661 CanvasRenderer: @@ -3847,12 +3890,12 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 45 + m_FontSize: 43 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 45 - m_Alignment: 0 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -8696,7 +8739,7 @@ RectTransform: 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: -4, y: -455} + m_AnchoredPosition: {x: -4, y: -420} m_SizeDelta: {x: 666.2, y: 141.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5255812259545317010 @@ -9990,7 +10033,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8472957522681567586 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleLevelInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleLevelInfoPopup.lua index cacabb626e..6e88e926fa 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleLevelInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleLevelInfoPopup.lua @@ -23,6 +23,7 @@ function FightLevelSingleLevelInfoPopup:InitComponent() this.contents=Util.GetGameObject(this.gameObject,"Contents") this.BGImage1=Util.GetGameObject(this.gameObject,"Contents/BG/BGImage1") this.BGImage2=Util.GetGameObject(this.gameObject,"Contents/BG/BGImage2") + this.mask=Util.GetGameObject(this.gameObject,"BgMask") --this.backBtn=Util.GetGameObject(this.contents,"BackBtn") --子模块脚本初始化 for i = 1, #contentScripts do @@ -43,9 +44,9 @@ function FightLevelSingleLevelInfoPopup:BindEvent() contentScripts[i].view:BindEvent() end --返回按钮 - --Util.AddClick(this.backBtn,function() - -- self:ClosePanel() - --end) + Util.AddClick(this.mask,function() + self:ClosePanel() + end) end --添加事件监听(用于子类重写)