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

Code refactor

Browse Source
This commit is contained in:
Valdimir
2023-02-20 23:08:24 +02:00
parent 4cc6b1c7bf
commit 1002e27db4
14 changed files with 577 additions and 1447 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/EventArgs.cs
+12
View File
@@ -0,0 +1,12 @@
using System;
using UnityEngine;
public class OnSelectedObjectChangedEventArgs : EventArgs
{
public Transform SelectedObject;
}
public class OnMovementTargetSelectedEventArgs:EventArgs
{
public Vector3 PointToMove;
}
Assets/Scripts/EventArgs.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 4add4f03070ea3f46a3e4aea1fc71585
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/MouseInputManager.cs
+50
View File
@@ -0,0 +1,50 @@
using System;
using UnityEngine;
using UnityEngine.EventSystems;
public class MouseInputManager : MonoBehaviour
{
[SerializeField]
private LayerMask _selectableLayerMask;
[SerializeField]
private LayerMask _walkableLayerMask;
[SerializeField]
private Camera _camera;
private RaycastHit _raycastHit;
public event EventHandler<OnSelectedObjectChangedEventArgs> OnSelectedObjectChanged;
public event EventHandler<OnMovementTargetSelectedEventArgs> OnMovementTargetSelected;
public static MouseInputManager Instance { get; private set; }
private void Awake()
{
if (Instance != null)
{
Debug.Log("There's more than one player instance");
}
Instance = this;
}
void Update()
{
var ray = Camera.main.ScreenPointToRay(Input.mousePosition);
if (!EventSystem.current.IsPointerOverGameObject() && Physics.Raycast(ray, out _raycastHit, 100f, _selectableLayerMask))
{
OnSelectedObjectChanged?.Invoke(this, new OnSelectedObjectChangedEventArgs() { SelectedObject = _raycastHit.transform });
}
else
{
OnSelectedObjectChanged?.Invoke(this, new OnSelectedObjectChangedEventArgs() { SelectedObject = null });
}
if (Input.GetMouseButton(0))
{
if (Physics.Raycast(_camera.ScreenPointToRay(Input.mousePosition), out RaycastHit hit, 100f, _walkableLayerMask))
{
var pointToMove = hit.point;
OnMovementTargetSelected?.Invoke(this, new OnMovementTargetSelectedEventArgs() { PointToMove = pointToMove });
}
}
}
}
Assets/Scripts/MouseSelection.cs.meta → Assets/Scripts/MouseInputManager.cs.meta
View File
Assets/Scripts/MouseSelection.cs
-59
View File
@@ -1,59 +0,0 @@
using System;
using UnityEngine;
using UnityEngine.EventSystems;
public class MouseSelection : MonoBehaviour
{
[SerializeField]
private LayerMask _selectableLayerMask;
private Transform _selection;
private RaycastHit _raycastHit;
public event EventHandler<OnSelectedObjectChangedEventArgs> OnSelectedObjectChanged;
public class OnSelectedObjectChangedEventArgs : EventArgs
{
public Transform SelectedObject;
}
public static MouseSelection Instance { get; private set; }
private void Awake()
{
if (Instance != null)
{
Debug.Log("There's more than one player instance");
}
Instance = this;
}
void Update()
{
var ray = Camera.main.ScreenPointToRay(Input.mousePosition);
if (!EventSystem.current.IsPointerOverGameObject() && Physics.Raycast(ray, out _raycastHit, 100f, _selectableLayerMask))
{
OnSelectedObjectChanged?.Invoke(this, new OnSelectedObjectChangedEventArgs() { SelectedObject = _raycastHit.transform });
// _hightlight = _raycastHit.transform;
// if (_hightlight.CompareTag("Selectable") && _hightlight != _selection)
// {
// if (_hightlight.gameObject.GetComponent<Outline>() != null)
// {
// _hightlight.gameObject.GetComponent<Outline>().enabled = true;
// }
// else
// {
// var outline = _hightlight.gameObject.AddComponent<Outline>();
// outline.enabled = true;
// _hightlight.gameObject.GetComponent<Outline>().OutlineColor = Color.yellow;
// _hightlight.gameObject.GetComponent<Outline>().OutlineWidth = 7f;
// }
// }
// else
// {
// _hightlight = null;
// }
}
else
{
OnSelectedObjectChanged?.Invoke(this, new OnSelectedObjectChangedEventArgs() { SelectedObject = null });
}
}
}
Assets/Scripts/PlayerManager.cs
+26 -32
View File
@@ -3,20 +3,20 @@ using System.Collections.Generic;
using UnityEngine;
using UnityEngine.AI;
using static GameManager;
using static UnityEditor.PlayerSettings;
public class PlayerManager : MonoBehaviour
{
private enum States { Idle, Walking, Sleeping };
[SerializeField]
public LayerMask _walkableLayer;
[SerializeField]
public NavMeshAgent _navAgent;
[SerializeField]
public Animator _animator;
[SerializeField]
private Camera _camera;
[SerializeField]
public ParticleSystem _targetDest;
public bool allowMovement = true;
private States _state;
@@ -24,43 +24,37 @@ public class PlayerManager : MonoBehaviour
public Dictionary<StatsId, Stat> PlayerStats;
public IWorkPlace WorkPlace { get; set; }
private Vector3 _pointToMove;
private bool _movePointReceived=false;
private void OnEnable()
private void Start()
{
TimeManager.OnMinuteChanged += UpdatePlayerState;
}
private void OnDisable()
{
TimeManager.OnMinuteChanged -= UpdatePlayerState;
}
// Start is called before the first frame update
void Start()
{
allowMovement = true;
_navAgent.updatePosition = false;
PlayerStats = GameManager.Instance.PlayerStats;
MouseInputManager.Instance.OnMovementTargetSelected += Mouse_OnMovementTargetSelected;
}
// Update is called once per frame
void Update()
{
if (allowMovement)
{
if (Input.GetMouseButton(0))
{
_targetDest.Stop();
if (Physics.Raycast(_camera.ScreenPointToRay(Input.mousePosition), out RaycastHit hit, 100))
{
var pos = hit.point;
pos.y += 0.2f;
_targetDest.transform.position = pos;
_navAgent.SetDestination(pos);
_targetDest.Play();
}
}
}
private void Mouse_OnMovementTargetSelected(object sender, OnMovementTargetSelectedEventArgs e)
{
_pointToMove= e.PointToMove;
_movePointReceived = true;
}
private void OnDestroy()
{
TimeManager.OnMinuteChanged -= UpdatePlayerState;
MouseInputManager.Instance.OnMovementTargetSelected -= Mouse_OnMovementTargetSelected;
}
private void Update()
{
if (allowMovement && _movePointReceived)
{
_movePointReceived = false;
_navAgent.SetDestination(_pointToMove);
}
var worldDeltaPosition = _navAgent.nextPosition - transform.position;
_groundDeltaPosition.x = Vector3.Dot(transform.right, worldDeltaPosition);
Assets/Scripts/SelectedVisual.cs
+3 -3
View File
@@ -8,15 +8,15 @@ public class SelectedVisual : MonoBehaviour
private void Start()
{
MouseSelection.Instance.OnSelectedObjectChanged += Mouse_OnSelectedObjectChanged;
MouseInputManager.Instance.OnSelectedObjectChanged += Mouse_OnSelectedObjectChanged;
}
private void OnDestroy()
{
MouseSelection.Instance.OnSelectedObjectChanged -= Mouse_OnSelectedObjectChanged;
MouseInputManager.Instance.OnSelectedObjectChanged -= Mouse_OnSelectedObjectChanged;
}
private void Mouse_OnSelectedObjectChanged(object sender, MouseSelection.OnSelectedObjectChangedEventArgs e)
private void Mouse_OnSelectedObjectChanged(object sender, OnSelectedObjectChangedEventArgs e)
{
if (e.SelectedObject == _selectedObject)
{
Assets/Scripts/WaypointVisual.cs
+25
View File
@@ -0,0 +1,25 @@
using UnityEngine;
public class WaypointVisual : MonoBehaviour
{
[SerializeField]
private ParticleSystem _particleSystem;
[SerializeField]
private Transform _wayPoint;
private void Start()
{
MouseInputManager.Instance.OnMovementTargetSelected += Mouse_OnMovementTargetSelected;
}
private void Mouse_OnMovementTargetSelected(object sender, OnMovementTargetSelectedEventArgs e)
{
_wayPoint.position = e.PointToMove;
_particleSystem.Play();
}
private void OnDestroy()
{
MouseInputManager.Instance.OnMovementTargetSelected -= Mouse_OnMovementTargetSelected;
}
}
Assets/Scripts/WaypointVisual.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: ae5ecbfd9a3637247b4cd539f9a57316
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: