In Game Input Screen

Implemented saving/loading of custom input settings
Incorporated Input Screen in game
Organized UI scripts into folders
Deleted some unused UI scripts
Reimplemented Fog Blur (by copying modified DoF to assets)

AK.Wwise.Unity.API.Editor.csproj

@@ -310,6 +310,9 @@
  <Reference Include="Remotion.Linq">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
  </Reference>
+ <Reference Include="Substance.Editor">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
+ </Reference>
  <Reference Include="System.Memory">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
  </Reference>
@@ -340,9 +343,6 @@
  <Reference Include="System.Runtime.CompilerServices.Unsafe">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
  </Reference>
- <Reference Include="Substance.Editor">
- <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
- </Reference>
  <Reference Include="nunit.framework">
  <HintPath>E:/Projects/Aetheria-Economy/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll</HintPath>
  </Reference>

AK.Wwise.Unity.API.WwiseTypes.csproj

@@ -308,6 +308,9 @@
  <Reference Include="Remotion.Linq">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
  </Reference>
+ <Reference Include="Substance.Editor">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
+ </Reference>
  <Reference Include="System.Memory">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
  </Reference>
@@ -338,9 +341,6 @@
  <Reference Include="System.Runtime.CompilerServices.Unsafe">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
  </Reference>
- <Reference Include="Substance.Editor">
- <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
- </Reference>
  <Reference Include="mscorlib">
  <HintPath>E:/Applications/Unity Editors/2020.3.2f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
  </Reference>

AK.Wwise.Unity.API.csproj

@@ -159,8 +159,8 @@
      <Compile Include="Assets\Wwise\API\Runtime\Generated\Common\AkBusHierarchyFlags.cs" />
      <Compile Include="Assets\Wwise\API\Runtime\Handwritten\Common\Arrays\AkObjectInfoArray.cs" />
      <Compile Include="Assets\Wwise\API\Runtime\Generated\Common\AkImageSourceParams.cs" />
-     <Compile Include="Assets\Wwise\API\Runtime\Generated\Common\AkMIDIEventTypes.cs" />
      <Compile Include="Assets\Wwise\API\Runtime\Generated\Common\AkRamp.cs" />
+     <Compile Include="Assets\Wwise\API\Runtime\Generated\Common\AkMIDIEventTypes.cs" />
      <Compile Include="Assets\Wwise\API\Runtime\Generated\Common\AkActionOnEventType.cs" />
      <Compile Include="Assets\Wwise\API\Runtime\Generated\Common\AkExtent.cs" />
      <Compile Include="Assets\Wwise\API\Runtime\Generated\Mac\AkSoundEnginePINVOKE_Mac.cs" />
@@ -416,6 +416,9 @@
  <Reference Include="Remotion.Linq">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
  </Reference>
+ <Reference Include="Substance.Editor">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
+ </Reference>
  <Reference Include="System.Memory">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
  </Reference>
@@ -446,9 +449,6 @@
  <Reference Include="System.Runtime.CompilerServices.Unsafe">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
  </Reference>
- <Reference Include="Substance.Editor">
- <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
- </Reference>
  <Reference Include="mscorlib">
  <HintPath>E:/Applications/Unity Editors/2020.3.2f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
  </Reference>

AK.Wwise.Unity.MonoBehaviour.Editor.csproj

@@ -309,6 +309,9 @@
  <Reference Include="Remotion.Linq">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
  </Reference>
+ <Reference Include="Substance.Editor">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
+ </Reference>
  <Reference Include="System.Memory">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
  </Reference>
@@ -339,9 +342,6 @@
  <Reference Include="System.Runtime.CompilerServices.Unsafe">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
  </Reference>
- <Reference Include="Substance.Editor">
- <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
- </Reference>
  <Reference Include="nunit.framework">
  <HintPath>E:/Projects/Aetheria-Economy/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll</HintPath>
  </Reference>

AK.Wwise.Unity.MonoBehaviour.csproj

@@ -330,6 +330,9 @@
  <Reference Include="Remotion.Linq">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
  </Reference>
+ <Reference Include="Substance.Editor">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
+ </Reference>
  <Reference Include="System.Memory">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
  </Reference>
@@ -360,9 +363,6 @@
  <Reference Include="System.Runtime.CompilerServices.Unsafe">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
  </Reference>
- <Reference Include="Substance.Editor">
- <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
- </Reference>
  <Reference Include="mscorlib">
  <HintPath>E:/Applications/Unity Editors/2020.3.2f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
  </Reference>

AK.Wwise.Unity.Timeline.Editor.csproj

@@ -287,6 +287,9 @@
  <Reference Include="Remotion.Linq">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
  </Reference>
+ <Reference Include="Substance.Editor">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
+ </Reference>
  <Reference Include="System.Memory">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
  </Reference>
@@ -317,9 +320,6 @@
  <Reference Include="System.Runtime.CompilerServices.Unsafe">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
  </Reference>
- <Reference Include="Substance.Editor">
- <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
- </Reference>
  <Reference Include="nunit.framework">
  <HintPath>E:/Projects/Aetheria-Economy/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll</HintPath>
  </Reference>

AK.Wwise.Unity.Timeline.csproj

@@ -293,6 +293,9 @@
  <Reference Include="Remotion.Linq">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
  </Reference>
+ <Reference Include="Substance.Editor">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
+ </Reference>
  <Reference Include="System.Memory">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
  </Reference>
@@ -323,9 +326,6 @@
  <Reference Include="System.Runtime.CompilerServices.Unsafe">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
  </Reference>
- <Reference Include="Substance.Editor">
- <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
- </Reference>
  <Reference Include="mscorlib">
  <HintPath>E:/Applications/Unity Editors/2020.3.2f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
  </Reference>

Aetheria.Shared.Unity.csproj

@@ -136,8 +136,8 @@
      <Compile Include="Assets\Scripts\ServerShared\Attributes.cs" />
      <Compile Include="Assets\Scripts\ServerShared\NIH\LiteNetLib\NetStatistics.cs" />
      <Compile Include="Assets\Scripts\ServerShared\Agents\Tasks\PatrolOrbits.cs" />
-     <Compile Include="Assets\Scripts\ServerShared\NIH\LinqFaster\AnyAll.cs" />
      <Compile Include="Assets\Scripts\ServerShared\NIH\LiteNetLib\Utils\NetSerializer.cs" />
+     <Compile Include="Assets\Scripts\ServerShared\NIH\LinqFaster\AnyAll.cs" />
      <Compile Include="Assets\Scripts\ServerShared\NIH\MIConvexHull\ConvexHull\Collections.cs" />
      <Compile Include="Assets\Scripts\ServerShared\NIH\LinqFaster\Count.cs" />
      <Compile Include="Assets\Scripts\ServerShared\NIH\LinqFaster\Utils\ComparerMagic.cs" />
@@ -195,9 +195,9 @@
      <Compile Include="Assets\Scripts\ServerShared\CultCache\Serialization\JsonKnownTypes\Utils\Mapper.cs" />
      <Compile Include="Assets\Scripts\ServerShared\NIH\MIConvexHull\ConvexHull\ObjectManager.cs" />
      <Compile Include="Assets\Scripts\ServerShared\CultCache\Serialization\JsonKnownTypes\JsonKnownThisTypeAttribute.cs" />
-     <Compile Include="Assets\Scripts\ServerShared\Behaviors\Thermotoggle.cs" />
      <Compile Include="Assets\Scripts\ServerShared\MarkovNameGenerator.cs" />
      <Compile Include="Assets\Scripts\ServerShared\NIH\LinqFaster\Where.cs" />
+     <Compile Include="Assets\Scripts\ServerShared\Behaviors\Thermotoggle.cs" />
      <Compile Include="Assets\Scripts\ServerShared\NIH\LinqFaster\Min.cs" />
      <Compile Include="Assets\Scripts\ServerShared\CultCache\CollectionExtensions.cs" />
      <Compile Include="Assets\Scripts\ServerShared\Behaviors\ParticleEffect.cs" />
@@ -263,6 +263,9 @@
  <Reference Include="Remotion.Linq">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
  </Reference>
+ <Reference Include="Substance.Editor">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
+ </Reference>
  <Reference Include="System.Memory">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
  </Reference>
@@ -293,9 +296,6 @@
  <Reference Include="System.Runtime.CompilerServices.Unsafe">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
  </Reference>
- <Reference Include="Substance.Editor">
- <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
- </Reference>
  <Reference Include="mscorlib">
  <HintPath>E:/Applications/Unity Editors/2020.3.2f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
  </Reference>

Ak.Wwise.Api.WAAPI.csproj

@@ -289,6 +289,9 @@
  <Reference Include="Remotion.Linq">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/Remotion.Linq.dll</HintPath>
  </Reference>
