[MTT-8881] Integrate proximity voice-chat

Basic/DistributedAuthoritySocialHub/Assets/Prefabs/Characters/Avatar.prefab

@@ -302,6 +302,20 @@ MonoBehaviour:
     TransitionDuration: 0.1
     TriggerNameHash: -1243957561
     TransitionIndex: 0
+  - IsCrossFadeExit: 0
+    Layer: 1
+    OriginatingState: -1413593168
+    DestinationState: -802706916
+    TransitionDuration: 0.25
+    TriggerNameHash: -802706916
+    TransitionIndex: 1
+  - IsCrossFadeExit: 0
+    Layer: 1
+    OriginatingState: 1177697483
+    DestinationState: -802706916
+    TransitionDuration: 0.25
+    TriggerNameHash: -802706916
+    TransitionIndex: 1
   m_Animator: {fileID: 7006295767383679619}
   m_PhysicsPlayerController: {fileID: 4655812346339390596}
   m_AvatarInputs: {fileID: 8197190117666738524}
@@ -423,6 +437,9 @@ PrefabInstance:
     - targetCorrespondingSourceObject: {fileID: 8353930243667998089, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
       insertIndex: -1
       addedObject: {fileID: 3050276823525430539}
+    - targetCorrespondingSourceObject: {fileID: 8353930243667998089, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 4683992500645973501}
   m_SourcePrefab: {fileID: 100100000, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}
 --- !u!136 &36137897785899347 stripped
 CapsuleCollider:
@@ -456,6 +473,19 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4f398d1c0abd4744eb035893ea7619cf, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &4683992500645973501
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3745480105526614893}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bee830f09ba1465fa953159de83e882e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ShowTopMostFoldoutHeaderGroup: 1
 --- !u!4 &4085133075368149463 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3}

Basic/DistributedAuthoritySocialHub/Assets/Scripts/GameManagement/GameplayEventHandler.cs

@@ -17,8 +17,7 @@ static class GameplayEventHandler
         internal static event Action OnExitedSession;
         internal static event Action<string, string, bool> OnTextMessageReceived;
         internal static event Action<string> OnSendTextMessage;
-        internal static event Action<bool> OnBlockPlayerControls;
-        internal static event Action<bool> OnChatIsReady;
+        internal static event Action<bool, string> OnChatIsReady;
 
         internal static void NetworkObjectDespawned(NetworkObject networkObject)
         {
@@ -75,14 +74,9 @@ internal static void SendTextMessage(string message)
             OnSendTextMessage?.Invoke(message);
         }
 
-        public static void BlockPlayerControls(bool disable)
+        public static void SetTextChatReady(bool enabled, string channelName)
         {
-            OnBlockPlayerControls?.Invoke(disable);
-        }
-
-        public static void SetTextChatReady(bool enabled)
-        {
-            OnChatIsReady?.Invoke(enabled);
+            OnChatIsReady?.Invoke(enabled, channelName);
         }
     }
 }

Basic/DistributedAuthoritySocialHub/Assets/Scripts/Player/AvatarTransform.cs

@@ -1,7 +1,5 @@
 using System;
 using Unity.Collections;
-using Unity.Multiplayer.Samples.SocialHub.GameManagement;
-using Unity.Multiplayer.Samples.SocialHub.Gameplay;
 using UnityEngine;
 using Unity.Multiplayer.Samples.SocialHub.Input;
 using Unity.Multiplayer.Samples.SocialHub.Physics;
@@ -29,13 +27,16 @@ class AvatarTransform : PhysicsObjectMotion, INetworkUpdateSystem
         PlayersTopUIController m_TopUIController;
 
         NetworkVariable<FixedString32Bytes> m_PlayerName = new NetworkVariable<FixedString32Bytes>(string.Empty, readPerm: NetworkVariableReadPermission.Everyone, writePerm: NetworkVariableWritePermission.Owner);
+        NetworkVariable<FixedString32Bytes> m_PlayerId = new NetworkVariable<FixedString32Bytes>(string.Empty, readPerm: NetworkVariableReadPermission.Everyone, writePerm: NetworkVariableWritePermission.Owner);
+
 
         public override void OnNetworkSpawn()
         {
             gameObject.name = $"[Client-{OwnerClientId}]{name}";
 
             m_TopUIController = FindFirstObjectByType<PlayersTopUIController>();
             m_PlayerName.OnValueChanged += OnPlayerNameChanged;
+            m_PlayerId.OnValueChanged += OnPlayerIdChanged;
             OnPlayerNameChanged(string.Empty, m_PlayerName.Value);
 
             if (!HasAuthority)
@@ -44,8 +45,8 @@ public override void OnNetworkSpawn()
                 return;
             }
 
