Action Bar Weapon Group Binding

Selecting a weapon now displays weapon group toggles
Added global drag and drop handling in game manager
Weapon group toggles can be dragged to action bar to bind them
This commit is contained in:
Reinier Vens 2021-04-19 03:46:35 +01:00
commit 9779afb1bb
24 changed files with 1213 additions and 27 deletions

View file

@ -4,6 +4,7 @@ using JsonKnownTypes;
using MessagePack;
using Newtonsoft.Json;
using TMPro;
using UniRx.Triggers;
using UnityEngine;
using UnityEngine.UI;
@ -15,6 +16,8 @@ public class ActionBarSlot : MonoBehaviour
public Image InputIcon;
public TextMeshProUGUI QuantityRemaining;
public Image Fill;
public ObservablePointerEnterTrigger PointerEnterTrigger;
public ObservablePointerExitTrigger PointerExitTrigger;
private ActionBarBinding binding;
public Entity Entity { get; set; }
@ -27,6 +30,8 @@ public class ActionBarSlot : MonoBehaviour
binding = value;
if (binding == null)
{
Fill.fillAmount = 0;
Label.gameObject.SetActive(false);
QuantityRemaining.gameObject.SetActive(false);
Icon.gameObject.SetActive(false);
}
@ -179,7 +184,8 @@ public class ActionBarWeaponGroupBinding : ActionBarBinding
public ActionBarWeaponGroupBinding(Entity entity, ActionBarSlot slot, int group) : base(entity, slot)
{
Group = group;
slot.Label.text = $"G{Group}";
slot.Label.gameObject.SetActive(true);
slot.Label.text = $"G{Group+1}";
Slot.Icon.gameObject.SetActive(false);
}

View file

@ -81,6 +81,7 @@ public class ActionGameManager : MonoBehaviour
[Header("Input Icons")]
public Sprite ShiftIcon;
public Sprite MouseLeftIcon;
public Sprite MouseRightIcon;
public Sprite MouseMiddleIcon;
[Header("Scene Links")]
@ -161,6 +162,9 @@ public class ActionGameManager : MonoBehaviour
(float2(0, -1), "Rear")
};
private DragAction _dragAction;
private Action<DragAction> _endDragCallback;
public EntitySettings NewEntitySettings
{
get => MessagePackSerializer.Deserialize<EntitySettings>(MessagePackSerializer.Serialize(Settings.GameplaySettings.DefaultEntitySettings));
@ -325,9 +329,36 @@ public class ActionGameManager : MonoBehaviour
var action = new InputAction(binding: controlPath);
_actionBarActions.Add(action);
var slot = Instantiate(ActionBarSlot, ActionBar);
slot.Binding = null;
_actionBarSlots.Add(slot);
action.started += context => slot.Binding?.Activate();
action.canceled += context => slot.Binding?.Deactivate();
slot.PointerEnterTrigger.OnPointerEnterAsObservable().Subscribe(_ =>
{
//Debug.Log($"Pointer entered action bar slot {controlPath}");
RegisterDragTarget(dragAction =>
{
//Debug.Log("Registering binding!");
switch (dragAction)
{
case EquippedItemDragAction equippedItemDragAction:
break;
case ItemInstanceDragAction itemInstanceDragAction:
break;
case WeaponGroupDragAction weaponGroupDragAction:
slot.Binding = new ActionBarWeaponGroupBinding(CurrentEntity, slot, weaponGroupDragAction.Group);
break;
default:
throw new ArgumentOutOfRangeException(nameof(dragAction));
}
});
});
slot.PointerExitTrigger.OnPointerExitAsObservable().Subscribe(_ =>
{
//Debug.Log($"Pointer exited action bar slot {controlPath}");
UnregisterDragTarget();
});
return slot;
}
@ -340,8 +371,7 @@ public class ActionGameManager : MonoBehaviour
left.InputLabel.gameObject.SetActive(false);
var right = createBinding("<Mouse>/rightButton");
right.InputIcon.sprite = MouseLeftIcon;
right.InputIcon.transform.localScale = new Vector3(-1, 1, 1);
right.InputIcon.sprite = MouseRightIcon;
right.InputLabel.gameObject.SetActive(false);
var middle = createBinding("<Mouse>/middleButton");
@ -467,6 +497,27 @@ public class ActionGameManager : MonoBehaviour
});
}
public void BeginDrag(DragAction dragAction)
{
_dragAction = dragAction;
}
public void RegisterDragTarget(Action<DragAction> onEndDrag)
{
_endDragCallback = onEndDrag;
}
public void UnregisterDragTarget()
{
_endDragCallback = null;
}
public void EndDrag()
{
_endDragCallback?.Invoke(_dragAction);
_dragAction = null;
}
public void EnablePlayerInput()
{
Input.Player.Enable();
@ -1015,4 +1066,36 @@ public class ActionGameManager : MonoBehaviour
}
}
}
}
public abstract class DragAction{}
public class WeaponGroupDragAction : DragAction
{
public WeaponGroupDragAction(int group)
{
Group = group;
}
public int Group { get; }
}
public class ItemInstanceDragAction : DragAction
{
public ItemInstanceDragAction(ItemInstance item)
{
Item = item;
}
public ItemInstance Item { get; }
}
public class EquippedItemDragAction : DragAction
{
public EquippedItemDragAction(EquippedItem item)
{
Item = item;
}
public EquippedItem Item { get; }
}