+ <Reference Include="Substance.Editor">
+ <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
+ </Reference>
  <Reference Include="System.Memory">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Memory.dll</HintPath>
  </Reference>
@@ -319,9 +322,6 @@
  <Reference Include="System.Runtime.CompilerServices.Unsafe">
  <HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
  </Reference>
- <Reference Include="Substance.Editor">
- <HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll</HintPath>
- </Reference>
  <Reference Include="mscorlib">
  <HintPath>E:/Applications/Unity Editors/2020.3.2f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
  </Reference>

Assets/Materials/UI/Map Gravity Lines.mat

@@ -86,7 +86,7 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
-    - _Scale: 6.772527
+    - _Scale: 0.5
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1

Assets/Prefabs/UI/Input Display Container.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4f89435094b12e6498421b939dbf3982
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/ARPG.unity

@@ -2136,7 +2136,7 @@ RectTransform:
   - {fileID: 1868140981}
   - {fileID: 1080776604}
   m_Father: {fileID: 761574181}
-  m_RootOrder: 7
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -5038,7 +5038,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 761574181}
-  m_RootOrder: 10
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
@@ -7236,7 +7236,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 761574181}
-  m_RootOrder: 8
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -9359,7 +9359,7 @@ RectTransform:
   - {fileID: 738229276}
   - {fileID: 947321578}
   m_Father: {fileID: 761574181}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -9410,7 +9410,6 @@ MonoBehaviour:
   WeaponGroupAssignment: {fileID: 0}
   Content: {fileID: 620555923}
   DragParent: {fileID: 0}
-  SelectedChild: {fileID: 0}
   GameManager: {fileID: 0}
   CancelClickCatcher: {fileID: 1420548305}
   ButtonGroup: {fileID: 947321577}
@@ -11661,8 +11660,6 @@ GameObject:
   - component: {fileID: 761574180}
   - component: {fileID: 761574179}
   - component: {fileID: 761574178}
-  - component: {fileID: 761574183}
-  - component: {fileID: 761574182}
   m_Layer: 5
   m_Name: Canvas
   m_TagString: Untagged
@@ -11746,13 +11743,13 @@ RectTransform:
   - {fileID: 411347519}
   - {fileID: 346000247}
   - {fileID: 1726632265}
+  - {fileID: 393961848}
   - {fileID: 1420548308}
   - {fileID: 620555923}
   - {fileID: 1157981992}
   - {fileID: 178733680}
   - {fileID: 472507698}
   - {fileID: 1723136546}
-  - {fileID: 393961848}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -11761,59 +11758,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
---- !u!114 &761574182
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 761574177}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MoveRepeatDelay: 0.5
-  m_MoveRepeatRate: 0.1
-  m_ActionsAsset: {fileID: -944628639613478452, guid: aefbf90246423cf408d3520635b878eb,
-    type: 3}
-  m_PointAction: {fileID: -2666785218623681154, guid: aefbf90246423cf408d3520635b878eb,
-    type: 3}
-  m_MoveAction: {fileID: -571377341132145845, guid: aefbf90246423cf408d3520635b878eb,
-    type: 3}
-  m_SubmitAction: {fileID: 6020759625124486942, guid: aefbf90246423cf408d3520635b878eb,
-    type: 3}
-  m_CancelAction: {fileID: -3007086672108469427, guid: aefbf90246423cf408d3520635b878eb,
-    type: 3}
-  m_LeftClickAction: {fileID: -8438243394997324320, guid: aefbf90246423cf408d3520635b878eb,
-    type: 3}
-  m_MiddleClickAction: {fileID: -5972739252077987374, guid: aefbf90246423cf408d3520635b878eb,
-    type: 3}
-  m_RightClickAction: {fileID: 7905374199509969056, guid: aefbf90246423cf408d3520635b878eb,
-    type: 3}
-  m_ScrollWheelAction: {fileID: 8879611588596475417, guid: aefbf90246423cf408d3520635b878eb,
-    type: 3}
-  m_TrackedDevicePositionAction: {fileID: 8860902725583761198, guid: aefbf90246423cf408d3520635b878eb,
-    type: 3}
-  m_TrackedDeviceOrientationAction: {fileID: 7496690464979690870, guid: aefbf90246423cf408d3520635b878eb,
-    type: 3}
-  m_DeselectOnBackgroundClick: 1
-  m_PointerBehavior: 1
---- !u!114 &761574183
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 761574177}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_FirstSelected: {fileID: 0}
-  m_sendNavigationEvents: 1
-  m_DragThreshold: 10
 --- !u!1 &776416423
 GameObject:
   m_ObjectHideFlags: 0
@@ -15006,6 +14950,91 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 11}
   m_Pivot: {x: 0.5, y: 1}
+--- !u!1 &990038539
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 990038542}
+  - component: {fileID: 990038541}
+  - component: {fileID: 990038540}
+  m_Layer: 0
+  m_Name: EventSystem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &990038540
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 990038539}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MoveRepeatDelay: 0.5
+  m_MoveRepeatRate: 0.1
+  m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018,
+    type: 3}
+  m_PointAction: {fileID: 1054132383583890850, guid: ca9f5fa95ffab41fb9a615ab714db018,
+    type: 3}
+  m_MoveAction: {fileID: 3710738434707379630, guid: ca9f5fa95ffab41fb9a615ab714db018,
+    type: 3}
+  m_SubmitAction: {fileID: 2064916234097673511, guid: ca9f5fa95ffab41fb9a615ab714db018,
+    type: 3}
+  m_CancelAction: {fileID: -1967631576421560919, guid: ca9f5fa95ffab41fb9a615ab714db018,
+    type: 3}
+  m_LeftClickAction: {fileID: 8056856818456041789, guid: ca9f5fa95ffab41fb9a615ab714db018,
+    type: 3}
+  m_MiddleClickAction: {fileID: 3279352641294131588, guid: ca9f5fa95ffab41fb9a615ab714db018,
+    type: 3}
+  m_RightClickAction: {fileID: 3837173908680883260, guid: ca9f5fa95ffab41fb9a615ab714db018,
+    type: 3}
+  m_ScrollWheelAction: {fileID: 4502412055082496612, guid: ca9f5fa95ffab41fb9a615ab714db018,
+    type: 3}
+  m_TrackedDevicePositionAction: {fileID: 4754684134866288074, guid: ca9f5fa95ffab41fb9a615ab714db018,
+    type: 3}
+  m_TrackedDeviceOrientationAction: {fileID: 1025543830046995696, guid: ca9f5fa95ffab41fb9a615ab714db018,
+    type: 3}
+  m_DeselectOnBackgroundClick: 1
+  m_PointerBehavior: 0
+--- !u!114 &990038541
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 990038539}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_FirstSelected: {fileID: 0}
+  m_sendNavigationEvents: 1
+  m_DragThreshold: 10
+--- !u!4 &990038542
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 990038539}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 11
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &999927010
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -15463,7 +15492,6 @@ GameObject:
   - component: {fileID: 1009503730}
   - component: {fileID: 1009503729}
   - component: {fileID: 1009503731}
-  - component: {fileID: 1009503733}
   - component: {fileID: 1009503735}
   - component: {fileID: 1009503736}
   m_Layer: 0
@@ -15498,6 +15526,9 @@ MonoBehaviour:
   HypothermiaPP: {fileID: 1800086610}
   SevereHeatstrokePP: {fileID: 837424435}
   SevereHypothermiaPP: {fileID: 694183021}
+  UiRoot: {fileID: 761574177}
+  HelpScreen: {fileID: 1210651002}
+  InputDisplayLayout: {fileID: 1088218870}
   ActionBar: {fileID: 393961848}
   ActionBarSlot: {fileID: 8334150340270499366, guid: bfce34a0acbaa454e97a700e1875357e,
     type: 3}
@@ -15678,93 +15709,6 @@ MonoBehaviour:
   Sun: {fileID: 2259714927540639794, guid: 046dde0f4600bce41ad33c476f99b309, type: 3}
   PlanetoidIcon: {fileID: 2800000, guid: 823d8a1c4e071994087624c39f62b319, type: 3}
   PlanetIcon: {fileID: 2800000, guid: 0d2acbd593b7fd349b0b26b4844733ef, type: 3}