-            // a randomly-generated suffix consisting of a hash and four digits (e.g. #1234) is automatically appended to the requested name
-            m_PlayerName.Value = new FixedString32Bytes(AuthenticationService.Instance.PlayerName.Split('#')[0]);
+            m_PlayerId.Value = new FixedString32Bytes(AuthenticationService.Instance.PlayerId);
+            m_PlayerName.Value = new FixedString32Bytes(UIUtils.ExtractPlayerNameFromAuthUserName(AuthenticationService.Instance.PlayerName));
             m_PlayerInput.enabled = true;
             m_AvatarInputs.enabled = true;
             m_AvatarInputs.Jumped += OnJumped;
@@ -69,8 +70,6 @@ public override void OnNetworkSpawn()
                 Debug.LogError("CameraControl not found on the Main Camera or Main Camera is missing.");
             }
 
-            GameplayEventHandler.OnBlockPlayerControls += OnBlockPlayerControls;
-
             base.OnNetworkSpawn();
         }
 
@@ -91,7 +90,6 @@ public override void OnNetworkDespawn()
                 cameraControl.SetTransform(null);
             }
 
-            GameplayEventHandler.OnBlockPlayerControls -= OnBlockPlayerControls;
             m_TopUIController?.RemovePlayer(gameObject);
         }
 
@@ -120,12 +118,12 @@ void OnTransformUpdate()
 
         void OnPlayerNameChanged(FixedString32Bytes previousValue, FixedString32Bytes newValue)
         {
-            m_TopUIController.AddPlayer(gameObject, newValue.Value);
+            m_TopUIController.AddOrUpdatePlayer(gameObject, newValue.Value,m_PlayerId.Value.Value);
         }
 
-        void OnBlockPlayerControls(bool blockInput)
+        void OnPlayerIdChanged(FixedString32Bytes previousValue, FixedString32Bytes newValue)
         {
-            m_PlayerInput.enabled = !blockInput;
+            m_TopUIController.AddOrUpdatePlayer(gameObject, m_PlayerName.Value.Value,newValue.Value);
         }
 
         public void NetworkUpdate(NetworkUpdateStage updateStage)

Basic/DistributedAuthoritySocialHub/Assets/Scripts/Services/ServicesHelper.cs

@@ -131,9 +131,9 @@ async void LeaveSession()
             }
         }
 
-        void SignInFailed(RequestFailedException obj)
+        void SignInFailed(RequestFailedException e)
         {
-            Debug.LogWarning($"Sign in via Authentication failed: obj.ErrorCode {obj.ErrorCode}");
+            Debug.LogWarning($"Sign in via Authentication failed: obj.ErrorCode {e.ErrorCode}");
         }
 
         void RemovedFromSession()

Basic/DistributedAuthoritySocialHub/Assets/Scripts/Services/Unity.Multiplayer.Samples.SocialHub.Services.asmdef

@@ -8,7 +8,8 @@
         "GUID:6087a74f6015aae4daed9a2577a7596c",
         "GUID:1491147abca9d7d4bb7105af628b223e",
         "GUID:707bb6c7c4ef140eeac239b4f8251af8",
-        "GUID:75469ad4d38634e559750d17036d5f7c"
+        "GUID:75469ad4d38634e559750d17036d5f7c",
+        "GUID:86923d8926a1f4aca9fcdd3f0097bfd7"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
@@ -19,4 +20,4 @@
     "defineConstraints": [],
     "versionDefines": [],
     "noEngineReferences": false
-}
+}

Basic/DistributedAuthoritySocialHub/Assets/Scripts/Services/Vivox3DPositioning.cs

@@ -0,0 +1,49 @@
+using UnityEngine;
+using Unity.Netcode;
+using Unity.Multiplayer.Samples.SocialHub.GameManagement;
+
+namespace Unity.Multiplayer.Samples.SocialHub.Services
+{
+    class Vivox3DPositioning : NetworkBehaviour
+    {
+        bool m_Initialized;
+        float m_NextPosUpdate;
+
+        void Start()
+        {
+            GameplayEventHandler.OnChatIsReady -= OnChatIsReady;
+            GameplayEventHandler.OnChatIsReady += OnChatIsReady;
+
+            GameplayEventHandler.OnExitedSession -= OnExitSession;
+            GameplayEventHandler.OnExitedSession += OnExitSession;
+        }
+
+        void OnChatIsReady(bool chatIsReady, string channelName)
+        {
+            m_Initialized = chatIsReady;
+        }
+
+        void OnExitSession()
+        {
+            m_Initialized = false;
+        }
+
+        void Update()
+        {
+            if (IsOwner && m_Initialized)
+            {
+                if (Time.time > m_NextPosUpdate)
+                {
+                    VivoxManager.Instance.SetPlayer3DPosition(gameObject);
+                    m_NextPosUpdate = Time.time + 0.3f;
+                }
+            }
+        }
+
+        public override void OnDestroy()
+        {
+            GameplayEventHandler.OnChatIsReady -= OnChatIsReady;
+            GameplayEventHandler.OnExitedSession -= OnExitSession;
+        }
+    }
+}