diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab index b50def75ad..ed5e2846c5 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab @@ -5214,7 +5214,7 @@ ParticleSystem: --- !u!199 &199793888397422328 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10306,7 +10306,7 @@ ParticleSystem: --- !u!199 &199786334729933541 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -15062,7 +15062,7 @@ ParticleSystem: --- !u!199 &199812891778826125 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -19750,7 +19750,7 @@ ParticleSystem: --- !u!199 &199314592830468766 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -24560,7 +24560,7 @@ ParticleSystem: --- !u!199 &199738970247411175 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -24783,6 +24783,7 @@ RectTransform: - {fileID: 224750236772289674} - {fileID: 224426596203719212} - {fileID: 4876906455354951967} + - {fileID: 4393913951047476588} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -29732,7 +29733,7 @@ ParticleSystem: --- !u!199 &199312732024159113 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -34818,7 +34819,7 @@ ParticleSystem: --- !u!199 &199309040906483979 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -39574,7 +39575,7 @@ ParticleSystem: --- !u!199 &199592651100025897 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -44404,7 +44405,7 @@ ParticleSystem: --- !u!199 &199310039250832541 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -49160,7 +49161,7 @@ ParticleSystem: --- !u!199 &199031629276305175 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -53997,7 +53998,7 @@ ParticleSystem: --- !u!199 &199224694020007487 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -58110,6 +58111,143 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &6909460281451971607 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4393913951047476588} + - component: {fileID: 2655808383754163735} + - component: {fileID: 519131936541944881} + - component: {fileID: 1413176289760668499} + - component: {fileID: 89058003544773882} + m_Layer: 5 + m_Name: imprintBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4393913951047476588 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6909460281451971607} + 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: 224287801546099592} + m_RootOrder: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 98.70001, y: 904} + m_SizeDelta: {x: 148, y: 158} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2655808383754163735 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6909460281451971607} + m_CullTransparentMesh: 0 +--- !u!114 &519131936541944881 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6909460281451971607} + 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: db6fe3e950012f644b3aaf02debee77a, 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 &1413176289760668499 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6909460281451971607} + 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: 519131936541944881} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &89058003544773882 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6909460281451971607} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, 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 &7028428600769697282 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua index 9ddc216df6..bfbf144842 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua @@ -12,6 +12,7 @@ function this.Initialize() -- this.PracticeConfigData = {} this.ImprintServerData = {}--服务器发来的神印信息 this.BigLevelImprintList = {}--大境界对应的神印 + this.HeroWithImprintList = {}--英雄身上的神印 end --从服务器更新当前修行等级 function this.UpdataFromServer(_level) @@ -172,7 +173,7 @@ end --服务器发来的神印信息 function this.UpdataImprintDataFromServer(_imprintList) - this.BigLevelWithImprint()--初始化大境界对应的神印 + this.BigLevelWithImprint()--初始化大境界/英雄对应的神印 for key, value in pairs(_imprintList) do if value and value.id then if not this.ImprintServerData[value.id] then @@ -185,19 +186,22 @@ function this.UpdataImprintDataFromServer(_imprintList) LogBlue("value.id:"..tostring(value.id).." value.type:"..tostring(value.type).." value.subId:"..tostring(value.subId).." value.state:"..tostring(value.state)) if value.state == 1 then this.BigLevelImprintList[XiuXianSkillConfig[value.id].UnlockId] = value.id - -- LogBlue("大境界Id:"..tostring(XiuXianSkillConfig[value.id].UnlockId).."对应的神印:"..tostring(value.id)) + if value.subId ~= nil and value.subId ~= "" and value.subId ~= "nil" then + this.HeroWithImprintList[value.subId] = value.id + end end end end end ---初始化大境界对应的神印 +--初始化大境界/英雄对应的神印 function this.BigLevelWithImprint() for i, v in ConfigPairs(XiuXianSkillConfig) do if v.UnlockId > 0 then this.BigLevelImprintList[v.UnlockId] = 0 end end + this.HeroWithImprintList = {} end --获取单个神印的信息(服务器+表) @@ -219,10 +223,11 @@ function this.SetNameColor(name,level) return ""..name.."" end -function this.GetOtherImprintList(team) - for i, hero in ipairs(team) do - local demonId = team.team[i].heroTid +function this.CheckHeroWearImprint(heroDid) + if this.HeroWithImprintList[heroDid] then + return this.HeroWithImprintList[heroDid] end + return false end return PracticeManager \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 30a0fee555..24cd0cdb9d 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -28,6 +28,7 @@ local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local heroRankupConfig = ConfigManager.GetConfig(ConfigName.HeroRankupConfig) local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig) local heroSkinConfig = ConfigManager.GetConfig(ConfigName.HeroSkin) +local XiuXianSkillConfig = ConfigManager.GetConfig(ConfigName.XiuXianSkillConfig) local index--当前英雄在 英雄列表中的索引 local soulPrintData={}--魂印数据 @@ -89,6 +90,8 @@ function RoleInfoPanel:InitComponent() this.talentProgress=Util.GetGameObject(self.transform,"talentBtn/progress"):GetComponent("Text") this.talentTipStr=Util.GetGameObject(self.transform,"talentBtn/tipStr"):GetComponent("Text") this.talentTipStrGo=Util.GetGameObject(self.transform,"talentBtn/tipStr") + --神印 + this.imprintBtn=Util.GetGameObject(self.transform,"imprintBtn") this.force = Util.GetGameObject(self.transform, "powerBtn/value"):GetComponent("Text") Util.GetGameObject(self.transform, "powerBtn"):GetComponent("Image").sprite = Util.LoadSprite("t_tongyong-zhanli_zh") @@ -612,6 +615,17 @@ function this:UpdateHeroInfoData() allAddProVal = HeroManager.CalculateHeroAllProValList(1,curHeroData.dynamicId,false) end this.force.text =allAddProVal[HeroProType.WarPower] + --神印按钮 + local imprintId = PracticeManager.CheckHeroWearImprint(curHeroData.dynamicId) + if imprintId then + this.imprintBtn:SetActive(true) + this.imprintBtn:GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(XiuXianSkillConfig[imprintId].Icon)) + Util.AddOnceClick(this.imprintBtn,function () + UIManager.OpenPanel(UIName.GeneralInfoPopup,GENERALINFO_TYPE.Imprint,imprintId,curHeroData.id) + end) + else + this.imprintBtn:SetActive(false) + end end function this:ChangeCurentHeroSkinLive(herodata)