---- !u!114 &1009503733
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1009503727}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Actions: {fileID: -944628639613478452, guid: aefbf90246423cf408d3520635b878eb,
-    type: 3}
-  m_NotificationBehavior: 3
-  m_UIInputModule: {fileID: 761574182}
-  m_DeviceLostEvent:
-    m_PersistentCalls:
-      m_Calls: []
-  m_DeviceRegainedEvent:
-    m_PersistentCalls:
-      m_Calls: []
-  m_ControlsChangedEvent:
-    m_PersistentCalls:
-      m_Calls: []
-  m_ActionEvents:
-  - m_PersistentCalls:
-      m_Calls: []
-    m_ActionId: 197ba05c-054a-44fc-8328-0d37e8ac00db
-    m_ActionName: Player/Move[/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow]
-  - m_PersistentCalls:
-      m_Calls: []
-    m_ActionId: 323b9ea0-f916-4609-b697-322fc0ef9420
-    m_ActionName: Player/Look[/Mouse/delta]
-  - m_PersistentCalls:
-      m_Calls: []
-    m_ActionId: 575943b0-4866-4be0-a289-3253973523b1
-    m_ActionName: Player/Fire[/Mouse/leftButton]
-  - m_PersistentCalls:
-      m_Calls: []
-    m_ActionId: 5708685d-78bd-4d2b-8796-712704f21bfb
-    m_ActionName: Player/Minimap Zoom[/Keyboard/m]
-  - m_PersistentCalls:
-      m_Calls: []
-    m_ActionId: add1d35f-58cd-4789-8868-f0afb51d87bc
-    m_ActionName: UI/Navigate[/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow]
-  - m_PersistentCalls:
-      m_Calls: []
-    m_ActionId: 766f9151-3f3d-4e12-8ade-ce5aacd3940f
-    m_ActionName: UI/Submit[/Keyboard/enter]
-  - m_PersistentCalls:
-      m_Calls: []
-    m_ActionId: 9dc56d99-ed81-42c3-b38d-1a7e76688b34
-    m_ActionName: UI/Cancel[/Keyboard/escape]
-  - m_PersistentCalls:
-      m_Calls: []
-    m_ActionId: dfeef3e2-b0cc-4a9c-97ea-48ab693ac37f
-    m_ActionName: UI/Point[/Mouse/position]
-  - m_PersistentCalls:
-      m_Calls: []
-    m_ActionId: aae7decd-7584-44f4-87ad-09c14c406ead
-    m_ActionName: UI/Click[/Mouse/leftButton]
-  - m_PersistentCalls:
-      m_Calls: []
-    m_ActionId: 25891af2-479b-4104-9a29-158aee22fa73
-    m_ActionName: UI/ScrollWheel[/Mouse/scroll]
-  - m_PersistentCalls:
-      m_Calls: []
-    m_ActionId: dc9af334-4f90-46dc-9b77-f381faa04a79
-    m_ActionName: UI/MiddleClick[/Mouse/middleButton]
-  - m_PersistentCalls:
-      m_Calls: []
-    m_ActionId: 27901940-469e-42cd-92b3-f5f787a8d1d6
-    m_ActionName: UI/RightClick[/Mouse/rightButton]
-  - m_PersistentCalls:
-      m_Calls: []
-    m_ActionId: b297afa0-f417-4a48-aaa1-36a6efd36190
-    m_ActionName: UI/TrackedDevicePosition
-  - m_PersistentCalls:
-      m_Calls: []
-    m_ActionId: 1a877e6d-221e-4815-a289-aa93412c8d87
-    m_ActionName: UI/TrackedDeviceOrientation
-  m_NeverAutoSwitchControlSchemes: 0
-  m_DefaultControlScheme: Keyboard&Mouse
-  m_DefaultActionMap: Player
-  m_SplitScreenIndex: -1
-  m_Camera: {fileID: 2115559089}
 --- !u!114 &1009503735
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -16847,6 +16791,313 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1080776603}
   m_CullTransparentMesh: 0
+--- !u!1001 &1088218868
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1210651008}
+    m_Modifications:
+    - target: {fileID: 3575543199475698843, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_Name
+      value: Input Display Container
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199475698844, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199475698844, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199475698844, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199475698844, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199475698844, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199475698844, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199475698844, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199475698844, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199475698844, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199475698844, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199475698844, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199475698844, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199475698844, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199475698844, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199475698844, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199475698844, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199475698844, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199475698844, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199475698844, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199475698844, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199475698844, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199809032539, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199809032539, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199809032539, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 80
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199809032539, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 80
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199809032539, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 40
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199809032539, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -119.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199949252307, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199949252307, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543199949252307, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 80
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543200370154277, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543200370154277, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543200370154277, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 80
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543200370154277, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 80
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543200370154277, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 40
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543200370154277, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -40
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543200538069944, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543200538069944, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543200538069944, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 148.51
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543200538069944, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 15.699997
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543200538069944, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 74.255
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543200538069944, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -7.8499985
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543200860056044, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543200860056044, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543200860056044, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -159.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543200978094812, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543200978094812, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543200978094812, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 148.51
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543200978094812, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 79.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543200978094812, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 74.255
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543200978094812, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -39.85
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543201062286834, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 148.51
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543201062286834, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 159.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543201132091707, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 58.19
+      objectReference: {fileID: 0}
+    - target: {fileID: 3575543201132091707, guid: 4f89435094b12e6498421b939dbf3982,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 31.79
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 4f89435094b12e6498421b939dbf3982, type: 3}
+--- !u!224 &1088218869 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3575543199475698844, guid: 4f89435094b12e6498421b939dbf3982,
+    type: 3}
+  m_PrefabInstance: {fileID: 1088218868}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1088218870 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3575543199475698845, guid: 4f89435094b12e6498421b939dbf3982,
+    type: 3}
+  m_PrefabInstance: {fileID: 1088218868}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5ac50145a005ca340837d054dc1d03f3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1094975723
 GameObject:
   m_ObjectHideFlags: 0
@@ -17567,7 +17818,7 @@ RectTransform:
   - {fileID: 1505831357}
   - {fileID: 1741914910}
   m_Father: {fileID: 761574181}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -18239,6 +18490,106 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1187424823}
   m_CullTransparentMesh: 0
+--- !u!1 &1210651002
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1210651008}
+  - component: {fileID: 1210651007}
+  - component: {fileID: 1210651006}
+  - component: {fileID: 1210651005}
+  m_Layer: 5
+  m_Name: Help Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!114 &1210651005
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1210651002}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &1210651006
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1210651002}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 1
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 1920, y: 1080}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 0
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!223 &1210651007
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1210651002}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 2115559089}
+  m_PlaneDistance: 25.48
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 25
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!224 &1210651008
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1210651002}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_Children:
+  - {fileID: 1088218869}
+  m_Father: {fileID: 0}
+  m_RootOrder: 10
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
 --- !u!1 &1214607511
 GameObject:
   m_ObjectHideFlags: 0
@@ -20912,7 +21263,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 761574181}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -25650,7 +26001,7 @@ RectTransform:
   m_Children:
   - {fileID: 460484049}
   m_Father: {fileID: 761574181}
-  m_RootOrder: 9
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 1}
@@ -29431,6 +29782,7 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_renderer: {fileID: 2092739553}
   m_maskType: 0
+  _SortingLayer: 0
   _SortingLayerID: 0
   _SortingOrder: 0
 --- !u!23 &2092739553
@@ -29797,7 +30149,7 @@ Camera:
   serializedVersion: 2
   m_ClearFlags: 2
   m_BackGroundColor: {r: 0.16037738, g: 0.16037738, b: 0.16037738, a: 1}
-  m_projectionMatrixMode: 0
+  m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0
   m_SensorSize: {x: 36, y: 24}
@@ -29861,7 +30213,7 @@ MonoBehaviour:
     m_Bits: 256
   stopNaNPropagation: 1
   finalBlitToCameraTarget: 0
-  antialiasingMode: 0
+  antialiasingMode: 3
   temporalAntialiasing:
     jitterSpread: 1
     sharpness: 0
@@ -29901,7 +30253,9 @@ MonoBehaviour:
   m_ShowCustomSorter: 0
   breakBeforeColorGrading: 0
   m_BeforeTransparentBundles: []
-  m_BeforeStackBundles: []
+  m_BeforeStackBundles:
+  - assemblyQualifiedName: UnityEngine.Rendering.PostProcessing.DepthOfField, Assembly-CSharp,
+      Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
   m_AfterStackBundles: []
 --- !u!114 &2115559092
 MonoBehaviour:
@@ -30018,10 +30372,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 899f97884c6d96b4ca20648ec109a37f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  pattern: 12
+  pattern: 9
   patternScale: 1
-  activeSample: {x: -0.46875, y: 0.0925926, z: 0.4375, w: -0.24074075}
-  activeIndex: 15
+  activeSample: {x: -0.0309703, y: -0.24158497, z: -0.1195988, w: -0.14001325}
+  activeIndex: 9
 --- !u!114 &2115559098
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -30036,7 +30390,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   ditherTex: {fileID: 2800000, guid: 859f329ee8606864ea19dbf373a5ec56, type: 3}
   reprojectionShader: {fileID: 4800000, guid: 7ca93c1a56ee0154b8c714591d6d211a, type: 3}
-  colorspace: 0
+  colorspace: 1
   useHigherOrderFilteringMainColor: 1
   useHigherOrderFilteringHistory: 1
   historyRectification: 0
