GameCult/Aetheria
Watch
9
0
Fork
You've already forked Aetheria
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Keyboard Layout Display

Browse source 
Fully implemented procedurally generated keyboard layout display UI
Fixed Granular Audio
This commit is contained in:
Reinier Vens 2021-05-03 23:15:29 +01:00
commit c2a23b5f5e
58 changed files with 1240 additions and 422 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -10,6 +10,7 @@
/[Ll]ogs/
/[Mm]emoryCaptures/
/Recordings/
/Assets/StreamingAssets/Audio/GeneratedSoundBanks/
# Wwise folders
/Aetheria-Economy_WwiseProject/.backup

6
AK.Wwise.Unity.API.Editor.csproj
View file

@ -310,9 +310,6 @@
<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>
@ -343,6 +340,9 @@
<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>

6
AK.Wwise.Unity.API.WwiseTypes.csproj
View file

@ -308,9 +308,6 @@
<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>
@ -341,6 +338,9 @@
<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>

6
AK.Wwise.Unity.API.csproj
View file

@ -416,9 +416,6 @@
<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>
@ -449,6 +446,9 @@
<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>

6
AK.Wwise.Unity.MonoBehaviour.Editor.csproj
View file

@ -309,9 +309,6 @@
<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>
@ -342,6 +339,9 @@
<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>

6
AK.Wwise.Unity.MonoBehaviour.csproj
View file

@ -330,9 +330,6 @@
<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>
@ -363,6 +360,9 @@
<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>

6
AK.Wwise.Unity.Timeline.Editor.csproj
View file

@ -287,9 +287,6 @@
<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>
@ -320,6 +317,9 @@
<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>

6
AK.Wwise.Unity.Timeline.csproj
View file

@ -293,9 +293,6 @@
<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>
@ -326,6 +323,9 @@
<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>

28
Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/SFX.wwu
View file

@ -3101,9 +3101,9 @@
</Sound>
</ChildrenList>
</Folder>
<Folder Name="Ion_cannon" ID="{29C6B342-4A84-46E2-9311-46294D25A37E}" ShortID="487576856">
<Folder Name="Laser" ID="{29C6B342-4A84-46E2-9311-46294D25A37E}" ShortID="487576856">
<ChildrenList>
<RandomSequenceContainer Name="IonCannon_fire" ID="{F342EF35-B9FB-43DF-AC49-9C25006D66F7}" ShortID="550015439">
<RandomSequenceContainer Name="Laser_fire" ID="{F342EF35-B9FB-43DF-AC49-9C25006D66F7}" ShortID="550015439">
<PropertyList>
<Property Name="3DSpatialization" Type="int16" Value="1"/>
<Property Name="NormalOrShuffle" Type="int16" Value="0"/>
@ -3229,7 +3229,7 @@
</ChildrenList>
<ObjectLists/>
</RandomSequenceContainer>
<RandomSequenceContainer Name="IonCanon_miss" ID="{A1EE3BC5-E24E-42FD-BC32-0B42BF2CAF89}" ShortID="31284936">
<RandomSequenceContainer Name="Laser_miss" ID="{A1EE3BC5-E24E-42FD-BC32-0B42BF2CAF89}" ShortID="31284936">
<PropertyList>
<Property Name="3DSpatialization" Type="int16" Value="2"/>
<Property Name="Lowpass" Type="int16">
@ -3367,7 +3367,7 @@
</ChildrenList>
<ObjectLists/>
</RandomSequenceContainer>
<RandomSequenceContainer Name="IonCannon_hit" ID="{D1773018-EB65-45CB-857B-1158EFED37A3}" ShortID="727113654">
<RandomSequenceContainer Name="Laser_hit" ID="{D1773018-EB65-45CB-857B-1158EFED37A3}" ShortID="727113654">
<PropertyList>
<Property Name="3DSpatialization" Type="int16" Value="2"/>
<Property Name="Highpass" Type="int16">
@ -3501,7 +3501,7 @@
</ChildrenList>
<ObjectLists/>
</RandomSequenceContainer>
<Sound Name="ionCannon_ship_destroyed" ID="{4410E0F9-FBD6-4B39-985B-CFA8D2385F93}" ShortID="885246363">
<Sound Name="Laser_ship_destroyed" ID="{4410E0F9-FBD6-4B39-985B-CFA8D2385F93}" ShortID="885246363">
<PropertyList>
<Property Name="3DSpatialization" Type="int16" Value="2"/>
<Property Name="Pitch" Type="int32">
@ -3543,7 +3543,7 @@
<ActiveSource Name="SFX_weapon_ioncannon_ship_destroyed" ID="{06FC6DD8-E446-4481-8CC6-F6D06DE4D03C}" Platform="Linked"/>
</ActiveSourceList>
</Sound>
<Sound Name="ionCannon_charge" ID="{AB1CDB93-B4E8-426C-988D-76F8F0A57434}" ShortID="25665205">
<Sound Name="Laser_charge" ID="{AB1CDB93-B4E8-426C-988D-76F8F0A57434}" ShortID="25665205">
<PropertyList>
<Property Name="3DSpatialization" Type="int16" Value="2"/>
</PropertyList>
@ -3695,7 +3695,7 @@
<ActiveSource Name="SoundSeed Grain" ID="{0B6801A8-8A69-4333-82C0-B9CC1C8C1BC9}" Platform="Linked"/>
</ActiveSourceList>
</Sound>
<Sound Name="ionCannon_fail" ID="{C6965B65-65A8-498F-80B0-B85675AAFDFE}" ShortID="38274307">
<Sound Name="Laser_fail" ID="{C6965B65-65A8-498F-80B0-B85675AAFDFE}" ShortID="38274307">
<PropertyList>
<Property Name="3DSpatialization" Type="int16" Value="2"/>
<Property Name="OutputBusVolume" Type="Real64">
@ -5524,7 +5524,7 @@
<RTPC Name="" ID="{C24276F7-4811-478B-950E-AD10001530EA}" ShortID="324897844">
<ReferenceList>
<Reference Name="ControlInput">
<ObjectRef Name="sfx_reactor_pitch" ID="{DB985387-9685-4E6D-BF7E-AAE3C0C79457}" WorkUnitID="{02152354-45CF-4389-B435-5367FA80C881}"/>
<ObjectRef Name="sfx_shared_pitch" ID="{DB985387-9685-4E6D-BF7E-AAE3C0C79457}" WorkUnitID="{02152354-45CF-4389-B435-5367FA80C881}"/>
</Reference>
</ReferenceList>
<Curve Name="" ID="{577E6ED0-82B9-43D7-8972-2AF5940AAEBA}">
@ -6152,7 +6152,7 @@
<PropertyList>
<Property Name="Volume" Type="Real64">
<ValueList>
<Value>-4.4</Value>
<Value>4.6</Value>
</ValueList>
</Property>
</PropertyList>
@ -6195,7 +6195,12 @@
</RTPC>
</RTPCList>
</Property>
<Property Name="FmAmount" Type="Real32" Value="12.1"/>
<Property Name="NoiseLevel" Type="Real32" Value="-11"/>
<Property Name="NoiseShape" Type="int32" Value="2"/>
<Property Name="OperationMode" Type="int32" Value="1"/>
<Property Name="Osc1Transpose" Type="int32" Value="-2387"/>
<Property Name="Osc2Pwm" Type="Real32" Value="69"/>
<Property Name="Osc2Transpose" Type="int32" Value="-909"/>
<Property Name="OutputLevel" Type="Real32" Value="-14">
<RTPCList>
@ -6697,6 +6702,11 @@
</Sound>
<Sound Name="Flamethrower SOUND" ID="{43AA608E-5C5B-455F-9397-B5A4277F211E}" ShortID="102997625">
<PropertyList>
<Property Name="Inclusion" Type="bool">
<ValueList>
<Value>False</Value>
</ValueList>
</Property>
<Property Name="IsLoopingEnabled" Type="bool" Value="True"/>
<Property Name="OverrideEffect" Type="bool" Value="True"/>
<Property Name="Volume" Type="Real64">

22
Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache
View file

@ -6,7 +6,7 @@
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\States\Default Work Unit.wwu" DateLow="1619652115" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Soundcaster Sessions\Default Work Unit.wwu" DateLow="1619758624" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\SoundBanks\SFX.wwu" DateLow="1619766556" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\SoundBanks\Music.wwu" DateLow="1619679742" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\SoundBanks\Music.wwu" DateLow="1619770991" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\SoundBanks\Default Work Unit.wwu" DateLow="1619679323" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\SoundBanks\Ambience SB Unit.wwu" DateLow="1619677843" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Queries\Factory Queries.wwu" DateLow="1619652116" DateHigh="0"/>
@ -18,29 +18,29 @@
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Metadata\Default Work Unit.wwu" DateLow="1619672901" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Master-Mixer Hierarchy\Default Work Unit.wwu" DateLow="1619652115" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Master-Mixer Hierarchy\Ambience MM Unit.wwu" DateLow="1619672812" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Interactive Music Hierarchy\Overworld.wwu" DateLow="1619672610" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Interactive Music Hierarchy\Overworld.wwu" DateLow="1619914416" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Interactive Music Hierarchy\Menu_Music.wwu" DateLow="1619672610" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Interactive Music Hierarchy\Default Work Unit.wwu" DateLow="1619652116" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Interactive Music Hierarchy\Combat.wwu" DateLow="1619807524" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Interactive Music Hierarchy\Boss.wwu" DateLow="1619672610" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Interactive Music Hierarchy\Combat.wwu" DateLow="1619914416" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Interactive Music Hierarchy\Boss.wwu" DateLow="1619914416" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Game Parameters\SFX.wwu" DateLow="1619672610" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Game Parameters\Default Work Unit.wwu" DateLow="1619652115" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Events\SFX.wwu" DateLow="1619766556" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Events\Music.wwu" DateLow="1619679460" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Events\SFX.wwu" DateLow="1620042943" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Events\Music.wwu" DateLow="1619779820" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Events\Default Work Unit.wwu" DateLow="1619679460" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Events\Ambience.wwu" DateLow="1619672812" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Events\Ambience.wwu" DateLow="1619769605" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Effects\Factory Effects.wwu" DateLow="1619672816" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Effects\Default Work Unit.wwu" DateLow="1619765272" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Effects\Default Work Unit.wwu" DateLow="1619769078" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Dynamic Dialogue\Default Work Unit.wwu" DateLow="1619652116" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Conversion Settings\Factory Conversion Settings.wwu" DateLow="1619672900" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Conversion Settings\Default Work Unit.wwu" DateLow="1619652116" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Control Surface Sessions\Default Work Unit.wwu" DateLow="1619652116" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Audio Devices\Default Work Unit.wwu" DateLow="1619652115" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Attenuations\Default Work Unit.wwu" DateLow="1619672610" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Attenuations\Default Work Unit.wwu" DateLow="1619769078" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Aetheria-Economy_WwiseProject.wproj" DateLow="1619761573" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Aetheria-Economy_WwiseProject.rwvens.wsettings" DateLow="1619766556" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Aetheria-Economy_WwiseProject.rwvens.wsettings" DateLow="1620043071" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Actor-Mixer Hierarchy\UI.wwu" DateLow="1619672610" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Actor-Mixer Hierarchy\SFX.wwu" DateLow="1619766556" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Actor-Mixer Hierarchy\SFX.wwu" DateLow="1620042943" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Actor-Mixer Hierarchy\Default Work Unit.wwu" DateLow="1619672898" DateHigh="0"/>
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Actor-Mixer Hierarchy\Ambience AM Unit.wwu" DateLow="1619672812" DateHigh="0"/>
</ValidationCache>

18
Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings
View file

