From 39aa09f3177250b1a54f1786a89dd42cdcb4aba1 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 22 Oct 2021 11:27:47 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=82=B9=E5=87=BB=E9=BB=91=E8=89=B2?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E5=85=B3=E9=97=AD=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QuickPurchase/QuickPurchasePanel.prefab | 122 +++++++++++++++++- .../QuickPurchase/QuickPurchasePanel.lua | 17 ++- 2 files changed, 133 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/QuickPurchase/QuickPurchasePanel.prefab b/Assets/ManagedResources/Prefabs/UI/QuickPurchase/QuickPurchasePanel.prefab index 881fdd197a..398117840c 100644 --- a/Assets/ManagedResources/Prefabs/UI/QuickPurchase/QuickPurchasePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/QuickPurchase/QuickPurchasePanel.prefab @@ -2651,7 +2651,7 @@ RectTransform: m_Children: - {fileID: 224641604813797116} m_Father: {fileID: 224186096547724832} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2673,7 +2673,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1478784877413772} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -6026,6 +6026,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 3991899024909538889} - {fileID: 224434740051487558} m_Father: {fileID: 0} m_RootOrder: 0 @@ -7581,6 +7582,123 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2961029825949491722} m_CullTransparentMesh: 0 +--- !u!1 &3448795897872020067 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3991899024909538889} + - component: {fileID: 1534945010657177594} + - component: {fileID: 5369209181501476874} + - component: {fileID: 6366439769228432051} + m_Layer: 5 + m_Name: Mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3991899024909538889 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3448795897872020067} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224186096547724832} + m_RootOrder: 0 + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1534945010657177594 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3448795897872020067} + m_CullTransparentMesh: 0 +--- !u!114 &5369209181501476874 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3448795897872020067} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.78431374} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &6366439769228432051 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3448795897872020067} + 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: 5369209181501476874} + 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 &3535828274943961996 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickPurchasePanel.lua b/Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickPurchasePanel.lua index 0da32d8f00..d5f68205c1 100644 --- a/Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickPurchasePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickPurchasePanel.lua @@ -21,9 +21,8 @@ local ColorDef = { function QuickPurchasePanel:InitComponent() self.spLoader = SpriteLoader.New() - self.transform:Find("frame/bg/closeBtn"):GetComponent("Button").onClick:AddListener(function() - self:ClosePanel() - end) + self.Mask = Util.GetGameObject(self.transform, "Mask") + self.closeBtn = Util.GetGameObject(self.transform, "frame/bg/closeBtn") self.title = Util.GetGameObject(self.transform, "frame/bg/title"):GetComponent("Text") self.help = Util.GetGameObject(self.transform, "frame/bg/help") self.commonPurchase = QuickCommonPurchasePart.new(self, self.transform:Find("frame/bg/commonPart")) @@ -33,12 +32,22 @@ function QuickPurchasePanel:InitComponent() self.coinPurchase=QuickCoinPurchasePart.new(self,self.transform:Find("frame/bg/coinPart")) self.coinPurchase:OnHide() + +end + +--绑定事件(用于子类重写) +function QuickPurchasePanel:BindEvent() Util.AddOnceClick(self.help, function() local pos = self.help.transform.localPosition UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.BuyCoin, pos.x, pos.y) end) + Util.AddOnceClick(self.Mask, function() + self:ClosePanel() + end) + Util.AddOnceClick(self.closeBtn, function() + self:ClosePanel() + end) end - --context = {type} function QuickPurchasePanel:OnOpen(context) self.title.text = Language[11668]