diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab index 28e49fd61c..f592098fbe 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab @@ -55869,7 +55869,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2246648241802263488} - m_RootOrder: 2 + 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} @@ -57141,6 +57141,86 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6148560299268369487 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1626895919996446539} + - component: {fileID: 4670899948352390400} + - component: {fileID: 7195862976847799695} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1626895919996446539 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6148560299268369487} + 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: 5730679569691257838} + 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: 0} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4670899948352390400 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6148560299268369487} + m_CullTransparentMesh: 0 +--- !u!114 &7195862976847799695 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6148560299268369487} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, 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_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 23 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u4E03\u661F\u89E3\u9501" + LanguageIndex: 11548 --- !u!1 &6542225790368454234 GameObject: m_ObjectHideFlags: 0 @@ -58434,6 +58514,7 @@ RectTransform: m_Children: - {fileID: 5836802569624017800} - {fileID: 1058526753115987929} + - {fileID: 5730679569691257838} - {fileID: 539173715555894674} m_Father: {fileID: 8221946263362407270} m_RootOrder: 1 @@ -58649,6 +58730,81 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &9086748526179909697 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5730679569691257838} + - component: {fileID: 7193507369120574693} + - component: {fileID: 1571990144159239098} + m_Layer: 5 + m_Name: lock + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5730679569691257838 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9086748526179909697} + 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: 1626895919996446539} + m_Father: {fileID: 2246648241802263488} + m_RootOrder: 2 + 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: -6, y: -4} + m_SizeDelta: {x: 123, y: 24} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7193507369120574693 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9086748526179909697} + m_CullTransparentMesh: 0 +--- !u!114 &1571990144159239098 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9086748526179909697} + 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: 6855519ff9d6ad742bd124d6932043ac, 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 &9102816608975143759 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 7fee5dfa50..9c8f07c033 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -54,6 +54,7 @@ local teamHero = {}--主线编队成员信息 local talismanIsOpen = false--法宝是否开启 local soulPrintIsOpen = false--魂印是否开启 local isProChange=false +local isOpenGod --初始化组件(用于子类重写) function RoleInfoPanel:InitComponent() this.spLoader = SpriteLoader.New() @@ -231,6 +232,9 @@ function RoleInfoPanel:BindEvent() end end) Util.AddClick(this.godPrintBtn,function () + if not isOpenGod then + PopupTipPanel.ShowTip("神将六星解锁神印") + end UIManager.OpenPanel(UIName.GodPrintPanel,curHeroData,heroDatas) end) --法宝 @@ -757,6 +761,25 @@ function this:UpdateHeroInfoData() end --魂印按钮逻辑 this.soulPrintBtn:SetActive(ActTimeCtrlManager.IsQualifiled(87) and curHeroData.heroConfig.MaxRank >= EquipSignUnlock[2][2]) + --神印按钮逻辑 + local config = ConfigManager.GetConfigData(ConfigName.SpecialConfig,149) + if config then + local limits = string.split(config.Value, "#") + if limits then + this.godPrintBtn:SetActive(ActTimeCtrlManager.IsQualifiled(126)) + isOpenGod=curHeroData.star >= tonumber(limits[1]) + Util.SetGray(this.godPrintBtn, not isOpenGod) + Util.GetGameObject(this.godPrintBtn, "lock"):SetActive(not isOpenGod) + if not isOpenGod then + Util.GetGameObject(this.godPrintBtn, "lock/Text"):GetComponent("Text").text = "六星解锁" + end + else + this.godPrintBtn:SetActive(false) + end + else + this.godPrintBtn:SetActive(false) + end + this:SetDragView()