From 40759d2494300d831caee2d81ba6f095ff232d52 Mon Sep 17 00:00:00 2001 From: MpakobecEx Date: Sun, 1 Nov 2026 20:58:27 +0500 Subject: [PATCH] =?UTF-8?q?client:=20=D0=BA=D0=BE=D0=BB=D0=B5=D1=81=D0=BE?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=BA=D1=80=D1=83=D1=87=D0=B8=D0=B2=D0=B0?= =?UTF-8?q?=D0=B5=D1=82=20=D0=BA=D0=BE=D0=BB=D0=BB=D0=B5=D0=BA=D1=86=D0=B8?= =?UTF-8?q?=D1=8E=20=D0=BD=D0=B0=20=D0=BE=D0=B4=D0=BD=D1=83=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D0=BE=D1=81=D1=83=20=D0=BA=D0=B0=D1=80=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Исправлено направление и границы SmoothScrollRect: целевая позиция считается в [0, max] и уменьшается на scrollDelta, а не уходила в отрицательные значения (из-за этого колесо не двигало список). - Для сетки коллекции шаг колеса = 448 px (ячейка 434 + отступ 14), то есть один тик — одна полоса карт. - Проверки: EditMode 69/69, standalone собран. --- client/Assets/Vanguard/Runtime/UI/DeckBuilderView.cs | 4 ++++ client/Assets/Vanguard/Runtime/UI/SmoothScrollRect.cs | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/client/Assets/Vanguard/Runtime/UI/DeckBuilderView.cs b/client/Assets/Vanguard/Runtime/UI/DeckBuilderView.cs index ab8239c..5ce4461 100644 --- a/client/Assets/Vanguard/Runtime/UI/DeckBuilderView.cs +++ b/client/Assets/Vanguard/Runtime/UI/DeckBuilderView.cs @@ -213,6 +213,10 @@ namespace Vanguard.UI scrollElement.flexibleHeight = 1f; scrollElement.minHeight = 220f; + var smooth = scroll.GetComponent(); + if (smooth != null) + smooth.WheelStep = 448f; + var grid = _collectionContent.GetComponent(); if (grid != null) grid.childAlignment = TextAnchor.UpperLeft; diff --git a/client/Assets/Vanguard/Runtime/UI/SmoothScrollRect.cs b/client/Assets/Vanguard/Runtime/UI/SmoothScrollRect.cs index 7d3bc1e..1d8baf3 100644 --- a/client/Assets/Vanguard/Runtime/UI/SmoothScrollRect.cs +++ b/client/Assets/Vanguard/Runtime/UI/SmoothScrollRect.cs @@ -28,7 +28,7 @@ namespace Vanguard.UI _target = content.anchoredPosition.y; var max = Mathf.Max(0f, content.rect.height - viewport.rect.height); - _target = Mathf.Clamp(_target + eventData.scrollDelta.y * WheelStep, -max, 0f); + _target = Mathf.Clamp(_target - eventData.scrollDelta.y * WheelStep, 0f, max); velocity = Vector2.zero; _smooth = true; } @@ -49,7 +49,7 @@ namespace Vanguard.UI var position = content.anchoredPosition; var max = Mathf.Max(0f, content.rect.height - viewport.rect.height); - _target = Mathf.Clamp(_target, -max, 0f); + _target = Mathf.Clamp(_target, 0f, max); var t = 1f - Mathf.Exp(-Time.unscaledDeltaTime / Mathf.Max(0.01f, Smoothing)); var next = Mathf.Lerp(position.y, _target, t);