@@ -30044,8 +30398,8 @@ MonoBehaviour:
   useAABBRounding: 1
   dilation: 2
   useMotionBlur: 0
-  feedbackMin: 0.615
-  feedbackMax: 0.99
+  feedbackMin: 0.99
+  feedbackMax: 0.999
   motionBlurStrength: 1
   motionBlurIgnoreFF: 0
 --- !u!1 &2117796865
@@ -35247,7 +35601,6 @@ MonoBehaviour:
   WeaponGroupAssignment: {fileID: 0}
   Content: {fileID: 3255828831356619720}
   DragParent: {fileID: 0}
-  SelectedChild: {fileID: 0}
   GameManager: {fileID: 0}
 --- !u!114 &5496444666756201237
 MonoBehaviour:

Assets/Scenes/Main Menu.unity

@@ -802,8 +802,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 741153267}
-  m_LocalRotation: {x: 0.015506913, y: 0.9502416, z: -0.30741316, w: 0.047933254}
-  m_LocalPosition: {x: -117.52001, y: -77.08742, z: 149.09026}
+  m_LocalRotation: {x: 0.015506897, y: 0.9502416, z: -0.30741316, w: 0.047933206}
+  m_LocalPosition: {x: -117.52, y: -77.08742, z: 149.09026}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 412917866}
@@ -1304,8 +1304,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 965376321}
-  m_LocalRotation: {x: 0.015506913, y: 0.9502416, z: -0.30741316, w: 0.047933254}
-  m_LocalPosition: {x: -117.52001, y: -77.08742, z: 149.09026}
+  m_LocalRotation: {x: 0.015506897, y: 0.9502416, z: -0.30741316, w: 0.047933206}
+  m_LocalPosition: {x: -117.52, y: -77.08742, z: 149.09026}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
@@ -1453,8 +1453,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   pattern: 12
   patternScale: 1
-  activeSample: {x: 0.125, y: 0.2777778, z: -0.375, w: -0.055555552}
-  activeIndex: 4
+  activeSample: {x: -0.25, y: 0.16666669, z: 0, w: -0.16666666}
+  activeIndex: 1
 --- !u!114 &965376331
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2451,7 +2451,7 @@ PrefabInstance:
     - target: {fileID: 3664209305474245377, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 60.98
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3664209305474245377, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
         type: 3}
@@ -2476,7 +2476,7 @@ PrefabInstance:
     - target: {fileID: 3664209306888449100, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 55.675
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3664209306888449100, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
         type: 3}

Assets/Scenes/MusicTest.unity

@@ -1,605 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!29 &1
-OcclusionCullingSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_OcclusionBakeSettings:
-    smallestOccluder: 5
-    smallestHole: 0.25
-    backfaceThreshold: 100
-  m_SceneGUID: 00000000000000000000000000000000
-  m_OcclusionCullingData: {fileID: 0}
---- !u!104 &2
-RenderSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 9
-  m_Fog: 0
-  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
-  m_FogMode: 3
-  m_FogDensity: 0.01
-  m_LinearFogStart: 0
-  m_LinearFogEnd: 300
-  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
-  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
-  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
-  m_AmbientIntensity: 1
-  m_AmbientMode: 0
-  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
-  m_SkyboxMaterial: {fileID: 0}
-  m_HaloStrength: 0.5
-  m_FlareStrength: 1
-  m_FlareFadeSpeed: 3
-  m_HaloTexture: {fileID: 0}
-  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
-  m_DefaultReflectionMode: 0
-  m_DefaultReflectionResolution: 128
-  m_ReflectionBounces: 1
-  m_ReflectionIntensity: 1
-  m_CustomReflection: {fileID: 0}
-  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
-  m_UseRadianceAmbientProbe: 0
---- !u!157 &3
-LightmapSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 12
-  m_GIWorkflowMode: 1
-  m_GISettings:
-    serializedVersion: 2
-    m_BounceScale: 1
-    m_IndirectOutputScale: 1
-    m_AlbedoBoost: 1
-    m_EnvironmentLightingMode: 0
-    m_EnableBakedLightmaps: 1
-    m_EnableRealtimeLightmaps: 0
-  m_LightmapEditorSettings:
-    serializedVersion: 12
-    m_Resolution: 2
-    m_BakeResolution: 40
-    m_AtlasSize: 1024
-    m_AO: 0
-    m_AOMaxDistance: 1
-    m_CompAOExponent: 1
-    m_CompAOExponentDirect: 0
-    m_ExtractAmbientOcclusion: 0
-    m_Padding: 2
-    m_LightmapParameters: {fileID: 0}
-    m_LightmapsBakeMode: 1
-    m_TextureCompression: 1
-    m_FinalGather: 0
-    m_FinalGatherFiltering: 1
-    m_FinalGatherRayCount: 256
-    m_ReflectionCompression: 2
-    m_MixedBakeMode: 2
-    m_BakeBackend: 1
-    m_PVRSampling: 1
-    m_PVRDirectSampleCount: 32
-    m_PVRSampleCount: 512
-    m_PVRBounces: 2
-    m_PVREnvironmentSampleCount: 256
-    m_PVREnvironmentReferencePointCount: 2048
-    m_PVRFilteringMode: 1
-    m_PVRDenoiserTypeDirect: 1
-    m_PVRDenoiserTypeIndirect: 1
-    m_PVRDenoiserTypeAO: 1
-    m_PVRFilterTypeDirect: 0
-    m_PVRFilterTypeIndirect: 0
-    m_PVRFilterTypeAO: 0
-    m_PVREnvironmentMIS: 1
-    m_PVRCulling: 1
-    m_PVRFilteringGaussRadiusDirect: 1
-    m_PVRFilteringGaussRadiusIndirect: 5
-    m_PVRFilteringGaussRadiusAO: 2
-    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
-    m_PVRFilteringAtrousPositionSigmaIndirect: 2
-    m_PVRFilteringAtrousPositionSigmaAO: 1
-    m_ExportTrainingData: 0
-    m_TrainingDataDestination: TrainingData
-    m_LightProbeSampleCountMultiplier: 4
-  m_LightingDataAsset: {fileID: 0}
-  m_LightingSettings: {fileID: 0}
---- !u!196 &4
-NavMeshSettings:
-  serializedVersion: 2
-  m_ObjectHideFlags: 0
-  m_BuildSettings:
-    serializedVersion: 2
-    agentTypeID: 0
-    agentRadius: 0.5
-    agentHeight: 2
-    agentSlope: 45
-    agentClimb: 0.4
-    ledgeDropHeight: 0
-    maxJumpAcrossDistance: 0
-    minRegionArea: 2
-    manualCellSize: 0
-    cellSize: 0.16666667
-    manualTileSize: 0
-    tileSize: 256
-    accuratePlacement: 0
-    maxJobWorkers: 0
-    preserveTilesOutsideBounds: 0
-    debug:
-      m_Flags: 0
-  m_NavMeshData: {fileID: 0}
---- !u!1 &746903059
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 746903062}
-  - component: {fileID: 746903061}
-  - component: {fileID: 746903060}
-  m_Layer: 0
-  m_Name: Main Camera
-  m_TagString: MainCamera
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!81 &746903060
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 746903059}
-  m_Enabled: 1
---- !u!20 &746903061
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 746903059}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 2
-  m_BackGroundColor: {r: 0.31132078, g: 0.31132078, b: 0.31132078, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: -1
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
---- !u!4 &746903062
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 746903059}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 1, z: -10}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &783217159
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 783217161}
-  - component: {fileID: 783217160}
-  m_Layer: 0
-  m_Name: MusicManager
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &783217160
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 783217159}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c2bc9afd74edd9d44a14d3465d60e1c4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  TransitionTime: 5
-  CombatSnapshot: {fileID: 4951561632732636846, guid: d220a87cb27315048975cce74c6d84b6,
-    type: 2}
-  AmbientSnapshot: {fileID: -603028713283386147, guid: d220a87cb27315048975cce74c6d84b6,
-    type: 2}
---- !u!4 &783217161
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 783217159}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &813951580
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 813951582}
-  - component: {fileID: 813951581}
-  m_Layer: 0
-  m_Name: Directional Light
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!108 &813951581
-Light:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 813951580}
-  m_Enabled: 1
-  serializedVersion: 10
-  m_Type: 1
-  m_Shape: 0
-  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
-  m_Intensity: 1
-  m_Range: 10
-  m_SpotAngle: 30
-  m_InnerSpotAngle: 21.80208
-  m_CookieSize: 10
-  m_Shadows:
-    m_Type: 2
-    m_Resolution: -1
-    m_CustomResolution: -1
-    m_Strength: 1
-    m_Bias: 0.05
-    m_NormalBias: 0.4
-    m_NearPlane: 0.2
-    m_CullingMatrixOverride:
-      e00: 1
-      e01: 0
-      e02: 0
-      e03: 0
-      e10: 0
-      e11: 1
-      e12: 0
-      e13: 0
-      e20: 0
-      e21: 0
-      e22: 1
-      e23: 0
-      e30: 0
-      e31: 0
-      e32: 0
-      e33: 1
-    m_UseCullingMatrixOverride: 0
-  m_Cookie: {fileID: 0}
-  m_DrawHalo: 0
-  m_Flare: {fileID: 0}
-  m_RenderMode: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingLayerMask: 1
-  m_Lightmapping: 4
-  m_LightShadowCasterMode: 0
-  m_AreaSize: {x: 1, y: 1}
-  m_BounceIntensity: 1
-  m_ColorTemperature: 6570
-  m_UseColorTemperature: 0
-  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
-  m_UseBoundingSphereOverride: 0
-  m_UseViewFrustumForShadowCasterCull: 1
-  m_ShadowRadius: 0
-  m_ShadowAngle: 0
---- !u!4 &813951582
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 813951580}
-  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
-  m_LocalPosition: {x: 0, y: 3, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
---- !u!1 &1760457183
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1760457185}
-  - component: {fileID: 1760457184}
-  m_Layer: 0
-  m_Name: Ambient
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!82 &1760457184
-AudioSource:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1760457183}
-  m_Enabled: 1
-  serializedVersion: 4
-  OutputAudioMixerGroup: {fileID: -4850697152304757985, guid: d220a87cb27315048975cce74c6d84b6,
-    type: 2}
-  m_audioClip: {fileID: 8300000, guid: 87ea9825d40c580469ccd947cd1954d8, type: 3}
-  m_PlayOnAwake: 1
-  m_Volume: 1
-  m_Pitch: 1
-  Loop: 1
-  Mute: 0
-  Spatialize: 0
-  SpatializePostEffects: 0
-  Priority: 128
-  DopplerLevel: 1
-  MinDistance: 1
-  MaxDistance: 500
-  Pan2D: 0
-  rolloffMode: 0
-  BypassEffects: 0
-  BypassListenerEffects: 0
-  BypassReverbZones: 0
-  rolloffCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 1
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    - serializedVersion: 3
-      time: 1
-      value: 0
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  panLevelCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 0
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  spreadCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 0
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  reverbZoneMixCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 1
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
---- !u!4 &1760457185
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1760457183}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1882565429
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1882565431}
-  - component: {fileID: 1882565430}
-  m_Layer: 0
-  m_Name: Combat
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!82 &1882565430
-AudioSource:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1882565429}
-  m_Enabled: 1
-  serializedVersion: 4
-  OutputAudioMixerGroup: {fileID: 4584421116988752864, guid: d220a87cb27315048975cce74c6d84b6,
-    type: 2}
-  m_audioClip: {fileID: 8300000, guid: 7cd0308c0f4ea354384fd97573516132, type: 3}
-  m_PlayOnAwake: 1
-  m_Volume: 1
-  m_Pitch: 1
-  Loop: 1
-  Mute: 0
-  Spatialize: 0
-  SpatializePostEffects: 0
-  Priority: 128
-  DopplerLevel: 1
-  MinDistance: 1
-  MaxDistance: 500
-  Pan2D: 0
-  rolloffMode: 0
-  BypassEffects: 0
-  BypassListenerEffects: 0
-  BypassReverbZones: 0
-  rolloffCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 1
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    - serializedVersion: 3
-      time: 1
-      value: 0
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  panLevelCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 0
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  spreadCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 0
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  reverbZoneMixCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 1
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
---- !u!4 &1882565431
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1882565429}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Scripts/Gameplay/ActionGameManager.cs

@@ -140,6 +140,9 @@ public class ActionGameManager : MonoBehaviour
     public PostProcessVolume SevereHypothermiaPP;
 
     [Header("Scene Links")]
+    public GameObject UiRoot;
+    public GameObject HelpScreen;
+    public InputDisplayLayout InputDisplayLayout;
     public Transform ActionBar;
     public ActionBarSlot ActionBarSlot;
     public Transform EffectManagerParent;
@@ -305,6 +308,9 @@ public class ActionGameManager : MonoBehaviour
         #region Input Handling
 
         Input = new AetheriaInput();
+        foreach (var x in PlayerSettings.InputSettings.InputActionMap) Input.asset[x.Key.action].ApplyBindingOverride(x.Key.binding, x.Value);
+
+        InputDisplayLayout.Input = Input.asset;
         Input.Global.Enable();
 
         _zoomLevelIndex = Settings.DefaultMinimapZoom;
@@ -348,7 +354,9 @@ public class ActionGameManager : MonoBehaviour
             else Undock();
         };
 
-        Input.Global.MainMenu.performed += context => ToggleMainMenu();
+        Input.Global.MainMenu.performed += context => ToggleFullscreenMenu(MainMenu.gameObject);
+        
+        Input.Global.InputScreen.performed += context => ToggleFullscreenMenu(HelpScreen);
 
         Input.Player.HideUI.performed += context =>
         {
@@ -693,42 +701,31 @@ public class ActionGameManager : MonoBehaviour
         }
     }
 
-    private void ToggleMainMenu()
+    private void ToggleFullscreenMenu(GameObject menu)
     {
-        if (EventSystem.current.currentSelectedGameObject != null && EventSystem.current.currentSelectedGameObject.GetComponent<TMP_InputField>() != null) return;
+        if (EventSystem.current != null && EventSystem.current.currentSelectedGameObject != null && EventSystem.current.currentSelectedGameObject.GetComponent<TMP_InputField>() != null) return;
         if (CurrentEntity == null) return;
-        if (MainMenu.gameObject.activeSelf)
+        if (menu.activeSelf)
         {
             _paused = false;
             VolumeRenderer.EnableDepth = true;
-            MainMenu.gameObject.SetActive(false);
-            if (_menuShown)
-            {
-                Menu.gameObject.SetActive(true);
-            }
-            else
+            menu.SetActive(false);
+            UiRoot.SetActive(true);
+            if (!_menuShown)
             {
                 EnablePlayerInput();
                 UpdatePlayerPanel();
                 UpdateTargetPanel(CurrentEntity.Target.Value);
-                GameplayUI.gameObject.SetActive(true);
             }
         }
         else
         {
             _paused = true;
             VolumeRenderer.EnableDepth = false;
-            MainMenu.gameObject.SetActive(true);
+            menu.SetActive(true);
+            UiRoot.SetActive(false);
             _menuShown = Menu.gameObject.activeSelf;
-            if (_menuShown)
-            {
-                Menu.gameObject.SetActive(false);
-            }
-            else
-            {
-                GameplayUI.gameObject.SetActive(false);
-                DisablePlayerInput();
-            }
+            if (!_menuShown) DisablePlayerInput();
         }
     }
 

Assets/Scripts/ServerShared/PlayerSettings.cs

@@ -59,7 +59,6 @@ public class PlayerGameplaySettings
 [MessagePackObject]
 public class PlayerInputSettings
 {
-    [Key(0)] public Dictionary<string, string> InputActionMap = new Dictionary<string, string>();
+    [Key(0)] public Dictionary<(string action, int binding), string> InputActionMap = new Dictionary<(string action, int binding), string>();
     [Key(1)] public List<string> ActionBarInputs = new List<string>();
-    [Key(2)] public bool FiveButtonMouse;
 }

Assets/Scripts/UI/FlatButton.cs

@@ -1,110 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using TMPro;
-using UnityEngine;
-using UnityEngine.EventSystems;
-using UnityEngine.UI;
-
-public class FlatButton : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler, IPointerClickHandler
-{
-    public event Action OnClick;
-    public float StateDamping;
-//    public RectTransform Tab;
-    public Image Fill;
-    public Image Outline;
-    public VerticalLayoutGroup LabelLayout;
-    public FlatButtonState CurrentState = FlatButtonState.Unselected;
-    public bool DisableClickWhenSelected = true;
-
-    public FlatButtonAppearance UnselectedAppearance;
-    public FlatButtonAppearance SelectedAppearance;
-    public FlatButtonAppearance HoverAppearance;
-    public FlatButtonAppearance ClickAppearance;
-    public FlatButtonAppearance DisabledAppearance;
-
-    private RectOffset _defaultPadding;
-    private float _currentPadding;
-
-    private void Start()
-    {
-        _defaultPadding = LabelLayout.padding;
-        _currentPadding = _defaultPadding.left;
-    }
-
-    public void OnPointerEnter(PointerEventData eventData)
-    {
-        if (CurrentState == FlatButtonState.Unselected)
-            CurrentState = FlatButtonState.Hover;
-    }
-
-    public void OnPointerExit(PointerEventData eventData)
-    {
-        if (CurrentState == FlatButtonState.Hover)
-            CurrentState = FlatButtonState.Unselected;
-    }
-
-    public void OnPointerClick(PointerEventData eventData)
-    {
-        if (CurrentState != FlatButtonState.Disabled && (!DisableClickWhenSelected || CurrentState != FlatButtonState.Selected))
-        {
-            Fill.color = ClickAppearance.FillColor;
-            Outline.color = ClickAppearance.OutlineColor;
-            OnClick?.Invoke();
-        }
-    }
-
-    private void Update()
-    {
-        FlatButtonAppearance appearance;
-        switch (CurrentState)
-        {
-            case FlatButtonState.Unselected:
-                appearance = UnselectedAppearance;
-                break;
-            case FlatButtonState.Selected:
-                appearance = SelectedAppearance;
-                break;
-            case FlatButtonState.Hover:
-                appearance = HoverAppearance;
-                break;
-            case FlatButtonState.Disabled:
-                appearance = DisabledAppearance;
-                break;
-            default:
-                appearance = new FlatButtonAppearance();
-                break;
-        }
-
-        Fill.color = Color.Lerp(Fill.color, appearance.FillColor, StateDamping * Time.deltaTime);
-        Outline.color = Color.Lerp(Outline.color, appearance.OutlineColor, StateDamping * Time.deltaTime);
-        _currentPadding = Mathf.Lerp(_currentPadding, appearance.LayoutPadding, StateDamping * Time.deltaTime);
-        LabelLayout.padding = new RectOffset
-        {
-            bottom = _defaultPadding.bottom,
-            top = _defaultPadding.top,
-            left = (int) _currentPadding,
-            right = (int) _currentPadding
-        };
-    }
-}
-
-public enum FlatButtonState
-{
-    Unselected,
-    Selected,
-    Hover,
-    Disabled
-}
-
-[Serializable]
-public struct FlatButtonAppearance
-{
-    public Color FillColor;
-    public Color OutlineColor;
-    public int LayoutPadding;
-}

Assets/Scripts/UI/FlatFlatButton.cs

@@ -1,126 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using TMPro;
-using UnityEngine;
-using UnityEngine.EventSystems;
-using UnityEngine.UI;
-
-public class FlatFlatButton : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler, IPointerClickHandler, IBeginDragHandler, IDragHandler, IEndDragHandler
-{
-    public event Action<PointerEventData> OnClick;
-    public float StateDamping;
-//    public RectTransform Tab;
-    public Image Fill;
-    public TextMeshProUGUI Label;
-    public FlatButtonState CurrentState = FlatButtonState.Unselected;
-    public bool DisableClickWhenSelected = true;
-    public RectTransform DragObject;
-
-    public Color UnselectedColor;
-    public Color SelectedColor;
-    public Color HoverColor;
-    public Color ClickColor;
-    public Color DisabledColor;
-    public Color EnabledTextColor;
-    public Color DisabledTextColor;
-
-    public Func<PointerEventData, bool> DragSuccess;
-    private int _siblingIndex;
-    private Transform _dragParent;
-    private Vector3 _dragPositionOffset;
-
-    public void OnPointerEnter(PointerEventData eventData)
-    {
-        if (OnClick != null && CurrentState == FlatButtonState.Unselected)
-            CurrentState = FlatButtonState.Hover;
-    }
-
-    public void OnPointerExit(PointerEventData eventData)
-    {
-        if (CurrentState == FlatButtonState.Hover)
-            CurrentState = FlatButtonState.Unselected;
-    }
-
-    public void OnPointerClick(PointerEventData eventData)
-    {
-        if (CurrentState != FlatButtonState.Disabled && (!DisableClickWhenSelected || CurrentState != FlatButtonState.Selected))
-        {
-            if (OnClick != null)
-            {
-                Fill.color = ClickColor;
-                OnClick(eventData);
-            }
-        }
-    }
-
-    public void OnBeginDrag(PointerEventData eventData)
-    {
-        if (DragSuccess == null || DragObject == null)
-        {
-            eventData.pointerDrag = null;
-            return;
-        }
-        
-        var canvas = gameObject.FindInParents<Canvas>();
-        if (canvas == null)
-            return;
-        
-        _siblingIndex = DragObject.GetSiblingIndex();
-        _dragParent = DragObject.parent;
-        
-        DragObject.SetParent(canvas.transform, true);
-        _dragPositionOffset = DragObject.position - (Vector3)eventData.position;
-        DragObject.SetAsLastSibling();
-    }
-
-    public void OnDrag(PointerEventData eventData)
-    {
-        var targetPosition = (Vector3)eventData.position + _dragPositionOffset;
-        //Debug.Log($"Moving drag object to {targetPosition}");
-        DragObject.position = targetPosition;
-    }
-
-    public void OnEndDrag(PointerEventData eventData)
-    {
-        if(DragSuccess(eventData))
-            Destroy(DragObject.gameObject);
-        else
-        {
-            DragObject.parent = _dragParent;
-            DragObject.SetSiblingIndex(_siblingIndex);
-        }
-    }
-
-    private void Update()
-    {
-        Color appearance;
-        switch (CurrentState)
-        {
-            case FlatButtonState.Unselected:
-                appearance = UnselectedColor;
-                break;
-            case FlatButtonState.Selected:
-                appearance = SelectedColor;
-                break;
-            case FlatButtonState.Hover:
-                appearance = HoverColor;
-                break;
-            case FlatButtonState.Disabled:
-                appearance = DisabledColor;
-                break;
-            default:
-                appearance = Color.white;
-                break;
-        }
-
-        if (Label != null)
-            Label.color = Color.Lerp(Label.color,
-                CurrentState == FlatButtonState.Disabled ? DisabledTextColor : EnabledTextColor, StateDamping * Time.deltaTime);
-        Fill.color = Color.Lerp(Fill.color, appearance, StateDamping * Time.deltaTime);
-    }
-}

Assets/Scripts/UI/FlatFlatButton.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: fafbcd26aa8d175448880b37b7a41b2e
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/UI/HUD.meta

@@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: 329ba502cff95994db78bee35715203d
+guid: a72db0c93905d9c46bd021fe8d9f5dac
+folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Scripts/UI/Icons.cs

@@ -1,20 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-[CreateAssetMenu(fileName = "Icons", menuName = "Aetheria/Icons")]
-public class Icons : ScriptableObject
-{
-    public Texture2D plus;
-    public Texture2D minus;
-    
-    private const string AssetPath = "Icons";
-    private static Icons _instance;
-    public static Icons Instance {
-        get { return _instance ?? (_instance = Resources.Load<Icons>(AssetPath)); }
-    }
-}

Assets/Scripts/UI/Icons.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 32eff58a98b2e4c43a9a375c7db56e25
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/UI/InputScreen/InputDisplayLayout.cs

@@ -53,6 +53,8 @@ public class InputDisplayLayout : MonoBehaviour
     private ButtonMapping _previewButton;
     private ActionMapping _previewOriginalAction;
     private bool _previewOriginallyActionBar;
