diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/FaLingSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/FaLingSingleShowPopup.prefab index ef882dd384..d66de896ce 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/FaLingSingleShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/FaLingSingleShowPopup.prefab @@ -69,8 +69,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: 6ff20609e8c68014394e6b730e1c7948, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 5ce4cf7c6a156d64ca117ce0caf6a53b, type: 3} + m_Type: 1 m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 @@ -20714,8 +20714,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: 6ff20609e8c68014394e6b730e1c7948, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 5ce4cf7c6a156d64ca117ce0caf6a53b, type: 3} + m_Type: 1 m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 @@ -30874,7 +30874,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: 96.2, y: 24.1} + m_AnchoredPosition: {x: 109.2, y: 24.1} m_SizeDelta: {x: 25, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1809506500578323808 @@ -51261,8 +51261,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: 6ff20609e8c68014394e6b730e1c7948, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 5ce4cf7c6a156d64ca117ce0caf6a53b, type: 3} + m_Type: 1 m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 @@ -61264,7 +61264,7 @@ MonoBehaviour: m_ChildAlignment: 4 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 260, y: 74} + m_CellSize: {x: 260, y: 90} m_Spacing: {x: 40, y: 0} m_Constraint: 0 m_ConstraintCount: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaLingListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaLingListPanel.prefab index c7ce7a6d88..c9af7dc3e1 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaLingListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaLingListPanel.prefab @@ -263,7 +263,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -78, y: 117} + m_AnchoredPosition: {x: -82.3, y: 149} m_SizeDelta: {x: 6, y: 552.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222281965302237708 @@ -384,8 +384,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.07006836, y: -25.428986} - m_SizeDelta: {x: -91.3, y: -159.88} + m_AnchoredPosition: {x: 0, y: -5.1999817} + m_SizeDelta: {x: -60, y: -202} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222808304241616932 CanvasRenderer: @@ -466,7 +466,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 0, y: 146.8} - m_SizeDelta: {x: 0.000061035, y: 771.2} + m_SizeDelta: {x: -80, y: 771.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222748833298593690 CanvasRenderer: @@ -761,7 +761,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: -868, y: 424.7} + m_AnchoredPosition: {x: -1274, y: 424.7} m_SizeDelta: {x: 120, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222865794791962386 @@ -912,7 +912,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -67.97, y: -63.400024} + m_AnchoredPosition: {x: -66.9, y: -59.9} m_SizeDelta: {x: 119.130005, y: 119.869995} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222172312748859870 @@ -1099,7 +1099,7 @@ 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 @@ -1121,8 +1121,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 469.55, y: -43.75} - m_SizeDelta: {x: 965.82, y: 87.5} + m_AnchoredPosition: {x: 416.14, y: -43.75} + m_SizeDelta: {x: 900.32, y: 87.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222090514832067844 CanvasRenderer: @@ -1363,8 +1363,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: -16, y: -172} - m_SizeDelta: {x: 260, y: 74} + m_AnchoredPosition: {x: -16, y: -184.6} + m_SizeDelta: {x: 260, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222377172953290452 CanvasRenderer: @@ -1394,8 +1394,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: 9657165ee43a7cb44ba1f1d5b522d220, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 5ce4cf7c6a156d64ca117ce0caf6a53b, type: 3} + m_Type: 1 m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 @@ -1573,8 +1573,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: -19, y: 250.2} - m_SizeDelta: {x: 773.1, y: 523.9} + m_AnchoredPosition: {x: -2.95, y: 271.13} + m_SizeDelta: {x: 914.41, y: 551.3} m_Pivot: {x: 0.5, y: 1} --- !u!222 &222846710238382770 CanvasRenderer: @@ -1721,8 +1721,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.060058594, y: -31.50003} - m_SizeDelta: {x: -91.32, y: -163.1} + m_AnchoredPosition: {x: -0.000011444092, y: -11.390015} + m_SizeDelta: {x: -60, y: -203.31} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6865014636957397900 CanvasRenderer: @@ -2795,7 +2795,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: 104.99994, y: 91} + m_AnchoredPosition: {x: 104.99994, y: 141} m_SizeDelta: {x: 306, y: 414} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4374805718658329674 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingListPanel.lua index 331c7b3fec..231f2bebea 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingListPanel.lua @@ -23,7 +23,7 @@ function FaLingListPanel:InitComponent() this.Scrollbar= Util.GetGameObject(self.gameObject, "Scrollbar"):GetComponent("Scrollbar") 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(50,50)) - 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