@ -115,9 +115,9 @@
<Property Name="GenerateSoundBanks\ListMode" Type="string" Value="Tree"/>
<Property Name="GenerateSoundBanks\x64_SelectedLanguages" Type="string" Value="BvDMKA=="/>
<Property Name="GenerateSoundBanks\x64_SelectedPlatforms" Type="string" Value="74wppGGLGUKocCTUjliE6atk2Ww+IVRJs5fEQCA5KRI="/>
<Property Name="GenerateSoundBanks\x64_SelectedSoundBanks" Type="string" Value="Za5mlmZVs0yOu7E3c3kEhXSKlUaqlINNhKJXlakG6GQfnIXJkYCYRrdjdxmYIwyBSmgS3nSEw0miaQE+YFVy9ZPwTm+6m8RNhDaG4kRxYasGP8deqPT2SLY96I6guRCtqIP/fJnGjkyqUQMYlBqq04NvLQMUCLxJoWBsgvdZEq3thAk1VRuHQKFsG3D+ioKLkXoxD61LqUCO+4Lawl5ffJ4FL/v2+bRBo/3Iezc3mrRhO2GpvVNORZtuDp8Fh1/6KIMtl4HI002epB73v2D5XEDzRwKdZpdGp9A1J8v1gGkHDOPiWGJmTb0MvxoxxAruEqVoKQFKSkSwW9fwHyzGX3zVNCY9JBdJi7DIXcLnL0MhDBOG3YG4TZAq8XLM15Zm"/>
<Property Name="GenerateSoundBanks\x64_SelectedSoundBanks" Type="string" Value="Za5mlmZVs0yOu7E3c3kEhXSKlUaqlINNhKJXlakG6GST8E5vupvETYQ2huJEcWGrSmgS3nSEw0miaQE+YFVy9QY/x16o9PZItj3ojqC5EK2og/98mcaOTKpRAxiUGqrTg28tAxQIvEmhYGyC91kSrR+chcmRgJhGt2N3GZgjDIHthAk1VRuHQKFsG3D+ioKLkXoxD61LqUCO+4Lawl5ffJ4FL/v2+bRBo/3Iezc3mrRhO2GpvVNORZtuDp8Fh1/6KIMtl4HI002epB73v2D5XEDzRwKdZpdGp9A1J8v1gGkHDOPiWGJmTb0MvxoxxAruEqVoKQFKSkSwW9fwHyzGX3zVNCY9JBdJi7DIXcLnL0MhDBOG3YG4TZAq8XLM15Zm"/>
<Property Name="HardwareController\CurrentSession" Type="string" Value="{2451DD2E-A7B2-45E6-B93B-6F49B9B887AD}"/>
<Property Name="HardwareController\{2451DD2E-A7B2-45E6-B93B-6F49B9B887AD}\x64_ActiveGroups" Type="string" Value="sahohopAK0WRE4XvXPYF/QHvd2f/////+lZlPDTFnUSwqLpTpFltuQHvd2f/////"/>
<Property Name="HardwareController\{2451DD2E-A7B2-45E6-B93B-6F49B9B887AD}\x64_ActiveGroups" Type="string" Value="sahohopAK0WRE4XvXPYF/QHvygD/////+lZlPDTFnUSwqLpTpFltuQHvygD/////"/>
<Property Name="Interactive Music\x64_{065373CA-B6B7-4634-9C4B-6D6F79214FAA} - SegmentEditorZoomInfo" Type="string" Value="AAAAAAAA8D8AAAAAAADwP+PLJfkeqhdAAAAAAAAA8D8AAAAAAAAAAAAAAAAAAAAA"/>
<Property Name="Interactive Music\x64_{586B920D-AA94-4B2C-828B-37B68C3F2982} - SegmentEditorZoomInfo" Type="string" Value="AAAAAAAA8D8AAAAAAADwPxf6U4KZ8SFAAAAAAAAA8D8AAAAAAAAAAAAAAAAAAAAA"/>
<Property Name="Interactive Music\x64_{7282DE71-9B0C-4E9B-960C-0EF0036250A4} - SegmentEditorZoomInfo" Type="string" Value="AAAAAAAA8D8AAAAAAADwP4NGy0A+qhxAAAAAAAAA8D8AAAAAAAAAAAAAAAAAAAAA"/>
@ -150,9 +150,9 @@
<Property Name="ProjectExplorer\FirstVisible_10_1" Type="string" Value="{4C96B38B-3DB4-40C7-91C9-665510E38993}"/>
<Property Name="ProjectExplorer\FirstVisible_11_1" Type="string" Value="{4C96B38B-3DB4-40C7-91C9-665510E38993}"/>
<Property Name="ProjectExplorer\FirstVisible_12_1" Type="string" Value="{23EC2DE3-3ED8-4B82-AC99-92E25F2E4C6B}"/>
<Property Name="ProjectExplorer\FirstVisible_1_1" Type="string" Value="{9A1CEC8E-BF0E-473B-970B-316CB723C123}"/>
<Property Name="ProjectExplorer\FirstVisible_1_1" Type="string" Value="{076C9B1F-5546-43DA-8A92-E4A1C9B3FD42}"/>
<Property Name="ProjectExplorer\FirstVisible_3_1" Type="string" Value="{A69BF0FC-D84A-487C-ABDD-56F71CB2A126}"/>
<Property Name="ProjectExplorer\FirstVisible_4_1" Type="string" Value="{A69BF0FC-D84A-487C-ABDD-56F71CB2A126}"/>
<Property Name="ProjectExplorer\FirstVisible_4_1" Type="string" Value="{FD58627D-DA04-4181-8A2E-6995EE927024}"/>
<Property Name="ProjectExplorer\FirstVisible_5_1" Type="string" Value="{CB6175F1-6080-4A23-92EF-0807E304D0C1}"/>
<Property Name="ProjectExplorer\FirstVisible_6_1" Type="string" Value="{C98E673F-A24C-48A8-960F-10565FFE70A0}"/>
<Property Name="ProjectExplorer\FirstVisible_7_1" Type="string" Value="{C98E673F-A24C-48A8-960F-10565FFE70A0}"/>
@ -161,7 +161,7 @@
<Property Name="ProjectExplorer\x64_Expanded_10_1" Type="string" Value=""/>
<Property Name="ProjectExplorer\x64_Expanded_11_1" Type="string" Value=""/>
<Property Name="ProjectExplorer\x64_Expanded_12_1" Type="string" Value=""/>
<Property Name="ProjectExplorer\x64_Expanded_13_1" Type="string" Value="glV0iEvh3UqLmas2xlR/ZQ=="/>
<Property Name="ProjectExplorer\x64_Expanded_13_1" Type="string" Value="q2PPeqBdrkC8FluEK/lXKQk+ngR9C+hDlZu300kLqf/xhFaWG58XRbGhviCrj5N6KHNLKmE8UkaVaxXDHGvW0/Qit3ydOGdIh8oAEgp0WiKCVXSIS+HdSouZqzbGVH9lvvuxxoiq2E+c+gyku4FwHg=="/>
<Property Name="ProjectExplorer\x64_Expanded_14_1" Type="string" Value=""/>
<Property Name="ProjectExplorer\x64_Expanded_15_1" Type="string" Value=""/>
<Property Name="ProjectExplorer\x64_Expanded_16_1" Type="string" Value=""/>
@ -173,11 +173,11 @@
<Property Name="ProjectExplorer\x64_Expanded_21_1" Type="string" Value=""/>
<Property Name="ProjectExplorer\x64_Expanded_22_1" Type="string" Value=""/>
<Property Name="ProjectExplorer\x64_Expanded_2_1" Type="string" Value=""/>
<Property Name="ProjectExplorer\x64_Expanded_3_1" Type="string" Value="5mszmjEJjECJveimULc2l46W+RB4AExBtz0hqhzQnTjPI8UPqH1WQbN7uyK/xgNKVI3ktLWgckGKYQE8z7BY+PTb3+UhV4dBjSXZCQNwDunYuB1IozuKQriz3s9aVo1gH5tsB0ZV2kOKkuShybP9Qpkz5THOTOBDtfA+35hlc55Cs8YphEriRpMRRilNJaN+khYaWL9TlUmfePddww/G4vTBX5q6eQZKmYRlpN0cgWcC2uELycCNTIuMoMz51Dh5HkaXnz0bs0yQFCiCY44KDeFVZTRYeCpOuazMHkmQdZ48yhXyEBJzTp7NPm9zaSNenR/7A5/ZME+zuB8bdC0sVVslBUJ9p0VPuiXWa/gjnNU="/>
<Property Name="ProjectExplorer\x64_Expanded_4_1" Type="string" Value="b86WNzs/4ECYHGe30VU4Ogd3h6Oyam9BvX1qY9Qdt159Ylj9BNqBQYouaZXuknAkG45wuqgOeEOn/3IPHWJugk7w5D3DJHVHtzDUkl6YB6UG7kARaSSVR5JQDHK/+u8b6B6PCYa/CkmNjMns+nbtKq/od+46YaJJjHfjezhn53A6JKx5R065SaDiKxYo5giMXMvPttDmEk2LW5meVxT4OUrP9+SN5FZNlRdhY6pOj7PHSPHQZkf5TrJeAy5qNDmm"/>
<Property Name="ProjectExplorer\x64_Expanded_3_1" Type="string" Value="5mszmjEJjECJveimULc2ly1MVjXJG7tAs2XZxKR65fGOlvkQeABMQbc9Iaoc0J04zyPFD6h9VkGze7siv8YDSlSN5LS1oHJBimEBPM+wWPj029/lIVeHQY0l2QkDcA7p2LgdSKM7ikK4s97PWlaNYB+bbAdGVdpDipLkocmz/UKZM+UxzkzgQ7XwPt+YZXOeQrPGKYRK4kaTEUYpTSWjfpIWGli/U5VJn3j3XcMPxuL0wV+aunkGSpmEZaTdHIFnAtrhC8nAjUyLjKDM+dQ4eR5Gl589G7NMkBQogmOOCg3hVWU0WHgqTrmszB5JkHWePMoV8hASc06ezT5vc2kjXp0f+wOf2TBPs7gfG3QtLFVbJQVCfadFT7ol1mv4I5zV"/>
<Property Name="ProjectExplorer\x64_Expanded_4_1" Type="string" Value="RKCoPPy0bkCCcQXv8eepOG/Oljc7P+BAmBxnt9FVODoHd4ejsmpvQb19amPUHbdefWJY/QTagUGKLmmV7pJwJL9QNYS3yZtCiqiLuGpAITwbjnC6qA54Q6f/cg8dYm6CungmQHz3rUOTPoxwGuOBS1bDQsXzBtdDh7ejsX9loVlN1jbmEMy7Rb/5y3dd5BFpTvDkPcMkdUe3MNSSXpgHpQbuQBFpJJVHklAMcr/67xtVbZDm/nqrR5O1mbNTJWEN6B6PCYa/CkmNjMns+nbtKq/od+46YaJJjHfjezhn53A6JKx5R065SaDiKxYo5giMPY3G4xeZDUudCukE17j89/hzr7EXj1ZLlMBEHXdzkjSDYFNyrKOxS77srGpI90ncXMvPttDmEk2LW5meVxT4OUrP9+SN5FZNlRdhY6pOj7MDJpsIq+jHTpHNOvX+wVKlx0jx0GZH+U6yXgMuajQ5pg=="/>
<Property Name="ProjectExplorer\x64_Expanded_5_1" Type="string" Value="AlekTQhF7EqFkQdJV+6xTg=="/>
<Property Name="ProjectExplorer\x64_Expanded_6_1" Type="string" Value=""/>
<Property Name="ProjectExplorer\x64_Expanded_7_1" Type="string" Value="doQntELI5kGtE2rkfBxVjyfZzEr0CYhCuHx7RCyc+wpTRbUZkJf+RatZRJvgZjsRuEOx6rqWs0qCWbTlW0NSOurQOJFOmZRMoCJQCbs1/Dvs1tDx12JSTbtZn+j62qdtPdunN+1Z302GveAHIPhfI/OeHmWIm8xPtlOqph86KSE="/>
<Property Name="ProjectExplorer\x64_Expanded_7_1" Type="string" Value="XauXjQKuVUGiRlV8dB3srnaEJ7RCyOZBrRNq5HwcVY8n2cxK9AmIQrh8e0QsnPsKW3PN2icgxEWSMy36nfKfTFNFtRmQl/5Fq1lEm+BmOxG4Q7HqupazSoJZtOVbQ1I66tA4kU6ZlEygIlAJuzX8O+zW0PHXYlJNu1mf6Prap20926c37VnfTYa94Acg+F8j3jePNb9nT06OOrLWe8QYMPOeHmWIm8xPtlOqph86KSE="/>
<Property Name="ProjectExplorer\x64_Expanded_8_1" Type="string" Value="Bclcc8A9IEKzeqI7Supe3jIjyQqAyJNCm3a9EGUqOnlUIxUCz0WJQ7Q1U2f6gMiBFoxM0KuClUixgZXTU5VpUbkoo5lcDOZKuGjI/8sf/8IGMi54KI/mTJCHmw6uWg5Y"/>
<Property Name="ProjectExplorer\x64_Expanded_9_1" Type="string" Value=""/>
<Property Name="RTPC\GameParameterSimValue\{054DD684-3F0A-4629-BB94-1E5A662EED8A}" Type="Real64" Value="0.94"/>
@ -200,7 +200,7 @@
<Property Name="RTPC\GameParameterSimValue\{D962E3DD-1F06-4C09-B49B-B4158D76A581}" Type="Real64" Value="0.01"/>
<Property Name="RTPC\GameParameterSimValue\{DB985387-9685-4E6D-BF7E-AAE3C0C79457}" Type="Real64" Value="0"/>
<Property Name="RTPC\GameParameterSimValue\{E9101997-FD09-41DC-8BB2-B7519B030AE8}" Type="Real64" Value="1"/>
<Property Name="SoundBank Manager\x64_Expand States" Type="string" Value="J9nMSvQJiEK4fHtELJz7ClNFtRmQl/5Fq1lEm+BmOxG4Q7HqupazSoJZtOVbQ1I6854eZYibzE+2U6qmHzopIerQOJFOmZRMoCJQCbs1/Ds="/>
<Property Name="SoundBank Manager\x64_Expand States" Type="string" Value="J9nMSvQJiEK4fHtELJz7ClNFtRmQl/5Fq1lEm+BmOxHeN481v2dPTo46stZ7xBgwXauXjQKuVUGiRlV8dB3srrhDseq6lrNKglm05VtDUjrznh5liJvMT7ZTqqYfOikh6tA4kU6ZlEygIlAJuzX8Ow=="/>
<Property Name="SoundBankHeaderFilePath" Type="string" Value="GeneratedSoundBanks\"/>
<Property Name="SoundBankPaths" Type="string">
<ValueList>

