diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/HandBookRoleInfoLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/HandBookRoleInfoLayout.prefab index 886783db90..caf98e3b64 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/HandBookRoleInfoLayout.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/HandBookRoleInfoLayout.prefab @@ -5526,6 +5526,9 @@ GameObject: - component: {fileID: 4487789826452690660} - component: {fileID: 5582104310426932214} - component: {fileID: 339700535740451210} + - component: {fileID: 3941673511622965647} + - component: {fileID: 2785837382319435049} + - component: {fileID: 8945870842926663208} m_Layer: 5 m_Name: dingwei m_TagString: Untagged @@ -5591,6 +5594,76 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!114 &3941673511622965647 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5056771340439473104} + 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: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!222 &2785837382319435049 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5056771340439473104} + m_CullTransparentMesh: 0 +--- !u!114 &8945870842926663208 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5056771340439473104} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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 --- !u!1 &5168367206551728392 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua index 24e6c6874e..a511b2b090 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua @@ -41,7 +41,7 @@ function HandBookRoleInfoLayout:InitComponent() self.line3=Util.GetGameObject(self.gameObject,"skillBtns/line3") self.line4=Util.GetGameObject(self.gameObject,"skillBtns/line4") self.selsectSkillImage=Util.GetGameObject(self.gameObject,"selsectSkillImage") - self.posBtn= Util.GetGameObject(self.gameObject,"dingwei/posBtn") + self.posBtn= Util.GetGameObject(self.gameObject,"dingwei") self.posTxt=Util.GetGameObject(self.gameObject,"dingwei/posText"):GetComponent("Text") self.lvTxt=Util.GetGameObject(self.gameObject,"lvObj/lvTxt"):GetComponent("Text") self.proImg=Util.GetGameObject(self.gameObject,"posImage"):GetComponent("Image") @@ -171,7 +171,7 @@ function HandBookRoleInfoLayout:OnShowHeroData(_starType,star,_lv) self:SetBtnsLayer() end) end - if heroConFigData.IsSoulOpen == 1 and star > 10 then + if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.shenhun) and heroConFigData.IsSoulOpen == 1 and star > 10 then btnCount=btnCount+1 local passObj=Util.GetGameObject(self.skillGrid,"sBg"..len+2)--self.skillGrid.transform:GetChild(len+1).gameObject passObj:SetActive(true)