Wwise Audio Integration
This commit is contained in:
parent
e7e305e6a0
commit
7d67d7ec2c
72 changed files with 4551 additions and 11819 deletions
|
|
@ -797,7 +797,7 @@
|
|||
<ActiveSource Name="SoundSeed Grain" ID="{67039B8A-C316-4911-AD10-CF38B4D9E37A}" Platform="Linked"/>
|
||||
</ActiveSourceList>
|
||||
</Sound>
|
||||
<BlendContainer Name="lightningGun_fire_lighting_discharge" ID="{31E53399-4CCE-43E0-B5F0-3EDF9865739E}" ShortID="641391425">
|
||||
<BlendContainer Name="lightningGun_fire_lightning_discharge" ID="{31E53399-4CCE-43E0-B5F0-3EDF9865739E}" ShortID="641391425">
|
||||
<PropertyList>
|
||||
<Property Name="3DSpatialization" Type="int16" Value="2"/>
|
||||
<Property Name="InitialDelay" Type="Real64">
|
||||
|
|
@ -860,6 +860,34 @@
|
|||
<Property Name="Attack" Type="Real32" Value="284"/>
|
||||
<Property Name="Duration" Type="Real32" Value="405"/>
|
||||
<Property Name="DurationLink" Type="int32" Value="1"/>
|
||||
<Property Name="FilterFreq" Type="Real32">
|
||||
<RTPCList>
|
||||
<RTPC Name="" ID="{1F08712C-0F3F-4116-8091-0410D2B2F020}" ShortID="715472442">
|
||||
<ReferenceList>
|
||||
<Reference Name="ControlInput">
|
||||
<ObjectRef Name="sfx_weapon_lightning_pitch" ID="{64F012EA-795C-4DDF-82F0-00DFA345043A}" WorkUnitID="{02152354-45CF-4389-B435-5367FA80C881}"/>
|
||||
</Reference>
|
||||
</ReferenceList>
|
||||
<Curve Name="" ID="{AC7D90AD-332F-43DE-A452-5EB124DA52F1}">
|
||||
<PropertyList>
|
||||
<Property Name="Flags" Type="int32" Value="5"/>
|
||||
</PropertyList>
|
||||
<PointList>
|
||||
<Point>
|
||||
<XPos>0</XPos>
|
||||
<YPos>20000</YPos>
|
||||
<Flags>5</Flags>
|
||||
</Point>
|
||||
<Point>
|
||||
<XPos>1</XPos>
|
||||
<YPos>1206.2725</YPos>
|
||||
<Flags>37</Flags>
|
||||
</Point>
|
||||
</PointList>
|
||||
</Curve>
|
||||
</RTPC>
|
||||
</RTPCList>
|
||||
</Property>
|
||||
<Property Name="GrainRate" Type="Real32" Value="6.74"/>
|
||||
<Property Name="MarkerSelectMod1Depth" Type="Real32" Value="100"/>
|
||||
<Property Name="ModAmount2" Type="Real32" Value="-6.36"/>
|
||||
|
|
|
|||
|
|
@ -2,12 +2,10 @@
|
|||
<ValidationCache Version="1" SchemaVersion="103">
|
||||
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Virtual Acoustics\Default Work Unit.wwu" DateLow="1619652116" DateHigh="0"/>
|
||||
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Triggers\Default Work Unit.wwu" DateLow="1619652116" DateHigh="0"/>
|
||||
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Switches\Default Work Unit.wwu" DateLow="1619652115" DateHigh="0"/>
|
||||
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Switches\def_test.wwu" DateLow="1619652115" DateHigh="0"/>
|
||||
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Switches\Default Work Unit.wwu" DateLow="1619680864" DateHigh="0"/>
|
||||
<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="1619679185" DateHigh="0"/>
|
||||
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\SoundBanks\Weapons.wwu" DateLow="1619672614" DateHigh="0"/>
|
||||
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\SoundBanks\SFX.wwu" DateLow="1619679552" 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="1619746147" 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\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"/>
|
||||
|
|
@ -25,35 +23,24 @@
|
|||
<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="1619672610" 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\Game Parameters\weapon_events.wwu" DateLow="1619652115" DateHigh="0"/>
|
||||
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Game Parameters\ship_technology_parameters.wwu" DateLow="1619652115" 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\item_properties.wwu" DateLow="1619652115" 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\UI.wwu" DateLow="1619672610" DateHigh="0"/>
|
||||
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Events\Ship Audio.wwu" DateLow="1619652115" DateHigh="0"/>
|
||||
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Events\SFX_Defirm_unit.wwu" DateLow="1619652115" DateHigh="0"/>
|
||||
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Events\SFX_defirm_aeth_drive_model.wwu" DateLow="1619652115" DateHigh="0"/>
|
||||
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Events\SFX.wwu" DateLow="1619679365" DateHigh="0"/>
|
||||
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Events\SFX.wwu" DateLow="1619746147" 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\Menu_Music.wwu" DateLow="1619672610" 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\Effects\Factory Effects.wwu" DateLow="1619672816" DateHigh="0"/>
|
||||
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Effects\Default Work Unit.wwu" DateLow="1619674989" DateHigh="0"/>
|
||||
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Effects\Default Work Unit.wwu" DateLow="1619680728" 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\Aetheria-Economy_WwiseProject.wproj" DateLow="1619680020" DateHigh="0"/>
|
||||
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Aetheria-Economy_WwiseProject.rwvens.wsettings" DateLow="1619680026" DateHigh="0"/>
|
||||
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Aetheria-Economy_WwiseProject.wproj" DateLow="1619759801" DateHigh="0"/>
|
||||
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Aetheria-Economy_WwiseProject.rwvens.wsettings" DateLow="1619760038" 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\Spaceship_Aetheric_drivers.wwu" DateLow="1619652115" DateHigh="0"/>
|
||||
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Actor-Mixer Hierarchy\SFX_Defirm_Unit.wwu" DateLow="1619652115" DateHigh="0"/>
|
||||
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Actor-Mixer Hierarchy\SFX_defirm_aeth_drive.wwu" DateLow="1619652115" DateHigh="0"/>
|
||||
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Actor-Mixer Hierarchy\SFX.wwu" DateLow="1619679185" DateHigh="0"/>
|
||||
<ValidationCacheItem File="E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\Actor-Mixer Hierarchy\SFX.wwu" DateLow="1619733732" 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>
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@
|
|||
<Property Name="GenerateSoundBanks\x64_SelectedPlatforms" Type="string" Value="74wppGGLGUKocCTUjliE6atk2Ww+IVRJs5fEQCA5KRI="/>
|
||||
<Property Name="GenerateSoundBanks\x64_SelectedSoundBanks" Type="string" Value="Za5mlmZVs0yOu7E3c3kEhXSKlUaqlINNhKJXlakG6GRB0GqrMd/DRrl4hKPVsqZ4H5yFyZGAmEa3Y3cZmCMMgW+f7IoyteRAtmKe+/QyA0/thAk1VRuHQKFsG3D+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="+lZlPDTFnUSwqLpTpFltuQHvd2f/////sahohopAK0WRE4XvXPYF/QHvd2f/////"/>
|
||||
<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="MeterView\LastObject1" Type="string" Value="{1514A4D8-1DA6-412A-A17E-75CA0C2149F3}"/>
|
||||
|
|
@ -128,7 +128,7 @@
|
|||
<Property Name="ProjectExplorer\FirstVisible_12_1" Type="string" Value="{23EC2DE3-3ED8-4B82-AC99-92E25F2E4C6B}"/>
|
||||
<Property Name="ProjectExplorer\FirstVisible_1_1" Type="string" Value="{27092F88-225A-1154-6725-C8A34F3D4482}"/>
|
||||
<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="{F041A256-D33B-4117-91CF-085BF306F5B4}"/>
|
||||
<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}"/>
|
||||
|
|
@ -149,17 +149,17 @@
|
|||
<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="H5tsB0ZV2kOKkuShybP9Qg=="/>
|
||||
<Property Name="ProjectExplorer\x64_Expanded_4_1" Type="string" Value="TvDkPcMkdUe3MNSSXpgHpQbuQBFpJJVHklAMcr/67xuv6HfuOmGiSYx343s4Z+dwOiSseUdOuUmg4isWKOYIjFzLz7bQ5hJNi1uZnlcU+DlKz/fkjeRWTZUXYWOqTo+z"/>
|
||||
<Property Name="ProjectExplorer\x64_Expanded_5_1" Type="string" Value=""/>
|
||||
<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="b86WNzs/4ECYHGe30VU4On1iWP0E2oFBii5ple6ScCQbjnC6qA54Q6f/cg8dYm6CTvDkPcMkdUe3MNSSXpgHpQbuQBFpJJVHklAMcr/67xvoHo8Jhr8KSY2Myez6du0qr+h37jphokmMd+N7OGfncDokrHlHTrlJoOIrFijmCIxcy8+20OYSTYtbmZ5XFPg5Ss/35I3kVk2VF2Fjqk6Ps8dI8dBmR/lOsl4DLmo0OaY="/>
|
||||
<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="J9nMSvQJiEK4fHtELJz7ClNFtRmQl/5Fq1lEm+BmOxG4Q7HqupazSoJZtOVbQ1I6PdunN+1Z302GveAHIPhfIw=="/>
|
||||
<Property Name="ProjectExplorer\x64_Expanded_8_1" Type="string" Value="Bclcc8A9IEKzeqI7Supe3jIjyQqAyJNCm3a9EGUqOnlUIxUCz0WJQ7Q1U2f6gMiBuSijmVwM5kq4aMj/yx//wgYyLngoj+ZMkIebDq5aDlg="/>
|
||||
<Property Name="ProjectExplorer\x64_Expanded_7_1" Type="string" Value="doQntELI5kGtE2rkfBxVjyfZzEr0CYhCuHx7RCyc+wpTRbUZkJf+RatZRJvgZjsRuEOx6rqWs0qCWbTlW0NSOurQOJFOmZRMoCJQCbs1/Dvs1tDx12JSTbtZn+j62qdtPdunN+1Z302GveAHIPhfI/OeHmWIm8xPtlOqph86KSE="/>
|
||||
<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"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{082F199E-AA5F-42DE-A1D7-C9BFC973DB9D}" Type="Real64" Value="0"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{0FCABA25-DB66-4E12-ABEC-6E75E92AD397}" Type="Real64" Value="0"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{215424C5-9F3E-438A-AE24-4314B540C243}" Type="Real64" Value="0"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{054DD684-3F0A-4629-BB94-1E5A662EED8A}" Type="Real64" Value="0.94"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{082F199E-AA5F-42DE-A1D7-C9BFC973DB9D}" Type="Real64" Value="1"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{0FCABA25-DB66-4E12-ABEC-6E75E92AD397}" Type="Real64" Value="1"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{215424C5-9F3E-438A-AE24-4314B540C243}" Type="Real64" Value="1"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{264C0657-8EE3-435B-9D01-246DABEB52D7}" Type="Real64" Value="0"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{29928AF3-1DE3-475C-9CF6-9892FED27E34}" Type="Real64" Value="1"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{4193E609-4585-49C0-8CCB-989754DC1284}" Type="Real64" Value="1"/>
|
||||
|
|
@ -167,16 +167,16 @@
|
|||
<Property Name="RTPC\GameParameterSimValue\{64F012EA-795C-4DDF-82F0-00DFA345043A}" Type="Real64" Value="0"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{69088562-620A-4123-8C93-DDBD1437C6C9}" Type="Real64" Value="1"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{72651D5D-22E1-4AEE-87FA-9F706D12B1DC}" Type="Real64" Value="0"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{73534BF8-0FC9-4F33-92A9-D9E445654891}" Type="Real64" Value="0"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{73534BF8-0FC9-4F33-92A9-D9E445654891}" Type="Real64" Value="0.71"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{778F5836-B82F-46F8-936A-E8581E9DA7A9}" Type="Real64" Value="1"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{9D610C30-BA07-43EF-B2E3-6CEB72857C03}" Type="Real64" Value="0"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{9D610C30-BA07-43EF-B2E3-6CEB72857C03}" Type="Real64" Value="0.54"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{A5EACAF7-0E81-432C-A284-84437E8983B3}" Type="Real64" Value="1"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{B54383F3-A1EF-4FCA-94D5-24A7E4AC228C}" Type="Real64" Value="0"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{B907BE30-367C-4955-AF3B-AF6B2806F9D5}" Type="Real64" Value="0"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{B54383F3-A1EF-4FCA-94D5-24A7E4AC228C}" Type="Real64" Value="0.5"/>
|
||||
<Property Name="RTPC\GameParameterSimValue\{B907BE30-367C-4955-AF3B-AF6B2806F9D5}" Type="Real64" Value="100"/>
|
||||
<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="J9nMSvQJiEK4fHtELJz7CvOeHmWIm8xPtlOqph86KSHq0DiRTpmUTKAiUAm7Nfw7"/>
|
||||
<Property Name="SoundBank Manager\x64_Expand States" Type="string" Value="J9nMSvQJiEK4fHtELJz7ClNFtRmQl/5Fq1lEm+BmOxG4Q7HqupazSoJZtOVbQ1I6854eZYibzE+2U6qmHzopIerQOJFOmZRMoCJQCbs1/Ds="/>
|
||||
<Property Name="SoundBankHeaderFilePath" Type="string" Value="GeneratedSoundBanks\"/>
|
||||
<Property Name="SoundBankPaths" Type="string">
|
||||
<ValueList>
|
||||
|
|
|
|||
|
|
@ -38,31 +38,31 @@ ZW5zZSBpZD0iNDEiIG5hbWU9Ild3aXNlIChMaW1pdGVkIENvbW1lcmNpYWwgTGlj
|
|||
ZW5zZSkgKExpbWl0ZWQgdG8gNTAwIGFzc2V0cykiIHR5cGU9IjIiIHBsYXRmb3Jt
|
||||
cz0iNCwxMCwxMywxNCIgZXhwaXJlcz0iMjAyMi0wNC0wMSIgYXNzZXRzPSI1MDAi
|
||||
IC8+PGxpY2Vuc2UgaWQ9IjMxIiBuYW1lPSJTb3VuZFNlZWQgQWlyIiB0eXBlPSIx
|
||||
IiBwbGF0Zm9ybXM9IjQsMTAsMTQiIGV4cGlyZXM9IjIwMjEtMDUtMTUiICAvPjxs
|
||||
IiBwbGF0Zm9ybXM9IjQsMTAsMTQiIGV4cGlyZXM9IjIwMjEtMDgtMDEiICAvPjxs
|
||||
aWNlbnNlIGlkPSI1NCIgbmFtZT0iU291bmRTZWVkIEdyYWluIiB0eXBlPSIxIiBw
|
||||
bGF0Zm9ybXM9IjQsMTAsMTQiIGV4cGlyZXM9IjIwMjEtMDUtMTUiICAvPjxsaWNl
|
||||
bGF0Zm9ybXM9IjQsMTAsMTQiIGV4cGlyZXM9IjIwMjEtMDgtMDEiICAvPjxsaWNl
|
||||
bnNlIGlkPSIxMSIgbmFtZT0iaVpvdG9wZSBUcmFzaCBGaWx0ZXJzIiB0eXBlPSIx
|
||||
IiBwbGF0Zm9ybXM9IjQsMTAsMTQiIGV4cGlyZXM9IjIwMjEtMDUtMTUiICAvPjxs
|
||||
IiBwbGF0Zm9ybXM9IjQsMTAsMTQiIGV4cGlyZXM9IjIwMjEtMDgtMDEiICAvPjxs
|
||||
aWNlbnNlIGlkPSIxMiIgbmFtZT0iaVpvdG9wZSBUcmFzaCBNdWx0aS1iYW5kIERp
|
||||
c3RvcnRpb25zIiB0eXBlPSIxIiBwbGF0Zm9ybXM9IjQsMTAsMTQiIGV4cGlyZXM9
|
||||
IjIwMjEtMDUtMTUiICAvPjxsaWNlbnNlIGlkPSIxMyIgbmFtZT0iaVpvdG9wZSBU
|
||||
IjIwMjEtMDgtMDEiICAvPjxsaWNlbnNlIGlkPSIxMyIgbmFtZT0iaVpvdG9wZSBU
|
||||
cmFzaCBTaW5nbGUtYmFuZCBEaXN0b3J0aW9ucyIgdHlwZT0iMSIgcGxhdGZvcm1z
|
||||
PSI0LDEwLDE0IiBleHBpcmVzPSIyMDIxLTA1LTE1IiAgLz48bGljZW5zZSBpZD0i
|
||||
PSI0LDEwLDE0IiBleHBpcmVzPSIyMDIxLTA4LTAxIiAgLz48bGljZW5zZSBpZD0i
|
||||
MTQiIG5hbWU9Imlab3RvcGUgVHJhc2ggQm94IE1vZGVscyIgdHlwZT0iMSIgcGxh
|
||||
dGZvcm1zPSI0LDEwLDE0IiBleHBpcmVzPSIyMDIxLTA1LTE1IiAgLz48bGljZW5z
|
||||
dGZvcm1zPSI0LDEwLDE0IiBleHBpcmVzPSIyMDIxLTA4LTAxIiAgLz48bGljZW5z
|
||||
ZSBpZD0iMTUiIG5hbWU9Imlab3RvcGUgVHJhc2ggRHluYW1pY3MgKyBEZWxheSBC
|
||||
dW5kbGUiIHR5cGU9IjEiIHBsYXRmb3Jtcz0iNCwxMCwxNCIgZXhwaXJlcz0iMjAy
|
||||
MS0wNS0xNSIgIC8+PGxpY2Vuc2UgaWQ9IjE2IiBuYW1lPSJpWm90b3BlIEh5YnJp
|
||||
MS0wOC0wMSIgIC8+PGxpY2Vuc2UgaWQ9IjE2IiBuYW1lPSJpWm90b3BlIEh5YnJp
|
||||
ZCBSZXZlcmIiIHR5cGU9IjEiIHBsYXRmb3Jtcz0iNCwxMCwxNCIgZXhwaXJlcz0i
|
||||
MjAyMS0wNS0xNSIgIC8+PGxpY2Vuc2UgaWQ9IjEwIiBuYW1lPSJNY0RTUCBCdW5k
|
||||
MjAyMS0wOC0wMSIgIC8+PGxpY2Vuc2UgaWQ9IjEwIiBuYW1lPSJNY0RTUCBCdW5k
|
||||
bGUgKE1MMSwgRnV0ekJveCkiIHR5cGU9IjEiIHBsYXRmb3Jtcz0iNCwxMCwxNCIg
|
||||
ZXhwaXJlcz0iMjAyMS0wNi0yOCIgIC8+PC9wcm9qZWN0Pg==|K5pv7w2AJGKm83p
|
||||
ZMAMxyty1ESLzbmW/kMiZNzK6WxmAl63kl/vQT9NybW4Anib4hOoT9p6nax6iOnL
|
||||
olmxHcXcT7VhL3ZAYe2HnXZO7j9jcQoILzsdvwRKwtUdG8jRyVAhJ/GCFa6O3/OH
|
||||
Sb8+r9c0e2GPq914YdXNclK2emeWvZXamDNai1vosh9DI0DW9vG4sxQA1PTyLnNT
|
||||
kjDvR4kd7lUxaACRkowMxsarKav5ix4Ovf0V+oyZPA3V/8sOZnCsSo2Fvxh79Iun
|
||||
Uirl9wsxYhZHtekNGXE/6pZT5PkK+h53B3ixm5gKjuLte6lYV7cjIScvGCduRYpc
|
||||
8nscgwQ==
|
||||
ZXhwaXJlcz0iMjAyMS0wOC0wMSIgIC8+PC9wcm9qZWN0Pg==|NBBl885V/400+q/
|
||||
iX3ZdjX1w4peIdit7BCl7Ancfvph3scyTQNPIUih6zoCyNgDcuKEZg1vVXEXgg/s
|
||||
zDMPHr8frHsSWbVJiDv+j0I6yuN3idoF/Q8OfCpj7SaIpSwt91sVdjh8/0UKBq1W
|
||||
I/0U2Ydr/9S6IJlj3Rr51fHeE3L9vp5doees0qU2gy671IRQLy5eL3M6sZsSIFuj
|
||||
PD0g8ws3eD0Z1h3J1qbU9SOmoyNkywwvsbeMhUJyzuNWnzGr+cXCf3RiJZLGYSDw
|
||||
pbqunvYvZfJ8sLlAXefkqmo99gxJrb3ZKGIM1Ojwx84rOmhyQkh7isE32bQ9COjD
|
||||
JBnTG7g==
|
||||
"/>
|
||||
<Property Name="SoundBankGenerateEstimatedDuration" Type="bool" Value="True"/>
|
||||
<Property Name="SoundBankGenerateHeaderFile" Type="bool" Value="True"/>
|
||||
|
|
|
|||
|
|
@ -167,6 +167,12 @@
|
|||
<Property Name="MicType" Type="int32" Value="2"/>
|
||||
</PropertyList>
|
||||
<ChildrenList>
|
||||
<PluginMediaSource Name="" ID="{F19CE877-12D6-4A48-9353-EEF1DCF8BEC7}">
|
||||
<ParentPluginID>462899</ParentPluginID>
|
||||
<MediaIDList>
|
||||
<MediaID ID="435959294"/>
|
||||
</MediaIDList>
|
||||
</PluginMediaSource>
|
||||
<PluginMediaSource Name="" ID="{887F2160-14C2-436C-9E96-A353F04860A3}">
|
||||
<ParentPluginID>462899</ParentPluginID>
|
||||
<MediaIDList>
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@
|
|||
</Action>
|
||||
</ChildrenList>
|
||||
</Event>
|
||||
<Event Name="IonCannon_charge_start" ID="{926CA47C-05B7-443F-92F1-7F99ED878BFE}">
|
||||
<Event Name="IonCannon_charge_play" ID="{926CA47C-05B7-443F-92F1-7F99ED878BFE}">
|
||||
<ChildrenList>
|
||||
<Action Name="" ID="{739F5D09-3808-4D68-9B17-DFDAA22D3ABF}" ShortID="67337178">
|
||||
<ReferenceList>
|
||||
|
|
@ -204,7 +204,7 @@
|
|||
</Action>
|
||||
</ChildrenList>
|
||||
</Event>
|
||||
<Event Name="LightningGun_charge_start" ID="{C079F5B7-E84D-4949-A243-E3CEF7A9C3BB}">
|
||||
<Event Name="LightningGun_charge_play" ID="{C079F5B7-E84D-4949-A243-E3CEF7A9C3BB}">
|
||||
<ChildrenList>
|
||||
<Action Name="" ID="{51FD9B7A-8611-4EA5-AFFC-46636D4B9CB3}" ShortID="203203463">
|
||||
<ReferenceList>
|
||||
|
|
@ -292,7 +292,7 @@
|
|||
</Folder>
|
||||
<Folder Name="RailGun" ID="{EE77E8AF-613A-49A2-8C77-E37B3867E770}" ShortID="659032749">
|
||||
<ChildrenList>
|
||||
<Event Name="RailGun_charge_start" ID="{896BB1FF-E96F-44E2-ADAC-3FB552FECBE4}">
|
||||
<Event Name="RailGun_charge_play" ID="{896BB1FF-E96F-44E2-ADAC-3FB552FECBE4}">
|
||||
<ChildrenList>
|
||||
<Action Name="" ID="{3B675650-DA3A-482C-ADBD-053E55526F80}" ShortID="629614386">
|
||||
<ReferenceList>
|
||||
|
|
|
|||
Binary file not shown.
BIN
Aetheria-Economy_WwiseProject/Originals/SFX/SFX_Spcshp_reactor_extended_V2.0.wav
(Stored with Git LFS)
Normal file
BIN
Aetheria-Economy_WwiseProject/Originals/SFX/SFX_Spcshp_reactor_extended_V2.0.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
Binary file not shown.
BIN
Aetheria-Economy_WwiseProject/Originals/SFX/SFX__railgun_charging.wav
(Stored with Git LFS)
Normal file
BIN
Aetheria-Economy_WwiseProject/Originals/SFX/SFX__railgun_charging.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
Binary file not shown.
BIN
Aetheria-Economy_WwiseProject/Originals/SFX/SFX_spcship_shield_active02.wav
(Stored with Git LFS)
Normal file
BIN
Aetheria-Economy_WwiseProject/Originals/SFX/SFX_spcship_shield_active02.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
Binary file not shown.
BIN
Aetheria-Economy_WwiseProject/Originals/SFX/SFX_weapon_ioncannon_ship_charge.wav
(Stored with Git LFS)
Normal file
BIN
Aetheria-Economy_WwiseProject/Originals/SFX/SFX_weapon_ioncannon_ship_charge.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
Binary file not shown.
BIN
Aetheria-Economy_WwiseProject/Originals/SFX/SFX_weapon_lightingGun_charge.wav
(Stored with Git LFS)
Normal file
BIN
Aetheria-Economy_WwiseProject/Originals/SFX/SFX_weapon_lightingGun_charge.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
Binary file not shown.
BIN
Aetheria-Economy_WwiseProject/Originals/SFX/SFX_weapon_lightingGun_discharge01.wav
(Stored with Git LFS)
Normal file
BIN
Aetheria-Economy_WwiseProject/Originals/SFX/SFX_weapon_lightingGun_discharge01.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
Binary file not shown.
BIN
Aetheria-Economy_WwiseProject/Originals/SFX/SFX_weapon_lightingGun_dishi.wav
(Stored with Git LFS)
Normal file
BIN
Aetheria-Economy_WwiseProject/Originals/SFX/SFX_weapon_lightingGun_dishi.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
Binary file not shown.
BIN
Aetheria-Economy_WwiseProject/Originals/SFX/SFX_weapon_lightingGun_dislow.wav
(Stored with Git LFS)
Normal file
BIN
Aetheria-Economy_WwiseProject/Originals/SFX/SFX_weapon_lightingGun_dislow.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Aetheria-Economy_WwiseProject/Originals/SFX/rotor_2.akd
Normal file
BIN
Aetheria-Economy_WwiseProject/Originals/SFX/rotor_2.akd
Normal file
Binary file not shown.
BIN
Aetheria-Economy_WwiseProject/Originals/SFX/rotor_2.wav
(Stored with Git LFS)
Normal file
BIN
Aetheria-Economy_WwiseProject/Originals/SFX/rotor_2.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
Binary file not shown.
BIN
Aetheria-Economy_WwiseProject/Originals/SFX/sfx_spcp_drives_dc_scifi_electric.wav
(Stored with Git LFS)
Normal file
BIN
Aetheria-Economy_WwiseProject/Originals/SFX/sfx_spcp_drives_dc_scifi_electric.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
Binary file not shown.
BIN
Aetheria-Economy_WwiseProject/Originals/SFX/sfx_spcp_drives_nuclr01.wav
(Stored with Git LFS)
Normal file
BIN
Aetheria-Economy_WwiseProject/Originals/SFX/sfx_spcp_drives_nuclr01.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
|
|
@ -75,7 +75,7 @@
|
|||
<ChildrenList>
|
||||
<SoundBank Name="Aetheric_Drive" ID="{350984ED-1B55-4087-A16C-1B70FE8A828B}">
|
||||
<ObjectInclusionList>
|
||||
<ObjectRef Name="Aetheric Drives" ID="{3796CE6F-3F3B-40E0-981C-67B7D155383A}" WorkUnitID="{79AC243A-4E47-49B9-A0E2-2B1628E6088C}" Origin="Manual" Filter="7"/>
|
||||
<ObjectRef Name="Electric" ID="{E4F7CF4A-E48D-4D56-9517-6163AA4E8FB3}" WorkUnitID="{79AC243A-4E47-49B9-A0E2-2B1628E6088C}" Origin="Manual" Filter="7"/>
|
||||
<ObjectRef Name="Aetheric Drives" ID="{F215CA3C-1210-4E73-9ECD-3E6F7369235E}" WorkUnitID="{9A5FC1F4-79BA-4A06-9984-65A4DD1C8167}" Origin="Manual" Filter="7"/>
|
||||
</ObjectInclusionList>
|
||||
<ObjectExclusionList/>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<SoundcasterSession Name="spaceship_sounds" ID="{8CD02381-704A-4881-9445-9A309D9B5B9E}">
|
||||
<ModuleList>
|
||||
<Module>
|
||||
<ObjectRef Name="RailGun_charge_start" ID="{896BB1FF-E96F-44E2-ADAC-3FB552FECBE4}" WorkUnitID="{79AC243A-4E47-49B9-A0E2-2B1628E6088C}"/>
|
||||
<ObjectRef Name="RailGun_charge_play" ID="{896BB1FF-E96F-44E2-ADAC-3FB552FECBE4}" WorkUnitID="{79AC243A-4E47-49B9-A0E2-2B1628E6088C}"/>
|
||||
<Position X="0" Y="3"/>
|
||||
</Module>
|
||||
<Module>
|
||||
|
|
@ -94,7 +94,7 @@
|
|||
<Position X="1" Y="1"/>
|
||||
</Module>
|
||||
<Module>
|
||||
<ObjectRef Name="RailGun_charge_start" ID="{896BB1FF-E96F-44E2-ADAC-3FB552FECBE4}" WorkUnitID="{79AC243A-4E47-49B9-A0E2-2B1628E6088C}"/>
|
||||
<ObjectRef Name="RailGun_charge_play" ID="{896BB1FF-E96F-44E2-ADAC-3FB552FECBE4}" WorkUnitID="{79AC243A-4E47-49B9-A0E2-2B1628E6088C}"/>
|
||||
<Position X="1" Y="2"/>
|
||||
</Module>
|
||||
<Module>
|
||||
|
|
@ -165,7 +165,7 @@
|
|||
</RTPCValue>
|
||||
<RTPCValue>
|
||||
<GameParameterRef Name="charge_level" ID="{082F199E-AA5F-42DE-A1D7-C9BFC973DB9D}"/>
|
||||
<Value>0</Value>
|
||||
<Value>1</Value>
|
||||
</RTPCValue>
|
||||
<RTPCValue>
|
||||
<GameParameterRef Name="sfx_thruster_variability" ID="{A5EACAF7-0E81-432C-A284-84437E8983B3}"/>
|
||||
|
|
@ -173,11 +173,11 @@
|
|||
</RTPCValue>
|
||||
<RTPCValue>
|
||||
<GameParameterRef Name="target_locking" ID="{215424C5-9F3E-438A-AE24-4314B540C243}"/>
|
||||
<Value>0</Value>
|
||||
<Value>1</Value>
|
||||
</RTPCValue>
|
||||
<RTPCValue>
|
||||
<GameParameterRef Name="sfx_ship_electric_speed" ID="{9D610C30-BA07-43EF-B2E3-6CEB72857C03}"/>
|
||||
<Value>0</Value>
|
||||
<Value>0.54</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.19</Value>
|
||||
<Value>0.94</Value>
|
||||
</RTPCValue>
|
||||
<RTPCValue>
|
||||
<GameParameterRef Name="sfx_reactor_alarm" ID="{778F5836-B82F-46F8-936A-E8581E9DA7A9}"/>
|
||||
|
|
@ -217,7 +217,7 @@
|
|||
</RTPCValue>
|
||||
<RTPCValue>
|
||||
<GameParameterRef Name="sfx_ship_drive_electric_fuzzbox_filter" ID="{0FCABA25-DB66-4E12-ABEC-6E75E92AD397}"/>
|
||||
<Value>0.86</Value>
|
||||
<Value>1</Value>
|
||||
</RTPCValue>
|
||||
<RTPCValue>
|
||||
<GameParameterRef Name="sfx_reactor_pitch" ID="{DB985387-9685-4E6D-BF7E-AAE3C0C79457}"/>
|
||||
|
|
|
|||
|
|
@ -60,8 +60,8 @@
|
|||
<Compile Include="Assets\Scripts\ServerShared\Behaviors\HaulingController.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\NIH\LinqFaster\Reverse.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\Behaviors\Cooldown.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\CultCache\RethinkConnection.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\NIH\LiteNetLib\Utils\NtpPacket.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\CultCache\RethinkConnection.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\OrbitalEntity.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\ActionCollection.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\NIH\LiteNetLib\Utils\FastBitConverter.cs" />
|
||||
|
|
@ -80,6 +80,7 @@
|
|||
<Compile Include="Assets\Scripts\ServerShared\NIH\LiteNetLib\Utils\NetDataWriter.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\NIH\LinqFaster\Single.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\Agents\States\Combat.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\WwiseMetadata.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\NIH\LinqFaster\OrderBy.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\NIH\KDTree\KDQuery\QueryInterval.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\NIH\MIConvexHull\Triangulation\DelaunayTrianglationInternal.cs" />
|
||||
|
|
@ -213,6 +214,7 @@
|
|||
<Compile Include="Assets\Scripts\ServerShared\CultCache\Serialization\JsonKnownTypes\Exceptions\JsonKnownTypesException.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\NIH\LinqFaster\Utils\Error.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\Behaviors\Behaviors.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\WwiseSoundBinding.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\NIH\LiteNetLib\Layers\PacketLayerBase.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\Narrative\StoryProcessor.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\NIH\LiteNetLib\Layers\XorEncryptLayer.cs" />
|
||||
|
|
@ -258,12 +260,12 @@
|
|||
<Compile Include="Assets\Scripts\ServerShared\ItemManager.cs" />
|
||||
<None Include="Assets\Scripts\ServerShared\NIH\LinqFaster\readme.txt" />
|
||||
<None Include="Assets\Scripts\ServerShared\Aetheria.Shared.Unity.asmdef" />
|
||||
<Reference Include="System.Threading.Tasks.Extensions">
|
||||
<HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll</HintPath>
|
||||
</Reference>
|
||||
<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>
|
||||
|
|
@ -285,15 +287,15 @@
|
|||
<Reference Include="QuickGraph">
|
||||
<HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/QuickGraph.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Threading.Tasks.Extensions">
|
||||
<HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="SourceUnityLib">
|
||||
<HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll</HintPath>
|
||||
</Reference>
|
||||
<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>C:/Program Files/Unity/Hub/Editor/2020.2.6f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
|
||||
</Reference>
|
||||
|
|
|
|||
|
|
@ -47,22 +47,41 @@ namespace Substance.EditorHelper
|
|||
public static bool IsURP()
|
||||
{
|
||||
#if UNITY_2019_3_OR_NEWER
|
||||
bool bActive = false;
|
||||
bool bActive = false;
|
||||
|
||||
UnityEngine.Rendering.RenderPipelineAsset asset;
|
||||
asset = UnityEngine.Rendering.GraphicsSettings.renderPipelineAsset;
|
||||
UnityEngine.Rendering.RenderPipelineAsset asset;
|
||||
asset = UnityEngine.Rendering.GraphicsSettings.renderPipelineAsset;
|
||||
|
||||
if ((asset != null) &&
|
||||
(asset.GetType().ToString().EndsWith(".UniversalRenderPipelineAsset")))
|
||||
{
|
||||
bActive = true;
|
||||
}
|
||||
if ((asset != null) &&
|
||||
(asset.GetType().ToString().EndsWith("UniversalRenderPipelineAsset")))
|
||||
{
|
||||
bActive = true;
|
||||
}
|
||||
|
||||
return bActive;
|
||||
return bActive;
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
// Keep the following for PackageManager investigation:
|
||||
/*
|
||||
public static UnityEditor.PackageManager.PackageInfo GetPackageInfo(string pName)
|
||||
{
|
||||
#if UNITY_2019_3_OR_NEWER
|
||||
Debug.Log("New stuff...");
|
||||
|
||||
UnityEditor.PackageManager.PackageInfo info;
|
||||
|
||||
info = UnityEditor.PackageManager.PackageInfo.FindForAssetPath(pName);
|
||||
|
||||
return info;
|
||||
#else
|
||||
Debug.Log("Old stuff...");
|
||||
return null;
|
||||
#endif
|
||||
}
|
||||
*/
|
||||
}
|
||||
}
|
||||
}
|
||||
BIN
Assets/Allegorithmic/Plugins/Substance.Engine.bundle/Contents/MacOS/Substance.Engine
(Stored with Git LFS)
BIN
Assets/Allegorithmic/Plugins/Substance.Engine.bundle/Contents/MacOS/Substance.Engine
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/Allegorithmic/Plugins/Substance.Engine.dll
(Stored with Git LFS)
BIN
Assets/Allegorithmic/Plugins/Substance.Engine.dll
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/Allegorithmic/Plugins/Substance.Game.dll
(Stored with Git LFS)
BIN
Assets/Allegorithmic/Plugins/Substance.Game.dll
(Stored with Git LFS)
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll
(Stored with Git LFS)
BIN
Assets/Allegorithmic/Plugins/Substance/Substance Engine/Editor/Substance.Editor.dll
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/Allegorithmic/Plugins/Substance/iOS/libSubstance.Engine.a
(Stored with Git LFS)
BIN
Assets/Allegorithmic/Plugins/Substance/iOS/libSubstance.Engine.a
(Stored with Git LFS)
Binary file not shown.
|
|
@ -1,4 +1,4 @@
|
|||
Build Number: 118
|
||||
Commit Hash: 2b1f4be3a8d28d44dc5ce59eff39c91144368d60
|
||||
Plugin Commit: 9183
|
||||
Plugin Build: A8
|
||||
Plugin Commit: 24eb4364a04f2cf81f76a384c02085ea3afcfeb5
|
||||
Plugin Build: A4
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -6937,6 +6937,13 @@ MonoBehaviour:
|
|||
- {fileID: 7082458133318971407}
|
||||
EquipmentHardpoints:
|
||||
- {fileID: 2469466822132512704}
|
||||
- {fileID: 1146951631}
|
||||
- {fileID: 1438588955}
|
||||
- {fileID: 1710933325}
|
||||
- {fileID: 3957237907279416794}
|
||||
- {fileID: 253280912000941906}
|
||||
- {fileID: 7393376835743981754}
|
||||
- {fileID: 4372481120480406282}
|
||||
RadiatorHardpoints: []
|
||||
ThrusterHardpoints:
|
||||
- {fileID: 3048427942634017260}
|
||||
|
|
|
|||
|
|
@ -66,6 +66,17 @@ MonoBehaviour:
|
|||
- {fileID: 622200413621136597}
|
||||
EquipmentHardpoints:
|
||||
- {fileID: 5919860033273162118}
|
||||
- {fileID: 3808243476277989511}
|
||||
- {fileID: 3808243476383497141}
|
||||
- {fileID: 3808243476117197859}
|
||||
- {fileID: 3808243477043154687}
|
||||
- {fileID: 3808243475991870157}
|
||||
- {fileID: 3808243475691857600}
|
||||
- {fileID: 3808243476828703185}
|
||||
- {fileID: 3808243475227829746}
|
||||
- {fileID: 2790942369306015874}
|
||||
- {fileID: 8786608379366237548}
|
||||
- {fileID: 831742832124941950}
|
||||
RadiatorHardpoints:
|
||||
- {fileID: 3129773903157032569}
|
||||
- {fileID: 3644514805656464792}
|
||||
|
|
@ -529,6 +540,7 @@ Transform:
|
|||
- {fileID: 2790942369306015874}
|
||||
- {fileID: 8786608379366237548}
|
||||
- {fileID: 5919860033273162118}
|
||||
- {fileID: 831742832124941950}
|
||||
m_Father: {fileID: 737798575382408336}
|
||||
m_RootOrder: 9
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -1677,6 +1689,36 @@ MeshRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!1 &8319681195931096355
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 831742832124941950}
|
||||
m_Layer: 0
|
||||
m_Name: Drive
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &831742832124941950
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8319681195931096355}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -0, y: 0.83, z: -2.82}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 3808243475646715368}
|
||||
m_RootOrder: 11
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &8882633467169423962
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -802,8 +802,8 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 741153267}
|
||||
m_LocalRotation: {x: 0.015506899, y: 0.9502416, z: -0.3074132, w: 0.04793321}
|
||||
m_LocalPosition: {x: -117.52, y: -77.08742, z: 149.09026}
|
||||
m_LocalRotation: {x: 0.015506914, y: 0.9502416, z: -0.30741316, w: 0.047933258}
|
||||
m_LocalPosition: {x: -117.52002, y: -77.08742, z: 149.09026}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 412917866}
|
||||
|
|
@ -1095,6 +1095,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 850359437}
|
||||
- component: {fileID: 850359436}
|
||||
- component: {fileID: 850359438}
|
||||
m_Layer: 0
|
||||
m_Name: Persist
|
||||
m_TagString: Untagged
|
||||
|
|
@ -1128,6 +1129,32 @@ Transform:
|
|||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 11
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &850359438
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 850359435}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: a4eab75687879a445a2a2397d86a2172, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
InitializationSettings: {fileID: 11400000, guid: ca1886ece3dfc5e49902e78defccd355,
|
||||
type: 2}
|
||||
basePath:
|
||||
language:
|
||||
defaultPoolSize: 0
|
||||
lowerPoolSize: 0
|
||||
streamingPoolSize: 0
|
||||
memoryCutoffThreshold: 0
|
||||
monitorPoolSize: 0
|
||||
monitorQueuePoolSize: 0
|
||||
callbackManagerBufferSize: 0
|
||||
spatialAudioPoolSize: 0
|
||||
maxSoundPropagationDepth: 0
|
||||
engineLogging: 0
|
||||
--- !u!1 &965376321
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1234,8 +1261,8 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 965376321}
|
||||
m_LocalRotation: {x: 0.015506899, y: 0.9502416, z: -0.3074132, w: 0.04793321}
|
||||
m_LocalPosition: {x: -117.52, y: -77.08742, z: 149.09026}
|
||||
m_LocalRotation: {x: 0.015506914, y: 0.9502416, z: -0.30741316, w: 0.047933258}
|
||||
m_LocalPosition: {x: -117.52002, y: -77.08742, z: 149.09026}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
|
|
@ -2321,7 +2348,7 @@ PrefabInstance:
|
|||
- target: {fileID: 3664209305474245377, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 60.98
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3664209305474245377, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
|
||||
type: 3}
|
||||
|
|
@ -2346,7 +2373,7 @@ PrefabInstance:
|
|||
- target: {fileID: 3664209306888449100, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 55.675
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3664209306888449100, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
|
||||
type: 3}
|
||||
|
|
|
|||
|
|
@ -80,25 +80,25 @@ public class DatabaseInspector : EditorWindow
|
|||
}
|
||||
}
|
||||
|
||||
public void Inspect(object obj, bool inspectablesOnly = true)
|
||||
public void Inspect(object obj, object parent = null)
|
||||
{
|
||||
foreach (var field in obj.GetType().GetFields().OrderBy(f=>f.GetCustomAttribute<KeyAttribute>()?.IntKey ?? 0))
|
||||
{
|
||||
Inspect(obj, field, inspectablesOnly);
|
||||
Inspect(obj, field, parent);
|
||||
}
|
||||
}
|
||||
|
||||
public void Inspect(object obj, FieldInfo field, bool inspectablesOnly = true)
|
||||
public void Inspect(object obj, FieldInfo field, object parent = null)
|
||||
{
|
||||
var inspectable = field.GetCustomAttribute<InspectableAttribute>();
|
||||
if (inspectable == null && inspectablesOnly) return;
|
||||
if (inspectable == null) return;
|
||||
|
||||
var attributes = field.GetCustomAttributes(false);
|
||||
|
||||
var type = field.FieldType;
|
||||
var value = field.GetValue(obj);
|
||||
|
||||
field.SetValue(obj, InspectMember(field.Name.SplitCamelCase(), value, obj, type, false, attributes));
|
||||
field.SetValue(obj, InspectMember(field.Name.SplitCamelCase(), value, parent ?? obj, type, false, attributes));
|
||||
}
|
||||
|
||||
public object InspectMember(string label, object value, object parent, Type type, bool suppressContainer = false, params object[] attributes)
|
||||
|
|
@ -159,7 +159,7 @@ public class DatabaseInspector : EditorWindow
|
|||
else if (value == null) value = Activator.CreateInstance(type);
|
||||
}
|
||||
|
||||
if (value != null && (_foldouts.Contains(value) || suppressContainer)) Inspect(value);
|
||||
if (value != null && (_foldouts.Contains(value) || suppressContainer)) Inspect(value, parent);
|
||||
if(!suppressContainer)
|
||||
GUILayout.EndVertical();
|
||||
_listItemStyle = style;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Unity.Mathematics;
|
||||
using UnityEditor;
|
||||
|
|
@ -110,7 +112,56 @@ public class ShapeInspector : BaseInspector<Shape>
|
|||
|
||||
public override Shape Inspect(string label, Shape value, object parent, DatabaseInspector inspectorWindow)
|
||||
{
|
||||
var hull = parent as HullData;
|
||||
if(value == null)
|
||||
{
|
||||
value = new Shape(1, 1);
|
||||
value[int2(0)] = true;
|
||||
}
|
||||
using (new VerticalScope())
|
||||
{
|
||||
using (new HorizontalScope())
|
||||
{
|
||||
GUILayout.Label(label, GUILayout.Width(width));
|
||||
GUILayout.Label("Size", GUILayout.ExpandWidth(false));
|
||||
GUILayout.Label("X", GUILayout.Width(labelWidth));
|
||||
value.Width = DelayedIntField(value.Width);
|
||||
GUILayout.Label("Y", GUILayout.Width(labelWidth));
|
||||
value.Height = DelayedIntField(value.Height);
|
||||
}
|
||||
|
||||
using (new HorizontalScope())
|
||||
{
|
||||
GUILayout.Label("", GUILayout.Width(width));
|
||||
using (new VerticalScope())
|
||||
{
|
||||
for (var y = value.Height - 1; y >= 0; y--)
|
||||
{
|
||||
using (new HorizontalScope())
|
||||
{
|
||||
for (var x = 0; x < value.Width; x++)
|
||||
{
|
||||
var oldColor = GUI.backgroundColor;
|
||||
value[int2(x, y)] = Toggle(value[int2(x, y)], GUILayout.Width(toggleWidth));
|
||||
GUI.backgroundColor = oldColor;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
GUILayout.FlexibleSpace();
|
||||
}
|
||||
}
|
||||
|
||||
return value;
|
||||
}
|
||||
}
|
||||
|
||||
public class ShapeSchematicInspector : BaseInspector<Shape, InspectableSchematicShapeAttribute>
|
||||
{
|
||||
private Material _schematicMat = new Material(Shader.Find("Legacy Shaders/Particles/Additive"));
|
||||
|
||||
public override Shape Inspect(string label, Shape value, object parent, DatabaseInspector inspectorWindow, InspectableSchematicShapeAttribute attribute)
|
||||
{
|
||||
var item = parent as EquippableItemData;
|
||||
if(value == null)
|
||||
{
|
||||
value = new Shape(1, 1);
|
||||
|
|
@ -119,8 +170,8 @@ public class ShapeInspector : BaseInspector<Shape>
|
|||
using (new VerticalScope())
|
||||
{
|
||||
Texture2D schematic = null;
|
||||
if(hull != null && !string.IsNullOrEmpty(hull.Schematic))
|
||||
schematic = AssetDatabase.LoadAssetAtPath<Texture2D>(hull.Schematic);
|
||||
if(item != null && !string.IsNullOrEmpty(item.Schematic))
|
||||
schematic = AssetDatabase.LoadAssetAtPath<Texture2D>(item.Schematic);
|
||||
using (new HorizontalScope())
|
||||
{
|
||||
GUILayout.Label(label, GUILayout.Width(width));
|
||||
|
|
@ -158,7 +209,7 @@ public class ShapeInspector : BaseInspector<Shape>
|
|||
for (var x = 0; x < value.Width; x++)
|
||||
{
|
||||
var oldColor = GUI.backgroundColor;
|
||||
if(hull != null)
|
||||
if(item is HullData hull)
|
||||
{
|
||||
var hardpoint = hull.Hardpoints
|
||||
.FirstOrDefault(hp =>
|
||||
|
|
@ -180,4 +231,93 @@ public class ShapeInspector : BaseInspector<Shape>
|
|||
|
||||
return value;
|
||||
}
|
||||
}
|
||||
|
||||
public class WwiseSoundBankInspector : BaseInspector<uint, InspectableSoundBankAttribute>
|
||||
{
|
||||
public override uint Inspect(string label, uint value, object parent, DatabaseInspector inspectorWindow, InspectableSoundBankAttribute attribute)
|
||||
{
|
||||
using (new HorizontalScope())
|
||||
{
|
||||
GUILayout.Label(label, GUILayout.Width(width));
|
||||
|
||||
var item = parent as EquippableItemData;
|
||||
if (item == null)
|
||||
{
|
||||
using (new HorizontalScope(GUI.skin.box))
|
||||
{
|
||||
GUILayout.Label("Unsupported Parent Type!");
|
||||
return value;
|
||||
}
|
||||
}
|
||||
|
||||
IEnumerable<WwiseMetaSoundBank> soundBanks = ActionGameManager.SoundBanksInfo.SoundBanks;
|
||||
|
||||
if (item.Behaviors.Any(b => b is WeaponData))
|
||||
soundBanks = soundBanks.Where(s => s.GetEvent(WeaponAudioEvent.Fire) != null);
|
||||
|
||||
if (item.Behaviors.Any(b => b is ChargedWeaponData))
|
||||
soundBanks = soundBanks.Where(s => s.GetEvent(ChargedWeaponAudioEvent.Start) != null);
|
||||
|
||||
if (item.Behaviors.Any(b => b is ReactorData || b is ThrusterData || b is AetherDriveData))
|
||||
soundBanks = soundBanks.Where(s =>
|
||||
s.GetEvent(LoopingAudioEvent.Play) != null &&
|
||||
s.GetEvent(LoopingAudioEvent.Stop) != null &&
|
||||
s.GetParameter(SpecialAudioParameter.Intensity) != null);
|
||||
|
||||
var soundBanksArray = soundBanks.ToArray();
|
||||
|
||||
if (soundBanksArray.Length==0)
|
||||
{
|
||||
using (new HorizontalScope(GUI.skin.box))
|
||||
{
|
||||
GUILayout.Label("Sound bank not found!");
|
||||
return value;
|
||||
}
|
||||
}
|
||||
|
||||
var selected = Array.FindIndex(soundBanksArray, o=>o.Id==value);
|
||||
if (selected == -1) selected = 0;
|
||||
|
||||
value = soundBanksArray[Popup(selected, soundBanksArray.Select(p => p.ShortName).ToArray())].Id;
|
||||
return value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public class WwiseParameterBindingInspector : BaseInspector<uint, InspectableAudioParameterAttribute>
|
||||
{
|
||||
public override uint Inspect(string label, uint value, object parent, DatabaseInspector inspectorWindow, InspectableAudioParameterAttribute attribute)
|
||||
{
|
||||
using (new HorizontalScope())
|
||||
{
|
||||
GUILayout.Label(label, GUILayout.Width(width));
|
||||
|
||||
var item = parent as EquippableItemData;
|
||||
if (item == null)
|
||||
{
|
||||
using (new HorizontalScope(GUI.skin.box))
|
||||
{
|
||||
GUILayout.Label("Unsupported Parent Type!");
|
||||
return value;
|
||||
}
|
||||
}
|
||||
|
||||
var soundbank = ActionGameManager.SoundBanksInfo.SoundBanks.FirstOrDefault(s => s.Id == item.SoundBank);
|
||||
if (soundbank == null)
|
||||
{
|
||||
using (new HorizontalScope(GUI.skin.box))
|
||||
{
|
||||
GUILayout.Label("Sound bank not found!");
|
||||
return value;
|
||||
}
|
||||
}
|
||||
|
||||
var selected = Array.FindIndex(soundbank.GameParameters, o=>o.Id==value);
|
||||
if (selected == -1) selected = 0;
|
||||
|
||||
value = soundbank.GameParameters[Popup(selected, soundbank.GameParameters.Select(p => p.Name).ToArray())].Id;
|
||||
return value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -130,7 +130,7 @@ public static class CultClient {
|
|||
case LoginSuccessMessage loginSuccess:
|
||||
_token = loginSuccess.Session;
|
||||
break;
|
||||
case ErrorMessage error:
|
||||
case NetErrorMessage error:
|
||||
OnError?.Invoke(error.Error);
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ using Cinemachine;
|
|||
using Ink;
|
||||
using Ink.Runtime;
|
||||
using MessagePack;
|
||||
using Newtonsoft.Json;
|
||||
using TMPro;
|
||||
using UniRx;
|
||||
using UnityEngine;
|
||||
|
|
@ -36,6 +37,21 @@ public class ActionGameManager : MonoBehaviour
|
|||
get => _gameDataDirectory ??= new DirectoryInfo(Application.dataPath).Parent.CreateSubdirectory("GameData");
|
||||
}
|
||||
|
||||
private static WwiseMetaSoundBanksInfo _soundBanksInfo;
|
||||
public static WwiseMetaSoundBanksInfo SoundBanksInfo => _soundBanksInfo ??=
|
||||
JsonConvert.DeserializeObject<WwiseMetadataFile>(File.ReadAllText(Path.Combine(GameDataDirectory.FullName, "SoundbanksInfo.json")))
|
||||
.SoundBanksInfo;
|
||||
|
||||
private static HashSet<uint> _loadedSoundBanks = new HashSet<uint>();
|
||||
public static void LoadSoundbank(uint soundBank)
|
||||
{
|
||||
if (!_loadedSoundBanks.Contains(soundBank))
|
||||
{
|
||||
AkSoundEngine.LoadBank(SoundBanksInfo.GetSoundBank(soundBank).ShortName, out _);
|
||||
_loadedSoundBanks.Add(soundBank);
|
||||
}
|
||||
}
|
||||
|
||||
private static CultCache _cultCache;
|
||||
|
||||
public static CultCache CultCache
|
||||
|
|
|
|||
|
|
@ -42,9 +42,10 @@ public class EntityInstance : MonoBehaviour
|
|||
private (Transform transform, MeshRenderer meshRenderer) _currentPing;
|
||||
private float _pingBrightness;
|
||||
private Sensor _sensor;
|
||||
|
||||
private (Reactor reactor, GameObject sfxSource) _reactor;
|
||||
private Dictionary<Radiator, GameObject> _radiatorSfx = new Dictionary<Radiator, GameObject>();
|
||||
|
||||
private List<(GameObject source, EquippedItem item)> _audioSources = new List<(GameObject source, EquippedItem item)>();
|
||||
// private (Reactor reactor, GameObject sfxSource) _reactor;
|
||||
// private Dictionary<Radiator, GameObject> _radiatorSfx = new Dictionary<Radiator, GameObject>();
|
||||
|
||||
private static Dictionary<InstantWeaponData, InstantWeaponEffectManager> _instantWeaponManagers = new Dictionary<InstantWeaponData, InstantWeaponEffectManager>();
|
||||
private static Dictionary<ConstantWeaponData, ConstantWeaponEffectManager> _constantWeaponManagers = new Dictionary<ConstantWeaponData, ConstantWeaponEffectManager>();
|
||||
|
|
@ -231,36 +232,24 @@ public class EntityInstance : MonoBehaviour
|
|||
}
|
||||
|
||||
var hp = Entity.Hardpoints[item.Position.x, item.Position.y];
|
||||
if (hp != null && !string.IsNullOrEmpty(item.Data.SoundEffectTrigger))
|
||||
if (hp != null && item.Data.SoundBank != 0)
|
||||
{
|
||||
if(hp.Type == HardpointType.Radiator)
|
||||
var hardpointTransform = EquipmentHardpoints.FirstOrDefault(x => x.name == hp.Transform);
|
||||
if (hardpointTransform != null)
|
||||
{
|
||||
var radiatorHardpoint = RadiatorHardpoints.FirstOrDefault(x => x.name == hp.Transform);
|
||||
if (radiatorHardpoint)
|
||||
var hardpointGameObject = hardpointTransform.gameObject;
|
||||
_audioSources.Add((hardpointGameObject, item));
|
||||
AkSoundEngine.RegisterGameObj(hardpointGameObject);
|
||||
ActionGameManager.LoadSoundbank(item.Data.SoundBank);
|
||||
_subscriptions.Add(item.AudioEvents.Subscribe(e=>AkSoundEngine.PostEvent(e, hardpointGameObject)));
|
||||
_subscriptions.Add(item.AudioParameters.Subscribe(p=>AkSoundEngine.SetRTPCValue(p.id, p.v, hardpointGameObject)));
|
||||
var soundBank = ActionGameManager.SoundBanksInfo.GetSoundBank(item.Data.SoundBank);
|
||||
item.SoundBank = soundBank;
|
||||
if (soundBank.GetEvent(LoopingAudioEvent.Play) != null && soundBank.GetEvent(ChargedWeaponAudioEvent.Start) == null)
|
||||
{
|
||||
var rad = item.GetBehavior<Radiator>();
|
||||
if(rad != null && !string.IsNullOrEmpty(item.Data.SoundEffectTrigger))
|
||||
{
|
||||
AkSoundEngine.RegisterGameObj(radiatorHardpoint.gameObject);
|
||||
AkSoundEngine.PostEvent(item.Data.SoundEffectTrigger, radiatorHardpoint.gameObject);
|
||||
_radiatorSfx[rad] = radiatorHardpoint.gameObject;
|
||||
}
|
||||
AkSoundEngine.PostEvent(soundBank.GetEvent(LoopingAudioEvent.Play).Id, hardpointGameObject);
|
||||
}
|
||||
}
|
||||
// if(hp.Type == HardpointType.Reactor)
|
||||
// {
|
||||
// var reactorHardpoint = EquipmentHardpoints.FirstOrDefault(x => x.name == hp.Transform);
|
||||
// if (reactorHardpoint)
|
||||
// {
|
||||
// var reactor = item.GetBehavior<Reactor>();
|
||||
// if( reactor != null && !string.IsNullOrEmpty(item.Data.SoundEffectTrigger) )
|
||||
// {
|
||||
// AkSoundEngine.RegisterGameObj(reactorHardpoint.gameObject);
|
||||
// AkSoundEngine.PostEvent(item.Data.SoundEffectTrigger, reactorHardpoint.gameObject);
|
||||
// _reactor = (reactor, reactorHardpoint.gameObject);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
}
|
||||
}
|
||||
RadiatorMeshes = new Dictionary<Radiator, MeshRenderer>();
|
||||
|
|
@ -522,25 +511,6 @@ public class EntityInstance : MonoBehaviour
|
|||
foreach(var material in _fadeMaterials) material.SetFloat("_Fade", _fade);
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var r in _radiatorSfx)
|
||||
{
|
||||
r.Value.SetActive(r.Key.Item.Online.Value);
|
||||
AkSoundEngine.SetObjectPosition(r.Value, r.Value.transform);
|
||||
AkSoundEngine.SetRTPCValue("performance_durability", r.Key.Item.DurabilityPerformance, r.Value);
|
||||
AkSoundEngine.SetRTPCValue("performance_thermal", r.Key.Item.ThermalPerformance, r.Value);
|
||||
AkSoundEngine.SetRTPCValue("performance_quality", r.Key.Item.EquippableItem.Quality, r.Value);
|
||||
}
|
||||
|
||||
// if (_reactor.reactor != null)
|
||||
// {
|
||||
// _reactor.sfxSource.SetActive(_reactor.reactor.Item.Online.Value);
|
||||
// AkSoundEngine.SetObjectPosition(_reactor.sfxSource, _reactor.sfxSource.transform);
|
||||
// AkSoundEngine.SetRTPCValue("reactor_load", _reactor.reactor.CurrentLoadRatio, _reactor.sfxSource);
|
||||
// AkSoundEngine.SetRTPCValue("performance_durability", _reactor.reactor.Item.DurabilityPerformance, _reactor.sfxSource);
|
||||
// AkSoundEngine.SetRTPCValue("performance_thermal", _reactor.reactor.Item.ThermalPerformance, _reactor.sfxSource);
|
||||
// AkSoundEngine.SetRTPCValue("performance_quality", _reactor.reactor.Item.EquippableItem.Quality, _reactor.sfxSource);
|
||||
// }
|
||||
|
||||
foreach (var x in RadiatorMeshes)
|
||||
{
|
||||
|
|
@ -560,16 +530,14 @@ public class EntityInstance : MonoBehaviour
|
|||
public virtual void OnDestroy()
|
||||
{
|
||||
Destroy(LocalSpace.gameObject);
|
||||
foreach (var r in _radiatorSfx)
|
||||
foreach (var (source, item) in _audioSources)
|
||||
{
|
||||
AkSoundEngine.PostEvent($"{r.Key.Item.Data.SoundEffectTrigger}_stop", r.Value);
|
||||
AkSoundEngine.UnregisterGameObj(r.Value);
|
||||
}
|
||||
|
||||
if (_reactor.reactor != null)
|
||||
{
|
||||
AkSoundEngine.PostEvent($"{_reactor.reactor.Item.Data.SoundEffectTrigger}_stop", _reactor.sfxSource);
|
||||
AkSoundEngine.UnregisterGameObj(_reactor.sfxSource);
|
||||
var soundBank = ActionGameManager.SoundBanksInfo.GetSoundBank(item.Data.SoundBank);
|
||||
if (soundBank.GetEvent(LoopingAudioEvent.Stop) != null)
|
||||
{
|
||||
AkSoundEngine.PostEvent(soundBank.GetEvent(LoopingAudioEvent.Stop).Id, source);
|
||||
}
|
||||
AkSoundEngine.UnregisterGameObj(source);
|
||||
}
|
||||
foreach(var x in _subscriptions)
|
||||
x.Dispose();
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ public class ShipInstance : EntityInstance
|
|||
private class ThrusterInstance
|
||||
{
|
||||
public Thruster Thruster;
|
||||
public GameObject SfxSource;
|
||||
public ParticleSystem System;
|
||||
public float BaseEmission;
|
||||
public int MaxParticleCount;
|
||||
|
|
@ -53,7 +52,6 @@ public class ShipInstance : EntityInstance
|
|||
return new ThrusterInstance
|
||||
{
|
||||
Thruster = thruster,
|
||||
SfxSource = thrusterHardpoint?.gameObject,
|
||||
System = particles,
|
||||
BaseEmission = particles.emission.rateOverTimeMultiplier,
|
||||
MaxParticleCount = 0
|
||||
|
|
@ -99,31 +97,8 @@ public class ShipInstance : EntityInstance
|
|||
var data = Entity.ItemManager.GetData(item);
|
||||
thrusterInstance.MaxParticleCount = thrusterInstance.System.particleCount;
|
||||
emissionModule.rateOverTimeMultiplier = thrusterInstance.BaseEmission * thrusterInstance.Thruster.Axis * (item.Durability / data.Durability);
|
||||
// if (thrusterInstance.SfxSource)
|
||||
// {
|
||||
// var throttle = 0f;
|
||||
// if (thrusterInstance.System.particleCount > 0)
|
||||
// throttle = (float) thrusterInstance.System.particleCount / thrusterInstance.MaxParticleCount;
|
||||
// AkSoundEngine.SetObjectPosition(thrusterInstance.SfxSource, thrusterInstance.SfxSource.transform);
|
||||
// AkSoundEngine.SetRTPCValue("thruster_throttle", throttle, thrusterInstance.SfxSource);
|
||||
// AkSoundEngine.SetRTPCValue("performance_durability", thrusterInstance.Thruster.Item.DurabilityPerformance, thrusterInstance.SfxSource);
|
||||
// AkSoundEngine.SetRTPCValue("performance_thermal", thrusterInstance.Thruster.Item.ThermalPerformance, thrusterInstance.SfxSource);
|
||||
// AkSoundEngine.SetRTPCValue("performance_quality", thrusterInstance.Thruster.Item.EquippableItem.Quality, thrusterInstance.SfxSource);
|
||||
// }
|
||||
}
|
||||
|
||||
transform.rotation = Ship.Rotation;
|
||||
}
|
||||
|
||||
public override void OnDestroy()
|
||||
{
|
||||
foreach (var thrusterInstance in _thrusters)
|
||||
{
|
||||
if (thrusterInstance.SfxSource)
|
||||
{
|
||||
AkSoundEngine.PostEvent(thrusterInstance.Thruster.Item.Data.SoundEffectTrigger + "_stop", thrusterInstance.SfxSource);
|
||||
AkSoundEngine.UnregisterGameObj(thrusterInstance.SfxSource);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -39,6 +39,12 @@ public class AetherDriveData : BehaviorData
|
|||
|
||||
[Inspectable, JsonProperty("passiveCoupling"), Key(10), RuntimeInspectable]
|
||||
public PerformanceStat PassiveCoupling;
|
||||
|
||||
[InspectableAudioParameter, JsonProperty("rpmAudio"), Key(11), RuntimeInspectable]
|
||||
public uint RpmAudioParameter;
|
||||
|
||||
[InspectableAudioParameter, JsonProperty("torqueAudio"), Key(12), RuntimeInspectable]
|
||||
public uint TorqueRatioAudioParameter;
|
||||
|
||||
public override Behavior CreateInstance(EquippedItem item)
|
||||
{
|
||||
|
|
@ -119,6 +125,10 @@ 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(_data.RpmAudioParameter, (Rpm.x + Rpm.y + Rpm.z) / 3 / MaximumRpm);
|
||||
Item.SetAudioParameter(_data.TorqueRatioAudioParameter, max(max(torqueRatio.x, torqueRatio.y), torqueRatio.z));
|
||||
|
||||
if (Entity.TryConsumeEnergy((draw.x + draw.y + draw.z)*dt))
|
||||
{
|
||||
Rpm += actualRpmDelta;
|
||||
|
|
|
|||
|
|
@ -127,6 +127,7 @@ public class ChargedWeapon : InstantWeapon
|
|||
if (_charging)
|
||||
{
|
||||
_charge += dt / ChargeTime;
|
||||
Item.SetAudioParameter(SpecialAudioParameter.ChargeLevel, saturate(_charge));
|
||||
if (!_charged)
|
||||
{
|
||||
AddHeat(ChargeHeat * (dt / ChargeTime));
|
||||
|
|
@ -143,6 +144,7 @@ public class ChargedWeapon : InstantWeapon
|
|||
_coolingDown = true;
|
||||
_charge = 0;
|
||||
OnFailed?.Invoke();
|
||||
Item.FireAudioEvent(ChargedWeaponAudioEvent.Fail);
|
||||
CauseDamage(_data.FailureDamage);
|
||||
}
|
||||
}
|
||||
|
|
@ -154,6 +156,7 @@ public class ChargedWeapon : InstantWeapon
|
|||
if(!_charging && !_coolingDown)
|
||||
{
|
||||
OnStartCharging?.Invoke();
|
||||
Item.FireAudioEvent(ChargedWeaponAudioEvent.Start);
|
||||
_charging = true;
|
||||
_charged = false;
|
||||
}
|
||||
|
|
@ -169,6 +172,7 @@ public class ChargedWeapon : InstantWeapon
|
|||
_charge = 0;
|
||||
}
|
||||
OnStopCharging?.Invoke();
|
||||
Item.FireAudioEvent(ChargedWeaponAudioEvent.Stop);
|
||||
_charging = false;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -165,7 +165,8 @@ public class InstantWeapon : Weapon, IProgressBehavior, IEventBehavior
|
|||
OnCooldownComplete?.Invoke();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
var firedThisFrame = false;
|
||||
_burstTimer += dt;
|
||||
while (_burstRemaining > 0 && _burstTimer > 0)
|
||||
{
|
||||
|
|
@ -180,6 +181,11 @@ public class InstantWeapon : Weapon, IProgressBehavior, IEventBehavior
|
|||
_burstRemaining--;
|
||||
_burstTimer -= _burstInterval;
|
||||
OnFire?.Invoke();
|
||||
if(!firedThisFrame)
|
||||
{
|
||||
Item.FireAudioEvent(WeaponAudioEvent.Fire);
|
||||
firedThisFrame = true;
|
||||
}
|
||||
CauseWearDamage(1);
|
||||
AddHeat(Heat);
|
||||
Entity.VisibilitySources[this] = Visibility;
|
||||
|
|
|
|||
|
|
@ -140,6 +140,8 @@ public class Reactor : Behavior, IOrderedBehavior, IDisposable
|
|||
CurrentLoadRatio = 1;
|
||||
}
|
||||
|
||||
Item.SetAudioParameter(SpecialAudioParameter.Intensity, max(.25f, 1 - 1 / CurrentLoadRatio));
|
||||
|
||||
AddHeat(heat);
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@ public class Thruster : Behavior, IAnalogBehavior
|
|||
|
||||
public override bool Execute(float dt)
|
||||
{
|
||||
Item.SetAudioParameter(SpecialAudioParameter.Intensity, _input);
|
||||
if(_input > .01f && Entity.TryConsumeEnergy(_input * Evaluate(_data.EnergyUsage)))
|
||||
{
|
||||
Thrust = Evaluate(_data.Thrust);
|
||||
|
|
|
|||
|
|
@ -19,6 +19,9 @@ public class InspectableTextAssetAttribute : PreferredInspectorAttribute { }
|
|||
public class InspectableTemperatureAttribute : PreferredInspectorAttribute { }
|
||||
public class InspectableAnimationCurveAttribute : PreferredInspectorAttribute { }
|
||||
public class InspectableColorAttribute : PreferredInspectorAttribute { }
|
||||
public class InspectableSoundBankAttribute : PreferredInspectorAttribute { }
|
||||
public class InspectableAudioParameterAttribute : PreferredInspectorAttribute { }
|
||||
public class InspectableSchematicShapeAttribute : PreferredInspectorAttribute { }
|
||||
|
||||
public class InspectableEnumValuesAttribute : PreferredInspectorAttribute
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1033,6 +1033,7 @@ public class EquippedItem
|
|||
|
||||
private bool _thermalOnline;
|
||||
private bool _durabilityOnline;
|
||||
public WwiseMetaSoundBank SoundBank;
|
||||
|
||||
public Behavior[] Behaviors { get; }
|
||||
public Dictionary<int, BehaviorGroup> BehaviorGroups { get; }
|
||||
|
|
@ -1053,6 +1054,10 @@ public class EquippedItem
|
|||
public ReadOnlyReactiveProperty<bool> Active { get; }
|
||||
public ItemManager ItemManager { get; }
|
||||
|
||||
public Subject<uint> AudioEvents { get; } = new Subject<uint>();
|
||||
public Subject<(uint id, float v)> AudioParameters { get; } = new Subject<(uint id, float v)>();
|
||||
public Dictionary<uint, float> AudioParameterValues { get; } = new Dictionary<uint, float>();
|
||||
|
||||
public float Temperature
|
||||
{
|
||||
get
|
||||
|
|
@ -1062,8 +1067,77 @@ public class EquippedItem
|
|||
return sum/InsetShape.Coordinates.Length;
|
||||
}
|
||||
}
|
||||
|
||||
//private bool _online;
|
||||
|
||||
public void FireAudioEvent(uint eventId, bool skipVerify = false)
|
||||
{
|
||||
if(SoundBank != null && (skipVerify || SoundBank.IncludedEvents.Any(o => o.Id == eventId)))
|
||||
AudioEvents.OnNext(eventId);
|
||||
}
|
||||
|
||||
public void FireAudioEvent(WwiseSoundBinding soundBinding)
|
||||
{
|
||||
FireAudioEvent(soundBinding.PlayEvent);
|
||||
}
|
||||
|
||||
public void PlaySound(WwiseLoopingSoundBinding soundBinding)
|
||||
{
|
||||
FireAudioEvent(soundBinding.PlayEvent);
|
||||
}
|
||||
|
||||
public void StopSound(WwiseLoopingSoundBinding soundBinding)
|
||||
{
|
||||
FireAudioEvent(soundBinding.StopEvent);
|
||||
}
|
||||
|
||||
public void FireAudioEvent(WeaponAudioEvent weaponAudioEvent)
|
||||
{
|
||||
if (SoundBank == null) return;
|
||||
var eventObject = SoundBank.GetEvent(weaponAudioEvent);
|
||||
if (eventObject == null)
|
||||
{
|
||||
ItemManager.Log($"Attempted to trigger {Enum.GetName(typeof(WeaponAudioEvent), weaponAudioEvent)} weapon audio event, but the soundbank doesn't support it!");
|
||||
return;
|
||||
}
|
||||
FireAudioEvent(eventObject.Id, true);
|
||||
}
|
||||
|
||||
public void FireAudioEvent(ChargedWeaponAudioEvent weaponAudioEvent)
|
||||
{
|
||||
if (SoundBank == null) return;
|
||||
var eventObject = SoundBank.GetEvent(weaponAudioEvent);
|
||||
if (eventObject == null)
|
||||
{
|
||||
ItemManager.Log($"Attempted to trigger {Enum.GetName(typeof(ChargedWeaponAudioEvent), weaponAudioEvent)} weapon audio event, but the soundbank doesn't support it!");
|
||||
return;
|
||||
}
|
||||
FireAudioEvent(eventObject.Id, true);
|
||||
}
|
||||
|
||||
public void SetAudioParameter(uint id, float v, bool skipVerify = false)
|
||||
{
|
||||
if (SoundBank != null && (skipVerify || SoundBank.GameParameters.Any(o => o.Id == id)))
|
||||
{
|
||||
AudioParameterValues[id] = v;
|
||||
AudioParameters.OnNext((id, v));
|
||||
}
|
||||
}
|
||||
|
||||
// public void SetAudioParameter(WwiseParameterBinding binding)
|
||||
// {
|
||||
// FireAudioEvent(binding.Parameter);
|
||||
// }
|
||||
|
||||
public void SetAudioParameter(SpecialAudioParameter p, float v)
|
||||
{
|
||||
if (SoundBank == null) return;
|
||||
var metaObject = SoundBank.GetParameter(p);
|
||||
if (metaObject == null)
|
||||
{
|
||||
ItemManager.Log($"Attempted to set {Enum.GetName(typeof(ChargedWeaponAudioEvent), p)} audio parameter, but the soundbank doesn't support it!");
|
||||
return;
|
||||
}
|
||||
SetAudioParameter(metaObject.Id, v, true);
|
||||
}
|
||||
|
||||
public EquippedItem(ItemManager itemManager, EquippableItem item, int2 position, Entity entity)
|
||||
{
|
||||
|
|
@ -1152,6 +1226,11 @@ public class EquippedItem
|
|||
|
||||
public void Update(float delta)
|
||||
{
|
||||
foreach (var audioStat in Data.AudioStats)
|
||||
{
|
||||
SetAudioParameter(audioStat.Parameter, Evaluate(audioStat.Stat));
|
||||
}
|
||||
|
||||
if (Active.Value)
|
||||
{
|
||||
foreach (var group in BehaviorGroups.Values)
|
||||
|
|
|
|||
|
|
@ -170,4 +170,32 @@ public enum TemperatureUnit
|
|||
Kelvin,
|
||||
Celsius,
|
||||
Fahrenheit
|
||||
}
|
||||
|
||||
public enum WeaponAudioEvent
|
||||
{
|
||||
Fire,
|
||||
Hit,
|
||||
Miss
|
||||
}
|
||||
|
||||
public enum ChargedWeaponAudioEvent
|
||||
{
|
||||
Start,
|
||||
Stop,
|
||||
Fail
|
||||
}
|
||||
|
||||
public enum SpecialAudioParameter
|
||||
{
|
||||
ShipVelocity,
|
||||
ChargeLevel,
|
||||
TargetLock,
|
||||
Intensity,
|
||||
}
|
||||
|
||||
public enum LoopingAudioEvent
|
||||
{
|
||||
Play,
|
||||
Stop
|
||||
}
|
||||
|
|
@ -234,7 +234,7 @@ public abstract class ItemData : DatabaseEntry, INamedEntry
|
|||
[Inspectable, JsonProperty("mass"), Key(4)]
|
||||
public float Mass;
|
||||
|
||||
[Inspectable, JsonProperty("shape"), Key(5)]
|
||||
[InspectableSchematicShape, JsonProperty("shape"), Key(5)]
|
||||
public Shape Shape;
|
||||
|
||||
// Heat needed to change temperature of 1 gram by 1 degree
|
||||
|
|
@ -347,11 +347,17 @@ public abstract class EquippableItemData : CraftedItemData
|
|||
[Inspectable, JsonProperty("resilience"), Key(18)]
|
||||
public float ThermalResilience = 1;
|
||||
|
||||
[Inspectable, JsonProperty("sfx"), Key(19)]
|
||||
public string SoundEffectTrigger;
|
||||
// [Inspectable, JsonProperty("sfx"), Key(19)]
|
||||
// public string SoundEffectTrigger;
|
||||
|
||||
[InspectableTexture, JsonProperty("actionIcon"), Key(20)]
|
||||
public string ActionBarIcon;
|
||||
|
||||
[InspectableSoundBank, JsonProperty("soundBank"), Key(21)]
|
||||
public uint SoundBank;
|
||||
|
||||
[Inspectable, JsonProperty("audioStats"), Key(22)]
|
||||
public List<AudioStat> AudioStats = new List<AudioStat>();
|
||||
|
||||
[IgnoreMember]
|
||||
public abstract HardpointType HardpointType { get; }
|
||||
|
|
@ -391,10 +397,20 @@ public abstract class EquippableItemData : CraftedItemData
|
|||
}
|
||||
}
|
||||
|
||||
[Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
|
||||
public class AudioStat
|
||||
{
|
||||
[InspectableAudioParameter, JsonProperty("parameter"), Key(0)]
|
||||
public uint Parameter;
|
||||
|
||||
[Inspectable, JsonProperty("stat"), Key(1)]
|
||||
public PerformanceStat Stat = new PerformanceStat();
|
||||
}
|
||||
|
||||
[RethinkTable("Items"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
|
||||
public class GearData : EquippableItemData
|
||||
{
|
||||
[Inspectable, JsonProperty("hardpointType"), Key(21)]
|
||||
[Inspectable, JsonProperty("hardpointType"), Key(23)]
|
||||
public HardpointType Hardpoint;
|
||||
|
||||
[IgnoreMember] public override HardpointType HardpointType => Hardpoint;
|
||||
|
|
@ -403,56 +419,57 @@ public class GearData : EquippableItemData
|
|||
[RethinkTable("Items"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
|
||||
public class CargoBayData : EquippableItemData
|
||||
{
|
||||
[Inspectable, JsonProperty("interiorShape"), Key(21)]
|
||||
[Inspectable, JsonProperty("interiorShape"), Key(24)]
|
||||
public Shape InteriorShape;
|
||||
|
||||
[IgnoreMember] public override HardpointType HardpointType => HardpointType.Tool;
|
||||
}
|
||||
|
||||
[RethinkTable("Items"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
|
||||
public class DockingBayData : CargoBayData
|
||||
{
|
||||
[Inspectable, JsonProperty("maxSize"), Key(22)]
|
||||
[Inspectable, JsonProperty("maxSize"), Key(25)]
|
||||
public int2 MaxSize;
|
||||
}
|
||||
|
||||
[RethinkTable("Items"), MessagePackObject, JsonObject(MemberSerialization.OptIn)]
|
||||
public class WeaponItemData : GearData
|
||||
{
|
||||
[Inspectable, JsonProperty("range"), Key(22)]
|
||||
[Inspectable, JsonProperty("range"), Key(24)]
|
||||
public WeaponRange WeaponRange;
|
||||
|
||||
[Inspectable, JsonProperty("caliber"), Key(23)]
|
||||
[Inspectable, JsonProperty("caliber"), Key(25)]
|
||||
public WeaponCaliber WeaponCaliber;
|
||||
|
||||
[Inspectable, JsonProperty("weaponType"), Key(24)]
|
||||
[Inspectable, JsonProperty("weaponType"), Key(26)]
|
||||
public WeaponType WeaponType;
|
||||
|
||||
[Inspectable, JsonProperty("fireTypes"), Key(25)]
|
||||
[Inspectable, JsonProperty("fireTypes"), Key(27)]
|
||||
public WeaponFireType WeaponFireTypes;
|
||||
|
||||
[Inspectable, JsonProperty("modifiers"), Key(26)]
|
||||
[Inspectable, JsonProperty("modifiers"), Key(28)]
|
||||
public WeaponModifiers WeaponModifiers;
|
||||
}
|
||||
|
||||
[RethinkTable("Items"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
|
||||
public class HullData : EquippableItemData
|
||||
{
|
||||
[Inspectable, JsonProperty("hardpoints"), Key(21)]
|
||||
[Inspectable, JsonProperty("hardpoints"), Key(23)]
|
||||
public List<HardpointData> Hardpoints = new List<HardpointData>();
|
||||
|
||||
[InspectablePrefab, JsonProperty("prefab"), Key(22)]
|
||||
[InspectablePrefab, JsonProperty("prefab"), Key(24)]
|
||||
public string Prefab;
|
||||
|
||||
[Inspectable, JsonProperty("hullType"), Key(23)]
|
||||
[Inspectable, JsonProperty("hullType"), Key(25)]
|
||||
public HullType HullType;
|
||||
|
||||
[Inspectable, JsonProperty("gridOffset"), Key(24)]
|
||||
[Inspectable, JsonProperty("gridOffset"), Key(26)]
|
||||
public float GridOffset;
|
||||
|
||||
[Inspectable, JsonProperty("armor"), Key(25)]
|
||||
[Inspectable, JsonProperty("armor"), Key(27)]
|
||||
public float Armor;
|
||||
|
||||
[Inspectable, JsonProperty("drag"), Key(26)]
|
||||
[Inspectable, JsonProperty("drag"), Key(28)]
|
||||
public float Drag;
|
||||
|
||||
[IgnoreMember]
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ using Unity.Mathematics;
|
|||
Union(1, typeof(LoginMessage)),
|
||||
Union(2, typeof(RegisterMessage)),
|
||||
Union(3, typeof(VerifyMessage)),
|
||||
Union(4, typeof(ErrorMessage)),
|
||||
Union(4, typeof(NetErrorMessage)),
|
||||
Union(5, typeof(LoginSuccessMessage)),
|
||||
Union(6, typeof(ChatMessage)),
|
||||
Union(7, typeof(ChatBroadcastMessage)),
|
||||
|
|
@ -53,7 +53,7 @@ public class VerifyMessage : Message
|
|||
}
|
||||
|
||||
[MessagePackObject]
|
||||
public class ErrorMessage : Message
|
||||
public class NetErrorMessage : Message
|
||||
{
|
||||
[Key(0)] public string Error;
|
||||
}
|
||||
|
|
|
|||
85
Assets/Scripts/ServerShared/WwiseMetadata.cs
Normal file
85
Assets/Scripts/ServerShared/WwiseMetadata.cs
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
[JsonObject]
|
||||
public class WwiseMetadataFile
|
||||
{
|
||||
public WwiseMetaSoundBanksInfo SoundBanksInfo;
|
||||
}
|
||||
|
||||
[JsonObject]
|
||||
public class WwiseMetaSoundBanksInfo
|
||||
{
|
||||
public WwiseMetaSoundBank[] SoundBanks;
|
||||
|
||||
private Dictionary<uint, WwiseMetaSoundBank> _soundBanks;
|
||||
|
||||
public WwiseMetaSoundBank GetSoundBank(uint id)
|
||||
{
|
||||
if (_soundBanks == null) _soundBanks = SoundBanks.ToDictionary(sb => sb.Id);
|
||||
return _soundBanks[id];
|
||||
}
|
||||
}
|
||||
|
||||
[JsonObject]
|
||||
public class WwiseMetaSoundBank
|
||||
{
|
||||
public uint Id;
|
||||
public string ShortName;
|
||||
public WwiseMetaObject[] IncludedEvents;
|
||||
public WwiseMetaObject[] GameParameters;
|
||||
|
||||
public WwiseMetaObject GetEvent(WeaponAudioEvent weaponAudioEvent)
|
||||
{
|
||||
return weaponAudioEvent switch
|
||||
{
|
||||
WeaponAudioEvent.Fire => IncludedEvents?.FirstOrDefault(e => e.Name.EndsWith("_fire")),
|
||||
WeaponAudioEvent.Hit => IncludedEvents?.FirstOrDefault(e => e.Name.EndsWith("_hit")),
|
||||
WeaponAudioEvent.Miss => IncludedEvents?.FirstOrDefault(e => e.Name.EndsWith("_miss")),
|
||||
_ => throw new ArgumentOutOfRangeException(nameof(weaponAudioEvent), weaponAudioEvent, null)
|
||||
};
|
||||
}
|
||||
|
||||
public WwiseMetaObject GetEvent(ChargedWeaponAudioEvent chargedWeaponAudioEvent)
|
||||
{
|
||||
return chargedWeaponAudioEvent switch
|
||||
{
|
||||
ChargedWeaponAudioEvent.Start => IncludedEvents?.FirstOrDefault(e => e.Name.EndsWith("_charge_play")),
|
||||
ChargedWeaponAudioEvent.Stop => IncludedEvents?.FirstOrDefault(e => e.Name.EndsWith("_charge_stop")),
|
||||
ChargedWeaponAudioEvent.Fail => IncludedEvents?.FirstOrDefault(e => e.Name.EndsWith("_fail")),
|
||||
_ => throw new ArgumentOutOfRangeException(nameof(chargedWeaponAudioEvent), chargedWeaponAudioEvent, null)
|
||||
};
|
||||
}
|
||||
|
||||
public WwiseMetaObject GetEvent(LoopingAudioEvent loopingAudioEvent)
|
||||
{
|
||||
return loopingAudioEvent switch
|
||||
{
|
||||
LoopingAudioEvent.Play => IncludedEvents?.FirstOrDefault(e => e.Name.EndsWith("_play")),
|
||||
LoopingAudioEvent.Stop => IncludedEvents?.FirstOrDefault(e => e.Name.EndsWith("_stop")),
|
||||
_ => throw new ArgumentOutOfRangeException(nameof(loopingAudioEvent), loopingAudioEvent, null)
|
||||
};
|
||||
}
|
||||
|
||||
public WwiseMetaObject GetParameter(SpecialAudioParameter audioParameter)
|
||||
{
|
||||
return audioParameter switch
|
||||
{
|
||||
SpecialAudioParameter.ShipVelocity => GameParameters?.FirstOrDefault(p => p.Name == "ship_velocity"),
|
||||
SpecialAudioParameter.ChargeLevel => GameParameters?.FirstOrDefault(p => p.Name == "charge_level"),
|
||||
SpecialAudioParameter.TargetLock => GameParameters?.FirstOrDefault(p => p.Name == "target_locking"),
|
||||
SpecialAudioParameter.Intensity => GameParameters?.FirstOrDefault(p => p.Name == "sfx_shared_intensity"),
|
||||
_ => throw new ArgumentOutOfRangeException(nameof(audioParameter), audioParameter, null)
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
[JsonObject]
|
||||
public class WwiseMetaObject
|
||||
{
|
||||
public uint Id;
|
||||
public string Name;
|
||||
public string ObjectPath;
|
||||
}
|
||||
22
Assets/Scripts/ServerShared/WwiseSoundBinding.cs
Normal file
22
Assets/Scripts/ServerShared/WwiseSoundBinding.cs
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
using MessagePack;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
[MessagePackObject, JsonObject(MemberSerialization.OptIn)]
|
||||
public class WwiseSoundBinding
|
||||
{
|
||||
[Key(0), JsonProperty("playEvent")]
|
||||
public uint PlayEvent;
|
||||
}
|
||||
|
||||
[MessagePackObject, JsonObject(MemberSerialization.OptIn)]
|
||||
public class WwiseLoopingSoundBinding : WwiseSoundBinding
|
||||
{
|
||||
[Key(1), JsonProperty("stopEvent")]
|
||||
public uint StopEvent;
|
||||
}
|
||||
|
||||
// public class WwiseParameterBinding
|
||||
// {
|
||||
// [Key(0), JsonProperty("parameter")]
|
||||
// public uint Parameter;
|
||||
// }
|
||||
3
Assets/Scripts/ServerShared/WwiseSoundBinding.cs.meta
Normal file
3
Assets/Scripts/ServerShared/WwiseSoundBinding.cs.meta
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2e128c1cb68f481c9a846344e8283014
|
||||
timeCreated: 1619729875
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
using Newtonsoft.Json;
|
||||
|
||||
[JsonObject]
|
||||
public class WwiseMetadataFile
|
||||
{
|
||||
public WwiseMetaSoundBanksInfo SoundBanksInfo;
|
||||
}
|
||||
|
||||
[JsonObject]
|
||||
public class WwiseMetaSoundBanksInfo
|
||||
{
|
||||
public WwiseMetaSoundBank[] SoundBanks;
|
||||
}
|
||||
|
||||
[JsonObject]
|
||||
public class WwiseMetaSoundBank
|
||||
{
|
||||
public int Id;
|
||||
public string ShortName;
|
||||
public WwiseMetaObject[] IncludedEvents;
|
||||
public WwiseMetaObject[] GameParameters;
|
||||
}
|
||||
|
||||
[JsonObject]
|
||||
public class WwiseMetaObject
|
||||
{
|
||||
public int Id;
|
||||
public string Name;
|
||||
public string ObjectPath;
|
||||
}
|
||||
|
|
@ -28,14 +28,14 @@ namespace AK
|
|||
static const AkUniqueID ELECTRIC_DRIVE_PLAY = 3691930898U;
|
||||
static const AkUniqueID ELECTRIC_DRIVE_STOP = 1108521100U;
|
||||
static const AkUniqueID EQUIP = 2412608643U;
|
||||
static const AkUniqueID IONCANNON_CHARGE_START = 3397460648U;
|
||||
static const AkUniqueID IONCANNON_CHARGE_PLAY = 1733674570U;
|
||||
static const AkUniqueID IONCANNON_CHARGE_STOP = 3179453300U;
|
||||
static const AkUniqueID IONCANNON_FAIL = 216684405U;
|
||||
static const AkUniqueID IONCANNON_FIRE = 299292453U;
|
||||
static const AkUniqueID IONCANNON_HIT = 1028672300U;
|
||||
static const AkUniqueID IONCANNON_MISS = 4133048765U;
|
||||
static const AkUniqueID IONCANNON_SHIP_DESTROYED = 3465139343U;
|
||||
static const AkUniqueID LIGHTNINGGUN_CHARGE_START = 1965329713U;
|
||||
static const AkUniqueID LIGHTNINGGUN_CHARGE_PLAY = 2129771581U;
|
||||
static const AkUniqueID LIGHTNINGGUN_CHARGE_STOP = 62119851U;
|
||||
static const AkUniqueID LIGHTNINGGUN_FAIL = 1293013044U;
|
||||
static const AkUniqueID LIGHTNINGGUN_FIRE = 1744728900U;
|
||||
|
|
@ -56,7 +56,7 @@ namespace AK
|
|||
static const AkUniqueID PLAY_METAL_BOSS_01 = 826124593U;
|
||||
static const AkUniqueID PLAY_METAL_COMBAT_01 = 2406196U;
|
||||
static const AkUniqueID PLAY_METAL_OW_01 = 1885982954U;
|
||||
static const AkUniqueID RAILGUN_CHARGE_START = 3058694461U;
|
||||
static const AkUniqueID RAILGUN_CHARGE_PLAY = 95340409U;
|
||||
static const AkUniqueID RAILGUN_CHARGE_STOP = 2686405055U;
|
||||
static const AkUniqueID RAILGUN_FAIL = 3475584168U;
|
||||
static const AkUniqueID RAILGUN_FIRE = 3929859736U;
|
||||
|
|
|
|||
BIN
GameData/AetherDB.msgpack
(Stored with Git LFS)
BIN
GameData/AetherDB.msgpack
(Stored with Git LFS)
Binary file not shown.
BIN
GameData/PlayerSettings.msgpack
(Stored with Git LFS)
BIN
GameData/PlayerSettings.msgpack
(Stored with Git LFS)
Binary file not shown.
2583
GameData/SoundbanksInfo.json
Normal file
2583
GameData/SoundbanksInfo.json
Normal file
File diff suppressed because it is too large
Load diff
12
Ink.csproj
12
Ink.csproj
|
|
@ -150,12 +150,12 @@
|
|||
<Compile Include="Assets\Plugins\Ink\ink-engine-runtime\StoryState.cs" />
|
||||
<Compile Include="Assets\Plugins\Ink\compiler\ParsedHierarchy\Choice.cs" />
|
||||
<None Include="Assets\Plugins\Ink\Ink.asmdef" />
|
||||
<Reference Include="System.Threading.Tasks.Extensions">
|
||||
<HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll</HintPath>
|
||||
</Reference>
|
||||
<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>
|
||||
|
|
@ -177,15 +177,15 @@
|
|||
<Reference Include="QuickGraph">
|
||||
<HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/QuickGraph.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Threading.Tasks.Extensions">
|
||||
<HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="SourceUnityLib">
|
||||
<HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll</HintPath>
|
||||
</Reference>
|
||||
<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>C:/Program Files/Unity/Hub/Editor/2020.2.6f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
|
||||
</Reference>
|
||||
|
|
|
|||
|
|
@ -281,8 +281,8 @@
|
|||
<Compile Include="Assets\Scripts\ServerShared\NIH\RethinkDb\RethinkDb.Driver\Extras\Dao\Document.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\NIH\RethinkDb\RethinkDb.Driver.Linq\WhereClauseParsers\PrimaryIndexParser.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\NIH\RethinkDb\RethinkDb.Driver\Generated\Ast\Wednesday.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\NIH\RethinkDb\RethinkDb.Driver.Linq\WhereClauseParsers\SubQueryVisitor\AllSubQueryVisitor.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\NIH\RethinkDb\RethinkDb.Driver\Log.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\NIH\RethinkDb\RethinkDb.Driver.Linq\WhereClauseParsers\SubQueryVisitor\AllSubQueryVisitor.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\NIH\RethinkDb\RethinkDb.Driver\Generated\Ast\Values.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\NIH\RethinkDb\RethinkDb.Driver\Generated\Ast\Keys.cs" />
|
||||
<Compile Include="Assets\Scripts\ServerShared\NIH\RethinkDb\RethinkDb.Driver\Generated\Ast\Reduce.cs" />
|
||||
|
|
@ -596,12 +596,12 @@
|
|||
<Reference Include="UnityEditor.WindowsStandalone.Extensions">
|
||||
<HintPath>C:/Program Files/Unity/Hub/Editor/2020.2.6f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Threading.Tasks.Extensions">
|
||||
<HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll</HintPath>
|
||||
</Reference>
|
||||
<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>
|
||||
|
|
@ -623,15 +623,15 @@
|
|||
<Reference Include="QuickGraph">
|
||||
<HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/QuickGraph.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Threading.Tasks.Extensions">
|
||||
<HintPath>E:/Projects/Aetheria-Economy/Assets/Plugins/System.Threading.Tasks.Extensions.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="SourceUnityLib">
|
||||
<HintPath>E:/Projects/Aetheria-Economy/Assets/Allegorithmic/Plugins/Substance/Substance Source/Editor/SourceUnityLib.dll</HintPath>
|
||||
</Reference>
|
||||
<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>C:/Program Files/Unity/Hub/Editor/2020.2.6f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
|
||||
</Reference>
|
||||
|
|
|
|||
12699
logRunSetup.txt
12699
logRunSetup.txt
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue