diff --git a/.gitignore b/.gitignore index 7c63397b4..1584d76fa 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,9 @@ /[Mm]emoryCaptures/ /Recordings/ +# Wwise cache folder +/Aetheria-Economy_WwiseProject/.cache + # Wwise profiling sessions *.prof diff --git a/Aetheria-Economy_WwiseProject/.cache/CacheVersion b/Aetheria-Economy_WwiseProject/.cache/CacheVersion deleted file mode 100644 index f75a6a499..000000000 Binary files a/Aetheria-Economy_WwiseProject/.cache/CacheVersion and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/Aetheria_docking_spaceship_V2.1_10C4C929.wem b/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/Aetheria_docking_spaceship_V2.1_10C4C929.wem deleted file mode 100644 index c2950696d..000000000 Binary files a/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/Aetheria_docking_spaceship_V2.1_10C4C929.wem and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/Aetheria_undocking_spaceship_V2.1_10C4C929.wem b/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/Aetheria_undocking_spaceship_V2.1_10C4C929.wem deleted file mode 100644 index 9c5b98402..000000000 Binary files a/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/Aetheria_undocking_spaceship_V2.1_10C4C929.wem and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/Wwise.dat b/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/Wwise.dat deleted file mode 100644 index fd3f71756..000000000 Binary files a/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/Wwise.dat and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/blip1_10C4C929.wem b/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/blip1_10C4C929.wem deleted file mode 100644 index 4d09f43c1..000000000 Binary files a/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/blip1_10C4C929.wem and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/blip2_10C4C929.wem b/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/blip2_10C4C929.wem deleted file mode 100644 index 1772f5821..000000000 Binary files a/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/blip2_10C4C929.wem and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/equip_10C4C929.wem b/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/equip_10C4C929.wem deleted file mode 100644 index 9c481a7c9..000000000 Binary files a/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/equip_10C4C929.wem and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/pickup_10C4C929.wem b/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/pickup_10C4C929.wem deleted file mode 100644 index f2fcaffc0..000000000 Binary files a/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/pickup_10C4C929.wem and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/putdown_10C4C929.wem b/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/putdown_10C4C929.wem deleted file mode 100644 index e4aab8409..000000000 Binary files a/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/putdown_10C4C929.wem and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/unequip_10C4C929.wem b/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/unequip_10C4C929.wem deleted file mode 100644 index 65448a6ad..000000000 Binary files a/Aetheria-Economy_WwiseProject/.cache/Mac/SFX/unequip_10C4C929.wem and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/.cache/SoundBankInfoCache.dat b/Aetheria-Economy_WwiseProject/.cache/SoundBankInfoCache.dat deleted file mode 100644 index 98de5d312..000000000 Binary files a/Aetheria-Economy_WwiseProject/.cache/SoundBankInfoCache.dat and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/.cache/Windows/Plugins/SoundSeed Grain/SFX_Spcshp_reactor_extended_V2.0_D79FB2B7.wem b/Aetheria-Economy_WwiseProject/.cache/Windows/Plugins/SoundSeed Grain/SFX_Spcshp_reactor_extended_V2.0_D79FB2B7.wem deleted file mode 100644 index abd7a3911..000000000 Binary files a/Aetheria-Economy_WwiseProject/.cache/Windows/Plugins/SoundSeed Grain/SFX_Spcshp_reactor_extended_V2.0_D79FB2B7.wem and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/.cache/Windows/Plugins/SoundSeed Grain/Wwise.dat b/Aetheria-Economy_WwiseProject/.cache/Windows/Plugins/SoundSeed Grain/Wwise.dat deleted file mode 100644 index 79f37effd..000000000 Binary files a/Aetheria-Economy_WwiseProject/.cache/Windows/Plugins/SoundSeed Grain/Wwise.dat and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/Aetheria_Wormhole_travel_jumpin_3CA8C70E.wem b/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/Aetheria_Wormhole_travel_jumpin_3CA8C70E.wem deleted file mode 100644 index f42528792..000000000 Binary files a/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/Aetheria_Wormhole_travel_jumpin_3CA8C70E.wem and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/Aetheria_Wormhole_travel_jumpout_8FC987B8.wem b/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/Aetheria_Wormhole_travel_jumpout_8FC987B8.wem deleted file mode 100644 index 4ed92a4a9..000000000 Binary files a/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/Aetheria_Wormhole_travel_jumpout_8FC987B8.wem and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/Aetheria_docking_spaceship_V2.1_10C4C929.wem b/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/Aetheria_docking_spaceship_V2.1_10C4C929.wem deleted file mode 100644 index c2950696d..000000000 Binary files a/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/Aetheria_docking_spaceship_V2.1_10C4C929.wem and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/Aetheria_undocking_spaceship_V2.1_10C4C929.wem b/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/Aetheria_undocking_spaceship_V2.1_10C4C929.wem deleted file mode 100644 index 9c5b98402..000000000 Binary files a/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/Aetheria_undocking_spaceship_V2.1_10C4C929.wem and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/Wwise.dat b/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/Wwise.dat deleted file mode 100644 index 959d7e7cf..000000000 Binary files a/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/Wwise.dat and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/blip1_10C4C929.wem b/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/blip1_10C4C929.wem deleted file mode 100644 index 4d09f43c1..000000000 Binary files a/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/blip1_10C4C929.wem and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/blip2_10C4C929.wem b/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/blip2_10C4C929.wem deleted file mode 100644 index 1772f5821..000000000 Binary files a/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/blip2_10C4C929.wem and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/equip_10C4C929.wem b/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/equip_10C4C929.wem deleted file mode 100644 index 9c481a7c9..000000000 Binary files a/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/equip_10C4C929.wem and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/pickup_10C4C929.wem b/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/pickup_10C4C929.wem deleted file mode 100644 index f2fcaffc0..000000000 Binary files a/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/pickup_10C4C929.wem and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/putdown_10C4C929.wem b/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/putdown_10C4C929.wem deleted file mode 100644 index e4aab8409..000000000 Binary files a/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/putdown_10C4C929.wem and /dev/null differ diff --git a/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/unequip_10C4C929.wem b/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/unequip_10C4C929.wem deleted file mode 100644 index 65448a6ad..000000000 Binary files a/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/unequip_10C4C929.wem and /dev/null differ 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 d90409d98..1aff12ca4 100644 --- a/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu +++ b/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu @@ -233,6 +233,32 @@ 2.8 + + + + + + + + + + + + + + 0 + -200 + 5 + + + 1 + 0 + 37 + + + + + @@ -254,7 +280,7 @@ - + @@ -304,7 +330,7 @@ - + @@ -395,7 +421,7 @@ - + @@ -479,7 +505,7 @@ - + @@ -563,7 +589,7 @@ - + @@ -640,7 +666,7 @@ - + @@ -680,7 +706,7 @@ - + @@ -713,7 +739,7 @@ - + @@ -741,7 +767,7 @@ - + @@ -847,7 +873,7 @@ - + @@ -929,7 +955,7 @@ - + @@ -995,6 +1021,32 @@ 2.8 + + + + + + + + + + + + + + 0 + -200 + 5 + + + 1 + 0 + 37 + + + + + @@ -1016,7 +1068,7 @@ - + @@ -1066,7 +1118,7 @@ - + @@ -1157,7 +1209,7 @@ - + @@ -1241,7 +1293,7 @@ - + @@ -1325,7 +1377,7 @@ - + @@ -1402,7 +1454,7 @@ - + @@ -1443,7 +1495,7 @@ - + @@ -1613,7 +1665,7 @@ - + @@ -1679,6 +1731,32 @@ 2.8 + + + + + + + + + + + + + + 0 + -200 + 5 + + + 1 + 0 + 37 + + + + + @@ -1700,7 +1778,7 @@ - + @@ -1750,7 +1828,7 @@ - + @@ -1841,7 +1919,7 @@ - + @@ -1925,7 +2003,7 @@ - + @@ -2009,7 +2087,7 @@ - + @@ -2086,7 +2164,7 @@ - + @@ -2127,7 +2205,7 @@ - + @@ -2240,7 +2318,7 @@ - + @@ -2318,7 +2396,7 @@ - + @@ -2388,6 +2466,30 @@ -7.4 + + + + + + + + + + + + + 0 + -200 + 5 + + + 1 + 0 + 37 + + + + @@ -2428,7 +2530,7 @@ - + @@ -2438,7 +2540,7 @@ 0 - -0 + 0 5 @@ -2474,7 +2576,7 @@ - + @@ -2504,7 +2606,7 @@ - + @@ -2587,7 +2689,7 @@ - + @@ -2638,7 +2740,7 @@ - + @@ -2651,12 +2753,6 @@ -4.88957 5 - - 0.30069 - -12.2097 - 0 - Log1 - 0.49826 -200 diff --git a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache index 063113f47..d115b3cea 100644 --- a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache +++ b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache @@ -28,29 +28,34 @@ - + - + - + + + - + + + - + - - - + + + + diff --git a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings index 75545acca..5d86f421a 100644 --- a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings +++ b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings @@ -8,8 +8,12 @@ + + + + @@ -29,12 +33,13 @@ + - + - + @@ -65,14 +70,20 @@ - - - + + + - - + + - + + + + + + + diff --git a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.wproj b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.wproj index a55fcba31..df2953671 100644 --- a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.wproj +++ b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.wproj @@ -1,16 +1,16 @@ - + - - + + - - - - + + + + @@ -25,7 +25,10 @@ GeneratedSoundBanks\Windows\ - + + + + GeneratedSoundBanks\Mac\ @@ -56,7 +59,7 @@ - + @@ -148,7 +151,7 @@ - + @@ -666,6 +669,105 @@ + + + + + 0 + + + + + 10000 + + + + + 1 + + + + + 400 + + + + + 1 + + + + + 1 + + + + + 0.5 + + + + + 0 + + + + + -96 + + + + + 0 + + + + + True + + + + + False + + + + + 0 + + + + + 0 + + + + + 16 + + + + + -96 + + + + + 0 + + + + + 48000 + + + + + 0 + + + + @@ -905,6 +1007,85 @@ + + + + + 0 + + + + + 0 + + + + + 100 + + + + + 0 + + + + + 5 + + + + + 0.5 + + + + + 0 + + + + + 0 + + + + + 100 + + + + + 0 + + + + + 5 + + + + + 0.5 + + + + + 0 + + + + + True + + + + + False + + + + @@ -988,6 +1169,75 @@ + + + + + 0 + + + + + 0 + + + + + 100 + + + + + 20 + + + + + 10000 + + + + + 0.2 + + + + + True + + + + + 80 + + + + + 0.2 + + + + + False + + + + + 200 + + + + + 0.25 + + + + + 0 + + + + @@ -1137,6 +1387,75 @@ + + + + + 0 + + + + + 0 + + + + + 10 + + + + + 1 + + + + + 200 + + + + + 0 + + + + + 0 + + + + + 10 + + + + + 1 + + + + + 200 + + + + + 0 + + + + + True + + + + + False + + + + @@ -1151,6 +1470,205 @@ + + + + + 0 + + + + + 40 + + + + + 0 + + + + + 1000 + + + + + 160 + + + + + 0 + + + + + 0.5 + + + + + 0.2 + + + + + 0 + + + + + 0.5 + + + + + 0.2 + + + + + 0 + + + + + 0 + + + + + 1000 + + + + + 0 + + + + + 1000 + + + + + 0 + + + + + 0.2 + + + + + 0 + + + + + 0.2 + + + + + 0.2 + + + + + 3000 + + + + + 0.2 + + + + + 0 + + + + + 6 + + + + + 15000 + + + + + 0 + + + + + 1000 + + + + + 20000 + + + + + 0 + + + + + 0.5 + + + + + 0.2 + + + + + 0 + + + + + 0.5 + + + + + 0.2 + + + + + 0 + + + + + 1 + + + + + True + + + + + False + + + + @@ -1170,6 +1688,60 @@ + + + + + 1 + + + + + 0 + + + + + True + + + + + 0 + + + + + 1 + + + + + 0 + + + + + 100 + + + + + 0 + + + + + False + + + + + 3 + + + + @@ -2128,6 +2700,215 @@ + + + + + 0 + + + + + 0 + + + + + 100 + + + + + 0 + + + + + 5 + + + + + 0.5 + + + + + 0 + + + + + 0 + + + + + 100 + + + + + 0 + + + + + 5 + + + + + 0.5 + + + + + 0 + + + + + 0 + + + + + 100 + + + + + 0 + + + + + 5 + + + + + 0.5 + + + + + 0 + + + + + 0 + + + + + 100 + + + + + 0 + + + + + 5 + + + + + 0.5 + + + + + 0 + + + + + 0 + + + + + 100 + + + + + 0 + + + + + 5 + + + + + 0.5 + + + + + 0 + + + + + 0 + + + + + 100 + + + + + 0 + + + + + 5 + + + + + 0.5 + + + + + 0 + + + + + True + + + + + 5000 + + + + + 10000 + + + + + False + + + + @@ -6304,7 +7085,7 @@ - + @@ -6889,7 +7670,7 @@ - + @@ -7034,7 +7815,7 @@ - + @@ -7626,6 +8407,80 @@ + + + + + 0 + + + + + 0 + + + + + True + + + + + 0 + + + + + 0 + + + + + 0 + + + + + True + + + + + True + + + + + 0 + + + + + True + + + + + 100 + + + + + 0 + + + + + False + + + + + -96.3 + + + + @@ -7885,6 +8740,337 @@ + + + + + 1 + + + + + 0 + + + + + False + + + + + 0 + + + + + 1 + + + + + 0 + + + + + False + + + + + 0 + + + + + 10 + + + + + 0 + + + + + 0 + + + + + False + + + + + 0 + + + + + 0 + + + + + False + + + + + 0 + + + + + 0.5 + + + + + False + + + + + 0 + + + + + 10 + + + + + 5 + + + + + 1 + + + + + 0 + + + + + False + + + + + 0 + + + + + 0.25 + + + + + False + + + + + 0 + + + + + 0.5 + + + + + + + + + 1 + + + + + 1 + + + + + True + + + + + 0.5 + + + + + 0 + + + + + 0 + + + + + False + + + + + 0 + + + + + 0 + + + + + False + + + + + 0 + + + + + 10 + + + + + 0 + + + + + 1 + + + + + 1 + + + + + 0 + + + + + False + + + + + 0 + + + + + 0 + + + + + False + + + + + 10 + + + + + 0.5 + + + + + 0 + + + + + 1 + + + + + + + + + 440 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 10 + + + + + + + + + False + + + + + 440 + + + + + 0 + + + + + 10 + + + + + 1 + + + + @@ -8992,6 +10178,924 @@ + + + + + 100 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 10 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 1000 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 1 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 20000 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0.707 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 1 + + + + + 1 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 1000 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 256 + + + + + False + + + + + 100 + + + + + 100 + + + + + 100 + + + + + 100 + + + + + 1000 + + + + + 1000 + + + + + 1000 + + + + + 1000 + + + + + 20000 + + + + + 20000 + + + + + 20000 + + + + + 20000 + + + + + 1 + + + + + 1 + + + + + 0 + + + + + 0 + + + + + 5 + + + + + 5 + + + + + 9 + + + + + 9 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 16641 + + + + + 0 + + + + + 0 + + + + + False + + + + + 10 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 1 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + + + + 60 + + + + + 1 + + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + 0 + + + + + + + + + @@ -9585,7 +11689,7 @@ - + @@ -9606,7 +11710,7 @@ - + @@ -9627,7 +11731,7 @@ - + @@ -9648,7 +11752,7 @@ - + @@ -9669,7 +11773,7 @@ - + @@ -9690,7 +11794,7 @@ - + @@ -9709,70 +11813,70 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/Aetheria-Economy_WwiseProject/Events/Default Work Unit.wwu b/Aetheria-Economy_WwiseProject/Events/Default Work Unit.wwu index 4de09775e..1db3fbb64 100644 --- a/Aetheria-Economy_WwiseProject/Events/Default Work Unit.wwu +++ b/Aetheria-Economy_WwiseProject/Events/Default Work Unit.wwu @@ -102,57 +102,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Aetheria-Economy_WwiseProject/Events/Ship Audio.wwu b/Aetheria-Economy_WwiseProject/Events/Ship Audio.wwu new file mode 100644 index 000000000..ecf6720e0 --- /dev/null +++ b/Aetheria-Economy_WwiseProject/Events/Ship Audio.wwu @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Aetheria-Economy_WwiseProject/Events/test_sounds.wwu b/Aetheria-Economy_WwiseProject/Events/test_sounds.wwu deleted file mode 100644 index ac0d52ba1..000000000 --- a/Aetheria-Economy_WwiseProject/Events/test_sounds.wwu +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Aetheria-Economy_WwiseProject/Game Parameters/item_properties.wwu b/Aetheria-Economy_WwiseProject/Game Parameters/item_properties.wwu new file mode 100644 index 000000000..1db36c125 --- /dev/null +++ b/Aetheria-Economy_WwiseProject/Game Parameters/item_properties.wwu @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Aetheria-Economy_WwiseProject/Game Parameters/test_paramenters.wwu b/Aetheria-Economy_WwiseProject/Game Parameters/test_paramenters.wwu deleted file mode 100644 index 25249a49d..000000000 --- a/Aetheria-Economy_WwiseProject/Game Parameters/test_paramenters.wwu +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/Init.bnk b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/Init.bnk index 8bbaa2898..3e78f2779 100644 Binary files a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/Init.bnk and b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/Init.bnk differ diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/PluginInfo.xml b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/PluginInfo.xml index 94d6f006f..89ec46b2b 100644 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/PluginInfo.xml +++ b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/PluginInfo.xml @@ -1,6 +1,8 @@ + + diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/SoundbanksInfo.xml b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/SoundbanksInfo.xml index be5195d13..075867ade 100644 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/SoundbanksInfo.xml +++ b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/SoundbanksInfo.xml @@ -11,7 +11,27 @@ - + + \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 @@ -95,5 +115,88 @@ + + \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/.cache/Windows/SFX/Aetheia_Overheat_Alarm_D79FB2B7.wem b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/reactor_type01.bnk similarity index 99% rename from Aetheria-Economy_WwiseProject/.cache/Windows/SFX/Aetheia_Overheat_Alarm_D79FB2B7.wem rename to Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/reactor_type01.bnk index 45435f7c7..bf109ab05 100644 Binary files a/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/Aetheia_Overheat_Alarm_D79FB2B7.wem and b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/reactor_type01.bnk differ diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/reactor_type01.txt b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/reactor_type01.txt new file mode 100644 index 000000000..368ee4384 --- /dev/null +++ b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/reactor_type01.txt @@ -0,0 +1,18 @@ +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 new file mode 100644 index 000000000..de53f9d7a Binary files /dev/null and b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_large.bnk differ diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_large.txt b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_large.txt new file mode 100644 index 000000000..86ed17d7b --- /dev/null +++ b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_large.txt @@ -0,0 +1,31 @@ +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/.cache/Windows/SFX/Flamethrower SOUND_D79FB2B7.wem b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_medium.bnk similarity index 99% rename from Aetheria-Economy_WwiseProject/.cache/Windows/SFX/Flamethrower SOUND_D79FB2B7.wem rename to Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_medium.bnk index 04d3121f5..484d39ccb 100644 Binary files a/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/Flamethrower SOUND_D79FB2B7.wem and b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_medium.bnk differ diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_medium.txt b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_medium.txt new file mode 100644 index 000000000..997e66eb5 --- /dev/null +++ b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_medium.txt @@ -0,0 +1,29 @@ +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 new file mode 100644 index 000000000..fb40ea5fa Binary files /dev/null and b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_small.bnk differ diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_small.txt b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_small.txt new file mode 100644 index 000000000..fc2fd0559 --- /dev/null +++ b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/thruster_small.txt @@ -0,0 +1,29 @@ +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/.cache/Windows/SFX/Aetheria_Wormhole_travel_10C4C929.wem b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/wormhole.bnk similarity index 72% rename from Aetheria-Economy_WwiseProject/.cache/Windows/SFX/Aetheria_Wormhole_travel_10C4C929.wem rename to Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/wormhole.bnk index 3c4b75b14..5fe7f6ce6 100644 Binary files a/Aetheria-Economy_WwiseProject/.cache/Windows/SFX/Aetheria_Wormhole_travel_10C4C929.wem and b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/wormhole.bnk differ diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/wormhole.txt b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/wormhole.txt new file mode 100644 index 000000000..05e5c6f1d --- /dev/null +++ b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Mac/wormhole.txt @@ -0,0 +1,10 @@ +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 index f5e119f13..5ac293230 100644 Binary files a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/Init.bnk and b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/Init.bnk differ diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/SoundbanksInfo.xml b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/SoundbanksInfo.xml index a987b05ee..8342dacb8 100644 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/SoundbanksInfo.xml +++ b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/SoundbanksInfo.xml @@ -1,41 +1,42 @@ - /Users/panagiotis/Library/Application Support/Wwise2019/Bottles/Wwise2019x64/dosdevices/y:/Documents/Unity/repository/Aetheria-Economy/Aetheria-Economy_WwiseProject/ - /Users/panagiotis/Library/Application Support/Wwise2019/Bottles/Wwise2019x64/dosdevices/y:/Documents/Unity/repository/Aetheria-Economy/Aetheria-Economy_WwiseProject/.cache/Windows/ - /Users/panagiotis/Library/Application Support/Wwise2019/Bottles/Wwise2019x64/dosdevices/y:/Documents/Unity/repository/Aetheria-Economy/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/ + 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\ - /Users/panagiotis/Library/Application Support/Wwise2019/Bottles/Wwise2019x64/dosdevices/y:/Documents/Unity/repository/Aetheria-Economy/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows + E:\Projects\Aetheria-Economy\Aetheria-Economy_WwiseProject\GeneratedSoundBanks\Windows - - \SoundBanks\Default Work Unit\spacehsip\Reactor_type\Type_01\reactor_type01 + + \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 + SFX\Aetheia_Overheat_Alarm_D79FB2B7.wem - - + + + - + Init Init Init.bnk - + \SoundBanks\Default Work Unit\UI UI UI.bnk @@ -44,7 +45,7 @@ Aetheria_docking_spaceship_V2.1.wav - SFX/Aetheria_docking_spaceship_V2.1_10C4C929.wem + SFX\Aetheria_docking_spaceship_V2.1_10C4C929.wem @@ -52,7 +53,7 @@ blip2.wav - SFX/blip2_10C4C929.wem + SFX\blip2_10C4C929.wem @@ -60,7 +61,7 @@ putdown.wav - SFX/putdown_10C4C929.wem + SFX\putdown_10C4C929.wem @@ -68,7 +69,7 @@ equip.wav - SFX/equip_10C4C929.wem + SFX\equip_10C4C929.wem @@ -76,7 +77,7 @@ pickup.wav - SFX/pickup_10C4C929.wem + SFX\pickup_10C4C929.wem @@ -84,7 +85,7 @@ blip2.wav - SFX/blip2_10C4C929.wem + SFX\blip2_10C4C929.wem @@ -92,7 +93,7 @@ blip1.wav - SFX/blip1_10C4C929.wem + SFX\blip1_10C4C929.wem @@ -100,7 +101,7 @@ Aetheria_undocking_spaceship_V2.1.wav - SFX/Aetheria_undocking_spaceship_V2.1_10C4C929.wem + SFX\Aetheria_undocking_spaceship_V2.1_10C4C929.wem @@ -108,13 +109,13 @@ unequip.wav - SFX/unequip_10C4C929.wem + SFX\unequip_10C4C929.wem - + \SoundBanks\Default Work Unit\wormhole\wormhole wormhole wormhole.bnk @@ -126,71 +127,75 @@ Aetheria_Wormhole_travel_jumpin.wav - SFX/Aetheria_Wormhole_travel_jumpin_3CA8C70E.wem + SFX\Aetheria_Wormhole_travel_jumpin_3CA8C70E.wem Aetheria_Wormhole_travel.wav - SFX/Aetheria_Wormhole_travel_10C4C929.wem + SFX\Aetheria_Wormhole_travel_10C4C929.wem Aetheria_Wormhole_travel_jumpout.wav - SFX/Aetheria_Wormhole_travel_jumpout_8FC987B8.wem + SFX\Aetheria_Wormhole_travel_jumpout_8FC987B8.wem - - \SoundBanks\Default Work Unit\spacehsip\Thruster_type\Type_01\thruster_small + + \SoundBanks\Default Work Unit\Ship\Thruster_type\Type_01\thruster_small thruster_small thruster_small.bnk - + Flamethrower SOUND.wav - SFX/Flamethrower SOUND_D79FB2B7.wem + SFX\Flamethrower SOUND_D79FB2B7.wem - - + + + - - \SoundBanks\Default Work Unit\spacehsip\Thruster_type\Type_01\thruster_large + + \SoundBanks\Default Work Unit\Ship\Thruster_type\Type_01\thruster_large thruster_large thruster_large.bnk - - + + Flamethrower SOUND.wav - SFX/Flamethrower SOUND_D79FB2B7.wem + SFX\Flamethrower SOUND_D79FB2B7.wem - - + + + + - - \SoundBanks\Default Work Unit\spacehsip\Thruster_type\Type_01\thruster_medium + + \SoundBanks\Default Work Unit\Ship\Thruster_type\Type_01\thruster_medium thruster_medium thruster_medium.bnk - + Flamethrower SOUND.wav - SFX/Flamethrower SOUND_D79FB2B7.wem + SFX\Flamethrower SOUND_D79FB2B7.wem - - + + + diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/reactor_type01.bnk b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/reactor_type01.bnk index cfd22ed44..bf109ab05 100644 Binary files a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/reactor_type01.bnk and b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/reactor_type01.bnk differ diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/reactor_type01.txt b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/reactor_type01.txt index a92fec1ef..db7057564 100644 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/reactor_type01.txt +++ b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/reactor_type01.txt @@ -1,10 +1,11 @@ Event ID Name Wwise Object Path Notes - 108700025 reactor_type01 \Default Work Unit\reactor_type01 - 937212177 test_spaship_full_unit \test_sounds\test_spaship_full_unit + 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 - 1438681362 reactor_temp \test_paramenters\reactor_temp - 2187658529 reactor_duravility \test_paramenters\reactor_duravility + 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 @@ -13,5 +14,5 @@ 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 Y:\Documents\Unity\repository\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 + 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 index 9fc69e372..de53f9d7a 100644 Binary files a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_large.bnk and b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_large.bnk differ diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_large.txt b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_large.txt index 3929c583b..47a8989b0 100644 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_large.txt +++ b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_large.txt @@ -1,13 +1,15 @@ Event ID Name Wwise Object Path Notes - 937212177 test_spaship_full_unit \test_sounds\test_spaship_full_unit - 2370087034 thruster_large \Default Work Unit\thruster_large + 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 - 652189180 thruster_durability \test_paramenters\thruster_durability - 3387986107 spaceship_velocity \test_paramenters\spaceship_velocity + 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 New Modulator LFO_low_dur \Default Work Unit\New Modulator LFO_low_dur + 995081500 LFO_durability \Default Work Unit\LFO_durability Modulator Envelope ID Name Wwise Object Path Notes 216769872 Modulator Envelope (Custom) @@ -25,5 +27,5 @@ Source plug-ins ID Name Type Wwise Object Path Notes 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 Y:\Documents\Unity\repository\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 + 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 index d0147d987..484d39ccb 100644 Binary files a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_medium.bnk and b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_medium.bnk differ diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_medium.txt b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_medium.txt index 8a13c5b6c..102680b3c 100644 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_medium.txt +++ b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_medium.txt @@ -1,12 +1,13 @@ Event ID Name Wwise Object Path Notes - 2528260676 thruster_medium \Default Work Unit\thruster_medium + 2528260676 thruster_medium \Ship Audio\thruster_medium Game Parameter ID Name Wwise Object Path Notes - 652189180 thruster_durability \test_paramenters\thruster_durability - 3387986107 spaceship_velocity \test_paramenters\spaceship_velocity + 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 New Modulator LFO_low_dur \Default Work Unit\New Modulator LFO_low_dur + 995081500 LFO_durability \Default Work Unit\LFO_durability Modulator Envelope ID Name Wwise Object Path Notes 218240564 Modulator Envelope (Custom) @@ -24,5 +25,5 @@ Source plug-ins ID Name Type Wwise Object Path Notes 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 Y:\Documents\Unity\repository\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 + 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 index 326bc2fd4..fb40ea5fa 100644 Binary files a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_small.bnk and b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_small.bnk differ diff --git a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_small.txt b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_small.txt index 0849ec73d..4fc506eb8 100644 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_small.txt +++ b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/thruster_small.txt @@ -1,12 +1,13 @@ Event ID Name Wwise Object Path Notes - 1944968294 thruster_small \Default Work Unit\thruster_small + 1944968294 thruster_small \Ship Audio\thruster_small Game Parameter ID Name Wwise Object Path Notes - 652189180 thruster_durability \test_paramenters\thruster_durability - 3387986107 spaceship_velocity \test_paramenters\spaceship_velocity + 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 New Modulator LFO_low_dur \Default Work Unit\New Modulator LFO_low_dur + 995081500 LFO_durability \Default Work Unit\LFO_durability Modulator Envelope ID Name Wwise Object Path Notes 27468274 Modulator Envelope (Custom) @@ -24,5 +25,5 @@ Source plug-ins ID Name Type Wwise Object Path Notes 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 Y:\Documents\Unity\repository\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 + 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.txt b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/wormhole.txt index a9c322e71..2e3e90190 100644 --- a/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/wormhole.txt +++ b/Aetheria-Economy_WwiseProject/GeneratedSoundBanks/Windows/wormhole.txt @@ -4,7 +4,7 @@ Event ID Name Wwise Object Path Notes 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 Y:\Documents\Unity\repository\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 Y:\Documents\Unity\repository\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 Y:\Documents\Unity\repository\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 + 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/Modulators/Default Work Unit.wwu b/Aetheria-Economy_WwiseProject/Modulators/Default Work Unit.wwu index a16de5318..8e8f719cb 100644 --- a/Aetheria-Economy_WwiseProject/Modulators/Default Work Unit.wwu +++ b/Aetheria-Economy_WwiseProject/Modulators/Default Work Unit.wwu @@ -10,7 +10,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -80,12 +80,12 @@ 0 - 23.93823 + 20 5 1 - -0 + 0 37 @@ -98,7 +98,7 @@ - + @@ -108,7 +108,7 @@ 0 - 3.59737 + 6 5 diff --git a/Aetheria-Economy_WwiseProject/SoundBanks/Default Work Unit.wwu b/Aetheria-Economy_WwiseProject/SoundBanks/Default Work Unit.wwu index c93d7d5b7..7966e3f92 100644 --- a/Aetheria-Economy_WwiseProject/SoundBanks/Default Work Unit.wwu +++ b/Aetheria-Economy_WwiseProject/SoundBanks/Default Work Unit.wwu @@ -18,7 +18,7 @@ - + diff --git a/Aetheria-Economy_WwiseProject/Switches/Default Work Unit.wwu b/Aetheria-Economy_WwiseProject/Switches/Default Work Unit.wwu index 15863d6df..de00317ba 100644 --- a/Aetheria-Economy_WwiseProject/Switches/Default Work Unit.wwu +++ b/Aetheria-Economy_WwiseProject/Switches/Default Work Unit.wwu @@ -1,16 +1,6 @@ - - - - - - - - - - - + diff --git a/Assets/BGM.mixer b/Assets/BGM.mixer deleted file mode 100644 index 81806c45f..000000000 --- a/Assets/BGM.mixer +++ /dev/null @@ -1,172 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!244 &-9004461515939757133 -AudioMixerEffectController: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_EffectID: b2ed06905f6eac24da74c25f09426340 - m_EffectName: Attenuation - m_MixLevel: 2b7519561da34db4aa07a1270e3e7b32 - m_Parameters: [] - m_SendTarget: {fileID: 0} - m_EnableWetMix: 0 - m_Bypass: 0 ---- !u!243 &-4850697152304757985 -AudioMixerGroupController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Ambient - m_AudioMixer: {fileID: 24100000} - m_GroupID: 9764340bebfac4746a92399112954474 - m_Children: [] - m_Volume: a5787336378e972489b61f7f10dd3bbf - m_Pitch: 84c0da0bed49d074da2c2a1739fc0423 - m_Send: 00000000000000000000000000000000 - m_Effects: - - {fileID: -9004461515939757133} - m_UserColorIndex: 0 - m_Mute: 0 - m_Solo: 0 - m_BypassEffects: 0 ---- !u!244 &-4604239232645738977 -AudioMixerEffectController: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_EffectID: d750d8702ca126b41838024cd85b5814 - m_EffectName: Attenuation - m_MixLevel: 4f6917ef5cb76e3469b85371872bbcb8 - m_Parameters: [] - m_SendTarget: {fileID: 0} - m_EnableWetMix: 0 - m_Bypass: 0 ---- !u!245 &-603028713283386147 -AudioMixerSnapshotController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Ambient - m_AudioMixer: {fileID: 24100000} - m_SnapshotID: 04e5ad01f0a1d7c4495ea64237e715ec - m_FloatValues: - 9d3125547e768e948a1677655841e667: -60 - a5787336378e972489b61f7f10dd3bbf: 0 - m_TransitionOverrides: - 9d3125547e768e948a1677655841e667: 2 - a5787336378e972489b61f7f10dd3bbf: 3 ---- !u!241 &24100000 -AudioMixerController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: BGM - m_OutputGroup: {fileID: 0} - m_MasterGroup: {fileID: 24300002} - m_Snapshots: - - {fileID: 24500006} - - {fileID: 4951561632732636846} - - {fileID: -603028713283386147} - m_StartSnapshot: {fileID: -603028713283386147} - m_SuspendThreshold: -80 - m_EnableSuspend: 1 - m_UpdateMode: 0 - m_ExposedParameters: [] - m_AudioMixerGroupViews: - - guids: - - b23f0c944d93514408fb6ee9a25fbff0 - - 9764340bebfac4746a92399112954474 - - 05743d679c7de904bb58116993bed9ef - name: View - m_CurrentViewIndex: 0 - m_TargetSnapshot: {fileID: -603028713283386147} ---- !u!243 &24300002 -AudioMixerGroupController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Master - m_AudioMixer: {fileID: 24100000} - m_GroupID: b23f0c944d93514408fb6ee9a25fbff0 - m_Children: - - {fileID: -4850697152304757985} - - {fileID: 4584421116988752864} - m_Volume: 478a12bd2d6d3b64abd462d715ba3e7b - m_Pitch: 6ffae4b8e0d7a2440b5d64bd30124684 - m_Send: 00000000000000000000000000000000 - m_Effects: - - {fileID: 24400004} - m_UserColorIndex: 0 - m_Mute: 0 - m_Solo: 0 - m_BypassEffects: 0 ---- !u!244 &24400004 -AudioMixerEffectController: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_EffectID: 5c30de4818289884ca29eee3b58c0974 - m_EffectName: Attenuation - m_MixLevel: 44a47a63d37fb4f47b1aabfeb7e57920 - m_Parameters: [] - m_SendTarget: {fileID: 0} - m_EnableWetMix: 0 - m_Bypass: 0 ---- !u!245 &24500006 -AudioMixerSnapshotController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Snapshot - m_AudioMixer: {fileID: 24100000} - m_SnapshotID: 689ad3d0463365c47a63b89cf2c31324 - m_FloatValues: - 9d3125547e768e948a1677655841e667: -80 - a5787336378e972489b61f7f10dd3bbf: -80 - m_TransitionOverrides: {} ---- !u!243 &4584421116988752864 -AudioMixerGroupController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Combat - m_AudioMixer: {fileID: 24100000} - m_GroupID: 05743d679c7de904bb58116993bed9ef - m_Children: [] - m_Volume: 9d3125547e768e948a1677655841e667 - m_Pitch: 5717438562307a24daee6dc36c4bed57 - m_Send: 00000000000000000000000000000000 - m_Effects: - - {fileID: -4604239232645738977} - m_UserColorIndex: 0 - m_Mute: 0 - m_Solo: 0 - m_BypassEffects: 0 ---- !u!245 &4951561632732636846 -AudioMixerSnapshotController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Combat - m_AudioMixer: {fileID: 24100000} - m_SnapshotID: 5e8b9973e0ba4f54db58bad1579bf0b5 - m_FloatValues: - 9d3125547e768e948a1677655841e667: 0 - a5787336378e972489b61f7f10dd3bbf: -60 - m_TransitionOverrides: - 9d3125547e768e948a1677655841e667: 3 - a5787336378e972489b61f7f10dd3bbf: 2 diff --git a/Assets/Materials/UI/Entrance.mat b/Assets/Materials/UI/Entrance.mat index 13455373e..334ddeb0f 100644 --- a/Assets/Materials/UI/Entrance.mat +++ b/Assets/Materials/UI/Entrance.mat @@ -8,14 +8,16 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Entrance - m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 + m_Shader: {fileID: 4800000, guid: f69be63d97f3ffe499bc8ad9f5a104c6, type: 3} + m_ShaderKeywords: _ALPHABLEND_ON + m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - ALWAYS m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -56,25 +58,44 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: + - _BlendOp: 0 - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0 + - _DstBlend: 10 + - _EmissionEnabled: 0 + - _FlipbookMode: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 - _InvFade: 1 + - _LightingEnabled: 0 - _Metallic: 0 - - _Mode: 0 + - _Mode: 2 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _TintColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Materials/UI/Galaxy Zone Background Primary.mat b/Assets/Materials/UI/Galaxy Zone Background Primary.mat index b30692781..ddadafc39 100644 --- a/Assets/Materials/UI/Galaxy Zone Background Primary.mat +++ b/Assets/Materials/UI/Galaxy Zone Background Primary.mat @@ -8,14 +8,16 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Galaxy Zone Background Primary - m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 + m_Shader: {fileID: 4800000, guid: f69be63d97f3ffe499bc8ad9f5a104c6, type: 3} + m_ShaderKeywords: _ALPHABLEND_ON + m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - ALWAYS m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -56,25 +58,44 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: + - _BlendOp: 0 - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0 + - _DstBlend: 10 + - _EmissionEnabled: 0 + - _FlipbookMode: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 - _InvFade: 1 + - _LightingEnabled: 0 - _Metallic: 0 - - _Mode: 0 + - _Mode: 2 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _TintColor: {r: 0.5283019, g: 0.5283019, b: 0.5283019, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Materials/UI/Galaxy Zone Background Secondary.mat b/Assets/Materials/UI/Galaxy Zone Background Secondary.mat index ef29c2d14..5dc107c8f 100644 --- a/Assets/Materials/UI/Galaxy Zone Background Secondary.mat +++ b/Assets/Materials/UI/Galaxy Zone Background Secondary.mat @@ -8,14 +8,16 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Galaxy Zone Background Secondary - m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 + m_Shader: {fileID: 4800000, guid: f69be63d97f3ffe499bc8ad9f5a104c6, type: 3} + m_ShaderKeywords: _ALPHABLEND_ON + m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - ALWAYS m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -56,25 +58,44 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: + - _BlendOp: 0 - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0 + - _DstBlend: 10 + - _EmissionEnabled: 0 + - _FlipbookMode: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 - _InvFade: 1 + - _LightingEnabled: 0 - _Metallic: 0 - - _Mode: 0 + - _Mode: 2 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorAddSubDiff: {r: -1, g: 1, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _TintColor: {r: 0.6226415, g: 0.6226415, b: 0.6226415, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Materials/UI/Galaxy Zone.mat b/Assets/Materials/UI/Galaxy Zone.mat index fbeedb0ad..8c30359b4 100644 --- a/Assets/Materials/UI/Galaxy Zone.mat +++ b/Assets/Materials/UI/Galaxy Zone.mat @@ -8,14 +8,16 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Galaxy Zone - m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 + m_Shader: {fileID: 4800000, guid: f69be63d97f3ffe499bc8ad9f5a104c6, type: 3} + m_ShaderKeywords: _ALPHABLEND_ON + m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - ALWAYS m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -56,25 +58,44 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: + - _BlendOp: 0 - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0 + - _DstBlend: 10 + - _EmissionEnabled: 0 + - _FlipbookMode: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 - _InvFade: 1 + - _LightingEnabled: 0 - _Metallic: 0 - - _Mode: 0 + - _Mode: 2 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _UVSec: 0 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _TintColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Materials/UI/Galaxy.mat b/Assets/Materials/UI/Galaxy.mat index 613fe389f..e20188017 100644 --- a/Assets/Materials/UI/Galaxy.mat +++ b/Assets/Materials/UI/Galaxy.mat @@ -79,6 +79,7 @@ Material: - StarExponent: 12 - Twist: 7.85 - TwistPower: 2 + - Zoom: 1 - _BumpScale: 1 - _ColorMask: 15 - _Cutoff: 0.5 @@ -102,6 +103,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: + - Extents: {r: 0, g: 0, b: 1, a: 1} - _CloudColor: {r: 0.050980393, g: 0.4509804, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/UI/Map Gravity Lines.mat b/Assets/Materials/UI/Map Gravity Lines.mat index e6bd7e7f0..749d876be 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: 8.580017 + - _Scale: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Materials/UI/Sector Map UI.mat b/Assets/Materials/UI/Sector Map UI.mat new file mode 100644 index 000000000..79a2c6a30 --- /dev/null +++ b/Assets/Materials/UI/Sector Map UI.mat @@ -0,0 +1,90 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Sector Map UI + m_Shader: {fileID: 4800000, guid: 16ca943590e909145a2f5b7aaeef334e, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailGamma: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/BGM.mixer.meta b/Assets/Materials/UI/Sector Map UI.mat.meta similarity index 64% rename from Assets/BGM.mixer.meta rename to Assets/Materials/UI/Sector Map UI.mat.meta index 0a683bcb2..a298dcff9 100644 --- a/Assets/BGM.mixer.meta +++ b/Assets/Materials/UI/Sector Map UI.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: d220a87cb27315048975cce74c6d84b6 +guid: bc587f27303721a449ce72b1c01c0af6 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 24100000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Materials/UI/Zone Link.mat b/Assets/Materials/UI/Zone Link.mat index 56f4965b8..070bddb99 100644 --- a/Assets/Materials/UI/Zone Link.mat +++ b/Assets/Materials/UI/Zone Link.mat @@ -8,14 +8,16 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Zone Link - m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: + m_Shader: {fileID: 4800000, guid: f69be63d97f3ffe499bc8ad9f5a104c6, type: 3} + m_ShaderKeywords: _ALPHAPREMULTIPLY_ON m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - ALWAYS m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -69,7 +71,7 @@ Material: - _DistortionEnabled: 0 - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - - _DstBlend: 0 + - _DstBlend: 10 - _EmissionEnabled: 0 - _FlipbookMode: 0 - _GlossMapScale: 1 @@ -78,7 +80,7 @@ Material: - _InvFade: 1 - _LightingEnabled: 0 - _Metallic: 0 - - _Mode: 0 + - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 @@ -88,7 +90,7 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Plugins/Google.Protobuf/lib.meta b/Assets/Plugins/Google.Protobuf/lib.meta deleted file mode 100644 index d415abf6d..000000000 --- a/Assets/Plugins/Google.Protobuf/lib.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e4ab5b3f8a676a84a9eb3ffcf1e8138d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Google.Protobuf/lib/net45.meta b/Assets/Plugins/Google.Protobuf/lib/net45.meta deleted file mode 100644 index b7670b6f7..000000000 --- a/Assets/Plugins/Google.Protobuf/lib/net45.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4c50e24955a9a294b99ad097ae2e252a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll b/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll deleted file mode 100644 index b378d5e93..000000000 --- a/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd06dd3ce2930529ea2571668f91c1d42e7cb3017b4ea84a1e3350af697283ec -size 332272 diff --git a/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll.meta b/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll.meta deleted file mode 100644 index d6a537838..000000000 --- a/Assets/Plugins/Google.Protobuf/lib/net45/Google.Protobuf.dll.meta +++ /dev/null @@ -1,30 +0,0 @@ -fileFormatVersion: 2 -guid: 286edf5aec6aae64697e5e8b7ab9b60e -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Geonames/bad-words.txt b/Assets/Resources/Geonames/bad-words.txt new file mode 100644 index 000000000..5013fea9d --- /dev/null +++ b/Assets/Resources/Geonames/bad-words.txt @@ -0,0 +1,1384 @@ + +abbo +abo +abortion +abuse +addict +addicts +adult +africa +african +alla +allah +alligatorbait +amateur +american +anal +analannie +analsex +angie +angry +anus +arab +arabs +areola +argie +aroused +arse +arsehole +asian +ass +assassin +assassinate +assassination +assault +assbagger +assblaster +assclown +asscowboy +asses +assfuck +assfucker +asshat +asshole +assholes +asshore +assjockey +asskiss +asskisser +assklown +asslick +asslicker +asslover +assman +assmonkey +assmunch +assmuncher +asspacker +asspirate +asspuppies +assranger +asswhore +asswipe +athletesfoot +attack +australian +babe +babies +backdoor +backdoorman +backseat +badfuck +balllicker +balls +ballsack +banging +baptist +barelylegal +barf +barface +barfface +bast +bastard +bazongas +bazooms +beaner +beast +beastality +beastial +beastiality +beatoff +beat-off +beatyourmeat +beaver +bestial +bestiality +bi +biatch +bible +bicurious +bigass +bigbastard +bigbutt +bigger +bisexual +bi-sexual +bitch +bitcher +bitches +bitchez +bitchin +bitching +bitchslap +bitchy +biteme +black +blackman +blackout +blacks +blind +blow +blowjob +boang +bogan +bohunk +bollick +bollock +bomb +bombers +bombing +bombs +bomd +bondage +boner +bong +boob +boobies +boobs +booby +boody +boom +boong +boonga +boonie +booty +bootycall +bountybar +bra +brea5t +breast +breastjob +breastlover +breastman +brothel +bugger +buggered +buggery +bullcrap +bulldike +bulldyke +bullshit +bumblefuck +bumfuck +bunga +bunghole +buried +burn +butchbabes +butchdike +butchdyke +butt +buttbang +butt-bang +buttface +buttfuck +butt-fuck +buttfucker +butt-fucker +buttfuckers +butt-fuckers +butthead +buttman +buttmunch +buttmuncher +buttpirate +buttplug +buttstain +byatch +cacker +cameljockey +cameltoe +canadian +cancer +carpetmuncher +carruth +catholic +catholics +cemetery +chav +cherrypopper +chickslick +children's +chin +chinaman +chinamen +chinese +chink +chinky +choad +chode +christ +christian +church +cigarette +cigs +clamdigger +clamdiver +clit +clitoris +clogwog +cocaine +cock +cockblock +cockblocker +cockcowboy +cockfight +cockhead +cockknob +cocklicker +cocklover +cocknob +cockqueen +cockrider +cocksman +cocksmith +cocksmoker +cocksucer +cocksuck +cocksucked +cocksucker +cocksucking +cocktail +cocktease +cocky +cohee +coitus +color +colored +coloured +commie +communist +condom +conservative +conspiracy +coolie +cooly +coon +coondog +copulate +cornhole +corruption +cra5h +crabs +crack +crackpipe +crackwhore +crack-whore +crap +crapola +crapper +crappy +crash +creamy +crime +crimes +criminal +criminals +crotch +crotchjockey +crotchmonkey +crotchrot +cum +cumbubble +cumfest +cumjockey +cumm +cummer +cumming +cumquat +cumqueen +cumshot +cunilingus +cunillingus +cunn +cunnilingus +cunntt +cunt +cunteyed +cuntfuck +cuntfucker +cuntlick +cuntlicker +cuntlicking +cuntsucker +cybersex +cyberslimer +dago +dahmer +dammit +damn +damnation +damnit +darkie +darky +datnigga +dead +deapthroat +death +deepthroat +defecate +dego +demon +deposit +desire +destroy +deth +devil +devilworshipper +dick +dickbrain +dickforbrains +dickhead +dickless +dicklick +dicklicker +dickman +dickwad +dickweed +diddle +die +died +dies +dike +dildo +dingleberry +dink +dipshit +dipstick +dirty +disease +diseases +disturbed +dive +dix +dixiedike +dixiedyke +doggiestyle +doggystyle +dong +doodoo +doo-doo +doom +dope +dragqueen +dragqween +dripdick +drug +drunk +drunken +dumb +dumbass +dumbbitch +dumbfuck +dyefly +dyke +easyslut +eatballs +eatme +eatpussy +ecstacy +ejaculate +ejaculated +ejaculating +ejaculation +enema +enemy +erect +erection +ero +escort +ethiopian +ethnic +european +evl +excrement +execute +executed +execution +executioner +explosion +facefucker +faeces +fag +fagging +faggot +fagot +failed +failure +fairies +fairy +faith +fannyfucker +fart +farted +farting +farty +fastfuck +fat +fatah +fatass +fatfuck +fatfucker +fatso +fckcum +fear +feces +felatio +felch +felcher +felching +fellatio +feltch +feltcher +feltching +fetish +fight +filipina +filipino +fingerfood +fingerfuck +fingerfucked +fingerfucker +fingerfuckers +fingerfucking +fire +firing +fister +fistfuck +fistfucked +fistfucker +fistfucking +fisting +flange +flasher +flatulence +floo +flydie +flydye +fok +fondle +footaction +footfuck +footfucker +footlicker +footstar +fore +foreskin +forni +fornicate +foursome +fourtwenty +fraud +freakfuck +freakyfucker +freefuck +fu +fubar +fuc +fucck +fuck +fucka +fuckable +fuckbag +fuckbuddy +fucked +fuckedup +fucker +fuckers +fuckface +fuckfest +fuckfreak +fuckfriend +fuckhead +fuckher +fuckin +fuckina +fucking +fuckingbitch +fuckinnuts +fuckinright +fuckit +fuckknob +fuckme +fuckmehard +fuckmonkey +fuckoff +fuckpig +fucks +fucktard +fuckwhore +fuckyou +fudgepacker +fugly +fuk +fuks +funeral +funfuck +fungus +fuuck +gangbang +gangbanged +gangbanger +gangsta +gatorbait +gay +gaymuthafuckinwhore +gaysex +geez +geezer +geni +genital +german +getiton +gin +ginzo +gipp +girls +givehead +glazeddonut +gob +god +godammit +goddamit +goddammit +goddamn +goddamned +goddamnes +goddamnit +goddamnmuthafucker +goldenshower +gonorrehea +gonzagas +gook +gotohell +goy +goyim +greaseball +gringo +groe +gross +grostulation +gubba +gummer +gun +gyp +gypo +gypp +gyppie +gyppo +gyppy +hamas +handjob +hapa +harder +hardon +harem +headfuck +headlights +hebe +heeb +hell +henhouse +heroin +herpes +heterosexual +hijack +hijacker +hijacking +hillbillies +hindoo +hiscock +hitler +hitlerism +hitlerist +hiv +ho +hobo +hodgie +hoes +hole +holestuffer +homicide +homo +homobangers +homosexual +honger +honk +honkers +honkey +honky +hook +hooker +hookers +hooters +hore +hork +horn +horney +horniest +horny +horseshit +hosejob +hoser +hostage +hotdamn +hotpussy +hottotrot +hummer +husky +hussy +hustler +hymen +hymie +iblowu +idiot +ikey +illegal +incest +insest +intercourse +interracial +intheass +inthebuff +israel +israeli +israel's +italiano +itch +jackass +jackoff +jackshit +jacktheripper +jade +jap +japanese +japcrap +jebus +jeez +jerkoff +jesus +jesuschrist +jew +jewish +jiga +jigaboo +jigg +jigga +jiggabo +jigger +jiggy +jihad +jijjiboo +jimfish +jism +jiz +jizim +jizjuice +jizm +jizz +jizzim +jizzum +joint +juggalo +jugs +junglebunny +kaffer +kaffir +kaffre +kafir +kanake +kid +kigger +kike +kill +killed +killer +killing +kills +kink +kinky +kissass +kkk +knife +knockers +kock +kondum +koon +kotex +krap +krappy +kraut +kum +kumbubble +kumbullbe +kummer +kumming +kumquat +kums +kunilingus +kunnilingus +kunt +ky +kyke +lactate +laid +lapdance +latin +lesbain +lesbayn +lesbian +lesbin +lesbo +lez +lezbe +lezbefriends +lezbo +lezz +lezzo +liberal +libido +licker +lickme +lies +limey +limpdick +limy +lingerie +liquor +livesex +loadedgun +lolita +looser +loser +lotion +lovebone +lovegoo +lovegun +lovejuice +lovemuscle +lovepistol +loverocket +lowlife +lsd +lubejob +lucifer +luckycammeltoe +lugan +lynch +macaca +mad +mafia +magicwand +mams +manhater +manpaste +marijuana +mastabate +mastabater +masterbate +masterblaster +mastrabator +masturbate +masturbating +mattressprincess +meatbeatter +meatrack +meth +mexican +mgger +mggor +mickeyfinn +mideast +milf +minority +mockey +mockie +mocky +mofo +moky +moles +molest +molestation +molester +molestor +moneyshot +mooncricket +mormon +moron +moslem +mosshead +mothafuck +mothafucka +mothafuckaz +mothafucked +mothafucker +mothafuckin +mothafucking +mothafuckings +motherfuck +motherfucked +motherfucker +motherfuckin +motherfucking +motherfuckings +motherlovebone +muff +muffdive +muffdiver +muffindiver +mufflikcer +mulatto +muncher +munt +murder +murderer +muslim +naked +narcotic +nasty +nastybitch +nastyho +nastyslut +nastywhore +nazi +necro +negro +negroes +negroid +negro's +nig +niger +nigerian +nigerians +nigg +nigga +niggah +niggaracci +niggard +niggarded +niggarding +niggardliness +niggardliness's +niggardly +niggards +niggard's +niggaz +nigger +niggerhead +niggerhole +niggers +nigger's +niggle +niggled +niggles +niggling +nigglings +niggor +niggur +niglet +nignog +nigr +nigra +nigre +nip +nipple +nipplering +nittit +nlgger +nlggor +nofuckingway +nook +nookey +nookie +noonan +nooner +nude +nudger +nuke +nutfucker +nymph +ontherag +oral +orga +orgasim +orgasm +orgies +orgy +osama +paki +palesimian +palestinian +pansies +pansy +panti +panties +payo +pearlnecklace +peck +pecker +peckerwood +pee +peehole +pee-pee +peepshow +peepshpw +pendy +penetration +peni5 +penile +penis +penises +penthouse +period +perv +phonesex +phuk +phuked +phuking +phukked +phukking +phungky +phuq +pi55 +picaninny +piccaninny +pickaninny +piker +pikey +piky +pimp +pimped +pimper +pimpjuic +pimpjuice +pimpsimp +pindick +piss +pissed +pisser +pisses +pisshead +pissin +pissing +pissoff +pistol +pixie +pixy +playboy +playgirl +pocha +pocho +pocketpool +pohm +polack +pom +pommie +pommy +poo +poon +poontang +poop +pooper +pooperscooper +pooping +poorwhitetrash +popimp +porchmonkey +porn +pornflick +pornking +porno +pornography +pornprincess +pot +poverty +premature +pric +prick +prickhead +primetime +propaganda +pros +prostitute +protestant +pu55i +pu55y +pube +pubic +pubiclice +pud +pudboy +pudd +puddboy +puke +puntang +purinapricness +puss +pussie +pussies +pussy +pussycat +pussyeater +pussyfucker +pussylicker +pussylips +pussylover +pussypounder +pusy +quashie +queef +queer +quickie +quim +ra8s +rabbi +racial +racist +radical +radicals +raghead +randy +rape +raped +raper +rapist +rearend +rearentry +rectum +redlight +redneck +reefer +reestie +refugee +reject +remains +rentafuck +republican +rere +retard +retarded +ribbed +rigger +rimjob +rimming +roach +robber +roundeye +rump +russki +russkie +sadis +sadom +samckdaddy +sandm +sandnigger +satan +scag +scallywag +scat +schlong +screw +screwyou +scrotum +scum +semen +seppo +servant +sex +sexed +sexfarm +sexhound +sexhouse +sexing +sexkitten +sexpot +sexslave +sextogo +sextoy +sextoys +sexual +sexually +sexwhore +sexy +sexymoma +sexy-slim +shag +shaggin +shagging +shat +shav +shawtypimp +sheeney +shhit +shinola +shit +shitcan +shitdick +shite +shiteater +shited +shitface +shitfaced +shitfit +shitforbrains +shitfuck +shitfucker +shitfull +shithapens +shithappens +shithead +shithouse +shiting +shitlist +shitola +shitoutofluck +shits +shitstain +shitted +shitter +shitting +shitty +shoot +shooting +shortfuck +showtime +sick +sissy +sixsixsix +sixtynine +sixtyniner +skank +skankbitch +skankfuck +skankwhore +skanky +skankybitch +skankywhore +skinflute +skum +skumbag +slant +slanteye +slapper +slaughter +slav +slave +slavedriver +sleezebag +sleezeball +slideitin +slime +slimeball +slimebucket +slopehead +slopey +slopy +slut +sluts +slutt +slutting +slutty +slutwear +slutwhore +smack +smackthemonkey +smut +snatch +snatchpatch +snigger +sniggered +sniggering +sniggers +snigger's +sniper +snot +snowback +snownigger +sob +sodom +sodomise +sodomite +sodomize +sodomy +sonofabitch +sonofbitch +sooty +sos +soviet +spaghettibender +spaghettinigger +spank +spankthemonkey +sperm +spermacide +spermbag +spermhearder +spermherder +spic +spick +spig +spigotty +spik +spit +spitter +splittail +spooge +spreadeagle +spunk +spunky +squaw +stagg +stiffy +strapon +stringer +stripclub +stroke +stroking +stupid +stupidfuck +stupidfucker +suck +suckdick +sucker +suckme +suckmyass +suckmydick +suckmytit +suckoff +suicide +swallow +swallower +swalow +swastika +sweetness +syphilis +taboo +taff +tampon +tang +tantra +tarbaby +tard +teat +terror +terrorist +teste +testicle +testicles +thicklips +thirdeye +thirdleg +threesome +threeway +timbernigger +tinkle +tit +titbitnipply +titfuck +titfucker +titfuckin +titjob +titlicker +titlover +tits +tittie +titties +titty +tnt +toilet +tongethruster +tongue +tonguethrust +tonguetramp +tortur +torture +tosser +towelhead +trailertrash +tramp +trannie +tranny +transexual +transsexual +transvestite +triplex +trisexual +trojan +trots +tuckahoe +tunneloflove +turd +turnon +twat +twink +twinkie +twobitwhore +uck +uk +unfuckable +upskirt +uptheass +upthebutt +urinary +urinate +urine +usama +uterus +vagina +vaginal +vatican +vibr +vibrater +vibrator +vietcong +violence +virgin +virginbreaker +vomit +vulva +wab +wank +wanker +wanking +waysted +weapon +weenie +weewee +welcher +welfare +wetb +wetback +wetspot +whacker +whash +whigger +whiskey +whiskeydick +whiskydick +whit +whitenigger +whites +whitetrash +whitey +whiz +whop +whore +whorefucker +whorehouse +wigger +willie +williewanker +willy +wn +wog +women's +wop +wtf +wuss +wuzzie +xtc +xxx +yankee +yellowman +zigabo +zipperhead diff --git a/Assets/Plugins/Google.Protobuf.meta b/Assets/Resources/Geonames/bad-words.txt.meta similarity index 57% rename from Assets/Plugins/Google.Protobuf.meta rename to Assets/Resources/Geonames/bad-words.txt.meta index c9d3ca96b..ff605e0c5 100644 --- a/Assets/Plugins/Google.Protobuf.meta +++ b/Assets/Resources/Geonames/bad-words.txt.meta @@ -1,7 +1,6 @@ fileFormatVersion: 2 -guid: 4b6ebd913ac610041b63fc847ee96302 -folderAsset: yes -DefaultImporter: +guid: 790ef350f8658b04480e0645919a21fa +TextScriptImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Scenes/ARPG.unity b/Assets/Scenes/ARPG.unity index 7243a8cc3..43adf0183 100644 --- a/Assets/Scenes/ARPG.unity +++ b/Assets/Scenes/ARPG.unity @@ -865,7 +865,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 639.455, y: -40} + m_AnchoredPosition: {x: 527.51, y: -40} m_SizeDelta: {x: 329.91, y: 56} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &101395091 @@ -2334,6 +2334,81 @@ Transform: m_Father: {fileID: 1665127616} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &200920995 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 200920996} + - component: {fileID: 200920998} + - component: {fileID: 200920997} + m_Layer: 5 + m_Name: Primary + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &200920996 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 200920995} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1539162434} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 8, y: 8} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &200920997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 200920995} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: d4144ee6db2bf3c468cc5010acfe8974, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &200920998 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 200920995} + m_CullTransparentMesh: 1 --- !u!1 &204301709 GameObject: m_ObjectHideFlags: 0 @@ -3026,6 +3101,195 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 221986828} m_CullTransparentMesh: 1 +--- !u!1 &225222196 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 225222197} + - component: {fileID: 225222202} + - component: {fileID: 225222201} + - component: {fileID: 225222200} + - component: {fileID: 225222199} + - component: {fileID: 225222198} + m_Layer: 0 + m_Name: Sector Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &225222197 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 225222196} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1665127616} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &225222198 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 225222196} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0fc98635c5cb28848958c245f681acaf, type: 3} + m_Name: + m_EditorClassIdentifier: + _shader: {fileID: 4800000, guid: 2d020ca820b3647479e78b8c3d26e3a6, type: 3} + _downSampleMode: 2 + _iteration: 4 +--- !u!114 &225222199 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 225222196} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4ae335524e949404bb57f1612ec4b9b5, type: 3} + m_Name: + m_EditorClassIdentifier: + isDefaultListener: 1 + listenerId: 0 +--- !u!114 &225222200 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 225222196} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f27db6b94e477054e96392f94dc50c9d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_listeners: + initialListenerList: [] + useDefaultListeners: 1 + isEnvironmentAware: 0 + isStaticObject: 0 + m_positionOffsetData: + KeepMe: 0 + positionOffset: {x: 0, y: 0, z: 0} + m_posOffsetData: {fileID: 0} + listenerMask: 1 +--- !u!114 &225222201 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 225222196} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3} + m_Name: + m_EditorClassIdentifier: + volumeTrigger: {fileID: 0} + volumeLayer: + serializedVersion: 2 + m_Bits: 1048576 + stopNaNPropagation: 1 + finalBlitToCameraTarget: 0 + antialiasingMode: 2 + temporalAntialiasing: + jitterSpread: 0.75 + sharpness: 0.25 + stationaryBlending: 0.95 + motionBlending: 0 + subpixelMorphologicalAntialiasing: + quality: 1 + fastApproximateAntialiasing: + fastMode: 0 + keepAlpha: 0 + fog: + enabled: 1 + excludeSkybox: 1 + debugLayer: + lightMeter: + width: 512 + height: 256 + showCurves: 1 + histogram: + width: 512 + height: 256 + channel: 3 + waveform: + exposure: 0.12 + height: 256 + vectorscope: + size: 256 + exposure: 0.12 + overlaySettings: + linearDepth: 0 + motionColorIntensity: 4 + motionGridSize: 64 + colorBlindnessType: 0 + colorBlindnessStrength: 1 + m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2} + m_ShowToolkit: 0 + m_ShowCustomSorter: 0 + breakBeforeColorGrading: 0 + m_BeforeTransparentBundles: [] + m_BeforeStackBundles: [] + m_AfterStackBundles: [] +--- !u!20 &225222202 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 225222196} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.5 + far clip plane: 20 + field of view: 60 + orthographic: 1 + orthographic size: 0.5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 524288 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &232470596 GameObject: m_ObjectHideFlags: 0 @@ -3732,6 +3996,150 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &259676746 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 259676747} + - component: {fileID: 259676750} + - component: {fileID: 259676749} + - component: {fileID: 259676748} + m_Layer: 19 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &259676747 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 259676746} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.0125, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1511875452} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &259676748 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 259676746} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &259676749 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 259676746} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f8ca4487714456d4991818a621f6b573, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &259676750 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 259676746} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &259895013 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 259895014} + - component: {fileID: 259895015} + m_Layer: 20 + m_Name: SectorPostProcessing + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &259895014 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 259895013} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 906767442} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &259895015 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 259895013} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} + m_Name: + m_EditorClassIdentifier: + sharedProfile: {fileID: 11400000, guid: c0f0f7379aac8474d9ef1b01fa85a9c3, type: 2} + isGlobal: 1 + blendDistance: 0 + weight: 1 + priority: 0 --- !u!1 &263352742 GameObject: m_ObjectHideFlags: 0 @@ -4576,6 +4984,93 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 359038939} +--- !u!1 &394213709 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 394213710} + - component: {fileID: 394213713} + - component: {fileID: 394213712} + - component: {fileID: 394213711} + m_Layer: 5 + m_Name: Corp Legend + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &394213710 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 394213709} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1539162434} + - {fileID: 1691979037} + m_Father: {fileID: 1896923344} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 36, y: -10} + m_SizeDelta: {x: 64, y: 12} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &394213711 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 394213709} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d3cdb62043eacb24b87bab4e3584c17c, type: 3} + m_Name: + m_EditorClassIdentifier: + Primary: {fileID: 200920997} + Secondary: {fileID: 1539162435} + Label: {fileID: 1691979038} +--- !u!114 &394213712 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 394213709} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1281fe44325f9b548aa42dc331b17266, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &394213713 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 394213709} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 64 + m_PreferredHeight: 12 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &395150540 GameObject: m_ObjectHideFlags: 0 @@ -4614,6 +5109,231 @@ RectTransform: m_AnchoredPosition: {x: 0.000045776367, y: 0} m_SizeDelta: {x: 0, y: 12} m_Pivot: {x: 0.5, y: 0} +--- !u!1 &396382210 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 396382211} + - component: {fileID: 396382214} + - component: {fileID: 396382213} + - component: {fileID: 396382212} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &396382211 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 396382210} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 445770198} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 36, y: 0} + m_SizeDelta: {x: 64, y: 17.94} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &396382212 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 396382210} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &396382213 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 396382210} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Legend + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f65e20c70af9671428dd62c7c635e417, type: 2} + m_sharedMaterial: {fileID: 21790448164444372, guid: f65e20c70af9671428dd62c7c635e417, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 32 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &396382214 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 396382210} + m_CullTransparentMesh: 1 +--- !u!1 &407048972 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 407048973} + - component: {fileID: 407048975} + - component: {fileID: 407048974} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &407048973 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 407048972} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 693745764} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 16, y: 0} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &407048974 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 407048972} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 66887e71b9b25b94baa1da4bf12b490d, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &407048975 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 407048972} + m_CullTransparentMesh: 1 --- !u!1 &410348229 GameObject: m_ObjectHideFlags: 0 @@ -4835,7 +5555,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 78aa0b8ec7594a7438f13757228e3500, type: 3} m_Name: m_EditorClassIdentifier: - ConfirmationDialog: {fileID: 0} + Dialog: {fileID: 0} Flip: 1 Settings: {fileID: 11400000, guid: cd2344e2001a37544aab0960c164d4ff, type: 2} GameManager: {fileID: 1009503729} @@ -5739,6 +6459,38 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 411347518} m_CullTransparentMesh: 0 +--- !u!1 &415301830 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 415301831} + m_Layer: 19 + m_Name: Contents + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &415301831 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 415301830} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 812977435} + - {fileID: 735674215} + m_Father: {fileID: 2132980329} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &416399494 GameObject: m_ObjectHideFlags: 0 @@ -6046,6 +6798,88 @@ RectTransform: m_AnchoredPosition: {x: -0.5, y: 0} m_SizeDelta: {x: -1, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &445770197 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 445770198} + - component: {fileID: 445770200} + - component: {fileID: 445770199} + m_Layer: 5 + m_Name: Contents + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &445770198 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 445770197} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 396382211} + - {fileID: 524354596} + - {fileID: 1580369953} + - {fileID: 1174520928} + - {fileID: 693745764} + m_Father: {fileID: 1005841432} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 44, y: -46.97} + m_SizeDelta: {x: 72, y: 77.94} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &445770199 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 445770197} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &445770200 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 445770197} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 4 + m_Right: 4 + m_Top: 0 + m_Bottom: 4 + m_ChildAlignment: 0 + m_Spacing: 2 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &454004898 GameObject: m_ObjectHideFlags: 0 @@ -6277,6 +7111,81 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &462936758 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 462936759} + - component: {fileID: 462936761} + - component: {fileID: 462936760} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &462936759 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 462936758} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1174520928} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 16, y: 0} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &462936760 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 462936758} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 6c9ab17a8574de140969db991b89994f, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &462936761 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 462936758} + m_CullTransparentMesh: 1 --- !u!1 &472507697 GameObject: m_ObjectHideFlags: 0 @@ -7394,6 +8303,160 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 522642867} m_CullTransparentMesh: 0 +--- !u!1 &524354595 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 524354596} + - component: {fileID: 524354597} + m_Layer: 5 + m_Name: Start Legend + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &524354596 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 524354595} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2065828645} + - {fileID: 1312331772} + m_Father: {fileID: 445770198} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 36, y: -25.94} + m_SizeDelta: {x: 64, y: 12} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &524354597 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 524354595} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 64 + m_PreferredHeight: 12 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &542243545 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 542243546} + - component: {fileID: 542243549} + - component: {fileID: 542243548} + - component: {fileID: 542243547} + m_Layer: 18 + m_Name: Influence + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &542243546 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 542243545} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 15, y: 15, z: 1} + m_Children: [] + m_Father: {fileID: 1511875452} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &542243547 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 542243545} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &542243548 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 542243545} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a71206b06f60aec41bc533ba93ab7907, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &542243549 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 542243545} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &545103407 GameObject: m_ObjectHideFlags: 0 @@ -8176,6 +9239,7 @@ RectTransform: - {fileID: 218215090} - {fileID: 800990061} - {fileID: 250585915} + - {fileID: 1130044040} m_Father: {fileID: 1726632265} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -8204,7 +9268,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 95307b613a054bc4a9bb1f9db0a2e3d0, type: 3} m_Name: m_EditorClassIdentifier: - Canvas: {fileID: 761574180} + GameManager: {fileID: 1009503729} + Title: {fileID: 1130044038} MapOverlayCamera: {fileID: 1075335643} GravityCamera: {fileID: 326516967} TintCamera: {fileID: 166261018} @@ -9240,6 +10305,64 @@ RectTransform: m_AnchoredPosition: {x: 64, y: 0} m_SizeDelta: {x: 14, y: 0} m_Pivot: {x: 0, y: 0.5} +--- !u!1 &693745763 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 693745764} + - component: {fileID: 693745765} + m_Layer: 5 + m_Name: Boss Legend + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &693745764 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 693745763} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 407048973} + - {fileID: 1054285087} + m_Father: {fileID: 445770198} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 36, y: -67.94} + m_SizeDelta: {x: 64, y: 12} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &693745765 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 693745763} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: 12 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &697075015 GameObject: m_ObjectHideFlags: 0 @@ -9376,6 +10499,102 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 697075015} m_CullTransparentMesh: 0 +--- !u!1 &708399893 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 708399894} + - component: {fileID: 708399897} + - component: {fileID: 708399896} + - component: {fileID: 708399895} + m_Layer: 19 + m_Name: Primary + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &708399894 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 708399893} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 2} + m_LocalScale: {x: 0.87800574, y: 0.87800574, z: 1.7560115} + m_Children: [] + m_Father: {fileID: 1511875452} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &708399895 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 708399893} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &708399896 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 708399893} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 6c332e6d0be83ac459c05a7cf5b90ed1, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &708399897 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 708399893} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &719842150 GameObject: m_ObjectHideFlags: 0 @@ -9547,6 +10766,37 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &735674214 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 735674215} + m_Layer: 19 + m_Name: Links + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &735674215 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 735674214} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 3} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1163671426} + m_Father: {fileID: 415301831} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &737569921 GameObject: m_ObjectHideFlags: 0 @@ -10946,6 +12196,39 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 804489111} m_CullTransparentMesh: 0 +--- !u!1 &812977434 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 812977435} + m_Layer: 19 + m_Name: Zones + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &812977435 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 812977434} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1511875452} + - {fileID: 926083406} + - {fileID: 2117796866} + m_Father: {fileID: 415301831} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &817565120 GameObject: m_ObjectHideFlags: 0 @@ -11945,6 +13228,7 @@ Transform: - {fileID: 1404901905} - {fileID: 837424434} - {fileID: 803284855} + - {fileID: 259895014} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -12158,6 +13442,115 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 912920565} m_CullTransparentMesh: 0 +--- !u!1 &926083401 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 926083406} + - component: {fileID: 926083405} + - component: {fileID: 926083404} + - component: {fileID: 926083403} + - component: {fileID: 926083402} + m_Layer: 19 + m_Name: IconBackground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &926083402 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 926083401} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1281fe44325f9b548aa42dc331b17266, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!64 &926083403 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 926083401} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &926083404 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 926083401} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 76476d467e1cd844dacbcbe00105866e, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &926083405 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 926083401} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &926083406 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 926083401} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 1} + m_LocalScale: {x: 0.044999998, y: 0.044999998, z: 3} + m_Children: [] + m_Father: {fileID: 812977435} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &931657850 GameObject: m_ObjectHideFlags: 0 @@ -12190,11 +13583,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1783772015} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 877.83, y: -40} + m_AnchoredPosition: {x: 960.13495, y: -40} m_SizeDelta: {x: 146.84, y: 56} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &931657852 @@ -12430,6 +13823,100 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 933815652} m_CullTransparentMesh: 0 +--- !u!1 &936330461 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 936330465} + - component: {fileID: 936330464} + - component: {fileID: 936330463} + - component: {fileID: 936330462} + m_Layer: 19 + m_Name: Influence Map + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &936330462 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 936330461} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1281fe44325f9b548aa42dc331b17266, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!23 &936330463 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 936330461} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 2b21c6753ff66084283cc31f201344f9, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &936330464 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 936330461} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &936330465 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 936330461} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.5, y: 0.5, z: 5} + m_LocalScale: {x: 1.25, y: 1.25, z: 1.25} + m_Children: [] + m_Father: {fileID: 2132980329} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &937280107 GameObject: m_ObjectHideFlags: 0 @@ -13356,6 +14843,238 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 52} m_Pivot: {x: 1, y: 1} +--- !u!1 &1005841431 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1005841432} + - component: {fileID: 1005841436} + - component: {fileID: 1005841435} + - component: {fileID: 1005841434} + - component: {fileID: 1005841433} + m_Layer: 5 + m_Name: Legend Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1005841432 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1005841431} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2124945556} + - {fileID: 445770198} + - {fileID: 1896923344} + m_Father: {fileID: 2056162322} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -16, y: 16} + m_SizeDelta: {x: 164.01999, y: 93.94} + m_Pivot: {x: 1, y: 0} +--- !u!114 &1005841433 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1005841431} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 8 + m_Right: 8 + m_Top: 8 + m_Bottom: 8 + m_ChildAlignment: 0 + m_Spacing: 4.02 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &1005841434 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1005841431} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &1005841435 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1005841431} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.0050000013, g: 0.034999993, b: 0.05, a: 0.9490196} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: d4144ee6db2bf3c468cc5010acfe8974, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!222 &1005841436 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1005841431} + m_CullTransparentMesh: 1 +--- !u!1 &1005979864 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1005979865} + - component: {fileID: 1005979868} + - component: {fileID: 1005979867} + - component: {fileID: 1005979866} + m_Layer: 0 + m_Name: Influence Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1005979865 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1005979864} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.5, y: 0.5, z: -1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1665127616} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1005979866 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1005979864} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4ae335524e949404bb57f1612ec4b9b5, type: 3} + m_Name: + m_EditorClassIdentifier: + isDefaultListener: 1 + listenerId: 0 +--- !u!114 &1005979867 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1005979864} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f27db6b94e477054e96392f94dc50c9d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_listeners: + initialListenerList: [] + useDefaultListeners: 1 + isEnvironmentAware: 0 + isStaticObject: 0 + m_positionOffsetData: + KeepMe: 0 + positionOffset: {x: 0, y: 0, z: 0} + m_posOffsetData: {fileID: 0} + listenerMask: 1 +--- !u!20 &1005979868 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1005979864} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 2 + field of view: 60 + orthographic: 1 + orthographic size: 0.625 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 262144 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 8400000, guid: 9c4523304810d514b9670f6e6fa71b39, type: 2} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &1009503727 GameObject: m_ObjectHideFlags: 0 @@ -13436,18 +15155,19 @@ MonoBehaviour: - {fileID: 1771741750} - {fileID: 1631662979} EventLog: {fileID: 1396909588} - SectorRenderer: {fileID: 1009503731} + ZoneRenderer: {fileID: 1009503731} DockCamera: {fileID: 393266593} FollowCamera: {fileID: 887677622} GameplayUI: {fileID: 346000246} Menu: {fileID: 1726632268} MenuMap: {fileID: 630131162} + SectorMap: {fileID: 0} SchematicDisplay: {fileID: 7628189704109037584} TargetSchematicDisplay: {fileID: 410701129} Inventory: {fileID: 1997243495} ShipPanel: {fileID: 7628189704109037582} TargetShipPanel: {fileID: 410701133} - ConfirmationDialog: {fileID: 620555924} + Dialog: {fileID: 620555924} --- !u!4 &1009503730 Transform: m_ObjectHideFlags: 0 @@ -13689,7 +15409,7 @@ MonoBehaviour: Minimap: {fileID: 970624071} GravityRenderer: {fileID: 0} ZoomSpeed: 0.001 - SectorRenderer: {fileID: 1009503731} + ZoneRenderer: {fileID: 1009503731} --- !u!114 &1009503735 MonoBehaviour: m_ObjectHideFlags: 0 @@ -13982,7 +15702,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1019449642} - - component: {fileID: 1019449641} - component: {fileID: 1019449643} m_Layer: 0 m_Name: WwiseGlobal @@ -13991,33 +15710,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1019449641 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1019449640} - 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 - diffractionFlags: 11 - engineLogging: 0 --- !u!4 &1019449642 Transform: m_ObjectHideFlags: 0 @@ -14142,7 +15834,7 @@ GameObject: m_Component: - component: {fileID: 1037490739} m_Layer: 0 - m_Name: Sector Brushes + m_Name: Zone Brushes m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -14166,6 +15858,141 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1 &1054285086 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1054285087} + - component: {fileID: 1054285089} + - component: {fileID: 1054285088} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1054285087 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1054285086} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 693745764} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 7, y: 0} + m_SizeDelta: {x: -14, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1054285088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1054285086} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Executive + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f65e20c70af9671428dd62c7c635e417, type: 2} + m_sharedMaterial: {fileID: 21790448164444372, guid: f65e20c70af9671428dd62c7c635e417, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 8 + m_fontSizeBase: 8 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1054285089 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1054285086} + m_CullTransparentMesh: 1 --- !u!1 &1060591358 GameObject: m_ObjectHideFlags: 0 @@ -14819,6 +16646,216 @@ Transform: m_Father: {fileID: 1037490739} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1115239398 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1115239399} + - component: {fileID: 1115239401} + - component: {fileID: 1115239400} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1115239399 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115239398} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1580369953} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 16, y: 0} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1115239400 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115239398} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: cb18d00f3b884e24da71c10aa20a1a18, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1115239401 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115239398} + m_CullTransparentMesh: 1 +--- !u!1 &1130044037 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1130044040} + - component: {fileID: 1130044039} + - component: {fileID: 1130044038} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1130044038 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1130044037} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Zone: Name' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f65e20c70af9671428dd62c7c635e417, type: 2} + m_sharedMaterial: {fileID: 21790448164444372, guid: f65e20c70af9671428dd62c7c635e417, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1130044039 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1130044037} + m_CullTransparentMesh: 1 +--- !u!224 &1130044040 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1130044037} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 630131159} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -80} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 0.5, y: 1} --- !u!1 &1156729697 GameObject: m_ObjectHideFlags: 0 @@ -14968,6 +17005,115 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &1163671425 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1163671426} + - component: {fileID: 1163671429} + - component: {fileID: 1163671428} + - component: {fileID: 1163671427} + - component: {fileID: 1163671430} + m_Layer: 19 + m_Name: Link + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1163671426 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1163671425} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.25, y: 0.25, z: 0} + m_LocalScale: {x: 0.1, y: 0.002, z: 1} + m_Children: [] + m_Father: {fileID: 735674215} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &1163671427 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1163671425} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1163671428 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1163671425} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a8d716e09aea7ce48a1220980f19b494, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1163671429 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1163671425} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1163671430 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1163671425} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1281fe44325f9b548aa42dc331b17266, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1167314587 GameObject: m_ObjectHideFlags: 0 @@ -15152,6 +17298,64 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: aa69c313aba23f945b760e79c45083ad, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1174520927 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1174520928} + - component: {fileID: 1174520929} + m_Layer: 5 + m_Name: Home Legend + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1174520928 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1174520927} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 462936759} + - {fileID: 1407086849} + m_Father: {fileID: 445770198} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 36, y: -53.940002} + m_SizeDelta: {x: 64, y: 12} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1174520929 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1174520927} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: 12 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!114 &1176624628 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3501282941175030939, guid: 2758dfa2744d7ad4d8877545189d116e, @@ -16026,6 +18230,141 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1284802337} m_CullTransparentMesh: 1 +--- !u!1 &1312331771 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1312331772} + - component: {fileID: 1312331774} + - component: {fileID: 1312331773} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1312331772 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1312331771} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 524354596} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 7, y: 0} + m_SizeDelta: {x: -14, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1312331773 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1312331771} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Start + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f65e20c70af9671428dd62c7c635e417, type: 2} + m_sharedMaterial: {fileID: 21790448164444372, guid: f65e20c70af9671428dd62c7c635e417, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 8 + m_fontSizeBase: 8 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1312331774 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1312331771} + m_CullTransparentMesh: 1 --- !u!1 &1319157834 GameObject: m_ObjectHideFlags: 3 @@ -16819,6 +19158,338 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1396909586} m_CullTransparentMesh: 1 +--- !u!1 &1396920480 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1396920481} + - component: {fileID: 1396920483} + - component: {fileID: 1396920482} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1396920481 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396920480} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1580369953} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 7, y: 0} + m_SizeDelta: {x: -14, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1396920482 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396920480} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Terminus + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f65e20c70af9671428dd62c7c635e417, type: 2} + m_sharedMaterial: {fileID: 21790448164444372, guid: f65e20c70af9671428dd62c7c635e417, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 8 + m_fontSizeBase: 8 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1396920483 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396920480} + m_CullTransparentMesh: 1 +--- !u!1 &1399108417 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1399108418} + - component: {fileID: 1399108422} + - component: {fileID: 1399108421} + - component: {fileID: 1399108420} + - component: {fileID: 1399108419} + m_Layer: 5 + m_Name: Galaxy + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1399108418 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1399108417} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1783772015} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1145.4999, y: -40} + m_SizeDelta: {x: 223.89, y: 56} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1399108419 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1399108417} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d90317f6ecd38754fad9aee92f46b126, type: 3} + m_Name: + m_EditorClassIdentifier: + TabContents: {fileID: 2056162321} + Button: {fileID: 1399108420} + Tab: 3 + Text: {fileID: 1399108421} + RequireParent: 0 +--- !u!114 &1399108420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1399108417} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1399108421} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1399108421 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1399108417} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Galaxy + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f65e20c70af9671428dd62c7c635e417, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 0e7beef0cfe7ac44cb03690b8e068c5e, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 49.95 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1399108422 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1399108417} + m_CullTransparentMesh: 0 --- !u!1 &1399423349 GameObject: m_ObjectHideFlags: 0 @@ -16959,6 +19630,141 @@ MonoBehaviour: blendDistance: 0 weight: 0 priority: 1 +--- !u!1 &1407086848 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1407086849} + - component: {fileID: 1407086851} + - component: {fileID: 1407086850} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1407086849 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1407086848} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1174520928} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 7, y: 0} + m_SizeDelta: {x: -14, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1407086850 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1407086848} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Home Zone + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f65e20c70af9671428dd62c7c635e417, type: 2} + m_sharedMaterial: {fileID: 21790448164444372, guid: f65e20c70af9671428dd62c7c635e417, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 8 + m_fontSizeBase: 8 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1407086851 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1407086848} + m_CullTransparentMesh: 1 --- !u!1 &1416434298 GameObject: m_ObjectHideFlags: 0 @@ -17444,11 +20250,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1783772015} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1048.375, y: -40} + m_AnchoredPosition: {x: 789.58997, y: -40} m_SizeDelta: {x: 194.25, y: 56} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1464157086 @@ -17950,6 +20756,71 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1505831356} m_CullTransparentMesh: 0 +--- !u!1 &1511875451 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1511875452} + - component: {fileID: 1511875454} + - component: {fileID: 1511875453} + m_Layer: 19 + m_Name: Zone + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1511875452 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1511875451} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.25, y: 0.25, z: 0} + m_LocalScale: {x: 0.015, y: 0.015, z: 1} + m_Children: + - {fileID: 708399894} + - {fileID: 1857285685} + - {fileID: 542243546} + - {fileID: 259676747} + - {fileID: 2092739550} + m_Father: {fileID: 812977435} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1511875453 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1511875451} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2c8b54233e980c94096777e19a4e070a, type: 3} + m_Name: + m_EditorClassIdentifier: + Primary: {fileID: 708399896} + Secondary: {fileID: 1857285687} + Influence: {fileID: 542243548} + Label: {fileID: 2092739552} +--- !u!114 &1511875454 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1511875451} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1281fe44325f9b548aa42dc331b17266, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1523113324 GameObject: m_ObjectHideFlags: 0 @@ -18329,6 +21200,82 @@ Camera: m_OcclusionCulling: 0 m_StereoConvergence: 10 m_StereoSeparation: 0.022 +--- !u!1 &1539162433 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1539162434} + - component: {fileID: 1539162436} + - component: {fileID: 1539162435} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1539162434 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1539162433} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 200920996} + m_Father: {fileID: 394213710} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 12, y: 0} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1539162435 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1539162433} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 92184887b260c82429005061b0b08b3b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1539162436 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1539162433} + m_CullTransparentMesh: 1 --- !u!1 &1547889398 GameObject: m_ObjectHideFlags: 0 @@ -19148,6 +22095,87 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &1566772336 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1566772339} + - component: {fileID: 1566772338} + - component: {fileID: 1566772337} + m_Layer: 19 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!23 &1566772337 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1566772336} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 57000f7bd59643b4f9a5731dea6468ef, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1566772338 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1566772336} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1566772339 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1566772336} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2132980329} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1576705656 GameObject: m_ObjectHideFlags: 0 @@ -19244,6 +22272,64 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1576705656} m_CullTransparentMesh: 1 +--- !u!1 &1580369952 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1580369953} + - component: {fileID: 1580369954} + m_Layer: 5 + m_Name: Terminus Legend + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1580369953 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1580369952} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1115239399} + - {fileID: 1396920481} + m_Father: {fileID: 445770198} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 36, y: -39.940002} + m_SizeDelta: {x: 64, y: 12} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1580369954 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1580369952} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: 12 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &1590553658 GameObject: m_ObjectHideFlags: 0 @@ -20096,6 +23182,8 @@ Transform: - {fileID: 1547889399} - {fileID: 199435031} - {fileID: 826773974} + - {fileID: 225222197} + - {fileID: 1005979865} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -20174,6 +23262,141 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1669395624} m_CullTransparentMesh: 0 +--- !u!1 &1691979036 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1691979037} + - component: {fileID: 1691979039} + - component: {fileID: 1691979038} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1691979037 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1691979036} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 394213710} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 7, y: 0} + m_SizeDelta: {x: -14, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1691979038 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1691979036} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Corporation + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f65e20c70af9671428dd62c7c635e417, type: 2} + m_sharedMaterial: {fileID: 21790448164444372, guid: f65e20c70af9671428dd62c7c635e417, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 8 + m_fontSizeBase: 8 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1691979039 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1691979036} + m_CullTransparentMesh: 1 --- !u!1 &1698810627 GameObject: m_ObjectHideFlags: 0 @@ -20670,6 +23893,7 @@ RectTransform: - {fileID: 1997243493} - {fileID: 630131159} - {fileID: 522642868} + - {fileID: 2056162322} - {fileID: 1783772015} m_Father: {fileID: 761574181} m_RootOrder: 4 @@ -20733,6 +23957,64 @@ MonoBehaviour: TabButtons: {fileID: 1783772015} ActiveTabColor: {r: 1, g: 0.44583336, b: 0.050000012, a: 1} InactiveTabColor: {r: 0.6981132, g: 0.6981132, b: 0.6981132, a: 1} +--- !u!1 &1732078363 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1732078365} + - component: {fileID: 1732078364} + m_Layer: 0 + m_Name: WwiseGlobal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1732078364 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1732078363} + 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 + diffractionFlags: 11 + engineLogging: 0 +--- !u!4 &1732078365 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1732078363} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1733988258 GameObject: m_ObjectHideFlags: 0 @@ -21266,10 +24548,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 101395090} - - {fileID: 931657851} - {fileID: 1464157085} + - {fileID: 931657851} + - {fileID: 1399108418} m_Father: {fileID: 1726632265} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -21957,6 +25240,102 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1850578694} m_CullTransparentMesh: 0 +--- !u!1 &1857285684 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1857285685} + - component: {fileID: 1857285688} + - component: {fileID: 1857285687} + - component: {fileID: 1857285686} + m_Layer: 19 + m_Name: Secondary + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1857285685 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857285684} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 4} + m_LocalScale: {x: 2, y: 2, z: 2} + m_Children: [] + m_Father: {fileID: 1511875452} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &1857285686 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857285684} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1857285687 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857285684} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 76476d467e1cd844dacbcbe00105866e, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1857285688 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857285684} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1868140980 GameObject: m_ObjectHideFlags: 0 @@ -22248,6 +25627,84 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1281fe44325f9b548aa42dc331b17266, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1896923343 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1896923344} + - component: {fileID: 1896923346} + - component: {fileID: 1896923345} + m_Layer: 5 + m_Name: Corporations + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1896923344 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1896923343} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 394213710} + m_Father: {fileID: 1005841432} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 120.02, y: -46.97} + m_SizeDelta: {x: 72, y: 77.94} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1896923345 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1896923343} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &1896923346 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1896923343} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 4 + m_Right: 4 + m_Top: 4 + m_Bottom: 4 + m_ChildAlignment: 0 + m_Spacing: 2 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &1897237531 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2279630453886260054, guid: aac073da6df367d499834c926930dd84, @@ -22971,6 +26428,100 @@ MonoBehaviour: Dialog: {fileID: 620555924} BackgroundEntered: {fileID: 411347521} BackgroundExited: {fileID: 411347520} +--- !u!1 &1998350928 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1998350929} + - component: {fileID: 1998350932} + - component: {fileID: 1998350931} + - component: {fileID: 1998350930} + m_Layer: 5 + m_Name: Sector Contents + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1998350929 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1998350928} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2056162322} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1998350930 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1998350928} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: bc587f27303721a449ce72b1c01c0af6, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: d4144ee6db2bf3c468cc5010acfe8974, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1998350931 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1998350928} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59b26802254e34b4bb26f48d0d8b51bf, type: 3} + m_Name: + m_EditorClassIdentifier: + GameManager: {fileID: 1009503729} + SectorCamera: {fileID: 225222202} + SectorBackgroundRenderer: {fileID: 1566772337} + ZoomSpeed: 0.025 + MinViewSize: 0.1 + MaxViewSize: 2 +--- !u!222 &1998350932 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1998350928} + m_CullTransparentMesh: 1 --- !u!1 &2011788088 GameObject: m_ObjectHideFlags: 0 @@ -23404,6 +26955,43 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2044077501} m_CullTransparentMesh: 0 +--- !u!1 &2056162321 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2056162322} + m_Layer: 5 + m_Name: Sector Screen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2056162322 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2056162321} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1998350929} + - {fileID: 1005841432} + m_Father: {fileID: 1726632265} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2060807770 GameObject: m_ObjectHideFlags: 0 @@ -23554,6 +27142,265 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2060887865} m_CullTransparentMesh: 0 +--- !u!1 &2065828644 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2065828645} + - component: {fileID: 2065828647} + - component: {fileID: 2065828646} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2065828645 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2065828644} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 524354596} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 16, y: 0} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &2065828646 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2065828644} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 9025249fbeb4b594680d2749b521bb41, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2065828647 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2065828644} + m_CullTransparentMesh: 1 +--- !u!1 &2092739549 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2092739550} + - component: {fileID: 2092739553} + - component: {fileID: 2092739552} + - component: {fileID: 2092739551} + m_Layer: 19 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2092739550 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2092739549} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1511875452} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 1.3049984, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2092739551 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2092739549} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &2092739552 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2092739549} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Sample text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 53555f7a2d5e745428813f1b1118734f, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 3b8ba3beb81524a4fb40e7aef88a7383, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 4 + m_fontSizeBase: 4 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 2092739553} + m_maskType: 0 + _SortingLayerID: 0 + _SortingOrder: 0 +--- !u!23 &2092739553 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2092739549} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 3b8ba3beb81524a4fb40e7aef88a7383, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &2095699056 GameObject: m_ObjectHideFlags: 0 @@ -23564,7 +27411,7 @@ GameObject: m_Component: - component: {fileID: 2095699057} m_Layer: 0 - m_Name: Sector Root + m_Name: Zone Root m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -24107,6 +27954,100 @@ MonoBehaviour: positionOffset: {x: 0, y: 0, z: 0} m_posOffsetData: {fileID: 0} listenerMask: 1 +--- !u!1 &2117796865 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2117796866} + - component: {fileID: 2117796868} + - component: {fileID: 2117796867} + - component: {fileID: 2117796869} + m_Layer: 19 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2117796866 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2117796865} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.015, y: 0.015, z: 1} + m_Children: [] + m_Father: {fileID: 812977435} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &2117796867 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2117796865} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 35aa68e225b14d940a7ac767f8bf8463, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &2117796868 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2117796865} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &2117796869 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2117796865} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1281fe44325f9b548aa42dc331b17266, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2122035459 GameObject: m_ObjectHideFlags: 0 @@ -24241,6 +28182,170 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2122035459} m_CullTransparentMesh: 0 +--- !u!1 &2124945555 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2124945556} + - component: {fileID: 2124945559} + - component: {fileID: 2124945558} + - component: {fileID: 2124945557} + m_Layer: 5 + m_Name: Outline + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2124945556 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2124945555} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1005841432} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2124945557 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2124945555} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &2124945558 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2124945555} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.8, g: 0.9333333, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 53be25fb8ef6567478599a1f7299ca24, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!222 &2124945559 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2124945555} + m_CullTransparentMesh: 1 +--- !u!1 &2132980327 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2132980329} + - component: {fileID: 2132980328} + m_Layer: 0 + m_Name: Sector View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2132980328 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2132980327} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5369ea8554e422a45a9f949bdd3bee3f, type: 3} + m_Name: + m_EditorClassIdentifier: + InfluenceCamera: {fileID: 1005979868} + InfluenceRendererPrototype: {fileID: 936330462} + SectorRenderer: {fileID: 1566772337} + ZonePrototype: {fileID: 1511875454} + LinkPrototype: {fileID: 1163671430} + IconPrototype: {fileID: 2117796869} + IconBackgroundPrototype: {fileID: 926083402} + ZonePrimaryMaterial: {fileID: 2100000, guid: 6c332e6d0be83ac459c05a7cf5b90ed1, type: 2} + ZoneSecondaryMaterial: {fileID: 2100000, guid: 76476d467e1cd844dacbcbe00105866e, + type: 2} + ZoneLinkMaterial: {fileID: 2100000, guid: a8d716e09aea7ce48a1220980f19b494, type: 2} + MegaPrimaryBoost: 0.75 + MegaSecondaryBoost: 2 + MegaLinkBoost: 2 + EntranceIcon: {fileID: 2800000, guid: 9025249fbeb4b594680d2749b521bb41, type: 3} + ExitIcon: {fileID: 2800000, guid: cb18d00f3b884e24da71c10aa20a1a18, type: 3} + BossIcon: {fileID: 2800000, guid: 66887e71b9b25b94baa1da4bf12b490d, type: 3} + HomeIcon: {fileID: 2800000, guid: 6c9ab17a8574de140969db991b89994f, type: 3} + LegendPrototype: {fileID: 394213712} + IconDistance: 1 + IconBackgroundSize: 3 + LabelDistance: 0.4 +--- !u!4 &2132980329 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2132980327} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1566772339} + - {fileID: 936330465} + - {fileID: 415301831} + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2139956859 GameObject: m_ObjectHideFlags: 0 @@ -29234,7 +33339,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 78aa0b8ec7594a7438f13757228e3500, type: 3} m_Name: m_EditorClassIdentifier: - ConfirmationDialog: {fileID: 0} + Dialog: {fileID: 0} Flip: 0 Settings: {fileID: 11400000, guid: cd2344e2001a37544aab0960c164d4ff, type: 2} GameManager: {fileID: 1009503729} diff --git a/Assets/Scenes/Main Menu.unity b/Assets/Scenes/Main Menu.unity index 6f3e6edfd..1ad35e072 100644 --- a/Assets/Scenes/Main Menu.unity +++ b/Assets/Scenes/Main Menu.unity @@ -204,6 +204,315 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 128306751} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &306118574 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1985290577} + m_Modifications: + - target: {fileID: 422905925398675622, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: DisableClickWhenSelected + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 685543055046964044, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_ChildControlHeight + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 685543055046964044, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_ChildForceExpandHeight + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_SizeDelta.y + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 60.98 + objectReference: {fileID: 0} + - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1713457305180270767, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_text + value: Confirm + objectReference: {fileID: 0} + - target: {fileID: 1713457305180270767, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_textInfo.lineCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1713457305180270767, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_textInfo.pageCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1713457305180270767, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_textInfo.wordCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1713457305180270767, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_textInfo.spaceCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1713457305180270767, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_textInfo.characterCount + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1713457305180270767, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_firstOverflowCharacterIndex + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_SizeDelta.y + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3873577224371502733, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3873577224371502733, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3873577224371502733, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3873577224371502733, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_SizeDelta.y + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 3873577224371502733, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3873577224371502733, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4710256612221957410, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4710256612221957410, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4710256612221957410, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4710256612221957410, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_SizeDelta.y + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 4710256612221957410, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4710256612221957410, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5931676848528526781, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_ChildControlHeight + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5931676848528526781, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_ChildForceExpandHeight + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7032199941939260770, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_ChildControlHeight + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7032199941939260770, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_ChildForceExpandHeight + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7183058363224579084, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_Name + value: Confirm Button + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} +--- !u!224 &306118575 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + m_PrefabInstance: {fileID: 306118574} + m_PrefabAsset: {fileID: 0} +--- !u!114 &306118576 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1713457305180270767, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + m_PrefabInstance: {fileID: 306118574} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &306118577 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3501282941175030939, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + m_PrefabInstance: {fileID: 306118574} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &335549370 GameObject: m_ObjectHideFlags: 0 @@ -247,7 +556,7 @@ Transform: m_Children: - {fileID: 801832274} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &356429273 GameObject: @@ -463,6 +772,62 @@ MonoBehaviour: m_MaximumFOV: 60 m_MinimumOrthoSize: 1 m_MaximumOrthoSize: 5000 +--- !u!1 &526847151 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 526847152} + - component: {fileID: 526847153} + m_Layer: 5 + m_Name: Padding + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &526847152 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 526847151} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1985290577} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &526847153 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 526847151} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: 1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &553528106 GameObject: m_ObjectHideFlags: 0 @@ -546,8 +911,143 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &557816235 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 557816236} + - component: {fileID: 557816238} + - component: {fileID: 557816237} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &557816236 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 557816235} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1000515313} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &557816237 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 557816235} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Moving Thing + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 53555f7a2d5e745428813f1b1118734f, type: 2} + m_sharedMaterial: {fileID: -2804126062856497447, guid: 53555f7a2d5e745428813f1b1118734f, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &557816238 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 557816235} + m_CullTransparentMesh: 0 --- !u!1 &564164468 GameObject: m_ObjectHideFlags: 0 @@ -802,13 +1302,13 @@ 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.015506916, y: 0.9502416, z: -0.3074131, w: 0.047933273} + m_LocalPosition: {x: -117.52, y: -77.08745, z: 149.09027} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 412917866} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &750375533 GameObject: @@ -839,7 +1339,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &750375535 MonoBehaviour: @@ -1071,6 +1571,102 @@ Transform: type: 3} m_PrefabInstance: {fileID: 801832273} m_PrefabAsset: {fileID: 0} +--- !u!1 &926654440 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 926654441} + - component: {fileID: 926654444} + - component: {fileID: 926654443} + - component: {fileID: 926654442} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &926654441 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 926654440} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1000515313} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &926654442 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 926654440} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &926654443 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 926654440} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0.041666675, b: 0.1, a: 0.79607844} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: d43f9691259ed984fa09c853c5cda7f0, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &926654444 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 926654440} + m_CullTransparentMesh: 0 --- !u!1 &965376321 GameObject: m_ObjectHideFlags: 0 @@ -1177,8 +1773,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.015506916, y: 0.9502416, z: -0.3074131, w: 0.047933273} + m_LocalPosition: {x: -117.52, y: -77.08745, z: 149.09027} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -1393,8 +1989,9 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 6584140821722344271} + - {fileID: 1000515313} m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1413,12 +2010,156 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3d7c7b928d043a3449b93bce9de03d1c, type: 3} m_Name: m_EditorClassIdentifier: + Settings: + LinkDensity: 0.5 + ZoneCount: 128 + NameGeneratorMinLength: 5 + NameGeneratorMaxLength: 10 + NameGeneratorOrder: 4 + MegaCount: 6 + BossCount: 3 + NoisePosition: 0 + CloudExponent: 10 + CloudAmplitude: 0.01 + NoiseAmplitude: 1 + NoiseOffset: 0.3 + NoiseGain: 0.7 + NoiseLacunarity: 2 + NoiseFrequency: 1 + Dialog: {fileID: 1000515314} InGame: 0 PanelPrototype: {fileID: 6584140821722344273} FadeTime: 0.5 FadeDistance: 1024 FadeAlphaExponent: 2 FadePositionExponent: 2 +--- !u!1 &1000515312 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1000515313} + - component: {fileID: 1000515316} + - component: {fileID: 1000515315} + - component: {fileID: 1000515314} + m_Layer: 5 + m_Name: Confirmation Dialog + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1000515313 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000515312} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6666667, y: 0.6666667, z: 0.6666667} + m_Children: + - {fileID: 926654441} + - {fileID: 557816236} + - {fileID: 1985290577} + m_Father: {fileID: 991231192} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 285.7, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1000515314 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000515312} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 83488dc4b5e58cd40b4d1c4ee98207b5, type: 3} + m_Name: + m_EditorClassIdentifier: + Dropdown: {fileID: 0} + Title: {fileID: 557816237} + Section: {fileID: 1026668114703092140, guid: 3a149ea40b43fbf47b51ec165cb04e5f, type: 3} + List: {fileID: 6914334813923144328, guid: 93e63e3a8b352a04897123288d70f04b, type: 3} + Property: {fileID: 9159917045172241898, guid: be88722a74d512d45a454fe91327a389, + type: 3} + PropertyLabel: {fileID: 279061376544739623, guid: 5b8c5126640066e4fabe6e65b7225b3b, + type: 3} + Attribute: {fileID: 4447025208748278043, guid: 5e3a258a5b91c8246b20962ba6eccb09, + type: 3} + InputField: {fileID: 6586910564433979167, guid: fb49ef180533e3e488fa39d80cc2423a, + type: 3} + RangedFloatField: {fileID: 1663396771457720812, guid: c214f62d8f2188140b96ed12798034c8, + type: 3} + ProgressField: {fileID: 256436433275418348, guid: e6524d59d9bc67545b0eb1304bfb9d4b, + type: 3} + EnumField: {fileID: 1444953514731475975, guid: f19a14cd178d48f49ace9ad217bea2ed, + type: 3} + BoolField: {fileID: 7661950293931311388, guid: 001ad6a15f0d582458d359c0ae4405ed, + type: 3} + PropertyButton: {fileID: 4311087511401681413, guid: 99bde06e2f0ca504bb95f2a4e3429462, + type: 3} + ButtonField: {fileID: 6566784227922820057, guid: 6db1feb4cda7b8c419384cd42c85a5c4, + type: 3} + IncrementField: {fileID: 5486709585343280439, guid: 9c14c92a1a08b0a4fb4f6aa6f8504082, + type: 3} + Content: {fileID: 1000515313} + SelectedChild: {fileID: 0} + CancelClickCatcher: {fileID: 0} + ButtonGroup: {fileID: 1985290576} + Cancel: {fileID: 1719922918} + Confirm: {fileID: 306118577} + ConfirmText: {fileID: 306118576} + CancelText: {fileID: 1719922917} +--- !u!114 &1000515315 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000515312} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 8 + m_Right: 8 + m_Top: 8 + m_Bottom: 8 + m_ChildAlignment: 0 + m_Spacing: 16 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &1000515316 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000515312} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &1131053606 GameObject: m_ObjectHideFlags: 0 @@ -1532,7 +2273,7 @@ Transform: - {fileID: 2103364770} - {fileID: 1988716753} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1311800795 GameObject: @@ -1661,7 +2402,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1340266883 GameObject: @@ -1695,7 +2436,7 @@ Transform: - {fileID: 1734434094} - {fileID: 678287591} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &1362573162 GameObject: @@ -1725,7 +2466,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1429393530 PrefabInstance: @@ -1737,7 +2478,7 @@ PrefabInstance: - target: {fileID: 463084220523011477, guid: 4a77c480b4bb2a148954bd57dfe91d0b, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 463084220523011477, guid: 4a77c480b4bb2a148954bd57dfe91d0b, type: 3} @@ -1951,6 +2692,320 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1662321234} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &1719922915 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1985290577} + m_Modifications: + - target: {fileID: 422905925398675622, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: DisableClickWhenSelected + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 685543055046964044, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_ChildControlHeight + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 685543055046964044, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_ChildForceExpandHeight + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_SizeDelta.y + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 55.675 + objectReference: {fileID: 0} + - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1713457305180270767, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_text + value: Cancel + objectReference: {fileID: 0} + - target: {fileID: 1713457305180270767, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_fontSizeBase + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 1713457305180270767, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_textInfo.lineCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1713457305180270767, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_textInfo.pageCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1713457305180270767, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_textInfo.wordCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1713457305180270767, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_textInfo.spaceCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1713457305180270767, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_textInfo.characterCount + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1713457305180270767, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_firstOverflowCharacterIndex + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_SizeDelta.y + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3873577224371502733, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3873577224371502733, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3873577224371502733, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3873577224371502733, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_SizeDelta.y + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 3873577224371502733, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3873577224371502733, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4710256612221957410, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4710256612221957410, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4710256612221957410, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4710256612221957410, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_SizeDelta.y + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 4710256612221957410, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4710256612221957410, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5931676848528526781, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_ChildControlHeight + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5931676848528526781, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_ChildForceExpandHeight + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7032199941939260770, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_ChildControlHeight + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7032199941939260770, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_ChildForceExpandHeight + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7183058363224579084, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + propertyPath: m_Name + value: Cancel Button + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} +--- !u!224 &1719922916 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2297648055057363568, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + m_PrefabInstance: {fileID: 1719922915} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1719922917 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1713457305180270767, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + m_PrefabInstance: {fileID: 1719922915} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1719922918 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3501282941175030939, guid: 2758dfa2744d7ad4d8877545189d116e, + type: 3} + m_PrefabInstance: {fileID: 1719922915} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1734434093 GameObject: m_ObjectHideFlags: 0 @@ -1984,36 +3039,6 @@ Transform: m_Father: {fileID: 1340266884} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1758349332 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1758349334} - m_Layer: 0 - m_Name: WwiseGlobal - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1758349334 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1758349332} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1854054862 GameObject: m_ObjectHideFlags: 0 @@ -2024,6 +3049,7 @@ GameObject: m_Component: - component: {fileID: 1854054864} - component: {fileID: 1854054863} + - component: {fileID: 1854054865} m_Layer: 0 m_Name: WwiseGlobal m_TagString: Untagged @@ -2070,8 +3096,20 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1854054865 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1854054862} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c3cd207057515c4438a31a6a7b548fe7, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1872107548 GameObject: m_ObjectHideFlags: 0 @@ -2153,6 +3191,71 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1872107548} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1985290576 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1985290577} + - component: {fileID: 1985290578} + m_Layer: 5 + m_Name: Buttons + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1985290577 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1985290576} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1719922916} + - {fileID: 526847152} + - {fileID: 306118575} + m_Father: {fileID: 1000515313} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1985290578 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1985290576} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &1988716752 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/TestScene.unity b/Assets/Scenes/TestScene.unity index 692ffe547..7deaa14db 100644 --- a/Assets/Scenes/TestScene.unity +++ b/Assets/Scenes/TestScene.unity @@ -136,7 +136,7 @@ GameObject: - component: {fileID: 62236176} - component: {fileID: 62236175} - component: {fileID: 62236177} - m_Layer: 0 + m_Layer: 19 m_Name: Label m_TagString: Untagged m_Icon: {fileID: 0} @@ -806,7 +806,7 @@ GameObject: - component: {fileID: 162042372} - component: {fileID: 162042371} - component: {fileID: 162042370} - m_Layer: 0 + m_Layer: 19 m_Name: Icon m_TagString: Untagged m_Icon: {fileID: 0} @@ -903,7 +903,7 @@ GameObject: - component: {fileID: 240056263} - component: {fileID: 240056262} - component: {fileID: 240056261} - m_Layer: 0 + m_Layer: 19 m_Name: IconBackground m_TagString: Untagged m_Icon: {fileID: 0} @@ -1195,7 +1195,7 @@ RectTransform: m_Children: - {fileID: 676739119} m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1293,7 +1293,7 @@ GameObject: - component: {fileID: 441433741} - component: {fileID: 441433740} - component: {fileID: 441433739} - m_Layer: 0 + m_Layer: 19 m_Name: Secondary m_TagString: Untagged m_Icon: {fileID: 0} @@ -1452,102 +1452,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 453065207} m_CullTransparentMesh: 1 ---- !u!1 &496644893 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 496644897} - - component: {fileID: 496644896} - - component: {fileID: 496644895} - - component: {fileID: 496644894} - m_Layer: 18 - m_Name: Influence (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!64 &496644894 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 496644893} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &496644895 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 496644893} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: e26829122ec0d0e4aaf1a8266d846796, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &496644896 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 496644893} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &496644897 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 496644893} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -305.7485, y: -442.5712, z: 0.02} - m_LocalScale: {x: 369.68045, y: 406.3519, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &507446966 GameObject: m_ObjectHideFlags: 0 @@ -1560,7 +1464,7 @@ GameObject: - component: {fileID: 507446969} - component: {fileID: 507446968} - component: {fileID: 507446967} - m_Layer: 0 + m_Layer: 19 m_Name: Influence Map m_TagString: Untagged m_Icon: {fileID: 0} @@ -2211,7 +2115,7 @@ GameObject: - component: {fileID: 801092332} - component: {fileID: 801092331} - component: {fileID: 801092330} - m_Layer: 0 + m_Layer: 19 m_Name: Icon m_TagString: Untagged m_Icon: {fileID: 0} @@ -2302,7 +2206,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 820952285} - m_Layer: 0 + m_Layer: 19 m_Name: Zones m_TagString: Untagged m_Icon: {fileID: 0} @@ -2550,7 +2454,7 @@ GameObject: - component: {fileID: 1124877095} - component: {fileID: 1124877096} - component: {fileID: 1124877097} - m_Layer: 0 + m_Layer: 19 m_Name: Zone m_TagString: Untagged m_Icon: {fileID: 0} @@ -2630,13 +2534,13 @@ Transform: m_GameObject: {fileID: 1183010123} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2048, y: 2048, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1940409868} - {fileID: 507446970} - {fileID: 2067021207} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1183010125 MonoBehaviour: @@ -2687,8 +2591,7 @@ MonoBehaviour: HomeIcon: {fileID: 2800000, guid: 6c9ab17a8574de140969db991b89994f, type: 3} LegendPrototype: {fileID: 652433666} IconDistance: 1 - ZoneCount: 256 - LinkDensity: 0.25 + IconBackgroundSize: 3 LabelDistance: 0.4 --- !u!1 &1187011251 GameObject: @@ -3012,7 +2915,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1388747985} - m_Layer: 0 + m_Layer: 19 m_Name: Links m_TagString: Untagged m_Icon: {fileID: 0} @@ -3049,7 +2952,7 @@ GameObject: - component: {fileID: 1404197276} - component: {fileID: 1404197280} m_Layer: 0 - m_Name: Ortho Camera + m_Name: Sector Camera m_TagString: MainCamera m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3070,17 +2973,17 @@ MonoBehaviour: volumeTrigger: {fileID: 104940730} volumeLayer: serializedVersion: 2 - m_Bits: 256 + m_Bits: 1048832 stopNaNPropagation: 1 finalBlitToCameraTarget: 0 - antialiasingMode: 3 + antialiasingMode: 2 temporalAntialiasing: jitterSpread: 0.75 sharpness: 0.25 stationaryBlending: 0.95 motionBlending: 0 subpixelMorphologicalAntialiasing: - quality: 2 + quality: 1 fastApproximateAntialiasing: fastMode: 0 keepAlpha: 0 @@ -3156,11 +3059,11 @@ Camera: far clip plane: 20 field of view: 60 orthographic: 1 - orthographic size: 1024 + orthographic size: 0.5 m_Depth: 0 m_CullingMask: serializedVersion: 2 - m_Bits: 1 + m_Bits: 524288 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -3269,7 +3172,7 @@ Camera: far clip plane: 2 field of view: 60 orthographic: 1 - orthographic size: 1024 + orthographic size: 0.5 m_Depth: 0 m_CullingMask: serializedVersion: 2 @@ -3347,7 +3250,7 @@ GameObject: - component: {fileID: 1520024709} - component: {fileID: 1520024708} - component: {fileID: 1520024707} - m_Layer: 0 + m_Layer: 19 m_Name: Primary m_TagString: Untagged m_Icon: {fileID: 0} @@ -3786,8 +3689,8 @@ GameObject: m_Component: - component: {fileID: 1812750581} - component: {fileID: 1812750580} - m_Layer: 8 - m_Name: PP + m_Layer: 20 + m_Name: SectorPostProcessing m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3954,7 +3857,7 @@ GameObject: - component: {fileID: 1940409868} - component: {fileID: 1940409867} - component: {fileID: 1940409866} - m_Layer: 0 + m_Layer: 19 m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} @@ -4037,7 +3940,7 @@ GameObject: - component: {fileID: 1955533725} - component: {fileID: 1955533724} - component: {fileID: 1955533723} - m_Layer: 0 + m_Layer: 19 m_Name: Link m_TagString: Untagged m_Icon: {fileID: 0} @@ -4472,7 +4375,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2067021207} - m_Layer: 0 + m_Layer: 19 m_Name: Contents m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Scripts/Editor/DatabaseInspector.cs b/Assets/Scripts/Editor/DatabaseInspector.cs index 04a1a095c..c98222e18 100644 --- a/Assets/Scripts/Editor/DatabaseInspector.cs +++ b/Assets/Scripts/Editor/DatabaseInspector.cs @@ -70,32 +70,6 @@ public class DatabaseInspector : EditorWindow Inspect(obj, field, inspectablesOnly); } - // if (obj is GalaxyMapLayerData mapLayer) - // { - // var global = DatabaseCache.GetAll().FirstOrDefault(); - // if (global != null) - // { - // GUILayout.Label("Preview", EditorStyles.boldLabel); - // _galaxyMat.SetFloat("Arms", global.Arms); - // _galaxyMat.SetFloat("Twist", global.Twist); - // _galaxyMat.SetFloat("TwistPower", global.TwistPower); - // _galaxyMat.SetFloat("SpokeOffset", mapLayer.SpokeOffset); - // _galaxyMat.SetFloat("SpokeScale", mapLayer.SpokeScale); - // _galaxyMat.SetFloat("CoreBoost", mapLayer.CoreBoost); - // _galaxyMat.SetFloat("CoreBoostOffset", mapLayer.CoreBoostOffset); - // _galaxyMat.SetFloat("CoreBoostPower", mapLayer.CoreBoostPower); - // _galaxyMat.SetFloat("EdgeReduction", mapLayer.EdgeReduction); - // _galaxyMat.SetFloat("NoisePosition", mapLayer.NoisePosition); - // _galaxyMat.SetFloat("NoiseAmplitude", mapLayer.NoiseAmplitude); - // _galaxyMat.SetFloat("NoiseOffset", mapLayer.NoiseOffset); - // _galaxyMat.SetFloat("NoiseGain", mapLayer.NoiseGain); - // _galaxyMat.SetFloat("NoiseLacunarity", mapLayer.NoiseLacunarity); - // _galaxyMat.SetFloat("NoiseFrequency", mapLayer.NoiseFrequency); - // var rect = GetControlRect(false, Screen.width); - // EditorGUI.DrawPreviewTexture(rect, _white, _galaxyMat); - // } - // } - if (obj is EquippableItemData equippableItemData) { var restricted = false; diff --git a/Assets/Scripts/Editor/DatabaseView.cs b/Assets/Scripts/Editor/DatabaseView.cs index ccf971bbe..c8926db1c 100644 --- a/Assets/Scripts/Editor/DatabaseView.cs +++ b/Assets/Scripts/Editor/DatabaseView.cs @@ -51,7 +51,8 @@ public class DatabaseListView : EditorWindow private Dictionary> _itemBlueprints = new Dictionary>(); private HashSet _itemBlueprintFoldouts = new HashSet(); private HashSet _itemGroupFoldouts = new HashSet(); - private DirectoryInfo _filePath; + private string _filePath => Path.Combine(ActionGameManager.GameDataDirectory.FullName, _fileName); + private string _fileName = "AetherDB.msgpack"; public Color LabelColor => EditorGUIUtility.isProSkin ? Color.white : Color.black; @@ -60,7 +61,7 @@ public class DatabaseListView : EditorWindow void OnEnable() { - _filePath = new DirectoryInfo(Application.dataPath).Parent.CreateSubdirectory("GameData"); + //_filePath = ; // Create database cache _databaseCache = new DatabaseCache(); @@ -140,16 +141,6 @@ public class DatabaseListView : EditorWindow { Event currentEvent = Event.current; EventType currentEventType = currentEvent.type; - - _view = BeginScrollView( - _view, - false, - false, - GUIStyle.none, - GUI.skin.verticalScrollbar, - GUI.skin.scrollView, - GUILayout.Width(EditorGUIUtility.currentViewWidth), - GUILayout.ExpandHeight(true)); if (currentEventType == EventType.DragUpdated) // Indicate that we don't accept drags ourselves @@ -163,24 +154,24 @@ public class DatabaseListView : EditorWindow EditorPrefs.SetString("RethinkDB.URL", _connectionString); _queryStatus = RethinkConnection.RethinkConnect(_databaseCache, _connectionString); } + // if (GUILayout.Button("Connect All")) + // { + // EditorPrefs.SetString("RethinkDB.URL", _connectionString); + // _queryStatus = RethinkConnection.RethinkConnect(_databaseCache, _connectionString, true, false); + // } } using (var h = new HorizontalScope()) { - if (GUILayout.Button("Connect All")) - { - EditorPrefs.SetString("RethinkDB.URL", _connectionString); - _queryStatus = RethinkConnection.RethinkConnect(_databaseCache, _connectionString, true, false); - } - + _fileName = TextField(_fileName); if (GUILayout.Button("Save")) { - _databaseCache.Save(_filePath.FullName); + _databaseCache.Save(_filePath); Debug.Log("Local DB Cache Saved!"); } if (GUILayout.Button("Load")) { - _databaseCache.Load(_filePath.FullName); + _databaseCache.Load(_filePath); Debug.Log("Loaded DB From Local Cache!"); } } @@ -207,18 +198,18 @@ public class DatabaseListView : EditorWindow var progressRect = GetControlRect(false, 20); EditorGUI.ProgressBar(progressRect, (float)_queryStatus.RetrievedItems/(_queryStatus.GalaxyEntries + _queryStatus.ItemsEntries), "Sync Progress"); } - // else - // { - // if(_itemBlueprints == null) - // _itemBlueprints = _databaseCache.GetAll() - // .Select(itemData => new {itemData, blueprints = _databaseCache.GetAll() - // .Where(blueprintData => blueprintData.Item == itemData.ID) - // .Select(bp => bp.ID) - // .ToList()}) - // .ToDictionary(x => x.itemData.ID, x => x.blueprints); - // } GUILayout.Space(5); + _view = BeginScrollView( + _view, + false, + false, + GUIStyle.none, + GUI.skin.verticalScrollbar, + GUI.skin.scrollView, + GUILayout.Width(EditorGUIUtility.currentViewWidth), + GUILayout.ExpandHeight(true)); + // if(GUILayout.Button("Log Cache Count")) // Debug.Log($"Cache contains {_databaseCache.AllEntries.Count()} elements"); diff --git a/Assets/Scripts/Editor/NameTools.cs b/Assets/Scripts/Editor/NameTools.cs index 95b27d03d..974ace6d2 100644 --- a/Assets/Scripts/Editor/NameTools.cs +++ b/Assets/Scripts/Editor/NameTools.cs @@ -10,6 +10,7 @@ using Random = Unity.Mathematics.Random; public class NameTools : EditorWindow { + public TextAsset[] NameFiles; public int NameGeneratorMinLength = 5; public int NameGeneratorMaxLength = 10; public int NameGeneratorOrder = 4; @@ -18,6 +19,7 @@ public class NameTools : EditorWindow private MarkovNameGenerator _nameGenerator; private bool _stripNumberTokens; + // Add menu named "My Window" to the Window menu [MenuItem("Window/Aetheria/Name Tools")] static void Init() @@ -29,6 +31,25 @@ public class NameTools : EditorWindow void OnGUI() { + ScriptableObject target = this; + SerializedObject so = new SerializedObject(target); + SerializedProperty stringsProperty = so.FindProperty("NameFiles"); + + EditorGUILayout.PropertyField(stringsProperty, true); // True means show children + so.ApplyModifiedProperties(); // Remember to apply modified properties + + if (GUILayout.Button("Save Name Files")) + { + var database = new DatabaseCache(); + foreach (var nameFile in NameFiles) + { + var entry = new NameFile(); + entry.Names = nameFile.text.Split('\n'); + database.Add(entry); + } + database.Save(Path.Combine(ActionGameManager.GameDataDirectory.FullName, "Names.msgpack")); + } + nameFile = (TextAsset) EditorGUILayout.ObjectField("Name File", nameFile, typeof(TextAsset), false); minWordLength = EditorGUILayout.IntField("Minimum File Word Length", minWordLength); NameGeneratorMinLength = EditorGUILayout.IntField("Generated Minimum Word Length", NameGeneratorMinLength); diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index 039597855..73e629e5b 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -12,10 +12,11 @@ using MessagePack; using TMPro; using UniRx; using UnityEngine; -using Unity.Mathematics; using UnityEngine.InputSystem; using UnityEngine.Rendering.PostProcessing; +using UnityEngine.Serialization; using UnityEngine.UI; +using Unity.Mathematics; using static Unity.Mathematics.math; using float2 = Unity.Mathematics.float2; using quaternion = Unity.Mathematics.quaternion; @@ -23,27 +24,41 @@ using Random = UnityEngine.Random; public class ActionGameManager : MonoBehaviour { + private static DirectoryInfo _gameDataDirectory; public static DirectoryInfo GameDataDirectory { get => _gameDataDirectory ??= new DirectoryInfo(Application.dataPath).Parent.CreateSubdirectory("GameData"); } - private static DirectoryInfo _gameDataDirectory; - + + private static DatabaseCache _database; + + public static DatabaseCache Database + { + get + { + if (_database != null) return _database; + + _database = new DatabaseCache(); + _database.Load(Path.Combine(GameDataDirectory.FullName, "AetherDB.msgpack")); + + return _database; + } + } + + private static PlayerSettings _playerSettings; public static PlayerSettings PlayerSettings { get => _playerSettings ??= File.Exists(_playerSettingsFilePath) ? MessagePackSerializer.Deserialize(File.ReadAllBytes(_playerSettingsFilePath)) : new PlayerSettings {Name = Environment.UserName}; } - private static PlayerSettings _playerSettings; private static string _playerSettingsFilePath => Path.Combine(GameDataDirectory.FullName, "PlayerSettings.msgpack"); public static void SavePlayerSettings() { File.WriteAllBytes(_playerSettingsFilePath, MessagePackSerializer.Serialize(_playerSettings)); } - - public static SavedGame Save; - + + public static Sector CurrentSector; public GameSettings Settings; public string StarterShipTemplate = "Longinus"; @@ -71,18 +86,20 @@ public class ActionGameManager : MonoBehaviour public Prototype LockIndicator; public PlaceUIElementWorldspace[] Crosshairs; public EventLog EventLog; - public SectorRenderer SectorRenderer; + [FormerlySerializedAs("SectorRenderer")] public ZoneRenderer ZoneRenderer; public CinemachineVirtualCamera DockCamera; public CinemachineVirtualCamera FollowCamera; public GameObject GameplayUI; public MenuPanel Menu; public MapRenderer MenuMap; + //public SectorRenderer SectorRenderer; + public SectorMap SectorMap; public SchematicDisplay SchematicDisplay; public SchematicDisplay TargetSchematicDisplay; public InventoryMenu Inventory; public InventoryPanel ShipPanel; public InventoryPanel TargetShipPanel; - public ConfirmationDialog ConfirmationDialog; + [FormerlySerializedAs("ConfirmationDialog")] public ConfirmationDialog Dialog; //public PlayerInput Input; @@ -105,7 +122,6 @@ public class ActionGameManager : MonoBehaviour private List _shipSubscriptions = new List(); private float _severeHeatstrokePhase; - public List PlayerEntities { get; } = new List(); public EquippedDockingBay DockingBay { get; private set; } public Entity DockedEntity { get; private set; } @@ -114,8 +130,7 @@ public class ActionGameManager : MonoBehaviour get => _currentEntity; set => _currentEntity = value; } - - public DatabaseCache ItemData { get; private set; } + public ItemManager ItemManager { get; private set; } public Zone Zone { get; private set; } public List Loadouts { get; } = new List(); @@ -130,21 +145,32 @@ public class ActionGameManager : MonoBehaviour public void SaveLoadout(EntityPack pack) { - File.WriteAllBytes(Path.Combine(_loadoutPath.FullName, $"{pack.Name}.preset"), MessagePackSerializer.Serialize(pack)); + File.WriteAllBytes(Path.Combine(_loadoutPath.FullName, $"{pack.Name}.loadout"), MessagePackSerializer.Serialize(pack)); + } + + private void OnApplicationQuit() + { + if(CurrentSector!=null) + { + SaveState(); + } + } + + public void SaveState() + { + PlayerSettings.CurrentRun = new SavedGame(CurrentSector, Zone, CurrentEntity); + SavePlayerSettings(); } void Start() { AkSoundEngine.RegisterGameObj(gameObject); - ConsoleController.MessageReceiver = this; - _loadoutPath = GameDataDirectory.CreateSubdirectory("Loadouts"); - ItemData = new DatabaseCache(); - ItemData.Load(Path.Combine(GameDataDirectory.FullName, "AetherDB.msgpack")); - ItemManager = new ItemManager(ItemData, Settings.GameplaySettings, Debug.Log); - SectorRenderer.ItemManager = ItemManager; + ItemManager = new ItemManager(Database, Settings.GameplaySettings, Debug.Log); + ZoneRenderer.ItemManager = ItemManager; + _loadoutPath = GameDataDirectory.CreateSubdirectory("Loadouts"); Loadouts.AddRange(_loadoutPath.EnumerateFiles("*.loadout") .Select(fi => MessagePackSerializer.Deserialize(File.ReadAllBytes(fi.FullName)))); @@ -158,7 +184,7 @@ public class ActionGameManager : MonoBehaviour _input.Player.MinimapZoom.performed += context => { _zoomLevelIndex = (_zoomLevelIndex + 1) % Settings.MinimapZoomLevels.Length; - SectorRenderer.MinimapDistance = Settings.MinimapZoomLevels[_zoomLevelIndex]; + ZoneRenderer.MinimapDistance = Settings.MinimapZoomLevels[_zoomLevelIndex]; }; _input.Global.MapToggle.performed += context => @@ -214,9 +240,10 @@ public class ActionGameManager : MonoBehaviour if (CurrentEntity == null) { AkSoundEngine.PostEvent("UI_Fail", gameObject); - ConfirmationDialog.Clear(); - ConfirmationDialog.Title.text = "Can't undock. You dont have a ship!"; - ConfirmationDialog.Show(); + Dialog.Clear(); + Dialog.Title.text = "Can't undock. You dont have a ship!"; + Dialog.Show(); + Dialog.MoveToCursor(); } else if (CurrentEntity.Parent == null) Dock(); else Undock(); @@ -226,15 +253,15 @@ public class ActionGameManager : MonoBehaviour { if(CurrentEntity is Ship ship) { - foreach (var wormhole in SectorRenderer.WormholeInstances.Keys) + foreach (var wormhole in ZoneRenderer.WormholeInstances.Keys) { if (length(wormhole.Position - CurrentEntity.Position.xz) < Settings.GameplaySettings.WormholeExitRadius) { ship.EnterWormhole(wormhole.Position); ship.OnEnteredWormhole += () => { - GenerateLevel(); - ship.ExitWormhole(SectorRenderer.WormholeInstances.Keys.First().Position, + GenerateLevel(wormhole.Target); + ship.ExitWormhole(ZoneRenderer.WormholeInstances.Keys.First().Position, Settings.GameplaySettings.WormholeExitVelocity * ItemManager.Random.NextFloat2Direction()); CurrentEntity.Zone = Zone; }; @@ -418,36 +445,33 @@ public class ActionGameManager : MonoBehaviour #endregion StartGame(); - // ConsoleController.AddCommand("editmode", _ => ToggleEditMode()); - ConsoleController.AddCommand("savezone", args => - { - if (args.Length > 0) - Zone.Data.Name = args[0]; - SaveZone(); - }); - - // MapButton.onClick.AddListener(() => - // { - // if (_currentMenuTabButton == MapPanel) return; - // - // _currentMenuTabButton.GetComponent().color = Color.white; - // _currentMenuTabButton = MapButton; - // }); - // - //InventoryPanel.Display(ItemManager, entity); } - public void GenerateLevel() + public void GenerateLevel(SectorZone sectorZone = null) { - var zonePack = ZoneGenerator.GenerateZone( - settings: Settings.ZoneSettings, - // mapLayers: Context.MapLayers, - // resources: Context.Resources, - mass: Settings.DefaultZoneMass, - radius: Settings.DefaultZoneRadius - ); + if (sectorZone != null) + { + if (sectorZone.Contents == null) + { + sectorZone.PackedContents ??= ZoneGenerator.GenerateZone( + settings: Settings.ZoneSettings, + mass: Settings.DefaultZoneMass, + radius: Settings.DefaultZoneRadius + ); + sectorZone.Contents = new Zone(ItemManager, Settings.PlanetSettings, sectorZone.PackedContents, sectorZone); + } + Zone = sectorZone.Contents; + } + else + { + var zonePack = ZoneGenerator.GenerateZone( + settings: Settings.ZoneSettings, + mass: Settings.DefaultZoneMass, + radius: Settings.DefaultZoneRadius + ); + Zone = new Zone(ItemManager, Settings.PlanetSettings, zonePack, sectorZone); + } - Zone = new Zone(ItemManager, Settings.PlanetSettings, zonePack); Zone.Log = s => Debug.Log($"Zone: {s}"); if (CurrentEntity != null) @@ -462,7 +486,7 @@ public class ActionGameManager : MonoBehaviour CurrentEntity.Activate(); } - SectorRenderer.LoadZone(Zone); + ZoneRenderer.LoadZone(Zone); if (CurrentEntity != null) { @@ -514,29 +538,45 @@ public class ActionGameManager : MonoBehaviour private void StartGame() { - GenerateLevel(); + if (CurrentSector != null) + { + if (PlayerSettings.CurrentRun == null) + { + GenerateLevel(CurrentSector.Entrance); + var ship = EntitySerializer.Unpack(ItemManager, Zone, Loadouts.First(x => x.Name == StarterShipTemplate), true); + ship.Zone = Zone; + Zone.Entities.Add(ship); + ship.Activate(); + BindToEntity(ship); + } + else + { + GenerateLevel(CurrentSector.Zones[PlayerSettings.CurrentRun.CurrentZone]); + var targetEntity = Zone.Entities[PlayerSettings.CurrentRun.CurrentZoneEntity]; + if (targetEntity is OrbitalEntity orbitalEntity) + DoDock(orbitalEntity, orbitalEntity.DockingBays.First()); + else + BindToEntity(targetEntity); + } + } + else GenerateLevel(); - var stationType = ItemData.GetAll().First(x=>x.HullType==HullType.Station); - var stationHull = ItemManager.CreateInstance(stationType) as EquippableItem; - var stationParent = Zone.PlanetInstances.Values.OrderByDescending(p => p.BodyData.Mass.Value).ElementAt(3); - var stationParentOrbit = stationParent.Orbit.Data.ID; - var stationParentPos = Zone.GetOrbitPosition(stationParentOrbit); - var stationPos = stationParentPos + ItemManager.Random.NextFloat2Direction() * stationParent.GravityWellRadius.Value * .1f; - var stationOrbit = Zone.CreateOrbit(stationParentOrbit, stationPos); - var station = new OrbitalEntity(ItemManager, Zone, stationHull, stationOrbit.ID, Settings.DefaultEntitySettings); - Zone.Entities.Add(station); - var dockingBayData = ItemData.GetAll().First(); - var dockingBay = ItemManager.CreateInstance(dockingBayData) as EquippableItem; - station.TryEquip(dockingBay); - station.Activate(); + // var stationType = Database.GetAll().First(x=>x.HullType==HullType.Station); + // var stationHull = ItemManager.CreateInstance(stationType) as EquippableItem; + // var stationParent = Zone.PlanetInstances.Values.OrderByDescending(p => p.BodyData.Mass.Value).ElementAt(3); + // var stationParentOrbit = stationParent.Orbit.Data.ID; + // var stationParentPos = Zone.GetOrbitPosition(stationParentOrbit); + // var stationPos = stationParentPos + ItemManager.Random.NextFloat2Direction() * stationParent.GravityWellRadius.Value * .1f; + // var stationOrbit = Zone.CreateOrbit(stationParentOrbit, stationPos); + // var station = new OrbitalEntity(ItemManager, Zone, stationHull, stationOrbit.ID, Settings.DefaultEntitySettings); + // Zone.Entities.Add(station); + // var dockingBayData = Database.GetAll().First(); + // var dockingBay = ItemManager.CreateInstance(dockingBayData) as EquippableItem; + // station.TryEquip(dockingBay); + // station.Activate(); + // + // DoDock(station, station.DockingBays.First()); - DoDock(station, station.DockingBays.First()); - - // var ship = EntityPack.Unpack(ItemManager, Zone, Loadouts.First(x => x.Name == StarterShipTemplate), true); - // ship.Zone = Zone; - // Zone.Entities.Add(ship); - // ship.Activate(); - // BindToEntity(ship); // ship.ExitWormhole( // SectorRenderer.WormholeInstances.Keys.First().Position, // ItemManager.Random.NextFloat2Direction() * Settings.GameplaySettings.WormholeExitVelocity); @@ -569,14 +609,14 @@ public class ActionGameManager : MonoBehaviour private void DoDock(Entity entity, EquippedDockingBay dockingBay) { DockedEntity = entity; - SectorRenderer.PerspectiveEntity = DockedEntity; + ZoneRenderer.PerspectiveEntity = DockedEntity; DockingBay = dockingBay; DockCamera.enabled = true; FollowCamera.enabled = false; var orbital = (OrbitalEntity) entity; - DockCamera.Follow = SectorRenderer.EntityInstances[orbital].transform; + DockCamera.Follow = ZoneRenderer.EntityInstances[orbital].transform; var parentOrbit = Zone.Orbits[orbital.OrbitData].Data.Parent; - var parentPlanet = SectorRenderer.Planets[Zone.Planets.FirstOrDefault(p => p.Value.Orbit == parentOrbit).Key]; + var parentPlanet = ZoneRenderer.Planets[Zone.Planets.FirstOrDefault(p => p.Value.Orbit == parentOrbit).Key]; DockCamera.LookAt = parentPlanet.Body.transform; Menu.ShowTab(MenuTab.Inventory); } @@ -588,23 +628,26 @@ public class ActionGameManager : MonoBehaviour { if (CurrentEntity.GetBehavior() == null) { - ConfirmationDialog.Clear(); - ConfirmationDialog.Title.text = "Can't undock. Missing cockpit component!"; - ConfirmationDialog.Show(); + Dialog.Clear(); + Dialog.Title.text = "Can't undock. Missing cockpit component!"; + Dialog.Show(); + Dialog.MoveToCursor(); AkSoundEngine.PostEvent("UI_Fail", gameObject); } else if (CurrentEntity.GetBehavior() == null) { - ConfirmationDialog.Clear(); - ConfirmationDialog.Title.text = "Can't undock. Missing thruster component!"; - ConfirmationDialog.Show(); + Dialog.Clear(); + Dialog.Title.text = "Can't undock. Missing thruster component!"; + Dialog.Show(); + Dialog.MoveToCursor(); AkSoundEngine.PostEvent("UI_Fail", gameObject); } else if (CurrentEntity.GetBehavior() == null) { - ConfirmationDialog.Clear(); - ConfirmationDialog.Title.text = "Can't undock. Missing reactor component!"; - ConfirmationDialog.Show(); + Dialog.Clear(); + Dialog.Title.text = "Can't undock. Missing reactor component!"; + Dialog.Show(); + Dialog.MoveToCursor(); AkSoundEngine.PostEvent("UI_Fail", gameObject); } else if (CurrentEntity.Parent.TryUndock(ship)) @@ -614,8 +657,9 @@ public class ActionGameManager : MonoBehaviour } else { - ConfirmationDialog.Title.text = "Can't undock. Must empty docking bay!"; - ConfirmationDialog.Show(); + Dialog.Title.text = "Can't undock. Must empty docking bay!"; + Dialog.Show(); + Dialog.MoveToCursor(); AkSoundEngine.PostEvent("UI_Fail", gameObject); } } @@ -641,7 +685,7 @@ public class ActionGameManager : MonoBehaviour private void BindToEntity(Entity entity) { - if (!SectorRenderer.EntityInstances.ContainsKey(entity)) + if (!ZoneRenderer.EntityInstances.ContainsKey(entity)) { Debug.LogError($"Attempted to bind to entity {entity.Name}, but SectorRenderer has no such instance!"); return; @@ -649,7 +693,7 @@ public class ActionGameManager : MonoBehaviour CurrentEntity = entity; DeathPP.weight = 0; - SectorRenderer.PerspectiveEntity = CurrentEntity; + ZoneRenderer.PerspectiveEntity = CurrentEntity; Menu.gameObject.SetActive(false); DockedEntity = null; @@ -663,17 +707,17 @@ public class ActionGameManager : MonoBehaviour ShipPanel.Display(CurrentEntity, true); SchematicDisplay.ShowShip(CurrentEntity); - FollowCamera.LookAt = SectorRenderer.EntityInstances[CurrentEntity].LookAtPoint; - FollowCamera.Follow = SectorRenderer.EntityInstances[CurrentEntity].transform; + FollowCamera.LookAt = ZoneRenderer.EntityInstances[CurrentEntity].LookAtPoint; + FollowCamera.Follow = ZoneRenderer.EntityInstances[CurrentEntity].transform; _articulationGroups = CurrentEntity.Equipment .Where(item => item.Behaviors.Any(x => x.Data is WeaponData && !(x.Data is LauncherData))) - .GroupBy(item => SectorRenderer.EntityInstances[CurrentEntity] + .GroupBy(item => ZoneRenderer.EntityInstances[CurrentEntity] .GetBarrel(CurrentEntity.Hardpoints[item.Position.x, item.Position.y]) .GetComponentInParent()?.Group ?? -1) .Select((group, index) => { return ( group.Select(item => CurrentEntity.Hardpoints[item.Position.x, item.Position.y]).ToArray(), - group.Select(item => SectorRenderer.EntityInstances[CurrentEntity].GetBarrel(CurrentEntity.Hardpoints[item.Position.x, item.Position.y])).ToArray(), + group.Select(item => ZoneRenderer.EntityInstances[CurrentEntity].GetBarrel(CurrentEntity.Hardpoints[item.Position.x, item.Position.y])).ToArray(), Crosshairs[index] ); }).ToArray(); @@ -715,9 +759,10 @@ public class ActionGameManager : MonoBehaviour var deathTime = Time.time; UnbindEntity(); CurrentEntity = null; - ConfirmationDialog.Clear(); - ConfirmationDialog.Title.text = "You have died!"; - ConfirmationDialog.Show(StartGame, null, "Try again!"); + Dialog.Clear(); + Dialog.Title.text = "You have died!"; + Dialog.Show(StartGame, null, "Try again!"); + Dialog.MoveToCursor(); Observable.EveryUpdate() .Select(_ => (Time.time - deathTime) / DeathPPTransitionTime) .Where(t => t < 1) @@ -742,8 +787,8 @@ public class ActionGameManager : MonoBehaviour }).ToArray(); } - public void SaveZone() => File.WriteAllBytes( - Path.Combine(_gameDataDirectory.FullName, $"{Zone.Data.Name}.zone"), MessagePackSerializer.Serialize(Zone.Pack())); + public void SaveZone(string name) => File.WriteAllBytes( + Path.Combine(_gameDataDirectory.FullName, $"{name}.zone"), MessagePackSerializer.Serialize(Zone.PackZone())); // public void ToggleEditMode() // { @@ -758,7 +803,7 @@ public class ActionGameManager : MonoBehaviour { foreach (var bay in CurrentEntity.Parent.DockingBays) { - if (PlayerEntities.Contains(bay.DockedShip)) yield return bay; + if (bay.DockedShip.IsPlayerShip) yield return bay; } } } @@ -766,9 +811,9 @@ public class ActionGameManager : MonoBehaviour public IEnumerable AvailableEntities() { if(DockedEntity != null) - foreach (var entity in PlayerEntities) + foreach (var entity in DockedEntity.Children) { - if (DockedEntity.Children.Contains(entity)) yield return entity; + if (entity is Ship { IsPlayerShip: true }) yield return entity; } else if (CurrentEntity != null) yield return CurrentEntity; @@ -809,7 +854,7 @@ public class ActionGameManager : MonoBehaviour } } Zone.Update(_time, Time.deltaTime); - SectorRenderer.GameTime = _time; + ZoneRenderer.GameTime = _time; } private void LateUpdate() @@ -821,7 +866,7 @@ public class ActionGameManager : MonoBehaviour { if (CurrentEntity == null || CurrentEntity.Parent != null) return; - ViewDot.Target = SectorRenderer.EntityInstances[CurrentEntity].LookAtPoint.position; + ViewDot.Target = ZoneRenderer.EntityInstances[CurrentEntity].LookAtPoint.position; if (CurrentEntity.Target.Value != null) TargetIndicator.Target = CurrentEntity.Target.Value.Position; var distance = length((float3)ViewDot.Target - CurrentEntity.Position); diff --git a/Assets/Scripts/Gameplay/EntityInstance.cs b/Assets/Scripts/Gameplay/EntityInstance.cs index 81b2db921..29ffc5157 100644 --- a/Assets/Scripts/Gameplay/EntityInstance.cs +++ b/Assets/Scripts/Gameplay/EntityInstance.cs @@ -44,7 +44,7 @@ public class EntityInstance : MonoBehaviour public Dictionary RadiatorMeshes { get; private set; } public Transform LookAtPoint { get; private set; } public Entity Entity { get; private set; } - public SectorRenderer SectorRenderer { get; private set; } + public ZoneRenderer ZoneRenderer { get; private set; } public bool Visible { get => _fade > 0.01f; @@ -132,11 +132,11 @@ public class EntityInstance : MonoBehaviour _fadingIn = false; } - public virtual void SetEntity(SectorRenderer sectorRenderer, Entity entity) + public virtual void SetEntity(ZoneRenderer zoneRenderer, Entity entity) { gameObject.name = entity.Name; Entity = entity; - SectorRenderer = sectorRenderer; + ZoneRenderer = zoneRenderer; var hullData = entity.ItemManager.GetData(entity.Hull) as HullData; if(Shield) @@ -161,7 +161,7 @@ public class EntityInstance : MonoBehaviour } instantWeapon.OnFire += () => - _instantWeaponManagers[data].Fire(instantWeapon, item, this, entity.Target.Value != null && SectorRenderer.EntityInstances.ContainsKey(entity.Target.Value) ? SectorRenderer.EntityInstances[entity.Target.Value] : null); + _instantWeaponManagers[data].Fire(instantWeapon, item, this, entity.Target.Value != null && ZoneRenderer.EntityInstances.ContainsKey(entity.Target.Value) ? ZoneRenderer.EntityInstances[entity.Target.Value] : null); if (behavior is ChargedWeapon chargedWeapon) { @@ -190,7 +190,7 @@ public class EntityInstance : MonoBehaviour } constantWeapon.OnStartFiring += () => - _constantWeaponManagers[data].StartFiring(data, item, this, entity.Target.Value != null ? SectorRenderer.EntityInstances[entity.Target.Value] : null); + _constantWeaponManagers[data].StartFiring(data, item, this, entity.Target.Value != null ? ZoneRenderer.EntityInstances[entity.Target.Value] : null); constantWeapon.OnStopFiring += () => _constantWeaponManagers[data].StopFiring(item); } diff --git a/Assets/Scripts/Gameplay/GameSettings.cs b/Assets/Scripts/Gameplay/GameSettings.cs index ad085e9fd..5174a47d4 100644 --- a/Assets/Scripts/Gameplay/GameSettings.cs +++ b/Assets/Scripts/Gameplay/GameSettings.cs @@ -27,7 +27,6 @@ public class GameSettings : ScriptableObject public PlanetSettings PlanetSettings; public ZoneGenerationSettings ZoneSettings; public GameplaySettings GameplaySettings; - public EntitySettings DefaultEntitySettings; public Color HullHitColor; public Color ArmorHitColor; public Color HardpointHitColor; diff --git a/Assets/Scripts/Gameplay/ShipInstance.cs b/Assets/Scripts/Gameplay/ShipInstance.cs index d95522689..e74dfbabd 100644 --- a/Assets/Scripts/Gameplay/ShipInstance.cs +++ b/Assets/Scripts/Gameplay/ShipInstance.cs @@ -8,9 +8,9 @@ public class ShipInstance : EntityInstance public Ship Ship { get; private set; } - public override void SetEntity(SectorRenderer sectorRenderer, Entity entity) + public override void SetEntity(ZoneRenderer zoneRenderer, Entity entity) { - base.SetEntity(sectorRenderer, entity); + base.SetEntity(zoneRenderer, entity); var ship = entity as Ship; if (ship == null) { diff --git a/Assets/Scripts/MainMenu.cs b/Assets/Scripts/MainMenu.cs index 24e7f1776..c4f50fdfe 100644 --- a/Assets/Scripts/MainMenu.cs +++ b/Assets/Scripts/MainMenu.cs @@ -2,14 +2,20 @@ using System; using System.Collections; using System.Collections.Generic; using System.IO; +using System.Threading; +using System.Threading.Tasks; using TMPro; +using UniRx; using UnityEngine; using UnityEngine.SceneManagement; using UnityEngine.UI; using static Unity.Mathematics.math; +using Random = UnityEngine.Random; public class MainMenu : MonoBehaviour { + public SectorGenerationSettings Settings; + public ConfirmationDialog Dialog; public bool InGame; public Prototype PanelPrototype; public float FadeTime = .5f; @@ -22,10 +28,13 @@ public class MainMenu : MonoBehaviour private float _fadeLerp; private bool _fading; private Vector3 _panelPosition; - private DirectoryInfo _saveDirectory; + //private Task _databaseLoad; void Start() { + // Start loading the database in the background 'cause it takes a few seconds + //_databaseLoad = Task.Run(() => ActionGameManager.Database); + RegisterResolver.Register(); _panelPosition = PanelPrototype.transform.position; @@ -36,7 +45,7 @@ public class MainMenu : MonoBehaviour _nextMenu = (panel2, panel2.GetComponent()); _currentMenu.panel.gameObject.SetActive(false); - _saveDirectory = ActionGameManager.GameDataDirectory.CreateSubdirectory("Saves"); + //_saveDirectory = ActionGameManager.GameDataDirectory.CreateSubdirectory("Saves"); ShowMain(); Fade(true); @@ -84,14 +93,36 @@ public class MainMenu : MonoBehaviour if (!InGame) { if(ActionGameManager.PlayerSettings.CurrentRun != null) - _nextMenu.panel.AddButton("Continue", () => SceneManager.LoadScene("ARPG")); + _nextMenu.panel.AddButton("Continue", + () => + { + ActionGameManager.CurrentSector = new Sector(ActionGameManager.Database, ActionGameManager.PlayerSettings.CurrentRun); + SceneManager.LoadScene("ARPG"); + }); else _nextMenu.panel.AddButton("Continue", null); } _nextMenu.panel.AddButton("New Game", () => { - // TODO: Initialize Run + var generatorState = "Loading Database Contents"; + Action setState = s => generatorState = s; + + Fade(true); + _nextMenu.panel.gameObject.SetActive(false); + Dialog.Clear(); + Dialog.Title.text = "Generating Galaxy"; + Dialog.AddProperty(() => generatorState); + Dialog.Show(); + Settings.NoisePosition = Random.value * 100; + + var task = Task.Run(() => new Sector(Settings, ActionGameManager.Database, 0, setState)); + task.ContinueWith(task => Observable.NextFrame().Subscribe(_ => + { + ActionGameManager.PlayerSettings.CurrentRun = null; + ActionGameManager.CurrentSector = task.Result; + SceneManager.LoadScene("ARPG"); + })); }); _nextMenu.panel.AddButton("Settings", () => diff --git a/Assets/Scripts/RethinkConnection.cs b/Assets/Scripts/RethinkConnection.cs index b4b1acf61..e7c35a6b1 100644 --- a/Assets/Scripts/RethinkConnection.cs +++ b/Assets/Scripts/RethinkConnection.cs @@ -147,10 +147,10 @@ public static class RethinkConnection } }).WrapErrors(); - Observable.Timer(DateTimeOffset.Now, TimeSpan.FromSeconds(60)).Subscribe(_ => - { - Debug.Log(R.Now().Run(connection).ToString() as string); - }); + // Observable.Timer(DateTimeOffset.Now, TimeSpan.FromSeconds(60)).Subscribe(_ => + // { + // Debug.Log(R.Now().Run(connection).ToString() as string); + // }); return status; } diff --git a/Assets/Scripts/Sector Display/MapView.cs b/Assets/Scripts/Sector Display/MapView.cs index 124188940..c7a7d4d58 100644 --- a/Assets/Scripts/Sector Display/MapView.cs +++ b/Assets/Scripts/Sector Display/MapView.cs @@ -7,6 +7,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.InputSystem; +using UnityEngine.Serialization; public class MapView : MonoBehaviour { @@ -15,7 +16,7 @@ public class MapView : MonoBehaviour public Camera Minimap; public MeshRenderer GravityRenderer; public float ZoomSpeed; - public SectorRenderer SectorRenderer; + [FormerlySerializedAs("SectorRenderer")] public ZoneRenderer ZoneRenderer; private Transform _minimapTransform; private CopyTransform _minimapCopyTransform; @@ -57,7 +58,7 @@ public class MapView : MonoBehaviour void SetZoom() { - SectorRenderer.ViewDistance = _viewDistance * _aspectRatio; + ZoneRenderer.ViewDistance = _viewDistance * _aspectRatio; Minimap.orthographicSize = MinimapGravity.orthographicSize = _viewDistance; _gravityRendererTransform.localScale = new Vector3(_viewDistance*_aspectRatio*2, _viewDistance*2, 1); } diff --git a/Assets/Scripts/Sector Display/SectorRenderer.cs b/Assets/Scripts/Sector Display/ZoneRenderer.cs similarity index 97% rename from Assets/Scripts/Sector Display/SectorRenderer.cs rename to Assets/Scripts/Sector Display/ZoneRenderer.cs index 87dac7279..99cc893eb 100644 --- a/Assets/Scripts/Sector Display/SectorRenderer.cs +++ b/Assets/Scripts/Sector Display/ZoneRenderer.cs @@ -16,7 +16,7 @@ using Unity.Mathematics; using static Unity.Mathematics.math; using float2 = Unity.Mathematics.float2; -public class SectorRenderer : MonoBehaviour +public class ZoneRenderer : MonoBehaviour { public Transform WormholePrefab; public float EntityFadeTime; @@ -151,7 +151,7 @@ public class SectorRenderer : MonoBehaviour ClearZone(); _maxDepth = 0; Zone = zone; - SectorBrushes.localScale = zone.Data.Radius * 2 * Vector3.one; + SectorBrushes.localScale = zone.Pack.Radius * 2 * Vector3.one; foreach(var p in zone.Planets.Values) LoadPlanet(p); @@ -187,12 +187,15 @@ public class SectorRenderer : MonoBehaviour LoadEntity(entity); zone.Entities.ObserveAdd().Subscribe(e => LoadEntity(e.Value)); zone.Entities.ObserveRemove().Subscribe(e => UnloadEntity(e.Value)); - - var southernWormhole = new Wormhole {Position = float2(0, -Settings.DefaultZoneRadius * Settings.WormholeDistanceRatio)}; - AddWormhole(southernWormhole); - var northernWormhole = new Wormhole {Position = float2(0, Settings.DefaultZoneRadius * Settings.WormholeDistanceRatio)}; - AddWormhole(northernWormhole); + if(zone.SectorZone != null) + { + foreach (var adjacentZone in zone.SectorZone.AdjacentZones) + { + var dir = normalize(adjacentZone.Position - zone.SectorZone.Position); + AddWormhole(new Wormhole {Position = dir * Settings.DefaultZoneRadius * Settings.WormholeDistanceRatio}); + } + } } public void AddWormhole(Wormhole wormhole) diff --git a/Assets/Scripts/Sector Display/SectorRenderer.cs.meta b/Assets/Scripts/Sector Display/ZoneRenderer.cs.meta similarity index 100% rename from Assets/Scripts/Sector Display/SectorRenderer.cs.meta rename to Assets/Scripts/Sector Display/ZoneRenderer.cs.meta diff --git a/Assets/Scripts/ServerShared/Corporations.cs b/Assets/Scripts/ServerShared/Corporations.cs index d54b40152..b02d4d0a2 100644 --- a/Assets/Scripts/ServerShared/Corporations.cs +++ b/Assets/Scripts/ServerShared/Corporations.cs @@ -62,16 +62,14 @@ public class MegaCorporation : DatabaseEntry, INamedEntry [InspectableColor, JsonProperty("secondaryColor"), Key(8)] public float3 SecondaryColor; - [InspectableTextAsset, JsonProperty("geonames"), Key(9)] - public string GeonameFile; + [InspectableDatabaseLink(typeof(NameFile)), JsonProperty("nameFile"), Key(9)] + public Guid GeonameFile; [InspectableDatabaseLink(typeof(HullData)), JsonProperty("bossHull"), Key(10)] public Guid BossHull; [InspectableField, JsonProperty("influence"), Key(11)] public int InfluenceDistance = 4; - - [IgnoreMember] public MarkovNameGenerator NameGenerator { get; set; } [IgnoreMember] public string EntryName { @@ -79,3 +77,10 @@ public class MegaCorporation : DatabaseEntry, INamedEntry set => Name = value; } } + +[Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)] +public class NameFile : DatabaseEntry +{ + [JsonProperty("names"), Key(1)] + public string[] Names; +} diff --git a/Assets/Scripts/ServerShared/DatabaseCache.cs b/Assets/Scripts/ServerShared/DatabaseCache.cs index e55358c3f..50ec7f2d7 100644 --- a/Assets/Scripts/ServerShared/DatabaseCache.cs +++ b/Assets/Scripts/ServerShared/DatabaseCache.cs @@ -118,6 +118,6 @@ public class DatabaseCache { RegisterResolver.Register(); var entries = AllEntries.ToArray(); - File.WriteAllBytes(Path.Combine(path, "AetherDB.msgpack"), MessagePackSerializer.Serialize(entries)); + File.WriteAllBytes(path, MessagePackSerializer.Serialize(entries)); } } \ No newline at end of file diff --git a/Assets/Scripts/ServerShared/DatabaseEntry.cs b/Assets/Scripts/ServerShared/DatabaseEntry.cs index 535601d47..7dd4b3c16 100644 --- a/Assets/Scripts/ServerShared/DatabaseEntry.cs +++ b/Assets/Scripts/ServerShared/DatabaseEntry.cs @@ -27,8 +27,8 @@ public interface INamedEntry Union(6, typeof(EquippableItem)), Union(7, typeof(BlueprintData)), Union(8, typeof(GalaxyMapLayerData)), - // Union(9, typeof(GlobalData)), - Union(10, typeof(ZoneData)), + Union(9, typeof(NameFile)), + //Union(10, typeof(ZoneData)), Union(11, typeof(PlayerData)), Union(12, typeof(Corporation)), Union(13, typeof(MegaCorporation)), @@ -56,4 +56,7 @@ public abstract class DatabaseEntry { [JsonProperty("id"), Key(0)] public Guid ID = Guid.NewGuid(); + + [IgnoreMember] + public DatabaseCache Database; } \ No newline at end of file diff --git a/Assets/Scripts/ServerShared/EntitySerializer.cs b/Assets/Scripts/ServerShared/EntitySerializer.cs index 838c5065f..7cf6a3701 100644 --- a/Assets/Scripts/ServerShared/EntitySerializer.cs +++ b/Assets/Scripts/ServerShared/EntitySerializer.cs @@ -8,7 +8,6 @@ using Unity.Mathematics; public static class EntitySerializer { - public static EntityPack Pack(Entity entity) { EntityPack pack; @@ -21,9 +20,12 @@ public static class EntitySerializer pack = new ShipPack { Position = ship.Position, - Direction = ship.Direction + Direction = ship.Direction, + IsPlayerShip = ship.IsPlayerShip }; else throw new ArgumentException("Attempted to pack an instance of abstract class Entity!"); + + pack.Settings = entity.Settings; // Filter item behavior collections by those with any persistent behaviors // For each item create an object containing the item position and a list of persistent behaviors @@ -52,6 +54,8 @@ public static class EntitySerializer public static Entity Unpack(ItemManager itemManager, Zone zone, EntityPack pack, bool instantiate = false) { + pack.Settings ??= MessagePackSerializer.Deserialize( + MessagePackSerializer.Serialize(itemManager.GameplaySettings.DefaultEntitySettings)); return pack switch { ShipPack shipPack => Unpack(itemManager, zone, shipPack, instantiate), @@ -63,8 +67,12 @@ public static class EntitySerializer private static Ship Unpack(ItemManager itemManager, Zone zone, ShipPack pack, bool instantiate = false) { + var entity = new Ship(itemManager, zone, instantiate ? (EquippableItem) itemManager.Instantiate(pack.Hull) : pack.Hull, pack.Settings); Restore(itemManager, zone, pack, entity, instantiate); + entity.Position = pack.Position; + entity.Direction = pack.Direction; + entity.IsPlayerShip = pack.IsPlayerShip; return entity; } @@ -130,11 +138,9 @@ public static class EntitySerializer [MessagePackObject] public class ShipPack : EntityPack { - [Key(15)] - public float3 Position; - - [Key(16)] - public float2 Direction; + [Key(15)] public float3 Position; + [Key(16)] public float2 Direction; + [Key(17)] public bool IsPlayerShip; } [MessagePackObject] @@ -147,7 +153,7 @@ public class OrbitalEntityPack : EntityPack [MessagePackObject, Union(0, typeof(OrbitalEntityPack)), Union(1, typeof(ShipPack))] -public class EntityPack +public abstract class EntityPack { [Key(0)] public string Name; diff --git a/Assets/Scripts/ServerShared/MarkovNameGenerator.cs b/Assets/Scripts/ServerShared/MarkovNameGenerator.cs index 6ce743304..19deb426a 100644 --- a/Assets/Scripts/ServerShared/MarkovNameGenerator.cs +++ b/Assets/Scripts/ServerShared/MarkovNameGenerator.cs @@ -20,11 +20,10 @@ public class MarkovNameGenerator private int _maxLength; private Random _random; - public MarkovNameGenerator(ref Random random, string nameData, SectorGenerationSettings settings) + public MarkovNameGenerator(ref Random random, IEnumerable sampleNames, SectorGenerationSettings settings) { var names = new HashSet(); - var lines = nameData.Split('\n'); - foreach (var line in lines) + foreach (var line in sampleNames) { foreach(var word in line.ToUpperInvariant().Split(' ', ',', '.', '"')) if (word.Length >= settings.NameGeneratorMinLength && !names.Contains(word)) diff --git a/Assets/Scripts/ServerShared/Messages.cs b/Assets/Scripts/ServerShared/Messages.cs index f5e8da441..d09d3d025 100644 --- a/Assets/Scripts/ServerShared/Messages.cs +++ b/Assets/Scripts/ServerShared/Messages.cs @@ -18,12 +18,6 @@ using Unity.Mathematics; Union(6, typeof(ChatMessage)), Union(7, typeof(ChatBroadcastMessage)), Union(8, typeof(ChangeNameMessage)), - Union(9, typeof(GalaxyRequestMessage)), - Union(10, typeof(GalaxyResponseMessage)), - Union(11, typeof(ZoneRequestMessage)), - Union(12, typeof(ZoneResponseMessage)), - Union(13, typeof(BlueprintsRequestMessage)), - Union(14, typeof(BlueprintsResponseMessage)), MessagePackObject] public abstract class Message { @@ -88,52 +82,3 @@ public class ChangeNameMessage : Message { [Key(0)] public string Name; } - -[MessagePackObject] -public class GalaxyRequestMessage : Message -{ - //[Key(0)] public int RequiredByMessagePack; -} - -[MessagePackObject] -public class GalaxyResponseMessage : Message -{ - [Key(0)] public ZoneDefinition[] Zones; - [Key(1)] public GalaxyMapLayerData StarDensity; - // [Key(2)] public GlobalData GlobalData; -} - -[MessagePackObject] -public class ZoneDefinition -{ - [Key(0)] public Guid ZoneID; - [Key(1)] public Guid[] Links; - [Key(2)] public string Name; - [Key(3)] public float2 Position; -} - -[MessagePackObject] -public class ZoneRequestMessage : Message -{ - [Key(0)] public Guid ZoneID; -} - -[MessagePackObject] -public class ZoneResponseMessage : Message -{ - [Key(0)] public ZoneData Zone; - [Key(1)] public DatabaseEntry[] Contents; -} - -[MessagePackObject] -public class BlueprintsRequestMessage : Message -{ - -} - -[MessagePackObject] -public class BlueprintsResponseMessage : Message -{ - [Key(0)] public BlueprintData[] Blueprints; -} - diff --git a/Assets/Scripts/ServerShared/SampleElimination.cs b/Assets/Scripts/ServerShared/SampleElimination.cs index b01e4eb73..e72fdb954 100644 --- a/Assets/Scripts/ServerShared/SampleElimination.cs +++ b/Assets/Scripts/ServerShared/SampleElimination.cs @@ -85,7 +85,7 @@ public static class WeightedSampleElimination }, d_max); } - public static float2[] GeneratePoints(int count, Func density = null, Func envelope = null, uint seed = 1337) + public static float2[] GeneratePoints(int count, Func density = null, Func envelope = null, Action progressCallback = null, uint seed = 1337) { if (density == null) density = v => .5f; if (envelope == null) envelope = v => 1; @@ -101,9 +101,11 @@ public static class WeightedSampleElimination { accumulator = 0; inputSamples[sample++] = v; + progressCallback?.Invoke($"Generating Samples: {sample} / {inputSamples.Length}"); } } var outputSamples = new float2[count]; + progressCallback?.Invoke("Eliminating Samples"); Eliminate(inputSamples, outputSamples, density); return outputSamples; } diff --git a/Assets/Scripts/ServerShared/SavedGame.cs b/Assets/Scripts/ServerShared/SavedGame.cs index 83001698e..c68a23997 100644 --- a/Assets/Scripts/ServerShared/SavedGame.cs +++ b/Assets/Scripts/ServerShared/SavedGame.cs @@ -31,11 +31,15 @@ public class SavedGame [Key(7)] public int CurrentZoneEntity; + + [Key(8)] + public SectorGenerationSettings Settings; public SavedGame() { } - public SavedGame(Sector sector) + public SavedGame(Sector sector, Zone currentZone, Entity currentEntity) { + Settings = sector.Settings; Factions = sector.HomeZones.Keys.Select(f => f.ID).ToArray(); HomeZones = sector.HomeZones.ToDictionary( @@ -45,15 +49,18 @@ public class SavedGame x => Array.IndexOf(Factions, x.Key.ID), x => Array.IndexOf(sector.Zones, x.Value)); - Zones = sector.Zones.Select(zone=> new SavedZone + Zones = sector.Zones.Select(zone => new SavedZone { Name = zone.Name, Position = zone.Position, AdjacentZones = zone.AdjacentZones.Select(az=> Array.IndexOf(sector.Zones, az)).ToArray(), Factions = zone.Factions.Select(f=> Array.IndexOf(Factions, f.ID)).ToArray(), - Contents = zone.Contents.Pack(), - Owner = Array.IndexOf(Factions, zone.Owner.ID) + Contents = zone.Contents?.PackZone(), + Owner = zone.Owner == null ? -1 : Array.IndexOf(Factions, zone.Owner.ID) }).ToArray(); + + CurrentZone = Array.FindIndex(sector.Zones, zone => zone.Contents == currentZone); + CurrentZoneEntity = currentZone.Entities.IndexOf(currentEntity); Entrance = Array.IndexOf(sector.Zones, sector.Entrance); Exit = Array.IndexOf(sector.Zones, sector.Exit); diff --git a/Assets/Scripts/ServerShared/Sector.cs b/Assets/Scripts/ServerShared/Sector.cs index 4eaa99423..806ce7a5c 100644 --- a/Assets/Scripts/ServerShared/Sector.cs +++ b/Assets/Scripts/ServerShared/Sector.cs @@ -1,6 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading; +using System.Threading.Tasks; using DataStructures.ViliWonka.Heap; using MIConvexHull; using JM.LinqFaster; @@ -13,11 +15,14 @@ public class Sector public Dictionary HomeZones = new Dictionary(); public Dictionary BossZones = new Dictionary(); + public SectorGenerationSettings Settings { get; } + public MegaCorporation[] Factions { get; } public SectorZone[] Zones { get; } public SectorZone Entrance { get; } public SectorZone Exit { get; } private SectorZone[] _exitPath; + private Dictionary _nameGenerators = new Dictionary(); public SectorZone[] ExitPath { @@ -29,28 +34,30 @@ public class Sector public Sector(DatabaseCache database, SavedGame savedGame) { - var factions = savedGame.Factions.Select(database.Get).ToArray(); + Settings = savedGame.Settings; + Factions = savedGame.Factions.Select(database.Get).ToArray(); Zones = savedGame.Zones.Select(zone => { return new SectorZone { Name = zone.Name, - Position = zone.Position + Position = zone.Position, + PackedContents = zone.Contents }; }).ToArray(); for (var i = 0; i < Zones.Length; i++) { Zones[i].AdjacentZones = savedGame.Zones[i].AdjacentZones.Select(azi => Zones[azi]).ToList(); - Zones[i].Factions = savedGame.Zones[i].Factions.Select(mi => factions[mi]).ToArray(); - Zones[i].Owner = factions[savedGame.Zones[i].Owner]; + Zones[i].Factions = savedGame.Zones[i].Factions.Select(mi => Factions[mi]).ToArray(); + Zones[i].Owner = savedGame.Zones[i].Owner < 0 ? null : Factions[savedGame.Zones[i].Owner]; } HomeZones = savedGame.HomeZones.ToDictionary( - x => factions[x.Key], + x => Factions[x.Key], x => Zones[x.Value]); BossZones = savedGame.BossZones.ToDictionary( - x => factions[x.Key], + x => Factions[x.Key], x => Zones[x.Value]); Entrance = Zones[savedGame.Entrance]; @@ -59,15 +66,24 @@ public class Sector CalculateDistanceMatrix(); } - public Sector(SectorGenerationSettings settings, MegaCorporation[] factions, ref Random random, float minLineSeparation = .01f) + public Sector(SectorGenerationSettings settings, DatabaseCache database, uint seed = 0, Action progressCallback = null, float minLineSeparation = .01f) { + Settings = settings; + var megas = database.GetAll(); + var random = new Random(seed == 0 ? (uint) (DateTime.Now.Ticks % uint.MaxValue) : seed); + Factions = megas.OrderBy(x => random.NextFloat()).Take(settings.MegaCount).ToArray(); + var outputSamples = WeightedSampleElimination.GeneratePoints(settings.ZoneCount, settings.CloudDensity, - v => (.2f - lengthsq(v - float2(.5f))) * 4); + v => (.2f - lengthsq(v - float2(.5f))) * 4, + progressCallback); Zones = outputSamples.Select(v => new SectorZone {Position = v}).ToArray(); #region Link Placement + progressCallback?.Invoke("Triangulating Zone Positions"); + if(progressCallback!=null) Thread.Sleep(500); // Inserting Delay to make it seem like it's doing more work lmao + // Create a delaunay triangulation to connect adjacent sectors var triangulation = DelaunayTriangulation, Cell2> .Create(Zones.Select(z => new Vertex2(z.Position, z)).ToList(), 1e-5f); @@ -85,6 +101,8 @@ public class Sector links.Add((cell.Vertices[0].StoredObject, cell.Vertices[2].StoredObject)); } + progressCallback?.Invoke("Eliminating Zone Links"); + if(progressCallback!=null) Thread.Sleep(500); // Inserting Delay to make it seem like it's doing more work lmao foreach (var link in links.ToArray()) { foreach (var zone in Zones) @@ -133,25 +151,33 @@ public class Sector #endregion + progressCallback?.Invoke("Calculating Distance Matrix"); + if(progressCallback!=null) Thread.Sleep(500); // Inserting Delay to make it seem like it's doing more work lmao CalculateDistanceMatrix(); + progressCallback?.Invoke("Finding Chokepoints"); + if(progressCallback!=null) Thread.Sleep(500); // Inserting Delay to make it seem like it's doing more work lmao + // Entrance is the most isolated zone (highest total distance to all other zones Entrance = Zones.MaxBy(z => z.Isolation); - // Exit is the zone furthest from the exit - Exit = Zones.MaxBy(z => Exit.Distance[z]); + // Exit is the zone furthest from the entrance + Exit = Zones.MaxBy(z => Entrance.Distance[z]); // Find all zones on the exit path where removing that zone would disconnect the entrance from the exit // Disregard "corridor" zones with only two adjacent zones var chokePoints = ExitPath .Where(z => z.AdjacentZones.Count > 2 && !ConnectedRegion(Entrance, z).Contains(Exit)); - + + progressCallback?.Invoke("Placing Factions"); + if(progressCallback!=null) Thread.Sleep(500); // Inserting Delay to make it seem like it's doing more work lmao + // Choose some megas to have bosses placed based on whether a boss hull is assigned - var bossMegas = factions + var bossMegas = Factions .Where(m => m.BossHull != Guid.Empty) .Take(settings.BossCount) .ToArray(); - + // Place boss zones along the critical path as far apart from each other as possible foreach (var mega in bossMegas) { @@ -171,7 +197,7 @@ public class Sector } // Place remaining headquarters away from existing megas while also maximizing territory - foreach (var mega in factions.Where(m=>!bossMegas.Contains(m))) + foreach (var mega in Factions.Where(m=>!bossMegas.Contains(m))) { HomeZones[mega] = Zones.MaxBy(z => pow(ConnectedRegion(z, mega.InfluenceDistance).Count, HomeZones.Count) * @@ -179,24 +205,53 @@ public class Sector HomeZones.Values.Aggregate(1f, (i, os) => i * sqrt(os.Distance[z])) * BossZones.Values.Aggregate(1f, (i, os) => i * sqrt(os.Distance[z]))); } + + progressCallback?.Invoke("Calculating Faction Influence"); + if(progressCallback!=null) Thread.Sleep(500); // Inserting Delay to make it seem like it's doing more work lmao // Assign faction presence foreach (var zone in Zones) { // Factions are present in all zones within their sphere of influence - zone.Factions = factions + zone.Factions = Factions .Where(m => zone.Distance[HomeZones[m]] <= m.InfluenceDistance) .ToArray(); // Owner of a zone is the faction with the nearest headquarters - var nearestFaction = factions.MinBy(m => zone.Distance[HomeZones[m]]); + var nearestFaction = Factions.MinBy(m => zone.Distance[HomeZones[m]]); if (zone.Distance[HomeZones[nearestFaction]] <= nearestFaction.InfluenceDistance) zone.Owner = nearestFaction; } + for (var i = 0; i < Factions.Length; i++) + { + progressCallback?.Invoke($"Feeding Markov Chains: {i} / {Factions.Length}"); + //if(progressCallback!=null) Thread.Sleep(250); // Inserting Delay to make it seem like it's doing more work lmao + var faction = Factions[i]; + _nameGenerators[faction] = new MarkovNameGenerator(ref random, database.Get(faction.GeonameFile).Names, settings); + } + // Generate zone name using the owner's name generator, otherwise assign catalogue ID - foreach (var zone in Zones) - zone.Name = zone.Owner?.NameGenerator.NextName ?? $"EAC-{random.NextInt(99999).ToString()}"; + foreach (var zone in Zones) + { + if (zone.Owner != null) + { + zone.Name = _nameGenerators[zone.Owner].NextName.Trim(); + } + else + { + zone.Name = $"EAC-{random.NextInt(99999).ToString()}"; + } + } + + + progressCallback?.Invoke("Done!"); + if(progressCallback!=null) Thread.Sleep(500); // Inserting Delay to make it seem like it's doing more work lmao + } + + private void GenerateSector() + { + } // Cache distance matrix and calculate isolation for every zone (used extensively for placing stuff) @@ -328,4 +383,5 @@ public class SectorZone public MegaCorporation[] Factions; public MegaCorporation Owner; public Zone Contents; + public ZonePack PackedContents; } \ No newline at end of file diff --git a/Assets/Scripts/ServerShared/Settings.cs b/Assets/Scripts/ServerShared/Settings.cs index 4d5de9de2..592e1396d 100644 --- a/Assets/Scripts/ServerShared/Settings.cs +++ b/Assets/Scripts/ServerShared/Settings.cs @@ -61,7 +61,6 @@ public class SectorGenerationSettings public float NoiseGain; public float NoiseLacunarity; public float NoiseFrequency; - public float Zoom = 1; public float fBm(float2 p, int octaves) { @@ -80,7 +79,7 @@ public class SectorGenerationSettings public float CloudDensity(float2 uv) { - float noise = fBm(uv / Zoom + NoisePosition, 10); + float noise = fBm(uv + NoisePosition, 10); return pow(noise, CloudExponent) * CloudAmplitude; } } @@ -133,6 +132,7 @@ public class ZoneGenerationSettings [Serializable, MessagePackObject(keyAsPropertyName: true), JsonObject] public class GameplaySettings { + public EntitySettings DefaultEntitySettings; public RarityTier[] Tiers; public float DefaultShutdownPerformance = .25f; public float SevereHeatstrokeRiskThreshold = .25f; diff --git a/Assets/Scripts/ServerShared/Ship.cs b/Assets/Scripts/ServerShared/Ship.cs index dfd52b422..61d4e5be1 100644 --- a/Assets/Scripts/ServerShared/Ship.cs +++ b/Assets/Scripts/ServerShared/Ship.cs @@ -25,6 +25,7 @@ public class Ship : Entity // [IgnoreMember] public Targetable Target; public Entity HomeEntity; public float2 MovementDirection; + public bool IsPlayerShip; private HashSet _thrusterItems; private Thruster[] _allThrusters; diff --git a/Assets/Scripts/ServerShared/Wormhole.cs b/Assets/Scripts/ServerShared/Wormhole.cs index e1446c07b..a8e1bd7a3 100644 --- a/Assets/Scripts/ServerShared/Wormhole.cs +++ b/Assets/Scripts/ServerShared/Wormhole.cs @@ -3,4 +3,5 @@ using Unity.Mathematics; public class Wormhole { public float2 Position; + public SectorZone Target; } \ No newline at end of file diff --git a/Assets/Scripts/ServerShared/Zone.cs b/Assets/Scripts/ServerShared/Zone.cs index 32e18d256..c215087f1 100644 --- a/Assets/Scripts/ServerShared/Zone.cs +++ b/Assets/Scripts/ServerShared/Zone.cs @@ -34,15 +34,18 @@ public class Zone private Random _random; public List Agents = new List(); - public ZoneData Data { get; } private List BeltUpdates = new List(); + + public ZonePack Pack { get; } + public SectorZone SectorZone { get; } - public Zone(ItemManager itemManager, PlanetSettings settings, ZonePack pack) + public Zone(ItemManager itemManager, PlanetSettings settings, ZonePack pack, SectorZone sectorZone) { + SectorZone = sectorZone; + Pack = pack; _itemManager = itemManager; - Data = pack.Data; Settings = settings; - _random = new Random(Convert.ToUInt32(abs(Data.ID.GetHashCode()))); + _random = new Random(Convert.ToUInt32(abs(sectorZone?.Name.GetHashCode() ?? 1337))); foreach (var orbit in pack.Orbits) { @@ -66,19 +69,22 @@ public class Zone } } - foreach (var entity in pack.Entities) + foreach (var entityPack in pack.Entities) { - Entities.Add(EntitySerializer.Unpack(_itemManager, this, entity)); + var entity = EntitySerializer.Unpack(_itemManager, this, entityPack); + Entities.Add(entity); + entity.Activate(); } // TODO: Associate planets with stored entities for planetary colonies } - public ZonePack Pack() + public ZonePack PackZone() { return new ZonePack { - Data = Data, + Radius = Pack.Radius, + Mass = Pack.Mass, Entities = Entities.Select(EntitySerializer.Pack).ToList(), Orbits = Orbits.Values.Select(o=>o.Data).ToList(), Planets = Planets.Values.ToList() @@ -118,12 +124,6 @@ public class Zone foreach (var entity in Entities.ToArray()) entity.Update(deltaTime); } - - public float2 WormholePosition(ZoneDefinition target) - { - var direction = target.Position - Data.Position; - return normalize(direction) * Data.Radius * .95f; - } // Determine orbital position recursively, caching parent positions to avoid repeated calculations public float2 GetOrbitPosition(Guid orbitID) @@ -284,7 +284,7 @@ public class Zone } public float GetHeight(float2 position) { - float result = -PowerPulse(length(position)/(Data.Radius*2), Settings.ZoneDepthExponent) * Settings.ZoneDepth; + float result = -PowerPulse(length(position)/(Pack.Radius*2), Settings.ZoneDepthExponent) * Settings.ZoneDepth; foreach (var body in PlanetInstances.Values) { var p = position - body.Orbit.Position; //GetOrbitPosition(body.BodyData.Orbit) @@ -343,11 +343,6 @@ public class Zone float3 normal = new float3((hL - hR), (hD - hU), step*2); return normalize(normal).xzy; } - - public override int GetHashCode() - { - return Data.ID.GetHashCode(); - } } public class Planet diff --git a/Assets/Scripts/ServerShared/ZoneData.cs b/Assets/Scripts/ServerShared/ZoneData.cs index 8658f26d3..c76321563 100644 --- a/Assets/Scripts/ServerShared/ZoneData.cs +++ b/Assets/Scripts/ServerShared/ZoneData.cs @@ -13,60 +13,23 @@ using static Unity.Mathematics.math; using float2 = Unity.Mathematics.float2; using float3 = Unity.Mathematics.float3; -[RethinkTable("Galaxy"), MessagePackObject, JsonObject(MemberSerialization.OptIn)] -public class ZoneData : DatabaseEntry, INamedEntry +[MessagePackObject, JsonObject(MemberSerialization.OptIn)] +public class ZonePack { - [JsonProperty("name"), Key(1)] - public string Name; - - [JsonProperty("position"), Key(2)] - public float2 Position = 500; - + [JsonProperty("planets"), Key(0)] + public List Planets = new List(); + + [JsonProperty("orbits"), Key(1)] + public List Orbits = new List(); + + [JsonProperty("entities"), Key(2)] + public List Entities = new List(); + [JsonProperty("radius"), Key(3)] public float Radius = 2000; [JsonProperty("mass"), Key(4)] public float Mass = 10000; - - // [JsonProperty("visited"), Key(5)] - // public bool Visited; - - [JsonProperty("wormholes"), Key(5)] - public List Wormholes = new List(); - - // [JsonProperty("planets"), Key(7)] - // public Guid[] Planets;// = new List(); - // - // [JsonProperty("orbits"), Key(8)] - // public List Orbits = new List(); - - [IgnoreMember] public string EntryName - { - get => Name; - set => Name = value; - } -} - -[MessagePackObject, JsonObject(MemberSerialization.OptIn)] -public class ZonePack : INamedEntry -{ - [JsonProperty("data"), Key(0)] - public ZoneData Data; - - [JsonProperty("planets"), Key(1)] - public List Planets = new List(); - - [JsonProperty("orbits"), Key(2)] - public List Orbits = new List(); - - [JsonProperty("entities"), Key(3)] - public List Entities = new List(); - - [IgnoreMember] public string EntryName - { - get => Data.Name; - set => Data.Name = value; - } } // [RethinkTable("Galaxy"), MessagePackObject, JsonObject(MemberSerialization.OptIn)] @@ -227,7 +190,7 @@ public class OrbitData : DatabaseEntry [JsonProperty("phase"), Key(3)] public float Phase; - [JsonProperty("phase"), Key(3)] + [JsonProperty("phase"), Key(4)] public float2 FixedPosition = float2.zero; // [JsonProperty("period"), Key(4)] diff --git a/Assets/Scripts/ServerShared/ZoneGenerator.cs b/Assets/Scripts/ServerShared/ZoneGenerator.cs index 3ba71e6ca..3db1f2a10 100644 --- a/Assets/Scripts/ServerShared/ZoneGenerator.cs +++ b/Assets/Scripts/ServerShared/ZoneGenerator.cs @@ -73,19 +73,11 @@ public class ZoneGenerator Random random, int targetSubzoneCount) { - var zone = new ZoneData - { - Name = name, - Position = position - }; + + var pack = new ZonePack(); - var pack = new ZonePack - { - Data = zone - }; - - zone.Radius = radius; - zone.Mass = mass; + pack.Radius = radius; + pack.Mass = mass; //Debug.Log($"Generating zone at position {zone.Position} with radius {zoneRadius} and mass {zoneMass}"); @@ -122,11 +114,11 @@ public class ZoneGenerator var totalArea = occupiedAreas.Sum(c => c.Area); foreach (var c in occupiedAreas) { - planets.AddRange(GenerateEntities(settings, ref random, c.Area / totalArea * zone.Mass, c.Radius, c.Center)); + planets.AddRange(GenerateEntities(settings, ref random, c.Area / totalArea * pack.Mass, c.Radius, c.Center)); } } else - planets.AddRange(GenerateEntities(settings, ref random, zone.Mass, zone.Radius, float2.zero)); + planets.AddRange(GenerateEntities(settings, ref random, pack.Mass, pack.Radius, float2.zero)); // Create collections to map between zone generator output and database entries var orbitMap = new Dictionary(); diff --git a/Assets/Scripts/UI/ConfirmationDialog.cs b/Assets/Scripts/UI/ConfirmationDialog.cs index 7fdd13b4d..72ec21920 100644 --- a/Assets/Scripts/UI/ConfirmationDialog.cs +++ b/Assets/Scripts/UI/ConfirmationDialog.cs @@ -18,26 +18,20 @@ public class ConfirmationDialog : PropertiesPanel public Button Confirm; public TextMeshProUGUI ConfirmText; public TextMeshProUGUI CancelText; + + public bool LockDialog { get; set; } private Action _onCancel; private Action _onConfirm; private void Start() { - Cancel.onClick.AddListener(() => - { - _onCancel?.Invoke(); - End(); - }); - Confirm.onClick.AddListener(() => - { - _onConfirm?.Invoke(); - End(); - }); + Cancel.onClick.AddListener(() => End()); + Confirm.onClick.AddListener(() => End()); if (CancelClickCatcher != null) CancelClickCatcher.OnClick += data => { - _onCancel?.Invoke(); + if (LockDialog) return; End(); }; @@ -49,12 +43,19 @@ public class ConfirmationDialog : PropertiesPanel gameObject.SetActive(false); } - private void End() + public void End(bool success = false) { - CancelClickCatcher.gameObject.SetActive(false); + if(success) _onConfirm?.Invoke(); + else _onCancel?.Invoke(); + CancelClickCatcher?.gameObject.SetActive(false); gameObject.SetActive(false); } + public void MoveToCursor() + { + transform.position = Mouse.current.position.ReadValue(); + } + public void Show(Action onConfirm = null, Action onCancel = null, string confirmText = "OK", string cancelText = "Cancel") { gameObject.SetActive(true); @@ -69,7 +70,6 @@ public class ConfirmationDialog : PropertiesPanel ButtonGroup.SetActive(onConfirm!=null || onCancel!=null); - transform.position = Mouse.current.position.ReadValue(); - CancelClickCatcher.gameObject.SetActive(true); + CancelClickCatcher?.gameObject.SetActive(true); } } diff --git a/Assets/Scripts/UI/ConsoleView.cs b/Assets/Scripts/UI/ConsoleView.cs index 8e7a59ffd..8a28dea6d 100644 --- a/Assets/Scripts/UI/ConsoleView.cs +++ b/Assets/Scripts/UI/ConsoleView.cs @@ -38,7 +38,7 @@ public class ConsoleView : MonoBehaviour { { //AcceptingInput = false; //_console = new ConsoleController(); - Application.logMessageReceived += (condition, trace, type) => ConsoleController.Instance.AppendLogLine("" + condition + ""); + Application.logMessageReceived += OnLogCallback; SetVisibility(false); @@ -56,8 +56,14 @@ public class ConsoleView : MonoBehaviour { // var sizeFitter = GetComponentInChildren().on } - - ~ConsoleView() { + + private void OnLogCallback(string condition, string trace, LogType type) + { + ConsoleController.Instance.AppendLogLine("" + condition + ""); + } + + ~ConsoleView() { + Application.logMessageReceived -= OnLogCallback; ConsoleController.Instance.VisibilityChanged -= OnVisibilityChanged; ConsoleController.Instance.LogChanged -= OnLogChanged; } diff --git a/Assets/Scripts/UI/InventoryMenu.cs b/Assets/Scripts/UI/InventoryMenu.cs index 5e8864f7b..91dd73ad1 100644 --- a/Assets/Scripts/UI/InventoryMenu.cs +++ b/Assets/Scripts/UI/InventoryMenu.cs @@ -182,6 +182,7 @@ public class InventoryMenu : MonoBehaviour Dialog.Title.text = "Unable to move item!"; Dialog.AddProperty("Verify that cargo bays are empty before un-equipping them."); Dialog.Show(); + Dialog.MoveToCursor(); } } @@ -206,6 +207,7 @@ public class InventoryMenu : MonoBehaviour Dialog.Title.text = "Unable to destroy item!"; Dialog.AddProperty("Verify that cargo bays are empty before un-equipping them."); Dialog.Show(); + Dialog.MoveToCursor(); } } } @@ -389,6 +391,8 @@ public class InventoryMenu : MonoBehaviour panel.OnBackgroundClick.Subscribe(data => { + if (GameManager.CurrentEntity == null) return; // Only show ship settings if there's a ship, duh! + PropertiesPanel.Clear(); PropertiesPanel.AddField("Shutdown Threshold", () => GameManager.CurrentEntity.Settings.ShutdownPerformance, diff --git a/Assets/Scripts/UI/InventoryPanel.cs b/Assets/Scripts/UI/InventoryPanel.cs index b5a84226c..35b174f02 100644 --- a/Assets/Scripts/UI/InventoryPanel.cs +++ b/Assets/Scripts/UI/InventoryPanel.cs @@ -14,12 +14,13 @@ using UnityEngine.UI; using UnityEngine.EventSystems; using UnityEngine.Experimental.Rendering; using Unity.Mathematics; +using UnityEngine.Serialization; using static Unity.Mathematics.math; using int2 = Unity.Mathematics.int2; public class InventoryPanel : MonoBehaviour, IPointerClickHandler { - public ConfirmationDialog ConfirmationDialog; + [FormerlySerializedAs("ConfirmationDialog")] public ConfirmationDialog Dialog; public bool Flip; public GameSettings Settings; public ActionGameManager GameManager; @@ -113,9 +114,10 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler } else { - ConfirmationDialog.Clear(); - ConfirmationDialog.Title.text = "Can't select entity, you can only pilot a ship!"; - ConfirmationDialog.Show(); + Dialog.Clear(); + Dialog.Title.text = "Can't select entity, you can only pilot a ship!"; + Dialog.Show(); + Dialog.MoveToCursor(); } } }); @@ -157,11 +159,11 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler { var entity = EntitySerializer.Unpack(GameManager.ItemManager, GameManager.Zone, pack, true); entity.SetParent(GameManager.DockedEntity); - GameManager.PlayerEntities.Add(entity); GameManager.Credits -= pack.Price(GameManager.ItemManager); GameManager.CurrentEntity = entity; if(entity is Ship ship) { + ship.IsPlayerShip = true; GameManager.DockingBay.DockedShip = ship; } Display(entity); diff --git a/Assets/Scripts/UI/MapRenderer.cs b/Assets/Scripts/UI/MapRenderer.cs index 80cda4725..5533f1082 100644 --- a/Assets/Scripts/UI/MapRenderer.cs +++ b/Assets/Scripts/UI/MapRenderer.cs @@ -5,6 +5,7 @@ using System; using System.Collections; using System.Collections.Generic; +using TMPro; using UnityEngine; using Unity.Mathematics; using UnityEngine.UI; @@ -13,7 +14,8 @@ using int2 = Unity.Mathematics.int2; public class MapRenderer : MonoBehaviour { - public Canvas Canvas; + public ActionGameManager GameManager; + public TextMeshProUGUI Title; public Camera MapOverlayCamera; public Camera GravityCamera; public Camera TintCamera; @@ -41,6 +43,7 @@ public class MapRenderer : MonoBehaviour MapOverlayCamera.gameObject.SetActive(true); GravityCamera.gameObject.SetActive(true); TintCamera.gameObject.SetActive(true); + Title.text = $"Zone: {GameManager.Zone.SectorZone.Name}"; } private void OnDisable() @@ -75,8 +78,6 @@ public class MapRenderer : MonoBehaviour _tintTexture.Release(); _tintTexture = null; } - var canvasCorners = new Vector3[4]; - Canvas.GetComponent().GetWorldCorners(canvasCorners); _mapTexture = new RenderTexture(_size.x, _size.y, 0, RenderTextureFormat.Default); MapOverlayCamera.targetTexture = _mapTexture; OverlayDisplay.material.SetTexture("_DetailTex", _mapTexture); diff --git a/Assets/Scripts/UI/MenuPanel.cs b/Assets/Scripts/UI/MenuPanel.cs index 1f58244dd..68173a9f7 100644 --- a/Assets/Scripts/UI/MenuPanel.cs +++ b/Assets/Scripts/UI/MenuPanel.cs @@ -72,5 +72,6 @@ public enum MenuTab { Map, Inventory, - Trade + Trade, + Galaxy } \ No newline at end of file diff --git a/Assets/Scripts/UI/PropertiesPanel.cs b/Assets/Scripts/UI/PropertiesPanel.cs index f945ac133..01fc0874f 100644 --- a/Assets/Scripts/UI/PropertiesPanel.cs +++ b/Assets/Scripts/UI/PropertiesPanel.cs @@ -95,6 +95,19 @@ public class PropertiesPanel : MonoBehaviour return section; } + public Property AddProperty(Func read) + { + if (read == null) throw new ArgumentException("Attempted to add property with null read function!"); + + var property = Instantiate(Property, Content ?? transform); + property.Label.text = read(); + + RefreshPropertyValues += () => property.Label.text = read(); + Properties.Add(property.gameObject); + OnPropertyAdded?.Invoke(property.gameObject); + return property; + } + public Property AddProperty(string name, Func read = null) { Property property; @@ -348,7 +361,7 @@ public class PropertiesPanel : MonoBehaviour public void AddItemProperties(Entity entity, ItemInstance item) { var data = Context.ItemData.Get(item.Data); - AddProperty(data.Description).Label.fontStyle = FontStyles.Normal; + AddProperty(data.Description);//.Label.fontStyle = FontStyles.Normal; var manufacturer = Context.ItemData.Get(data.Manufacturer); if (manufacturer != null) { diff --git a/Assets/Scripts/UI/SectorMap.cs b/Assets/Scripts/UI/SectorMap.cs index 97d794244..67640b3b0 100644 --- a/Assets/Scripts/UI/SectorMap.cs +++ b/Assets/Scripts/UI/SectorMap.cs @@ -3,6 +3,7 @@ using System.Collections; using System.Collections.Generic; using System.IO; using System.Linq; +using MessagePack; using TMPro; using UnityEngine; using Unity.Mathematics; @@ -16,7 +17,6 @@ public class SectorMap : MonoBehaviour public Camera InfluenceCamera; public Prototype InfluenceRendererPrototype; public MeshRenderer SectorRenderer; - public SectorGenerationSettings Settings; public Prototype ZonePrototype; public Prototype LinkPrototype; public Prototype IconPrototype; @@ -38,40 +38,34 @@ public class SectorMap : MonoBehaviour private Dictionary _factionMaterials = new Dictionary(); - - void Start() + + public void Start() { - var filePath = new DirectoryInfo(Application.dataPath).Parent.CreateSubdirectory("GameData"); - var cache = new DatabaseCache(); - cache.Load(Path.Combine(filePath.FullName, "AetherDB.msgpack")); - - var megas = cache.GetAll(); - - var random = new Unity.Mathematics.Random((uint) (DateTime.Now.Ticks % uint.MaxValue)); - var sectorMegas = megas.OrderBy(x => Random.value).Take(Settings.MegaCount).ToArray(); - foreach (var mega in sectorMegas) + if (ActionGameManager.CurrentSector == null) + { + gameObject.SetActive(false); + return; + } + foreach (var mega in ActionGameManager.CurrentSector.Factions) { var primary = Instantiate(ZonePrimaryMaterial); - primary.SetColor("_TintColor", (mega.PrimaryColor * MegaPrimaryBoost).ToColor()); + primary.SetColor("_Color", (mega.PrimaryColor * MegaPrimaryBoost).ToColor()); var secondary = Instantiate(ZoneSecondaryMaterial); - secondary.SetColor("_TintColor", (mega.SecondaryColor * MegaSecondaryBoost).ToColor()); + secondary.SetColor("_Color", (mega.SecondaryColor * MegaSecondaryBoost).ToColor()); var link = Instantiate(ZoneLinkMaterial); - link.SetColor("_TintColor", (mega.PrimaryColor * MegaLinkBoost).ToColor()); - _factionMaterials.Add(mega, (new RenderTexture(1024, 1024, 1, RenderTextureFormat.RHalf), primary, secondary, link)); - mega.NameGenerator = new MarkovNameGenerator(ref random, UnityHelpers.LoadAsset(mega.GeonameFile).text, Settings); + link.SetColor("_Color", (mega.PrimaryColor * MegaLinkBoost).ToColor()); + _factionMaterials.Add(mega, (new RenderTexture(1024, 1024, 0, RenderTextureFormat.RHalf), primary, secondary, link)); var legendElement = LegendPrototype.Instantiate(); legendElement.Primary.color = mega.PrimaryColor.ToColor(); legendElement.Secondary.color = mega.SecondaryColor.ToColor(); legendElement.Label.text = mega.ShortName; } - Settings.NoisePosition = Random.value * 100; - var sector = new Sector(Settings, sectorMegas, ref random); var visitedZones = new HashSet(); - Debug.Log($"Found {sector.Zones.Count(z=>!z.AdjacentZones.Any())} orphaned zones!"); + //Debug.Log($"Found {sector.Zones.Count(z=>!z.AdjacentZones.Any())} orphaned zones!"); var zoneInstances = new Dictionary(); - foreach (var zone in sector.Zones) + foreach (var zone in ActionGameManager.CurrentSector.Zones) { var zoneInstance = ZonePrototype.Instantiate(); zoneInstances[zone] = zoneInstance; @@ -109,10 +103,10 @@ public class SectorMap : MonoBehaviour zoneText.text = zone.Name; var zoneTextTransform = zoneText.GetComponent(); zoneTextTransform.pivot = new Vector2(sign(linkDirection.x)/2+.5f,sign(linkDirection.y)/2+.5f); - zoneTextTransform.localPosition = new Vector3(-linkDirection.x * LabelDistance, -linkDirection.y * LabelDistance); + zoneTextTransform.localPosition = new Vector3(-linkDirection.x * LabelDistance, -linkDirection.y * LabelDistance, -1); visitedZones.Add(zone); - if (zone == sector.Entrance) + if (zone == ActionGameManager.CurrentSector.Entrance) { var iconInstance = IconPrototype.Instantiate(); iconInstance.material.mainTexture = EntranceIcon; @@ -122,7 +116,7 @@ public class SectorMap : MonoBehaviour iconTransform.localPosition = new Vector3(-linkDirection.x * IconDistance, -linkDirection.y * IconDistance); } - if (zone == sector.Exit) + if (zone == ActionGameManager.CurrentSector.Exit) { var iconInstance = IconPrototype.Instantiate(); iconInstance.material.mainTexture = ExitIcon; @@ -132,15 +126,16 @@ public class SectorMap : MonoBehaviour iconTransform.localPosition = new Vector3(-linkDirection.x * IconDistance, -linkDirection.y * IconDistance); } - var homeMega = sector.HomeZones.Keys.FirstOrDefault(m => sector.HomeZones[m] == zone); + var homeMega = ActionGameManager.CurrentSector.HomeZones.Keys + .FirstOrDefault(m => ActionGameManager.CurrentSector.HomeZones[m] == zone); if (homeMega != null) { var backgroundInstance = IconBackgroundPrototype.Instantiate(); var iconInstance = IconPrototype.Instantiate(); - backgroundInstance.material.SetColor("_TintColor", homeMega.SecondaryColor.ToColor()); + backgroundInstance.material.SetColor("_Color", homeMega.SecondaryColor.ToColor()); iconInstance.material.mainTexture = HomeIcon; - iconInstance.material.SetColor("_TintColor", homeMega.PrimaryColor.ToColor()); + iconInstance.material.SetColor("_Color", homeMega.PrimaryColor.ToColor()); var backgroundTransform = backgroundInstance.transform; var iconTransform = iconInstance.transform; @@ -155,15 +150,16 @@ public class SectorMap : MonoBehaviour iconTransform.localPosition = new Vector3(-linkDirection.x * IconDistance, -linkDirection.y * IconDistance); } - var bossMega = sector.BossZones.Keys.FirstOrDefault(m => sector.BossZones[m] == zone); + var bossMega = ActionGameManager.CurrentSector.BossZones.Keys + .FirstOrDefault(m => ActionGameManager.CurrentSector.BossZones[m] == zone); if (bossMega != null) { var backgroundInstance = IconBackgroundPrototype.Instantiate(); var iconInstance = IconPrototype.Instantiate(); - backgroundInstance.material.SetColor("_TintColor", bossMega.SecondaryColor.ToColor()); + backgroundInstance.material.SetColor("_Color", bossMega.SecondaryColor.ToColor()); iconInstance.material.mainTexture = BossIcon; - iconInstance.material.SetColor("_TintColor", bossMega.PrimaryColor.ToColor()); + iconInstance.material.SetColor("_Color", bossMega.PrimaryColor.ToColor()); var backgroundTransform = backgroundInstance.transform; var iconTransform = iconInstance.transform; @@ -188,10 +184,10 @@ public class SectorMap : MonoBehaviour } // Render Influence Textures - foreach (var mega in sectorMegas) + foreach (var mega in ActionGameManager.CurrentSector.Factions) { var influenceRenderer = InfluenceRendererPrototype.Instantiate(); - foreach (var zone in sector.Zones) + foreach (var zone in ActionGameManager.CurrentSector.Zones) { var instance = zoneInstances[zone]; var influence = 0f; @@ -214,21 +210,16 @@ public class SectorMap : MonoBehaviour influenceRenderer.material.mainTexture = _factionMaterials[mega].influence; influenceRenderer.material.SetColor("_Color1", mega.PrimaryColor.ToColor()); influenceRenderer.material.SetColor("_Color2", mega.SecondaryColor.ToColor()); - influenceRenderer.material.SetFloat("_FillTilt", random.NextFloat(PI)); + influenceRenderer.material.SetFloat("_FillTilt", Random.value * PI); } - } - - // Update is called once per frame - void Update() - { - SectorRenderer.material.SetFloat("CloudAmplitude", Settings.CloudAmplitude); - SectorRenderer.material.SetFloat("CloudExponent", Settings.CloudExponent); - SectorRenderer.material.SetFloat("NoisePosition", Settings.NoisePosition); - SectorRenderer.material.SetFloat("Zoom", Settings.Zoom); - SectorRenderer.material.SetFloat("NoiseAmplitude", Settings.NoiseAmplitude); - SectorRenderer.material.SetFloat("NoiseOffset", Settings.NoiseOffset); - SectorRenderer.material.SetFloat("NoiseGain", Settings.NoiseGain); - SectorRenderer.material.SetFloat("NoiseLacunarity", Settings.NoiseLacunarity); - SectorRenderer.material.SetFloat("NoiseFrequency", Settings.NoiseFrequency); + + SectorRenderer.material.SetFloat("CloudAmplitude", ActionGameManager.CurrentSector.Settings.CloudAmplitude); + SectorRenderer.material.SetFloat("CloudExponent", ActionGameManager.CurrentSector.Settings.CloudExponent); + SectorRenderer.material.SetFloat("NoisePosition", ActionGameManager.CurrentSector.Settings.NoisePosition); + SectorRenderer.material.SetFloat("NoiseAmplitude", ActionGameManager.CurrentSector.Settings.NoiseAmplitude); + SectorRenderer.material.SetFloat("NoiseOffset", ActionGameManager.CurrentSector.Settings.NoiseOffset); + SectorRenderer.material.SetFloat("NoiseGain", ActionGameManager.CurrentSector.Settings.NoiseGain); + SectorRenderer.material.SetFloat("NoiseLacunarity", ActionGameManager.CurrentSector.Settings.NoiseLacunarity); + SectorRenderer.material.SetFloat("NoiseFrequency", ActionGameManager.CurrentSector.Settings.NoiseFrequency); } } diff --git a/Assets/Scripts/UI/TradeMenu.cs b/Assets/Scripts/UI/TradeMenu.cs index 3123c59e1..70b0f2102 100644 --- a/Assets/Scripts/UI/TradeMenu.cs +++ b/Assets/Scripts/UI/TradeMenu.cs @@ -272,7 +272,7 @@ public class TradeMenu : MonoBehaviour data => () => { if (data is HullData) - return GameManager.PlayerEntities.Count(s => s.Hull.Data == data.ID && s.Parent == GameManager.DockedEntity).ToString(); + return GameManager.DockedEntity.Children.Count(s => s.Hull.Data == data.ID && s is Ship {IsPlayerShip: true}).ToString(); if(data is SimpleCommodityData) return (_targetCargo.ItemsOfType.ContainsKey(data.ID) ? _targetCargo.ItemsOfType[data.ID].Cast().Sum(s=>s.Quantity) : 0).ToString(); return (_targetCargo.ItemsOfType.ContainsKey(data.ID) ? _targetCargo.ItemsOfType[data.ID].Count : 0).ToString(); @@ -280,7 +280,7 @@ public class TradeMenu : MonoBehaviour data => { if (data is HullData) - return GameManager.PlayerEntities.Count(s => s.Hull.Data == data.ID && s.Parent == GameManager.DockedEntity); + return GameManager.DockedEntity.Children.Count(s => s.Hull.Data == data.ID && s is Ship {IsPlayerShip: true}); if(data is SimpleCommodityData) return _targetCargo.ItemsOfType.ContainsKey(data.ID) ? _targetCargo.ItemsOfType[data.ID].Cast().Sum(s=>s.Quantity) : 0; return _targetCargo.ItemsOfType.ContainsKey(data.ID) ? _targetCargo.ItemsOfType[data.ID].Count : 0; @@ -344,6 +344,7 @@ public class TradeMenu : MonoBehaviour Populate(); }); + Dialog.MoveToCursor(); }); ContextMenu.Show(); } @@ -358,10 +359,9 @@ public class TradeMenu : MonoBehaviour var hull = GameManager.ItemManager.CreateInstance(data) as EquippableItem; Entity entity; if(data.HullType==HullType.Ship) - entity = new Ship(GameManager.ItemManager, GameManager.Zone, hull, GameManager.Settings.DefaultEntitySettings); - else entity = new OrbitalEntity(GameManager.ItemManager, GameManager.Zone, hull, Guid.Empty, GameManager.Settings.DefaultEntitySettings); + entity = new Ship(GameManager.ItemManager, GameManager.Zone, hull, GameManager.Settings.GameplaySettings.DefaultEntitySettings) {IsPlayerShip = true}; + else entity = new OrbitalEntity(GameManager.ItemManager, GameManager.Zone, hull, Guid.Empty, GameManager.Settings.GameplaySettings.DefaultEntitySettings); entity.SetParent(GameManager.DockedEntity); - GameManager.PlayerEntities.Add(entity); GameManager.Credits -= data.Price; } @@ -370,6 +370,7 @@ public class TradeMenu : MonoBehaviour Dialog.Clear(); Dialog.Title.text = "Unable to buy: Insufficient Credits!"; Dialog.Show(); + Dialog.MoveToCursor(); } } @@ -388,6 +389,7 @@ public class TradeMenu : MonoBehaviour Dialog.Clear(); Dialog.Title.text = "Unable to buy: Insufficient Cargo Space!"; Dialog.Show(); + Dialog.MoveToCursor(); return; } } @@ -396,6 +398,7 @@ public class TradeMenu : MonoBehaviour Dialog.Clear(); Dialog.Title.text = "Unable to buy: Insufficient Credits!"; Dialog.Show(); + Dialog.MoveToCursor(); return; } } @@ -421,6 +424,7 @@ public class TradeMenu : MonoBehaviour Dialog.Clear(); Dialog.Title.text = "Unable to buy: Insufficient Cargo Space!"; Dialog.Show(); + Dialog.MoveToCursor(); return; } } @@ -429,6 +433,7 @@ public class TradeMenu : MonoBehaviour Dialog.Clear(); Dialog.Title.text = "Unable to buy: Insufficient Credits!"; Dialog.Show(); + Dialog.MoveToCursor(); return; } @@ -448,7 +453,7 @@ public class TradeMenu : MonoBehaviour _targetCargo = GameManager.DockingBay; TargetCargoLabel.text = "Docking Bay"; }); - foreach (var ship in GameManager.CurrentEntity.Parent.Children.Where(GameManager.PlayerEntities.Contains)) + foreach (var ship in GameManager.CurrentEntity.Parent.Children.Where(e => e is Ship {IsPlayerShip: true})) { foreach (var bay in ship.CargoBays.Select((bay, index) => (bay, index))) ContextMenu.AddOption($"{ship.Name} Bay {bay.index}", diff --git a/Assets/Scripts/UI/ZoneRenderer.cs b/Assets/Scripts/UI/ZoneRenderer.cs deleted file mode 100644 index 8f52b0b57..000000000 --- a/Assets/Scripts/UI/ZoneRenderer.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System; -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ - -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ZoneRenderer : MonoBehaviour -{ - public Camera FollowCamera; - public RenderTexture GravityTexture; - public MeshRenderer GravityRenderer; - - private int _resX, _resY; - private float _ratio; - private Camera _camera; - - private void Start() - { - _camera = GetComponent(); - } - - private void OnPreRender() - { - _camera.transform.position = FollowCamera.transform.position; - if (Screen.width != _resX || Screen.height != _resY) - { - _resX = Screen.width; - _resY = Screen.height; - _ratio = (float) _resX / _resY; - if (GravityTexture != null) - { - GravityTexture?.Release(); - } - GravityTexture = new RenderTexture(_resX, _resY, 0, RenderTextureFormat.RFloat); - } - - GravityRenderer.material.mainTexture = GravityTexture; - - var size = _camera.orthographicSize = FollowCamera.orthographicSize; - - GravityRenderer.transform.position = new Vector3(transform.position.x, transform.position.y, .25f); - GravityRenderer.transform.localScale = new Vector3(size * 2 * _ratio, size * 2, 1); - - _camera.targetTexture = GravityTexture; - } -} diff --git a/Assets/SectorRenderer.cs b/Assets/SectorRenderer.cs new file mode 100644 index 000000000..55daa982f --- /dev/null +++ b/Assets/SectorRenderer.cs @@ -0,0 +1,111 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.EventSystems; +using UnityEngine.UI; +using Unity.Mathematics; +using static Unity.Mathematics.math; +using float2 = Unity.Mathematics.float2; + +public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IScrollHandler +{ + public ActionGameManager GameManager; + public Camera SectorCamera; + public MeshRenderer SectorBackgroundRenderer; + public float ZoomSpeed; + public float MinViewSize = .1f; + public float MaxViewSize = 2; + + private float2 _startMousePosition; + private float2 _startMapPosition; + + private Transform _sectorBackgroundTransform; + private Transform _sectorCameraTransform; + private Image _outputImage; + private RenderTexture _outputTexture; + private Vector3[] _imageCorners = new Vector3[4]; + private int2 _size; + private bool _init; + private float _aspectRatio; + private float _sectorBackgroundDepth; + private float _sectorCameraDepth; + + private float2 _position = float2(0.5f); + private float _viewSize = .5f; + + void Start() + { + _outputImage = GetComponent(); + _sectorBackgroundTransform = SectorBackgroundRenderer.transform; + _sectorBackgroundDepth = _sectorBackgroundTransform.position.z; + _sectorCameraTransform = SectorCamera.transform; + _sectorCameraDepth = _sectorCameraTransform.position.z; + } + + private void OnEnable() + { + _init = true; + SectorCamera.gameObject.SetActive(true); + _position = GameManager.Zone.SectorZone.Position; + _viewSize = .25f; + } + + private void OnDisable() + { + if (_outputTexture != null) + { + _outputTexture.Release(); + _outputTexture = null; + } + SectorCamera.gameObject.SetActive(false); + } + + void LateUpdate() + { + var size = int2(Screen.width, Screen.height); + if (_init || size.x != _size.x || size.y != _size.y) + { + _aspectRatio = (float) size.x / size.y; + _size = size; + if (_outputTexture != null) + { + _outputTexture.Release(); + } + _outputTexture = new RenderTexture(_size.x, _size.y, 0, RenderTextureFormat.Default); + SectorCamera.targetTexture = _outputTexture; + _outputImage.material.SetTexture("_DetailTex", _outputTexture); + } + + var halfSize = _viewSize / 2; + var bounds = float4( + _position.x - _aspectRatio * halfSize, + _position.y - halfSize, + _position.x + _aspectRatio * halfSize, + _position.y + halfSize); + _sectorBackgroundTransform.position = new Vector3(_position.x, _position.y, _sectorBackgroundDepth); + _sectorBackgroundTransform.localScale = new Vector3(_aspectRatio * _viewSize, _viewSize); + _sectorCameraTransform.position = new Vector3(_position.x, _position.y, _sectorCameraDepth); + SectorCamera.orthographicSize = halfSize; + SectorBackgroundRenderer.material.SetVector("Extents", bounds); + } + + public void OnBeginDrag(PointerEventData eventData) + { + _startMousePosition = eventData.position; + _startMapPosition = _position; + } + + public void OnDrag(PointerEventData eventData) + { + _position = _startMapPosition - ((float2)eventData.position - _startMousePosition) / _size.y * _viewSize; + } + + public void OnScroll(PointerEventData eventData) + { + var mapCenter = float2((float)Screen.width / 2, (float)Screen.height / 2); + var oldPointerPosition = _position + ((float2)eventData.position - mapCenter) / Screen.height * _viewSize; + _viewSize = clamp(_viewSize * (1 - eventData.scrollDelta.y * ZoomSpeed), MinViewSize, MaxViewSize); + var pointerPosition = _position + ((float2)eventData.position - mapCenter) / Screen.height * _viewSize; + _position += oldPointerPosition - pointerPosition; + } +} diff --git a/Assets/Scripts/UI/ZoneRenderer.cs.meta b/Assets/SectorRenderer.cs.meta similarity index 83% rename from Assets/Scripts/UI/ZoneRenderer.cs.meta rename to Assets/SectorRenderer.cs.meta index 1f4c1639f..687820c1e 100644 --- a/Assets/Scripts/UI/ZoneRenderer.cs.meta +++ b/Assets/SectorRenderer.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 04277e392af12204397c334ea824f957 +guid: 59b26802254e34b4bb26f48d0d8b51bf MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Shaders/GalaxyMap.shader b/Assets/Shaders/GalaxyMap.shader index 1dad5595b..567396a35 100644 --- a/Assets/Shaders/GalaxyMap.shader +++ b/Assets/Shaders/GalaxyMap.shader @@ -8,7 +8,6 @@ Shader "Unlit/GalaxyMap" { _MainTex ("Texture", 2D) = "white" {} [HDR]_CloudColor ("Cloud Color", Color) = (1,1,1,1) - Zoom("Zoom", Float) = 1 CloudAmplitude("Cloud Amplitude", Float) = 1 CloudExponent ("Cloud Exponent", Float) = 2 _GlowColor ("GlowColor", Color) = (1,1,1,1) @@ -18,14 +17,16 @@ Shader "Unlit/GalaxyMap" NoiseGain("NoiseGain", Float) = 1 NoiseLacunarity("NoiseLacunarity", Float) = 2 NoiseFrequency("NoiseFrequency", Float) = 1 + Extents("Extents", Vector) = (0,0,1,1) StarBoost("StarBoost", Float) = 0 StarExponent("StarExponent", Float) = 1 } SubShader { + //Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" "PreviewType"="Plane" } Tags { "RenderType"="Opaque" } LOD 100 - //Blend One One + //Blend SrcAlpha OneMinusSrcAlpha Lighting Off ZWrite Off Pass @@ -55,7 +56,6 @@ Shader "Unlit/GalaxyMap" fixed4 _CloudColor; fixed4 _GlowColor; - float Zoom; float CloudExponent; float CloudAmplitude; float NoisePosition; @@ -66,13 +66,15 @@ Shader "Unlit/GalaxyMap" float NoiseFrequency; float StarBoost; float StarExponent; + float4 Extents; v2f vert (appdata v) { v2f o; o.vertex = UnityObjectToClipPos(v.vertex); - o.uv = v.uv; - o.uv2 = TRANSFORM_TEX(v.uv, _MainTex); + float2 uv = Extents.xy + v.uv * (Extents.zw-Extents.xy); + o.uv = uv; + o.uv2 = TRANSFORM_TEX(uv, _MainTex); return o; } @@ -94,10 +96,10 @@ Shader "Unlit/GalaxyMap" fixed4 frag (v2f i) : SV_Target { - float noise = fBm(i.uv / Zoom + NoisePosition.xx, 10); + float noise = fBm(i.uv + NoisePosition.xx, 10); float gal = pow(noise, CloudExponent) * CloudAmplitude; float stars = tex2D(_MainTex, i.uv2) * pow(noise, StarExponent) * StarBoost; - return fixed4(max(gal*_CloudColor.rgb - _GlowColor.rgb, 0) + stars.xxx, 1); + return fixed4(max(gal*_CloudColor.rgb - _GlowColor.rgb, 0) + stars.xxx, gal); } ENDCG } diff --git a/Assets/Shaders/MaskedWorldSpaceAdditiveUI.shader b/Assets/Shaders/MaskedWorldSpaceAdditiveUI.shader index 59fed0be0..04f1e6a1d 100644 --- a/Assets/Shaders/MaskedWorldSpaceAdditiveUI.shader +++ b/Assets/Shaders/MaskedWorldSpaceAdditiveUI.shader @@ -5,7 +5,7 @@ Shader "UI/MaskedWorldSpaceAdditiveUI" Properties { [PerRendererData] _MainTex ("Sprite Texture", 2D) = "white" {} - _DetailTex ("Detail Texture", 2D) = "white" {} + _DetailTex ("Detail Texture", 2D) = "black" {} [HDR] _Color ("Color", Color) = (.5,.5,.5,1) _DetailGamma ("Detail Gamma", Float) = 1 diff --git a/Assets/Shaders/MaskedWorldSpaceUI.shader b/Assets/Shaders/MaskedWorldSpaceUI.shader index f55e1bae8..801295746 100644 --- a/Assets/Shaders/MaskedWorldSpaceUI.shader +++ b/Assets/Shaders/MaskedWorldSpaceUI.shader @@ -5,7 +5,7 @@ Shader "UI/MaskedWorldSpaceUI" Properties { [PerRendererData] _MainTex ("Sprite Texture", 2D) = "white" {} - _DetailTex ("Detail Texture", 2D) = "white" {} + _DetailTex ("Detail Texture", 2D) = "black" {} [HDR] _Color ("Color", Color) = (.5,.5,.5,1) _DetailGamma ("Detail Gamma", Float) = 1 diff --git a/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h b/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h index 8955139ab..15485846c 100644 --- a/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h +++ b/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h @@ -32,28 +32,14 @@ namespace AK static const AkUniqueID WORMHOLE_TRAVEL_LOOP = 3842220822U; } // namespace EVENTS - namespace SWITCHES - { - namespace TECHNOLOGY_STATE - { - static const AkUniqueID GROUP = 3657230105U; - - namespace SWITCH - { - static const AkUniqueID LOW_ENERGY = 2073286940U; - static const AkUniqueID OPTIMAL = 4124647433U; - static const AkUniqueID OVERHEAT = 916477217U; - } // namespace SWITCH - } // namespace TECHNOLOGY_STATE - - } // namespace SWITCHES - namespace GAME_PARAMETERS { - static const AkUniqueID REACTOR_DURAVILITY = 2187658529U; - static const AkUniqueID REACTOR_TEMP = 1438681362U; - static const AkUniqueID SPACESHIP_VELOCITY = 3387986107U; - static const AkUniqueID THRUSTER_DURABILITY = 652189180U; + static const AkUniqueID PERFORMANCE_DURABILITY = 965148665U; + static const AkUniqueID PERFORMANCE_QUALITY = 875134311U; + static const AkUniqueID PERFORMANCE_TEMPERATURE = 2129580506U; + static const AkUniqueID REACTOR_LOAD = 3735272724U; + static const AkUniqueID SHIP_VELOCITY = 3579545711U; + static const AkUniqueID THRUSTER_THROTTLE = 4116566921U; } // namespace GAME_PARAMETERS namespace BANKS diff --git a/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset b/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset index 96bc9b0cd..b1eda9aa1 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:84385fbb8dd6d591c55884e3d7fcc905c4700eb6dd822a97a30490373f1f892a -size 15940 +oid sha256:1905c6f29f69e39fa6e41f72efbb47ea57229dca022939b1c3b37772d26e0e5e +size 15474 diff --git a/GameData/AetherDB.msgpack b/GameData/AetherDB.msgpack index 1e2acd780..525d8309e 100644 Binary files a/GameData/AetherDB.msgpack and b/GameData/AetherDB.msgpack differ diff --git a/GameData/Loadouts/Longinus.loadout b/GameData/Loadouts/Longinus.loadout new file mode 100644 index 000000000..0219f396c Binary files /dev/null and b/GameData/Loadouts/Longinus.loadout differ diff --git a/GameData/Names.msgpack b/GameData/Names.msgpack new file mode 100644 index 000000000..34e4c2629 Binary files /dev/null and b/GameData/Names.msgpack differ diff --git a/GameData/PlayerSettings.msgpack b/GameData/PlayerSettings.msgpack index 9c5fffbec..625c245bd 100644 Binary files a/GameData/PlayerSettings.msgpack and b/GameData/PlayerSettings.msgpack differ diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index ed7c5453a..fcfa36107 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -84,7 +84,7 @@ "depth": 0, "source": "registry", "dependencies": { - "com.unity.timeline": "1.2.6" + "com.unity.timeline": "1.2.17" }, "url": "https://packages.unity.com" }, diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index b387c6d44..ae6dd4ad0 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6854cb4f83c37e92613e1d04f75a69bdc9909981a242c6c9e9d7175933e7824b -size 497 +oid sha256:af21f6625e09ef63a71929135db7e1e2d5789c6d8ca2157345fb8bd6ba6edeaa +size 513