diff --git a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab index e2399e4a3c..9c0fca7c8a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab @@ -1181,8 +1181,8 @@ RectTransform: 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: -217.54} - m_SizeDelta: {x: 930, y: 1271} + m_AnchoredPosition: {x: 0, y: -226} + m_SizeDelta: {x: 930, y: 1252.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5589030476217656402 CanvasRenderer: @@ -1938,8 +1938,8 @@ RectTransform: 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: -217.49} - m_SizeDelta: {x: 930, y: 1270.9} + m_AnchoredPosition: {x: 0, y: -226} + m_SizeDelta: {x: 930, y: 1252.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1901117743731807471 CanvasRenderer: @@ -4262,8 +4262,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 365.9} - m_SizeDelta: {x: 1500, y: 105} + m_AnchoredPosition: {x: 0, y: 400.9} + m_SizeDelta: {x: 1500, y: 35.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4496328919072966302 CanvasRenderer: @@ -8240,8 +8240,8 @@ RectTransform: 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: -228.6} - m_SizeDelta: {x: 930, y: 1249.1} + m_AnchoredPosition: {x: 0, y: -226} + m_SizeDelta: {x: 930, y: 1252.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4545936478164797372 CanvasRenderer: @@ -11485,8 +11485,8 @@ RectTransform: 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: -217.56} - m_SizeDelta: {x: 930, y: 1271.1} + m_AnchoredPosition: {x: 0, y: -226} + m_SizeDelta: {x: 930, y: 1252.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7187733382765485609 CanvasRenderer: @@ -12517,10 +12517,10 @@ RectTransform: m_Father: {fileID: 5004630571723986136} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 608, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7583128553425786306 CanvasRenderer: @@ -12772,10 +12772,10 @@ RectTransform: m_Father: {fileID: 5004630571723986136} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 104, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7583128553461871492 CanvasRenderer: @@ -13519,10 +13519,10 @@ RectTransform: m_Father: {fileID: 5004630571723986136} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 440, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7583128555069003081 CanvasRenderer: @@ -13675,10 +13675,10 @@ RectTransform: m_Father: {fileID: 5004630571723986136} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 776, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7583128555296664243 CanvasRenderer: @@ -13793,10 +13793,10 @@ RectTransform: m_Father: {fileID: 5004630571723986136} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 272, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7583128555409597101 CanvasRenderer: @@ -15440,8 +15440,8 @@ RectTransform: 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: -217.49} - m_SizeDelta: {x: 930, y: 1270.9} + m_AnchoredPosition: {x: 0, y: -226.8} + m_SizeDelta: {x: 930, y: 1252.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8550694524238033415 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 4b4afc8ac2..cf654da330 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -504,6 +504,7 @@ function this.UpdateSingleHeroDatas(heroDId, heroLv, heroStar, breakId, upStarId actionPowerRormula[3] * heroLv + actionPowerRormula[4]) ) + PlayerManager.SetHeroHandBookListData(heroDatas[heroDId].id, heroDatas[heroDId].star) end if isCallBackChangeWar then this.CompareWarPower(heroDId) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 6e18f80eb2..f9ceedc9a0 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -455,11 +455,14 @@ local _PageBindData = {} --页签选中效果设置 function this:SetSelectBtn(index) - LogGreen("当前页签:"..index) this.selectBtn.transform:SetParent(tabsList[index].transform) this.selectBtn.transform.localScale = Vector3.one this.selectBtn.transform.localPosition=Vector3.zero Util.GetGameObject(this.selectBtn.transform, "Text"):GetComponent("Text").text = tabs[index].title + Util.GetGameObject(self.transform,"talentBtn/tipStr"):SetActive(false) + if index == 2 then + Util.GetGameObject(self.transform,"talentBtn/tipStr"):SetActive(true) + end end -- tab改变事件