lionfish/SimUL
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix popup item menu and refactor ui system

Browse Source
This commit is contained in:
Vova
2023-12-11 16:16:18 +02:00
parent bf088009f6
commit e7f082a774
14 changed files with 131 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/Managers/InGameMouseHandler.cs
+5 -13
View File
@@ -39,6 +39,8 @@ public class InGameMouseHandler : UnityEngine.Object
{
if (!EventSystem.current.IsPointerOverGameObject())
{
GameManager.Instance.UI.ClosePopupMenu();
if (_selectedObject != null)
{
_waypointVisual.SetWaypoint(_selectedObject._interactionPoint.position);
@@ -58,26 +60,16 @@ public class InGameMouseHandler : UnityEngine.Object
public void Update()
{
_ray = _camera.ScreenPointToRay(Mouse.current.position.ReadValue());
//if(EventSystem.current.IsPointerOverGameObject())
//{
// return;
//}
//hide rounded menu
if (Physics.Raycast(_ray, out var mouseRaycastHit, 100f, _selectableLayerMask))
{
mouseRaycastHit.transform.TryGetComponent(out _selectedObject);
if (_selectedObject != null)
{
OnSelectedObjectChanged?.Invoke(this, new OnSelectedObjectChangedEventArgs() { SelectedObject = _selectedObject });
}
else
{
OnSelectedObjectChanged?.Invoke(this, new OnSelectedObjectChangedEventArgs() { SelectedObject = null });
return;
}
}
else
{
OnSelectedObjectChanged?.Invoke(this, new OnSelectedObjectChangedEventArgs() { SelectedObject = null });
}
_selectedObject = null;
OnSelectedObjectChanged?.Invoke(this, new OnSelectedObjectChangedEventArgs() { SelectedObject = null });
}
}