+    
+    public InputActionAsset Input { get; set; }
 
     private class ButtonMapping
     {
@@ -83,11 +85,12 @@ public class InputDisplayLayout : MonoBehaviour
     void Start()
     {
         _canvas = transform.root.GetComponent<Canvas>();
-        var path = Path.Combine(ActionGameManager.GameDataDirectory.CreateSubdirectory("KeyboardLayouts").FullName, $"{LayoutFile.name}.json");
+        var path = Path.Combine(ActionGameManager.GameDataDirectory.CreateSubdirectory("KeyboardLayouts").FullName, $"{LayoutFile.name}.msgpack");
         // _inputLayout = ParseJson(LayoutFile.text);
-        //RegisterResolver.Register();
-        //_inputLayout = MessagePackSerializer.Deserialize<InputLayout>(File.ReadAllBytes(path));
-        _inputLayout = JsonConvert.DeserializeObject<InputLayout>(File.ReadAllText(path));
+        RegisterResolver.Register();
+        _inputLayout = MessagePackSerializer.Deserialize<InputLayout>(File.ReadAllBytes(path));
+        // _inputLayout = JsonConvert.DeserializeObject<InputLayout>(File.ReadAllText(path));
+        // SaveLayout();
         DisplayLayout(_inputLayout);
         
         _buttonMappings.Add(MapMouseButton(MouseLeft, "<Mouse>/leftButton"));
@@ -97,33 +100,6 @@ public class InputDisplayLayout : MonoBehaviour
         _buttonMappings.Add(MapMouseButton(MouseBack, "<Mouse>/backButton"));
         
         Canvas.ForceUpdateCanvases();
-        
-        void EndDrag(PointerEventData _)
-        {
-            if (_previewButton == null)
-            {
-                if(_originalButton!=null)
-                {
-                    _originalButton.ActionMapping = _dragAction;
-                    _dragAction.ButtonMappings.Add(_originalButton);
-                    AssignColor(_originalButton);
-                }
-                PlaceLabel(_dragAction);
-            }
-            else
-            {
-                _dragAction.Binding.overridePath = _previewButton.Button.InputSystemPath;
-                _dragAction.Action.ApplyBindingOverride(_dragAction.Binding);
-                // TODO: Assign New Binding
-            }
-
-            foreach(var action in _actionMappings)
-                action.Label.Label.raycastTarget = true;
-            _dragAction = null;
-            _originalButton = null;
-            _previewButton = null;
-            _previewOriginalAction = null;
-        }
 
         foreach (var buttonMapping in _buttonMappings)
         {
@@ -141,89 +117,6 @@ public class InputDisplayLayout : MonoBehaviour
             };
             buttonMapping.TestAction.canceled += context => AssignColor(buttonMapping);
             buttonMapping.TestAction.Enable();
-
-            // On click: when a specific action is not assigned, toggle its availability on the action bar
-            buttonMapping.DisplayButton.ClickTrigger.OnPointerClickAsObservable()
-                .Where(_=>buttonMapping.ActionMapping==null)
-                .Subscribe(data =>
-            {
-                buttonMapping.IsActionBarButton = !buttonMapping.IsActionBarButton;
-                if (buttonMapping.IsActionBarButton)
-                {
-                    ActionGameManager.PlayerSettings.InputSettings.ActionBarInputs.Add(buttonMapping.Button.InputSystemPath);
-                    foreach(var overlap in OverlappingLabels(buttonMapping.ButtonRect))
-                        PlaceLabel(overlap);
-                }
-                else
-                {
-                    ActionGameManager.PlayerSettings.InputSettings.ActionBarInputs.Remove(buttonMapping.Button.InputSystemPath);
-                }
-                AssignColor(buttonMapping);
-            });
-
-            buttonMapping.DisplayButton.BeginDragTrigger.OnBeginDragAsObservable()
-                .Where(_ => buttonMapping.ActionMapping != null)
-                .Subscribe(_ =>
-                {
-                    _originalButton = buttonMapping;
-                    buttonMapping.LabelLine.Points = new Vector2[0];
-                    _dragAction = buttonMapping.ActionMapping;
-                    foreach(var action in _actionMappings)
-                        action.Label.Label.raycastTarget = false;
-                });
-
-            buttonMapping.DisplayButton.EnterTrigger.OnPointerEnterAsObservable()
-                .Where(_ => _dragAction != null)
-                .Subscribe(_ =>
-                {
-                    _previewButton = buttonMapping;
-                    _previewOriginalAction = buttonMapping.ActionMapping;
-                    _previewOriginallyActionBar = buttonMapping.IsActionBarButton;
-                    buttonMapping.IsActionBarButton = false;
-
-                    buttonMapping.ActionMapping?.ButtonMappings.Remove(buttonMapping);
-                    buttonMapping.ActionMapping = _dragAction;
-                    _dragAction.ButtonMappings.Add(buttonMapping);
-                    if(_previewOriginalAction!=null)
-                        PlaceLabel(_previewOriginalAction);
-                    PlaceLabel(_dragAction);
-                    AssignColor(buttonMapping);
-                    foreach(var overlap in OverlappingLabels(buttonMapping.ButtonRect))
-                        PlaceLabel(overlap);
-                });
-
-            buttonMapping.DisplayButton.ExitTrigger.OnPointerExitAsObservable()
-                .Where(_ => _dragAction != null)
-                .Subscribe(_ =>
-                {
-                    _dragAction.ButtonMappings.Remove(buttonMapping);
-                    if (buttonMapping == _originalButton)
-                    {
-                        buttonMapping.ActionMapping = null;
-                    }
-                    else if(buttonMapping == _previewButton)
-                    {
-                        buttonMapping.IsActionBarButton = _previewOriginallyActionBar;
-                        buttonMapping.ActionMapping = _previewOriginalAction;
-                        if (!_previewOriginallyActionBar)
-                        {
-                            if(_previewOriginalAction != null)
-                            {
-                                _previewOriginalAction.ButtonMappings.Add(buttonMapping);
-                                PlaceLabel(_previewOriginalAction);
-                            }
-                        }
-                    }
-
-                    ConnectButtonToLabel(buttonMapping);
-                    AssignColor(buttonMapping);
-                    _previewButton = null;
-                    _previewOriginalAction = null;
-                });
-
-            buttonMapping.DisplayButton.EndDragTrigger.OnEndDragAsObservable()
-                .Where(_ => _dragAction != null)
-                .Subscribe(EndDrag);
         }
         
         foreach(var actionBarInput in ActionGameManager.PlayerSettings.InputSettings.ActionBarInputs)
@@ -236,34 +129,25 @@ public class InputDisplayLayout : MonoBehaviour
             }
         }
         
-        var input = new AetheriaInput();
-        ProcessActions(input.asset);
-        input.Enable();
-        input.Global.Interact.performed += context => Debug.Log($"Interact Performed! Time = {((int) (Time.time * 1000)).ToString()}ms");
-
-        foreach (var actionMapping in _actionMappings)
+        if(Input==null)
         {
-            actionMapping.Label = CreateLabel(actionMapping);
-            actionMapping.Label.BeginDragTrigger.OnBeginDragAsObservable().Subscribe(_ =>
-            {
-                _dragAction = actionMapping;
-                actionMapping.Label.transform.parent = AssignedBindingsGroup;
-                foreach(var action in _actionMappings)
-                    action.Label.Label.raycastTarget = false;
-                if (actionMapping.ButtonMappings.Count == 1)
-                {
-                    var buttonMapping = actionMapping.ButtonMappings[0];
-                    _originalButton = buttonMapping;
-                    buttonMapping.LabelLine.Points = new Vector2[0];
-                    buttonMapping.ActionMapping = null;
-                    actionMapping.ButtonMappings.Clear();
-                    ConnectButtonToLabel(buttonMapping);
-                    AssignColor(buttonMapping);
-                }
-            });
-            actionMapping.Label.EndDragTrigger.OnEndDragAsObservable().Subscribe(EndDrag);
-            PlaceLabel(actionMapping);
+            var input = new AetheriaInput();
+            Input = input.asset;
         }
+        ProcessActions(Input);
+        // input.Enable();
+        // input.Global.Interact.performed += context => Debug.Log($"Interact Performed! Time = {((int) (Time.time * 1000)).ToString()}ms");
+
+        Observable.NextFrame().Subscribe(_ =>
+        {
+            foreach (var actionMapping in _actionMappings)
+            {
+                actionMapping.Label = CreateLabel(actionMapping);
+                PlaceLabel(actionMapping);
+            }
+
+            RegisterMouseCallbacks();
+        });
 
         //StartCoroutine(AssociateInputKeys(_inputLayout));
     }
@@ -287,7 +171,7 @@ public class InputDisplayLayout : MonoBehaviour
             var action = bindableActions[i];
             foreach (var binding in action.bindings)
             {
-                if (_bindButtons.ContainsKey(binding.path))
+                if (_bindButtons.ContainsKey(binding.effectivePath))
                 {
                     var name = action.name.Replace(' ', '\n');
                     if (binding.isPartOfComposite) name = $"{name} {binding.name}";
@@ -302,7 +186,7 @@ public class InputDisplayLayout : MonoBehaviour
                     };
                     _actionMappings.Add(actionMapping);
                     
-                    var buttonMapping = _bindButtons[binding.path];
+                    var buttonMapping = _bindButtons[binding.effectivePath];
                     buttonMapping.ActionMapping = actionMapping;
                     AssignColor(buttonMapping);
                     actionMapping.ButtonMappings.Add(buttonMapping);
@@ -605,12 +489,170 @@ public class InputDisplayLayout : MonoBehaviour
         }
         keyPress.Disable();
 
+        SaveLayout();
+    }
+
+    private void SaveLayout()
+    {
         RegisterResolver.Register();
         File.WriteAllBytes(
             Path.Combine(ActionGameManager.GameDataDirectory.CreateSubdirectory("KeyboardLayouts").FullName, $"{LayoutFile.name}.msgpack"),
             MessagePackSerializer.Serialize(_inputLayout));
     }
 
