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

radial menu work

Browse Source
This commit is contained in:
Valdimir
2023-11-17 15:02:33 +02:00
parent 37da3bd61a
commit cb2eba5731
39 changed files with 3292 additions and 3050 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/InteractableObjects/BaseInteractableObject.cs
+32 -11
View File
@@ -2,23 +2,44 @@
using System.Linq;
using UnityEngine;
public class BaseInteractableObject : MonoBehaviour
public abstract class BaseInteractableObject : MonoBehaviour
{
[SerializeField]
public Transform _interactionPoint;
[SerializeField]
public List<RadialMenuActionSO> _menuActions;
protected Dictionary<RadialMenuActions, RadialMenuActionDescription> _menuActions = new();
private RadialMenuActions _selectedAction;
protected Player _player;
private InteractionStatus _currentStatus = InteractionStatus.None;
private void Start()
{
_menuActions = new Dictionary<RadialMenuActions, RadialMenuActionDescription>
{
{ RadialMenuActions.Buy, new RadialMenuActionDescription() { Description = "Buy", IsEnabled = false } },
{ RadialMenuActions.Sleep, new RadialMenuActionDescription() { Description = "Sleep", IsEnabled = false } },
{ RadialMenuActions.Talk, new RadialMenuActionDescription() { Description = "Talk", IsEnabled = false } },
{ RadialMenuActions.Put, new RadialMenuActionDescription() { Description = "Put", IsEnabled = false } },
{ RadialMenuActions.Take, new RadialMenuActionDescription() { Description = "Take", IsEnabled = false } },
{ RadialMenuActions.Work, new RadialMenuActionDescription() { Description = "Work", IsEnabled = false } },
{ RadialMenuActions.Eat, new RadialMenuActionDescription() { Description = "Eat", IsEnabled = false } },
{ RadialMenuActions.Open, new RadialMenuActionDescription() { Description = "Open", IsEnabled = false } },
{ RadialMenuActions.Cancel, new RadialMenuActionDescription() { Description = "Cancel", IsEnabled = true } },
};
}
public InteractionStatus Interact(Player player)
{
_player = player;
PrepareMenuActions();
switch (_currentStatus)
{
case InteractionStatus.None when _menuActions.Any():
UIManager.Instance.ShowItemsMenu(_menuActions, PopupMenuCallback);
case InteractionStatus.None:
var filteredActions = _menuActions.Where(x => x.Value.IsEnabled).ToDictionary(i => i.Key, i => i.Value) ;
UIManager.Instance.ShowItemsMenu(filteredActions, PopupMenuCallback);
_currentStatus = InteractionStatus.WaitForChoose;
break;
case InteractionStatus.Complete:
@@ -29,7 +50,7 @@ public class BaseInteractableObject : MonoBehaviour
{
if (_player.IsPathComplete(_interactionPoint.position))
{
InteractAction();
InteractAction(_selectedAction);
_currentStatus = InteractionStatus.None;
return InteractionStatus.Complete;
}
@@ -43,20 +64,20 @@ public class BaseInteractableObject : MonoBehaviour
return _currentStatus;
}
private void PopupMenuCallback(RadialMenuActionSO action)
private void PopupMenuCallback(RadialMenuActions action)
{
if (action.Action == RadialMenuActions.Cancel)
if (action == RadialMenuActions.Cancel)
{
_currentStatus = InteractionStatus.Complete;
}
else
{
_selectedAction= action;
_currentStatus = InteractionStatus.InProgress;
}
}
protected virtual void InteractAction()
{
protected abstract void InteractAction(RadialMenuActions interactAction);
}
protected abstract void PrepareMenuActions();
}
Assets/Scripts/InteractableObjects/Bed.cs
+7 -2
View File
@@ -1,13 +1,18 @@
using System;
using System.Collections;
public class Bed : BaseInteractableObject
{
protected override void InteractAction()
protected override void PrepareMenuActions()
{
_menuActions[RadialMenuActions.Sleep].IsEnabled = true;
}
protected override void InteractAction(RadialMenuActions interactAction)
{
_player.SetPlayerAnimation(AnimationStates.Sitting, OnAnimationFinished);
}
private void OnAnimationFinished()
{
UIManager.Instance.ShowTimeSliderDialog("Go to sleep", "Sleep until", OnCancel, OnConfirm);
Assets/Scripts/InteractableObjects/CashierDesk.cs
+32 -15
View File
@@ -11,26 +11,43 @@ public class CashierDesk : BaseInteractableObject
private List<JobInfoSO> _jobsInfoList;
private JobInfoSO _playerJob;
protected override void InteractAction()
private bool CheckIfPlayerHaveItems()
{
if (_player.IsHoldContainerItem())
{
BuyItems();
var playerContainer = _player.GetContainerItem();
if (playerContainer.IsSalebleItems())
{
return true;
}
}
else
{
_playerJob = _jobsInfoList.Where(x => x.JobPosition == _player.JobPosition).FirstOrDefault();
print($"playerJob is {_playerJob}");
if (_playerJob != null)
{
UIManager.Instance.ShowTimeSliderDialog($"Work", $"Work as {_playerJob.Description}", OnCancel, OnConfirm);
return false;
}
}
else
{
print("You don't work here");
}
}
protected override void PrepareMenuActions()
{
_playerJob = _jobsInfoList.Where(x => x.JobPosition == _player.JobPosition).FirstOrDefault();
if (_playerJob != null)
_menuActions[RadialMenuActions.Work].IsEnabled = true;
_menuActions[RadialMenuActions.Buy].IsEnabled = CheckIfPlayerHaveItems();
}
protected override void InteractAction(RadialMenuActions interactAction)
{
switch (interactAction)
{
case RadialMenuActions.Buy:
BuyItems();
break;
case RadialMenuActions.Work:
UIManager.Instance.ShowTimeSliderDialog($"Work", $"Work as {_playerJob.Description}", OnCancel, OnConfirm);
break;
default:
print("unknown action");
break;
}
}
private void BuyItems()
Assets/Scripts/InteractableObjects/Door.cs
+6 -1
View File
@@ -17,7 +17,12 @@ public class Door : BaseInteractableObject
}
protected override void InteractAction()
protected override void PrepareMenuActions()
{
_menuActions[RadialMenuActions.Open].IsEnabled = true;
}
protected override void InteractAction(RadialMenuActions interactAction)
{
if (!string.IsNullOrEmpty(_exitName))
{
Assets/Scripts/InteractableObjects/Fridge.cs
+24 -14
View File
@@ -7,18 +7,34 @@ public class Fridge : BaseInteractableObject
{
[SerializeField]
private ContainerSO _containerSO;
[SerializeField]
//private ItemActionsUI _actionsMenu;
private List<FoodItemSO> _foodObjects = new List<FoodItemSO>();
protected override void InteractAction()
{
private bool CheckIfPlayerHaveItems()
{
if (_player.IsHoldContainerItem())
{
var playerContainer = _player.GetContainerItem();
if (!playerContainer.IsSalebleItems())
{
return true;
}
}
return false;
}
protected override void PrepareMenuActions()
{
_menuActions[RadialMenuActions.Put].IsEnabled = CheckIfPlayerHaveItems();
_menuActions[RadialMenuActions.Eat].IsEnabled = _foodObjects.Count > 0;
}
protected override void InteractAction(RadialMenuActions interactAction)
{
switch (interactAction)
{
case RadialMenuActions.Put:
var playerContainer = _player.GetContainerItem();
if (_foodObjects.Count + playerContainer.GetItems().Count <= _containerSO.MaxCapacity)
{
foreach (FoodItemSO item in playerContainer.GetItems())
@@ -31,19 +47,13 @@ public class Fridge : BaseInteractableObject
}
else
Debug.Log($"Fridge is full");
}
}
else
{
//Eat menu
if (_foodObjects.Count > 0)
{
break;
case RadialMenuActions.Eat:
var hunger = _player.Stats[StatsId.Food].MaxValue - _player.Stats[StatsId.Food].Value;
var eatingItems = _foodObjects.Count < (hunger / 10) ? _foodObjects.Count : (hunger / 10);
StartCoroutine(EatRoutine(eatingItems));
_foodObjects.RemoveRange(0, (int)eatingItems);
}
break;
}
}
Assets/Scripts/InteractableObjects/OfficeTable.cs
+6 -3
View File
@@ -1,13 +1,16 @@
using System;
using UnityEngine;
using static UnityEditor.Experimental.GraphView.GraphView;
public class OfficeTable : BaseInteractableObject
{
[SerializeField]
private JobsListSO _jobPositionsSO;
protected override void InteractAction()
protected override void PrepareMenuActions()
{
_menuActions[RadialMenuActions.Talk].IsEnabled = true;
}
protected override void InteractAction(RadialMenuActions interactAction)
{
UIManager.Instance.ShowJobSelectionDialog("Job agency", null, OnConfirm);
}
Assets/Scripts/InteractableObjects/RadialMenuActionDescription.cs
+5
View File
@@ -0,0 +1,5 @@
public class RadialMenuActionDescription
{
public bool IsEnabled { get; set; }
public string Description { get; set; }
}
Assets/Scripts/InteractableObjects/RadialMenuActionDescription.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: c6bfbb59bd3f3234e947cc44069cfe7d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/InteractableObjects/ShopingBasket.cs
+12 -11
View File
@@ -4,21 +4,22 @@ public class ShopingContainer : BaseInteractableObject
{
[SerializeField]
private ContainerSO _containerSO;
[SerializeField]
//private ItemActionsUI _actionsMenu;
protected override void InteractAction()
protected override void PrepareMenuActions()
{
if (!_player.IsHoldContainerItem())
_menuActions[RadialMenuActions.Take].IsEnabled = true;
}
protected override void InteractAction(RadialMenuActions interactAction)
{
var transform = Instantiate(_containerSO.prefab, _interactionPoint);
var containerItem = transform.GetComponent<ContainerItem>();
if (containerItem == null)
{
var transform = Instantiate(_containerSO.prefab, _interactionPoint);
var containerItem = transform.GetComponent<ContainerItem>();
if (containerItem == null)
{
Debug.LogError("Container Item is null");
return;
}
_player.SetContainerItem(containerItem);
Debug.LogError("Container Item is null");
return;
}
_player.SetContainerItem(containerItem);
}
}
Assets/Scripts/InteractableObjects/StoreContainer.cs
+9 -7
View File
@@ -6,14 +6,16 @@ public class StoreContainer : BaseInteractableObject
[SerializeField]
private SellableItemSO _sellableItemSO;
protected override void InteractAction()
protected override void PrepareMenuActions()
{
if (_player.IsHoldContainerItem())
{
var clone = Instantiate(_sellableItemSO);
_menuActions[RadialMenuActions.Take].IsEnabled = _player.IsHoldContainerItem();
}
var container = _player.GetContainerItem();
container.AddItem(clone);
}
protected override void InteractAction(RadialMenuActions interactAction)
{
var clone = Instantiate(_sellableItemSO);
var container = _player.GetContainerItem();
container.AddItem(clone);
}
}