6
Aetheria-Economy_WwiseProject/Effects/Default Work Unit.wwu
View file

@ -167,6 +167,12 @@
<Property Name="MicType" Type="int32" Value="2"/>
</PropertyList>
<ChildrenList>
<PluginMediaSource Name="" ID="{12941026-82A3-4EFA-AD77-05C698EF90D4}">
<ParentPluginID>462899</ParentPluginID>
<MediaIDList>
<MediaID ID="435959294"/>
</MediaIDList>
</PluginMediaSource>
<PluginMediaSource Name="" ID="{1F3B134D-785E-4F0C-A17E-56AFA6979FED}">
<ParentPluginID>462899</ParentPluginID>
<MediaIDList>

58
Aetheria-Economy_WwiseProject/Events/SFX.wwu
View file

@ -53,75 +53,75 @@
</Event>
</ChildrenList>
</Folder>
<Folder Name="IonCannon" ID="{FD58627D-DA04-4181-8A2E-6995EE927024}" ShortID="438738720">
<Folder Name="Laser" ID="{FD58627D-DA04-4181-8A2E-6995EE927024}" ShortID="438738720">
<ChildrenList>
<Event Name="IonCannon_hit" ID="{6EB479E4-48C4-481D-98EB-93C4689AF319}">
<Event Name="Laser_hit" ID="{6EB479E4-48C4-481D-98EB-93C4689AF319}">
<ChildrenList>
<Action Name="" ID="{CC64CB9C-D2CF-4CFA-8B65-50D58C7A6BCC}" ShortID="140328872">
<ReferenceList>
<Reference Name="Target">
<ObjectRef Name="IonCannon_hit" ID="{D1773018-EB65-45CB-857B-1158EFED37A3}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>
<ObjectRef Name="Laser_hit" ID="{D1773018-EB65-45CB-857B-1158EFED37A3}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>
</Reference>
</ReferenceList>
</Action>
</ChildrenList>
</Event>
<Event Name="IonCannon_ship_destroyed" ID="{9E66D8B7-AEC1-47DC-ADE4-2C830F5C4E87}">
<Event Name="Laser_ship_destroyed" ID="{9E66D8B7-AEC1-47DC-ADE4-2C830F5C4E87}">
<ChildrenList>
<Action Name="" ID="{245AF479-9936-4903-8E31-952A10E1043E}" ShortID="283819787">
<ReferenceList>
<Reference Name="Target">
<ObjectRef Name="ionCannon_ship_destroyed" ID="{4410E0F9-FBD6-4B39-985B-CFA8D2385F93}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>
<ObjectRef Name="Laser_ship_destroyed" ID="{4410E0F9-FBD6-4B39-985B-CFA8D2385F93}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>
</Reference>
</ReferenceList>
</Action>
</ChildrenList>
</Event>
<Event Name="IonCannon_fire" ID="{4E75BD76-EFDF-4729-B419-2CD3EFAC87ED}">
<Event Name="Laser_fire" ID="{4E75BD76-EFDF-4729-B419-2CD3EFAC87ED}">
<ChildrenList>
<Action Name="" ID="{F2F429D0-BCC4-4B5D-BBC2-3059D5AB6E19}" ShortID="872318280">
<ReferenceList>
<Reference Name="Target">
<ObjectRef Name="IonCannon_fire" ID="{F342EF35-B9FB-43DF-AC49-9C25006D66F7}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>
<ObjectRef Name="Laser_fire" ID="{F342EF35-B9FB-43DF-AC49-9C25006D66F7}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>
</Reference>
</ReferenceList>
</Action>
</ChildrenList>
</Event>
<Event Name="IonCannon_miss" ID="{EE886D7C-E644-4E41-918C-332FFC333B4E}">
<Event Name="Laser_miss" ID="{EE886D7C-E644-4E41-918C-332FFC333B4E}">
<ChildrenList>
<Action Name="" ID="{815946CD-5CC9-439B-BC4A-4C9DD96620BC}" ShortID="70575548">
<ReferenceList>
<Reference Name="Target">
<ObjectRef Name="IonCanon_miss" ID="{A1EE3BC5-E24E-42FD-BC32-0B42BF2CAF89}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>
<ObjectRef Name="Laser_miss" ID="{A1EE3BC5-E24E-42FD-BC32-0B42BF2CAF89}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>
</Reference>
</ReferenceList>
</Action>
</ChildrenList>
</Event>
<Event Name="IonCannon_charge_play" ID="{926CA47C-05B7-443F-92F1-7F99ED878BFE}">
<Event Name="Laser_charge_play" ID="{926CA47C-05B7-443F-92F1-7F99ED878BFE}">
<ChildrenList>
<Action Name="" ID="{739F5D09-3808-4D68-9B17-DFDAA22D3ABF}" ShortID="67337178">
<ReferenceList>
<Reference Name="Target">
<ObjectRef Name="ionCannon_charge" ID="{AB1CDB93-B4E8-426C-988D-76F8F0A57434}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>
<ObjectRef Name="Laser_charge" ID="{AB1CDB93-B4E8-426C-988D-76F8F0A57434}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>
</Reference>
</ReferenceList>
</Action>
</ChildrenList>
</Event>
<Event Name="IonCannon_fail" ID="{67274AD3-8D3A-4041-A799-9BE929F06BD1}">
<Event Name="Laser_fail" ID="{67274AD3-8D3A-4041-A799-9BE929F06BD1}">
<ChildrenList>
<Action Name="" ID="{5F0013C9-B73C-4066-9681-830BBC7746DC}" ShortID="748997812">
<ReferenceList>
<Reference Name="Target">
<ObjectRef Name="ionCannon_fail" ID="{C6965B65-65A8-498F-80B0-B85675AAFDFE}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>
<ObjectRef Name="Laser_fail" ID="{C6965B65-65A8-498F-80B0-B85675AAFDFE}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>
</Reference>
</ReferenceList>
</Action>
</ChildrenList>
</Event>
<Event Name="IonCannon_charge_stop" ID="{F041A256-D33B-4117-91CF-085BF306F5B4}">
<Event Name="Laser_charge_stop" ID="{F041A256-D33B-4117-91CF-085BF306F5B4}">
<ChildrenList>
<Action Name="" ID="{8352FBF7-3D17-4D49-B304-7509010C6D72}" ShortID="676779554">
<PropertyList>
@ -129,7 +129,7 @@
</PropertyList>
<ReferenceList>
<Reference Name="Target">
<ObjectRef Name="ionCannon_charge" ID="{AB1CDB93-B4E8-426C-988D-76F8F0A57434}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>
<ObjectRef Name="Laser_charge" ID="{AB1CDB93-B4E8-426C-988D-76F8F0A57434}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>
</Reference>
</ReferenceList>
</Action>
@ -434,13 +434,6 @@
</ReferenceList>
</Action>
<Action Name="" ID="{6E68BD96-F32A-4109-8F63-3ED2AC416043}" ShortID="978335520">
<PropertyList>
<Property Name="Inclusion" Type="bool">
<ValueList>
<Value>False</Value>
</ValueList>
</Property>
</PropertyList>
<ReferenceList>
<Reference Name="Target">
<ObjectRef Name="rotor_plates" ID="{A37F3F85-4288-4EB1-81BD-69F2EEE878C6}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>
@ -448,13 +441,6 @@
</ReferenceList>
</Action>
<Action Name="" ID="{491B69A0-6AD3-4AF7-88C7-3412B526689C}" ShortID="440511318">
<PropertyList>
<Property Name="Inclusion" Type="bool">
<ValueList>
<Value>False</Value>
</ValueList>
</Property>
</PropertyList>
<ReferenceList>
<Reference Name="Target">
<ObjectRef Name="dc_scifi" ID="{A24984F6-89AB-4005-A389-1BAC49311538}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>
@ -573,13 +559,6 @@
</ReferenceList>
</Action>
<Action Name="" ID="{DD0BDADF-CA20-4F28-8423-5599F689CBFE}" ShortID="952690825">
<PropertyList>
<Property Name="Inclusion" Type="bool">
<ValueList>
<Value>False</Value>
</ValueList>
</Property>
</PropertyList>
<ReferenceList>
<Reference Name="Target">
<ObjectRef Name="reactor" ID="{8D0ED9E5-D9D6-41E5-A093-CF203E6F2F95}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>
@ -633,13 +612,6 @@
<Event Name="thruster_play" ID="{99504764-B63E-48E8-A9A0-717489DD3466}">
<ChildrenList>
<Action Name="" ID="{AE15152D-2BC4-4BE2-8CC1-CE46A85F2139}" ShortID="131458033">
<PropertyList>
<Property Name="Inclusion" Type="bool">
<ValueList>
<Value>False</Value>
</ValueList>
</Property>
</PropertyList>
<ReferenceList>
<Reference Name="Target">
<ObjectRef Name="Thruster" ID="{35564C2D-1BC9-40BB-B365-D9C4A47AE5F1}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}"/>

12
Aetheria-Economy_WwiseProject/Game Parameters/SFX.wwu
View file

@ -11,12 +11,6 @@
<Property Name="Max" Type="Real64" Value="1"/>
</PropertyList>
</GameParameter>
<GameParameter Name="sfx_reactor_pitch" ID="{DB985387-9685-4E6D-BF7E-AAE3C0C79457}">
<PropertyList>
<Property Name="InitialValue" Type="Real64" Value="0"/>
<Property Name="Max" Type="Real64" Value="1"/>
</PropertyList>
</GameParameter>
<GameParameter Name="sfx_reactor_distortion2" ID="{72651D5D-22E1-4AEE-87FA-9F706D12B1DC}">
<PropertyList>
<Property Name="InitialValue" Type="Real64" Value="0"/>
@ -96,6 +90,12 @@
<Property Name="Max" Type="Real64" Value="1"/>
</PropertyList>
</GameParameter>
<GameParameter Name="sfx_shared_pitch" ID="{DB985387-9685-4E6D-BF7E-AAE3C0C79457}">
<PropertyList>
<Property Name="InitialValue" Type="Real64" Value="0"/>
<Property Name="Max" Type="Real64" Value="1"/>
</PropertyList>
</GameParameter>
</ChildrenList>
</Folder>
<Folder Name="Thrusters" ID="{99A328B9-0C5C-4AE6-B868-C8FFCB1FFFC2}" ShortID="936568629">

6
Aetheria-Economy_WwiseProject/SoundBanks/SFX.wwu
View file

@ -13,10 +13,10 @@
<ObjectExclusionList/>
<GameSyncExclusionList/>
</SoundBank>
<SoundBank Name="IonCannon" ID="{972D8328-C881-4DD3-9EA4-1EF7BF60F95C}">
<SoundBank Name="Laser" ID="{972D8328-C881-4DD3-9EA4-1EF7BF60F95C}">
<ObjectInclusionList>
<ObjectRef Name="IonCannon" ID="{FD58627D-DA04-4181-8A2E-6995EE927024}" WorkUnitID="{79AC243A-4E47-49B9-A0E2-2B1628E6088C}" Origin="Manual" Filter="7"/>
<ObjectRef Name="Ion_cannon" ID="{29C6B342-4A84-46E2-9311-46294D25A37E}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}" Origin="Manual" Filter="7"/>
<ObjectRef Name="Laser" ID="{FD58627D-DA04-4181-8A2E-6995EE927024}" WorkUnitID="{79AC243A-4E47-49B9-A0E2-2B1628E6088C}" Origin="Manual" Filter="7"/>
<ObjectRef Name="Laser" ID="{29C6B342-4A84-46E2-9311-46294D25A37E}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}" Origin="Manual" Filter="7"/>
</ObjectInclusionList>
<ObjectExclusionList/>
<GameSyncExclusionList/>

14
Aetheria-Economy_WwiseProject/Soundcaster Sessions/Default Work Unit.wwu
View file

@ -177,7 +177,7 @@
</RTPCValue>
<RTPCValue>
<GameParameterRef Name="sfx_ship_electric_speed" ID="{9D610C30-BA07-43EF-B2E3-6CEB72857C03}"/>
<Value>0.54</Value>
<Value>0.66</Value>
</RTPCValue>
<RTPCValue>
<GameParameterRef Name="sfx_weapon_lightning_grain_filter" ID="{441AD5D1-8E39-451F-8505-8AF4C9DA76B0}"/>
@ -185,7 +185,7 @@
</RTPCValue>
<RTPCValue>
<GameParameterRef Name="sfx_ship_rotor_plates_grain_filter" ID="{054DD684-3F0A-4629-BB94-1E5A662EED8A}"/>
<Value>0.94</Value>
<Value>0.24</Value>
</RTPCValue>
<RTPCValue>
<GameParameterRef Name="sfx_reactor_alarm" ID="{778F5836-B82F-46F8-936A-E8581E9DA7A9}"/>
@ -197,7 +197,7 @@
</RTPCValue>
<RTPCValue>
<GameParameterRef Name="ship_velocity" ID="{B907BE30-367C-4955-AF3B-AF6B2806F9D5}"/>
<Value>100</Value>
<Value>74</Value>
</RTPCValue>
<RTPCValue>
<GameParameterRef Name="sfx_shared_lfo_intensity" ID="{4193E609-4585-49C0-8CCB-989754DC1284}"/>
@ -217,19 +217,19 @@
</RTPCValue>
<RTPCValue>
<GameParameterRef Name="sfx_ship_drive_electric_fuzzbox_filter" ID="{0FCABA25-DB66-4E12-ABEC-6E75E92AD397}"/>
<Value>1</Value>
<Value>0.96</Value>
</RTPCValue>
<RTPCValue>
<GameParameterRef Name="sfx_reactor_pitch" ID="{DB985387-9685-4E6D-BF7E-AAE3C0C79457}"/>
<GameParameterRef Name="sfx_shared_pitch" ID="{DB985387-9685-4E6D-BF7E-AAE3C0C79457}"/>
<Value>0</Value>
</RTPCValue>
<RTPCValue>
<GameParameterRef Name="sfx_ship_drive_nuclear_grain_speed_mod" ID="{73534BF8-0FC9-4F33-92A9-D9E445654891}"/>
<Value>0.71</Value>
<Value>0</Value>
</RTPCValue>
<RTPCValue>
<GameParameterRef Name="sfx_ship_drive_nuclear_filterDuration" ID="{B54383F3-A1EF-4FCA-94D5-24A7E4AC228C}"/>
<Value>0.5</Value>
<Value>1</Value>
</RTPCValue>
</RTPCValueList>
<CurrentStateList ShowAll="true"/>

8
Aetheria.Shared.Unity.csproj
View file

@ -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\LiteNetLib\Utils\NetSerializer.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\MIConvexHull\ConvexHull\Collections.cs" />
<Compile Include="Assets\Scripts\ServerShared\NIH\LinqFaster\Count.cs" />
<Compile Include="Assets\Scripts\ServerShared\NIH\LinqFaster\Utils\ComparerMagic.cs" />
@ -263,9 +263,6 @@
<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>
@ -296,6 +293,9 @@
<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>

6
Ak.Wwise.Api.WAAPI.csproj
View file

@ -289,9 +289,6 @@
<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>
@ -322,6 +319,9 @@
<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>

4
Assets/InputDisplayKey.cs
View file

