diff --git a/.gitattributes b/.gitattributes index 910faddfb..744578b54 100644 --- a/.gitattributes +++ b/.gitattributes @@ -52,6 +52,7 @@ *.bundle filter=lfs diff=lfs merge=lfs -text *.engine filter=lfs diff=lfs merge=lfs -text *.sbsar filter=lfs diff=lfs merge=lfs -text +*.msgpack filter=lfs diff=lfs merge=lfs -text *.a filter=lfs diff=lfs merge=lfs -text *AkSoundEngine filter=lfs diff=lfs merge=lfs -text *AkWaapiClient filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore index 1584d76fa..af6882648 100644 --- a/.gitignore +++ b/.gitignore @@ -11,8 +11,9 @@ /[Mm]emoryCaptures/ /Recordings/ -# Wwise cache folder +# Wwise folders /Aetheria-Economy_WwiseProject/.cache +/Aetheria-Economy_WwiseProject/GeneratedSoundBanks # Wwise profiling sessions *.prof diff --git a/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu b/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu index 1aff12ca4..826a224fe 100644 --- a/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu +++ b/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu @@ -227,7 +227,7 @@ - + @@ -883,7 +883,7 @@ 0 - -6.69195 + -6.46329 21 @@ -1015,7 +1015,7 @@ - + @@ -1605,7 +1605,30 @@ 3.6 - + + + + + + + + + + + + + 0 + -5.70471 + 21 + + + 1 + -22.60668 + 53 + + + + @@ -1725,7 +1748,7 @@ - + @@ -2778,7 +2801,7 @@ - + SFX Aetheia_Overheat_Alarm.wav @@ -2787,7 +2810,7 @@ - + diff --git a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache index d115b3cea..7f572c8a2 100644 --- a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache +++ b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache @@ -54,8 +54,8 @@ - - + + diff --git a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings index 5d86f421a..8832db972 100644 --- a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings +++ b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings @@ -39,7 +39,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -83,7 +83,7 @@ - + diff --git a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.wproj b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.wproj index df2953671..6f7d353d0 100644 --- a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.wproj +++ b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.wproj @@ -60,6 +60,35 @@ + + diff --git a/Aetheria-Economy_WwiseProject/Events/Ship Audio.wwu b/Aetheria-Economy_WwiseProject/Events/Ship Audio.wwu index ecf6720e0..e6c582bf5 100644 --- a/Aetheria-Economy_WwiseProject/Events/Ship Audio.wwu +++ b/Aetheria-Economy_WwiseProject/Events/Ship Audio.wwu @@ -8,7 +8,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/Init.bnk b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/Init.bnk deleted file mode 100644 index 3e78f2779..000000000 Binary files a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/Init.bnk and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/Init.txt b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/Init.txt deleted file mode 100644 index bb5e1799d..000000000 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/Init.txt +++ /dev/null @@ -1,7 +0,0 @@ -Audio Bus ID Name Wwise Object Path Notes - 3803692087 Master Audio Bus \Default Work Unit\Master Audio Bus - -Audio Devices ID Name Type Notes - 2317455096 No_Output No Output - 3859886410 System System - diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/PluginInfo.xml b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/PluginInfo.xml deleted file mode 100644 index 89ec46b2b..000000000 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/PluginInfo.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/SoundbanksInfo.xml b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/SoundbanksInfo.xml deleted file mode 100644 index 075867ade..000000000 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/SoundbanksInfo.xml +++ /dev/null @@ -1,202 +0,0 @@ - - - - E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\ - E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Mac\ - E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\GeneratedSoundBanks\Mac\ - - E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\GeneratedSoundBanks\Mac - - - - - - - \SoundBanks\Default Work Unit\Ship\Reactor_type\Type_01\reactor_type01 - reactor_type01 - reactor_type01.bnk - - - - - - - Aetheia_Overheat_Alarm.wav - SFX\Aetheia_Overheat_Alarm_D79FB2B7.wem - - - - - - - - - - Init - Init - Init.bnk - - - \SoundBanks\Default Work Unit\UI - UI - UI.bnk - - - - - Aetheria_docking_spaceship_V2.1.wav - SFX\Aetheria_docking_spaceship_V2.1_10C4C929.wem - - - - - - - blip2.wav - SFX\blip2_10C4C929.wem - - - - - - - putdown.wav - SFX\putdown_10C4C929.wem - - - - - - - equip.wav - SFX\equip_10C4C929.wem - - - - - - - pickup.wav - SFX\pickup_10C4C929.wem - - - - - - - blip2.wav - SFX\blip2_10C4C929.wem - - - - - - - blip1.wav - SFX\blip1_10C4C929.wem - - - - - - - Aetheria_undocking_spaceship_V2.1.wav - SFX\Aetheria_undocking_spaceship_V2.1_10C4C929.wem - - - - - - - unequip.wav - SFX\unequip_10C4C929.wem - - - - - - - \SoundBanks\Default Work Unit\wormhole\wormhole - wormhole - wormhole.bnk - - - - - - - - Aetheria_Wormhole_travel_jumpin.wav - SFX\Aetheria_Wormhole_travel_jumpin_3CA8C70E.wem - - - Aetheria_Wormhole_travel.wav - SFX\Aetheria_Wormhole_travel_10C4C929.wem - - - Aetheria_Wormhole_travel_jumpout.wav - SFX\Aetheria_Wormhole_travel_jumpout_8FC987B8.wem - - - - - \SoundBanks\Default Work Unit\Ship\Thruster_type\Type_01\thruster_small - thruster_small - thruster_small.bnk - - - - - - Flamethrower SOUND.wav - SFX\Flamethrower SOUND_D79FB2B7.wem - - - - - - - - - - \SoundBanks\Default Work Unit\Ship\Thruster_type\Type_01\thruster_large - thruster_large - thruster_large.bnk - - - - - - - Flamethrower SOUND.wav - SFX\Flamethrower SOUND_D79FB2B7.wem - - - - - - - - - - - \SoundBanks\Default Work Unit\Ship\Thruster_type\Type_01\thruster_medium - thruster_medium - thruster_medium.bnk - - - - - - Flamethrower SOUND.wav - SFX\Flamethrower SOUND_D79FB2B7.wem - - - - - - - - - - diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/UI.bnk b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/UI.bnk deleted file mode 100644 index 6e6ffffbf..000000000 Binary files a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/UI.bnk and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/UI.txt b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/UI.txt deleted file mode 100644 index 25d114ebe..000000000 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/UI.txt +++ /dev/null @@ -1,21 +0,0 @@ -Event ID Name Wwise Object Path Notes - 588409068 Unequip \Default Work Unit\Unequip - 981465891 UI_Success \Default Work Unit\UI_Success - 1878686274 Drop \Default Work Unit\Drop - 1944958176 Dock \Default Work Unit\Dock - 2412608643 Equip \Default Work Unit\Equip - 2820966551 Dock_Fail \Default Work Unit\Dock_Fail - 2826728501 Undock \Default Work Unit\Undock - 3050276906 UI_Fail \Default Work Unit\UI_Fail - 3978245845 Pickup \Default Work Unit\Pickup - -In Memory Audio ID Name Audio source file Wwise Object Path Notes Data Size - 105294056 unequip E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Mac\SFX\unequip_10C4C929.wem \Actor-Mixer Hierarchy\Default Work Unit\unequip 238460 - 217524873 Aetheria_undocking_spaceship_V2_1 E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Mac\SFX\Aetheria_undocking_spaceship_V2.1_10C4C929.wem \Actor-Mixer Hierarchy\Default Work Unit\Aetheria_undocking_spaceship_V2_1 434864 - 286482309 equip E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Mac\SFX\equip_10C4C929.wem \Actor-Mixer Hierarchy\Default Work Unit\equip 220356 - 375041892 pickup E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Mac\SFX\pickup_10C4C929.wem \Actor-Mixer Hierarchy\Default Work Unit\pickup 169332 - 409680203 putdown E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Mac\SFX\putdown_10C4C929.wem \Actor-Mixer Hierarchy\Default Work Unit\putdown 282668 - 628544089 blip2 E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Mac\SFX\blip2_10C4C929.wem \Actor-Mixer Hierarchy\Default Work Unit\blip2 13580 - 741366116 Aetheria_docking_spaceship_V2_1 E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Mac\SFX\Aetheria_docking_spaceship_V2.1_10C4C929.wem \Actor-Mixer Hierarchy\Default Work Unit\Aetheria_docking_spaceship_V2_1 251708 - 907378552 blip1 E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Mac\SFX\blip1_10C4C929.wem \Actor-Mixer Hierarchy\Default Work Unit\blip1 22460 - diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/reactor_type01.bnk b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/reactor_type01.bnk deleted file mode 100644 index bf109ab05..000000000 Binary files a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/reactor_type01.bnk and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/reactor_type01.txt b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/reactor_type01.txt deleted file mode 100644 index 368ee4384..000000000 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/reactor_type01.txt +++ /dev/null @@ -1,18 +0,0 @@ -Event ID Name Wwise Object Path Notes - 108700025 reactor_type01 \Ship Audio\reactor_type01 - 937212177 test_spaship_full_unit \Ship Audio\test_spaship_full_unit - -Game Parameter ID Name Wwise Object Path Notes - 965148665 performance_durability \item_properties\performance_durability - 2129580506 performance_temperature \item_properties\performance_temperature - 3735272724 reactor_load \item_properties\reactor_load - -Modulator LFO ID Name Wwise Object Path Notes - 1022088505 New Modulator LFO_reactor_dur \Default Work Unit\New Modulator LFO_reactor_dur - -Modulator Envelope ID Name Wwise Object Path Notes - 1033491562 Modulator Envelope (Custom) - -In Memory Audio ID Name Audio source file Wwise Object Path Notes Data Size - 670972525 spaceship_reactor_overheat_alarm E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Mac\SFX\Aetheia_Overheat_Alarm_D79FB2B7.wem \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\spaceship_reactor_overheat_alarm 120064 - diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_large.bnk b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_large.bnk deleted file mode 100644 index de53f9d7a..000000000 Binary files a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_large.bnk and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_large.txt b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_large.txt deleted file mode 100644 index 86ed17d7b..000000000 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_large.txt +++ /dev/null @@ -1,31 +0,0 @@ -Event ID Name Wwise Object Path Notes - 937212177 test_spaship_full_unit \Ship Audio\test_spaship_full_unit - 2370087034 thruster_large \Ship Audio\thruster_large - -Game Parameter ID Name Wwise Object Path Notes - 875134311 performance_quality \item_properties\performance_quality - 965148665 performance_durability \item_properties\performance_durability - 3579545711 ship_velocity \item_properties\ship_velocity - 4116566921 thruster_throttle \item_properties\thruster_throttle - -Modulator LFO ID Name Wwise Object Path Notes - 995081500 LFO_durability \Default Work Unit\LFO_durability - -Modulator Envelope ID Name Wwise Object Path Notes - 216769872 Modulator Envelope (Custom) - 621374991 Modulator Envelope (Custom) - 771499935 Modulator Envelope (Custom) - 1065786528 Modulator Envelope (Custom) - -Effect plug-ins ID Name Type Notes - 915708438 New_Wwise_Parametric_EQ_temp_(Custom) Wwise Parametric EQ - -Source plug-ins ID Name Type Wwise Object Path Notes - 240728995 Wwise Synth One Wwise Synth One \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_large\harmonic_layer\mid2\Wwise Synth One - 271092398 Wwise Synth One Wwise Synth One \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_large\harmonic_layer\hi\Wwise Synth One - 843918017 Wwise Synth One Wwise Synth One \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_large\harmonic_layer\low\Wwise Synth One - 847540198 Wwise Synth One Wwise Synth One \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_large\harmonic_layer\mid\Wwise Synth One - -In Memory Audio ID Name Audio source file Wwise Object Path Notes Data Size - 274716874 Flamethrower SOUND E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Mac\SFX\Flamethrower SOUND_D79FB2B7.wem \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_large\Flamethrower SOUND 1473292 - diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_medium.bnk b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_medium.bnk deleted file mode 100644 index 484d39ccb..000000000 Binary files a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_medium.bnk and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_medium.txt b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_medium.txt deleted file mode 100644 index 997e66eb5..000000000 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_medium.txt +++ /dev/null @@ -1,29 +0,0 @@ -Event ID Name Wwise Object Path Notes - 2528260676 thruster_medium \Ship Audio\thruster_medium - -Game Parameter ID Name Wwise Object Path Notes - 965148665 performance_durability \item_properties\performance_durability - 3579545711 ship_velocity \item_properties\ship_velocity - 4116566921 thruster_throttle \item_properties\thruster_throttle - -Modulator LFO ID Name Wwise Object Path Notes - 995081500 LFO_durability \Default Work Unit\LFO_durability - -Modulator Envelope ID Name Wwise Object Path Notes - 218240564 Modulator Envelope (Custom) - 341844737 Modulator Envelope (Custom) - 390344710 Modulator Envelope (Custom) - 749463440 Modulator Envelope (Custom) - -Effect plug-ins ID Name Type Notes - 789053654 New_Wwise_Parametric_EQ_temp_(Custom) Wwise Parametric EQ - -Source plug-ins ID Name Type Wwise Object Path Notes - 502283259 Wwise Synth One Wwise Synth One \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_medium\harmonic_layer\mid2\Wwise Synth One - 639781883 Wwise Synth One Wwise Synth One \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_medium\harmonic_layer\mid\Wwise Synth One - 677527052 Wwise Synth One Wwise Synth One \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_medium\harmonic_layer\low\Wwise Synth One - 928756191 Wwise Synth One Wwise Synth One \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_medium\harmonic_layer\hi\Wwise Synth One - -In Memory Audio ID Name Audio source file Wwise Object Path Notes Data Size - 274716874 Flamethrower SOUND E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Mac\SFX\Flamethrower SOUND_D79FB2B7.wem \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_medium\Flamethrower SOUND 1473292 - diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_small.bnk b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_small.bnk deleted file mode 100644 index fb40ea5fa..000000000 Binary files a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_small.bnk and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_small.txt b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_small.txt deleted file mode 100644 index fc2fd0559..000000000 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_small.txt +++ /dev/null @@ -1,29 +0,0 @@ -Event ID Name Wwise Object Path Notes - 1944968294 thruster_small \Ship Audio\thruster_small - -Game Parameter ID Name Wwise Object Path Notes - 965148665 performance_durability \item_properties\performance_durability - 3579545711 ship_velocity \item_properties\ship_velocity - 4116566921 thruster_throttle \item_properties\thruster_throttle - -Modulator LFO ID Name Wwise Object Path Notes - 995081500 LFO_durability \Default Work Unit\LFO_durability - -Modulator Envelope ID Name Wwise Object Path Notes - 27468274 Modulator Envelope (Custom) - 432029618 Modulator Envelope (Custom) - 637693247 Modulator Envelope (Custom) - 730274206 Modulator Envelope (Custom) - -Effect plug-ins ID Name Type Notes - 123744803 New_Wwise_Parametric_EQ_temp_(Custom) Wwise Parametric EQ - -Source plug-ins ID Name Type Wwise Object Path Notes - 230415347 Wwise Synth One Wwise Synth One \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_small\harmonic_layer\low\Wwise Synth One - 243266503 Wwise Synth One Wwise Synth One \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_small\harmonic_layer\hi\Wwise Synth One - 815803029 Wwise Synth One Wwise Synth One \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_small\harmonic_layer\mid2\Wwise Synth One - 1069088392 Wwise Synth One Wwise Synth One \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_small\harmonic_layer\mid\Wwise Synth One - -In Memory Audio ID Name Audio source file Wwise Object Path Notes Data Size - 274716874 Flamethrower SOUND E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Mac\SFX\Flamethrower SOUND_D79FB2B7.wem \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_small\Flamethrower SOUND 1473292 - diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/wormhole.bnk b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/wormhole.bnk deleted file mode 100644 index 5fe7f6ce6..000000000 Binary files a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/wormhole.bnk and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/wormhole.txt b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/wormhole.txt deleted file mode 100644 index 05e5c6f1d..000000000 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/wormhole.txt +++ /dev/null @@ -1,10 +0,0 @@ -Event ID Name Wwise Object Path Notes - 74807897 Wormhole_jump_in \Default Work Unit\Wormhole_jump_in - 1122693656 wormhole_jump_out \Default Work Unit\wormhole_jump_out - 3842220822 wormhole_travel_loop \Default Work Unit\wormhole_travel_loop - -In Memory Audio ID Name Audio source file Wwise Object Path Notes Data Size - 305405244 Aetheria_Wormhole_travel_jumpin E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Mac\SFX\Aetheria_Wormhole_travel_jumpin_3CA8C70E.wem \Actor-Mixer Hierarchy\Default Work Unit\wormhole\Aetheria_Wormhole_travel_jumpin 1127356 - 416185788 Aetheria_Wormhole_travel E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Mac\SFX\Aetheria_Wormhole_travel_10C4C929.wem \Actor-Mixer Hierarchy\Default Work Unit\wormhole\Aetheria_Wormhole_travel 5292064 - 857805897 Aetheria_Wormhole_travel_jumpout E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Mac\SFX\Aetheria_Wormhole_travel_jumpout_8FC987B8.wem \Actor-Mixer Hierarchy\Default Work Unit\wormhole\Aetheria_Wormhole_travel_jumpout 929780 - diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/Init.bnk b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/Init.bnk deleted file mode 100644 index 5ac293230..000000000 Binary files a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/Init.bnk and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/Init.txt b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/Init.txt deleted file mode 100644 index 0fa8fbe4c..000000000 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/Init.txt +++ /dev/null @@ -1,7 +0,0 @@ -Audio Bus ID Name Wwise Object Path Notes - 3803692087 Master Audio Bus \Default Work Unit\Master Audio Bus - -Audio Devices ID Name Type Notes - 2317455096 No_Output No Output - 3859886410 System System - diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/PluginInfo.xml b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/PluginInfo.xml deleted file mode 100644 index afb430113..000000000 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/PluginInfo.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/SoundbanksInfo.xml b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/SoundbanksInfo.xml deleted file mode 100644 index 8342dacb8..000000000 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/SoundbanksInfo.xml +++ /dev/null @@ -1,202 +0,0 @@ - - - - E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\ - E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Windows\ - E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\GeneratedSoundBanks\Windows\ - - E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\GeneratedSoundBanks\Windows - - - - - - - \SoundBanks\Default Work Unit\Ship\Reactor_type\Type_01\reactor_type01 - reactor_type01 - reactor_type01.bnk - - - - - - - Aetheia_Overheat_Alarm.wav - SFX\Aetheia_Overheat_Alarm_D79FB2B7.wem - - - - - - - - - - Init - Init - Init.bnk - - - \SoundBanks\Default Work Unit\UI - UI - UI.bnk - - - - - Aetheria_docking_spaceship_V2.1.wav - SFX\Aetheria_docking_spaceship_V2.1_10C4C929.wem - - - - - - - blip2.wav - SFX\blip2_10C4C929.wem - - - - - - - putdown.wav - SFX\putdown_10C4C929.wem - - - - - - - equip.wav - SFX\equip_10C4C929.wem - - - - - - - pickup.wav - SFX\pickup_10C4C929.wem - - - - - - - blip2.wav - SFX\blip2_10C4C929.wem - - - - - - - blip1.wav - SFX\blip1_10C4C929.wem - - - - - - - Aetheria_undocking_spaceship_V2.1.wav - SFX\Aetheria_undocking_spaceship_V2.1_10C4C929.wem - - - - - - - unequip.wav - SFX\unequip_10C4C929.wem - - - - - - - \SoundBanks\Default Work Unit\wormhole\wormhole - wormhole - wormhole.bnk - - - - - - - - Aetheria_Wormhole_travel_jumpin.wav - SFX\Aetheria_Wormhole_travel_jumpin_3CA8C70E.wem - - - Aetheria_Wormhole_travel.wav - SFX\Aetheria_Wormhole_travel_10C4C929.wem - - - Aetheria_Wormhole_travel_jumpout.wav - SFX\Aetheria_Wormhole_travel_jumpout_8FC987B8.wem - - - - - \SoundBanks\Default Work Unit\Ship\Thruster_type\Type_01\thruster_small - thruster_small - thruster_small.bnk - - - - - - Flamethrower SOUND.wav - SFX\Flamethrower SOUND_D79FB2B7.wem - - - - - - - - - - \SoundBanks\Default Work Unit\Ship\Thruster_type\Type_01\thruster_large - thruster_large - thruster_large.bnk - - - - - - - Flamethrower SOUND.wav - SFX\Flamethrower SOUND_D79FB2B7.wem - - - - - - - - - - - \SoundBanks\Default Work Unit\Ship\Thruster_type\Type_01\thruster_medium - thruster_medium - thruster_medium.bnk - - - - - - Flamethrower SOUND.wav - SFX\Flamethrower SOUND_D79FB2B7.wem - - - - - - - - - - diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/UI.bnk b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/UI.bnk deleted file mode 100644 index 6e6ffffbf..000000000 Binary files a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/UI.bnk and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/UI.txt b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/UI.txt deleted file mode 100644 index 15b62c87f..000000000 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/UI.txt +++ /dev/null @@ -1,21 +0,0 @@ -Event ID Name Wwise Object Path Notes - 588409068 Unequip \Default Work Unit\Unequip - 981465891 UI_Success \Default Work Unit\UI_Success - 1878686274 Drop \Default Work Unit\Drop - 1944958176 Dock \Default Work Unit\Dock - 2412608643 Equip \Default Work Unit\Equip - 2820966551 Dock_Fail \Default Work Unit\Dock_Fail - 2826728501 Undock \Default Work Unit\Undock - 3050276906 UI_Fail \Default Work Unit\UI_Fail - 3978245845 Pickup \Default Work Unit\Pickup - -In Memory Audio ID Name Audio source file Wwise Object Path Notes Data Size - 105294056 unequip E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Windows\SFX\unequip_10C4C929.wem \Actor-Mixer Hierarchy\Default Work Unit\unequip 238460 - 217524873 Aetheria_undocking_spaceship_V2_1 E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Windows\SFX\Aetheria_undocking_spaceship_V2.1_10C4C929.wem \Actor-Mixer Hierarchy\Default Work Unit\Aetheria_undocking_spaceship_V2_1 434864 - 286482309 equip E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Windows\SFX\equip_10C4C929.wem \Actor-Mixer Hierarchy\Default Work Unit\equip 220356 - 375041892 pickup E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Windows\SFX\pickup_10C4C929.wem \Actor-Mixer Hierarchy\Default Work Unit\pickup 169332 - 409680203 putdown E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Windows\SFX\putdown_10C4C929.wem \Actor-Mixer Hierarchy\Default Work Unit\putdown 282668 - 628544089 blip2 E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Windows\SFX\blip2_10C4C929.wem \Actor-Mixer Hierarchy\Default Work Unit\blip2 13580 - 741366116 Aetheria_docking_spaceship_V2_1 E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Windows\SFX\Aetheria_docking_spaceship_V2.1_10C4C929.wem \Actor-Mixer Hierarchy\Default Work Unit\Aetheria_docking_spaceship_V2_1 251708 - 907378552 blip1 E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Windows\SFX\blip1_10C4C929.wem \Actor-Mixer Hierarchy\Default Work Unit\blip1 22460 - diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/reactor_type01.bnk b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/reactor_type01.bnk deleted file mode 100644 index bf109ab05..000000000 Binary files a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/reactor_type01.bnk and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/reactor_type01.txt b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/reactor_type01.txt deleted file mode 100644 index db7057564..000000000 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/reactor_type01.txt +++ /dev/null @@ -1,18 +0,0 @@ -Event ID Name Wwise Object Path Notes - 108700025 reactor_type01 \Ship Audio\reactor_type01 - 937212177 test_spaship_full_unit \Ship Audio\test_spaship_full_unit - -Game Parameter ID Name Wwise Object Path Notes - 965148665 performance_durability \item_properties\performance_durability - 2129580506 performance_temperature \item_properties\performance_temperature - 3735272724 reactor_load \item_properties\reactor_load - -Modulator LFO ID Name Wwise Object Path Notes - 1022088505 New Modulator LFO_reactor_dur \Default Work Unit\New Modulator LFO_reactor_dur - -Modulator Envelope ID Name Wwise Object Path Notes - 1033491562 Modulator Envelope (Custom) - -In Memory Audio ID Name Audio source file Wwise Object Path Notes Data Size - 670972525 spaceship_reactor_overheat_alarm E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Windows\SFX\Aetheia_Overheat_Alarm_D79FB2B7.wem \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\spaceship_reactor_overheat_alarm 120064 - diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_large.bnk b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_large.bnk deleted file mode 100644 index de53f9d7a..000000000 Binary files a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_large.bnk and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_large.txt b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_large.txt deleted file mode 100644 index 47a8989b0..000000000 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_large.txt +++ /dev/null @@ -1,31 +0,0 @@ -Event ID Name Wwise Object Path Notes - 937212177 test_spaship_full_unit \Ship Audio\test_spaship_full_unit - 2370087034 thruster_large \Ship Audio\thruster_large - -Game Parameter ID Name Wwise Object Path Notes - 875134311 performance_quality \item_properties\performance_quality - 965148665 performance_durability \item_properties\performance_durability - 3579545711 ship_velocity \item_properties\ship_velocity - 4116566921 thruster_throttle \item_properties\thruster_throttle - -Modulator LFO ID Name Wwise Object Path Notes - 995081500 LFO_durability \Default Work Unit\LFO_durability - -Modulator Envelope ID Name Wwise Object Path Notes - 216769872 Modulator Envelope (Custom) - 621374991 Modulator Envelope (Custom) - 771499935 Modulator Envelope (Custom) - 1065786528 Modulator Envelope (Custom) - -Effect plug-ins ID Name Type Notes - 915708438 New_Wwise_Parametric_EQ_temp_(Custom) Wwise Parametric EQ - -Source plug-ins ID Name Type Wwise Object Path Notes - 240728995 Wwise Synth One Wwise Synth One \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_large\harmonic_layer\mid2\Wwise Synth One - 271092398 Wwise Synth One Wwise Synth One \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_large\harmonic_layer\hi\Wwise Synth One - 843918017 Wwise Synth One Wwise Synth One \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_large\harmonic_layer\low\Wwise Synth One - 847540198 Wwise Synth One Wwise Synth One \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_large\harmonic_layer\mid\Wwise Synth One - -In Memory Audio ID Name Audio source file Wwise Object Path Notes Data Size - 274716874 Flamethrower SOUND E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Windows\SFX\Flamethrower SOUND_D79FB2B7.wem \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_large\Flamethrower SOUND 1473292 - diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_medium.bnk b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_medium.bnk deleted file mode 100644 index 484d39ccb..000000000 Binary files a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_medium.bnk and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_medium.txt b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_medium.txt deleted file mode 100644 index 102680b3c..000000000 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_medium.txt +++ /dev/null @@ -1,29 +0,0 @@ -Event ID Name Wwise Object Path Notes - 2528260676 thruster_medium \Ship Audio\thruster_medium - -Game Parameter ID Name Wwise Object Path Notes - 965148665 performance_durability \item_properties\performance_durability - 3579545711 ship_velocity \item_properties\ship_velocity - 4116566921 thruster_throttle \item_properties\thruster_throttle - -Modulator LFO ID Name Wwise Object Path Notes - 995081500 LFO_durability \Default Work Unit\LFO_durability - -Modulator Envelope ID Name Wwise Object Path Notes - 218240564 Modulator Envelope (Custom) - 341844737 Modulator Envelope (Custom) - 390344710 Modulator Envelope (Custom) - 749463440 Modulator Envelope (Custom) - -Effect plug-ins ID Name Type Notes - 789053654 New_Wwise_Parametric_EQ_temp_(Custom) Wwise Parametric EQ - -Source plug-ins ID Name Type Wwise Object Path Notes - 502283259 Wwise Synth One Wwise Synth One \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_medium\harmonic_layer\mid2\Wwise Synth One - 639781883 Wwise Synth One Wwise Synth One \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_medium\harmonic_layer\mid\Wwise Synth One - 677527052 Wwise Synth One Wwise Synth One \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_medium\harmonic_layer\low\Wwise Synth One - 928756191 Wwise Synth One Wwise Synth One \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_medium\harmonic_layer\hi\Wwise Synth One - -In Memory Audio ID Name Audio source file Wwise Object Path Notes Data Size - 274716874 Flamethrower SOUND E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Windows\SFX\Flamethrower SOUND_D79FB2B7.wem \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_medium\Flamethrower SOUND 1473292 - diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_small.bnk b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_small.bnk deleted file mode 100644 index fb40ea5fa..000000000 Binary files a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_small.bnk and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_small.txt b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_small.txt deleted file mode 100644 index 4fc506eb8..000000000 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_small.txt +++ /dev/null @@ -1,29 +0,0 @@ -Event ID Name Wwise Object Path Notes - 1944968294 thruster_small \Ship Audio\thruster_small - -Game Parameter ID Name Wwise Object Path Notes - 965148665 performance_durability \item_properties\performance_durability - 3579545711 ship_velocity \item_properties\ship_velocity - 4116566921 thruster_throttle \item_properties\thruster_throttle - -Modulator LFO ID Name Wwise Object Path Notes - 995081500 LFO_durability \Default Work Unit\LFO_durability - -Modulator Envelope ID Name Wwise Object Path Notes - 27468274 Modulator Envelope (Custom) - 432029618 Modulator Envelope (Custom) - 637693247 Modulator Envelope (Custom) - 730274206 Modulator Envelope (Custom) - -Effect plug-ins ID Name Type Notes - 123744803 New_Wwise_Parametric_EQ_temp_(Custom) Wwise Parametric EQ - -Source plug-ins ID Name Type Wwise Object Path Notes - 230415347 Wwise Synth One Wwise Synth One \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_small\harmonic_layer\low\Wwise Synth One - 243266503 Wwise Synth One Wwise Synth One \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_small\harmonic_layer\hi\Wwise Synth One - 815803029 Wwise Synth One Wwise Synth One \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_small\harmonic_layer\mid2\Wwise Synth One - 1069088392 Wwise Synth One Wwise Synth One \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_small\harmonic_layer\mid\Wwise Synth One - -In Memory Audio ID Name Audio source file Wwise Object Path Notes Data Size - 274716874 Flamethrower SOUND E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Windows\SFX\Flamethrower SOUND_D79FB2B7.wem \Actor-Mixer Hierarchy\Default Work Unit\spaceship\Spaceship\Thruster_type01\thuster_small\Flamethrower SOUND 1473292 - diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/wormhole.bnk b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/wormhole.bnk deleted file mode 100644 index 5fe7f6ce6..000000000 Binary files a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/wormhole.bnk and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/wormhole.txt b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/wormhole.txt deleted file mode 100644 index 2e3e90190..000000000 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/wormhole.txt +++ /dev/null @@ -1,10 +0,0 @@ -Event ID Name Wwise Object Path Notes - 74807897 Wormhole_jump_in \Default Work Unit\Wormhole_jump_in - 1122693656 wormhole_jump_out \Default Work Unit\wormhole_jump_out - 3842220822 wormhole_travel_loop \Default Work Unit\wormhole_travel_loop - -In Memory Audio ID Name Audio source file Wwise Object Path Notes Data Size - 305405244 Aetheria_Wormhole_travel_jumpin E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Windows\SFX\Aetheria_Wormhole_travel_jumpin_3CA8C70E.wem \Actor-Mixer Hierarchy\Default Work Unit\wormhole\Aetheria_Wormhole_travel_jumpin 1127356 - 416185788 Aetheria_Wormhole_travel E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Windows\SFX\Aetheria_Wormhole_travel_10C4C929.wem \Actor-Mixer Hierarchy\Default Work Unit\wormhole\Aetheria_Wormhole_travel 5292064 - 857805897 Aetheria_Wormhole_travel_jumpout E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\.cache\Windows\SFX\Aetheria_Wormhole_travel_jumpout_8FC987B8.wem \Actor-Mixer Hierarchy\Default Work Unit\wormhole\Aetheria_Wormhole_travel_jumpout 929780 - diff --git a/Aetheria-Economy_WwiseProject/SoundBanks/Default Work Unit.wwu b/Aetheria-Economy_WwiseProject/SoundBanks/Default Work Unit.wwu index 7966e3f92..a7382c7e6 100644 --- a/Aetheria-Economy_WwiseProject/SoundBanks/Default Work Unit.wwu +++ b/Aetheria-Economy_WwiseProject/SoundBanks/Default Work Unit.wwu @@ -26,21 +26,21 @@ - + - + - + diff --git a/Assets/Materials/Planet.mat b/Assets/Materials/Planet.mat index 5efc2f40c..535e6b305 100644 --- a/Assets/Materials/Planet.mat +++ b/Assets/Materials/Planet.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Planet - m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -61,10 +61,10 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0 + - _Glossiness: 0.331 - _GlossyReflections: 1 - _InvFade: 1 - - _Metallic: 1 + - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 @@ -74,7 +74,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.6981132, g: 0.6981132, b: 0.6981132, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] diff --git a/Assets/Materials/UI/Map Gravity Lines.mat b/Assets/Materials/UI/Map Gravity Lines.mat index 749d876be..58ee0a10b 100644 --- a/Assets/Materials/UI/Map Gravity Lines.mat +++ b/Assets/Materials/UI/Map Gravity Lines.mat @@ -86,7 +86,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Scale: 0.5 + - _Scale: 5.978973 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Prefabs/RPG/Planets/Planet.prefab b/Assets/Prefabs/RPG/Planets/Planet.prefab index f1bc3fc69..b6b0d2faf 100644 --- a/Assets/Prefabs/RPG/Planets/Planet.prefab +++ b/Assets/Prefabs/RPG/Planets/Planet.prefab @@ -235,7 +235,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8859079004937162791} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bbe3bd5182f0f47d6a8a90fe1aaadc52, type: 3} m_Name: diff --git a/Assets/Resources/Geonames/Australia.csv b/Assets/Resources/Geonames/Australia.csv index 5830339d5..05587efaa 100644 --- a/Assets/Resources/Geonames/Australia.csv +++ b/Assets/Resources/Geonames/Australia.csv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af3be8a80cca42b3bf13dadacd8b5052128e289c7443e312c42b9fe3d21a7d8e -size 2146085 +oid sha256:01bb478f4433dc42d5533e5030ef103ad163deca6bc40fb412025acd12e35c73 +size 442795 diff --git a/Assets/Resources/Geonames/Congo.csv b/Assets/Resources/Geonames/Congo.csv index 325f580fe..5d0f0b66e 100644 --- a/Assets/Resources/Geonames/Congo.csv +++ b/Assets/Resources/Geonames/Congo.csv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efd6659ea33c2b6457ada99d829b0751133ab97d900dce424155750cf241de88 -size 827566 +oid sha256:c84ff44083e4f0d9d9314e7b7095ed4ce2955905f26e7926faa09ed222655729 +size 506722 diff --git a/Assets/Resources/Geonames/Germany.csv b/Assets/Resources/Geonames/Germany.csv index 7b4fcca9e..beb35d1d0 100644 --- a/Assets/Resources/Geonames/Germany.csv +++ b/Assets/Resources/Geonames/Germany.csv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f04cb0580bf6e3b50ea5f5a6b7518eb43385b58190289e76844d0b161ec9a511 -size 2208305 +oid sha256:73e4e7231d448879d0a6d8524b3200be75fc8f5011a70cfd670b0897d07eca10 +size 1284208 diff --git a/Assets/Resources/Geonames/India.csv b/Assets/Resources/Geonames/India.csv index f4591eaa7..6b4eab5c6 100644 --- a/Assets/Resources/Geonames/India.csv +++ b/Assets/Resources/Geonames/India.csv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b1658df654cdd00949c514ae0c24a066bafefa38c85038a62f867b12280b67d -size 7829069 +oid sha256:96c66414822c43a5451ce1910c1e545dedb224b0f3e79bc54f945dd484afc6a2 +size 3229324 diff --git a/Assets/Resources/Geonames/Iran.csv b/Assets/Resources/Geonames/Iran.csv index 43d5ae1e6..8d2754642 100644 --- a/Assets/Resources/Geonames/Iran.csv +++ b/Assets/Resources/Geonames/Iran.csv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:227971b87de98f1eb91f8238cf9569bf31ac2ef97d4c9e9035690ee4a439e8ec -size 6292323 +oid sha256:b70fbbe6b4832eb1a3f35844bd87c0eb479fc77b6e59d6600b64cbbe7cc1bf16 +size 1073119 diff --git a/Assets/Resources/Geonames/Japan.csv b/Assets/Resources/Geonames/Japan.csv index ca5979d17..d106ec364 100644 --- a/Assets/Resources/Geonames/Japan.csv +++ b/Assets/Resources/Geonames/Japan.csv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54ef4239af6d59b74966465cc817e9c32854cb9ccac25ae7b651dd5d2a083af7 -size 1852881 +oid sha256:d58dc0227cc6e3b7622726c155031467b6d7314623c7e3a33aad8ce1462b2c5b +size 1031132 diff --git a/Assets/Resources/Geonames/Mexico.csv b/Assets/Resources/Geonames/Mexico.csv index 9cd9c88a9..517228e8f 100644 --- a/Assets/Resources/Geonames/Mexico.csv +++ b/Assets/Resources/Geonames/Mexico.csv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f2d4bc9da8a6df046cccd6bba93101d165e30ade26440dd8e146056b9261470 -size 7168941 +oid sha256:9a654b8451a08a0c769712f4fb1d96c3c661457a88bb57ec4288eab36eab7ec1 +size 633432 diff --git a/Assets/Resources/Geonames/Russia.csv b/Assets/Resources/Geonames/Russia.csv index b30e1ab62..6344ff571 100644 --- a/Assets/Resources/Geonames/Russia.csv +++ b/Assets/Resources/Geonames/Russia.csv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef869a1238671846e69afae67af1d28a829802190a39de1282d41e52c70fde34 -size 7050301 +oid sha256:f4ed581eef681e5357a14efe4e6a1fc52370def7ada6565f4b953e410fa7f39e +size 2375319 diff --git a/Assets/Resources/Geonames/Swahili.csv b/Assets/Resources/Geonames/Swahili.csv index 45a77e10f..678065eed 100644 --- a/Assets/Resources/Geonames/Swahili.csv +++ b/Assets/Resources/Geonames/Swahili.csv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3ff6908d81b867737dcaa85f6770649f476d76a5759aa8a0cadcd406eb547b0 -size 954824 +oid sha256:fb0f44e7948c637a2b0f9e0ca098b2f4689d065fe6484723acf0bfa34a26d0a5 +size 501002 diff --git a/Assets/Resources/Geonames/Thailand.csv b/Assets/Resources/Geonames/Thailand.csv index 5845b7802..400b8f1a9 100644 --- a/Assets/Resources/Geonames/Thailand.csv +++ b/Assets/Resources/Geonames/Thailand.csv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c016259159731500606e465a84cf719f471c15e16674dd76f41503061135d018 -size 5438167 +oid sha256:888c929f0e29728369448e6981bb8a043c49610f4c4390a2cb549bf6b494d3dc +size 143084 diff --git a/Assets/Resources/Geonames/USA.csv b/Assets/Resources/Geonames/USA.csv index 9a0dd9bbb..05bd91140 100644 --- a/Assets/Resources/Geonames/USA.csv +++ b/Assets/Resources/Geonames/USA.csv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d93b813d740820cfa8e8aae593015cbd7c45cecd683efde1de32da9ae674da03 -size 18331904 +oid sha256:314a30df2033795f04738589c660991e4310f1bfe0578c71bda2a9a72d8a617f +size 954928 diff --git a/Assets/Resources/Geonames/pleiades.csv b/Assets/Resources/Geonames/pleiades.csv new file mode 100644 index 000000000..581d44ff7 --- /dev/null +++ b/Assets/Resources/Geonames/pleiades.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45b0dbc07d492958b26de3695427076d270bdd0525ab45c415be72560ebccb5f +size 400944 diff --git a/Assets/Resources/Geonames/pleiades.csv.meta b/Assets/Resources/Geonames/pleiades.csv.meta new file mode 100644 index 000000000..dc0edb8f1 --- /dev/null +++ b/Assets/Resources/Geonames/pleiades.csv.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b532694a5ec3cc6458d42aa2835537b5 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main Menu.unity b/Assets/Scenes/Main Menu.unity index 1ad35e072..56751dd82 100644 --- a/Assets/Scenes/Main Menu.unity +++ b/Assets/Scenes/Main Menu.unity @@ -1302,8 +1302,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 741153267} - m_LocalRotation: {x: 0.015506916, y: 0.9502416, z: -0.3074131, w: 0.047933273} - m_LocalPosition: {x: -117.52, y: -77.08745, z: 149.09027} + m_LocalRotation: {x: 0.015506901, y: 0.9502416, z: -0.30741307, w: 0.047933236} + m_LocalPosition: {x: -117.51998, y: -77.08744, z: 149.09026} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 412917866} @@ -1773,8 +1773,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 965376321} - m_LocalRotation: {x: 0.015506916, y: 0.9502416, z: -0.3074131, w: 0.047933273} - m_LocalPosition: {x: -117.52, y: -77.08745, z: 149.09027} + m_LocalRotation: {x: 0.015506901, y: 0.9502416, z: -0.30741307, w: 0.047933236} + m_LocalPosition: {x: -117.51998, y: -77.08744, z: 149.09026} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Scripts/Editor/DatabaseInspector.cs b/Assets/Scripts/Editor/DatabaseInspector.cs index c98222e18..da1dc18af 100644 --- a/Assets/Scripts/Editor/DatabaseInspector.cs +++ b/Assets/Scripts/Editor/DatabaseInspector.cs @@ -199,7 +199,10 @@ public class DatabaseInspector : EditorWindow else if (type == typeof(Dictionary)) { var dict = (Dictionary) field.GetValue(obj); - Inspect(field.Name.SplitCamelCase(), ref dict, link.EntryType); + var ranged = field.GetCustomAttribute(); + if(ranged != null) + Inspect(field.Name.SplitCamelCase(), ref dict, link.EntryType, ranged.Min, ranged.Max); + else Inspect(field.Name.SplitCamelCase(), ref dict, link.EntryType); } else if (type == typeof(List)) { @@ -851,6 +854,65 @@ public class DatabaseInspector : EditorWindow } } + public void Inspect(string label, ref Dictionary value, Type referenceType, float min, float max) + { + Space(); + LabelField(label, EditorStyles.boldLabel); + + using (var v = new VerticalScope(GUI.skin.box)) + { + if (value.Count == 0) + { + using (var h = new HorizontalScope(_list.ListItemStyle)) + { + GUILayout.Label("Drag from list to add item"); + } + } + foreach (var ingredient in value.ToArray()) + { + using (var h = new HorizontalScope(_list.ListItemStyle)) + { + var entry = DatabaseCache.Get(ingredient.Key); + if (entry == null) + { + value.Remove(ingredient.Key); + GUI.changed = true; + return; + } + + if(entry is INamedEntry named) + GUILayout.Label(named.EntryName); + else GUILayout.Label(entry.ID.ToString()); + value[ingredient.Key] = Slider(value[ingredient.Key], min, max); + + var rect = GetControlRect(false, GUILayout.Width(EditorGUIUtility.singleLineHeight)); + GUI.DrawTexture(rect, Icons.Instance.minus, ScaleMode.StretchToFill, true, 1, LabelColor, 0, 0); + if (GUI.Button(rect, GUIContent.none, GUIStyle.none)) + value.Remove(ingredient.Key); + } + } + + if (v.rect.Contains(Event.current.mousePosition)) + { + var dragData = DragAndDrop.GetGenericData("Item"); + var isId = dragData is Guid guid; + var dragEntry = isId ? DatabaseCache.Get(guid) : null; + var correctType = referenceType.IsInstanceOfType(dragEntry); + if(Event.current.type == EventType.DragUpdated) + DragAndDrop.visualMode = correctType ? DragAndDropVisualMode.Copy : DragAndDropVisualMode.Rejected; + else if(Event.current.type == EventType.DragPerform) + { + if (isId && correctType) + { + DragAndDrop.AcceptDrag(); + value[guid] = max; + GUI.changed = true; + } + } + } + } + } + public void Inspect(string label, ref List value, Type entryType) { Space(); diff --git a/Assets/Scripts/Editor/DatabaseView.cs b/Assets/Scripts/Editor/DatabaseView.cs index c8926db1c..4aedda1d3 100644 --- a/Assets/Scripts/Editor/DatabaseView.cs +++ b/Assets/Scripts/Editor/DatabaseView.cs @@ -63,7 +63,7 @@ public class DatabaseListView : EditorWindow { //_filePath = ; // Create database cache - _databaseCache = new DatabaseCache(); + _databaseCache = new DatabaseCache(_filePath); var onInsert = new Action(entry => { @@ -162,16 +162,16 @@ public class DatabaseListView : EditorWindow } using (var h = new HorizontalScope()) { - _fileName = TextField(_fileName); + //_fileName = TextField(_fileName); if (GUILayout.Button("Save")) { - _databaseCache.Save(_filePath); + _databaseCache.Save(); Debug.Log("Local DB Cache Saved!"); } if (GUILayout.Button("Load")) { - _databaseCache.Load(_filePath); + _databaseCache.Load(); Debug.Log("Loaded DB From Local Cache!"); } } @@ -411,7 +411,7 @@ public class DatabaseListView : EditorWindow } } - var entries = _databaseCache.AllEntries.Where(item => !(item is ItemData)).ToArray(); + //var entries = _databaseCache.AllEntries.Where(item => !(item is ItemData)).ToArray(); for (var i = 0; i < _entryTypes.Length; i++) { using (var h = new HorizontalScope(ListItemStyle)) @@ -424,7 +424,7 @@ public class DatabaseListView : EditorWindow if (_entryFoldouts[i]) { int index = 0; - foreach (var entry in entries.Where(e=>e.GetType()==_entryTypes[i]).OrderBy(entry=>entry is INamedEntry namedEntry ? namedEntry.EntryName : entry.ID.ToString())) + foreach (var entry in _databaseCache.GetAll(_entryTypes[i]).OrderBy(entry=>entry is INamedEntry namedEntry ? namedEntry.EntryName : entry.ID.ToString())) { index++; var style = ListItemStyle; diff --git a/Assets/Scripts/Editor/NameTools.cs b/Assets/Scripts/Editor/NameTools.cs index 974ace6d2..1482e4022 100644 --- a/Assets/Scripts/Editor/NameTools.cs +++ b/Assets/Scripts/Editor/NameTools.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text.RegularExpressions; +using MessagePack; using Unity.Mathematics; using UnityEngine; using UnityEditor; @@ -28,6 +29,11 @@ public class NameTools : EditorWindow NameTools window = (NameTools)EditorWindow.GetWindow(typeof(NameTools)); window.Show(); } + + bool HasNonASCIIChars(string str) + { + return (System.Text.Encoding.UTF8.GetByteCount(str) != str.Length); + } void OnGUI() { @@ -40,14 +46,17 @@ public class NameTools : EditorWindow if (GUILayout.Button("Save Name Files")) { - var database = new DatabaseCache(); + RegisterResolver.Register(); + var nameFilesDirectory = ActionGameManager.GameDataDirectory.CreateSubdirectory("NameFile"); foreach (var nameFile in NameFiles) { - var entry = new NameFile(); - entry.Names = nameFile.text.Split('\n'); - database.Add(entry); + var entry = new NameFile + { + Name = nameFile.name, + Names = nameFile.text.Split('\n') + }; + File.WriteAllBytes(Path.Combine(nameFilesDirectory.FullName, $"{entry.ID.ToString()}.msgpack"), MessagePackSerializer.Serialize((DatabaseEntry) entry)); } - database.Save(Path.Combine(ActionGameManager.GameDataDirectory.FullName, "Names.msgpack")); } nameFile = (TextAsset) EditorGUILayout.ObjectField("Name File", nameFile, typeof(TextAsset), false); @@ -61,22 +70,20 @@ public class NameTools : EditorWindow { var lines = nameFile.text.Split('\n'); using StreamWriter outputFile = new StreamWriter(Path.Combine(Application.dataPath, nameFile.name + ".csv")); + var names = new HashSet(); foreach (var line in lines) { - if (!_stripNumberTokens) + var tokens = line.Split(',', ' '); + foreach (var t in tokens) { - if (!string.IsNullOrEmpty(line) && Regex.IsMatch(line, "^[\\x00-\\x7F]+$") && !char.IsDigit(line[0])) + if (!HasNonASCIIChars(t)) { - outputFile.WriteLine(line.Trim()); - } - } - else - { - var tokens = line.Split('_', '-', ' '); - if(!(tokens.Any(t => t.Length == 2 && char.IsUpper(t[0]) && char.IsUpper(t[1])))) - //if (Regex.IsMatch(line, "^[\\x00-\\x7F]+$") && !tokens.Any(t=>int.TryParse(t, out _)) && !tokens.Any(t=>t=="AM"||t=="FM"||t=="TV")) - { - outputFile.WriteLine(line.Trim()); + var s = new string(t.Where(c => char.IsLetter(c) || c == '-' || c == '`' || c == '\'').ToArray()).Trim().Trim('`','-'); + if(s.Length >= minWordLength && !names.Contains(s)) + { + names.Add(s); + outputFile.WriteLine(s); + } } } } diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index 73e629e5b..840d955d1 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -38,8 +38,8 @@ public class ActionGameManager : MonoBehaviour { if (_database != null) return _database; - _database = new DatabaseCache(); - _database.Load(Path.Combine(GameDataDirectory.FullName, "AetherDB.msgpack")); + _database = new DatabaseCache(Path.Combine(GameDataDirectory.FullName, "AetherDB.msgpack")); + _database.Load(); return _database; } diff --git a/Assets/Scripts/RethinkConnection.cs b/Assets/Scripts/RethinkConnection.cs index e7c35a6b1..047a287f0 100644 --- a/Assets/Scripts/RethinkConnection.cs +++ b/Assets/Scripts/RethinkConnection.cs @@ -18,7 +18,7 @@ public static class RethinkConnection { public static RethinkDB R = RethinkDB.R; - public static RethinkQueryStatus RethinkConnect(DatabaseCache cache, string connectionString, bool syncLocalChanges = true, bool filterGalaxyData = true) + public static RethinkQueryStatus RethinkConnect(DatabaseCache cache, string connectionString, bool syncLocalChanges = true) { // Add Unity.Mathematics serialization support to RethinkDB Driver //Converter.Serializer.Converters.Add(new MathJsonConverter()); @@ -105,15 +105,7 @@ public static class RethinkConnection ReqlAst operation = R .Db("Aetheria") .Table("Galaxy"); - if (filterGalaxyData) - { - var filter = ((Table) operation).Filter(o => - o["$type"] == typeof(GalaxyMapLayerData).Name || - o["$type"] == typeof(MegaCorporation).Name); - status.GalaxyEntries = filter.Count().RunAtom(connection); - operation = filter; - } - else status.GalaxyEntries = ((Table) operation).Count().RunAtom(connection); + status.GalaxyEntries = ((Table) operation).Count().RunAtom(connection); var result = await operation .RunCursorAsync(connection); diff --git a/Assets/Scripts/Sector Display/ZoneRenderer.cs b/Assets/Scripts/Sector Display/ZoneRenderer.cs index 99cc893eb..bd8512ac4 100644 --- a/Assets/Scripts/Sector Display/ZoneRenderer.cs +++ b/Assets/Scripts/Sector Display/ZoneRenderer.cs @@ -193,7 +193,11 @@ public class ZoneRenderer : MonoBehaviour foreach (var adjacentZone in zone.SectorZone.AdjacentZones) { var dir = normalize(adjacentZone.Position - zone.SectorZone.Position); - AddWormhole(new Wormhole {Position = dir * Settings.DefaultZoneRadius * Settings.WormholeDistanceRatio}); + AddWormhole(new Wormhole + { + Target = adjacentZone, + Position = dir * Settings.DefaultZoneRadius * Settings.WormholeDistanceRatio + }); } } } diff --git a/Assets/Scripts/ServerShared/Attributes.cs b/Assets/Scripts/ServerShared/Attributes.cs index a6523da4b..ecc971791 100644 --- a/Assets/Scripts/ServerShared/Attributes.cs +++ b/Assets/Scripts/ServerShared/Attributes.cs @@ -51,6 +51,9 @@ public class RuntimeInspectable : Attribute { } [AttributeUsage(AttributeTargets.Class)] public class InspectableAttribute : Attribute { } +[AttributeUsage(AttributeTargets.Class)] +public class ExternalEntryAttribute : Attribute { } + public class InspectableFieldAttribute : Attribute { } [AttributeUsage(AttributeTargets.Field)] @@ -108,6 +111,18 @@ public class RangedFloatInspectableAttribute : InspectableFieldAttribute } } +[AttributeUsage(AttributeTargets.Field)] +public class RangedFloatAttribute : Attribute +{ + public readonly float Min, Max; + + public RangedFloatAttribute(float min, float max) + { + Min = min; + Max = max; + } +} + [AttributeUsage(AttributeTargets.Field)] public class RangedIntInspectableAttribute : InspectableFieldAttribute { diff --git a/Assets/Scripts/ServerShared/Corporations.cs b/Assets/Scripts/ServerShared/Corporations.cs index b02d4d0a2..1093a43d5 100644 --- a/Assets/Scripts/ServerShared/Corporations.cs +++ b/Assets/Scripts/ServerShared/Corporations.cs @@ -71,6 +71,9 @@ public class MegaCorporation : DatabaseEntry, INamedEntry [InspectableField, JsonProperty("influence"), Key(11)] public int InfluenceDistance = 4; + [InspectableDatabaseLink(typeof(MegaCorporation)), RangedFloat(0, 1), JsonProperty("allegiance"), Key(12)] + public Dictionary Allegiance = new Dictionary(); + [IgnoreMember] public string EntryName { get => Name; @@ -78,9 +81,16 @@ public class MegaCorporation : DatabaseEntry, INamedEntry } } -[Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)] -public class NameFile : DatabaseEntry +[Inspectable, MessagePackObject, ExternalEntry] +public class NameFile : DatabaseEntry, INamedEntry { - [JsonProperty("names"), Key(1)] - public string[] Names; + [Key(1)] public string Name; + [Key(2)] public string[] Names; + + [IgnoreMember] + public string EntryName + { + get => Name; + set => Name = value; + } } diff --git a/Assets/Scripts/ServerShared/DatabaseCache.cs b/Assets/Scripts/ServerShared/DatabaseCache.cs index 50ec7f2d7..44f6cf7d9 100644 --- a/Assets/Scripts/ServerShared/DatabaseCache.cs +++ b/Assets/Scripts/ServerShared/DatabaseCache.cs @@ -7,6 +7,7 @@ using System.Collections; using System.Collections.Generic; using System.IO; using System.Linq; +using System.Reflection; using MessagePack; public class DatabaseCache @@ -20,44 +21,107 @@ public class DatabaseCache private readonly object addLock = new object(); - public Action Logger = Console.WriteLine; + //public Action Logger = Console.WriteLine; + private string _filePath; private readonly Dictionary _entries = new Dictionary(); - private readonly Dictionary> _types = new Dictionary>(); + private readonly Dictionary> _types = new Dictionary>(); + + private readonly Dictionary entries)> _externalTypes = new Dictionary entries)>(); + + private class ExternalEntry + { + public string FilePath; + public DatabaseEntry Entry; + + public ExternalEntry(string filePath, DatabaseEntry entry) + { + FilePath = filePath; + Entry = entry; + } + } + private readonly Dictionary _externalEntries = new Dictionary(); public IEnumerable AllEntries => _entries.Values; + public DatabaseCache(string filePath) + { + RegisterResolver.Register(); + _filePath = filePath; + var fileInfo = new FileInfo(filePath); + var dataDirectory = fileInfo.Directory; + + // Entry types can be marked external + // External entries are stored individually and loaded on demand + // This is mainly to accomodate large files like datasets + foreach (var type in typeof(DatabaseEntry).GetAllChildClasses()) + { + if (type.GetCustomAttribute() != null) + { + var typeDirectory = dataDirectory.CreateSubdirectory(type.Name); + _externalTypes[type] = (typeDirectory, new List()); + + // Cache the GUIDs for all available external entries for querying + // Initially set values to null to indicate they haven't been loaded yet + foreach (var file in typeDirectory.EnumerateFiles("*.msgpack")) + { + Guid id; + if (Guid.TryParse(file.Name.Substring(0, file.Name.IndexOf('.')), out id)) + { + _externalEntries.Add(id, new ExternalEntry(file.FullName, null)); + _externalTypes[type].entries.Add(id); + } + } + } + else _types[type] = new HashSet(); + } + } + public void Add(DatabaseEntry entry, bool remote = false) { lock(addLock) { if (entry != null) { + entry.Database = this; var exists = _entries.ContainsKey(entry.ID); - _entries[entry.ID] = entry; + + // If an external entry is added, store it separately var type = entry.GetType(); - var types = type.GetParentTypes(); - foreach (var t in types) + if (_externalTypes.ContainsKey(type)) { - if (!_types.ContainsKey(t)) - _types[t] = new Dictionary(); - _types[t][entry.ID] = entry; - } - - if (remote) - { - if (exists) - OnDataUpdateRemote?.Invoke(entry); + if (_externalEntries.ContainsKey(entry.ID)) + { + _externalEntries[entry.ID].Entry = entry; + } else - OnDataInsertRemote?.Invoke(entry); + { + _externalTypes[type].entries.Add(entry.ID); + _externalEntries[entry.ID] = new ExternalEntry( + Path.Combine(_externalTypes[type].directory.FullName, $"{entry.ID.ToString()}.msgpack"), + entry); + } } else { - if (exists) - OnDataUpdateLocal?.Invoke(entry); + _entries[entry.ID] = entry; + _types[type].Add(entry); + + if (remote) + { + if (exists) + OnDataUpdateRemote?.Invoke(entry); + else + OnDataInsertRemote?.Invoke(entry); + } else - OnDataInsertLocal?.Invoke(entry); + { + if (exists) + OnDataUpdateLocal?.Invoke(entry); + else + OnDataInsertLocal?.Invoke(entry); + } } } } @@ -73,6 +137,19 @@ public class DatabaseCache public DatabaseEntry Get(Guid guid) { + if (_externalEntries.ContainsKey(guid)) + { + if(_externalEntries[guid].Entry == null) + { + var bytes = File.ReadAllBytes(_externalEntries[guid].FilePath); + var e = MessagePackSerializer.Deserialize(bytes); + e.Database = this; + _externalEntries[guid].Entry = e; + } + + return _externalEntries[guid].Entry; + } + DatabaseEntry entry; _entries.TryGetValue(guid, out entry); return entry; @@ -80,25 +157,31 @@ public class DatabaseCache public T Get(Guid guid) where T : DatabaseEntry { - if (!_types.ContainsKey(typeof(T))) - return null; - DatabaseEntry entry; - _types[typeof(T)].TryGetValue(guid, out entry); - return (T) entry; + return Get(guid) as T; } - public IEnumerable GetAll() + public IEnumerable GetAll(Type type) { - return !_types.ContainsKey(typeof(T)) ? Enumerable.Empty() : _types[typeof(T)].Values.Cast(); + if (_externalTypes.ContainsKey(type)) + { + return _externalTypes[type].entries.Select(Get); + } + return !_types.ContainsKey(type) ? Enumerable.Empty() : _types[type]; + } + + public IEnumerable GetAll() where T : DatabaseEntry + { + var type = typeof(T); + if (_externalTypes.ContainsKey(type)) + { + return _externalTypes[type].entries.Select(Get); + } + return !_types.ContainsKey(type) ? Enumerable.Empty() : _types[type].Cast(); } public void Delete(DatabaseEntry entry, bool remote = false) { _entries.Remove(entry.ID); - foreach (var type in _types.Values) - { - type.Remove(entry.ID); - } if (remote) OnDataDeleteRemote?.Invoke(entry); @@ -106,18 +189,25 @@ public class DatabaseCache OnDataDeleteLocal?.Invoke(entry); } - public void Load(string path) + public void Load() { - RegisterResolver.Register(); - var bytes = File.ReadAllBytes(path); + var bytes = File.ReadAllBytes(_filePath); var entries = MessagePackSerializer.Deserialize(bytes); + foreach (var entry in entries) entry.Database = this; AddAll(entries); } - public void Save(string path) + public void Save() { - RegisterResolver.Register(); var entries = AllEntries.ToArray(); - File.WriteAllBytes(path, MessagePackSerializer.Serialize(entries)); + File.WriteAllBytes(_filePath, MessagePackSerializer.Serialize(entries)); + + foreach (var external in _externalEntries.Values) + { + if (external.Entry != null) + { + File.WriteAllBytes(external.FilePath, MessagePackSerializer.Serialize(external.Entry)); + } + } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/ConsoleView.cs b/Assets/Scripts/UI/ConsoleView.cs index 8a28dea6d..bf7b522e0 100644 --- a/Assets/Scripts/UI/ConsoleView.cs +++ b/Assets/Scripts/UI/ConsoleView.cs @@ -62,7 +62,7 @@ public class ConsoleView : MonoBehaviour { ConsoleController.Instance.AppendLogLine("" + condition + ""); } - ~ConsoleView() { + private void OnDestroy() { Application.logMessageReceived -= OnLogCallback; ConsoleController.Instance.VisibilityChanged -= OnVisibilityChanged; ConsoleController.Instance.LogChanged -= OnLogChanged; diff --git a/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset b/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset index b1eda9aa1..670df43a5 100644 --- a/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset +++ b/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1905c6f29f69e39fa6e41f72efbb47ea57229dca022939b1c3b37772d26e0e5e +oid sha256:7f2aa52e203e7ee70723acc6de6331565f9f88981df9a8ce669a001ff820aa78 size 15474 diff --git a/GameData/AetherDB.msgpack b/GameData/AetherDB.msgpack index 525d8309e..43017a734 100644 Binary files a/GameData/AetherDB.msgpack and b/GameData/AetherDB.msgpack differ diff --git a/GameData/NameFile/350eac1f-ecca-4439-9a86-7bcef44f780c.msgpack b/GameData/NameFile/350eac1f-ecca-4439-9a86-7bcef44f780c.msgpack new file mode 100644 index 000000000..19cf62fba --- /dev/null +++ b/GameData/NameFile/350eac1f-ecca-4439-9a86-7bcef44f780c.msgpack @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f12af0d8bb159f41b6618a8a2f5ac7ddf2c0a2b1dc449dd21188416f2ccc4427 +size 633464 diff --git a/GameData/NameFile/35f90a4b-460c-416c-9a4e-f7e661850787.msgpack b/GameData/NameFile/35f90a4b-460c-416c-9a4e-f7e661850787.msgpack new file mode 100644 index 000000000..895ec9238 --- /dev/null +++ b/GameData/NameFile/35f90a4b-460c-416c-9a4e-f7e661850787.msgpack @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bdaa83a28f9448061b043115bdcbe09448f1eaf46c1cf44a78fe0d9044db9fd0 +size 506753 diff --git a/GameData/NameFile/43872e8e-df2f-4e03-81bb-e1d71f39b696.msgpack b/GameData/NameFile/43872e8e-df2f-4e03-81bb-e1d71f39b696.msgpack new file mode 100644 index 000000000..7ed8c9b37 --- /dev/null +++ b/GameData/NameFile/43872e8e-df2f-4e03-81bb-e1d71f39b696.msgpack @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3d7c59066055e76cc2f199ca8d47c6ca14ac20ad4cab66a273b72a0eb63804a +size 1031188 diff --git a/GameData/NameFile/5fb6de6e-616e-478c-9323-58f197af51b9.msgpack b/GameData/NameFile/5fb6de6e-616e-478c-9323-58f197af51b9.msgpack new file mode 100644 index 000000000..ae5a5f51c --- /dev/null +++ b/GameData/NameFile/5fb6de6e-616e-478c-9323-58f197af51b9.msgpack @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f3b5155c9003056d1fd33ad4a665d7f9330bed35bb45ab01bbdd05ef0cb006d +size 2375362 diff --git a/GameData/NameFile/86257ba5-2c68-4b6f-a269-7f02ff7372c3.msgpack b/GameData/NameFile/86257ba5-2c68-4b6f-a269-7f02ff7372c3.msgpack new file mode 100644 index 000000000..c9cb7a85f --- /dev/null +++ b/GameData/NameFile/86257ba5-2c68-4b6f-a269-7f02ff7372c3.msgpack @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f489a299b1a4d663a6b9be4790ff459ead7b36806783b759e6e24c0a26175d1 +size 400978 diff --git a/GameData/NameFile/8af167f7-2ac7-4cba-b204-25f5a6ba5f33.msgpack b/GameData/NameFile/8af167f7-2ac7-4cba-b204-25f5a6ba5f33.msgpack new file mode 100644 index 000000000..a898a8e8d --- /dev/null +++ b/GameData/NameFile/8af167f7-2ac7-4cba-b204-25f5a6ba5f33.msgpack @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b65a87570c0bbaecef45b047b5673cc83fbff5354ea0de68ca530cee290d30d6 +size 442830 diff --git a/GameData/NameFile/95c298ae-d7b4-4481-9fff-deb3eb5872e9.msgpack b/GameData/NameFile/95c298ae-d7b4-4481-9fff-deb3eb5872e9.msgpack new file mode 100644 index 000000000..9a79b7e17 --- /dev/null +++ b/GameData/NameFile/95c298ae-d7b4-4481-9fff-deb3eb5872e9.msgpack @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09cc5aa83fb1d97461846f86a0976dc58fb4730d7e27cc6e4f832f77b755f81a +size 3229371 diff --git a/GameData/NameFile/cfbb1969-2a8c-40dd-9f5d-c1b9e69d356d.msgpack b/GameData/NameFile/cfbb1969-2a8c-40dd-9f5d-c1b9e69d356d.msgpack new file mode 100644 index 000000000..f7585adc6 --- /dev/null +++ b/GameData/NameFile/cfbb1969-2a8c-40dd-9f5d-c1b9e69d356d.msgpack @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:085dbd6a8c2cf491d1344ce6de0ac024f5fbeb5f838c06ccbeb1506674a9b4d0 +size 954959 diff --git a/GameData/NameFile/d0959e52-7726-4510-bdaa-c267c58f2855.msgpack b/GameData/NameFile/d0959e52-7726-4510-bdaa-c267c58f2855.msgpack new file mode 100644 index 000000000..8c4f33b4b --- /dev/null +++ b/GameData/NameFile/d0959e52-7726-4510-bdaa-c267c58f2855.msgpack @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8352d97cd61b83b07dd9ce549358436800c588263147764df6bd5b556124f2cb +size 143118 diff --git a/GameData/NameFile/dfb8e9b0-31cd-4ff9-b6f3-bae707469e7c.msgpack b/GameData/NameFile/dfb8e9b0-31cd-4ff9-b6f3-bae707469e7c.msgpack new file mode 100644 index 000000000..6241d8117 --- /dev/null +++ b/GameData/NameFile/dfb8e9b0-31cd-4ff9-b6f3-bae707469e7c.msgpack @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f6fff7465869365a5dbb9aece1e6f2f3c72617808e66a942915d371ca22cd05 +size 1284248 diff --git a/GameData/NameFile/ecffecc1-d0b9-4014-be4d-442f72382721.msgpack b/GameData/NameFile/ecffecc1-d0b9-4014-be4d-442f72382721.msgpack new file mode 100644 index 000000000..0d29bb504 --- /dev/null +++ b/GameData/NameFile/ecffecc1-d0b9-4014-be4d-442f72382721.msgpack @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:275965b57ba3e75f1fd7b36339b843992a9a9a1b318d3bf08d940d458e7c7b79 +size 1073151 diff --git a/GameData/NameFile/fc790c9c-8b47-4519-8f2c-2486185f9064.msgpack b/GameData/NameFile/fc790c9c-8b47-4519-8f2c-2486185f9064.msgpack new file mode 100644 index 000000000..3d7b45f19 --- /dev/null +++ b/GameData/NameFile/fc790c9c-8b47-4519-8f2c-2486185f9064.msgpack @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5227513492cd33f502506dba741b99d5c7e9140318a44a5d84579258397aa227 +size 501035 diff --git a/GameData/Names.msgpack b/GameData/Names.msgpack deleted file mode 100644 index 34e4c2629..000000000 Binary files a/GameData/Names.msgpack and /dev/null differ diff --git a/GameData/PlayerSettings.msgpack b/GameData/PlayerSettings.msgpack index 625c245bd..66c99f543 100644 Binary files a/GameData/PlayerSettings.msgpack and b/GameData/PlayerSettings.msgpack differ diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index 40fa53e72..98f09ecba 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4aba838aefc3fa3db66e269656ea32bce2f37e887c0b22c94ef4650c3ab955d4 +oid sha256:d856ea646d82fd0547190760ee31ddc3d19d23a033c3ebbacc5813c73aae1e7c size 1289