diff --git a/Assets/ManagedResources/Prefabs/UI/GoodFriend/GoodFriendMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GoodFriend/GoodFriendMainPanel.prefab index 08eb470e09..795c15e246 100644 --- a/Assets/ManagedResources/Prefabs/UI/GoodFriend/GoodFriendMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GoodFriend/GoodFriendMainPanel.prefab @@ -892,8 +892,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.000026166439, y: 904} - m_SizeDelta: {x: 1080, y: 102.5} + m_AnchoredPosition: {x: 0.000026166439, y: 905.72} + m_SizeDelta: {x: 1080, y: 99.05} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &954335282 CanvasRenderer: @@ -2136,7 +2136,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2037088950 RectTransform: m_ObjectHideFlags: 0 @@ -2886,7 +2886,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 @@ -4286,7 +4286,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 180, y: 180} + m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5828071341644566728 CanvasRenderer: @@ -5581,7 +5581,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 180, y: 180} + m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7805188087420576223 CanvasRenderer: @@ -7435,7 +7435,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 180, y: 180} + m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1766362677631756855 CanvasRenderer: @@ -8773,10 +8773,10 @@ MonoBehaviour: Culture=neutral, PublicKeyToken=null m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_CustomCaretColor: 0 - m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} + m_SelectionColor: {r: 0.056381255, g: 0.060599018, b: 0.066037714, a: 0.7529412} m_Text: - m_CaretBlinkRate: 0.85 - m_CaretWidth: 1 + m_CaretBlinkRate: 3.06 + m_CaretWidth: 4 m_ReadOnly: 0 --- !u!1 &3626741708159676261 GameObject: @@ -12376,7 +12376,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 180, y: 180} + m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2014076604213274038 CanvasRenderer: @@ -13356,7 +13356,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6862594919747798903 RectTransform: m_ObjectHideFlags: 0 @@ -15441,7 +15441,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: -404.7, y: 3.5} + m_AnchoredPosition: {x: -404.7, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3612545106809169339 diff --git a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua index 4e17483360..62148d8ee6 100644 --- a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua @@ -63,25 +63,25 @@ function GoodFriendMainPanel:InitComponent() --GoodFriendManager.GetFriendInfoRequest(2)--1:好友, 2:推荐列表 3:申请列表 local v21 = this.friendListContentGrid:GetComponent("RectTransform").rect this.ScrollView1 = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.friendListContentGrid.transform, - this.item1, nil, Vector2.New(-v21.x * 2, -v21.y * 2), 1, 1, Vector2.New(0, -4)) + this.item1, nil, Vector2.New(-v21.x * 2, -v21.y * 2), 1, 1, Vector2.New(0, 15)) this.ScrollView1.moveTween.MomentumAmount = 1 this.ScrollView1.moveTween.Strength = 2 local v22 = this.friendApplicationContentGrid:GetComponent("RectTransform").rect this.ScrollView2 = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.friendApplicationContentGrid.transform, - this.item2, nil, Vector2.New(-v22.x * 2, -v22.y * 2), 1, 1, Vector2.New(0, -4)) + this.item2, nil, Vector2.New(-v22.x * 2, -v22.y * 2), 1, 1, Vector2.New(0, 15)) this.ScrollView2.moveTween.MomentumAmount = 1 this.ScrollView2.moveTween.Strength = 2 local v23 = this.friendSearchContentGrid:GetComponent("RectTransform").rect this.ScrollView3 = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.friendSearchContentGrid.transform, - this.item3, nil, Vector2.New(-v23.x * 2, -v23.y * 2), 1, 1, Vector2.New(0, -4)) + this.item3, nil, Vector2.New(-v23.x * 2, -v23.y * 2), 1, 1, Vector2.New(0, 15)) this.ScrollView3.moveTween.MomentumAmount = 1 this.ScrollView3.moveTween.Strength = 2 local v24 = this.blackListContentGrid:GetComponent("RectTransform").rect this.ScrollView4 = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.blackListContentGrid.transform, - this.item4, nil, Vector2.New(-v24.x * 2, -v24.y * 2), 1, 1, Vector2.New(0, -4)) + this.item4, nil, Vector2.New(-v24.x * 2, -v24.y * 2), 1, 1, Vector2.New(0, 15)) this.ScrollView4.moveTween.MomentumAmount = 1 this.ScrollView4.moveTween.Strength = 2