@ -6,8 +6,8 @@ using UnityEngine.UI;
public class InputDisplayKey : MonoBehaviour
{
public TextMeshProUGUI First;
public TextMeshProUGUI Second;
public TextMeshProUGUI MainLabel;
public TextMeshProUGUI AltLabel;
public Image Fill;
public Image Outline;
public LayoutElement LayoutElement;

375
Assets/InputDisplayLayout.cs
View file

@ -2,38 +2,296 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using MessagePack;
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
using TMPro;
using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.UI;
using UnityEngine.UI.Extensions;
using Unity.Mathematics;
using static Unity.Mathematics.math;
public class InputDisplayLayout : MonoBehaviour
{
public VerticalLayoutGroup RowContainer;
public TextAsset LayoutFile;
public Prototype LabelPrototype;
public Prototype LinePrototype;
//public UILineRendererList LineRenderer;
public Prototype RowPrototype;
public Prototype RowSpacerPrototype;
public int KeySize = 64;
public Color DefaultColor;
public Color HighlightColor;
public float FillBrightness = .5f;
public float FillAlpha;
public float FillMultiplier = .25f;
public float InactiveMultiplier = .333f;
public int TestSteps = 5;
public float TestPadding = 4;
public float BoxLineExpand = -1;
public Color GlobalColor;
public float GlobalHueBuffer = .1f;
private Canvas _canvas;
private Color _defaultInactiveColor;
private InputLayout _inputLayout;
private Dictionary<InputLayoutBindableKey, InputDisplayKey> _displayKeys = new Dictionary<InputLayoutBindableKey, InputDisplayKey>();
private Dictionary<string, InputLayoutBindableKey> _bindKeys = new Dictionary<string, InputLayoutBindableKey>();
private Dictionary<InputDisplayKey, InputAction> _actionMap = new Dictionary<InputDisplayKey, InputAction>();
private Dictionary<InputAction, TextMeshProUGUI> _actionLabels = new Dictionary<InputAction, TextMeshProUGUI>();
private Dictionary<InputAction, Color> _actionColors = new Dictionary<InputAction, Color>();
private List<Rect> _reservedRects = new List<Rect>();
private List<LayoutGroup> _layoutGroups = new List<LayoutGroup>();
private string FullKeyPath(string shortPath) => $"<Keyboard>/{shortPath}";
private string ShortKeyPath(string fullPath) => fullPath.Substring(fullPath.LastIndexOf('/') + 1);
void Start()
{
_canvas = transform.root.GetComponent<Canvas>();
_defaultInactiveColor = DefaultColor;
_defaultInactiveColor.a *= InactiveMultiplier;
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));
DisplayLayout(_inputLayout);
foreach (var key in _inputLayout.GetBindableKeys())
{
var fullInputPath = FullKeyPath(key.InputSystemPath);
_bindKeys[fullInputPath] = key;
// var keyPress = new InputAction(binding: fullInputPath);
// keyPress.started += context =>
// {
// var displayKey = _displayKeys[key];
// displayKey.Outline.color = HighlightColor;
// var fillColor = HighlightColor;
// fillColor *= FillMultiplier;
// fillColor.a = FillAlpha;
// displayKey.Fill.color = fillColor;
// };
// keyPress.canceled += context =>
// {
// var displayKey = _displayKeys[key];
// displayKey.Outline.color = DefaultColor;
// var fillColor = DefaultColor;
// fillColor *= FillMultiplier;
// fillColor.a = FillAlpha;
// displayKey.Fill.color = fillColor;
// };
// keyPress.Enable();
}
var input = new AetheriaInput();
// input.Global.Dock.performed += context => Debug.Log("Docking!");
// input.Global.GalaxyMap.performed += context =>
// {
// input.Global.Dock.Disable();
// var rebindOperation = input.Global.Dock.PerformInteractiveRebinding()
// .WithControlsExcluding("Mouse")
// .WithCancelingThrough("<Keyboard>/escape")
// .OnMatchWaitForAnother(0.2f)
// .Start();
// Debug.Log("Rebinding Dock!");
// rebindOperation.OnComplete(operation =>
// {
// Debug.Log("Rebinding Complete!");
// input.Global.Dock.Enable();
// });
// };
// input.Enable();
_layoutGroups.Add(RowContainer);
// foreach (var group in _layoutGroups)
// {
// group.CalculateLayoutInputHorizontal();
// group.CalculateLayoutInputVertical();
// group.SetLayoutHorizontal();
// group.SetLayoutVertical();
// LayoutRebuilder.ForceRebuildLayoutImmediate(group.GetComponent<RectTransform>());
// }
// LayoutRebuilder.ForceRebuildLayoutImmediate(GetComponent<RectTransform>());
Canvas.ForceUpdateCanvases();
Color.RGBToHSV(GlobalColor, out var hue, out var saturation, out var value);
var actionIndex = 0;
var actionCount = (float) input.asset.Count(a=>a.actionMap.name!="UI");
foreach (var action in input.asset)
{
if(action.actionMap.name=="UI") continue;
var h = frac(hue + GlobalHueBuffer + actionIndex++ / actionCount * (1 - GlobalHueBuffer * 2));
if (action.actionMap.name == "Global")
{
h = hue;
_actionColors[action] = GlobalColor;
}
else
_actionColors[action] = Color.HSVToRGB(h, saturation, value);
foreach (var binding in action.bindings)
{
if (_bindKeys.ContainsKey(binding.path))
{
var displayKey = _displayKeys[_bindKeys[binding.path]];
displayKey.Fill.color = Color.HSVToRGB(h, saturation, FillBrightness);
displayKey.Outline.gameObject.SetActive(true);
displayKey.Outline.color = displayKey.MainLabel.color = displayKey.AltLabel.color = _actionColors[action];
_actionMap[displayKey] = action;
_reservedRects.Add(displayKey.GetComponent<RectTransform>().ScreenSpaceRect());
}
}
}
var center = _actionMap.Keys.Aggregate(Vector2.zero, (v, displayKey) => v + (Vector2) displayKey.transform.position) / _actionMap.Keys.Count;
foreach (var x in _actionMap)
{
var key = x.Key;
var action = x.Value;
if(_actionLabels.ContainsKey(action)) continue;
var label = LabelPrototype.Instantiate<TextMeshProUGUI>();
label.color = _actionColors[action];
_actionLabels[action] = label;
var labelRect = label.rectTransform;
label.text = _actionMap[key].name.Replace(' ', '\n');
LayoutRebuilder.ForceRebuildLayoutImmediate(labelRect);
var pos = (Vector2) key.transform.position;
var dir = (pos - center).normalized;
label.transform.position = FindLabelPosition(key.GetComponent<RectTransform>(), labelRect, dir);
}
foreach (var x in _actionMap)
{
var key = x.Key;
var action = x.Value;
var keyBounds = key.Outline.rectTransform.GetBounds(BoxLineExpand);
var labelPoint = (Vector2) _actionLabels[action].rectTransform.GetBounds().ClosestPoint(key.Outline.transform.position);
var keyPoint = (Vector2) keyBounds.ClosestPoint(labelPoint);
var line = LinePrototype.Instantiate<UILineRenderer>();
line.color = _actionColors[action];
line.Points = new[] { keyPoint, labelPoint };
}
//StartCoroutine(AssociateInputKeys(_inputLayout));
}
private Vector2 FindLabelPosition(RectTransform key, RectTransform label, Vector2 dir)
{
var keyRect = key.ScreenSpaceRect();
var labelRect = label.ScreenSpaceRect(TestPadding);
var localRects = Overlap(key.ScreenSpaceRect(TestSteps * KeySize));
var keyCenter = keyRect.center;
for (int dist = KeySize; dist < TestSteps * KeySize; dist++)
{
for (float theta = 0; theta < PI * 2; theta += PI / 32)
{
for (int s = -1; s <= 1; s += 2)
{
var testPos = keyCenter + dir.Rotate(theta * s) * dist;
var testRect = new Rect(testPos - labelRect.size / 2, labelRect.size);
if(!localRects.Any(r => r.Overlaps(testRect)))
{
_reservedRects.Add(testRect);
return testPos;
}
}
}
}
return Vector2.zero;
}
private Rect[] Overlap(Rect rect) => _reservedRects.Where(r => r.Overlaps(rect)).ToArray();
public void DisplayLayout(InputLayout layout)
{
foreach (var row in layout.Rows)
{
if (row is InputLayoutKeyRow keyRow)
{
var displayRow = RowPrototype.Instantiate<InputDisplayRow>();
_layoutGroups.Add(displayRow.LayoutGroup);
foreach (var column in keyRow.Columns)
{
if (column is InputLayoutColumnSpacer)
{
displayRow.KeySpacerPrototype.Instantiate<LayoutElement>().preferredWidth = KeySize * column.Width;
}
else if (column is InputLayoutKey)
{
var displayKey = displayRow.KeyPrototype.Instantiate<InputDisplayKey>();
displayKey.LayoutElement.preferredHeight = KeySize;
displayKey.LayoutElement.preferredWidth = KeySize * column.Width;
displayKey.Outline.gameObject.SetActive(false);
displayKey.Outline.color = DefaultColor;
var fillColor = DefaultColor;
fillColor *= FillMultiplier;
fillColor.a = FillAlpha;
displayKey.MainLabel.color = displayKey.AltLabel.color = Color.Lerp(_defaultInactiveColor, fillColor, .5f);
if (column is InputLayoutBindableKey key)
{
_displayKeys[key] = displayKey;
displayKey.MainLabel.text = key.MainLabel;
displayKey.AltLabel.text = key.AltLabel;
if (column is InputLayoutMultiRowKey multiRowKey)
{
displayKey.Outline.rectTransform.anchorMin =
displayKey.MainLabel.rectTransform.anchorMin =
displayKey.AltLabel.rectTransform.anchorMin =
displayKey.Fill.rectTransform.anchorMin = Vector2.down * (multiRowKey.Height - 1);
}
}
else
{
fillColor.a *= InactiveMultiplier;
displayKey.MainLabel.text = "";
displayKey.AltLabel.text = "";
}
displayKey.Fill.color = fillColor;
}
else
{
throw new ArgumentOutOfRangeException(nameof(column));
}
}
}
else if (row is InputLayoutRowSpacer rowSpacer)
{
RowSpacerPrototype.Instantiate<LayoutElement>().preferredHeight = KeySize * rowSpacer.Height;
}
else
{
throw new ArgumentOutOfRangeException(nameof(row));
}
}
}
public InputLayout ParseJson(string layout)
{
var rows = new List<InputLayoutRow>();
var nextWidth = 1f;
var nextHeight = 1f;
var reader = new JsonTextReader(new StringReader(LayoutFile.text));
var nextHeight = 1;
var reader = new JsonTextReader(new StringReader(layout));
reader.Read();
if (reader.TokenType != JsonToken.StartArray)
{
Debug.Log($"Unexpected JSON format in line {reader.LineNumber}:{reader.LinePosition}");
return;
}
throw new JsonReaderException($"Unexpected JSON format in line {reader.LineNumber}:{reader.LinePosition}, expected: StartArray, received: {Enum.GetName(typeof(JsonToken), reader.TokenType)}");
while(reader.Read() && reader.TokenType != JsonToken.EndArray)
{
if (reader.TokenType != JsonToken.StartArray)
{
Debug.Log($"Unexpected JSON format in line {reader.LineNumber}:{reader.LinePosition}");
return;
}
throw new JsonReaderException($"Unexpected JSON format in line {reader.LineNumber}:{reader.LinePosition}, expected: StartArray, received: {Enum.GetName(typeof(JsonToken), reader.TokenType)}");
var row = RowPrototype.Instantiate<InputDisplayRow>();
var row = new InputLayoutKeyRow();
var columns = new List<InputLayoutColumn>();
while (reader.Read() && reader.TokenType != JsonToken.EndArray)
{
@ -49,59 +307,92 @@ public class InputDisplayLayout : MonoBehaviour
nextWidth = (float) (reader.ReadAsDouble() ?? 1.0);
break;
case "h":
nextHeight = (float) (reader.ReadAsDouble() ?? 1.0);
nextHeight = reader.ReadAsInt32() ?? 1;
break;
case "y":
RowSpacerPrototype.Instantiate<LayoutElement>().preferredHeight = KeySize * (float) (reader.ReadAsDouble() ?? 0.0);
row.transform.SetAsLastSibling();
rows.Add(new InputLayoutRowSpacer{Height = (float) (reader.ReadAsDouble() ?? 0.0)});
break;
case "x":
row.KeySpacerPrototype.Instantiate<LayoutElement>().preferredWidth = KeySize * (float) (reader.ReadAsDouble() ?? 0.0);
columns.Add(new InputLayoutColumnSpacer{Width = (float) (reader.ReadAsDouble() ?? 0.0)});
break;
}
}
break;
case JsonToken.String:
var key = row.KeyPrototype.Instantiate<InputDisplayKey>();
InputLayoutKey key;
var v = reader.Value.ToString().Trim();
if (!string.IsNullOrEmpty(v))
{
var labels = v.Split('\n');
if (labels.Length == 2)
{
key.First.text = labels[1];
key.Second.text = labels[0];
}
else
{
key.First.text = v;
key.Second.text = "";
}
key = nextHeight != 1 ? new InputLayoutMultiRowKey {Height = nextHeight} : new InputLayoutBindableKey();
nextHeight = 1;
((InputLayoutBindableKey) key).MainLabel = labels.Length == 2 ? labels[1] : v;
((InputLayoutBindableKey) key).AltLabel = labels.Length == 2 ? labels[0] : "";
}
else
{
key.First.text = "";
key.Second.text = "";
}
key = new InputLayoutKey();
key.LayoutElement.preferredHeight = KeySize;
key.LayoutElement.preferredWidth = KeySize * nextWidth;
key.Width = nextWidth;
columns.Add(key);
nextWidth = 1f;
if (Math.Abs(nextHeight - 1f) > .01f)
{
key.Outline.rectTransform.anchorMin =
key.First.rectTransform.anchorMin =
key.Second.rectTransform.anchorMin =
key.Fill.rectTransform.anchorMin = Vector2.down * (nextHeight-1);
}
nextHeight = 1f;
break;
default:
Debug.Log($"Unexpected JSON format in line {reader.LineNumber}:{reader.LinePosition}");
return;
throw new JsonReaderException($"Unexpected JSON format in line {reader.LineNumber}:{reader.LinePosition}");
}
}
row.Columns = columns.ToArray();
rows.Add(row);
}
return new InputLayout {Rows = rows.ToArray()};
}
private IEnumerator AssociateInputKeys(InputLayout layout)
{
var path = "";
var keyPress = new InputAction(binding: "/<Keyboard>/<button>");
keyPress.performed += context =>
{
var keyName = ShortKeyPath(context.control.path);
if (keyName == "anyKey") return;
path = keyName;
};
keyPress.Enable();
foreach (var row in layout.Rows)
{
if (row is InputLayoutKeyRow keyRow)
{
foreach (var column in keyRow.Columns)
{
if(column is InputLayoutBindableKey bindableKey)
{
_displayKeys[bindableKey].Outline.color = HighlightColor;
var fillColor = HighlightColor;
fillColor *= FillMultiplier;
fillColor.a = FillAlpha;
_displayKeys[bindableKey].Fill.color = fillColor;
path = "";
while (string.IsNullOrEmpty(path)) yield return null;
bindableKey.InputSystemPath = path;
Debug.Log($"Bound \"{path}\" to \"{bindableKey.MainLabel}\"");
_displayKeys[bindableKey].Outline.color = DefaultColor;
fillColor = DefaultColor;
fillColor *= FillMultiplier;
fillColor.a = FillAlpha;
_displayKeys[bindableKey].Fill.color = fillColor;
}
}
}
}
keyPress.Disable();
RegisterResolver.Register();
File.WriteAllBytes(
Path.Combine(ActionGameManager.GameDataDirectory.CreateSubdirectory("KeyboardLayouts").FullName, $"{LayoutFile.name}.msgpack"),
MessagePackSerializer.Serialize(layout));
}
void Update()

2
Assets/InputDisplayRow.cs
View file

@ -1,9 +1,11 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class InputDisplayRow : MonoBehaviour
{
public HorizontalLayoutGroup LayoutGroup;
public Prototype KeyPrototype;
public Prototype KeySpacerPrototype;
}

74
Assets/InputLayout.cs
View file

@ -1,19 +1,75 @@
using MessagePack;
using System.Collections.Generic;
using JsonKnownTypes;using MessagePack;
using Newtonsoft.Json;
[MessagePackObject, JsonObject(MemberSerialization.OptIn)]
public class InputLayout
{
[Key(0), JsonProperty("rows")] public InputLayoutRow[] Rows;
public IEnumerable<InputLayoutBindableKey> GetBindableKeys()
{
foreach (var row in Rows)
{
if (!(row is InputLayoutKeyRow keyRow)) continue;
foreach (var column in keyRow.Columns)
{
if (column is InputLayoutBindableKey bindableKey)
{
yield return bindableKey;
}
}
}
}
}
[JsonConverter(typeof(JsonKnownTypesConverter<InputLayoutRow>)),
MessagePackObject,
Union(0, typeof(InputLayoutRowSpacer)),
Union(1, typeof(InputLayoutKeyRow))
]
public abstract class InputLayoutRow { }
[MessagePackObject, JsonObject(MemberSerialization.OptIn)]
public class InputLayoutRowSpacer : InputLayoutRow
{
[Key(0), JsonProperty("height")] public float Height;
}
[MessagePackObject, JsonObject(MemberSerialization.OptIn)]
public class InputLayoutKey
public class InputLayoutKeyRow : InputLayoutRow
{
[Key(0), JsonProperty("columns")] public InputLayoutColumn[] Columns;
}
[JsonConverter(typeof(JsonKnownTypesConverter<InputLayoutColumn>)),
MessagePackObject,
Union(0, typeof(InputLayoutColumnSpacer)),
Union(1, typeof(InputLayoutKey)),
Union(2, typeof(InputLayoutBindableKey)),
Union(3, typeof(InputLayoutMultiRowKey))
]
public abstract class InputLayoutColumn
{
[Key(0), JsonProperty("width")] public float Width;
}
[MessagePackObject, JsonObject(MemberSerialization.OptIn)]
public class InputLayoutColumnSpacer : InputLayoutColumn { }
[MessagePackObject, JsonObject(MemberSerialization.OptIn)]
public class InputLayoutKey : InputLayoutColumn { }
[MessagePackObject, JsonObject(MemberSerialization.OptIn)]
public class InputLayoutBindableKey : InputLayoutKey
{
[Key(1), JsonProperty("mainLabel")] public string MainLabel;
[Key(2), JsonProperty("altLabel")] public string AltLabel;
[Key(3), JsonProperty("path")] public string InputSystemPath;
}
public class InputLayoutMultiRowKey : InputLayoutBindableKey
{
[Key(0), JsonProperty("mainLabel")] public string MainLabel;
[Key(1), JsonProperty("altLabel")] public string AltLabel;
[Key(2), JsonProperty("path")] public string InputSystemPath;
[Key(3), JsonProperty("width")] public float Width;
[Key(4), JsonProperty("height")] public int Height;
}

