diff --git a/Assets/UI Toolkit/PanelSettings.asset b/Assets/MuHua/UITool/DefaultTheme/PanelSettings.asset
similarity index 100%
rename from Assets/UI Toolkit/PanelSettings.asset
rename to Assets/MuHua/UITool/DefaultTheme/PanelSettings.asset
diff --git a/Assets/UI Toolkit/PanelSettings.asset.meta b/Assets/MuHua/UITool/DefaultTheme/PanelSettings.asset.meta
similarity index 100%
rename from Assets/UI Toolkit/PanelSettings.asset.meta
rename to Assets/MuHua/UITool/DefaultTheme/PanelSettings.asset.meta
diff --git a/Assets/MuHua/UITool/DefaultTheme/UnityDefaultRuntimeTheme.tss b/Assets/MuHua/UITool/DefaultTheme/UnityDefaultRuntimeTheme.tss
index adda22f..f8644bb 100644
--- a/Assets/MuHua/UITool/DefaultTheme/UnityDefaultRuntimeTheme.tss
+++ b/Assets/MuHua/UITool/DefaultTheme/UnityDefaultRuntimeTheme.tss
@@ -1,10 +1,14 @@
@import url("unity-theme://default");
@import url("/Assets/MuHua/UITool/FontLibrary/Fonts.uss");
-@import url("/Assets/MuHua/UITool/UIFloatingWindow/FloatingWindow.uss");
-@import url("/Assets/MuHua/UITool/UIScroller/Scroller.uss");
-@import url("/Assets/MuHua/UITool/UIScrollView/ScrollView.uss");
-@import url("/Assets/MuHua/UITool/UISlider/Slider.uss");
+@import url("/Assets/MuHua/UITool/USS/InputField.uss");
+@import url("/Assets/MuHua/UITool/USS/Scroller.uss");
+@import url("/Assets/MuHua/UITool/USS/ScrollView.uss");
+@import url("/Assets/MuHua/UITool/USS/Slider.uss");
+@import url("/Assets/MuHua/UITool/USS/Window.uss");
+
+
+
diff --git a/Assets/MuHua/UITool/UIFloatingWindow.meta b/Assets/MuHua/UITool/USS.meta
similarity index 77%
rename from Assets/MuHua/UITool/UIFloatingWindow.meta
rename to Assets/MuHua/UITool/USS.meta
index a856700..1fad454 100644
--- a/Assets/MuHua/UITool/UIFloatingWindow.meta
+++ b/Assets/MuHua/UITool/USS.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: e7cdf28a5161c094ea27a8b5ad54d741
+guid: 79a59b79f3428b449916c4b458f73e78
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/MuHua/UITool/USS/InputField.uss b/Assets/MuHua/UITool/USS/InputField.uss
new file mode 100644
index 0000000..249d134
--- /dev/null
+++ b/Assets/MuHua/UITool/USS/InputField.uss
@@ -0,0 +1,49 @@
+.input-field {
+ flex-direction: row;
+ background-color: rgba(255, 255, 255, 0.5);
+ width: 100%;
+ height: 30px;
+ flex-grow: 0;
+ flex-shrink: 1;
+}
+
+.input-field-label {
+ flex-grow: 0;
+ flex-basis: auto;
+ flex-shrink: 0;
+ min-width: 150px;
+ -unity-text-align: middle-left;
+ padding-top: 0;
+ padding-right: 0;
+ padding-bottom: 0;
+ padding-left: 5px;
+ width: auto;
+ background-color: rgba(0, 0, 0, 0);
+ margin-top: 0;
+ margin-right: 0;
+ margin-bottom: 0;
+ margin-left: 0;
+}
+
+.input-field-box {
+ background-color: rgb(255, 255, 255);
+ width: auto;
+ flex-grow: 1;
+ flex-shrink: 1;
+ flex-basis: 0;
+}
+
+.input-field-text {
+ -unity-text-align: middle-left;
+ height: 100%;
+ width: 100%;
+ padding-right: 0;
+ padding-left: 7px;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: visible;
+}
+.input-field-text-d {
+ -unity-font-style: italic;
+ color: rgba(27, 27, 27, 0.6);
+}
\ No newline at end of file
diff --git a/Assets/UI Toolkit/GlobalPage/GlobalPage.uss.meta b/Assets/MuHua/UITool/USS/InputField.uss.meta
similarity index 87%
rename from Assets/UI Toolkit/GlobalPage/GlobalPage.uss.meta
rename to Assets/MuHua/UITool/USS/InputField.uss.meta
index df7929f..de8508f 100644
--- a/Assets/UI Toolkit/GlobalPage/GlobalPage.uss.meta
+++ b/Assets/MuHua/UITool/USS/InputField.uss.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: e586d71f691bf1a4bab490af1c2cfe7f
+guid: fc0932c888e56eb429d27f412df5a822
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
diff --git a/Assets/MuHua/UITool/UIScrollView/ScrollView.uss b/Assets/MuHua/UITool/USS/ScrollView.uss
similarity index 93%
rename from Assets/MuHua/UITool/UIScrollView/ScrollView.uss
rename to Assets/MuHua/UITool/USS/ScrollView.uss
index 5722868..cf84740 100644
--- a/Assets/MuHua/UITool/UIScrollView/ScrollView.uss
+++ b/Assets/MuHua/UITool/USS/ScrollView.uss
@@ -38,6 +38,8 @@
top: 0;
right: 0;
bottom: 0;
+ width: 30px;
+ background-color: rgb(255, 255, 255);
}
.scrollview-vertical-scroller-dragger {
diff --git a/Assets/MuHua/UITool/UIScrollView/ScrollView.uss.meta b/Assets/MuHua/UITool/USS/ScrollView.uss.meta
similarity index 100%
rename from Assets/MuHua/UITool/UIScrollView/ScrollView.uss.meta
rename to Assets/MuHua/UITool/USS/ScrollView.uss.meta
diff --git a/Assets/MuHua/UITool/UIScroller/Scroller.uss b/Assets/MuHua/UITool/USS/Scroller.uss
similarity index 100%
rename from Assets/MuHua/UITool/UIScroller/Scroller.uss
rename to Assets/MuHua/UITool/USS/Scroller.uss
diff --git a/Assets/MuHua/UITool/UIScroller/Scroller.uss.meta b/Assets/MuHua/UITool/USS/Scroller.uss.meta
similarity index 100%
rename from Assets/MuHua/UITool/UIScroller/Scroller.uss.meta
rename to Assets/MuHua/UITool/USS/Scroller.uss.meta
diff --git a/Assets/MuHua/UITool/UISlider/Slider.uss b/Assets/MuHua/UITool/USS/Slider.uss
similarity index 100%
rename from Assets/MuHua/UITool/UISlider/Slider.uss
rename to Assets/MuHua/UITool/USS/Slider.uss
diff --git a/Assets/MuHua/UITool/UISlider/Slider.uss.meta b/Assets/MuHua/UITool/USS/Slider.uss.meta
similarity index 100%
rename from Assets/MuHua/UITool/UISlider/Slider.uss.meta
rename to Assets/MuHua/UITool/USS/Slider.uss.meta
diff --git a/Assets/MuHua/UITool/UIFloatingWindow/FloatingWindow.uss b/Assets/MuHua/UITool/USS/Window.uss
similarity index 100%
rename from Assets/MuHua/UITool/UIFloatingWindow/FloatingWindow.uss
rename to Assets/MuHua/UITool/USS/Window.uss
diff --git a/Assets/MuHua/UITool/UIFloatingWindow/FloatingWindow.uss.meta b/Assets/MuHua/UITool/USS/Window.uss.meta
similarity index 100%
rename from Assets/MuHua/UITool/UIFloatingWindow/FloatingWindow.uss.meta
rename to Assets/MuHua/UITool/USS/Window.uss.meta
diff --git a/Assets/MuHua/UITool/UIScroller.meta b/Assets/MuHua/UITool/UXML.meta
similarity index 77%
rename from Assets/MuHua/UITool/UIScroller.meta
rename to Assets/MuHua/UITool/UXML.meta
index 2656aa5..e3fffab 100644
--- a/Assets/MuHua/UITool/UIScroller.meta
+++ b/Assets/MuHua/UITool/UXML.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: bd2ae276ee0cc884cbe88f423b8f35fd
+guid: 238a02b461e75d141acabaee7cc80c87
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/MuHua/UITool/UISlider.meta b/Assets/MuHua/UITool/UXML/InputField.meta
similarity index 77%
rename from Assets/MuHua/UITool/UISlider.meta
rename to Assets/MuHua/UITool/UXML/InputField.meta
index 4017bf4..3e5a86e 100644
--- a/Assets/MuHua/UITool/UISlider.meta
+++ b/Assets/MuHua/UITool/UXML/InputField.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 3bf3dbd8db1a17e4c8e7c99b5fadee02
+guid: 819f5ae75816a96458f0a8d347fbb1a2
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/MuHua/UITool/UXML/InputField/FloatField.uxml b/Assets/MuHua/UITool/UXML/InputField/FloatField.uxml
new file mode 100644
index 0000000..87471ef
--- /dev/null
+++ b/Assets/MuHua/UITool/UXML/InputField/FloatField.uxml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/Assets/UI Toolkit/GlobalPage/GlobalPage.uxml.meta b/Assets/MuHua/UITool/UXML/InputField/FloatField.uxml.meta
similarity index 86%
rename from Assets/UI Toolkit/GlobalPage/GlobalPage.uxml.meta
rename to Assets/MuHua/UITool/UXML/InputField/FloatField.uxml.meta
index 2098be7..679400d 100644
--- a/Assets/UI Toolkit/GlobalPage/GlobalPage.uxml.meta
+++ b/Assets/MuHua/UITool/UXML/InputField/FloatField.uxml.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 43fe5b5fa3469a245854d8ca70e39edf
+guid: be4dcb8701971d14c8fc03653aba6348
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
diff --git a/Assets/MuHua/UITool/UXML/InputField/LongField.uxml b/Assets/MuHua/UITool/UXML/InputField/LongField.uxml
new file mode 100644
index 0000000..862c944
--- /dev/null
+++ b/Assets/MuHua/UITool/UXML/InputField/LongField.uxml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss.meta b/Assets/MuHua/UITool/UXML/InputField/LongField.uxml.meta
similarity index 58%
rename from Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss.meta
rename to Assets/MuHua/UITool/UXML/InputField/LongField.uxml.meta
index 36a63cd..dcc5b54 100644
--- a/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss.meta
+++ b/Assets/MuHua/UITool/UXML/InputField/LongField.uxml.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: a1f3f61784a9b574bb5b683d542e7d39
+guid: 6d1adb0fd3a339c4eac7384e14326bcc
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -7,5 +7,4 @@ ScriptedImporter:
userData:
assetBundleName:
assetBundleVariant:
- script: {fileID: 12388, guid: 0000000000000000e000000000000000, type: 0}
- disableValidation: 0
+ script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Assets/MuHua/UITool/UXML/InputField/TextField.uxml b/Assets/MuHua/UITool/UXML/InputField/TextField.uxml
new file mode 100644
index 0000000..c6bbc06
--- /dev/null
+++ b/Assets/MuHua/UITool/UXML/InputField/TextField.uxml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/Assets/MuHua/UITool/UXML/InputField/TextField.uxml.meta b/Assets/MuHua/UITool/UXML/InputField/TextField.uxml.meta
new file mode 100644
index 0000000..31265cc
--- /dev/null
+++ b/Assets/MuHua/UITool/UXML/InputField/TextField.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: f70e5bac0c1484f4798573018fc0bb83
+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/UXML/ScrollView.meta
similarity index 100%
rename from Assets/MuHua/UITool/UIScrollView.meta
rename to Assets/MuHua/UITool/UXML/ScrollView.meta
diff --git a/Assets/MuHua/UITool/UIScrollView/ScrollView.uxml b/Assets/MuHua/UITool/UXML/ScrollView/ScrollView.uxml
similarity index 87%
rename from Assets/MuHua/UITool/UIScrollView/ScrollView.uxml
rename to Assets/MuHua/UITool/UXML/ScrollView/ScrollView.uxml
index 04efc5d..4c89730 100644
--- a/Assets/MuHua/UITool/UIScrollView/ScrollView.uxml
+++ b/Assets/MuHua/UITool/UXML/ScrollView/ScrollView.uxml
@@ -21,11 +21,11 @@
-
-
+
+
-
-
+
+
diff --git a/Assets/MuHua/UITool/UIScrollView/ScrollView.uxml.meta b/Assets/MuHua/UITool/UXML/ScrollView/ScrollView.uxml.meta
similarity index 100%
rename from Assets/MuHua/UITool/UIScrollView/ScrollView.uxml.meta
rename to Assets/MuHua/UITool/UXML/ScrollView/ScrollView.uxml.meta
diff --git a/Assets/MuHua/UITool/UIScrollView/ScrollViewHorizontal.uxml b/Assets/MuHua/UITool/UXML/ScrollView/ScrollViewHorizontal.uxml
similarity index 100%
rename from Assets/MuHua/UITool/UIScrollView/ScrollViewHorizontal.uxml
rename to Assets/MuHua/UITool/UXML/ScrollView/ScrollViewHorizontal.uxml
diff --git a/Assets/MuHua/UITool/UIScrollView/ScrollViewHorizontal.uxml.meta b/Assets/MuHua/UITool/UXML/ScrollView/ScrollViewHorizontal.uxml.meta
similarity index 100%
rename from Assets/MuHua/UITool/UIScrollView/ScrollViewHorizontal.uxml.meta
rename to Assets/MuHua/UITool/UXML/ScrollView/ScrollViewHorizontal.uxml.meta
diff --git a/Assets/MuHua/UITool/UIScrollView/ScrollViewVertical.uxml b/Assets/MuHua/UITool/UXML/ScrollView/ScrollViewVertical.uxml
similarity index 100%
rename from Assets/MuHua/UITool/UIScrollView/ScrollViewVertical.uxml
rename to Assets/MuHua/UITool/UXML/ScrollView/ScrollViewVertical.uxml
diff --git a/Assets/MuHua/UITool/UIScrollView/ScrollViewVertical.uxml.meta b/Assets/MuHua/UITool/UXML/ScrollView/ScrollViewVertical.uxml.meta
similarity index 100%
rename from Assets/MuHua/UITool/UIScrollView/ScrollViewVertical.uxml.meta
rename to Assets/MuHua/UITool/UXML/ScrollView/ScrollViewVertical.uxml.meta
diff --git a/Assets/MuHua/UITool/UIScroller/Scroller.uxml b/Assets/MuHua/UITool/UXML/Scroller.uxml
similarity index 100%
rename from Assets/MuHua/UITool/UIScroller/Scroller.uxml
rename to Assets/MuHua/UITool/UXML/Scroller.uxml
diff --git a/Assets/MuHua/UITool/UIScroller/Scroller.uxml.meta b/Assets/MuHua/UITool/UXML/Scroller.uxml.meta
similarity index 100%
rename from Assets/MuHua/UITool/UIScroller/Scroller.uxml.meta
rename to Assets/MuHua/UITool/UXML/Scroller.uxml.meta
diff --git a/Assets/MuHua/UITool/UISlider/Slider.uxml b/Assets/MuHua/UITool/UXML/Slider.uxml
similarity index 100%
rename from Assets/MuHua/UITool/UISlider/Slider.uxml
rename to Assets/MuHua/UITool/UXML/Slider.uxml
diff --git a/Assets/MuHua/UITool/UISlider/Slider.uxml.meta b/Assets/MuHua/UITool/UXML/Slider.uxml.meta
similarity index 100%
rename from Assets/MuHua/UITool/UISlider/Slider.uxml.meta
rename to Assets/MuHua/UITool/UXML/Slider.uxml.meta
diff --git a/Assets/MuHua/UITool/UIFloatingWindow/FloatingWindow.uxml b/Assets/MuHua/UITool/UXML/Window.uxml
similarity index 100%
rename from Assets/MuHua/UITool/UIFloatingWindow/FloatingWindow.uxml
rename to Assets/MuHua/UITool/UXML/Window.uxml
diff --git a/Assets/MuHua/UITool/UIFloatingWindow/FloatingWindow.uxml.meta b/Assets/MuHua/UITool/UXML/Window.uxml.meta
similarity index 100%
rename from Assets/MuHua/UITool/UIFloatingWindow/FloatingWindow.uxml.meta
rename to Assets/MuHua/UITool/UXML/Window.uxml.meta
diff --git a/Assets/UI Toolkit/Assets.meta b/Assets/UI Toolkit/Assets.meta
deleted file mode 100644
index 569a78c..0000000
--- a/Assets/UI Toolkit/Assets.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 6d6bffb6d06d8af47a714ca6aca9a0a6
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/UI Toolkit/GlobalPage.meta b/Assets/UI Toolkit/GlobalPage.meta
deleted file mode 100644
index d94335a..0000000
--- a/Assets/UI Toolkit/GlobalPage.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4e1b362a28ce4c04babda53ffbecf64e
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/UI Toolkit/GlobalPage/GlobalPage.uss b/Assets/UI Toolkit/GlobalPage/GlobalPage.uss
deleted file mode 100644
index 1161b08..0000000
--- a/Assets/UI Toolkit/GlobalPage/GlobalPage.uss
+++ /dev/null
@@ -1 +0,0 @@
-VisualElement {}
\ No newline at end of file
diff --git a/Assets/UI Toolkit/GlobalPage/GlobalPage.uxml b/Assets/UI Toolkit/GlobalPage/GlobalPage.uxml
deleted file mode 100644
index ffacf74..0000000
--- a/Assets/UI Toolkit/GlobalPage/GlobalPage.uxml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/Assets/UI Toolkit/UnityThemes.meta b/Assets/UI Toolkit/UnityThemes.meta
deleted file mode 100644
index d6fbb3b..0000000
--- a/Assets/UI Toolkit/UnityThemes.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0659231a661d8314794c049dab0cdb39
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss b/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss
deleted file mode 100644
index cd84bda..0000000
--- a/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss
+++ /dev/null
@@ -1,4 +0,0 @@
-@import url("/Packages/com.muhua.uicontrol/Assets/Themes/DefaultRuntimeTheme.tss");
-
-
-
diff --git a/Packages/Tools/Runtime/Global.meta b/Packages/Tools/Runtime/Global.meta
deleted file mode 100644
index 306e9ef..0000000
--- a/Packages/Tools/Runtime/Global.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c2293d2090267954bb2e45486f1a6fc9
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Packages/Tools/Runtime/Data.meta b/Packages/Tools/Runtime/ModuleCore.meta
similarity index 100%
rename from Packages/Tools/Runtime/Data.meta
rename to Packages/Tools/Runtime/ModuleCore.meta
diff --git a/Packages/Tools/Runtime/Single/Single.cs b/Packages/Tools/Runtime/ModuleCore/Module.cs
similarity index 86%
rename from Packages/Tools/Runtime/Single/Single.cs
rename to Packages/Tools/Runtime/ModuleCore/Module.cs
index 74de0cc..d14d3c8 100644
--- a/Packages/Tools/Runtime/Single/Single.cs
+++ b/Packages/Tools/Runtime/ModuleCore/Module.cs
@@ -6,7 +6,7 @@ namespace MuHua {
///
/// 单例基类
///
- public class Single where T : Single, new() {
+ public class Module where T : Module, new() {
/// 模块单例
public static T I => Instantiate();
diff --git a/Packages/Tools/Runtime/Single/Single.cs.meta b/Packages/Tools/Runtime/ModuleCore/Module.cs.meta
similarity index 100%
rename from Packages/Tools/Runtime/Single/Single.cs.meta
rename to Packages/Tools/Runtime/ModuleCore/Module.cs.meta
diff --git a/Packages/Tools/Runtime/Global/Assets.cs b/Packages/Tools/Runtime/ModuleCore/ModuleAssets.cs
similarity index 90%
rename from Packages/Tools/Runtime/Global/Assets.cs
rename to Packages/Tools/Runtime/ModuleCore/ModuleAssets.cs
index de50e89..f0340e9 100644
--- a/Packages/Tools/Runtime/Global/Assets.cs
+++ b/Packages/Tools/Runtime/ModuleCore/ModuleAssets.cs
@@ -7,11 +7,11 @@ namespace MuHua {
///
/// 资源模块
///
- public class Assets : Single> {
+ public class ModuleAssets : Module> {
protected List datas = new List();
/// 更改事件
- public virtual event Action> OnChange;
+ public virtual event Action> OnChange;
/// 数据列表
public virtual List Datas => datas;
/// 数据计数
@@ -41,7 +41,7 @@ namespace MuHua {
///
public static class AssetsTool {
/// 头尾循环标准化索引
- public static Data LoopIndex(this Assets assets, int index) {
+ public static Data LoopIndex(this ModuleAssets assets, int index) {
return assets[LoopIndex(index, assets.Count)];
}
/// 头尾循环标准化索引
diff --git a/Packages/Tools/Runtime/Global/Assets.cs.meta b/Packages/Tools/Runtime/ModuleCore/ModuleAssets.cs.meta
similarity index 100%
rename from Packages/Tools/Runtime/Global/Assets.cs.meta
rename to Packages/Tools/Runtime/ModuleCore/ModuleAssets.cs.meta
diff --git a/Packages/Tools/Runtime/Data/Data.cs b/Packages/Tools/Runtime/ModuleCore/ModuleData.cs
similarity index 66%
rename from Packages/Tools/Runtime/Data/Data.cs
rename to Packages/Tools/Runtime/ModuleCore/ModuleData.cs
index acd04dd..21120d5 100644
--- a/Packages/Tools/Runtime/Data/Data.cs
+++ b/Packages/Tools/Runtime/ModuleCore/ModuleData.cs
@@ -6,8 +6,8 @@ namespace MuHua {
///
/// 数据
///
- public abstract class Data where T : Data {
+ public abstract class ModuleData where T : ModuleData {
/// 可视化对象
- public DataPrefab visual;
+ public ModulePrefab visual;
}
}
\ No newline at end of file
diff --git a/Packages/Tools/Runtime/Data/Data.cs.meta b/Packages/Tools/Runtime/ModuleCore/ModuleData.cs.meta
similarity index 100%
rename from Packages/Tools/Runtime/Data/Data.cs.meta
rename to Packages/Tools/Runtime/ModuleCore/ModuleData.cs.meta
diff --git a/Packages/Tools/Runtime/Global/Handle.cs b/Packages/Tools/Runtime/ModuleCore/ModuleHandle.cs
similarity index 91%
rename from Packages/Tools/Runtime/Global/Handle.cs
rename to Packages/Tools/Runtime/ModuleCore/ModuleHandle.cs
index 0f64a43..9113803 100644
--- a/Packages/Tools/Runtime/Global/Handle.cs
+++ b/Packages/Tools/Runtime/ModuleCore/ModuleHandle.cs
@@ -7,7 +7,7 @@ namespace MuHua {
///
/// 事件处理器
///
- public class Handle : Single> {
+ public class ModuleHandle : Module> {
/// 数据
protected Data value;
diff --git a/Packages/Tools/Runtime/Global/Handle.cs.meta b/Packages/Tools/Runtime/ModuleCore/ModuleHandle.cs.meta
similarity index 100%
rename from Packages/Tools/Runtime/Global/Handle.cs.meta
rename to Packages/Tools/Runtime/ModuleCore/ModuleHandle.cs.meta
diff --git a/Packages/Tools/Runtime/Data/DataPrefab.cs b/Packages/Tools/Runtime/ModuleCore/ModulePrefab.cs
similarity index 83%
rename from Packages/Tools/Runtime/Data/DataPrefab.cs
rename to Packages/Tools/Runtime/ModuleCore/ModulePrefab.cs
index c01da77..d975bc5 100644
--- a/Packages/Tools/Runtime/Data/DataPrefab.cs
+++ b/Packages/Tools/Runtime/ModuleCore/ModulePrefab.cs
@@ -6,7 +6,7 @@ namespace MuHua {
///
/// 数据预制件
///
- public abstract class DataPrefab : MonoBehaviour where T : Data {
+ public abstract class ModulePrefab : MonoBehaviour where T : ModuleData {
/// 关联的数据
protected T value;
diff --git a/Packages/Tools/Runtime/Data/DataPrefab.cs.meta b/Packages/Tools/Runtime/ModuleCore/ModulePrefab.cs.meta
similarity index 100%
rename from Packages/Tools/Runtime/Data/DataPrefab.cs.meta
rename to Packages/Tools/Runtime/ModuleCore/ModulePrefab.cs.meta
diff --git a/Packages/Tools/Runtime/Single/SingleBehaviour.cs b/Packages/Tools/Runtime/ModuleCore/ModuleSingle.cs
similarity index 91%
rename from Packages/Tools/Runtime/Single/SingleBehaviour.cs
rename to Packages/Tools/Runtime/ModuleCore/ModuleSingle.cs
index 6dde7b0..b2fac31 100644
--- a/Packages/Tools/Runtime/Single/SingleBehaviour.cs
+++ b/Packages/Tools/Runtime/ModuleCore/ModuleSingle.cs
@@ -6,7 +6,7 @@ namespace MuHua {
///
/// 单例行为
///
- public abstract class SingleBehaviour : MonoBehaviour where T : SingleBehaviour {
+ public abstract class ModuleSingle : MonoBehaviour where T : ModuleSingle {
/// 模块单例
public static T I => instance;
/// 模块单例
diff --git a/Packages/Tools/Runtime/Single/SingleBehaviour.cs.meta b/Packages/Tools/Runtime/ModuleCore/ModuleSingle.cs.meta
similarity index 100%
rename from Packages/Tools/Runtime/Single/SingleBehaviour.cs.meta
rename to Packages/Tools/Runtime/ModuleCore/ModuleSingle.cs.meta
diff --git a/Packages/Tools/Runtime/Data/DataVisual.cs b/Packages/Tools/Runtime/ModuleCore/ModuleVisual.cs
similarity index 93%
rename from Packages/Tools/Runtime/Data/DataVisual.cs
rename to Packages/Tools/Runtime/ModuleCore/ModuleVisual.cs
index 951c922..b6ba746 100644
--- a/Packages/Tools/Runtime/Data/DataVisual.cs
+++ b/Packages/Tools/Runtime/ModuleCore/ModuleVisual.cs
@@ -6,7 +6,7 @@ namespace MuHua {
///
/// 数据可视化
///
- public class DataVisual : SingleBehaviour> where T : Data {
+ public class ModuleVisual : ModuleSingle> where T : ModuleData {
/// 生成空间
public Transform space;
/// 数据预制件
diff --git a/Packages/Tools/Runtime/Data/DataVisual.cs.meta b/Packages/Tools/Runtime/ModuleCore/ModuleVisual.cs.meta
similarity index 100%
rename from Packages/Tools/Runtime/Data/DataVisual.cs.meta
rename to Packages/Tools/Runtime/ModuleCore/ModuleVisual.cs.meta
diff --git a/Packages/Tools/Runtime/Tools.meta b/Packages/Tools/Runtime/ModuleTools.meta
similarity index 100%
rename from Packages/Tools/Runtime/Tools.meta
rename to Packages/Tools/Runtime/ModuleTools.meta
diff --git a/Packages/Tools/Runtime/Tools/FileTool.cs b/Packages/Tools/Runtime/ModuleTools/FileTool.cs
similarity index 100%
rename from Packages/Tools/Runtime/Tools/FileTool.cs
rename to Packages/Tools/Runtime/ModuleTools/FileTool.cs
diff --git a/Packages/Tools/Runtime/Tools/FileTool.cs.meta b/Packages/Tools/Runtime/ModuleTools/FileTool.cs.meta
similarity index 100%
rename from Packages/Tools/Runtime/Tools/FileTool.cs.meta
rename to Packages/Tools/Runtime/ModuleTools/FileTool.cs.meta
diff --git a/Packages/Tools/Runtime/Tools/JsonTool.cs b/Packages/Tools/Runtime/ModuleTools/JsonTool.cs
similarity index 100%
rename from Packages/Tools/Runtime/Tools/JsonTool.cs
rename to Packages/Tools/Runtime/ModuleTools/JsonTool.cs
diff --git a/Packages/Tools/Runtime/Tools/JsonTool.cs.meta b/Packages/Tools/Runtime/ModuleTools/JsonTool.cs.meta
similarity index 100%
rename from Packages/Tools/Runtime/Tools/JsonTool.cs.meta
rename to Packages/Tools/Runtime/ModuleTools/JsonTool.cs.meta
diff --git a/Packages/Tools/Runtime/Tools/RayTool.cs b/Packages/Tools/Runtime/ModuleTools/RayTool.cs
similarity index 100%
rename from Packages/Tools/Runtime/Tools/RayTool.cs
rename to Packages/Tools/Runtime/ModuleTools/RayTool.cs
diff --git a/Packages/Tools/Runtime/Tools/RayTool.cs.meta b/Packages/Tools/Runtime/ModuleTools/RayTool.cs.meta
similarity index 100%
rename from Packages/Tools/Runtime/Tools/RayTool.cs.meta
rename to Packages/Tools/Runtime/ModuleTools/RayTool.cs.meta
diff --git a/Packages/Tools/Runtime/Tools/SaveTool.cs b/Packages/Tools/Runtime/ModuleTools/SaveTool.cs
similarity index 100%
rename from Packages/Tools/Runtime/Tools/SaveTool.cs
rename to Packages/Tools/Runtime/ModuleTools/SaveTool.cs
diff --git a/Packages/Tools/Runtime/Tools/SaveTool.cs.meta b/Packages/Tools/Runtime/ModuleTools/SaveTool.cs.meta
similarity index 100%
rename from Packages/Tools/Runtime/Tools/SaveTool.cs.meta
rename to Packages/Tools/Runtime/ModuleTools/SaveTool.cs.meta
diff --git a/Packages/Tools/Runtime/Single.meta b/Packages/Tools/Runtime/Single.meta
deleted file mode 100644
index d311388..0000000
--- a/Packages/Tools/Runtime/Single.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: cf2bc427dc33d6249adc8ab937d37331
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Packages/UITool/Runtime/Frame.meta b/Packages/UITool/Runtime/ModuleCoreUI.meta
similarity index 100%
rename from Packages/UITool/Runtime/Frame.meta
rename to Packages/UITool/Runtime/ModuleCoreUI.meta
diff --git a/Packages/UITool/Runtime/Frame/UIItem.cs b/Packages/UITool/Runtime/ModuleCoreUI/ModuleUIItem.cs
similarity index 84%
rename from Packages/UITool/Runtime/Frame/UIItem.cs
rename to Packages/UITool/Runtime/ModuleCoreUI/ModuleUIItem.cs
index e9774a4..9bbda0e 100644
--- a/Packages/UITool/Runtime/Frame/UIItem.cs
+++ b/Packages/UITool/Runtime/ModuleCoreUI/ModuleUIItem.cs
@@ -8,7 +8,7 @@ namespace MuHua {
///
/// UI项
///
- public abstract class UIItem {
+ public abstract class ModuleUIItem : ModuleUIPanel {
/// 选择事件
public static event Action OnSelect;
/// 触发事件
@@ -16,12 +16,9 @@ namespace MuHua {
/// 绑定的数据
public readonly Data value;
- /// 绑定的元素
- public readonly VisualElement element;
/// UI项
- public UIItem(Data value, VisualElement element) {
+ public ModuleUIItem(Data value, VisualElement element) : base(element) {
this.value = value;
- this.element = element;
OnSelect += UIItem_OnSelect;
}
diff --git a/Packages/UITool/Runtime/Frame/UIItem.cs.meta b/Packages/UITool/Runtime/ModuleCoreUI/ModuleUIItem.cs.meta
similarity index 100%
rename from Packages/UITool/Runtime/Frame/UIItem.cs.meta
rename to Packages/UITool/Runtime/ModuleCoreUI/ModuleUIItem.cs.meta
diff --git a/Packages/UITool/Runtime/Frame/UIContainer.cs b/Packages/UITool/Runtime/ModuleCoreUI/ModuleUIItems.cs
similarity index 73%
rename from Packages/UITool/Runtime/Frame/UIContainer.cs
rename to Packages/UITool/Runtime/ModuleCoreUI/ModuleUIItems.cs
index 2d06582..57d34d5 100644
--- a/Packages/UITool/Runtime/Frame/UIContainer.cs
+++ b/Packages/UITool/Runtime/ModuleCoreUI/ModuleUIItems.cs
@@ -6,22 +6,20 @@ using UnityEngine.UIElements;
namespace MuHua {
///
- /// UI容器
+ /// UI项容器
///
- public class UIContainer where Item : UIItem {
- public readonly VisualElement container;
+ public class ModuleUIItems : ModuleUIPanel where Item : ModuleUIItem {
public readonly VisualTreeAsset templateAsset;
public readonly Func generate;
public List- uiItems = new List
- ();
/// UI容器
- public UIContainer(VisualElement container, VisualTreeAsset templateAsset, Func generate) {
- this.container = container;
+ public ModuleUIItems(VisualElement element, VisualTreeAsset templateAsset, Func generate) : base(element) {
this.templateAsset = templateAsset;
this.generate = generate;
}
/// 释放资源
public void Release() {
- container.Clear();
+ element.Clear();
uiItems.ForEach(obj => obj.Release());
uiItems = new List
- ();
}
@@ -34,7 +32,7 @@ namespace MuHua {
public void Create(Data data) {
VisualElement element = templateAsset.Instantiate();
Item item = generate(data, element);
- container.Add(item.element);
+ this.element.Add(item.element);
uiItems.Add(item);
}
}
diff --git a/Packages/UITool/Runtime/Frame/UIContainer.cs.meta b/Packages/UITool/Runtime/ModuleCoreUI/ModuleUIItems.cs.meta
similarity index 100%
rename from Packages/UITool/Runtime/Frame/UIContainer.cs.meta
rename to Packages/UITool/Runtime/ModuleCoreUI/ModuleUIItems.cs.meta
diff --git a/Packages/UITool/Runtime/ModuleCoreUI/ModuleUIPage.cs b/Packages/UITool/Runtime/ModuleCoreUI/ModuleUIPage.cs
new file mode 100644
index 0000000..d7b73de
--- /dev/null
+++ b/Packages/UITool/Runtime/ModuleCoreUI/ModuleUIPage.cs
@@ -0,0 +1,20 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace MuHua {
+ ///
+ /// 页面模块
+ ///
+ public class ModuleUIPage : MonoBehaviour {
+ /// 绑定文档
+ public UIDocument document;
+ /// 根目录文档
+ public VisualElement root => document.rootVisualElement;
+ /// 添加UI元素
+ public void Add(VisualElement child) => root.Add(child);
+ /// 查询UI元素
+ public T Q(string name = null, string className = null) where T : VisualElement => root.Q(name, className);
+ }
+}
\ No newline at end of file
diff --git a/Packages/UITool/Runtime/ModuleCoreUI/ModuleUIPage.cs.meta b/Packages/UITool/Runtime/ModuleCoreUI/ModuleUIPage.cs.meta
new file mode 100644
index 0000000..9ec1474
--- /dev/null
+++ b/Packages/UITool/Runtime/ModuleCoreUI/ModuleUIPage.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a20e816476c4c5d4b83e112be2e08697
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Packages/UITool/Runtime/ModuleCoreUI/ModuleUIPanel.cs b/Packages/UITool/Runtime/ModuleCoreUI/ModuleUIPanel.cs
new file mode 100644
index 0000000..0e5ce6b
--- /dev/null
+++ b/Packages/UITool/Runtime/ModuleCoreUI/ModuleUIPanel.cs
@@ -0,0 +1,16 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace MuHua {
+ ///
+ /// UI控件
+ ///
+ public class ModuleUIPanel {
+ /// 绑定的元素
+ public readonly VisualElement element;
+ /// UI控件
+ public ModuleUIPanel(VisualElement element) => this.element = element;
+ }
+}
\ No newline at end of file
diff --git a/Packages/UITool/Runtime/ModuleCoreUI/ModuleUIPanel.cs.meta b/Packages/UITool/Runtime/ModuleCoreUI/ModuleUIPanel.cs.meta
new file mode 100644
index 0000000..4c0c2cf
--- /dev/null
+++ b/Packages/UITool/Runtime/ModuleCoreUI/ModuleUIPanel.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 97e1bf60274de61419b2d9588340cafa
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Packages/UITool/Runtime/Tools.meta b/Packages/UITool/Runtime/ModuleTools.meta
similarity index 100%
rename from Packages/UITool/Runtime/Tools.meta
rename to Packages/UITool/Runtime/ModuleTools.meta
diff --git a/Packages/UITool/Runtime/Tools/UIDirection.cs b/Packages/UITool/Runtime/ModuleTools/UIDirection.cs
similarity index 100%
rename from Packages/UITool/Runtime/Tools/UIDirection.cs
rename to Packages/UITool/Runtime/ModuleTools/UIDirection.cs
diff --git a/Packages/UITool/Runtime/Tools/UIDirection.cs.meta b/Packages/UITool/Runtime/ModuleTools/UIDirection.cs.meta
similarity index 100%
rename from Packages/UITool/Runtime/Tools/UIDirection.cs.meta
rename to Packages/UITool/Runtime/ModuleTools/UIDirection.cs.meta
diff --git a/Packages/UITool/Runtime/Tools/UITool.cs b/Packages/UITool/Runtime/ModuleTools/UITool.cs
similarity index 100%
rename from Packages/UITool/Runtime/Tools/UITool.cs
rename to Packages/UITool/Runtime/ModuleTools/UITool.cs
diff --git a/Packages/UITool/Runtime/Tools/UITool.cs.meta b/Packages/UITool/Runtime/ModuleTools/UITool.cs.meta
similarity index 100%
rename from Packages/UITool/Runtime/Tools/UITool.cs.meta
rename to Packages/UITool/Runtime/ModuleTools/UITool.cs.meta
diff --git a/Assets/UI Toolkit.meta b/Packages/UITool/Runtime/ModuleUIControl.meta
similarity index 77%
rename from Assets/UI Toolkit.meta
rename to Packages/UITool/Runtime/ModuleUIControl.meta
index f5cc1a2..bebc867 100644
--- a/Assets/UI Toolkit.meta
+++ b/Packages/UITool/Runtime/ModuleUIControl.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 93ea492ab6f026841bfee78f2f1c99fa
+guid: 90a36026f648a6f45add234bc15d5548
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Packages/UITool/Runtime/ModuleUIControl/UIFloatField.cs b/Packages/UITool/Runtime/ModuleUIControl/UIFloatField.cs
new file mode 100644
index 0000000..50ebf83
--- /dev/null
+++ b/Packages/UITool/Runtime/ModuleUIControl/UIFloatField.cs
@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace MuHua {
+ public class UIFloatField : FloatField {
+ public new class UxmlFactory : UxmlFactory { }
+ public new class UxmlTraits : FloatField.UxmlTraits { }
+ public VisualElement inputElement;
+ public VisualElement textElement;
+ public UIFloatField() {
+ ClearClassList();
+ AddToClassList("input-field");
+
+ labelElement.ClearClassList();
+ labelElement.AddToClassList("unity-text-element");
+ labelElement.AddToClassList("input-field-label");
+
+ inputElement = this.Q("unity-text-input");
+ inputElement.ClearClassList();
+ inputElement.AddToClassList("input-field-box");
+
+ textElement = inputElement.Q("");
+ textElement.ClearClassList();
+ textElement.AddToClassList("unity-text-element");
+ textElement.AddToClassList("input-field-text");
+ }
+ }
+}
diff --git a/Packages/UITool/Runtime/ModuleUIControl/UIFloatField.cs.meta b/Packages/UITool/Runtime/ModuleUIControl/UIFloatField.cs.meta
new file mode 100644
index 0000000..cc68417
--- /dev/null
+++ b/Packages/UITool/Runtime/ModuleUIControl/UIFloatField.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7046acdb2e5ef0c458969a4022ee9ab4
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Packages/UITool/Runtime/ModuleUIControl/UILongField.cs b/Packages/UITool/Runtime/ModuleUIControl/UILongField.cs
new file mode 100644
index 0000000..c597562
--- /dev/null
+++ b/Packages/UITool/Runtime/ModuleUIControl/UILongField.cs
@@ -0,0 +1,28 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace MuHua {
+ public class UILongField : LongField {
+ public new class UxmlFactory : UxmlFactory { }
+ public new class UxmlTraits : LongField.UxmlTraits { }
+ public UILongField() {
+ ClearClassList();
+ AddToClassList("input-field");
+
+ labelElement.ClearClassList();
+ labelElement.AddToClassList("unity-text-element");
+ labelElement.AddToClassList("input-field-label");
+
+ VisualElement inputElement = this.Q("unity-text-input");
+ inputElement.ClearClassList();
+ inputElement.AddToClassList("input-field-box");
+
+ VisualElement textElement = inputElement.Q("");
+ textElement.ClearClassList();
+ textElement.AddToClassList("unity-text-element");
+ textElement.AddToClassList("input-field-text");
+ }
+ }
+}
diff --git a/Packages/UITool/Runtime/ModuleUIControl/UILongField.cs.meta b/Packages/UITool/Runtime/ModuleUIControl/UILongField.cs.meta
new file mode 100644
index 0000000..94f0f33
--- /dev/null
+++ b/Packages/UITool/Runtime/ModuleUIControl/UILongField.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1d30b5caf969d9b4ab1464d329cf16ca
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Packages/UITool/Runtime/ModuleUIControl/UITextField.cs b/Packages/UITool/Runtime/ModuleUIControl/UITextField.cs
new file mode 100644
index 0000000..25885fc
--- /dev/null
+++ b/Packages/UITool/Runtime/ModuleUIControl/UITextField.cs
@@ -0,0 +1,55 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace MuHua {
+ public class UITextField : TextField {
+ public new class UxmlFactory : UxmlFactory { }
+ public new class UxmlTraits : TextField.UxmlTraits {
+ public UxmlStringAttributeDescription DefaultPrompt = new UxmlStringAttributeDescription {
+ name = "default-prompt"
+ };
+ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc) {
+ base.Init(ve, bag, cc);
+ UITextField textField = (UITextField)ve;
+ textField.DefaultPrompt = DefaultPrompt.GetValueFromBag(bag, cc);
+ textField.SetDefaultPrompt();
+ }
+ }
+ public string DefaultPrompt { get; set; }
+
+ public VisualElement inputElement => this.Q("unity-text-input");
+ public VisualElement textElement => inputElement.Q("");
+
+ public UITextField() {
+ ClearClassList();
+ AddToClassList("input-field");
+
+ labelElement.ClearClassList();
+ labelElement.AddToClassList("unity-text-element");
+ labelElement.AddToClassList("input-field-label");
+
+ inputElement.ClearClassList();
+ inputElement.AddToClassList("input-field-box");
+
+ textElement.ClearClassList();
+ textElement.AddToClassList("unity-text-element");
+ textElement.AddToClassList("input-field-text");
+
+ RegisterCallback((evt) => { PrepareInput(); });
+ RegisterCallback((evt) => { SetDefaultPrompt(); });
+ }
+ public void PrepareInput() {
+ textElement.RemoveFromClassList("input-field-text-d");
+ if (text != DefaultPrompt) { return; }
+ text = "";
+ }
+ public void SetDefaultPrompt() {
+ textElement.RemoveFromClassList("input-field-text-d");
+ if (value != "") { return; }
+ text = DefaultPrompt;
+ textElement.AddToClassList("input-field-text-d");
+ }
+ }
+}
\ No newline at end of file
diff --git a/Packages/UITool/Runtime/ModuleUIControl/UITextField.cs.meta b/Packages/UITool/Runtime/ModuleUIControl/UITextField.cs.meta
new file mode 100644
index 0000000..3ef4851
--- /dev/null
+++ b/Packages/UITool/Runtime/ModuleUIControl/UITextField.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3bbf7cc5bf423304dbb4eac4f82b2bee
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Packages/UITool/Runtime/Component.meta b/Packages/UITool/Runtime/ModuleUIPanel.meta
similarity index 100%
rename from Packages/UITool/Runtime/Component.meta
rename to Packages/UITool/Runtime/ModuleUIPanel.meta
diff --git a/Packages/UITool/Runtime/Component/UIScrollView.cs b/Packages/UITool/Runtime/ModuleUIPanel/UIScrollView.cs
similarity index 94%
rename from Packages/UITool/Runtime/Component/UIScrollView.cs
rename to Packages/UITool/Runtime/ModuleUIPanel/UIScrollView.cs
index 67481e9..cb3edd6 100644
--- a/Packages/UITool/Runtime/Component/UIScrollView.cs
+++ b/Packages/UITool/Runtime/ModuleUIPanel/UIScrollView.cs
@@ -8,9 +8,7 @@ namespace MuHua {
///
/// 滚动视图
///
- public class UIScrollView {
- /// 绑定的元素
- public readonly VisualElement element;
+ public class UIScrollView : ModuleUIPanel {
/// 绑定的画布
public readonly VisualElement canvas;
/// 元素方向
@@ -31,8 +29,8 @@ namespace MuHua {
public readonly VisualElement ScrollerHorizontal;
public readonly VisualElement ScrollerVertical;
- public UIScrollView(VisualElement element, VisualElement canvas, UIDirection direction = UIDirection.HorizontalAndVertical, UIDirection sh = UIDirection.FromLeftToRight, UIDirection sv = UIDirection.FromTopToBottom) {
- this.element = element;
+ public UIScrollView(VisualElement element, VisualElement canvas, UIDirection direction = UIDirection.HorizontalAndVertical,
+ UIDirection sh = UIDirection.FromLeftToRight, UIDirection sv = UIDirection.FromTopToBottom) : base(element) {
this.canvas = canvas;
this.direction = direction;
@@ -73,7 +71,8 @@ namespace MuHua {
float wheel = Mathf.Clamp(evt.delta.y, -1, 1);
if (direction == UIDirection.Horizontal) {
UpdateValue(new Vector2(value.x - wheel, value.y));
- } else {
+ }
+ else {
UpdateValue(new Vector2(value.x, value.y - wheel));
}
}
diff --git a/Packages/UITool/Runtime/Component/UIScrollView.cs.meta b/Packages/UITool/Runtime/ModuleUIPanel/UIScrollView.cs.meta
similarity index 100%
rename from Packages/UITool/Runtime/Component/UIScrollView.cs.meta
rename to Packages/UITool/Runtime/ModuleUIPanel/UIScrollView.cs.meta
diff --git a/Packages/UITool/Runtime/Component/UIScroller.cs b/Packages/UITool/Runtime/ModuleUIPanel/UIScroller.cs
similarity index 97%
rename from Packages/UITool/Runtime/Component/UIScroller.cs
rename to Packages/UITool/Runtime/ModuleUIPanel/UIScroller.cs
index 1cf20bf..9a48eff 100644
--- a/Packages/UITool/Runtime/Component/UIScroller.cs
+++ b/Packages/UITool/Runtime/ModuleUIPanel/UIScroller.cs
@@ -8,9 +8,7 @@ namespace MuHua {
///
/// 滚动条
///
- public class UIScroller {
- /// 绑定的元素
- public readonly VisualElement element;
+ public class UIScroller : ModuleUIPanel {
/// 绑定的画布
public readonly VisualElement canvas;
/// 元素方向
@@ -27,8 +25,7 @@ namespace MuHua {
public readonly VisualElement Dragger;
- public UIScroller(VisualElement element, VisualElement canvas, UIDirection direction = UIDirection.FromLeftToRight) {
- this.element = element;
+ public UIScroller(VisualElement element, VisualElement canvas, UIDirection direction = UIDirection.FromLeftToRight) : base(element) {
this.canvas = canvas;
this.direction = direction;
diff --git a/Packages/UITool/Runtime/Component/UIScroller.cs.meta b/Packages/UITool/Runtime/ModuleUIPanel/UIScroller.cs.meta
similarity index 100%
rename from Packages/UITool/Runtime/Component/UIScroller.cs.meta
rename to Packages/UITool/Runtime/ModuleUIPanel/UIScroller.cs.meta
diff --git a/Packages/UITool/Runtime/Component/UISlider.cs b/Packages/UITool/Runtime/ModuleUIPanel/UISlider.cs
similarity index 97%
rename from Packages/UITool/Runtime/Component/UISlider.cs
rename to Packages/UITool/Runtime/ModuleUIPanel/UISlider.cs
index 50734c0..cdf6c99 100644
--- a/Packages/UITool/Runtime/Component/UISlider.cs
+++ b/Packages/UITool/Runtime/ModuleUIPanel/UISlider.cs
@@ -8,9 +8,7 @@ namespace MuHua {
///
/// 滑块
///
- public class UISlider {
- /// 绑定的元素
- public readonly VisualElement element;
+ public class UISlider : ModuleUIPanel {
/// 绑定的画布
public readonly VisualElement canvas;
/// 元素方向
@@ -29,8 +27,7 @@ namespace MuHua {
public readonly VisualElement Tracker;
public readonly VisualElement Dragger;
- public UISlider(VisualElement element, VisualElement canvas, UIDirection direction = UIDirection.FromLeftToRight) {
- this.element = element;
+ public UISlider(VisualElement element, VisualElement canvas, UIDirection direction = UIDirection.FromLeftToRight) : base(element) {
this.canvas = canvas;
this.direction = direction;
diff --git a/Packages/UITool/Runtime/Component/UISlider.cs.meta b/Packages/UITool/Runtime/ModuleUIPanel/UISlider.cs.meta
similarity index 100%
rename from Packages/UITool/Runtime/Component/UISlider.cs.meta
rename to Packages/UITool/Runtime/ModuleUIPanel/UISlider.cs.meta
diff --git a/Packages/UITool/Runtime/ModuleUIPanel/UIWindow.cs b/Packages/UITool/Runtime/ModuleUIPanel/UIWindow.cs
new file mode 100644
index 0000000..1fbd609
--- /dev/null
+++ b/Packages/UITool/Runtime/ModuleUIPanel/UIWindow.cs
@@ -0,0 +1,68 @@
+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 UIWindow : ModuleUIPanel {
+ /// 绑定的画布
+ 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