From 8d76c2d37d827bfc272a0ca25a7b90274698aa4e Mon Sep 17 00:00:00 2001 From: Reinier Vens Date: Fri, 30 Apr 2021 11:50:47 +0100 Subject: [PATCH] Fix Music Event Targets --- ...eria-Economy_WwiseProject.rwvens.wsettings | 5 +++- .../Events/Music.wwu | 24 +++++++-------- Assets/Materials/UI/Map Gravity Lines.mat | 2 +- Assets/Scenes/Main Menu.unity | 30 +++++++++---------- Assets/Scripts/ServerShared/Sector.cs | 3 +- GameData/PlayerSettings.msgpack | 4 +-- 6 files changed, 35 insertions(+), 33 deletions(-) diff --git a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings index 653425a0a..60e6b12f2 100644 --- a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings +++ b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings @@ -115,11 +115,13 @@ - + + + @@ -132,6 +134,7 @@ + diff --git a/Aetheria-Economy_WwiseProject/Events/Music.wwu b/Aetheria-Economy_WwiseProject/Events/Music.wwu index dd9be2fc9..479bccc2d 100644 --- a/Aetheria-Economy_WwiseProject/Events/Music.wwu +++ b/Aetheria-Economy_WwiseProject/Events/Music.wwu @@ -16,7 +16,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -133,7 +133,7 @@ - + @@ -151,7 +151,7 @@ - + @@ -166,7 +166,7 @@ - + @@ -223,7 +223,7 @@ - + @@ -234,7 +234,7 @@ - + diff --git a/Assets/Materials/UI/Map Gravity Lines.mat b/Assets/Materials/UI/Map Gravity Lines.mat index c881f8290..12ce62c33 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: 4.6809607 + - _Scale: 5.3455396 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Scenes/Main Menu.unity b/Assets/Scenes/Main Menu.unity index 2bcf62c6b..0bd80d3a0 100644 --- a/Assets/Scenes/Main Menu.unity +++ b/Assets/Scenes/Main Menu.unity @@ -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} diff --git a/Assets/Scripts/ServerShared/Sector.cs b/Assets/Scripts/ServerShared/Sector.cs index b5df973e0..3f60537fd 100644 --- a/Assets/Scripts/ServerShared/Sector.cs +++ b/Assets/Scripts/ServerShared/Sector.cs @@ -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); diff --git a/GameData/PlayerSettings.msgpack b/GameData/PlayerSettings.msgpack index d6a4871ec..c1c8992fb 100644 --- a/GameData/PlayerSettings.msgpack +++ b/GameData/PlayerSettings.msgpack @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:184aa9a87d9e9721cdd0e3b047dfd40e18d1112e0513d0ac8e073f88cda87bba -size 66 +oid sha256:4de43919eb1829c5a530f4b871b1dbf1bc9073926a831c8ce9de4c87fb273604 +size 167477