+    private void OnEnable()
+    {
+        foreach(var buttonMapping in _buttonMappings)
+            buttonMapping.TestAction.Enable();
+        RegisterMouseCallbacks();
+    }
+
+    private void RegisterMouseCallbacks()
+    {
+        void EndDrag(PointerEventData _)
+        {
+            if (_previewButton == null)
+            {
+                if(_originalButton!=null)
+                {
+                    _originalButton.ActionMapping = _dragAction;
+                    _dragAction.ButtonMappings.Add(_originalButton);
+                    AssignColor(_originalButton);
+                }
+                PlaceLabel(_dragAction);
+            }
+            else
+            {
+                _dragAction.Binding.overridePath = _previewButton.Button.InputSystemPath;
+                _dragAction.Action.ApplyBindingOverride(_dragAction.Binding);
+                ActionGameManager.PlayerSettings.InputSettings.InputActionMap[(_dragAction.Action.name,
+                    _dragAction.Action.GetBindingIndex(_dragAction.Binding))] = _previewButton.Button.InputSystemPath;
+                // TODO: Assign New Binding
+            }
+
+            foreach(var action in _actionMappings)
+                action.Label.Label.raycastTarget = true;
+            _dragAction = null;
+            _originalButton = null;
+            _previewButton = null;
+            _previewOriginalAction = null;
+        }
+
+        foreach (var buttonMapping in _buttonMappings)
+        {
+            // On click: when a specific action is not assigned, toggle its availability on the action bar
+            buttonMapping.DisplayButton.ClickTrigger.OnPointerClickAsObservable()
+                .Where(_=>buttonMapping.ActionMapping==null)
+                .Subscribe(data =>
+            {
+                buttonMapping.IsActionBarButton = !buttonMapping.IsActionBarButton;
+                if (buttonMapping.IsActionBarButton)
+                {
+                    ActionGameManager.PlayerSettings.InputSettings.ActionBarInputs.Add(buttonMapping.Button.InputSystemPath);
+                    foreach(var overlap in OverlappingLabels(buttonMapping.ButtonRect))
+                        PlaceLabel(overlap);
+                }
+                else
+                {
+                    ActionGameManager.PlayerSettings.InputSettings.ActionBarInputs.Remove(buttonMapping.Button.InputSystemPath);
+                }
+                AssignColor(buttonMapping);
+            });
+
+            buttonMapping.DisplayButton.BeginDragTrigger.OnBeginDragAsObservable()
+                .Where(_ => buttonMapping.ActionMapping != null)
+                .Subscribe(_ =>
+                {
+                    _originalButton = buttonMapping;
+                    buttonMapping.LabelLine.Points = new Vector2[0];
+                    _dragAction = buttonMapping.ActionMapping;
+                    foreach(var action in _actionMappings)
+                        action.Label.Label.raycastTarget = false;
+                });
+
+            buttonMapping.DisplayButton.EnterTrigger.OnPointerEnterAsObservable()
+                .Where(_ => _dragAction != null)
+                .Subscribe(_ =>
+                {
+                    _previewButton = buttonMapping;
+                    _previewOriginalAction = buttonMapping.ActionMapping;
+                    _previewOriginallyActionBar = buttonMapping.IsActionBarButton;
+                    buttonMapping.IsActionBarButton = false;
+
+                    buttonMapping.ActionMapping?.ButtonMappings.Remove(buttonMapping);
+                    buttonMapping.ActionMapping = _dragAction;
+                    _dragAction.ButtonMappings.Add(buttonMapping);
+                    if(_previewOriginalAction!=null)
+                        PlaceLabel(_previewOriginalAction);
+                    PlaceLabel(_dragAction);
+                    AssignColor(buttonMapping);
+                    foreach(var overlap in OverlappingLabels(buttonMapping.ButtonRect))
+                        PlaceLabel(overlap);
+                });
+
+            buttonMapping.DisplayButton.ExitTrigger.OnPointerExitAsObservable()
+                .Where(_ => _dragAction != null)
+                .Subscribe(_ =>
+                {
+                    _dragAction.ButtonMappings.Remove(buttonMapping);
+                    if (buttonMapping == _originalButton)
+                    {
+                        buttonMapping.ActionMapping = null;
+                    }
+                    else if(buttonMapping == _previewButton)
+                    {
+                        buttonMapping.IsActionBarButton = _previewOriginallyActionBar;
+                        buttonMapping.ActionMapping = _previewOriginalAction;
+                        if (!_previewOriginallyActionBar)
+                        {
+                            if(_previewOriginalAction != null)
+                            {
+                                _previewOriginalAction.ButtonMappings.Add(buttonMapping);
+                                PlaceLabel(_previewOriginalAction);
+                            }
+                        }
+                    }
+
+                    ConnectButtonToLabel(buttonMapping);
+                    AssignColor(buttonMapping);
+                    _previewButton = null;
+                    _previewOriginalAction = null;
+                });
+
+            buttonMapping.DisplayButton.EndDragTrigger.OnEndDragAsObservable()
+                .Where(_ => _dragAction != null)
+                .Subscribe(EndDrag);
+        }
+        
+        foreach (var actionMapping in _actionMappings)
+        {
+            actionMapping.Label.BeginDragTrigger.OnBeginDragAsObservable().Subscribe(_ =>
+            {
+                _dragAction = actionMapping;
+                actionMapping.Label.transform.parent = AssignedBindingsGroup;
+                foreach (var action in _actionMappings)
+                    action.Label.Label.raycastTarget = false;
+                if (actionMapping.ButtonMappings.Count == 1)
+                {
+                    var buttonMapping = actionMapping.ButtonMappings[0];
+                    _originalButton = buttonMapping;
+                    buttonMapping.LabelLine.Points = new Vector2[0];
+                    buttonMapping.ActionMapping = null;
+                    actionMapping.ButtonMappings.Clear();
+                    ConnectButtonToLabel(buttonMapping);
+                    AssignColor(buttonMapping);
+                }
+            });
+            actionMapping.Label.EndDragTrigger.OnEndDragAsObservable().Subscribe(EndDrag);
+        }
+    }
+
+    private void OnDisable()
+    {
+        foreach(var buttonMapping in _buttonMappings)
+            buttonMapping.TestAction.Disable();
+    }
+
     void Update()
     {
         if (_dragAction != null && _previewButton == null)

Assets/Scripts/UI/LoginScreen.cs

@@ -1,89 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using TMPro;
-using UnityEngine;
-using UnityEngine.SceneManagement;
-
-public class LoginScreen : MonoBehaviour
-{
-    public FlatButton LoginButton;
-    public FlatButton RegisterButton;
-    public TMP_InputField Server;
-    public TMP_InputField EmailUsername;
-    public TMP_InputField Email;
-    public TMP_InputField Username;
-    public TMP_InputField Password;
-    public TextMeshProUGUI Error;
-
-    private bool _registering;
-    
-    void Start()
-    {
-        Error.text = " ";
-        LoginButton.CurrentState = FlatButtonState.Selected;
-        CultClient.AddMessageListener<LoginSuccessMessage>(success => SceneManager.LoadScene("Main"));
-        CultClient.OnError += s => Error.text = s;
-        RegisterButton.OnClick += () =>
-        {
-            if(!CultClient.Connected)
-                CultClient.Connect(Server.text);
-            if (_registering)
-            {
-                CultClient.Register(Email.text, Username.text, Password.text);
-            }
-            else
-            {
-                _registering = true;
-                EmailUsername.gameObject.SetActive(false);
-                Email.gameObject.SetActive(true);
-                Username.gameObject.SetActive(true);
-                LoginButton.CurrentState = FlatButtonState.Unselected;
-                RegisterButton.CurrentState = FlatButtonState.Selected;
-            }
-        };
-        LoginButton.OnClick += () =>
-        {
-            if(!CultClient.Connected)
-                CultClient.Connect(Server.text);
-            if (_registering)
-            {
-                _registering = false;
-                EmailUsername.gameObject.SetActive(true);
-                Email.gameObject.SetActive(false);
-                Username.gameObject.SetActive(false);
-                LoginButton.CurrentState = FlatButtonState.Selected;
-                RegisterButton.CurrentState = FlatButtonState.Unselected;
-            }
-            else
-            {
-                CultClient.Login(EmailUsername.text, Password.text);
-            }
-        };
-    }
-
-    private void Update()
-    {
-        if (Input.GetKeyDown(KeyCode.Tab) || Input.GetKeyDown(KeyCode.Return))
-        {
-            if (Server.isFocused)
-            {
-                if(_registering)
-                    Email.Select();
-                else EmailUsername.Select();
-            }
-            else if (EmailUsername.isFocused)
-                Password.Select();
-            else if (Email.isFocused)
-                Username.Select();
-            else if (Username.isFocused)
-                Password.Select();
-            else if (Password.isFocused && Input.GetKeyDown(KeyCode.Return))
-                (_registering ? RegisterButton : LoginButton).OnPointerClick(null);
-        }
-    }
-}

Assets/Scripts/UI/LoginScreen.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: a16898360275ccb489eef6245639fb56
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/UI/Menu.meta

@@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: f8a6ef8243cacfb48a4cfe8b07d8b2c2
+guid: e572a37b7883b9a4e9ad03f39589b1be
+folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Scripts/UI/Properties Panel.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3460afaee84d9f64283d4908724d82b4
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: