diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab index 19d1a84c07..ba5425bac5 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab @@ -431,7 +431,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &224230261642866192 RectTransform: m_ObjectHideFlags: 0 @@ -444,12 +444,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224525958220227972} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -48.5} - m_SizeDelta: {x: -26, y: -123} + m_AnchoredPosition: {x: 0, y: 70} + m_SizeDelta: {x: -50, y: -326.17} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222808304241616932 CanvasRenderer: @@ -479,8 +479,8 @@ 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: 9658c5a8f1777e74d9a8915414aaa5ac, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: dd45e2aaccfd75b4983340008ff67358, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -517,17 +517,18 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 6060184744563319682} - {fileID: 224230261642866192} - - {fileID: 224426544923544496} - {fileID: 224097724301338018} + - {fileID: 224426544923544496} - {fileID: 1363187077722955401} m_Father: {fileID: 224922477455617218} m_RootOrder: 1 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: -3.5, y: -17.71} - m_SizeDelta: {x: 888.9, y: 1355.6} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 940, y: 1000} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222748833298593690 CanvasRenderer: @@ -557,7 +558,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: 2ac0991f398537e409ada574046b899c, type: 3} + m_Sprite: {fileID: 21300000, guid: f2b962493626faf4d9a1829d593bff07, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -602,7 +603,7 @@ 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: -50, y: -524} + m_AnchoredPosition: {x: 0, y: -310} m_SizeDelta: {x: 0, y: 64.400024} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222072748987938296 @@ -809,11 +810,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224525958220227972} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -48} + m_AnchoredPosition: {x: 0, y: -44.5} m_SizeDelta: {x: 384.31, y: 64.410034} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222777620752913476 @@ -837,7 +838,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.92549026, g: 0.8588236, b: 0.74509805, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -847,7 +848,7 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} m_FontSize: 45 - m_FontStyle: 0 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 4 m_MaxSize: 50 @@ -1130,10 +1131,10 @@ RectTransform: m_Father: {fileID: 224922477455617218} 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: 408.02, y: 625.5} - m_SizeDelta: {x: 154, y: 139} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -121.899994, y: -515} + m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222172312748859870 CanvasRenderer: @@ -1163,7 +1164,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: 87b3cd7ab5ab3854db979a44d7e17767, type: 3} + m_Sprite: {fileID: 21300000, guid: 80b75ff76a0993041ac8b194fbeb0c19, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1319,12 +1320,12 @@ GameObject: - component: {fileID: 222090514832067844} - component: {fileID: 114610047359146968} m_Layer: 5 - m_Name: Image + m_Name: titleBG m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &224097724301338018 RectTransform: m_ObjectHideFlags: 0 @@ -1334,15 +1335,16 @@ RectTransform: m_GameObject: {fileID: 1641215205469108} 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_LocalScale: {x: 0.6, y: 0.6, z: 1} + m_Children: + - {fileID: 299148921184774006} m_Father: {fileID: 224525958220227972} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -0.28999758, y: 212.9} - m_SizeDelta: {x: 898.92, y: 4.4400024} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -45} + m_SizeDelta: {x: 666, y: 124} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222090514832067844 CanvasRenderer: @@ -1372,7 +1374,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: 19d5542f3ad36154883cfc2022d17e0a, type: 3} + m_Sprite: {fileID: 21300000, guid: 23f48f30ffa61104f8558bd46c51b2cd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1660,9 +1662,9 @@ RectTransform: m_Father: {fileID: 224922477455617218} m_RootOrder: 8 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: 180, y: -616} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 180, y: 554.3} m_SizeDelta: {x: 266, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222377172953290452 @@ -1872,8 +1874,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: -5.1244, y: 499.8} - m_SizeDelta: {x: 856.25, y: 970.7} + m_AnchoredPosition: {x: 0, y: 378.6} + m_SizeDelta: {x: 850, y: 610.5} m_Pivot: {x: 0.5, y: 1} --- !u!222 &222846710238382770 CanvasRenderer: @@ -2020,7 +2022,7 @@ 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: -1.44, y: -1.72} + m_AnchoredPosition: {x: -1.44, y: 3.5} m_SizeDelta: {x: 157.13, y: 65.07} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2887608802854596771 @@ -2044,7 +2046,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.23584908, g: 0.12935387, b: 0.08121218, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2141,6 +2143,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &912621882975710195 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 299148921184774006} + - component: {fileID: 7450425849829276} + - component: {fileID: 4679872864885171116} + m_Layer: 5 + m_Name: wenli + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &299148921184774006 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 912621882975710195} + 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: 224097724301338018} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 47.5} + m_SizeDelta: {x: 642, y: 96} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7450425849829276 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 912621882975710195} + m_CullTransparentMesh: 0 +--- !u!114 &4679872864885171116 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 912621882975710195} + 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: b105068399c35b842b41ad874dae29f0, 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 &954533782056180850 GameObject: m_ObjectHideFlags: 0 @@ -2322,7 +2398,7 @@ RectTransform: m_Children: - {fileID: 7341448468586361976} m_Father: {fileID: 224525958220227972} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2548,7 +2624,7 @@ 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: 0} + m_AnchoredPosition: {x: 0, y: 2.7} m_SizeDelta: {x: 157.13, y: 65.07} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1914539670844352180 @@ -2572,7 +2648,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.53333336, g: 0.34901962, b: 0.13333334, a: 1} + m_Color: {r: 0.2830189, g: 0.1938229, b: 0.089444645, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3040,9 +3116,9 @@ RectTransform: m_Father: {fileID: 224922477455617218} m_RootOrder: 9 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: -180, y: -616} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -180, y: 554.3001} m_SizeDelta: {x: 266, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &245000640175901755 @@ -3179,10 +3255,10 @@ RectTransform: m_Father: {fileID: 224922477455617218} m_RootOrder: 10 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: -1, y: -611} - m_SizeDelta: {x: 260, y: 74} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 552.8001} + m_SizeDelta: {x: 260, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6963492470490311145 CanvasRenderer: @@ -3212,7 +3288,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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Sprite: {fileID: 21300000, guid: 9eb616bde89052047ae1d9f20103daa7, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -3396,7 +3472,7 @@ 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: 0} + m_AnchoredPosition: {x: 0, y: 2.0999756} m_SizeDelta: {x: 210.08, y: 61.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6679550878004569784 @@ -4009,3 +4085,77 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &8552727712967633949 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6060184744563319682} + - component: {fileID: 4690663535739026008} + - component: {fileID: 3804311230837582272} + m_Layer: 5 + m_Name: wenli + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6060184744563319682 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8552727712967633949} + 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: 224525958220227972} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0.4000244} + m_SizeDelta: {x: -50, y: -52.19995} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4690663535739026008 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8552727712967633949} + m_CullTransparentMesh: 0 +--- !u!114 &3804311230837582272 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8552727712967633949} + 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: db524d3ca12854646b84559dd3e346a3, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua index 93c5c780b2..1686afe10f 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua @@ -25,7 +25,7 @@ function RoleUpStarListPanel:InitComponent() this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(self.gameObject, "scroll").transform, this.cardPre, this.Scrollbar, Vector2.New(v.width, v.height), 1, 5, Vector2.New(19.32, 40)) - this.ScrollView.gameObject:GetComponent("RectTransform").anchoredPosition = Vector2.New(6.78, 27) + this.ScrollView.gameObject:GetComponent("RectTransform").anchoredPosition = Vector2.New(0, 0) this.ScrollView.gameObject:GetComponent("RectTransform").anchorMin = Vector2.New(0.5, 0.5) this.ScrollView.gameObject:GetComponent("RectTransform").anchorMax = Vector2.New(0.5, 0.5) this.ScrollView.moveTween.MomentumAmount = 1