diff --git a/Assets/ModuleCore/ModuleUI/ModuleUIPage/UITestPage.cs b/Assets/ModuleCore/ModuleUI/ModuleUIPage/UITestPage.cs index 7138816..5294949 100644 --- a/Assets/ModuleCore/ModuleUI/ModuleUIPage/UITestPage.cs +++ b/Assets/ModuleCore/ModuleUI/ModuleUIPage/UITestPage.cs @@ -29,7 +29,7 @@ public class UITestPage : ModuleUIPage { dropdown.SetValue(list); dropdown.ValueChanged += (value) => Debug.Log(value); - scrollView = new UIScrollView(ScrollView, root, UIDirection.FromTopToBottom); + scrollView = new UIScrollView(ScrollView, root, UIDirection.Vertical, UIDirection.FromLeftToRight, UIDirection.FromTopToBottom); } private void Update() { dropdown.Update(); diff --git a/Assets/SceneManager/SampleScene/SampleScene.unity b/Assets/SceneManager/SampleScene/SampleScene.unity index 3122f06..5c04f01 100644 --- a/Assets/SceneManager/SampleScene/SampleScene.unity +++ b/Assets/SceneManager/SampleScene/SampleScene.unity @@ -692,6 +692,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a3ee54ac782eb1d4a9c8b92a859c3d38, type: 3} m_Name: m_EditorClassIdentifier: + document: {fileID: 1327183335} --- !u!1 &1334378334 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/UI Toolkit/Document/TestDocument.uxml b/Assets/UI Toolkit/Document/TestDocument.uxml index 0a8115a..da3847b 100644 --- a/Assets/UI Toolkit/Document/TestDocument.uxml +++ b/Assets/UI Toolkit/Document/TestDocument.uxml @@ -5,8 +5,8 @@ - - + + @@ -15,12 +15,17 @@ + + + + +