From f4a07224aaac7286da5d59691d70d7d54d870584 Mon Sep 17 00:00:00 2001
From: MuHua-123 <136542559+MuHua-123@users.noreply.github.com>
Date: Mon, 22 Sep 2025 14:27:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/UI Toolkit/Document/MainDocument.uxml        |  2 --
 .../ModuleUIPanel/UIScrollView/UIScrollView.cs      | 13 ++++++++++---
 .../ModuleUIPanel/UIScrollView/UIScrollViewH.cs     |  7 +++++--
 .../ModuleUIPanel/UIScrollView/UIScrollViewV.cs     |  7 +++++--
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/Assets/UI Toolkit/Document/MainDocument.uxml b/Assets/UI Toolkit/Document/MainDocument.uxml
index 31442fa..dc9fb1a 100644
--- a/Assets/UI Toolkit/Document/MainDocument.uxml	
+++ b/Assets/UI Toolkit/Document/MainDocument.uxml	
@@ -1,8 +1,6 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
-    <ui:Template name="LoginPage" src="project://database/Assets/UI%20Toolkit/GamePage/LoginPage/LoginPage.uxml?fileID=9197481963319205126&amp;guid=7ebceaef0e3991040bf96648c85589a4&amp;type=3#LoginPage" />
     <ui:Template name="BannerTip" src="project://database/Assets/UI%20Toolkit/GamePopup/BannerTip/BannerTip.uxml?fileID=9197481963319205126&amp;guid=e4a01fc5cb705fe4c9bedf1d0c5df107&amp;type=3#BannerTip" />
     <Style src="project://database/Assets/UI%20Toolkit/Document/Document.uss?fileID=7433441132597879392&amp;guid=9205939af30a4394f8f2e34232b27890&amp;type=3#Document" />
-    <ui:Instance template="LoginPage" name="LoginPage" class="document-page document-page-hide" />
     <ui:VisualElement name="Window" picking-mode="Ignore" class="document-page" style="flex-grow: 1;" />
     <ui:VisualElement name="Popup" picking-mode="Ignore" class="document-page" style="flex-grow: 1;">
         <ui:Instance template="BannerTip" name="BannerTip" class="document-page document-page-hide" />
diff --git a/Packages/UITool/Runtime/ModuleUIPanel/UIScrollView/UIScrollView.cs b/Packages/UITool/Runtime/ModuleUIPanel/UIScrollView/UIScrollView.cs
index 120a3bb..5b0df8e 100644
--- a/Packages/UITool/Runtime/ModuleUIPanel/UIScrollView/UIScrollView.cs
+++ b/Packages/UITool/Runtime/ModuleUIPanel/UIScrollView/UIScrollView.cs
@@ -71,9 +71,16 @@ namespace MuHua {
 		}
 		/// <summary> 视图滚轮滑动 </summary>
 		private void ViewportWheel(WheelEvent evt) {
-			float x = Mathf.Clamp(evt.delta.x, -1, 1);
-			float y = Mathf.Clamp(evt.delta.y, -1, 1);
-			UpdateValue(new Vector2(value.x - x, value.y - y));
+			float maxWidth = Viewport.resolvedStyle.width - Container.resolvedStyle.width;
+			float minWidth = Mathf.Min(Viewport.resolvedStyle.width, Container.resolvedStyle.width);
+			float x = evt.delta.x * minWidth / maxWidth;
+
+			float maxHeight = Viewport.resolvedStyle.height - Container.resolvedStyle.height;
+			float minHeight = Mathf.Min(Viewport.resolvedStyle.height, Container.resolvedStyle.height);
+			float y = evt.delta.y * minHeight / maxHeight;
+
+			value = value - new Vector2(x, y);
+			UpdateValue(value);
 		}
 		/// <summary> 拖拽按下 </summary>
 		private void DraggerDown(PointerDownEvent evt) {
diff --git a/Packages/UITool/Runtime/ModuleUIPanel/UIScrollView/UIScrollViewH.cs b/Packages/UITool/Runtime/ModuleUIPanel/UIScrollView/UIScrollViewH.cs
index 268ce1f..a9b18ba 100644
--- a/Packages/UITool/Runtime/ModuleUIPanel/UIScrollView/UIScrollViewH.cs
+++ b/Packages/UITool/Runtime/ModuleUIPanel/UIScrollView/UIScrollViewH.cs
@@ -76,8 +76,11 @@ namespace MuHua {
 		}
 		/// <summary> 滚轮滑动 </summary>
 		private void ViewportWheel(WheelEvent evt) {
-			float wheel = Mathf.Clamp(evt.delta.y, -1, 1);
-			UpdateValue(value - wheel);
+			float maxHeight = Viewport.resolvedStyle.height - Container.resolvedStyle.height;
+			float minHeight = Mathf.Min(Viewport.resolvedStyle.height, Container.resolvedStyle.height);
+			float y = evt.delta.y * minHeight / maxHeight;
+			value = value - y;
+			UpdateValue(value);
 		}
 		/// <summary> 拖拽按下 </summary>
 		private void DraggerDown(PointerDownEvent evt) {
diff --git a/Packages/UITool/Runtime/ModuleUIPanel/UIScrollView/UIScrollViewV.cs b/Packages/UITool/Runtime/ModuleUIPanel/UIScrollView/UIScrollViewV.cs
index 7538e7c..51e904f 100644
--- a/Packages/UITool/Runtime/ModuleUIPanel/UIScrollView/UIScrollViewV.cs
+++ b/Packages/UITool/Runtime/ModuleUIPanel/UIScrollView/UIScrollViewV.cs
@@ -76,8 +76,11 @@ namespace MuHua {
 		}
 		/// <summary> 滚轮滑动 </summary>
 		private void ViewportWheel(WheelEvent evt) {
-			float wheel = Mathf.Clamp(evt.delta.y, -1, 1);
-			UpdateValue(value - wheel);
+			float maxHeight = Viewport.resolvedStyle.height - Container.resolvedStyle.height;
+			float minHeight = Mathf.Min(Viewport.resolvedStyle.height, Container.resolvedStyle.height);
+			float y = evt.delta.y * minHeight / maxHeight;
+			value = value - y;
+			UpdateValue(value);
 		}
 		/// <summary> 拖拽按下 </summary>
 		private void DraggerDown(PointerDownEvent evt) {