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/InteractableObjects/BaseInteractableObject.cs
+1 -1
View File
@@ -39,7 +39,7 @@ public abstract class BaseInteractableObject : MonoBehaviour
{
case InteractionStatus.None:
var filteredActions = _menuActions.Where(x => x.Value.IsEnabled).ToDictionary(i => i.Key, i => i.Value) ;
UIManager.Instance.ShowItemsMenu(filteredActions, PopupMenuCallback);
GameManager.Instance.UI.ShowItemPopupMenu(filteredActions, PopupMenuCallback);
_currentStatus = InteractionStatus.WaitForChoose;
break;
case InteractionStatus.Complete:
Assets/Scripts/InteractableObjects/Bed.cs
+1 -1
View File
@@ -15,7 +15,7 @@ public class Bed : BaseInteractableObject
private void OnAnimationFinished()
{
UIManager.Instance.ShowTimeSliderDialog("Go to sleep", "Sleep until", OnCancel, OnConfirm);
GameManager.Instance.UI.ShowTimeSliderDialog("Go to sleep", "Sleep until", OnCancel, OnConfirm);
}
private void OnCancel()
{
Assets/Scripts/InteractableObjects/CashierDesk.cs
+1 -1
View File
@@ -42,7 +42,7 @@ public class CashierDesk : BaseInteractableObject
BuyItems();
break;
case RadialMenuActions.Work:
UIManager.Instance.ShowTimeSliderDialog($"Work", $"Work as {_playerJob.Description}", OnCancel, OnConfirm);
GameManager.Instance.UI.ShowTimeSliderDialog($"Work", $"Work as {_playerJob.Description}", OnCancel, OnConfirm);
break;
default:
print("unknown action");
Assets/Scripts/InteractableObjects/OfficeTable.cs
+1 -1
View File
@@ -12,7 +12,7 @@ public class OfficeTable : BaseInteractableObject
protected override void InteractAction(RadialMenuActions interactAction)
{
UIManager.Instance.ShowJobSelectionDialog("Job agency", null, OnConfirm);
GameManager.Instance.UI.ShowJobSelectionDialog("Job agency", null, OnConfirm);
}
private void OnConfirm(JobInfoSO selectedJob)
Assets/Scripts/InteractableObjects/SelectedVisual.cs
-2
View File
@@ -11,13 +11,11 @@ public class SelectedVisual : MonoBehaviour
private void Start()
{
InGameMouseHandler.OnSelectedObjectChanged += Mouse_OnSelectedObjectChanged;
print($"{_selectedObject.name} is subscribed to OnSelectedObjectChanged");
}
private void OnDestroy()
{
InGameMouseHandler.OnSelectedObjectChanged -= Mouse_OnSelectedObjectChanged;
print($"{_selectedObject.name} is Unsubscribed to OnSelectedObjectChanged");
}
private void Mouse_OnSelectedObjectChanged(object sender, OnSelectedObjectChangedEventArgs e)