Added EventController

Assets/Scripts/Events/EventController.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EventController : MonoBehaviour
+{
+    public Action baseEvent;
+
+    public void AddListener(Action Listener) => baseEvent += Listener;
+
+    public void RemoveListener(Action Listener) => baseEvent -= Listener;
+
+    public void InvokeEvent() => baseEvent?.Invoke();
+
+    // Start is called before the first frame update
+    void Start()
+    {
+
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+
+    }
+}

Assets/Scripts/Interactables/LightSwitchView.cs

@@ -7,15 +7,15 @@ public class LightSwitchView : MonoBehaviour, IInteractable
 {
     [SerializeField] private List<Light> lightsources = new List<Light>();
     private SwitchState currentState;
-    public static event Action OnLightSwitchToggled;
+    public static event Action lightToggledAction;
 
-    private void OnEnable() => OnLightSwitchToggled += onLightSwitch;
+    private void OnEnable() => EventService.Instance.lightToggledAction.AddListener(onLightSwitch);
 
-    private void OnDisable() => OnLightSwitchToggled -= onLightSwitch;
+    private void OnDisable() => EventService.Instance.lightToggledAction.RemoveListener(onLightSwitch);
 
     private void Start() => currentState = SwitchState.Off;
 
-    public void Interact() => OnLightSwitchToggled?.Invoke();
+    public void Interact() => EventService.Instance.lightToggledAction.InvokeEvent();
 
     private void toggleLights()
     {

Assets/Scripts/Player/PlayerController.cs

@@ -25,14 +25,15 @@ public PlayerController(PlayerView playerView, PlayerScriptableObject playerScri
 
         this.playerScriptableObject = playerScriptableObject;
         this.playerScriptableObject.KeysEquipped = 0;
-        LightSwitchView.OnLightSwitchToggled += onLightSwitch;
+
         playerState = PlayerState.InDark;
+        EventService.Instance.lightToggledAction.AddListener(LightSwitchToggled); 
     }
 
-    ~PlayerController()
-    {
-        LightSwitchView.OnLightSwitchToggled -= onLightSwitch;
+    ~PlayerController() {
+        EventService.Instance.lightToggledAction.RemoveListener(LightSwitchToggled);
     }
+
     public void Interact() => IsInteracted = Input.GetKeyDown(KeyCode.E) ? true : (Input.GetKeyUp(KeyCode.E) ? false : IsInteracted);
 
     public void Jump(Rigidbody playerRigidbody, Transform transform)
@@ -77,12 +78,15 @@ private void calculatePositionRotation(Rigidbody playerRigidbody, Transform tran
         rotation = playerRigidbody.rotation * Quaternion.Euler(lookRotation);
         position = (transform.position) + (velocity * movement) * Time.fixedDeltaTime;
     }
-
-    private void onLightSwitch()
+    private void LightSwitchToggled()
     {
         if (PlayerState == PlayerState.InDark)
+        {
             PlayerState = PlayerState.None;
+        }
         else
+        {
             PlayerState = PlayerState.InDark;
+        }
     }
 }

Assets/Scripts/Service/EventService.cs

@@ -0,0 +1,37 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EventService
+{
+    private static EventService instance;
+    public static EventService Instance
+    {
+        get
+        {
+            if(instance == null)
+            {
+                instance = new EventService();
+            }
+            return instance;
+        }
+    }
+
+    public EventController lightToggledAction {  get; private set; }
+
+    public EventService()
+    {
+        lightToggledAction = new EventController();
+    }
+    // Start is called before the first frame update
+    void Start()
+    {
+
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+
+    }
+}