From ae7a14afe30aadf6729a13e61a076fa8f8c5b84a Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Fri, 30 Aug 2024 15:00:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20UI=E6=89=93=E5=BC=80=20?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=93=8D=E4=BD=9C=20=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E4=BA=BA=E7=A7=B0=E8=A7=86=E8=A7=92=EF=BC=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=AF=B9=E8=AF=9D=E6=A1=86=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FirstPersonController/FirstPersonController.cs | 2 ++ Assets/Resources/UI/UI_Panel/UI_CustomSessionPanel.prefab | 4 ++-- Assets/Resources/UI/UI_Panel/UI_PlayerSessionPanel.prefab | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Assets/Plugins/ModularFirstPersonController/FirstPersonController/FirstPersonController.cs b/Assets/Plugins/ModularFirstPersonController/FirstPersonController/FirstPersonController.cs index fbf2a84..9c0ba57 100644 --- a/Assets/Plugins/ModularFirstPersonController/FirstPersonController/FirstPersonController.cs +++ b/Assets/Plugins/ModularFirstPersonController/FirstPersonController/FirstPersonController.cs @@ -8,6 +8,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; +using UnityEngine.EventSystems; #if UNITY_EDITOR using UnityEditor; @@ -209,6 +210,7 @@ public class FirstPersonController : MonoBehaviour private void Update() { + if (EventSystem.current.IsPointerOverGameObject()) return; float scrollValue = Input.GetAxis("Mouse ScrollWheel"); playerCamera.fieldOfView = Mathf.Clamp(playerCamera.fieldOfView - scrollValue * 20, 10, 60); diff --git a/Assets/Resources/UI/UI_Panel/UI_CustomSessionPanel.prefab b/Assets/Resources/UI/UI_Panel/UI_CustomSessionPanel.prefab index 7fa6c5f..7ec19d0 100644 --- a/Assets/Resources/UI/UI_Panel/UI_CustomSessionPanel.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_CustomSessionPanel.prefab @@ -861,8 +861,8 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 diff --git a/Assets/Resources/UI/UI_Panel/UI_PlayerSessionPanel.prefab b/Assets/Resources/UI/UI_Panel/UI_PlayerSessionPanel.prefab index 1075b65..8a6fc50 100644 --- a/Assets/Resources/UI/UI_Panel/UI_PlayerSessionPanel.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_PlayerSessionPanel.prefab @@ -451,7 +451,7 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 + m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0