diff --git a/Assets/Materials/Assorted/M_TouristInformationSign.mat b/Assets/Materials/Assorted/M_TouristInformationSign.mat index 697a8b6..9a0decc 100644 --- a/Assets/Materials/Assorted/M_TouristInformationSign.mat +++ b/Assets/Materials/Assorted/M_TouristInformationSign.mat @@ -69,7 +69,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - _BorderSize: 0.534 + - _BorderSize: 0.109 - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 diff --git a/Assets/Textures/T_EntertainmentPosters.png.meta b/Assets/Textures/T_EntertainmentPosters.png.meta index 55ee692..c33e305 100644 --- a/Assets/Textures/T_EntertainmentPosters.png.meta +++ b/Assets/Textures/T_EntertainmentPosters.png.meta @@ -73,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 3 - compressionQuality: 0 + compressionQuality: 20 crunchedCompression: 1 allowsAlphaSplitting: 0 overridden: 0 diff --git a/Assets/Textures/T_NationalGeographicWorldMagazineCovers.png.meta b/Assets/Textures/T_NationalGeographicWorldMagazineCovers.png.meta index 084815f..dff2165 100644 --- a/Assets/Textures/T_NationalGeographicWorldMagazineCovers.png.meta +++ b/Assets/Textures/T_NationalGeographicWorldMagazineCovers.png.meta @@ -73,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 3 - compressionQuality: 0 + compressionQuality: 10 crunchedCompression: 1 allowsAlphaSplitting: 0 overridden: 0 diff --git a/Assets/Textures/T_Round2Signs_SDF.png b/Assets/Textures/T_Round2Signs_SDF.png index 8438bf6..9470931 100644 Binary files a/Assets/Textures/T_Round2Signs_SDF.png and b/Assets/Textures/T_Round2Signs_SDF.png differ diff --git a/Assets/Textures/T_Round2Signs_SDF.png.meta b/Assets/Textures/T_Round2Signs_SDF.png.meta index 5ba4ab0..02de34e 100644 --- a/Assets/Textures/T_Round2Signs_SDF.png.meta +++ b/Assets/Textures/T_Round2Signs_SDF.png.meta @@ -51,8 +51,8 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 + alphaUsage: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 10 textureShape: 1 diff --git a/Assets/Textures/T_TravelPosters.png.meta b/Assets/Textures/T_TravelPosters.png.meta index 76e4969..8566b98 100644 --- a/Assets/Textures/T_TravelPosters.png.meta +++ b/Assets/Textures/T_TravelPosters.png.meta @@ -73,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 3 - compressionQuality: 0 + compressionQuality: 30 crunchedCompression: 1 allowsAlphaSplitting: 0 overridden: 0 diff --git a/Assets/UdonSharp/Microphone.cs b/Assets/UdonSharp/Microphone.cs index 09082a7..62f766c 100644 --- a/Assets/UdonSharp/Microphone.cs +++ b/Assets/UdonSharp/Microphone.cs @@ -11,7 +11,7 @@ public class Microphone : UdonSharpBehaviour [SerializeField] private float _MikedVoiceDistanceNear = 30.0f; [SerializeField] private float _MikedVoiceDistanceFar = 60.0f; - private VRCPlayerApi[] _EnteredPlayers = new VRCPlayerApi[MAX_PLAYERS]; + private VRCPlayerApi[] _EnteredPlayers = new VRCPlayerApi[MAX_PLAYERS]; private const float DEFAULT_VOICE_DISTANCE_NEAR = 0.0f; private const float DEFAULT_VOICE_DISTANCE_FAR = 25.0f; @@ -53,17 +53,20 @@ public class Microphone : UdonSharpBehaviour base.OnPlayerTriggerExit(Player); } - - public void OnDisable() + public override void OnPlayerLeft(VRCPlayerApi Player) { + Player.SetVoiceDistanceNear(DEFAULT_VOICE_DISTANCE_NEAR); + Player.SetVoiceDistanceFar(DEFAULT_VOICE_DISTANCE_FAR); + for (int i = 0; i < _EnteredPlayers.Length; i++) { - if (_EnteredPlayers[i] != null && _EnteredPlayers[i].IsValid()) + if (_EnteredPlayers[i] == Player) { - _EnteredPlayers[i].SetVoiceDistanceNear(DEFAULT_VOICE_DISTANCE_NEAR); - _EnteredPlayers[i].SetVoiceDistanceFar(DEFAULT_VOICE_DISTANCE_FAR); + _EnteredPlayers[i] = null; + break; } - _EnteredPlayers[i] = null; } + + base.OnPlayerLeft(Player); } }