From e509483e41c7b99700acf3566006f9d1f1512be8 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 23 May 2022 15:30:58 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AF=BB=E4=BB=99=E6=8B=9B=E5=8B=9F]=3D=3D=3D?= =?UTF-8?q?=3D=3D=E9=A2=84=E8=AE=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/GeneralPanel/GeneralBigPopup.prefab | 66 +++++++++---------- .../Popup/View/GeneralPopup_ChooseUpHero.lua | 2 +- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 528eaae981..775e1430a8 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -348,10 +348,10 @@ RectTransform: m_Father: {fileID: 6511771316027140810} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 595, y: -45} - m_SizeDelta: {x: 150, y: 150} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &103057047 CanvasRenderer: @@ -5775,10 +5775,10 @@ RectTransform: m_Father: {fileID: 6511771316027140810} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 75, y: -45} - m_SizeDelta: {x: 150, y: 150} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4333355844115441707 CanvasRenderer: @@ -7244,7 +7244,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -410} - m_SizeDelta: {x: 800, y: 90} + m_SizeDelta: {x: 0, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5992374240210674179 CanvasRenderer: @@ -15167,10 +15167,10 @@ RectTransform: m_Father: {fileID: 6511771316027140810} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 465, y: -45} - m_SizeDelta: {x: 150, y: 150} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1573551743946025575 CanvasRenderer: @@ -18438,10 +18438,10 @@ RectTransform: m_Father: {fileID: 6511771316027140810} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 335, y: -45} - m_SizeDelta: {x: 150, y: 150} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4934918169303577311 CanvasRenderer: @@ -19565,10 +19565,10 @@ RectTransform: m_Father: {fileID: 6511771316027140810} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 205, y: -45} - m_SizeDelta: {x: 150, y: 150} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5684472203954849967 CanvasRenderer: @@ -20782,10 +20782,10 @@ RectTransform: m_Father: {fileID: 6511771316027140810} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 725, y: -45} - m_SizeDelta: {x: 150, y: 150} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6724403881698098274 CanvasRenderer: @@ -24989,7 +24989,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3828362588263756447 RectTransform: m_ObjectHideFlags: 0 @@ -43497,8 +43497,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: -90} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: -0.60876, y: -90} + m_SizeDelta: {x: 161.22, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3107133874447021717 CanvasRenderer: @@ -43530,15 +43530,15 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 4 + m_MinSize: 2 + m_MaxSize: 265 + m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua index a9020d9a36..8af42b2efc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua @@ -27,7 +27,7 @@ function this:InitComponent(gameObject) local rootHight = this.root.transform.rect.height local width = this.root.transform.rect.width this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.root.transform, - this.prefab,nil, Vector2.New(width, rootHight), 1, 5,Vector2.New(20,40)) + this.prefab,nil, Vector2.New(width, rootHight), 1, 5,Vector2.New(20,80)) this.ScrollView.moveTween.MomentumAmount = 1 this.ScrollView.moveTween.Strength = 2 this.ScrollView.elastic = false