From fb849c9c259c619d571140960a7940953b555020 Mon Sep 17 00:00:00 2001 From: MuHua-123 <136542559+MuHua-123@users.noreply.github.com> Date: Fri, 28 Feb 2025 18:28:03 +0800 Subject: [PATCH] 1 --- Assets/FontLibrary/UIToolkit/Fonts.uss | 3 - Assets/MuHua/UITool.meta | 8 ++ Assets/MuHua/UITool/DefaultTheme.meta | 8 ++ .../DefaultTheme/UnityDefaultRuntimeTheme.tss | 9 ++ .../UnityDefaultRuntimeTheme.tss.meta | 11 ++ Assets/MuHua/UITool/FontLibrary.meta | 8 ++ Assets/MuHua/UITool/FontLibrary/Fonts.uss | 3 + .../UITool/FontLibrary}/Fonts.uss.meta | 0 .../UITool/FontLibrary}/FontsTest.uxml | 0 .../UITool/FontLibrary}/FontsTest.uxml.meta | 0 .../SourceHanSansCN-Medium SDF.asset | 0 .../SourceHanSansCN-Medium SDF.asset.meta | 0 .../FontLibrary}/SourceHanSansCN-Medium.otf | Bin .../SourceHanSansCN-Medium.otf.meta | 0 Assets/MuHua/UITool/UIFloatingWindow.meta | 8 ++ .../UIFloatingWindow/FloatingWindow.uss | 95 ++++++++++++++++++ .../UIFloatingWindow/FloatingWindow.uss.meta | 11 ++ .../UIFloatingWindow/FloatingWindow.uxml | 10 ++ .../UIFloatingWindow/FloatingWindow.uxml.meta | 10 ++ Assets/MuHua/UITool/UIScrollView.meta | 8 ++ .../MuHua/UITool/UIScrollView/ScrollView.uss | 0 .../UITool/UIScrollView/ScrollView.uss.meta | 11 ++ .../MuHua/UITool/UIScrollView/ScrollView.uxml | 4 + .../UITool/UIScrollView/ScrollView.uxml.meta | 10 ++ .../UIScrollView/ScrollViewHorizontal.uss | 0 .../ScrollViewHorizontal.uss.meta | 11 ++ .../UIScrollView/ScrollViewHorizontal.uxml | 3 + .../ScrollViewHorizontal.uxml.meta | 10 ++ .../UIScrollView/ScrollViewVertical.uss | 0 .../UIScrollView/ScrollViewVertical.uss.meta | 11 ++ .../UIScrollView/ScrollViewVertical.uxml | 3 + .../UIScrollView/ScrollViewVertical.uxml.meta | 10 ++ Assets/MuHua/UITool/UIScroller.meta | 8 ++ .../UITool/UIScroller/ScrollerHorizontal.uss | 11 ++ .../UIScroller/ScrollerHorizontal.uss.meta | 11 ++ .../UITool/UIScroller/ScrollerHorizontal.uxml | 6 ++ .../UIScroller/ScrollerHorizontal.uxml.meta | 10 ++ .../UITool/UIScroller/ScrollerVertical.uss | 11 ++ .../UIScroller/ScrollerVertical.uss.meta | 11 ++ .../UITool/UIScroller/ScrollerVertical.uxml | 8 ++ .../UIScroller/ScrollerVertical.uxml.meta | 10 ++ Assets/Scenes/SampleScene.unity | 66 ++++++++++++ Assets/Test.meta | 8 ++ Assets/Test/TestUI.cs | 20 ++++ Assets/Test/TestUI.cs.meta | 11 ++ Assets/Test/TestUI.uxml | 5 + Assets/Test/TestUI.uxml.meta | 10 ++ Assets/UI Toolkit/PanelSettings.asset | 2 +- .../UnityThemes/UnityDefaultRuntimeTheme.tss | 2 +- Packages/FSM/package.json | 2 +- Packages/LabelFollow/package.json | 2 +- Packages/UITool/Runtime.meta | 8 ++ Packages/UITool/Runtime/MuHua.UITool.asmdef | 3 + .../UITool/Runtime/MuHua.UITool.asmdef.meta | 7 ++ Packages/UITool/Runtime/Tools.meta | 8 ++ Packages/UITool/Runtime/Tools/UITool.cs | 26 +++++ Packages/UITool/Runtime/Tools/UITool.cs.meta | 11 ++ Packages/UITool/Runtime/UIFloatingWindow.cs | 77 ++++++++++++++ .../UITool/Runtime/UIFloatingWindow.cs.meta | 11 ++ Packages/UITool/Runtime/UIScrollView.meta | 8 ++ .../Runtime/UIScrollView/UIScrollView.cs | 14 +++ .../Runtime/UIScrollView/UIScrollView.cs.meta | 11 ++ .../UIScrollView/UIScrollViewHorizontal.cs | 15 +++ .../UIScrollViewHorizontal.cs.meta | 11 ++ .../UIScrollView/UIScrollViewVertical.cs | 14 +++ .../UIScrollView/UIScrollViewVertical.cs.meta | 11 ++ Packages/UITool/Runtime/UIScroller.meta | 8 ++ .../UIScroller/UIScrollerHorizontal.cs | 76 ++++++++++++++ .../UIScroller/UIScrollerHorizontal.cs.meta | 11 ++ .../Runtime/UIScroller/UIScrollerVertical.cs | 14 +++ .../UIScroller/UIScrollerVertical.cs.meta | 11 ++ Packages/UITool/Samples.meta | 8 ++ Packages/UITool/package.json | 11 ++ Packages/UITool/package.json.meta | 7 ++ Packages/packages-lock.json | 6 ++ 75 files changed, 859 insertions(+), 7 deletions(-) delete mode 100644 Assets/FontLibrary/UIToolkit/Fonts.uss create mode 100644 Assets/MuHua/UITool.meta create mode 100644 Assets/MuHua/UITool/DefaultTheme.meta create mode 100644 Assets/MuHua/UITool/DefaultTheme/UnityDefaultRuntimeTheme.tss create mode 100644 Assets/MuHua/UITool/DefaultTheme/UnityDefaultRuntimeTheme.tss.meta create mode 100644 Assets/MuHua/UITool/FontLibrary.meta create mode 100644 Assets/MuHua/UITool/FontLibrary/Fonts.uss rename Assets/{FontLibrary/UIToolkit => MuHua/UITool/FontLibrary}/Fonts.uss.meta (100%) rename Assets/{FontLibrary/UIToolkit => MuHua/UITool/FontLibrary}/FontsTest.uxml (100%) rename Assets/{FontLibrary/UIToolkit => MuHua/UITool/FontLibrary}/FontsTest.uxml.meta (100%) rename Assets/{FontLibrary/UIToolkit => MuHua/UITool/FontLibrary}/SourceHanSansCN-Medium SDF.asset (100%) rename Assets/{FontLibrary/UIToolkit => MuHua/UITool/FontLibrary}/SourceHanSansCN-Medium SDF.asset.meta (100%) rename Assets/{FontLibrary/Fonts => MuHua/UITool/FontLibrary}/SourceHanSansCN-Medium.otf (100%) rename Assets/{FontLibrary/Fonts => MuHua/UITool/FontLibrary}/SourceHanSansCN-Medium.otf.meta (100%) create mode 100644 Assets/MuHua/UITool/UIFloatingWindow.meta create mode 100644 Assets/MuHua/UITool/UIFloatingWindow/FloatingWindow.uss create mode 100644 Assets/MuHua/UITool/UIFloatingWindow/FloatingWindow.uss.meta create mode 100644 Assets/MuHua/UITool/UIFloatingWindow/FloatingWindow.uxml create mode 100644 Assets/MuHua/UITool/UIFloatingWindow/FloatingWindow.uxml.meta create mode 100644 Assets/MuHua/UITool/UIScrollView.meta create mode 100644 Assets/MuHua/UITool/UIScrollView/ScrollView.uss create mode 100644 Assets/MuHua/UITool/UIScrollView/ScrollView.uss.meta create mode 100644 Assets/MuHua/UITool/UIScrollView/ScrollView.uxml create mode 100644 Assets/MuHua/UITool/UIScrollView/ScrollView.uxml.meta create mode 100644 Assets/MuHua/UITool/UIScrollView/ScrollViewHorizontal.uss create mode 100644 Assets/MuHua/UITool/UIScrollView/ScrollViewHorizontal.uss.meta create mode 100644 Assets/MuHua/UITool/UIScrollView/ScrollViewHorizontal.uxml create mode 100644 Assets/MuHua/UITool/UIScrollView/ScrollViewHorizontal.uxml.meta create mode 100644 Assets/MuHua/UITool/UIScrollView/ScrollViewVertical.uss create mode 100644 Assets/MuHua/UITool/UIScrollView/ScrollViewVertical.uss.meta create mode 100644 Assets/MuHua/UITool/UIScrollView/ScrollViewVertical.uxml create mode 100644 Assets/MuHua/UITool/UIScrollView/ScrollViewVertical.uxml.meta create mode 100644 Assets/MuHua/UITool/UIScroller.meta create mode 100644 Assets/MuHua/UITool/UIScroller/ScrollerHorizontal.uss create mode 100644 Assets/MuHua/UITool/UIScroller/ScrollerHorizontal.uss.meta create mode 100644 Assets/MuHua/UITool/UIScroller/ScrollerHorizontal.uxml create mode 100644 Assets/MuHua/UITool/UIScroller/ScrollerHorizontal.uxml.meta create mode 100644 Assets/MuHua/UITool/UIScroller/ScrollerVertical.uss create mode 100644 Assets/MuHua/UITool/UIScroller/ScrollerVertical.uss.meta create mode 100644 Assets/MuHua/UITool/UIScroller/ScrollerVertical.uxml create mode 100644 Assets/MuHua/UITool/UIScroller/ScrollerVertical.uxml.meta create mode 100644 Assets/Test.meta create mode 100644 Assets/Test/TestUI.cs create mode 100644 Assets/Test/TestUI.cs.meta create mode 100644 Assets/Test/TestUI.uxml create mode 100644 Assets/Test/TestUI.uxml.meta create mode 100644 Packages/UITool/Runtime.meta create mode 100644 Packages/UITool/Runtime/MuHua.UITool.asmdef create mode 100644 Packages/UITool/Runtime/MuHua.UITool.asmdef.meta create mode 100644 Packages/UITool/Runtime/Tools.meta create mode 100644 Packages/UITool/Runtime/Tools/UITool.cs create mode 100644 Packages/UITool/Runtime/Tools/UITool.cs.meta create mode 100644 Packages/UITool/Runtime/UIFloatingWindow.cs create mode 100644 Packages/UITool/Runtime/UIFloatingWindow.cs.meta create mode 100644 Packages/UITool/Runtime/UIScrollView.meta create mode 100644 Packages/UITool/Runtime/UIScrollView/UIScrollView.cs create mode 100644 Packages/UITool/Runtime/UIScrollView/UIScrollView.cs.meta create mode 100644 Packages/UITool/Runtime/UIScrollView/UIScrollViewHorizontal.cs create mode 100644 Packages/UITool/Runtime/UIScrollView/UIScrollViewHorizontal.cs.meta create mode 100644 Packages/UITool/Runtime/UIScrollView/UIScrollViewVertical.cs create mode 100644 Packages/UITool/Runtime/UIScrollView/UIScrollViewVertical.cs.meta create mode 100644 Packages/UITool/Runtime/UIScroller.meta create mode 100644 Packages/UITool/Runtime/UIScroller/UIScrollerHorizontal.cs create mode 100644 Packages/UITool/Runtime/UIScroller/UIScrollerHorizontal.cs.meta create mode 100644 Packages/UITool/Runtime/UIScroller/UIScrollerVertical.cs create mode 100644 Packages/UITool/Runtime/UIScroller/UIScrollerVertical.cs.meta create mode 100644 Packages/UITool/Samples.meta create mode 100644 Packages/UITool/package.json create mode 100644 Packages/UITool/package.json.meta diff --git a/Assets/FontLibrary/UIToolkit/Fonts.uss b/Assets/FontLibrary/UIToolkit/Fonts.uss deleted file mode 100644 index b27ce5e..0000000 --- a/Assets/FontLibrary/UIToolkit/Fonts.uss +++ /dev/null @@ -1,3 +0,0 @@ -.unity-text-element { - -unity-font-definition: url("project://database/Assets/FontLibrary/UIToolkit/SourceHanSansCN-Medium%20SDF.asset?fileID=11400000&guid=500f473f880266d43aaf04a728879085&type=2#SourceHanSansCN-Medium SDF"); -} diff --git a/Assets/MuHua/UITool.meta b/Assets/MuHua/UITool.meta new file mode 100644 index 0000000..a504670 --- /dev/null +++ b/Assets/MuHua/UITool.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6d1bcd63c2c24d540bc4736439c8dc7d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MuHua/UITool/DefaultTheme.meta b/Assets/MuHua/UITool/DefaultTheme.meta new file mode 100644 index 0000000..25eea16 --- /dev/null +++ b/Assets/MuHua/UITool/DefaultTheme.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 96a17be56bd1a684388f693fae44f7c9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MuHua/UITool/DefaultTheme/UnityDefaultRuntimeTheme.tss b/Assets/MuHua/UITool/DefaultTheme/UnityDefaultRuntimeTheme.tss new file mode 100644 index 0000000..03d61da --- /dev/null +++ b/Assets/MuHua/UITool/DefaultTheme/UnityDefaultRuntimeTheme.tss @@ -0,0 +1,9 @@ +@import url("unity-theme://default"); + +@import url("/Assets/MuHua/UITool/FontLibrary/Fonts.uss"); +@import url("/Assets/MuHua/UITool/UIScroller/ScrollerHorizontal.uss"); + + + + +VisualElement {} diff --git a/Assets/MuHua/UITool/DefaultTheme/UnityDefaultRuntimeTheme.tss.meta b/Assets/MuHua/UITool/DefaultTheme/UnityDefaultRuntimeTheme.tss.meta new file mode 100644 index 0000000..d4f71aa --- /dev/null +++ b/Assets/MuHua/UITool/DefaultTheme/UnityDefaultRuntimeTheme.tss.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 59bfacbee7a859f42904b05799bf9437 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 12388, guid: 0000000000000000e000000000000000, type: 0} + disableValidation: 0 diff --git a/Assets/MuHua/UITool/FontLibrary.meta b/Assets/MuHua/UITool/FontLibrary.meta new file mode 100644 index 0000000..c4690cf --- /dev/null +++ b/Assets/MuHua/UITool/FontLibrary.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a5bdaff13d0987148992bf7cc1af29a2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MuHua/UITool/FontLibrary/Fonts.uss b/Assets/MuHua/UITool/FontLibrary/Fonts.uss new file mode 100644 index 0000000..a42a0e8 --- /dev/null +++ b/Assets/MuHua/UITool/FontLibrary/Fonts.uss @@ -0,0 +1,3 @@ +.unity-text-element { + -unity-font-definition: url("project://database/Assets/MuHua/UITool/FontLibrary/SourceHanSansCN-Medium%20SDF.asset?fileID=11400000&guid=500f473f880266d43aaf04a728879085&type=2#SourceHanSansCN-Medium SDF"); +} diff --git a/Assets/FontLibrary/UIToolkit/Fonts.uss.meta b/Assets/MuHua/UITool/FontLibrary/Fonts.uss.meta similarity index 100% rename from Assets/FontLibrary/UIToolkit/Fonts.uss.meta rename to Assets/MuHua/UITool/FontLibrary/Fonts.uss.meta diff --git a/Assets/FontLibrary/UIToolkit/FontsTest.uxml b/Assets/MuHua/UITool/FontLibrary/FontsTest.uxml similarity index 100% rename from Assets/FontLibrary/UIToolkit/FontsTest.uxml rename to Assets/MuHua/UITool/FontLibrary/FontsTest.uxml diff --git a/Assets/FontLibrary/UIToolkit/FontsTest.uxml.meta b/Assets/MuHua/UITool/FontLibrary/FontsTest.uxml.meta similarity index 100% rename from Assets/FontLibrary/UIToolkit/FontsTest.uxml.meta rename to Assets/MuHua/UITool/FontLibrary/FontsTest.uxml.meta diff --git a/Assets/FontLibrary/UIToolkit/SourceHanSansCN-Medium SDF.asset b/Assets/MuHua/UITool/FontLibrary/SourceHanSansCN-Medium SDF.asset similarity index 100% rename from Assets/FontLibrary/UIToolkit/SourceHanSansCN-Medium SDF.asset rename to Assets/MuHua/UITool/FontLibrary/SourceHanSansCN-Medium SDF.asset diff --git a/Assets/FontLibrary/UIToolkit/SourceHanSansCN-Medium SDF.asset.meta b/Assets/MuHua/UITool/FontLibrary/SourceHanSansCN-Medium SDF.asset.meta similarity index 100% rename from Assets/FontLibrary/UIToolkit/SourceHanSansCN-Medium SDF.asset.meta rename to Assets/MuHua/UITool/FontLibrary/SourceHanSansCN-Medium SDF.asset.meta diff --git a/Assets/FontLibrary/Fonts/SourceHanSansCN-Medium.otf b/Assets/MuHua/UITool/FontLibrary/SourceHanSansCN-Medium.otf similarity index 100% rename from Assets/FontLibrary/Fonts/SourceHanSansCN-Medium.otf rename to Assets/MuHua/UITool/FontLibrary/SourceHanSansCN-Medium.otf diff --git a/Assets/FontLibrary/Fonts/SourceHanSansCN-Medium.otf.meta b/Assets/MuHua/UITool/FontLibrary/SourceHanSansCN-Medium.otf.meta similarity index 100% rename from Assets/FontLibrary/Fonts/SourceHanSansCN-Medium.otf.meta rename to Assets/MuHua/UITool/FontLibrary/SourceHanSansCN-Medium.otf.meta diff --git a/Assets/MuHua/UITool/UIFloatingWindow.meta b/Assets/MuHua/UITool/UIFloatingWindow.meta new file mode 100644 index 0000000..a856700 --- /dev/null +++ b/Assets/MuHua/UITool/UIFloatingWindow.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e7cdf28a5161c094ea27a8b5ad54d741 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MuHua/UITool/UIFloatingWindow/FloatingWindow.uss b/Assets/MuHua/UITool/UIFloatingWindow/FloatingWindow.uss new file mode 100644 index 0000000..f19c20e --- /dev/null +++ b/Assets/MuHua/UITool/UIFloatingWindow/FloatingWindow.uss @@ -0,0 +1,95 @@ +.window { + position: absolute; + top: auto; + left: auto; + width: 400px; + height: 300px; + background-color: rgba(0, 0, 0, 0); + border-radius: 10px; + padding: 20px; + display: flex; + flex-direction: column; + opacity: 1; + padding-top: 0; + padding-right: 0; + padding-bottom: 0; + padding-left: 0; + border-top-left-radius: 0; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} + +.window-top { + justify-content: space-between; + background-color: rgb(44, 62, 80); + border-top-left-radius: 10px; + border-top-right-radius: 10px; + padding-left: 10px; + height: 50px; + flex-direction: row; + flex-shrink: 1; + flex-grow: 0; + align-items: center; +} + +.window-title { + font-size: 24px; + color: rgb(236, 240, 241); + margin-bottom: 0; + margin-top: 0; + margin-right: 0; + margin-left: 0; + padding-top: 0; + padding-right: 0; + padding-bottom: 0; + padding-left: 0; + -unity-text-align: middle-left; +} + +.window-close-button { + background-color: rgb(231, 76, 60); + color: rgb(236, 240, 241); + border-radius: 5px; + margin-top: 10px; + margin-right: 10px; + margin-bottom: 10px; + margin-left: 10px; + border-top-left-radius: 5px; + border-top-right-radius: 5px; + border-bottom-right-radius: 5px; + border-bottom-left-radius: 5px; + border-top-width: 2px; + border-right-width: 2px; + border-bottom-width: 2px; + border-left-width: 2px; + border-left-color: rgba(0, 0, 0, 0); + border-right-color: rgba(0, 0, 0, 0); + border-top-color: rgba(0, 0, 0, 0); + border-bottom-color: rgba(0, 0, 0, 0); + height: 30px; +} + +.window-close-button:hover { + background-color: rgb(192, 57, 43); + border-top-width: 2px; + border-right-width: 2px; + border-bottom-width: 2px; + border-left-width: 2px; + border-left-color: rgb(0, 157, 255); + border-right-color: rgb(0, 157, 255); + border-top-color: rgb(0, 157, 255); + border-bottom-color: rgb(0, 157, 255); +} + +.window-container { + border-bottom-right-radius: 10px; + border-bottom-left-radius: 10px; + background-color: rgb(242, 242, 242); + overflow: hidden; +} + +.window-hidden { + display: none; + opacity: 0; +} diff --git a/Assets/MuHua/UITool/UIFloatingWindow/FloatingWindow.uss.meta b/Assets/MuHua/UITool/UIFloatingWindow/FloatingWindow.uss.meta new file mode 100644 index 0000000..1b4d66f --- /dev/null +++ b/Assets/MuHua/UITool/UIFloatingWindow/FloatingWindow.uss.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 71fd1505cc1aa1e4297e4f4534cc0124 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0} + disableValidation: 0 diff --git a/Assets/MuHua/UITool/UIFloatingWindow/FloatingWindow.uxml b/Assets/MuHua/UITool/UIFloatingWindow/FloatingWindow.uxml new file mode 100644 index 0000000..4018ee8 --- /dev/null +++ b/Assets/MuHua/UITool/UIFloatingWindow/FloatingWindow.uxml @@ -0,0 +1,10 @@ + +