diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/HandBookRoleInfoLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/HandBookRoleInfoLayout.prefab index 56d80a7b69..48f225acdb 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/HandBookRoleInfoLayout.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/HandBookRoleInfoLayout.prefab @@ -987,7 +987,7 @@ RectTransform: 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_AnchoredPosition: {x: 70, y: 0} m_SizeDelta: {x: 0, y: 85} m_Pivot: {x: 0, y: 0.5} --- !u!222 &3614437442981187742 @@ -3465,7 +3465,7 @@ RectTransform: 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_AnchoredPosition: {x: 71, y: 0} m_SizeDelta: {x: 0, y: 41.45} m_Pivot: {x: 0, y: 0.5} --- !u!222 &3663813682684106159 @@ -4331,8 +4331,8 @@ RectTransform: 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: 41.45} + m_AnchoredPosition: {x: 77, y: 0} + m_SizeDelta: {x: 104, y: 41.45} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1688020600117090388 CanvasRenderer: @@ -8702,7 +8702,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} + m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2458418651366070318 CanvasRenderer: @@ -8732,7 +8732,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 02b8bbbaafb89d84a99da3dc5017a5aa, type: 3} + m_Sprite: {fileID: 21300000, guid: 2841ef59ba90a5f49b2d57f88687affa, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -9696,7 +9696,7 @@ RectTransform: 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_AnchoredPosition: {x: 448.5, y: 0} m_SizeDelta: {x: 0, y: 47.225} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6322995927825636346 @@ -9868,7 +9868,7 @@ RectTransform: 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_AnchoredPosition: {x: 85, y: 0} m_SizeDelta: {x: 0, y: 44.45} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4501267893261888517 @@ -9945,7 +9945,7 @@ RectTransform: 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_AnchoredPosition: {x: 660.5, y: 0} m_SizeDelta: {x: 0, y: 44.45} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3877915115971012172 @@ -10090,7 +10090,7 @@ RectTransform: 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_AnchoredPosition: {x: 265.5, y: 0} m_SizeDelta: {x: 0, y: 47.225} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7656266521403922078 @@ -10313,7 +10313,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 7f30ca068e9d6fb42b599c00c9a961c1, type: 3} + m_Sprite: {fileID: 21300000, guid: d7183aaa8ad92e2488276d26fc370192, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -11799,7 +11799,7 @@ RectTransform: 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_AnchoredPosition: {x: 66, y: 0} m_SizeDelta: {x: 0, y: 66.54} m_Pivot: {x: 0, y: 0.5} --- !u!222 &571921070044625757 @@ -11972,7 +11972,7 @@ RectTransform: 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_AnchoredPosition: {x: 77, y: 0} m_SizeDelta: {x: 0, y: 41.45} m_Pivot: {x: 0, y: 0.5} --- !u!222 &2021221086696075032 @@ -12973,7 +12973,7 @@ RectTransform: 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_AnchoredPosition: {x: 58, y: 0} m_SizeDelta: {x: 135, y: 101} m_Pivot: {x: 0, y: 0.5} --- !u!222 &7422043946221685851 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab index f98d10ce56..4fd1f4897d 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab @@ -5330,7 +5330,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} + m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1173538945110251614 CanvasRenderer: @@ -5360,7 +5360,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 02b8bbbaafb89d84a99da3dc5017a5aa, type: 3} + m_Sprite: {fileID: 21300000, guid: 2841ef59ba90a5f49b2d57f88687affa, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -5726,7 +5726,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 71, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 41.45} m_Pivot: {x: 0, y: 0.5} --- !u!222 &40333311778133471 @@ -6780,8 +6780,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 77, y: 0} - m_SizeDelta: {x: 104, y: 41.45} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 41.45} m_Pivot: {x: 0, y: 0.5} --- !u!222 &2682522523802392612 CanvasRenderer: @@ -7026,7 +7026,6 @@ RectTransform: - {fileID: 8122201035242150163} - {fileID: 1956147084} - {fileID: 8122044912547665591} - - {fileID: 8121407380889834853} m_Father: {fileID: 8121610969977954679} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -7101,7 +7100,7 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 11 + m_Top: 10 m_Bottom: 0 m_ChildAlignment: 0 m_Spacing: 0 @@ -7884,7 +7883,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 197.2, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 79.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2754469465666163521 @@ -9632,7 +9631,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 50, y: 0} + m_AnchoredPosition: {x: 60, y: 0} m_SizeDelta: {x: 0, y: 85} m_Pivot: {x: 0, y: 0.5} --- !u!222 &35534546367631598 @@ -13504,7 +13503,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 70, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 55.89} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1577826011132609920 @@ -13841,7 +13840,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 66, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 66.54} m_Pivot: {x: 0, y: 0.5} --- !u!222 &3871106533570820909 @@ -14425,7 +14424,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 77, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 41.45} m_Pivot: {x: 0, y: 0.5} --- !u!222 &3340509914722266984 @@ -15445,7 +15444,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 265.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 47.225} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6347740220062144238 @@ -15751,15 +15750,15 @@ RectTransform: m_GameObject: {fileID: 8335189835709653227} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.85, y: 0.85, z: 1} + m_LocalScale: {x: 0.7, y: 0.7, z: 1} m_Children: [] - m_Father: {fileID: 7935205897551049063} - m_RootOrder: 7 + m_Father: {fileID: 8121610969977954679} + 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: 46} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 25.5} + m_SizeDelta: {x: 108, y: 87} m_Pivot: {x: 1, y: 0.5} --- !u!222 &8123468436595037891 CanvasRenderer: @@ -15789,7 +15788,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 7f30ca068e9d6fb42b599c00c9a961c1, type: 3} + m_Sprite: {fileID: 21300000, guid: d9c4c388bd4677046acf2fff583e4bc3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -15829,6 +15828,7 @@ RectTransform: m_LocalScale: {x: 0.85, y: 0.85, z: 1} m_Children: - {fileID: 7935205897551049063} + - {fileID: 8121407380889834853} m_Father: {fileID: 7662967509015272728} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -16161,7 +16161,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 660.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 44.45} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &542171998909720124 @@ -16384,7 +16384,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 448.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 47.225} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7343394640306199434 @@ -16556,7 +16556,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 85, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 44.45} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &873846228633414773 @@ -17811,7 +17811,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 70, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 55.89} m_Pivot: {x: 0, y: 0.5} --- !u!222 &7515070434223187451 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index 855f32f9cd..837761ee37 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -69,7 +69,7 @@ function RoleInfoLayout:InitComponent() this.allProButton = Util.GetGameObject(self.gameObject,"content/pro") this.posBtn = Util.GetGameObject(self.gameObject,"content/posBtn") this.posInfo = Util.GetGameObject(this.posBtn,"PosInfo"):GetComponent("Text") - this.proTip = Util.GetGameObject(self.gameObject,"content/pro/bg/tishi") + this.proTip = Util.GetGameObject(self.gameObject,"content/pro/tishi") this.skillGrid=Util.GetGameObject(self.gameObject,"content/skill") this.skillGrid2=Util.GetGameObject(self.gameObject,"content/skill2") this.selsectSkillImage=Util.GetGameObject(this.skillGrid,"selsectSkillImage")