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

Fix Music Event Targets

Browse source
This commit is contained in:
Reinier Vens 2021-04-30 11:50:47 +01:00
commit 8d76c2d37d
6 changed files with 35 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -115,11 +115,13 @@
<Property Name="GenerateSoundBanks\ListMode" Type="string" Value="Tree"/>
<Property Name="GenerateSoundBanks\x64_SelectedLanguages" Type="string" Value="BvDMKA=="/>
<Property Name="GenerateSoundBanks\x64_SelectedPlatforms" Type="string" Value="74wppGGLGUKocCTUjliE6atk2Ww+IVRJs5fEQCA5KRI="/>
<Property Name="GenerateSoundBanks\x64_SelectedSoundBanks" Type="string" Value="Za5mlmZVs0yOu7E3c3kEhe2ECTVVG4dAoWwbcP6KgouRejEPrUupQI77gtrCXl98ngUv+/b5tEGj/ch7NzeatGE7Yam9U05Fm24OnwWHX/oogy2XgcjTTZ6kHve/YPlcQPNHAp1ml0an0DUny/WAaQcM4+JYYmZNvQy/GjHECu4SpWgpAUpKRLBb1/AfLMZffNU0Jj0kF0mLsMhdwucvQyEME4bdgbhNkCrxcszXlmY="/>
<Property Name="GenerateSoundBanks\x64_SelectedSoundBanks" Type="string" Value="Za5mlmZVs0yOu7E3c3kEhXSKlUaqlINNhKJXlakG6GQfnIXJkYCYRrdjdxmYIwyBSmgS3nSEw0miaQE+YFVy9ZPwTm+6m8RNhDaG4kRxYasGP8deqPT2SLY96I6guRCtqIP/fJnGjkyqUQMYlBqq04NvLQMUCLxJoWBsgvdZEq3thAk1VRuHQKFsG3D+ioKLkXoxD61LqUCO+4Lawl5ffJ4FL/v2+bRBo/3Iezc3mrRhO2GpvVNORZtuDp8Fh1/6KIMtl4HI002epB73v2D5XEDzRwKdZpdGp9A1J8v1gGkHDOPiWGJmTb0MvxoxxAruEqVoKQFKSkSwW9fwHyzGX3zVNCY9JBdJi7DIXcLnL0MhDBOG3YG4TZAq8XLM15Zm"/>
<Property Name="HardwareController\CurrentSession" Type="string" Value="{2451DD2E-A7B2-45E6-B93B-6F49B9B887AD}"/>
<Property Name="HardwareController\{2451DD2E-A7B2-45E6-B93B-6F49B9B887AD}\x64_ActiveGroups" Type="string" Value="sahohopAK0WRE4XvXPYF/QHvd2f/////+lZlPDTFnUSwqLpTpFltuQHvd2f/////"/>
<Property Name="Interactive Music\x64_{065373CA-B6B7-4634-9C4B-6D6F79214FAA} - SegmentEditorZoomInfo" Type="string" Value="AAAAAAAA8D8AAAAAAADwP+PLJfkeqhdAAAAAAAAA8D8AAAAAAAAAAAAAAAAAAAAA"/>
<Property Name="Interactive Music\x64_{586B920D-AA94-4B2C-828B-37B68C3F2982} - SegmentEditorZoomInfo" Type="string" Value="AAAAAAAA8D8AAAAAAADwPxf6U4KZ8SFAAAAAAAAA8D8AAAAAAAAAAAAAAAAAAAAA"/>
<Property Name="Interactive Music\x64_{7282DE71-9B0C-4E9B-960C-0EF0036250A4} - SegmentEditorZoomInfo" Type="string" Value="AAAAAAAA8D8AAAAAAADwP4NGy0A+qhxAAAAAAAAA8D8AAAAAAAAAAAAAAAAAAAAA"/>
<Property Name="Interactive Music\x64_{AAF59638-2F79-498D-A1F2-C52181563AD6} - SegmentEditorZoomInfo" Type="string" Value="AAAAAAAA8D8AAAAAAADwP+Iie77GrxZAAAAAAAAA8D8AAAAAAAAAAAAAAAAAAAAA"/>
<Property Name="Interactive Music\x64_{B63DD0AD-5CEB-42A1-806C-B704B3F7097A} - SegmentEditorZoomInfo" Type="string" Value="AAAAAAAA8D8AAAAAAADwP0/njIyGmhlAAAAAAAAA8D8AAAAAAAAAAAAAAAAAAAAA"/>
<Property Name="MeterView\LastObject1" Type="string" Value="{1514A4D8-1DA6-412A-A17E-75CA0C2149F3}"/>
<Property Name="MeterView\MeterMode1" Type="int32" Value="1"/>
@ -132,6 +134,7 @@
<Property Name="MonitoringManager\GameObjectFilter\GameObjectFiltersEnable" Type="bool" Value="True"/>
<Property Name="MonitoringManager\GameObjectFilter\x64_GameObjectFilters" Type="string" Value=""/>
<Property Name="Music Transition List\{965684F1-9F1B-4517-B1A1-BE20AB8F937A}\x64_Expand States" Type="string" Value=""/>
<Property Name="Music Transition List\{EE7EB190-D721-4534-9D41-AEF918FBC7D0}\x64_Expand States" Type="string" Value=""/>
<Property Name="OverrideCacheFolder\Active" Type="bool" Value="False"/>
<Property Name="OverrideCacheFolder\Path" Type="string" Value=".cache"/>
<Property Name="OverrideOriginalFolder\Active" Type="bool" Value="False"/>

