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

fix radial menu

Browse Source
This commit is contained in:
Valdimir
2023-11-17 13:52:06 +02:00
parent 8456ce0356
commit 37da3bd61a
14 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/InteractableObjects/BaseInteractableObject.cs
+23 -20
View File
@@ -15,27 +15,30 @@ public class BaseInteractableObject : MonoBehaviour
public InteractionStatus Interact(Player player)
{
_player = player;
if (_currentStatus == InteractionStatus.None && _menuActions.Any())
switch (_currentStatus)
{
UIManager.Instance.ShowItemsMenu(_menuActions, PopupMenuCallback);
_currentStatus = InteractionStatus.WaitForChoose;
}
else if (_currentStatus == InteractionStatus.Complete)
{
_currentStatus = InteractionStatus.None;
return InteractionStatus.Complete;
}
else if (_currentStatus != InteractionStatus.WaitForChoose && _currentStatus != InteractionStatus.Complete)
{
if (_player.IsPathComplete(_interactionPoint.position))
{
InteractAction();
_currentStatus = InteractionStatus.Complete;
}
else
{
_currentStatus = InteractionStatus.FarFromPlayer;
}
case InteractionStatus.None when _menuActions.Any():
UIManager.Instance.ShowItemsMenu(_menuActions, PopupMenuCallback);
_currentStatus = InteractionStatus.WaitForChoose;
break;
case InteractionStatus.Complete:
_currentStatus = InteractionStatus.None;
return InteractionStatus.Complete;
default:
if (_currentStatus != InteractionStatus.WaitForChoose && _currentStatus != InteractionStatus.Complete)
{
if (_player.IsPathComplete(_interactionPoint.position))
{
InteractAction();
_currentStatus = InteractionStatus.None;
return InteractionStatus.Complete;
}
else
{
_currentStatus = InteractionStatus.FarFromPlayer;
}
}
break;
}
return _currentStatus;
}
Assets/Scripts/UIElements/RadialMenuItem.cs
+16 -6
View File
@@ -8,9 +8,13 @@ public class RadialMenuItem : MonoBehaviour
{
[SerializeField]
private Button _radialMenuItemPrefab;
private Action<RadialMenuActionSO> _menuButtonClick=null;
List<RadialMenuActionSO> _actions;
public void ShowButtons(List<RadialMenuActionSO> actions, Action<RadialMenuActionSO> menuButtonClick)
{
_actions = actions;
_menuButtonClick = menuButtonClick;
for (int buttonsCount = 0; buttonsCount < actions.Count; buttonsCount++)
{
var button = Instantiate(_radialMenuItemPrefab);
@@ -27,14 +31,20 @@ public class RadialMenuItem : MonoBehaviour
textMeshPro.text = actions[buttonsCount].ActionName;
}
button.onClick.AddListener(() =>
{
Hide();
CloseDialog();
menuButtonClick?.Invoke(actions[1]);
});
AddEvent(button, buttonsCount);
}
}
void AddEvent(Button b, int i)
{
b.onClick.AddListener(() =>
{
Hide();
_menuButtonClick?.Invoke(_actions[i]);
CloseDialog();
});
}
private void CloseDialog()
{
UIManager.Instance.Unfreeze();