MuHua/MuHua-UIElements
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into 物品系统

Browse Source
This commit is contained in:
MuHua-123
2025-09-22 14:29:55 +08:00
parent c7d9cf0ace f4a07224aa
commit 217afaa20e
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Packages/UITool/Runtime/ModuleUIPanel/UIScrollView/UIScrollView.cs
+10 -3
View File
@@ -71,9 +71,16 @@ namespace MuHua {
} }
/// <summary> 视图滚轮滑动 </summary> /// <summary> 视图滚轮滑动 </summary>
private void ViewportWheel(WheelEvent evt) { private void ViewportWheel(WheelEvent evt) {
float x = Mathf.Clamp(evt.delta.x, -1, 1); float maxWidth = Viewport.resolvedStyle.width - Container.resolvedStyle.width;
float y = Mathf.Clamp(evt.delta.y, -1, 1); float minWidth = Mathf.Min(Viewport.resolvedStyle.width, Container.resolvedStyle.width);
UpdateValue(new Vector2(value.x - x, value.y - y)); 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> /// <summary> 拖拽按下 </summary>
private void DraggerDown(PointerDownEvent evt) { private void DraggerDown(PointerDownEvent evt) {
Packages/UITool/Runtime/ModuleUIPanel/UIScrollView/UIScrollViewH.cs
+5 -2
View File
@@ -76,8 +76,11 @@ namespace MuHua {
} }
/// <summary> 滚轮滑动 </summary> /// <summary> 滚轮滑动 </summary>
private void ViewportWheel(WheelEvent evt) { private void ViewportWheel(WheelEvent evt) {
float wheel = Mathf.Clamp(evt.delta.y, -1, 1); float maxHeight = Viewport.resolvedStyle.height - Container.resolvedStyle.height;
UpdateValue(value - wheel); float minHeight = Mathf.Min(Viewport.resolvedStyle.height, Container.resolvedStyle.height);
float y = evt.delta.y * minHeight / maxHeight;
value = value - y;
UpdateValue(value);
} }
/// <summary> 拖拽按下 </summary> /// <summary> 拖拽按下 </summary>
private void DraggerDown(PointerDownEvent evt) { private void DraggerDown(PointerDownEvent evt) {
Packages/UITool/Runtime/ModuleUIPanel/UIScrollView/UIScrollViewV.cs
+5 -2
View File
@@ -76,8 +76,11 @@ namespace MuHua {
} }
/// <summary> 滚轮滑动 </summary> /// <summary> 滚轮滑动 </summary>
private void ViewportWheel(WheelEvent evt) { private void ViewportWheel(WheelEvent evt) {
float wheel = Mathf.Clamp(evt.delta.y, -1, 1); float maxHeight = Viewport.resolvedStyle.height - Container.resolvedStyle.height;
UpdateValue(value - wheel); float minHeight = Mathf.Min(Viewport.resolvedStyle.height, Container.resolvedStyle.height);
float y = evt.delta.y * minHeight / maxHeight;
value = value - y;
UpdateValue(value);
} }
/// <summary> 拖拽按下 </summary> /// <summary> 拖拽按下 </summary>
private void DraggerDown(PointerDownEvent evt) { private void DraggerDown(PointerDownEvent evt) {