24
Aetheria-Economy_WwiseProject/Events/Music.wwu
View file

@ -16,7 +16,7 @@
</PropertyList>
<ReferenceList>
<Reference Name="Target">
<ObjectRef Name="Gen_OW_01" ID="{AAF59638-2F79-498D-A1F2-C52181563AD6}" WorkUnitID="{2A4B7328-3C61-4652-956B-15C31C6BD6D3}"/>
<ObjectRef Name="Generic" ID="{965684F1-9F1B-4517-B1A1-BE20AB8F937A}" WorkUnitID="{2A4B7328-3C61-4652-956B-15C31C6BD6D3}"/>
</Reference>
</ReferenceList>
</Action>
@ -30,7 +30,7 @@
</PropertyList>
<ReferenceList>
<Reference Name="Target">
<ObjectRef Name="Gen_OW_01" ID="{AAF59638-2F79-498D-A1F2-C52181563AD6}" WorkUnitID="{2A4B7328-3C61-4652-956B-15C31C6BD6D3}"/>
<ObjectRef Name="Generic" ID="{965684F1-9F1B-4517-B1A1-BE20AB8F937A}" WorkUnitID="{2A4B7328-3C61-4652-956B-15C31C6BD6D3}"/>
</Reference>
</ReferenceList>
</Action>
@ -49,7 +49,7 @@
</PropertyList>
<ReferenceList>
<Reference Name="Target">
<ObjectRef Name="Kawaii Future Bass" ID="{586B920D-AA94-4B2C-828B-37B68C3F2982}" WorkUnitID="{2A4B7328-3C61-4652-956B-15C31C6BD6D3}"/>
<ObjectRef Name="KFB" ID="{049E3E09-0B7D-43E8-959B-B7D3490BA9FF}" WorkUnitID="{2A4B7328-3C61-4652-956B-15C31C6BD6D3}"/>
</Reference>
</ReferenceList>
</Action>
@ -63,7 +63,7 @@
</PropertyList>
<ReferenceList>
<Reference Name="Target">
<ObjectRef Name="Kawaii Future Bass" ID="{586B920D-AA94-4B2C-828B-37B68C3F2982}" WorkUnitID="{2A4B7328-3C61-4652-956B-15C31C6BD6D3}"/>
<ObjectRef Name="KFB" ID="{049E3E09-0B7D-43E8-959B-B7D3490BA9FF}" WorkUnitID="{2A4B7328-3C61-4652-956B-15C31C6BD6D3}"/>
</Reference>
</ReferenceList>
</Action>
@ -81,7 +81,7 @@
</PropertyList>
<ReferenceList>
<Reference Name="Target">
<ObjectRef Name="Metal_OW_01" ID="{7282DE71-9B0C-4E9B-960C-0EF0036250A4}" WorkUnitID="{2A4B7328-3C61-4652-956B-15C31C6BD6D3}"/>
<ObjectRef Name="Metal" ID="{C6B1FBBE-AA88-4FD8-9CFA-0CA4BB81701E}" WorkUnitID="{2A4B7328-3C61-4652-956B-15C31C6BD6D3}"/>
</Reference>
</ReferenceList>
</Action>
@ -96,7 +96,7 @@
</PropertyList>
<ReferenceList>
<Reference Name="Target">
<ObjectRef Name="Metal_OW_01" ID="{7282DE71-9B0C-4E9B-960C-0EF0036250A4}" WorkUnitID="{2A4B7328-3C61-4652-956B-15C31C6BD6D3}"/>
<ObjectRef Name="Metal" ID="{C6B1FBBE-AA88-4FD8-9CFA-0CA4BB81701E}" WorkUnitID="{2A4B7328-3C61-4652-956B-15C31C6BD6D3}"/>
</Reference>
</ReferenceList>
</Action>
@ -118,7 +118,7 @@
</PropertyList>
<ReferenceList>
<Reference Name="Target">
<ObjectRef Name="Gen_Combat_1" ID="{37FA2177-60F1-4326-AF74-CD4928CEE0BE}" WorkUnitID="{88745582-E14B-4ADD-8B99-AB36C6547F65}"/>
<ObjectRef Name="Generic" ID="{7941F6A9-6948-41DA-8B46-8A33499165EB}" WorkUnitID="{88745582-E14B-4ADD-8B99-AB36C6547F65}"/>
</Reference>
</ReferenceList>
</Action>
@ -133,7 +133,7 @@
</PropertyList>
<ReferenceList>
<Reference Name="Target">
<ObjectRef Name="Gen_Combat_1" ID="{37FA2177-60F1-4326-AF74-CD4928CEE0BE}" WorkUnitID="{88745582-E14B-4ADD-8B99-AB36C6547F65}"/>
<ObjectRef Name="Generic" ID="{7941F6A9-6948-41DA-8B46-8A33499165EB}" WorkUnitID="{88745582-E14B-4ADD-8B99-AB36C6547F65}"/>
</Reference>
</ReferenceList>
</Action>
@ -151,7 +151,7 @@
</PropertyList>
<ReferenceList>
<Reference Name="Target">
<ObjectRef Name="Metal_Combat_01" ID="{065373CA-B6B7-4634-9C4B-6D6F79214FAA}" WorkUnitID="{88745582-E14B-4ADD-8B99-AB36C6547F65}"/>
<ObjectRef Name="Metal" ID="{6417DAE3-2CE0-4409-9D8B-AD00F5BD2B20}" WorkUnitID="{88745582-E14B-4ADD-8B99-AB36C6547F65}"/>
</Reference>
</ReferenceList>
</Action>
@ -166,7 +166,7 @@
</PropertyList>
<ReferenceList>
<Reference Name="Target">
<ObjectRef Name="Metal_Combat_01" ID="{065373CA-B6B7-4634-9C4B-6D6F79214FAA}" WorkUnitID="{88745582-E14B-4ADD-8B99-AB36C6547F65}"/>
<ObjectRef Name="Metal" ID="{6417DAE3-2CE0-4409-9D8B-AD00F5BD2B20}" WorkUnitID="{88745582-E14B-4ADD-8B99-AB36C6547F65}"/>
</Reference>
</ReferenceList>
</Action>
@ -223,7 +223,7 @@
</PropertyList>
<ReferenceList>
<Reference Name="Target">
<ObjectRef Name="Main_Menu_01" ID="{59BA138D-D6DB-4F02-909A-8329475FE98D}" WorkUnitID="{7CB722F4-389D-4867-87CA-00120A745A22}"/>
<ObjectRef Name="Main_Menu" ID="{52FD8D73-17FB-445D-A484-9FA4BA1B8CF2}" WorkUnitID="{7CB722F4-389D-4867-87CA-00120A745A22}"/>
</Reference>
</ReferenceList>
</Action>
@ -234,7 +234,7 @@
<Action Name="" ID="{FA9A6EB0-0E57-446C-B2CC-983F65E7EDBC}" ShortID="855697419">
<ReferenceList>
<Reference Name="Target">
<ObjectRef Name="Main_Menu_01" ID="{59BA138D-D6DB-4F02-909A-8329475FE98D}" WorkUnitID="{7CB722F4-389D-4867-87CA-00120A745A22}"/>
<ObjectRef Name="Main_Menu" ID="{52FD8D73-17FB-445D-A484-9FA4BA1B8CF2}" WorkUnitID="{7CB722F4-389D-4867-87CA-00120A745A22}"/>
</Reference>
</ReferenceList>
</Action>

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

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

