post merge fixes

UOP1_Project/Assets/Prefabs/UI/Button.prefab

   m_TargetGraphic: {fileID: 6880293173517029546}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 11400000, guid: 30f6db2122a30480b996908173e1c7d7, type: 2}
+        m_MethodName: RaiseEvent
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &6063084967698345726
 GameObject:
   m_ObjectHideFlags: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Button
+  m_text: Inventory
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_EditorClassIdentifier: 
   m_StringReference:
     m_TableReference:
-      m_TableCollectionName: 
+      m_TableCollectionName: GUID:7e97a5d681d6e4480b18b504a66e69b2
-      m_KeyId: 0
+      m_KeyId: 8945393664
       m_Key: 
   m_FormatArguments: []
   m_UpdateString:

UOP1_Project/Assets/Prefabs/UI/InventoryScreen.prefab

       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8b138dd8c9fac4f9bbe1bac525c63a3c, type: 3}
+--- !u!224 &5127849719113406291 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 5149096329462859123, guid: 8b138dd8c9fac4f9bbe1bac525c63a3c,
+    type: 3}
+  m_PrefabInstance: {fileID: 26049570273333792}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &7584548206858770602 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 7574264689645128330, guid: 8b138dd8c9fac4f9bbe1bac525c63a3c,
   m_Script: {fileID: 11500000, guid: 93dbe2b925cf041d1bab6ad1cc9ef1c0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!224 &5127849719113406291 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 5149096329462859123, guid: 8b138dd8c9fac4f9bbe1bac525c63a3c,
-    type: 3}
-  m_PrefabInstance: {fileID: 26049570273333792}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1135095444294628428
 PrefabInstance:
   m_ObjectHideFlags: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 5871d3b5d4307434e9d7011de3208d9b, type: 3}
+--- !u!224 &6041243878473060154 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8641244786037450274, guid: 5871d3b5d4307434e9d7011de3208d9b,
+    type: 3}
+  m_PrefabInstance: {fileID: 2611262141660309784}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &31031661233432215 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 2617486611881742223, guid: 5871d3b5d4307434e9d7011de3208d9b,
   m_Script: {fileID: 11500000, guid: 5b02f588ec7814c3895df91b3ba439a5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!224 &6041243878473060154 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8641244786037450274, guid: 5871d3b5d4307434e9d7011de3208d9b,
-    type: 3}
-  m_PrefabInstance: {fileID: 2611262141660309784}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4927264552654137991
 PrefabInstance:
   m_ObjectHideFlags: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8b138dd8c9fac4f9bbe1bac525c63a3c, type: 3}
+--- !u!224 &221919747404738548 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 5149096329462859123, guid: 8b138dd8c9fac4f9bbe1bac525c63a3c,
+    type: 3}
+  m_PrefabInstance: {fileID: 4927264552654137991}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &3277521686480019469 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 7574264689645128330, guid: 8b138dd8c9fac4f9bbe1bac525c63a3c,
   m_Script: {fileID: 11500000, guid: 93dbe2b925cf041d1bab6ad1cc9ef1c0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!224 &221919747404738548 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 5149096329462859123, guid: 8b138dd8c9fac4f9bbe1bac525c63a3c,
-    type: 3}
-  m_PrefabInstance: {fileID: 4927264552654137991}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5787777448482401271
 PrefabInstance:
   m_ObjectHideFlags: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8b138dd8c9fac4f9bbe1bac525c63a3c, type: 3}
---- !u!224 &4288636597873103797 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 5149096329462859123, guid: 8b138dd8c9fac4f9bbe1bac525c63a3c,
-    type: 3}
-  m_PrefabInstance: {fileID: 9002994275147945670}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &1579705794856000588 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 7574264689645128330, guid: 8b138dd8c9fac4f9bbe1bac525c63a3c,
   m_Script: {fileID: 11500000, guid: 93dbe2b925cf041d1bab6ad1cc9ef1c0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!224 &4288636597873103797 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 5149096329462859123, guid: 8b138dd8c9fac4f9bbe1bac525c63a3c,
+    type: 3}
+  m_PrefabInstance: {fileID: 9002994275147945670}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &9125883717371129678
 PrefabInstance:
   m_ObjectHideFlags: 0
     m_RemovedComponents:
     - {fileID: 5074195970675175550, guid: b01383ebcda1049008a325f2ca7e6aca, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: b01383ebcda1049008a325f2ca7e6aca, type: 3}
