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 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/Assets/MuHua/UITool/UIFloatingWindow/FloatingWindow.uxml.meta b/Assets/MuHua/UITool/UIFloatingWindow/FloatingWindow.uxml.meta
new file mode 100644
index 0000000..26edceb
--- /dev/null
+++ b/Assets/MuHua/UITool/UIFloatingWindow/FloatingWindow.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: f58c5527cf4cda147b239b37b0afcb85
+ScriptedImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 2
+ userData:
+ assetBundleName:
+ assetBundleVariant:
+ script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Assets/MuHua/UITool/UIScrollView.meta b/Assets/MuHua/UITool/UIScrollView.meta
new file mode 100644
index 0000000..12f02a7
--- /dev/null
+++ b/Assets/MuHua/UITool/UIScrollView.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bebc51f45f54a904a8e07157976da6bb
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MuHua/UITool/UIScrollView/ScrollView.uss b/Assets/MuHua/UITool/UIScrollView/ScrollView.uss
new file mode 100644
index 0000000..e69de29
diff --git a/Assets/MuHua/UITool/UIScrollView/ScrollView.uss.meta b/Assets/MuHua/UITool/UIScrollView/ScrollView.uss.meta
new file mode 100644
index 0000000..0caf3da
--- /dev/null
+++ b/Assets/MuHua/UITool/UIScrollView/ScrollView.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d8db2d69206657346a4fe9aebc592327
+ScriptedImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 2
+ userData:
+ assetBundleName:
+ assetBundleVariant:
+ script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+ disableValidation: 0
diff --git a/Assets/MuHua/UITool/UIScrollView/ScrollView.uxml b/Assets/MuHua/UITool/UIScrollView/ScrollView.uxml
new file mode 100644
index 0000000..072f0c0
--- /dev/null
+++ b/Assets/MuHua/UITool/UIScrollView/ScrollView.uxml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/Assets/MuHua/UITool/UIScrollView/ScrollView.uxml.meta b/Assets/MuHua/UITool/UIScrollView/ScrollView.uxml.meta
new file mode 100644
index 0000000..bbcbb5d
--- /dev/null
+++ b/Assets/MuHua/UITool/UIScrollView/ScrollView.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: e95fad6397f22504eb724a8ea0c8d926
+ScriptedImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 2
+ userData:
+ assetBundleName:
+ assetBundleVariant:
+ script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Assets/MuHua/UITool/UIScrollView/ScrollViewHorizontal.uss b/Assets/MuHua/UITool/UIScrollView/ScrollViewHorizontal.uss
new file mode 100644
index 0000000..e69de29
diff --git a/Assets/MuHua/UITool/UIScrollView/ScrollViewHorizontal.uss.meta b/Assets/MuHua/UITool/UIScrollView/ScrollViewHorizontal.uss.meta
new file mode 100644
index 0000000..f6d9c64
--- /dev/null
+++ b/Assets/MuHua/UITool/UIScrollView/ScrollViewHorizontal.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b0a55937e12435144b4b7c36d1fd6e95
+ScriptedImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 2
+ userData:
+ assetBundleName:
+ assetBundleVariant:
+ script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+ disableValidation: 0
diff --git a/Assets/MuHua/UITool/UIScrollView/ScrollViewHorizontal.uxml b/Assets/MuHua/UITool/UIScrollView/ScrollViewHorizontal.uxml
new file mode 100644
index 0000000..a156f19
--- /dev/null
+++ b/Assets/MuHua/UITool/UIScrollView/ScrollViewHorizontal.uxml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/Assets/MuHua/UITool/UIScrollView/ScrollViewHorizontal.uxml.meta b/Assets/MuHua/UITool/UIScrollView/ScrollViewHorizontal.uxml.meta
new file mode 100644
index 0000000..9df5cc5
--- /dev/null
+++ b/Assets/MuHua/UITool/UIScrollView/ScrollViewHorizontal.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: ac460a2d93de869499c04a4295795595
+ScriptedImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 2
+ userData:
+ assetBundleName:
+ assetBundleVariant:
+ script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Assets/MuHua/UITool/UIScrollView/ScrollViewVertical.uss b/Assets/MuHua/UITool/UIScrollView/ScrollViewVertical.uss
new file mode 100644
index 0000000..e69de29
diff --git a/Assets/MuHua/UITool/UIScrollView/ScrollViewVertical.uss.meta b/Assets/MuHua/UITool/UIScrollView/ScrollViewVertical.uss.meta
new file mode 100644
index 0000000..1747064
--- /dev/null
+++ b/Assets/MuHua/UITool/UIScrollView/ScrollViewVertical.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: fd72798a2f7a89b4b96b9d8249af66ad
+ScriptedImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 2
+ userData:
+ assetBundleName:
+ assetBundleVariant:
+ script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+ disableValidation: 0
diff --git a/Assets/MuHua/UITool/UIScrollView/ScrollViewVertical.uxml b/Assets/MuHua/UITool/UIScrollView/ScrollViewVertical.uxml
new file mode 100644
index 0000000..7e5449e
--- /dev/null
+++ b/Assets/MuHua/UITool/UIScrollView/ScrollViewVertical.uxml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/Assets/MuHua/UITool/UIScrollView/ScrollViewVertical.uxml.meta b/Assets/MuHua/UITool/UIScrollView/ScrollViewVertical.uxml.meta
new file mode 100644
index 0000000..330390e
--- /dev/null
+++ b/Assets/MuHua/UITool/UIScrollView/ScrollViewVertical.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: a75122cc6293a3d4f9ba44b98f4bed9e
+ScriptedImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 2
+ userData:
+ assetBundleName:
+ assetBundleVariant:
+ script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Assets/MuHua/UITool/UIScroller.meta b/Assets/MuHua/UITool/UIScroller.meta
new file mode 100644
index 0000000..2656aa5
--- /dev/null
+++ b/Assets/MuHua/UITool/UIScroller.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bd2ae276ee0cc884cbe88f423b8f35fd
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MuHua/UITool/UIScroller/ScrollerHorizontal.uss b/Assets/MuHua/UITool/UIScroller/ScrollerHorizontal.uss
new file mode 100644
index 0000000..75dc751
--- /dev/null
+++ b/Assets/MuHua/UITool/UIScroller/ScrollerHorizontal.uss
@@ -0,0 +1,11 @@
+.scroller-horizontal {
+ width: 100%;
+ height: 30px;
+ background-color: rgb(255, 255, 255);
+}
+
+.scroller-horizontal-dragger {
+ background-color: rgb(255, 126, 126);
+ width: 30px;
+ height: 100%;
+}
\ No newline at end of file
diff --git a/Assets/MuHua/UITool/UIScroller/ScrollerHorizontal.uss.meta b/Assets/MuHua/UITool/UIScroller/ScrollerHorizontal.uss.meta
new file mode 100644
index 0000000..da768ba
--- /dev/null
+++ b/Assets/MuHua/UITool/UIScroller/ScrollerHorizontal.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: fa60433f4fc03c34e8b51e6a8c9b32db
+ScriptedImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 2
+ userData:
+ assetBundleName:
+ assetBundleVariant:
+ script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+ disableValidation: 0
diff --git a/Assets/MuHua/UITool/UIScroller/ScrollerHorizontal.uxml b/Assets/MuHua/UITool/UIScroller/ScrollerHorizontal.uxml
new file mode 100644
index 0000000..2f1c2b0
--- /dev/null
+++ b/Assets/MuHua/UITool/UIScroller/ScrollerHorizontal.uxml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/Assets/MuHua/UITool/UIScroller/ScrollerHorizontal.uxml.meta b/Assets/MuHua/UITool/UIScroller/ScrollerHorizontal.uxml.meta
new file mode 100644
index 0000000..b635317
--- /dev/null
+++ b/Assets/MuHua/UITool/UIScroller/ScrollerHorizontal.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 14902068774d28f4daf1887a57533a75
+ScriptedImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 2
+ userData:
+ assetBundleName:
+ assetBundleVariant:
+ script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Assets/MuHua/UITool/UIScroller/ScrollerVertical.uss b/Assets/MuHua/UITool/UIScroller/ScrollerVertical.uss
new file mode 100644
index 0000000..a739de2
--- /dev/null
+++ b/Assets/MuHua/UITool/UIScroller/ScrollerVertical.uss
@@ -0,0 +1,11 @@
+.vertical-scroller {
+ width: 30px;
+ height: 100%;
+ background-color: rgb(255, 255, 255);
+}
+
+.vertical-scroller-dragger {
+ background-color: rgb(255, 126, 126);
+ width: 100%;
+ height: 30px;
+}
diff --git a/Assets/MuHua/UITool/UIScroller/ScrollerVertical.uss.meta b/Assets/MuHua/UITool/UIScroller/ScrollerVertical.uss.meta
new file mode 100644
index 0000000..2518d90
--- /dev/null
+++ b/Assets/MuHua/UITool/UIScroller/ScrollerVertical.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a7fd7497066a90d4cad4bb96a3d9cf68
+ScriptedImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 2
+ userData:
+ assetBundleName:
+ assetBundleVariant:
+ script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+ disableValidation: 0
diff --git a/Assets/MuHua/UITool/UIScroller/ScrollerVertical.uxml b/Assets/MuHua/UITool/UIScroller/ScrollerVertical.uxml
new file mode 100644
index 0000000..6b370e4
--- /dev/null
+++ b/Assets/MuHua/UITool/UIScroller/ScrollerVertical.uxml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/Assets/MuHua/UITool/UIScroller/ScrollerVertical.uxml.meta b/Assets/MuHua/UITool/UIScroller/ScrollerVertical.uxml.meta
new file mode 100644
index 0000000..e49160e
--- /dev/null
+++ b/Assets/MuHua/UITool/UIScroller/ScrollerVertical.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: f1b09f67b8d868f48ae3011621da6b73
+ScriptedImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 2
+ userData:
+ assetBundleName:
+ assetBundleVariant:
+ script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity
index b46fc5b..277d646 100644
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
@@ -122,6 +122,67 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
+--- !u!1 &36355707
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 36355710}
+ - component: {fileID: 36355709}
+ - component: {fileID: 36355708}
+ m_Layer: 5
+ m_Name: UIDocument
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &36355708
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 36355707}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 48270532e0731284a92ff8556d892c7e, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!114 &36355709
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 36355707}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_PanelSettings: {fileID: 11400000, guid: 4caef6f0e9981084a9e0cbfd447fac06, type: 2}
+ m_ParentUI: {fileID: 0}
+ sourceAsset: {fileID: 9197481963319205126, guid: 337d91fd31b0b764f97868cdacc90f66, type: 3}
+ m_SortingOrder: 0
+--- !u!4 &36355710
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 36355707}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &218982090
GameObject:
m_ObjectHideFlags: 0
@@ -863,6 +924,10 @@ PrefabInstance:
propertyPath: m_Name
value: StandardLabel
objectReference: {fileID: 0}
+ - target: {fileID: 1923445833930100383, guid: 9df2d2c64a5c06245be7e81572bcfe4e, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -877,3 +942,4 @@ SceneRoots:
- {fileID: 495038690}
- {fileID: 851831250}
- {fileID: 8592585726815668701}
+ - {fileID: 36355710}
diff --git a/Assets/Test.meta b/Assets/Test.meta
new file mode 100644
index 0000000..06ffcb9
--- /dev/null
+++ b/Assets/Test.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 255179b9440614542b26d46561680a31
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Test/TestUI.cs b/Assets/Test/TestUI.cs
new file mode 100644
index 0000000..72c5794
--- /dev/null
+++ b/Assets/Test/TestUI.cs
@@ -0,0 +1,20 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UIElements;
+using MuHua;
+
+public class TestUI : MonoBehaviour
+{
+ /// 绑定文档
+ public UIDocument document;
+ /// 根目录文档
+ public VisualElement root => document.rootVisualElement;
+
+ private UIScrollerHorizontal scroller;
+ private void Awake()
+ {
+ VisualElement Scroller = root.Q();
+ scroller = new UIScrollerHorizontal(Scroller, root);
+ }
+}
diff --git a/Assets/Test/TestUI.cs.meta b/Assets/Test/TestUI.cs.meta
new file mode 100644
index 0000000..31d57a7
--- /dev/null
+++ b/Assets/Test/TestUI.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 48270532e0731284a92ff8556d892c7e
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Test/TestUI.uxml b/Assets/Test/TestUI.uxml
new file mode 100644
index 0000000..e87616d
--- /dev/null
+++ b/Assets/Test/TestUI.uxml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/Assets/Test/TestUI.uxml.meta b/Assets/Test/TestUI.uxml.meta
new file mode 100644
index 0000000..60d3e01
--- /dev/null
+++ b/Assets/Test/TestUI.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 337d91fd31b0b764f97868cdacc90f66
+ScriptedImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 2
+ userData:
+ assetBundleName:
+ assetBundleVariant:
+ script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Assets/UI Toolkit/PanelSettings.asset b/Assets/UI Toolkit/PanelSettings.asset
index be2704f..a44a72e 100644
--- a/Assets/UI Toolkit/PanelSettings.asset
+++ b/Assets/UI Toolkit/PanelSettings.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 19101, guid: 0000000000000000e000000000000000, type: 0}
m_Name: PanelSettings
m_EditorClassIdentifier:
- themeUss: {fileID: -4733365628477956816, guid: a1f3f61784a9b574bb5b683d542e7d39, type: 3}
+ themeUss: {fileID: -4733365628477956816, guid: 59bfacbee7a859f42904b05799bf9437, type: 3}
m_TargetTexture: {fileID: 0}
m_ScaleMode: 2
m_ReferenceSpritePixelsPerUnit: 100
diff --git a/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss b/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss
index 9417520..cd84bda 100644
--- a/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss
+++ b/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss
@@ -1,4 +1,4 @@
@import url("/Packages/com.muhua.uicontrol/Assets/Themes/DefaultRuntimeTheme.tss");
-@import url("/Assets/FontLibrary/UIToolkit/Fonts.uss");
+
diff --git a/Packages/FSM/package.json b/Packages/FSM/package.json
index d78a451..04877e5 100644
--- a/Packages/FSM/package.json
+++ b/Packages/FSM/package.json
@@ -5,7 +5,7 @@
"description": "FiniteStateMachine\u6709\u9650\u72b6\u6001\u673a\u6846\u67b6",
"author": {
"name": "MuHua",
- "email": "2960208585@qq.com"
+ "email": "muhua233@qq.com"
},
"type": "tool",
"samples": [
diff --git a/Packages/LabelFollow/package.json b/Packages/LabelFollow/package.json
index 696772a..df05e69 100644
--- a/Packages/LabelFollow/package.json
+++ b/Packages/LabelFollow/package.json
@@ -5,7 +5,7 @@
"description": "\u6d6e\u52a8\u6807\u7b7e\u7cfb\u7edf",
"author": {
"name": "MuHua",
- "email": "2960208585@qq.com"
+ "email": "muhua233@qq.com"
},
"type": "tool",
"samples": [
diff --git a/Packages/UITool/Runtime.meta b/Packages/UITool/Runtime.meta
new file mode 100644
index 0000000..99a1c3c
--- /dev/null
+++ b/Packages/UITool/Runtime.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 687421b262e8f94438ea3821bca49d6b
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Packages/UITool/Runtime/MuHua.UITool.asmdef b/Packages/UITool/Runtime/MuHua.UITool.asmdef
new file mode 100644
index 0000000..90ac5c8
--- /dev/null
+++ b/Packages/UITool/Runtime/MuHua.UITool.asmdef
@@ -0,0 +1,3 @@
+{
+ "name": "MuHua.UITool"
+}
diff --git a/Packages/UITool/Runtime/MuHua.UITool.asmdef.meta b/Packages/UITool/Runtime/MuHua.UITool.asmdef.meta
new file mode 100644
index 0000000..dc06a15
--- /dev/null
+++ b/Packages/UITool/Runtime/MuHua.UITool.asmdef.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6206345d516a2bb4a821a7ee90e1b5d5
+AssemblyDefinitionImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Packages/UITool/Runtime/Tools.meta b/Packages/UITool/Runtime/Tools.meta
new file mode 100644
index 0000000..f74d0a1
--- /dev/null
+++ b/Packages/UITool/Runtime/Tools.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5c114499ba33d59478f35ca583231e02
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Packages/UITool/Runtime/Tools/UITool.cs b/Packages/UITool/Runtime/Tools/UITool.cs
new file mode 100644
index 0000000..017d180
--- /dev/null
+++ b/Packages/UITool/Runtime/Tools/UITool.cs
@@ -0,0 +1,26 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+#if ENABLE_INPUT_SYSTEM && UNITY_INPUT_SYSTEM_PACKAGE
+using UnityEngine.InputSystem;
+#endif
+
+namespace MuHua
+{
+ ///
+ /// UI工具
+ ///
+ public static class UITool
+ {
+ /// 获取鼠标位置
+ public static Vector3 GetMousePosition()
+ {
+#if ENABLE_INPUT_SYSTEM && UNITY_INPUT_SYSTEM_PACKAGE
+ return Mouse.current.position.ReadValue();
+#else
+ return Input.mousePosition;
+#endif
+ }
+ }
+}
\ No newline at end of file
diff --git a/Packages/UITool/Runtime/Tools/UITool.cs.meta b/Packages/UITool/Runtime/Tools/UITool.cs.meta
new file mode 100644
index 0000000..e6d6841
--- /dev/null
+++ b/Packages/UITool/Runtime/Tools/UITool.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ac8f1de11a0d473409df019e3d014d21
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Packages/UITool/Runtime/UIFloatingWindow.cs b/Packages/UITool/Runtime/UIFloatingWindow.cs
new file mode 100644
index 0000000..1721ad0
--- /dev/null
+++ b/Packages/UITool/Runtime/UIFloatingWindow.cs
@@ -0,0 +1,77 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+#if ENABLE_INPUT_SYSTEM && UNITY_INPUT_SYSTEM_PACKAGE
+using UnityEngine.InputSystem;
+#endif
+
+namespace MuHua
+{
+ ///
+ /// 悬浮窗口
+ ///
+ public abstract class UIFloatingWindow
+ {
+ /// 绑定的元素
+ public readonly VisualElement element;
+ /// 绑定的画布
+ public readonly VisualElement canvas;
+
+ private bool isDownMove;
+ private Vector3 pointerPosition;
+ private Vector3 originalPosition;
+
+ public VisualElement Window => element.Q("Window");
+ public VisualElement Top => element.Q("Top");
+ public VisualElement Container => element.Q("Container");
+
+ public Label Title => element.Q