30
Assets/Scenes/Main Menu.unity
View file

@ -802,8 +802,8 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 741153267}
m_LocalRotation: {x: 0.0155069195, y: 0.9502416, z: -0.30741316, w: 0.047933277}
m_LocalPosition: {x: -117.52002, y: -77.087425, z: 149.09026}
m_LocalRotation: {x: 0.015506903, y: 0.9502416, z: -0.30741313, w: 0.04793323}
m_LocalPosition: {x: -117.51999, y: -77.08743, z: 149.09026}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 412917866}
@ -1301,8 +1301,8 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 965376321}
m_LocalRotation: {x: 0.0155069195, y: 0.9502416, z: -0.30741316, w: 0.047933277}
m_LocalPosition: {x: -117.52002, y: -77.087425, z: 149.09026}
m_LocalRotation: {x: 0.015506903, y: 0.9502416, z: -0.30741313, w: 0.04793323}
m_LocalPosition: {x: -117.51999, y: -77.08743, z: 149.09026}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@ -2373,12 +2373,12 @@ PrefabInstance:
- target: {fileID: 3664209305474245377, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3664209305474245377, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3664209305474245377, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
type: 3}
@ -2388,22 +2388,22 @@ PrefabInstance:
- target: {fileID: 3664209305474245377, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 60.98
objectReference: {fileID: 0}
- target: {fileID: 3664209305474245377, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -16
objectReference: {fileID: 0}
- target: {fileID: 3664209306888449100, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3664209306888449100, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3664209306888449100, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
type: 3}
@ -2413,12 +2413,12 @@ PrefabInstance:
- target: {fileID: 3664209306888449100, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 55.675
objectReference: {fileID: 0}
- target: {fileID: 3664209306888449100, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -16
objectReference: {fileID: 0}
- target: {fileID: 4533226043449861658, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
type: 3}
@ -2623,12 +2623,12 @@ PrefabInstance:
- target: {fileID: 7329274283166941234, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7329274283166941234, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7329274283166941234, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
type: 3}
@ -2638,7 +2638,7 @@ PrefabInstance:
- target: {fileID: 7329274283166941234, guid: 3d8d9cbf10b12214e98891c1f03c1e99,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
value: 144.0148
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3d8d9cbf10b12214e98891c1f03c1e99, type: 3}

3
Assets/Scripts/ServerShared/Sector.cs
View file

@ -188,8 +188,7 @@ public class Sector
CalculateFactionInfluence(progressCallback);
Entrance = ConnectedRegion(HomeZones[protagonistFaction], 2)
.MaxBy(z => z.Distance[HomeZones[antagonistFaction]]);
Entrance = Zones.Where(z => z.Owner == null).MinBy(z => z.Distance[HomeZones[protagonistFaction]]);
DiscoveredZones.Add(Entrance);
foreach(var z in Entrance.AdjacentZones) DiscoveredZones.Add(z);

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

Binary file not shown.