fix radial menu
This commit is contained in:
@@ -9258,7 +9258,7 @@ MonoBehaviour:
|
||||
_jobSelectorPrefab: {fileID: 3776407727599883163, guid: 2ad5edd099127044684eeca456ed3d00,
|
||||
type: 3}
|
||||
_blurOverlay: {fileID: 1972616679270001457}
|
||||
_itemPopupMenuPrefab: {fileID: 5424962769672562944, guid: 543443cf1b9e73b4193a13044eda04d2,
|
||||
_radialMenuItemPrefab: {fileID: 5424962769672562944, guid: 543443cf1b9e73b4193a13044eda04d2,
|
||||
type: 3}
|
||||
--- !u!222 &1315590696984075725
|
||||
CanvasRenderer:
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user