From d32330f4b1ad3f4bb863e125d22010fcd602dc8b Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Fri, 22 Dec 2023 20:45:42 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BF=83=E6=84=BF=E6=8A=BD=E5=8D=A1]=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=E5=BF=83=E6=84=BF?= =?UTF-8?q?=E6=8A=BD=E5=8D=A1=E5=BF=83=E6=84=BF=E6=8A=BD=E8=A3=85=E5=A4=87?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Recruit/RecruitEquipPanelNew.prefab | 384 ++++++++++++++++++ .../DynamicActivity/TimeLimitUpHero.lua | 8 +- .../Modules/Operating/OperatingManager.lua | 4 + .../~Lua/Modules/Player/JumpManager.lua | 3 + .../Modules/Recruit/RecruitEquipPanelNew.lua | 14 + 5 files changed, 412 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitEquipPanelNew.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitEquipPanelNew.prefab index 1f1b95de59..68eb2fe2f0 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitEquipPanelNew.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitEquipPanelNew.prefab @@ -10898,6 +10898,127 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &2457739617985746926 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6517015777617752011} + - component: {fileID: 5460744977581086383} + - component: {fileID: 2819610492170099733} + - component: {fileID: 3942824355537341643} + m_Layer: 5 + m_Name: zqbg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6517015777617752011 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2457739617985746926} + 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: + - {fileID: 130627133138827722} + - {fileID: 2120582867657250868} + - {fileID: 1989902284330376601} + - {fileID: 8838079494150202763} + m_Father: {fileID: 8791069319542950841} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 399, y: 576} + m_SizeDelta: {x: 129, y: 126} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5460744977581086383 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2457739617985746926} + m_CullTransparentMesh: 0 +--- !u!114 &2819610492170099733 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2457739617985746926} + 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: 1, g: 1, b: 1, a: 1} + 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: 21300000, guid: de99e18ee6101e146b6d63540708cc25, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &3942824355537341643 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2457739617985746926} + 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: 2819610492170099733} + 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 &2480885231283029979 GameObject: m_ObjectHideFlags: 0 @@ -21096,6 +21217,100 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3325335872422946174 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 130627133138827722} + - component: {fileID: 9032749873019524390} + - component: {fileID: 7438979206256111400} + - component: {fileID: 1416705294966874883} + m_Layer: 5 + m_Name: Img + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &130627133138827722 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3325335872422946174} + 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: 6517015777617752011} + m_RootOrder: 0 + 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: 3.6} + m_SizeDelta: {x: 120, y: 101} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9032749873019524390 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3325335872422946174} + m_CullTransparentMesh: 0 +--- !u!114 &7438979206256111400 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3325335872422946174} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + 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: 21300000, guid: f9195d99260587f49a39e815c6ba7bf6, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!95 &1416705294966874883 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3325335872422946174} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 5d9ac99b75d220c43ba06f575523555c, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &3363185461273472464 GameObject: m_ObjectHideFlags: 0 @@ -21279,6 +21494,80 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -128} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &3626586144456692079 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2120582867657250868} + - component: {fileID: 7853710475770360392} + - component: {fileID: 6235047670187956430} + m_Layer: 5 + m_Name: Img2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2120582867657250868 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3626586144456692079} + 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: 6517015777617752011} + m_RootOrder: 1 + 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: -38.8} + m_SizeDelta: {x: 117, y: 39} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7853710475770360392 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3626586144456692079} + m_CullTransparentMesh: 0 +--- !u!114 &6235047670187956430 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3626586144456692079} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + 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: 21300000, guid: 27d3e3bfba04a224c9694ce5e6e9c79f, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &3749845715119794073 GameObject: m_ObjectHideFlags: 0 @@ -26604,6 +26893,80 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &4625330743365263282 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8838079494150202763} + - component: {fileID: 738972295875658454} + - component: {fileID: 662342633373151565} + m_Layer: 5 + m_Name: red + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8838079494150202763 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4625330743365263282} + 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: 6517015777617752011} + m_RootOrder: 3 + 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: 40.1, y: 39.49997} + m_SizeDelta: {x: 26, y: 26} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &738972295875658454 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4625330743365263282} + m_CullTransparentMesh: 0 +--- !u!114 &662342633373151565 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4625330743365263282} + 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: 1, g: 1, b: 1, a: 1} + 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: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &4681385928993236450 GameObject: m_ObjectHideFlags: 0 @@ -36586,6 +36949,7 @@ RectTransform: - {fileID: 146384446836850009} - {fileID: 2033406775299504181} - {fileID: 4558947000371413883} + - {fileID: 6517015777617752011} m_Father: {fileID: 3682111438792279610} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -58141,3 +58505,23 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1001 &2021795855514847598 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6517015777617752011} + m_Modifications: + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ccf72b26803e0d34cb0033c5bdd37418, type: 3} +--- !u!224 &1989902284330376601 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + m_PrefabInstance: {fileID: 2021795855514847598} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua index e9404ee653..838f016dbc 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua @@ -121,6 +121,12 @@ function TimeLimitUpHero:BindEvent() JumpManager.GoJump(40068) end) Util.AddOnceClick(self.lsth, function() + local isOpen =CheckFunctionOpenClient(FUNCTION_OPEN_TYPE.ChouJiangRukou) + local tip=GetFunctionOpenTipClient(FUNCTION_OPEN_TYPE.ChouJiangRukou) + if isOpen==false then + PopupTipPanel.ShowTip(tip) + return + end JumpManager.GoJump(40071) end) end @@ -296,7 +302,7 @@ function TimeLimitUpHero:RefreshGetHeroTimes() end local sureFunc=function() local isOpen =CheckFunctionOpenClient(FUNCTION_OPEN_TYPE.ChouJiangRukou) - local tip=GetFunctionOpenTip(FUNCTION_OPEN_TYPE.ChouJiangRukou) + local tip=GetFunctionOpenTipClient(FUNCTION_OPEN_TYPE.ChouJiangRukou) if isOpen==false then PopupTipPanel.ShowTip(tip) return diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 7724be44ca..6688c05ffd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -696,6 +696,10 @@ end --检测心愿抽卡活动红点 function this.GetWishDrawRedPointStatus() + local isOpen =CheckFunctionOpenClient(FUNCTION_OPEN_TYPE.ChouJiangRukou) + if isOpen==false then + return false + end local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LimitUpHero) if not activityId then return false diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 91286da73e..d04933699f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -737,6 +737,9 @@ local jumpDic = { [JumpType.xunxianbaoge] = function(data) this.JumpActivity(JumpType.xunxianbaoge,data[1]) end, + [20015] = function(data) + this.JumpActivity(20015,data[1]) + end, [JumpType.LingShouTehui] = function(data)--零售特惠 this.JumpActivity(JumpType.LingShouTehui,data[1]) end, diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitEquipPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitEquipPanelNew.lua index 5f4826b63a..2dacb2156d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitEquipPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitEquipPanelNew.lua @@ -52,6 +52,10 @@ function RecruitEquipPanelNew:InitComponent() self.wishOpen = Util.GetGameObject(self.wish,"upHeroGrid") self.wishPre = Util.GetGameObject(self.wish,"upHeroPre") + self.lsth = Util.GetGameObject(self.gameObject,"btngroup/zqbg") + self.lsth.gameObject:SetActive(false) + self.zqbgRed = Util.GetGameObject(self.gameObject,"btngroup/zqbg/red") + self.zqbgEffect = Util.GetGameObject(self.gameObject,"btngroup/zqbg/Fx_Circle 1") -- self.tip = Util.GetGameObject(self.panel, "tip/text"):GetComponent("Text") self.tenTip = Util.GetGameObject(self.panel, "TenTip") self.tenTipText = Util.GetGameObject(self.tenTip, "scroll/Text"):GetComponent("Text") @@ -92,6 +96,15 @@ function RecruitEquipPanelNew:InitComponent() end function RecruitEquipPanelNew:BindEvent() + Util.AddOnceClick(self.lsth, function() + local isOpen =CheckFunctionOpen(FUNCTION_OPEN_TYPE.EquipWish) + local tip=GetFunctionOpenTip(FUNCTION_OPEN_TYPE.EquipWish) + if isOpen==false then + PopupTipPanel.ShowTip(tip) + return + end + JumpManager.GoJump(40082) + end) --帮助按钮 Util.AddClick(self.helpBtn, function() UIManager.OpenPanel(UIName.HelpPopup,self.config.HelpId,self.helpPosition.x,self.helpPosition.y) @@ -128,6 +141,7 @@ function RecruitEquipPanelNew:OnSortingOrderChange(sortingOrder) Util.SetParticleSortLayer(self.UI_effect_RecruitPanel_box_normal, self.sortingOrder + 1) Util.SetParticleSortLayer(self.UI_effect_RecruitPanel_box_open, self.sortingOrder + 1) Util.SetParticleSortLayer(self.UI_effect_RecruitPanel_particle, self.sortingOrder + 1) + SetParticleSortLayer(self.zqbgEffect,self.sortingOrder+1) end --界面打开时调用(用于子类重写)