2
Assets/Materials/UI/Map Gravity Lines.mat
View file

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

126
Assets/Resources/Aetheria.inputactions
View file

@ -69,14 +69,6 @@
"processors": "",
"interactions": ""
},
{
"name": "EnterWormhole",
"type": "Button",
"id": "c918ac22-b029-4805-9c85-e615a52641f2",
"expectedControlType": "Button",
"processors": "",
"interactions": ""
},
{
"name": "Toggle Shield",
"type": "Button",
@ -116,6 +108,14 @@
"expectedControlType": "",
"processors": "",
"interactions": ""
},
{
"name": "Enter Wormhole",
"type": "Button",
"id": "b907857f-d1d2-455d-912b-8de9a64f0f3a",
"expectedControlType": "Button",
"processors": "",
"interactions": ""
}
],
"bindings": [
@ -152,17 +152,6 @@
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "up",
"id": "8180e8bd-4097-4f4e-ab88-4523101a6ce9",
"path": "<Keyboard>/upArrow",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "320bffee-a40b-4347-ac70-c210eb8bc73a",
@ -174,17 +163,6 @@
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "1c5327b5-f71c-4f60-99c7-4e737386f1d1",
"path": "<Keyboard>/downArrow",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "d2581a9b-1d11-4566-b27d-b92aff5fabbc",
@ -196,17 +174,6 @@
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "2e46982e-44cc-431b-9f0b-c11910bf467a",
"path": "<Keyboard>/leftArrow",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "fcfe95b8-67b9-4526-84b5-5d0bc98d6400",
@ -218,17 +185,6 @@
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "77bff152-3580-4b21-b6de-dcd0c7e41164",
"path": "<Keyboard>/rightArrow",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "",
"id": "3ea4d645-4504-4529-b061-ab81934c3752",
@ -298,7 +254,7 @@
{
"name": "",
"id": "6e13d87d-e5bb-4363-b153-1e0c1e21e4eb",
"path": "<Keyboard>/#(Y)",
"path": "<Keyboard>/y",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
@ -309,7 +265,7 @@
{
"name": "",
"id": "e6e3164c-1b59-4eab-99d9-5a3bc294af0b",
"path": "<Keyboard>/#(U)",
"path": "<Keyboard>/u",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
@ -320,7 +276,7 @@
{
"name": "",
"id": "b55dd143-367d-4842-82c8-593c301bcd69",
"path": "<Keyboard>/#(T)",
"path": "<Keyboard>/t",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
@ -331,7 +287,7 @@
{
"name": "",
"id": "71ac6088-1e18-4810-86be-1179918dd4a2",
"path": "<Keyboard>/#(H)",
"path": "<Keyboard>/h",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
@ -339,21 +295,10 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "95817d40-4c8d-4660-bd68-a93afe74b6e1",
"path": "<Keyboard>/#(V)",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "EnterWormhole",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "d59fb542-6ac5-466d-a668-67fd8c890232",
"path": "<Keyboard>/#(G)",
"path": "<Keyboard>/g",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
@ -364,7 +309,7 @@
{
"name": "",
"id": "8e8b5d19-20fd-43f3-88cf-6246f374e7cf",
"path": "<Keyboard>/#(O)",
"path": "<Keyboard>/o",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
@ -375,7 +320,7 @@
{
"name": "",
"id": "baa67cdf-3c91-46dd-965c-12370a897414",
"path": "<Keyboard>/#(X)",
"path": "<Keyboard>/x",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
@ -404,6 +349,17 @@
"action": "Tractor Beam",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "85857c0e-82fa-4889-895a-1e55c6dbe206",
"path": "<Keyboard>/v",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "Enter Wormhole",
"isComposite": false,
"isPartOfComposite": false
}
]
},
@ -898,9 +854,9 @@
"interactions": ""
},
{
"name": "MainMenu",
"name": "Main Menu",
"type": "Button",
"id": "a626132e-6205-4abb-9a45-4cce6446958b",
"id": "0515c617-9dff-406f-ab3e-763971d532d3",
"expectedControlType": "Button",
"processors": "",
"interactions": ""
@ -921,7 +877,7 @@
{
"name": "",
"id": "2eb827dd-4707-4648-b7e5-cf1fd8fa00da",
"path": "<Keyboard>/#(I)",
"path": "<Keyboard>/i",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
@ -932,7 +888,7 @@
{
"name": "",
"id": "3279cef8-8bd1-49f2-984a-637d1f8522f6",
"path": "<Keyboard>/#(C)",
"path": "<Keyboard>/c",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
@ -940,17 +896,6 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "7de0bb82-5492-49aa-aa56-8562b58ba8a8",
"path": "<Keyboard>/escape",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "MainMenu",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "f90929d5-d8d1-40dc-acc7-7ae294971d12",
@ -961,6 +906,17 @@
"action": "Galaxy Map",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "873dbfff-25b2-4747-ab9d-53d34324d660",
"path": "<Keyboard>/escape",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "Main Menu",
"isComposite": false,
"isPartOfComposite": false
}
]
}

1
Assets/Resources/Sprites/Attribution.txt
View file

@ -77,6 +77,7 @@ edit by The Icon Z
Resize by Markus
Rotate by Rohith M
up key by Dika Darma
Mouse by nopixel
Other

BIN
Assets/Resources/Sprites/Icons/Mouse.png (Stored with Git LFS) Normal file
View file

Binary file not shown.

96
Assets/Resources/Sprites/Icons/Mouse.png.meta Normal file
View file

@ -0,0 +1,96 @@
fileFormatVersion: 2
guid: 98e3434b962a2854e914af9d244bc9c9
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

0
Assets/Resources/keyboard-layout-ansi104-TKL.json → Assets/Resources/ansi104-TKL.json
View file

0
Assets/Resources/keyboard-layout-ansi104-TKL.json.meta → Assets/Resources/ansi104-TKL.json.meta
View file

20
Assets/Resources/keyboard-layout-ansi104.json → Assets/Resources/ansi104.json
View file

@ -94,9 +94,9 @@
{
"x": 0.25
},
"7\nHome",
"8\n↑",
"9\nPgUp",
"Home\n7",
"↑\n8",
"PgUp\n9",
{
"h": 2
},
@ -125,9 +125,9 @@
{
"x": 3.5
},
"4\n←",
"←\n4",
"5",
"6\n→"
"→\n6"
],
[
{
@ -155,9 +155,9 @@
{
"x": 1.25
},
"1\nEnd",
"2\n↓",
"3\nPgDn",
"End\n1",
"↓\n2",
"PgDn\n3",
{
"h": 2
},
@ -208,7 +208,7 @@
"x": 0.25,
"w": 2
},
"0\nIns",
".\nDel"
"Ins\n0",
"Del\n."
]
]

0
Assets/Resources/keyboard-layout-ansi104.json.meta → Assets/Resources/ansi104.json.meta
View file

18
Assets/Scenes/ARPG.unity
View file

@ -16392,7 +16392,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1009503727}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
@ -23687,12 +23687,12 @@ PrefabInstance:
- target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e,
type: 3}
@ -23712,7 +23712,7 @@ PrefabInstance:
- target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -16
objectReference: {fileID: 0}
- target: {fileID: 1713457305180270767, guid: 2758dfa2744d7ad4d8877545189d116e,
type: 3}
@ -24899,12 +24899,12 @@ PrefabInstance:
- target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e,
type: 3}
@ -24924,7 +24924,7 @@ PrefabInstance:
- target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -16
objectReference: {fileID: 0}
- target: {fileID: 1713457305180270767, guid: 2758dfa2744d7ad4d8877545189d116e,
type: 3}
@ -31280,8 +31280,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
pattern: 12
patternScale: 1
activeSample: {x: 0.25, y: -0.3888889, z: -0.25, w: 0.16666669}
activeIndex: 2
activeSample: {x: 0.125, y: 0.2777778, z: -0.375, w: -0.05555555}
activeIndex: 4
--- !u!114 &2115559098
MonoBehaviour:
m_ObjectHideFlags: 0

487
Assets/Scenes/InputScreenTest.unity
View file