---- !u!114 &5854709384753378033 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3451373362961513096, guid: b01383ebcda1049008a325f2ca7e6aca,
+--- !u!224 &8947289629807390876 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 184241180236232933, guid: b01383ebcda1049008a325f2ca7e6aca,
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!114 &1575787593498220194 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 7745052901829238491, guid: b01383ebcda1049008a325f2ca7e6aca,
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!224 &8947289629807390876 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 184241180236232933, guid: b01383ebcda1049008a325f2ca7e6aca,
+--- !u!114 &5854709384753378033 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3451373362961513096, guid: b01383ebcda1049008a325f2ca7e6aca,
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &9125883717816827348
 PrefabInstance:
   m_ObjectHideFlags: 0

UOP1_Project/Assets/Scenes/UI Scene.unity

       propertyPath: m_Name
       value: Button Inventory
       objectReference: {fileID: 0}
-    - target: {fileID: 3451373362961513096, guid: b01383ebcda1049008a325f2ca7e6aca,
-        type: 3}
-      propertyPath: m_StringReference.m_TableReference.m_TableCollectionName
-      value: GUID:7e97a5d681d6e4480b18b504a66e69b2
-      objectReference: {fileID: 0}
-    - target: {fileID: 3451373362961513096, guid: b01383ebcda1049008a325f2ca7e6aca,
-        type: 3}
-      propertyPath: m_StringReference.m_TableEntryReference.m_KeyId
-      value: 8945393664
-      objectReference: {fileID: 0}
-    - target: {fileID: 5795051186182416585, guid: b01383ebcda1049008a325f2ca7e6aca,
-        type: 3}
-      propertyPath: m_text
-      value: Inventory
-      objectReference: {fileID: 0}
-    - target: {fileID: 7745052901829238491, guid: b01383ebcda1049008a325f2ca7e6aca,
-        type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7745052901829238491, guid: b01383ebcda1049008a325f2ca7e6aca,
-        type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
-      objectReference: {fileID: 11400000, guid: 30f6db2122a30480b996908173e1c7d7,
-        type: 2}
-    - target: {fileID: 7745052901829238491, guid: b01383ebcda1049008a325f2ca7e6aca,
-        type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
-      value: Raise
-      objectReference: {fileID: 0}
-    - target: {fileID: 7745052901829238491, guid: b01383ebcda1049008a325f2ca7e6aca,
-        type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
-      value: UnityEngine.Object, UnityEngine
-      objectReference: {fileID: 0}
-    - target: {fileID: 7745052901829238491, guid: b01383ebcda1049008a325f2ca7e6aca,
-        type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7745052901829238491, guid: b01383ebcda1049008a325f2ca7e6aca,
-        type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
-      value: 2
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: b01383ebcda1049008a325f2ca7e6aca, type: 3}
 --- !u!224 &828170414 stripped
   m_Modification:
     m_TransformParent: {fileID: 1869732381}
     m_Modifications:
+    - target: {fileID: 1711649698, guid: 42ed5ae1f90714c4488cfabda2298591, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -19.999939
+      objectReference: {fileID: 0}
+    - target: {fileID: 1575787593219355029, guid: 42ed5ae1f90714c4488cfabda2298591,
+        type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: RaiseEvent
+      objectReference: {fileID: 0}
     - target: {fileID: 9125883718042355530, guid: 42ed5ae1f90714c4488cfabda2298591,
         type: 3}
       propertyPath: m_LocalPosition.x

UOP1_Project/Assets/ScriptableObjects/Events/UI/CloseDialogueEvent.asset

   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 04ea2f19feb15654cb31bb60f7f50855, type: 3}
+  m_Script: {fileID: 11500000, guid: 7fafac715ff920c4383fed91a38a351e, type: 3}
   m_Name: CloseDialogueEvent
   m_EditorClassIdentifier: 

UOP1_Project/Assets/ScriptableObjects/Events/UI/CloseInventoryEvent.asset

   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 04ea2f19feb15654cb31bb60f7f50855, type: 3}
+  m_Script: {fileID: 11500000, guid: 7fafac715ff920c4383fed91a38a351e, type: 3}
   m_Name: CloseInventoryEvent
   m_EditorClassIdentifier: 

UOP1_Project/Assets/ScriptableObjects/Events/UI/InventoryActionButton.asset

   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 04ea2f19feb15654cb31bb60f7f50855, type: 3}
+  m_Script: {fileID: 11500000, guid: 7fafac715ff920c4383fed91a38a351e, type: 3}
   m_Name: InventoryActionButton
   m_EditorClassIdentifier: 

UOP1_Project/Assets/ScriptableObjects/Events/UI/OpenInventoryEvent.asset

   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 04ea2f19feb15654cb31bb60f7f50855, type: 3}
+  m_Script: {fileID: 11500000, guid: 7fafac715ff920c4383fed91a38a351e, type: 3}
   m_Name: OpenInventoryEvent
   m_EditorClassIdentifier: 

UOP1_Project/Assets/Scripts/Inventory/InventoryFiller.cs

 
 	public ItemEvent SelectItemEvent;
 
-	public VoidGameEvent ActionButtonClicked;
+	public VoidEventChannelSO ActionButtonClicked;
 
 	private void OnEnable()
 	{
-			ActionButtonClicked.eventRaised += ActionButtonEventRaised;
+			ActionButtonClicked.OnEventRaised += ActionButtonEventRaised;
 		}
 		if (ChangeTabEvent != null)
 		{
 	{
 		if (ActionButtonClicked != null)
 		{
-			ActionButtonClicked.eventRaised -= ActionButtonEventRaised;
+			ActionButtonClicked.OnEventRaised -= ActionButtonEventRaised;
 		}
 		if (ChangeTabEvent != null)
 		{

UOP1_Project/Assets/Scripts/UI/UIManager.cs

 {
 
 	public DialogueLineEvent OpenUIDialogueEvent;
-	public VoidGameEvent CloseUIDialogueEvent;
+	public VoidEventChannelSO CloseUIDialogueEvent;
-	public VoidGameEvent OpenInventoryScreenEvent;
-	public VoidGameEvent CloseInventoryScreenEvent;
+	public VoidEventChannelSO OpenInventoryScreenEvent;
+	public VoidEventChannelSO CloseInventoryScreenEvent;
 
 	private void OnEnable()
 	{
 		}
 		if (CloseUIDialogueEvent != null)
 		{
-			CloseUIDialogueEvent.eventRaised += CloseUIDialogue;
+			CloseUIDialogueEvent.OnEventRaised += CloseUIDialogue;
-			OpenInventoryScreenEvent.eventRaised += OpenInventoryScreen;
+			OpenInventoryScreenEvent.OnEventRaised += OpenInventoryScreen;
-			CloseInventoryScreenEvent.eventRaised += CloseInventoryScreen;
+			CloseInventoryScreenEvent.OnEventRaised += CloseInventoryScreen;
 		}
 	}
 

UOP1_Project/Assets/Scenes/Examples/Cutscenes.unity.meta

+fileFormatVersion: 2
+guid: 537770164bc31f14bba81d9c6ecc8bfe
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UOP1_Project/Assets/ScriptableObjects/Events.meta

+fileFormatVersion: 2
+guid: 58c5280ba04164e4e867544e2a10f4a3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UOP1_Project/Assets/Inventory/Scripts.meta

-fileFormatVersion: 2
-guid: ae042d26dee93eb4ea906e8b3335ca9d
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: