From 1d4c7605f12d7fff4eeaae5c851395b5113de02e Mon Sep 17 00:00:00 2001
From: MuHua-123 <136542559+MuHua-123@users.noreply.github.com>
Date: Thu, 24 Apr 2025 11:53:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9UISlider?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Component/Dropdown/Dropdown.uxml | 2 +-
.../Component/Dropdown/DropdownTemplate.uxml | 2 +-
.../Component/Scroller/Scroller.uxml | 12 +++---
.../Scroller/ScrollerHorizontal.uxml | 5 +++
.../Scroller/ScrollerHorizontal.uxml.meta | 10 +++++
.../Component/Scroller/ScrollerVertical.uxml | 5 +++
.../Scroller/ScrollerVertical.uxml.meta | 10 +++++
Assets/UI Toolkit/Component/Slider/Slider.uss | 32 ++++++++++++++-
.../UI Toolkit/Component/Slider/Slider.uxml | 40 +++++--------------
.../Component/Slider/SliderHorizontal1.uxml | 11 +++++
.../Slider/SliderHorizontal1.uxml.meta | 10 +++++
.../Component/Slider/SliderHorizontal2.uxml | 10 +++++
.../Slider/SliderHorizontal2.uxml.meta | 10 +++++
.../Component/Slider/SliderVertical1.uxml | 11 +++++
.../Slider/SliderVertical1.uxml.meta | 10 +++++
.../Component/Slider/SliderVertical2.uxml | 10 +++++
.../Slider/SliderVertical2.uxml.meta | 10 +++++
.../UI Toolkit/Component/Toggle/Toggle.uxml | 2 +-
.../{Theme.meta => DefaultTheme.meta} | 0
.../PanelSettings.asset | 0
.../PanelSettings.asset.meta | 0
.../UnityDefaultRuntimeTheme.tss | 4 +-
.../UnityDefaultRuntimeTheme.tss.meta | 0
.../Window.meta => GameWindow.meta} | 0
.../Window.uss => GameWindow/GameWindow.uss} | 0
.../GameWindow.uss.meta} | 0
.../GameWindow.uxml} | 0
.../GameWindow.uxml.meta} | 0
.../UITool/Runtime/ModuleUIPanel/UISlider.cs | 1 +
29 files changed, 166 insertions(+), 41 deletions(-)
create mode 100644 Assets/UI Toolkit/Component/Scroller/ScrollerHorizontal.uxml
create mode 100644 Assets/UI Toolkit/Component/Scroller/ScrollerHorizontal.uxml.meta
create mode 100644 Assets/UI Toolkit/Component/Scroller/ScrollerVertical.uxml
create mode 100644 Assets/UI Toolkit/Component/Scroller/ScrollerVertical.uxml.meta
create mode 100644 Assets/UI Toolkit/Component/Slider/SliderHorizontal1.uxml
create mode 100644 Assets/UI Toolkit/Component/Slider/SliderHorizontal1.uxml.meta
create mode 100644 Assets/UI Toolkit/Component/Slider/SliderHorizontal2.uxml
create mode 100644 Assets/UI Toolkit/Component/Slider/SliderHorizontal2.uxml.meta
create mode 100644 Assets/UI Toolkit/Component/Slider/SliderVertical1.uxml
create mode 100644 Assets/UI Toolkit/Component/Slider/SliderVertical1.uxml.meta
create mode 100644 Assets/UI Toolkit/Component/Slider/SliderVertical2.uxml
create mode 100644 Assets/UI Toolkit/Component/Slider/SliderVertical2.uxml.meta
rename Assets/UI Toolkit/{Theme.meta => DefaultTheme.meta} (100%)
rename Assets/UI Toolkit/{Theme => DefaultTheme}/PanelSettings.asset (100%)
rename Assets/UI Toolkit/{Theme => DefaultTheme}/PanelSettings.asset.meta (100%)
rename Assets/UI Toolkit/{Theme => DefaultTheme}/UnityDefaultRuntimeTheme.tss (89%)
rename Assets/UI Toolkit/{Theme => DefaultTheme}/UnityDefaultRuntimeTheme.tss.meta (100%)
rename Assets/UI Toolkit/{Component/Window.meta => GameWindow.meta} (100%)
rename Assets/UI Toolkit/{Component/Window/Window.uss => GameWindow/GameWindow.uss} (100%)
rename Assets/UI Toolkit/{Component/Window/Window.uss.meta => GameWindow/GameWindow.uss.meta} (100%)
rename Assets/UI Toolkit/{Component/Window/Window.uxml => GameWindow/GameWindow.uxml} (100%)
rename Assets/UI Toolkit/{Component/Window/Window.uxml.meta => GameWindow/GameWindow.uxml.meta} (100%)
diff --git a/Assets/UI Toolkit/Component/Dropdown/Dropdown.uxml b/Assets/UI Toolkit/Component/Dropdown/Dropdown.uxml
index bdf060a..53546b5 100644
--- a/Assets/UI Toolkit/Component/Dropdown/Dropdown.uxml
+++ b/Assets/UI Toolkit/Component/Dropdown/Dropdown.uxml
@@ -5,7 +5,7 @@
-
+
diff --git a/Assets/UI Toolkit/Component/Dropdown/DropdownTemplate.uxml b/Assets/UI Toolkit/Component/Dropdown/DropdownTemplate.uxml
index 38ee251..5fa8025 100644
--- a/Assets/UI Toolkit/Component/Dropdown/DropdownTemplate.uxml
+++ b/Assets/UI Toolkit/Component/Dropdown/DropdownTemplate.uxml
@@ -1,6 +1,6 @@
-
+
diff --git a/Assets/UI Toolkit/Component/Scroller/Scroller.uxml b/Assets/UI Toolkit/Component/Scroller/Scroller.uxml
index 9d0ea35..4ca9925 100644
--- a/Assets/UI Toolkit/Component/Scroller/Scroller.uxml
+++ b/Assets/UI Toolkit/Component/Scroller/Scroller.uxml
@@ -1,9 +1,9 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/Assets/UI Toolkit/Component/Scroller/ScrollerHorizontal.uxml b/Assets/UI Toolkit/Component/Scroller/ScrollerHorizontal.uxml
new file mode 100644
index 0000000..7eb840f
--- /dev/null
+++ b/Assets/UI Toolkit/Component/Scroller/ScrollerHorizontal.uxml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/Assets/UI Toolkit/Component/Scroller/ScrollerHorizontal.uxml.meta b/Assets/UI Toolkit/Component/Scroller/ScrollerHorizontal.uxml.meta
new file mode 100644
index 0000000..fa2625c
--- /dev/null
+++ b/Assets/UI Toolkit/Component/Scroller/ScrollerHorizontal.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 5580a1adea643f747860b3cb601e12c5
+ScriptedImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 2
+ userData:
+ assetBundleName:
+ assetBundleVariant:
+ script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Assets/UI Toolkit/Component/Scroller/ScrollerVertical.uxml b/Assets/UI Toolkit/Component/Scroller/ScrollerVertical.uxml
new file mode 100644
index 0000000..a53dca3
--- /dev/null
+++ b/Assets/UI Toolkit/Component/Scroller/ScrollerVertical.uxml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/Assets/UI Toolkit/Component/Scroller/ScrollerVertical.uxml.meta b/Assets/UI Toolkit/Component/Scroller/ScrollerVertical.uxml.meta
new file mode 100644
index 0000000..1a47d60
--- /dev/null
+++ b/Assets/UI Toolkit/Component/Scroller/ScrollerVertical.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: d866b7570e7b3e642bced1d83309f5bf
+ScriptedImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 2
+ userData:
+ assetBundleName:
+ assetBundleVariant:
+ script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Assets/UI Toolkit/Component/Slider/Slider.uss b/Assets/UI Toolkit/Component/Slider/Slider.uss
index 076c315..57e85f7 100644
--- a/Assets/UI Toolkit/Component/Slider/Slider.uss
+++ b/Assets/UI Toolkit/Component/Slider/Slider.uss
@@ -4,6 +4,20 @@
padding-right: 10px;
padding-bottom: 10px;
padding-left: 10px;
+ flex-direction: row;
+}
+
+.slider-horizontal-title {
+ margin-top: 0;
+ margin-right: 0;
+ margin-bottom: 0;
+ margin-left: 0;
+ padding-top: 0;
+ padding-right: 0;
+ padding-bottom: 0;
+ padding-left: 0;
+ min-width: 100px;
+ -unity-text-align: middle-left;
}
.slider-horizontal-container {
@@ -22,6 +36,7 @@
border-top-color: rgb(51, 51, 51);
border-bottom-color: rgb(51, 51, 51);
flex-direction: row;
+ flex-grow: 1;
}
.slider-horizontal-tracker {
@@ -64,7 +79,21 @@
padding-left: 10px;
width: 30px;
flex-grow: 1;
- flex-direction: row;
+ flex-direction: column;
+}
+
+.slider-vertical-title {
+ margin-top: 0;
+ margin-right: 0;
+ margin-bottom: 0;
+ margin-left: 0;
+ padding-top: 0;
+ padding-right: 0;
+ padding-bottom: 0;
+ padding-left: 0;
+ -unity-text-align: upper-center;
+ white-space: normal;
+ min-height: 100px;
}
.slider-vertical-container {
@@ -84,6 +113,7 @@
border-bottom-color: rgb(51, 51, 51);
flex-direction: column;
width: 10px;
+ flex-grow: 1;
}
.slider-vertical-tracker {
diff --git a/Assets/UI Toolkit/Component/Slider/Slider.uxml b/Assets/UI Toolkit/Component/Slider/Slider.uxml
index e301a1a..615fd56 100644
--- a/Assets/UI Toolkit/Component/Slider/Slider.uxml
+++ b/Assets/UI Toolkit/Component/Slider/Slider.uxml
@@ -1,33 +1,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/Assets/UI Toolkit/Component/Slider/SliderHorizontal1.uxml b/Assets/UI Toolkit/Component/Slider/SliderHorizontal1.uxml
new file mode 100644
index 0000000..d8be73b
--- /dev/null
+++ b/Assets/UI Toolkit/Component/Slider/SliderHorizontal1.uxml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Assets/UI Toolkit/Component/Slider/SliderHorizontal1.uxml.meta b/Assets/UI Toolkit/Component/Slider/SliderHorizontal1.uxml.meta
new file mode 100644
index 0000000..094324e
--- /dev/null
+++ b/Assets/UI Toolkit/Component/Slider/SliderHorizontal1.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: c17edf36d99c3aa48bf28aaa08480ebf
+ScriptedImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 2
+ userData:
+ assetBundleName:
+ assetBundleVariant:
+ script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Assets/UI Toolkit/Component/Slider/SliderHorizontal2.uxml b/Assets/UI Toolkit/Component/Slider/SliderHorizontal2.uxml
new file mode 100644
index 0000000..644dc87
--- /dev/null
+++ b/Assets/UI Toolkit/Component/Slider/SliderHorizontal2.uxml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/Assets/UI Toolkit/Component/Slider/SliderHorizontal2.uxml.meta b/Assets/UI Toolkit/Component/Slider/SliderHorizontal2.uxml.meta
new file mode 100644
index 0000000..a3be3ab
--- /dev/null
+++ b/Assets/UI Toolkit/Component/Slider/SliderHorizontal2.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 4fcde11722aeffd4995a1091bffbb265
+ScriptedImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 2
+ userData:
+ assetBundleName:
+ assetBundleVariant:
+ script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Assets/UI Toolkit/Component/Slider/SliderVertical1.uxml b/Assets/UI Toolkit/Component/Slider/SliderVertical1.uxml
new file mode 100644
index 0000000..8d695b0
--- /dev/null
+++ b/Assets/UI Toolkit/Component/Slider/SliderVertical1.uxml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Assets/UI Toolkit/Component/Slider/SliderVertical1.uxml.meta b/Assets/UI Toolkit/Component/Slider/SliderVertical1.uxml.meta
new file mode 100644
index 0000000..540dcfb
--- /dev/null
+++ b/Assets/UI Toolkit/Component/Slider/SliderVertical1.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: fa8469bd565bf8f4188b6e2adc727445
+ScriptedImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 2
+ userData:
+ assetBundleName:
+ assetBundleVariant:
+ script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Assets/UI Toolkit/Component/Slider/SliderVertical2.uxml b/Assets/UI Toolkit/Component/Slider/SliderVertical2.uxml
new file mode 100644
index 0000000..59975e3
--- /dev/null
+++ b/Assets/UI Toolkit/Component/Slider/SliderVertical2.uxml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/Assets/UI Toolkit/Component/Slider/SliderVertical2.uxml.meta b/Assets/UI Toolkit/Component/Slider/SliderVertical2.uxml.meta
new file mode 100644
index 0000000..c93fea4
--- /dev/null
+++ b/Assets/UI Toolkit/Component/Slider/SliderVertical2.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 3227ed3b8be628046be5b9e1b2b14cd7
+ScriptedImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 2
+ userData:
+ assetBundleName:
+ assetBundleVariant:
+ script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Assets/UI Toolkit/Component/Toggle/Toggle.uxml b/Assets/UI Toolkit/Component/Toggle/Toggle.uxml
index f80a1e2..a2378dc 100644
--- a/Assets/UI Toolkit/Component/Toggle/Toggle.uxml
+++ b/Assets/UI Toolkit/Component/Toggle/Toggle.uxml
@@ -3,7 +3,7 @@
-
+
diff --git a/Assets/UI Toolkit/Theme.meta b/Assets/UI Toolkit/DefaultTheme.meta
similarity index 100%
rename from Assets/UI Toolkit/Theme.meta
rename to Assets/UI Toolkit/DefaultTheme.meta
diff --git a/Assets/UI Toolkit/Theme/PanelSettings.asset b/Assets/UI Toolkit/DefaultTheme/PanelSettings.asset
similarity index 100%
rename from Assets/UI Toolkit/Theme/PanelSettings.asset
rename to Assets/UI Toolkit/DefaultTheme/PanelSettings.asset
diff --git a/Assets/UI Toolkit/Theme/PanelSettings.asset.meta b/Assets/UI Toolkit/DefaultTheme/PanelSettings.asset.meta
similarity index 100%
rename from Assets/UI Toolkit/Theme/PanelSettings.asset.meta
rename to Assets/UI Toolkit/DefaultTheme/PanelSettings.asset.meta
diff --git a/Assets/UI Toolkit/Theme/UnityDefaultRuntimeTheme.tss b/Assets/UI Toolkit/DefaultTheme/UnityDefaultRuntimeTheme.tss
similarity index 89%
rename from Assets/UI Toolkit/Theme/UnityDefaultRuntimeTheme.tss
rename to Assets/UI Toolkit/DefaultTheme/UnityDefaultRuntimeTheme.tss
index b2d1a51..b1376e0 100644
--- a/Assets/UI Toolkit/Theme/UnityDefaultRuntimeTheme.tss
+++ b/Assets/UI Toolkit/DefaultTheme/UnityDefaultRuntimeTheme.tss
@@ -7,7 +7,9 @@
@import url("/Assets/UI Toolkit/Component/ScrollView/ScrollView.uss");
@import url("/Assets/UI Toolkit/Component/Slider/Slider.uss");
@import url("/Assets/UI Toolkit/Component/Toggle/Toggle.uss");
-@import url("/Assets/UI Toolkit/Component/Window/Window.uss");
+@import url("/Assets/UI Toolkit/GameWindow/GameWindow.uss");
+
+
diff --git a/Assets/UI Toolkit/Theme/UnityDefaultRuntimeTheme.tss.meta b/Assets/UI Toolkit/DefaultTheme/UnityDefaultRuntimeTheme.tss.meta
similarity index 100%
rename from Assets/UI Toolkit/Theme/UnityDefaultRuntimeTheme.tss.meta
rename to Assets/UI Toolkit/DefaultTheme/UnityDefaultRuntimeTheme.tss.meta
diff --git a/Assets/UI Toolkit/Component/Window.meta b/Assets/UI Toolkit/GameWindow.meta
similarity index 100%
rename from Assets/UI Toolkit/Component/Window.meta
rename to Assets/UI Toolkit/GameWindow.meta
diff --git a/Assets/UI Toolkit/Component/Window/Window.uss b/Assets/UI Toolkit/GameWindow/GameWindow.uss
similarity index 100%
rename from Assets/UI Toolkit/Component/Window/Window.uss
rename to Assets/UI Toolkit/GameWindow/GameWindow.uss
diff --git a/Assets/UI Toolkit/Component/Window/Window.uss.meta b/Assets/UI Toolkit/GameWindow/GameWindow.uss.meta
similarity index 100%
rename from Assets/UI Toolkit/Component/Window/Window.uss.meta
rename to Assets/UI Toolkit/GameWindow/GameWindow.uss.meta
diff --git a/Assets/UI Toolkit/Component/Window/Window.uxml b/Assets/UI Toolkit/GameWindow/GameWindow.uxml
similarity index 100%
rename from Assets/UI Toolkit/Component/Window/Window.uxml
rename to Assets/UI Toolkit/GameWindow/GameWindow.uxml
diff --git a/Assets/UI Toolkit/Component/Window/Window.uxml.meta b/Assets/UI Toolkit/GameWindow/GameWindow.uxml.meta
similarity index 100%
rename from Assets/UI Toolkit/Component/Window/Window.uxml.meta
rename to Assets/UI Toolkit/GameWindow/GameWindow.uxml.meta
diff --git a/Packages/UITool/Runtime/ModuleUIPanel/UISlider.cs b/Packages/UITool/Runtime/ModuleUIPanel/UISlider.cs
index a6a9353..dd0d75c 100644
--- a/Packages/UITool/Runtime/ModuleUIPanel/UISlider.cs
+++ b/Packages/UITool/Runtime/ModuleUIPanel/UISlider.cs
@@ -24,6 +24,7 @@ namespace MuHua {
public readonly UISliderFunc sliderFunc;
public VisualElement Container => Q("Container");
+ public VisualElement Title => Q("Title");
public VisualElement Tracker => Q("Tracker");
public VisualElement Dragger => Q("Dragger");