@ -209,8 +209,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e0aa077d998d3a249aefd2ed70f4d099, type: 3}
m_Name:
m_EditorClassIdentifier:
First: {fileID: 818051546}
Second: {fileID: 405516092}
MainLabel: {fileID: 818051546}
AltLabel: {fileID: 405516092}
Fill: {fileID: 2001795661}
Outline: {fileID: 838176421}
LayoutElement: {fileID: 187012182}
@ -295,7 +295,7 @@ GameObject:
- component: {fileID: 405516093}
- component: {fileID: 405516092}
m_Layer: 5
m_Name: Second
m_Name: Alt
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -315,10 +315,10 @@ RectTransform:
m_Father: {fileID: 187012181}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -12, y: -12}
m_SizeDelta: {x: -24, y: -24}
m_SizeDelta: {x: -24, y: -12}
m_Pivot: {x: 1, y: 1}
--- !u!114 &405516092
MonoBehaviour:
@ -371,10 +371,10 @@ MonoBehaviour:
m_fontSize: 20
m_fontSizeBase: 20
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 32
m_enableAutoSizing: 1
m_fontSizeMin: 12
m_fontSizeMax: 20
m_fontStyle: 0
m_HorizontalAlignment: 4
m_VerticalAlignment: 256
m_textAlignment: 65535
@ -428,6 +428,7 @@ GameObject:
m_Component:
- component: {fileID: 543472258}
- component: {fileID: 543472259}
- component: {fileID: 543472260}
m_Layer: 5
m_Name: Row Container
m_TagString: Untagged
@ -454,7 +455,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -64, y: -64}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &543472259
MonoBehaviour:
@ -482,6 +483,185 @@ MonoBehaviour:
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!114 &543472260
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 543472257}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &613373514
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 613373515}
- component: {fileID: 613373519}
- component: {fileID: 613373518}
- component: {fileID: 613373517}
- component: {fileID: 613373516}
m_Layer: 5
m_Name: Label
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &613373515
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 613373514}
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: 816403306}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &613373516
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 613373514}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1281fe44325f9b548aa42dc331b17266, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &613373517
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 613373514}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!114 &613373518
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 613373514}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 'New
Texture'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 53555f7a2d5e745428813f1b1118734f, type: 2}
m_sharedMaterial: {fileID: -2804126062856497447, guid: 53555f7a2d5e745428813f1b1118734f,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 14
m_fontSizeBase: 14
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 16
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 1
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &613373519
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 613373514}
m_CullTransparentMesh: 1
--- !u!1 &762724326
GameObject:
m_ObjectHideFlags: 0
@ -530,10 +710,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ReferenceResolution: {x: 1920, y: 1080}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
@ -573,7 +753,10 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 1225606406}
- {fileID: 1104528364}
- {fileID: 977013929}
- {fileID: 816403306}
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -582,6 +765,42 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!1 &816403305
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 816403306}
m_Layer: 5
m_Name: Labels
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &816403306
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 816403305}
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:
- {fileID: 613373515}
m_Father: {fileID: 762724330}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &818051544
GameObject:
m_ObjectHideFlags: 0
@ -594,7 +813,7 @@ GameObject:
- component: {fileID: 818051547}
- component: {fileID: 818051546}
m_Layer: 5
m_Name: First
m_Name: Main
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -615,9 +834,9 @@ RectTransform:
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 12, y: -12}
m_SizeDelta: {x: -24, y: -24}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 12, y: 0}
m_SizeDelta: {x: -24, y: -12}
m_Pivot: {x: 0, y: 1}
--- !u!114 &818051546
MonoBehaviour:
@ -673,7 +892,7 @@ MonoBehaviour:
m_enableAutoSizing: 1
m_fontSizeMin: 12
m_fontSizeMax: 20
m_fontStyle: 32
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 1024
m_textAlignment: 65535
@ -792,6 +1011,183 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 838176419}
m_CullTransparentMesh: 1
--- !u!1 &890604314
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 890604315}
- component: {fileID: 890604318}
- component: {fileID: 890604317}
- component: {fileID: 890604316}
m_Layer: 5
m_Name: Line
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &890604315
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 890604314}
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: 1225606406}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &890604316
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 890604314}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1281fe44325f9b548aa42dc331b17266, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &890604317
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 890604314}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5b33b2e663e78774c9f0c9af55018725, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: fcfc0ffd602442f42bddf109db9d2d20, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 0db2f052f2728c749bc0d25b8ca0af14, type: 3}
m_improveResolution: 0
m_Resolution: 5
m_useNativeSize: 0
m_points:
- {x: 0, y: 0}
- {x: 55.9, y: 51.63}
- {x: 162.23, y: 51.63}
- {x: 162.23, y: 248.6}
lineThickness: 2
relativeSize: 0
lineList: 0
lineCaps: 0
bezierSegmentsPerCurve: 1
LineJoins: 1
BezierMode: 0
drivenExternally: 0
--- !u!222 &890604318
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 890604314}
m_CullTransparentMesh: 1
--- !u!1 &977013928
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 977013929}
- component: {fileID: 977013931}
- component: {fileID: 977013930}
m_Layer: 5
m_Name: Lines
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &977013929
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 977013928}
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: 762724330}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &977013930
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 977013928}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 34861a5dcec3dbf438f8288be97dd133, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_improveResolution: 0
m_Resolution: 0
m_useNativeSize: 0
m_points:
- {x: 0, y: 0}
- {x: 10, y: 10}
- {x: 20, y: 10}
- {x: 20, y: 20}
lineThickness: 1
relativeSize: 0
lineList: 1
lineCaps: 0
bezierSegmentsPerCurve: 10
LineJoins: 0
BezierMode: 0
drivenExternally: 0
--- !u!222 &977013931
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 977013928}
m_CullTransparentMesh: 1
--- !u!1 &1017974192
GameObject:
m_ObjectHideFlags: 0
@ -828,7 +1224,7 @@ Camera:
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 2
m_BackGroundColor: {r: 0.18867922, g: 0.18867922, b: 0.18867922, a: 0}
m_BackGroundColor: {r: 0.084905684, g: 0.084905684, b: 0.084905684, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
@ -905,7 +1301,7 @@ RectTransform:
m_Children:
- {fileID: 543472258}
m_Father: {fileID: 762724330}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0.5}
@ -924,10 +1320,60 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5ac50145a005ca340837d054dc1d03f3, type: 3}
m_Name:
m_EditorClassIdentifier:
RowContainer: {fileID: 543472259}
LayoutFile: {fileID: 4900000, guid: 44459239c373d2c449a479e84867648a, type: 3}
LabelPrototype: {fileID: 613373516}
LinePrototype: {fileID: 890604316}
RowPrototype: {fileID: 1437310508}
RowSpacerPrototype: {fileID: 341206685}
KeySize: 80
KeySize: 64
DefaultColor: {r: 0.75, g: 0.9210527, b: 1, a: 1}
HighlightColor: {r: 1, g: 0.4464876, b: 0.050000012, a: 1}
FillBrightness: 0.25
FillAlpha: 0.75
FillMultiplier: 0.25
InactiveMultiplier: 0.2
TestSteps: 3
TestPadding: 0
BoxLineExpand: -4
GlobalColor: {r: 0.47999993, g: 0.9, b: 0.27, a: 1}
GlobalHueBuffer: 0.1
--- !u!1 &1225606405
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1225606406}
m_Layer: 5
m_Name: Lines
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1225606406
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1225606405}
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:
- {fileID: 890604315}
m_Father: {fileID: 762724330}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1315472063
GameObject:
m_ObjectHideFlags: 0
@ -1077,6 +1523,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6b0e4442eab42ac4e97e2c69d5c99ebc, type: 3}
m_Name:
m_EditorClassIdentifier:
LayoutGroup: {fileID: 1437310510}
KeyPrototype: {fileID: 187012183}
KeySpacerPrototype: {fileID: 1644964260}
--- !u!114 &1437310510

12
Assets/Scenes/Main Menu.unity
View file

@ -802,8 +802,8 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 741153267}
m_LocalRotation: {x: 0.015506926, y: 0.9502416, z: -0.30741316, w: 0.047933295}
m_LocalPosition: {x: -117.52003, y: -77.08742, z: 149.09026}
m_LocalRotation: {x: 0.015506903, y: 0.9502416, z: -0.30741313, w: 0.04793323}
m_LocalPosition: {x: -117.51999, y: -77.08743, 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.015506926, y: 0.9502416, z: -0.30741316, w: 0.047933295}
m_LocalPosition: {x: -117.52003, y: -77.08742, z: 149.09026}
m_LocalRotation: {x: 0.015506903, y: 0.9502416, z: -0.30741313, w: 0.04793323}
m_LocalPosition: {x: -117.51999, y: -77.08743, 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.375, y: -0.055555552, z: 0.25, w: -0.3888889}
activeIndex: 3
activeSample: {x: -0.3125, y: -0.35185185, z: 0.3125, w: 0.2037037}
activeIndex: 11
--- !u!114 &965376331
MonoBehaviour:
m_ObjectHideFlags: 0

148
Assets/Scripts/AetheriaInput.cs
View file

@ -82,14 +82,6 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
""processors"": """",
""interactions"": """"
},
{
""name"": ""EnterWormhole"",
""type"": ""Button"",
""id"": ""c918ac22-b029-4805-9c85-e615a52641f2"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """"
},
{
""name"": ""Toggle Shield"",
""type"": ""Button"",
@ -129,6 +121,14 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
""expectedControlType"": """",
""processors"": """",
""interactions"": """"
},
{
""name"": ""Enter Wormhole"",
""type"": ""Button"",
""id"": ""b907857f-d1d2-455d-912b-8de9a64f0f3a"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """"
}
],
""bindings"": [
@ -165,17 +165,6 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""up"",
""id"": ""8180e8bd-4097-4f4e-ab88-4523101a6ce9"",
""path"": ""<Keyboard>/upArrow"",
""interactions"": """",
""processors"": """",
""groups"": "";Keyboard&Mouse"",
""action"": ""Move"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""down"",
""id"": ""320bffee-a40b-4347-ac70-c210eb8bc73a"",
@ -187,17 +176,6 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""down"",
""id"": ""1c5327b5-f71c-4f60-99c7-4e737386f1d1"",
""path"": ""<Keyboard>/downArrow"",
""interactions"": """",
""processors"": """",
""groups"": "";Keyboard&Mouse"",
""action"": ""Move"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""left"",
""id"": ""d2581a9b-1d11-4566-b27d-b92aff5fabbc"",
@ -209,17 +187,6 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""left"",
""id"": ""2e46982e-44cc-431b-9f0b-c11910bf467a"",
""path"": ""<Keyboard>/leftArrow"",
""interactions"": """",
""processors"": """",
""groups"": "";Keyboard&Mouse"",
""action"": ""Move"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""right"",
""id"": ""fcfe95b8-67b9-4526-84b5-5d0bc98d6400"",
@ -231,17 +198,6 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""right"",
""id"": ""77bff152-3580-4b21-b6de-dcd0c7e41164"",
""path"": ""<Keyboard>/rightArrow"",
""interactions"": """",
""processors"": """",
""groups"": "";Keyboard&Mouse"",
""action"": ""Move"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": """",
""id"": ""3ea4d645-4504-4529-b061-ab81934c3752"",
@ -311,7 +267,7 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
{
""name"": """",
""id"": ""6e13d87d-e5bb-4363-b153-1e0c1e21e4eb"",
""path"": ""<Keyboard>/#(Y)"",
""path"": ""<Keyboard>/y"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard&Mouse"",
@ -322,7 +278,7 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
{
""name"": """",
""id"": ""e6e3164c-1b59-4eab-99d9-5a3bc294af0b"",
""path"": ""<Keyboard>/#(U)"",
""path"": ""<Keyboard>/u"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard&Mouse"",
@ -333,7 +289,7 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
{
""name"": """",
""id"": ""b55dd143-367d-4842-82c8-593c301bcd69"",
""path"": ""<Keyboard>/#(T)"",
""path"": ""<Keyboard>/t"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard&Mouse"",
@ -344,7 +300,7 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
{
""name"": """",
""id"": ""71ac6088-1e18-4810-86be-1179918dd4a2"",
""path"": ""<Keyboard>/#(H)"",
""path"": ""<Keyboard>/h"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard&Mouse"",
@ -352,21 +308,10 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""95817d40-4c8d-4660-bd68-a93afe74b6e1"",
""path"": ""<Keyboard>/#(V)"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard&Mouse"",
""action"": ""EnterWormhole"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""d59fb542-6ac5-466d-a668-67fd8c890232"",
""path"": ""<Keyboard>/#(G)"",
""path"": ""<Keyboard>/g"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard&Mouse"",
@ -377,7 +322,7 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
{
""name"": """",
""id"": ""8e8b5d19-20fd-43f3-88cf-6246f374e7cf"",
""path"": ""<Keyboard>/#(O)"",
""path"": ""<Keyboard>/o"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard&Mouse"",
@ -388,7 +333,7 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
{
""name"": """",
""id"": ""baa67cdf-3c91-46dd-965c-12370a897414"",
""path"": ""<Keyboard>/#(X)"",
""path"": ""<Keyboard>/x"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard&Mouse"",
@ -417,6 +362,17 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
""action"": ""Tractor Beam"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""85857c0e-82fa-4889-895a-1e55c6dbe206"",
""path"": ""<Keyboard>/v"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard&Mouse"",
""action"": ""Enter Wormhole"",
""isComposite"": false,
""isPartOfComposite"": false
}
]
},
@ -911,9 +867,9 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
""interactions"": """"
},
{
""name"": ""MainMenu"",
""name"": ""Main Menu"",
""type"": ""Button"",
""id"": ""a626132e-6205-4abb-9a45-4cce6446958b"",
""id"": ""0515c617-9dff-406f-ab3e-763971d532d3"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """"
@ -934,7 +890,7 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
{
""name"": """",
""id"": ""2eb827dd-4707-4648-b7e5-cf1fd8fa00da"",
""path"": ""<Keyboard>/#(I)"",
""path"": ""<Keyboard>/i"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard&Mouse"",
@ -945,7 +901,7 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
{
""name"": """",
""id"": ""3279cef8-8bd1-49f2-984a-637d1f8522f6"",
""path"": ""<Keyboard>/#(C)"",
""path"": ""<Keyboard>/c"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard&Mouse"",
@ -953,17 +909,6 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""7de0bb82-5492-49aa-aa56-8562b58ba8a8"",
""path"": ""<Keyboard>/escape"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard&Mouse"",
""action"": ""MainMenu"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""f90929d5-d8d1-40dc-acc7-7ae294971d12"",
@ -974,6 +919,17 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
""action"": ""Galaxy Map"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""873dbfff-25b2-4747-ab9d-53d34324d660"",
""path"": ""<Keyboard>/escape"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard&Mouse"",
""action"": ""Main Menu"",
""isComposite"": false,
""isPartOfComposite"": false
}
]
}
@ -1029,12 +985,12 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
m_Player_TargetNext = m_Player.FindAction("Target Next", throwIfNotFound: true);
m_Player_TargetNearest = m_Player.FindAction("Target Nearest", throwIfNotFound: true);
m_Player_ToggleHeatsinks = m_Player.FindAction("Toggle Heatsinks", throwIfNotFound: true);
m_Player_EnterWormhole = m_Player.FindAction("EnterWormhole", throwIfNotFound: true);
m_Player_ToggleShield = m_Player.FindAction("Toggle Shield", throwIfNotFound: true);
m_Player_OverrideShutdown = m_Player.FindAction("Override Shutdown", throwIfNotFound: true);
m_Player_Ping = m_Player.FindAction("Ping", throwIfNotFound: true);
m_Player_HideUI = m_Player.FindAction("Hide UI", throwIfNotFound: true);
m_Player_TractorBeam = m_Player.FindAction("Tractor Beam", throwIfNotFound: true);
m_Player_EnterWormhole = m_Player.FindAction("Enter Wormhole", throwIfNotFound: true);
// UI
m_UI = asset.FindActionMap("UI", throwIfNotFound: true);
m_UI_Navigate = m_UI.FindAction("Navigate", throwIfNotFound: true);
@ -1052,7 +1008,7 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
m_Global_GalaxyMap = m_Global.FindAction("Galaxy Map", throwIfNotFound: true);
m_Global_Inventory = m_Global.FindAction("Inventory", throwIfNotFound: true);
m_Global_Dock = m_Global.FindAction("Dock", throwIfNotFound: true);
m_Global_MainMenu = m_Global.FindAction("MainMenu", throwIfNotFound: true);
m_Global_MainMenu = m_Global.FindAction("Main Menu", throwIfNotFound: true);
}
public void Dispose()
@ -1110,12 +1066,12 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
private readonly InputAction m_Player_TargetNext;
private readonly InputAction m_Player_TargetNearest;
private readonly InputAction m_Player_ToggleHeatsinks;
private readonly InputAction m_Player_EnterWormhole;
private readonly InputAction m_Player_ToggleShield;
private readonly InputAction m_Player_OverrideShutdown;
private readonly InputAction m_Player_Ping;
private readonly InputAction m_Player_HideUI;
private readonly InputAction m_Player_TractorBeam;
private readonly InputAction m_Player_EnterWormhole;
public struct PlayerActions
{
private @AetheriaInput m_Wrapper;
@ -1128,12 +1084,12 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
public InputAction @TargetNext => m_Wrapper.m_Player_TargetNext;
public InputAction @TargetNearest => m_Wrapper.m_Player_TargetNearest;
public InputAction @ToggleHeatsinks => m_Wrapper.m_Player_ToggleHeatsinks;
public InputAction @EnterWormhole => m_Wrapper.m_Player_EnterWormhole;
public InputAction @ToggleShield => m_Wrapper.m_Player_ToggleShield;
public InputAction @OverrideShutdown => m_Wrapper.m_Player_OverrideShutdown;
public InputAction @Ping => m_Wrapper.m_Player_Ping;
public InputAction @HideUI => m_Wrapper.m_Player_HideUI;
public InputAction @TractorBeam => m_Wrapper.m_Player_TractorBeam;
public InputAction @EnterWormhole => m_Wrapper.m_Player_EnterWormhole;
public InputActionMap Get() { return m_Wrapper.m_Player; }
public void Enable() { Get().Enable(); }
public void Disable() { Get().Disable(); }
@ -1167,9 +1123,6 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
@ToggleHeatsinks.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnToggleHeatsinks;
@ToggleHeatsinks.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnToggleHeatsinks;
@ToggleHeatsinks.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnToggleHeatsinks;
@EnterWormhole.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnEnterWormhole;
@EnterWormhole.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnEnterWormhole;
@EnterWormhole.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnEnterWormhole;
@ToggleShield.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnToggleShield;
@ToggleShield.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnToggleShield;
@ToggleShield.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnToggleShield;
@ -1185,6 +1138,9 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
@TractorBeam.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnTractorBeam;
@TractorBeam.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnTractorBeam;
@TractorBeam.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnTractorBeam;
@EnterWormhole.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnEnterWormhole;
@EnterWormhole.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnEnterWormhole;
@EnterWormhole.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnEnterWormhole;
}
m_Wrapper.m_PlayerActionsCallbackInterface = instance;
if (instance != null)
@ -1213,9 +1169,6 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
@ToggleHeatsinks.started += instance.OnToggleHeatsinks;
@ToggleHeatsinks.performed += instance.OnToggleHeatsinks;
@ToggleHeatsinks.canceled += instance.OnToggleHeatsinks;
@EnterWormhole.started += instance.OnEnterWormhole;
@EnterWormhole.performed += instance.OnEnterWormhole;
@EnterWormhole.canceled += instance.OnEnterWormhole;
@ToggleShield.started += instance.OnToggleShield;
@ToggleShield.performed += instance.OnToggleShield;
@ToggleShield.canceled += instance.OnToggleShield;
@ -1231,6 +1184,9 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
@TractorBeam.started += instance.OnTractorBeam;
@TractorBeam.performed += instance.OnTractorBeam;
@TractorBeam.canceled += instance.OnTractorBeam;
@EnterWormhole.started += instance.OnEnterWormhole;
@EnterWormhole.performed += instance.OnEnterWormhole;
@EnterWormhole.canceled += instance.OnEnterWormhole;
}
}
}
@ -1434,12 +1390,12 @@ public class @AetheriaInput : IInputActionCollection, IDisposable
void OnTargetNext(InputAction.CallbackContext context);
void OnTargetNearest(InputAction.CallbackContext context);
void OnToggleHeatsinks(InputAction.CallbackContext context);
void OnEnterWormhole(InputAction.CallbackContext context);
void OnToggleShield(InputAction.CallbackContext context);
void OnOverrideShutdown(InputAction.CallbackContext context);
void OnPing(InputAction.CallbackContext context);
void OnHideUI(InputAction.CallbackContext context);
void OnTractorBeam(InputAction.CallbackContext context);
void OnEnterWormhole(InputAction.CallbackContext context);
}
public interface IUIActions
{

2
Assets/Scripts/ServerShared/Behaviors/AetherDrive.cs
View file

@ -130,7 +130,7 @@ public class AetherDrive : Behavior
var torqueRatio = actualRpmDelta / potentialRpmDelta;
var draw = torqueRatio * Evaluate(_data.EnergyDraw) / 3;
Item.SetAudioParameter(SpecialAudioParameter.Intensity, max(max(_axis.x, _axis.y), _axis.z));
Item.SetAudioParameter(SpecialAudioParameter.Intensity, max(max(abs(_axis.x), abs(_axis.y)), abs(_axis.z)));
Item.SetAudioParameter(_data.RpmAudioParameter, (Rpm.x + Rpm.y + Rpm.z) / 3 / MaximumRpm);
Item.SetAudioParameter(_data.TorqueRatioAudioParameter, max(max(torqueRatio.x, torqueRatio.y), torqueRatio.z));

28
Assets/Scripts/UnityExtensions.cs
View file

@ -77,4 +77,32 @@ public static class UnitySceneExtensions
public static Vector3 Flatland(this Vector2 v, float y = 0) => new Vector3(v.x,y,v.y);
public static Vector2 Flatland(this Vector3 v) => new Vector2(v.x,v.z);
// public static Rect ScreenSpaceRect(this RectTransform transform)
// {
// var size= Vector2.Scale(transform.rect.size, transform.lossyScale);
// var x= transform.position.x + transform.anchoredPosition.x;
// var y= Screen.height - transform.position.y - transform.anchoredPosition.y;
//
// return new Rect(x, y, size.x, size.y);
// }
private static Vector3[] _worldCorners = new Vector3[4];
public static Bounds GetBounds(this RectTransform transform, float expand = 0)
{
transform.GetWorldCorners(_worldCorners);
var bounds = new Bounds(_worldCorners[0], Vector3.zero);
for(int i = 1; i < 4; ++i)
{
bounds.Encapsulate(_worldCorners[i]);
}
bounds.size += new Vector3(expand, expand, 0);
return bounds;
}
public static Rect ScreenSpaceRect(this RectTransform transform, float expand = 0)
{
var bounds = GetBounds(transform, expand);
return new Rect(bounds.min, bounds.size);
}
}

2
Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/AkSoundSeedAir.dll.meta
View file

@ -45,7 +45,7 @@ PluginImporter:
- first:
Standalone: Win64
second:
enabled: 0
enabled: 1
settings:
CPU: None
userData:

2
Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/AkSoundSeedGrain.dll.meta
View file

@ -45,7 +45,7 @@ PluginImporter:
- first:
Standalone: Win64
second:
enabled: 0
enabled: 1
settings:
CPU: None
userData:

2
Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/AkSynthOne.dll.meta
View file

@ -45,7 +45,7 @@ PluginImporter:
- first:
Standalone: Win64
second:
enabled: 0
enabled: 1
settings:
CPU: None
userData:

2
Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/McDSP.dll.meta
View file

@ -45,7 +45,7 @@ PluginImporter:
- first:
Standalone: Win64
second:
enabled: 0
enabled: 1
settings:
CPU: None
userData:

2
Assets/Wwise/API/Runtime/Plugins/Windows/x86/DSP/iZotope.dll.meta
View file

@ -45,7 +45,7 @@ PluginImporter:
- first:
Standalone: Win64
second:
enabled: 0
enabled: 1
settings:
CPU: None
userData:

2
Assets/Wwise/API/Runtime/Plugins/Windows/x86/Profile/AkSoundEngine.dll.meta
View file

@ -45,7 +45,7 @@ PluginImporter:
- first:
Standalone: Win64
second:
enabled: 0
enabled: 1
settings:
CPU: None
userData:

2
Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/AkSoundSeedAir.dll.meta
View file

@ -45,7 +45,7 @@ PluginImporter:
- first:
Standalone: Win64
second:
enabled: 0
enabled: 1
settings:
CPU: AnyCPU
userData:

2
Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/AkSoundSeedGrain.dll.meta
View file

@ -45,7 +45,7 @@ PluginImporter:
- first:
Standalone: Win64
second:
enabled: 0
enabled: 1
settings:
CPU: AnyCPU
userData:

2
Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/AkSynthOne.dll.meta
View file

@ -45,7 +45,7 @@ PluginImporter:
- first:
Standalone: Win64
second:
enabled: 0
enabled: 1
settings:
CPU: AnyCPU
userData:

2
Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/McDSP.dll.meta
View file

@ -45,7 +45,7 @@ PluginImporter:
- first:
Standalone: Win64
second:
enabled: 0
enabled: 1
settings:
CPU: AnyCPU
userData:

2
Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/DSP/iZotope.dll.meta
View file

@ -45,7 +45,7 @@ PluginImporter:
- first:
Standalone: Win64
second:
enabled: 0
enabled: 1
settings:
CPU: AnyCPU
userData:

2
Assets/Wwise/API/Runtime/Plugins/Windows/x86_64/Profile/AkSoundEngine.dll.meta
View file

@ -45,7 +45,7 @@ PluginImporter:
- first:
Standalone: Win64
second:
enabled: 0
enabled: 1
settings:
CPU: AnyCPU
userData:

BIN
Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset (Stored with Git LFS)
View file

Binary file not shown.

BIN
GameData/AetherDB.msgpack (Stored with Git LFS)
View file

Binary file not shown.

BIN
GameData/KeyboardLayouts/ansi104.msgpack (Stored with Git LFS) Normal file
View file

Binary file not shown.

BIN
GameData/PlayerSettings.msgpack (Stored with Git LFS)
View file

Binary file not shown.

6
Ink.csproj
View file

@ -153,9 +153,6 @@
<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>
@ -186,6 +183,9 @@
<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>

1
Packages/manifest.json
View file

@ -10,7 +10,6 @@
"com.unity.inputsystem": "1.0.2",
"com.unity.mathematics": "1.2.1",
"com.unity.postprocessing": "2.3.0",
"com.unity.recorder": "2.5.4",
"com.unity.test-framework": "1.1.24",
"com.unity.textmeshpro": "3.0.1",
"com.unity.timeline": "1.4.6",

9
Packages/packages-lock.json
View file

@ -81,15 +81,6 @@
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.recorder": {
"version": "2.5.4",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.timeline": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.test-framework": {
"version": "1.1.24",
"depth": 0,

6
RethinkDB.csproj
View file

@ -599,9 +599,6 @@
<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>
@ -632,6 +629,9 @@
<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>

BIN
UserSettings/EditorUserSettings.asset (Stored with Git LFS)
View file

Binary file not shown.