From 2cadbf3864730c9b4aac52e32baebf6cc92dcb5b Mon Sep 17 00:00:00 2001 From: Riccardo Bovo Date: Sun, 5 Jan 2025 18:21:08 +0000 Subject: [PATCH 01/25] Make Room Name Persistent. Ensure that the room name the user chooses persists across sessions in multiplayer mode --- Assets/Scripts/GUI/MultiplayerPanel.cs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/GUI/MultiplayerPanel.cs b/Assets/Scripts/GUI/MultiplayerPanel.cs index 6e70a0d5c..0fc3e6c47 100644 --- a/Assets/Scripts/GUI/MultiplayerPanel.cs +++ b/Assets/Scripts/GUI/MultiplayerPanel.cs @@ -49,6 +49,7 @@ public string RoomName { data.roomName = value; UpdateDisplay(); + SaveRoomName(value); } } @@ -82,7 +83,7 @@ public void Awake() { data = new RoomCreateData { - roomName = GenerateUniqueRoomName(), + roomName = "default room", @private = false, maxPlayers = 4, voiceDisabled = false @@ -111,13 +112,23 @@ private void OnLanguageChanged(Locale newLocale) updateDisplay = true; } + public async void RetrieveRoomName() + { + var storedRoomName = await m_multiplayer.GetAsync("roomname"); + RoomName = storedRoomName ?? GenerateUniqueRoomName(); + } + + private async void SaveRoomName(string roomName) + { + await m_multiplayer.StoreAsync("roomname", roomName); + } + public async void RetrieveUsername() { var storedNickname = await m_multiplayer.GetAsync("nickname"); NickName = storedNickname ?? "Unnamed"; } - private async void SaveNickname(string nickname) { await m_multiplayer.StoreAsync("nickname", nickname); @@ -129,6 +140,7 @@ protected override void OnEnablePanel() m_multiplayer = new PlayerPrefsDataStore("Multiplayer"); RetrieveUsername(); + RetrieveRoomName(); if (MultiplayerManager.m_Instance == null) return; if (MultiplayerManager.m_Instance.State == ConnectionState.INITIALIZED || MultiplayerManager.m_Instance.State == ConnectionState.DISCONNECTED) From 91b99b86d89c17dd065fb17300d402cb8de87d35 Mon Sep 17 00:00:00 2001 From: Riccardo Bovo Date: Mon, 6 Jan 2025 21:31:04 +0000 Subject: [PATCH 02/25] Fix sync percentage tracking Revised percentage tracking to embed the progress directly into the ReliableKey, streamlining the process and simplifying debugging. --- .../Multiplayer/MultiplayerInterfaces.cs | 5 +- .../Scripts/Multiplayer/MultiplayerManager.cs | 31 +------ .../Multiplayer/MultiplayerSceneSync.cs | 80 +++---------------- .../Multiplayer/Photon/PhotonManager.cs | 38 ++------- .../Scripts/Multiplayer/Photon/PhotonRPC.cs | 20 ----- Assets/Scripts/SketchControlsScript.cs | 12 --- 6 files changed, 22 insertions(+), 164 deletions(-) diff --git a/Assets/Scripts/Multiplayer/MultiplayerInterfaces.cs b/Assets/Scripts/Multiplayer/MultiplayerInterfaces.cs index 3edab1b39..06770f229 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerInterfaces.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerInterfaces.cs @@ -36,7 +36,7 @@ public interface IDataConnectionHandler : IConnectionHandler int GetPlayerCount(); int GetNetworkedTimestampMilliseconds(); bool GetPlayerRoomOwnershipStatus(int playerId); - void SendLargeDataToPlayer(int playerId, byte[] largeData); + void SendLargeDataToPlayer(int playerId, byte[] largeData, int percentage); Task PerformCommand(BaseCommand command); Task SendCommandToPlayer(BaseCommand command, int playerId); Task CheckCommandReception(BaseCommand command, int playerId); @@ -44,9 +44,6 @@ public interface IDataConnectionHandler : IConnectionHandler Task UndoCommand(BaseCommand command); Task RedoCommand(BaseCommand command); Task RpcSyncToSharedAnchor(string uuid); - Task RpcStartSyncHistory(int id); - Task RpcSyncHistoryPercentage(int id, int exp, int snt); - Task RpcHistorySyncComplete(int id); event Action Disconnected; diff --git a/Assets/Scripts/Multiplayer/MultiplayerManager.cs b/Assets/Scripts/Multiplayer/MultiplayerManager.cs index 2293913e0..4f4c47474 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerManager.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerManager.cs @@ -420,14 +420,11 @@ void OnRemotePlayerJoined(int id, ITransientData playerData) } } - public void SendLargeDataToPlayer(int playerId, byte[] Data) + public void SendLargeDataToPlayer(int playerId, byte[] Data, int percentage) { - m_Manager.SendLargeDataToPlayer(playerId, Data); + m_Manager.SendLargeDataToPlayer(playerId, Data, percentage); } - - - void OnPlayerLeft(int id) { if (m_LocalPlayer.PlayerId == id) @@ -525,30 +522,6 @@ public void OnCommandRedo(BaseCommand command) } } - public async void StartSynchHistory(int id) - { - if (State == ConnectionState.IN_ROOM) - { - await m_Manager.RpcStartSyncHistory(id); - } - } - - public async void SynchHistoryPercentage(int id, int expected, int sent) - { - if (State == ConnectionState.IN_ROOM) - { - await m_Manager.RpcSyncHistoryPercentage(id, expected, sent); - } - } - - public async void SynchHistoryComplete(int id) - { - if (State == ConnectionState.IN_ROOM) - { - await m_Manager.RpcHistorySyncComplete(id); - } - } - async void ShareAnchors() { #if OCULUS_SUPPORTED diff --git a/Assets/Scripts/Multiplayer/MultiplayerSceneSync.cs b/Assets/Scripts/Multiplayer/MultiplayerSceneSync.cs index 9c4518556..4092830d2 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerSceneSync.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerSceneSync.cs @@ -28,7 +28,7 @@ namespace OpenBrush.Multiplayer public class MultiplayerSceneSync : MonoBehaviour { public static MultiplayerSceneSync m_Instance; - public Action onLargeDataReceived; + public Action onLargeDataReceived; [HideInInspector] public int batchSize = 10; [HideInInspector] public float delayBetweenBatches = 0.05f; public SyncType m_SyncType = SyncType.Strokes; @@ -75,6 +75,7 @@ public void StartSyncronizationForUser(int id) } #region Syncronization Logic Strokes + async void SendStrokesToPlayer(int id) { LinkedList strokes = SketchMemoryScript.m_Instance.GetMemoryList; @@ -82,22 +83,23 @@ async void SendStrokesToPlayer(int id) if (strokes.Count == 0) return; SendCurrentTargetEnvironmentCommand(); - StartSyncProgressDisplayForSrokes(id, strokes); + const int chunkSize = 5; List strokeList = strokes.ToList(); int counter = 0; for (int i = 0; i < strokeList.Count; i += chunkSize) { + int percentage = (int)((counter / (float)strokeList.Count) * 100); var chunk = strokeList.Skip(i).Take(chunkSize).ToList(); byte[] strokesData = await MultiplayerStrokeSerialization.SerializeAndCompressMemoryListAsync(chunk); - MultiplayerManager.m_Instance.SendLargeDataToPlayer(id, strokesData); + MultiplayerManager.m_Instance.SendLargeDataToPlayer(id, strokesData, percentage); counter += chunk.Count; //Debug.Log($"Sent {strokesData.Length} bytes of serialized stroke data (batch {(i / chunkSize) + 1}) to player {id}."); } } - async void DeserializeReceivedStrokes(byte[] largeData) + async void DeserializeReceivedStrokes(byte[] largeData, int percentage) { // Decompress and deserialize strokes asynchronously @@ -115,11 +117,12 @@ async void DeserializeReceivedStrokes(byte[] largeData) } - void OnLargeDataReceived(byte[] largeData) + void OnLargeDataReceived(byte[] largeData, int percentage) { //Debug.Log($"[Multiplayer Scene Sync]Successfully received {largeData.Length} bytes from the autosave."); - DeserializeReceivedStrokes(largeData); + SynchInfoPercentageUpdate(percentage); + DeserializeReceivedStrokes(largeData, percentage); } #endregion @@ -164,8 +167,6 @@ public IEnumerator SendCommandHistory(int id) SendCurrentTargetEnvironmentCommand(); - StartSyncProgressDisplayForCommands(id, commands.ToList()); - foreach (BaseCommand command in commands) MultiplayerManager.m_Instance.OnCommandPerformed(command); _isSendingCommandHistory = false; @@ -200,65 +201,6 @@ private void CreateBrushStrokeCommands(List strokes, int LastTimestamp) } } - #endregion - - #region Remote infoCard commands - - public async void StartSyncProgressDisplayForSrokes(int TargetPlayerId, LinkedList strokes) - { - StartSynchHistory(TargetPlayerId); - - int sentStrokes = 0; - - foreach (var stroke in strokes) - { - - while (await MultiplayerManager.m_Instance.CheckStrokeReception(stroke, TargetPlayerId)) - { - await Task.Delay(200); - } - - sentStrokes++; - SynchHistoryPercentage(TargetPlayerId, strokes.Count, sentStrokes); - } - - SynchHistoryComplete(TargetPlayerId); - } - - public async void StartSyncProgressDisplayForCommands(int TargetPlayerId, List commands) - { - StartSynchHistory(TargetPlayerId); - - int sentStrokes = 0; - foreach (var command in commands) - { - while (await MultiplayerManager.m_Instance.CheckCommandReception(command, TargetPlayerId)) - { - await Task.Delay(200); - } - sentStrokes++; - SynchHistoryPercentage(TargetPlayerId, commands.Count, sentStrokes); - } - - SynchHistoryComplete(TargetPlayerId); - } - - private void StartSynchHistory(int id) - { - MultiplayerManager.m_Instance.StartSynchHistory(id); - } - - private void SynchHistoryPercentage(int id, int expected, int sent) - { - MultiplayerManager.m_Instance.SynchHistoryPercentage(id, expected, sent); - } - - private void SynchHistoryComplete(int id) - { - MultiplayerManager.m_Instance.SynchHistoryComplete(id); - } - - #endregion #region Local infoCard commands @@ -328,9 +270,9 @@ public void StartSynchInfo() { EnqueueMessage("Sync Started!"); } - public void SynchInfoPercentageUpdate() + + public void SynchInfoPercentageUpdate(int percentage) { - int percentage = (int)((float)SketchMemoryScript.AllStrokesCount() / numberOfCommandsExpected * 100); EnqueueMessage($"Sync {percentage}%"); } diff --git a/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs b/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs index dbcea03c3..68cb695f5 100644 --- a/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs +++ b/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs @@ -324,39 +324,12 @@ public async Task RpcSyncToSharedAnchor(string uuid) return true; } - public async Task RpcStartSyncHistory(int id) - { - PlayerRef playerRef = PlayerRef.FromEncoded(id); - PhotonRPCBatcher.EnqueueRPC(() => - { PhotonRPC.RPC_StartHistorySync(m_Runner, playerRef); }); - await Task.Yield(); - return true; - } - - public async Task RpcHistorySyncComplete(int id) - { - PlayerRef playerRef = PlayerRef.FromEncoded(id); - PhotonRPCBatcher.EnqueueRPC(() => - { PhotonRPC.RPC_HistorySyncCompleted(m_Runner, playerRef);}); - await Task.Yield(); - return true; - } - - public async Task RpcSyncHistoryPercentage(int id, int exp, int snt) - { - PlayerRef playerRef = PlayerRef.FromEncoded(id); - PhotonRPCBatcher.EnqueueRPC(() => - { PhotonRPC.RPC_HistoryPercentageUpdate(m_Runner, playerRef, exp, snt);}); - await Task.Yield(); - return true; - } - - public void SendLargeDataToPlayer(int playerId, byte[] largeData) + public void SendLargeDataToPlayer(int playerId, byte[] largeData, int percentage) { sequenceNumber++; PlayerRef playerRef = PlayerRef.FromEncoded(playerId); int dataHash = largeData.GetHashCode(); - var key = ReliableKey.FromInts(playerId, sequenceNumber, dataHash, 0); + var key = ReliableKey.FromInts(playerId, sequenceNumber, dataHash, percentage); m_Runner.SendReliableDataToPlayer(playerRef, key, largeData); } @@ -549,6 +522,10 @@ public void OnReliableDataReceived(NetworkRunner runner, PlayerRef player, Relia { //Debug.Log("Server received complete reliable data"); + int percentage; + key.GetInts(out _, out _, out _, out percentage); + //Debug.Log($"Data received with percentage: {percentage}%"); + byte[] receivedData = data.Array; if (receivedData == null || receivedData.Length == 0) { @@ -556,9 +533,10 @@ public void OnReliableDataReceived(NetworkRunner runner, PlayerRef player, Relia return; } - MultiplayerSceneSync.m_Instance.onLargeDataReceived?.Invoke(receivedData); + MultiplayerSceneSync.m_Instance.onLargeDataReceived?.Invoke(receivedData,percentage); } + public void OnReliableDataProgress(NetworkRunner runner, PlayerRef player, ReliableKey key, float progress) { diff --git a/Assets/Scripts/Multiplayer/Photon/PhotonRPC.cs b/Assets/Scripts/Multiplayer/Photon/PhotonRPC.cs index 5f0ef5108..84d1f1e83 100644 --- a/Assets/Scripts/Multiplayer/Photon/PhotonRPC.cs +++ b/Assets/Scripts/Multiplayer/Photon/PhotonRPC.cs @@ -539,26 +539,6 @@ private static void RPC_SwitchEnvironment(NetworkRunner runner, Guid environment SwitchEnvironment(environmentGuid, commandGuid, timestamp, parentGuid, childCount); } - [Rpc(InvokeLocal = false)] - public static void RPC_StartHistorySync(NetworkRunner runner, [RpcTarget] PlayerRef targetPlayer) - { - m_Instance.IssueGlobalCommand(GlobalCommands.DisplaySynchInfo); - } - - [Rpc(InvokeLocal = false)] - public static void RPC_HistoryPercentageUpdate(NetworkRunner runner, [RpcTarget] PlayerRef targetPlayer, int expected, int sent) - { - MultiplayerSceneSync.m_Instance.numberOfCommandsExpected = expected; - MultiplayerSceneSync.m_Instance.numberOfCommandsSent = sent; - m_Instance.IssueGlobalCommand(GlobalCommands.SynchInfoPercentageUpdate); - } - - [Rpc(InvokeLocal = false)] - public static void RPC_HistorySyncCompleted(NetworkRunner runner, [RpcTarget] PlayerRef targetPlayer) - { - m_Instance.IssueGlobalCommand(GlobalCommands.HideSynchInfo); - } - [Rpc(InvokeLocal = false)] public static void RPC_CheckCommand(NetworkRunner runner, Guid commandGuid, PlayerRef initiatorPlayer, [RpcTarget] PlayerRef targetPlayer) { diff --git a/Assets/Scripts/SketchControlsScript.cs b/Assets/Scripts/SketchControlsScript.cs index cfdab9e63..b32a8f2c6 100644 --- a/Assets/Scripts/SketchControlsScript.cs +++ b/Assets/Scripts/SketchControlsScript.cs @@ -156,9 +156,6 @@ public enum GlobalCommands MultiplayerConnect = 1007, MultiplayerDisconnect = 1008, EditMultiplayerNickName = 1009, - DisplaySynchInfo = 1010, - SynchInfoPercentageUpdate = 1011, - HideSynchInfo = 1012, RenameSketch = 5200, OpenLayerOptionsPopup = 5201, @@ -4861,15 +4858,6 @@ public void IssueGlobalCommand(GlobalCommands rEnum, int iParam1 = -1, PointerManager.m_Instance.EatLineEnabledInput(); SketchSurfacePanel.m_Instance.EatToolsInput(); break; - case GlobalCommands.DisplaySynchInfo: - MultiplayerSceneSync.m_Instance.StartSynchInfo(); - break; - case GlobalCommands.SynchInfoPercentageUpdate: - MultiplayerSceneSync.m_Instance.SynchInfoPercentageUpdate(); - break; - case GlobalCommands.HideSynchInfo: - MultiplayerSceneSync.m_Instance.HideSynchInfo(); - break; case GlobalCommands.RepaintOptions: break; // Intentionally blank. case GlobalCommands.Null: break; // Intentionally blank. case GlobalCommands.MultiplayerPanelOptions: break; // Intentionally blank. From 0f0e15b182ac8fc1db989c5a4e6135a12733c04a Mon Sep 17 00:00:00 2001 From: Riccardo Bovo Date: Sat, 11 Jan 2025 21:42:44 +0000 Subject: [PATCH 03/25] Spatialized Sound Multiplayer Manager to set the voice prefab as a child of the player prefab so that --- .../Multiplayer/MultiplayerInterfaces.cs | 2 ++ .../Scripts/Multiplayer/MultiplayerManager.cs | 12 ++++++-- .../Multiplayer/Photon/PhotonManager.cs | 21 ++++++++++++-- .../Multiplayer/Photon/PhotonVoiceManager.cs | 28 ++++++++++++++++++- 4 files changed, 58 insertions(+), 5 deletions(-) diff --git a/Assets/Scripts/Multiplayer/MultiplayerInterfaces.cs b/Assets/Scripts/Multiplayer/MultiplayerInterfaces.cs index 06770f229..055a5e547 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerInterfaces.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerInterfaces.cs @@ -15,6 +15,7 @@ using System; using System.Threading.Tasks; using TiltBrush; +using UnityEngine; namespace OpenBrush.Multiplayer { @@ -36,6 +37,7 @@ public interface IDataConnectionHandler : IConnectionHandler int GetPlayerCount(); int GetNetworkedTimestampMilliseconds(); bool GetPlayerRoomOwnershipStatus(int playerId); + GameObject GetPlayerPrefab(int playerId); void SendLargeDataToPlayer(int playerId, byte[] largeData, int percentage); Task PerformCommand(BaseCommand command); Task SendCommandToPlayer(BaseCommand command, int playerId); diff --git a/Assets/Scripts/Multiplayer/MultiplayerManager.cs b/Assets/Scripts/Multiplayer/MultiplayerManager.cs index 4f4c47474..d6420b7aa 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerManager.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerManager.cs @@ -18,8 +18,6 @@ using System.Threading.Tasks; using UnityEngine; - - #if OCULUS_SUPPORTED using OVRPlatform = Oculus.Platform; #endif @@ -49,6 +47,7 @@ public class MultiplayerManager : MonoBehaviour public Action> localPlayerJoined; public Action> remotePlayerJoined; + public Action remoteVoiceAdded; public Action playerLeft; public Action> roomDataRefreshed; @@ -156,6 +155,7 @@ void Start() roomDataRefreshed += OnRoomDataRefreshed; localPlayerJoined += OnLocalPlayerJoined; remotePlayerJoined += OnRemotePlayerJoined; + remoteVoiceAdded += OnRemoteVoiceConnected; playerLeft += OnPlayerLeft; StateUpdated += UpdateSketchMemoryScriptTimeOffset; @@ -169,6 +169,7 @@ void OnDestroy() roomDataRefreshed -= OnRoomDataRefreshed; localPlayerJoined -= OnLocalPlayerJoined; remotePlayerJoined -= OnRemotePlayerJoined; + remoteVoiceAdded -= OnRemoteVoiceConnected; playerLeft -= OnPlayerLeft; StateUpdated -= UpdateSketchMemoryScriptTimeOffset; @@ -420,6 +421,13 @@ void OnRemotePlayerJoined(int id, ITransientData playerData) } } + public void OnRemoteVoiceConnected(int id, GameObject voicePrefab) + { + ITransientData playerData = m_RemotePlayers.First(x => x.PlayerId == id); + GameObject RemotePlayerGameObject = m_Manager.GetPlayerPrefab(id); + voicePrefab.transform.parent = RemotePlayerGameObject.transform; + } + public void SendLargeDataToPlayer(int playerId, byte[] Data, int percentage) { m_Manager.SendLargeDataToPlayer(playerId, Data, percentage); diff --git a/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs b/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs index 68cb695f5..9c14007af 100644 --- a/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs +++ b/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs @@ -87,10 +87,10 @@ public async Task Init() public void Update() { - var copy = m_PlayersSpawning.ToList(); + List copy = m_PlayersSpawning.ToList(); foreach (var player in copy) { - var newPlayer = m_Runner.GetPlayerObject(player); + NetworkObject newPlayer = m_Runner.GetPlayerObject(player); if (newPlayer != null) { m_Manager.remotePlayerJoined?.Invoke(player.RawEncoded, newPlayer.GetComponent()); @@ -99,6 +99,7 @@ public void Update() } } + #region IConnectionHandler Methods public async Task Connect() @@ -271,6 +272,22 @@ public bool GetPlayerRoomOwnershipStatus(int playerId) else return false; } + public GameObject GetPlayerPrefab(int playerId) + { + if (m_Runner == null) return null; + + PlayerRef player = PlayerRef.FromEncoded(playerId); + + NetworkObject playerNetworkObject = m_Runner.GetPlayerObject(player); + if (playerNetworkObject != null) return playerNetworkObject.gameObject; + + else + { + Debug.LogWarning($"No NetworkObject found for PlayerRef: {player.RawEncoded}"); + return null; + } + } + public async Task PerformCommand(BaseCommand command) { await Task.Yield(); diff --git a/Assets/Scripts/Multiplayer/Photon/PhotonVoiceManager.cs b/Assets/Scripts/Multiplayer/Photon/PhotonVoiceManager.cs index d6d4df382..932f59872 100644 --- a/Assets/Scripts/Multiplayer/Photon/PhotonVoiceManager.cs +++ b/Assets/Scripts/Multiplayer/Photon/PhotonVoiceManager.cs @@ -65,7 +65,7 @@ public async Task Init() }; m_VoiceConnection.Client.AddCallbackTarget(this); - + m_VoiceConnection.RemoteVoiceAdded += OnRemoteVoiceAdded; } catch (Exception ex) { @@ -81,6 +81,11 @@ public async Task Init() } + void OnDestroy() + { + m_VoiceConnection.RemoteVoiceAdded += OnRemoteVoiceAdded; + } + public async Task Connect() { State = ConnectionState.CONNECTING; @@ -262,6 +267,27 @@ private void UpdateSpeechDetection() wasTransmitting = isTransmitting; } + private async void WaitForSpeaker(string speakerName, Action onSpeakerFound) + { + GameObject speakerObject = null; + while (speakerObject == null) + { + speakerObject = GameObject.Find(speakerName); + await Task.Delay(1000); + } + onSpeakerFound?.Invoke(speakerObject); + } + + private void OnRemoteVoiceAdded(RemoteVoiceLink remoteVoice) + { + string speakerName = string.Format("Remote p#{0} v#{1}", remoteVoice.PlayerId, remoteVoice.VoiceId); + + // Start waiting for the speaker to appear + WaitForSpeaker(speakerName, speakerObject => + { + m_Manager.remoteVoiceAdded?.Invoke(remoteVoice.PlayerId+1, speakerObject); + }); + } #region MatchmakingCallbacks From 83a7cc150e03ebfdab22b9c7629290867fcd908f Mon Sep 17 00:00:00 2001 From: Riccardo Bovo Date: Sun, 12 Jan 2025 14:03:41 +0000 Subject: [PATCH 04/25] Fix positioning of the Speaker Prefab Speaker prefab is now child of the head transform --- .../Multiplayer/Photon/SpeakerPrefab.prefab | 7 +++--- .../Scripts/Multiplayer/MultiplayerManager.cs | 24 +++++++++++++++++-- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/Assets/Resources/Multiplayer/Photon/SpeakerPrefab.prefab b/Assets/Resources/Multiplayer/Photon/SpeakerPrefab.prefab index 6644b3839..19a3ac997 100644 --- a/Assets/Resources/Multiplayer/Photon/SpeakerPrefab.prefab +++ b/Assets/Resources/Multiplayer/Photon/SpeakerPrefab.prefab @@ -25,12 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9139372413509065517} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &5056828011079605640 AudioSource: @@ -88,7 +89,7 @@ AudioSource: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -142,7 +143,7 @@ MonoBehaviour: m_EditorClassIdentifier: playDelayConfig: Low: 200 - High: 400 + High: 200 Max: 1000 SpeedUpPerc: 5 restartOnDeviceChange: 1 diff --git a/Assets/Scripts/Multiplayer/MultiplayerManager.cs b/Assets/Scripts/Multiplayer/MultiplayerManager.cs index d6420b7aa..4a0bca4e0 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerManager.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerManager.cs @@ -17,7 +17,6 @@ using System.Linq; using System.Threading.Tasks; using UnityEngine; - #if OCULUS_SUPPORTED using OVRPlatform = Oculus.Platform; #endif @@ -424,8 +423,29 @@ void OnRemotePlayerJoined(int id, ITransientData playerData) public void OnRemoteVoiceConnected(int id, GameObject voicePrefab) { ITransientData playerData = m_RemotePlayers.First(x => x.PlayerId == id); + if (playerData == null) + { + Debug.LogWarning($"PlayerRigData with ID {id} not found"); + return; + } + + GameObject RemotePlayerGameObject = m_Manager.GetPlayerPrefab(id); - voicePrefab.transform.parent = RemotePlayerGameObject.transform; + if (RemotePlayerGameObject == null) + { + Debug.LogWarning($"RemotePlayerGameObject with ID {id} not found"); + return; + } + + Transform headTransform = RemotePlayerGameObject.transform.Find("HeadTransform"); + if (headTransform != null) + { + voicePrefab.transform.SetParent(headTransform, false); + } + else + { + Debug.LogWarning($"HeadTransform not found in {RemotePlayerGameObject.name}"); + } } public void SendLargeDataToPlayer(int playerId, byte[] Data, int percentage) From 502d3cd40290fe9c2af6d5835fdb1fe227af24fb Mon Sep 17 00:00:00 2001 From: Riccardo Bovo Date: Sun, 12 Jan 2025 15:58:47 +0000 Subject: [PATCH 05/25] Enhancing the Aesthetics of Sync Progress --- Assets/Scripts/InfoCardAnimation.cs | 9 +++++++-- Assets/Scripts/Multiplayer/MultiplayerSceneSync.cs | 5 +++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Assets/Scripts/InfoCardAnimation.cs b/Assets/Scripts/InfoCardAnimation.cs index 72185e26c..c8a3cd6a5 100644 --- a/Assets/Scripts/InfoCardAnimation.cs +++ b/Assets/Scripts/InfoCardAnimation.cs @@ -289,11 +289,16 @@ public void UpdateHoldingDuration(float newDuration) { if (m_CurrentState == State.Holding) { - m_HoldingStateDuration = newDuration; - m_StateTimer = 0.0f; + float remainingDuration = m_HoldingStateDuration - m_StateTimer; + + if (remainingDuration < newDuration) + { + m_HoldingStateDuration += newDuration - remainingDuration; + } } } + } }// namespace TiltBrush diff --git a/Assets/Scripts/Multiplayer/MultiplayerSceneSync.cs b/Assets/Scripts/Multiplayer/MultiplayerSceneSync.cs index 4092830d2..c9a0e3196 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerSceneSync.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerSceneSync.cs @@ -89,12 +89,13 @@ async void SendStrokesToPlayer(int id) int counter = 0; for (int i = 0; i < strokeList.Count; i += chunkSize) + { - int percentage = (int)((counter / (float)strokeList.Count) * 100); var chunk = strokeList.Skip(i).Take(chunkSize).ToList(); + counter += chunk.Count; + int percentage = (int)((counter / (float)strokeList.Count) * 100); byte[] strokesData = await MultiplayerStrokeSerialization.SerializeAndCompressMemoryListAsync(chunk); MultiplayerManager.m_Instance.SendLargeDataToPlayer(id, strokesData, percentage); - counter += chunk.Count; //Debug.Log($"Sent {strokesData.Length} bytes of serialized stroke data (batch {(i / chunkSize) + 1}) to player {id}."); } } From 83e8822ff8c28afb29d7f8d7d90208e9190587e9 Mon Sep 17 00:00:00 2001 From: Riccardo Bovo Date: Tue, 14 Jan 2025 17:48:33 +0000 Subject: [PATCH 06/25] Update HMD Font --- Assets/Fonts/NotoSansCJK-Light SDF.asset | 16 ++++++++++------ Assets/Fonts/Oswald-Bold SDF.asset | 9 ++++++--- .../Multiplayer/Photon/PhotonPlayerRig.prefab | 8 ++++---- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/Assets/Fonts/NotoSansCJK-Light SDF.asset b/Assets/Fonts/NotoSansCJK-Light SDF.asset index c52695e2e..84e55ec3a 100644 --- a/Assets/Fonts/NotoSansCJK-Light SDF.asset +++ b/Assets/Fonts/NotoSansCJK-Light SDF.asset @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: NotoSansCJK-Light SDF Material m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -70,9 +73,9 @@ Material: - _OutlineWidth: 0 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - - _ScaleRatioA: 1 - - _ScaleRatioB: 1 - - _ScaleRatioC: 1 + - _ScaleRatioA: 0.8333333 + - _ScaleRatioB: 0.6770833 + - _ScaleRatioC: 0.6770833 - _ScaleX: 1 - _ScaleY: 1 - _ShaderFlags: 0 @@ -117,9 +120,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3} m_Name: NotoSansCJK-Light SDF m_EditorClassIdentifier: - hashCode: 0 + hashCode: 1416160341 material: {fileID: -3903529720270446558} - materialHashCode: 0 + materialHashCode: -1938541483 m_Version: 1.1.0 m_SourceFontFileGUID: 501eea5417f248044ac830eb146b46cb m_SourceFontFile_EditorRef: {fileID: 12800000, guid: 501eea5417f248044ac830eb146b46cb, @@ -38758,7 +38761,8 @@ Texture2D: m_MipCount: 1 m_IsReadable: 0 m_IsPreProcessed: 0 - m_IgnoreMasterTextureLimit: 0 + m_IgnoreMipmapLimit: 0 + m_MipmapLimitGroupName: m_StreamingMipmaps: 0 m_StreamingMipmapsPriority: 0 m_VTOnly: 0 diff --git a/Assets/Fonts/Oswald-Bold SDF.asset b/Assets/Fonts/Oswald-Bold SDF.asset index 6ac2666fc..44a15f7ff 100644 --- a/Assets/Fonts/Oswald-Bold SDF.asset +++ b/Assets/Fonts/Oswald-Bold SDF.asset @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Oswald-Bold SDF Material m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 5 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -128,7 +131,8 @@ Texture2D: m_MipCount: 1 m_IsReadable: 1 m_IsPreProcessed: 0 - m_IgnoreMasterTextureLimit: 0 + m_IgnoreMipmapLimit: 0 + m_MipmapLimitGroupName: m_StreamingMipmaps: 0 m_StreamingMipmapsPriority: 0 m_VTOnly: 0 @@ -2897,8 +2901,7 @@ MonoBehaviour: m_FontFeatureTable: m_GlyphPairAdjustmentRecords: [] fallbackFontAssets: [] - m_FallbackFontAssetTable: - - {fileID: 0} + m_FallbackFontAssetTable: [] m_CreationSettings: sourceFontFileName: sourceFontFileGUID: diff --git a/Assets/Resources/Multiplayer/Photon/PhotonPlayerRig.prefab b/Assets/Resources/Multiplayer/Photon/PhotonPlayerRig.prefab index 9c6084431..e35b8e86b 100644 --- a/Assets/Resources/Multiplayer/Photon/PhotonPlayerRig.prefab +++ b/Assets/Resources/Multiplayer/Photon/PhotonPlayerRig.prefab @@ -2531,7 +2531,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + - {fileID: 2122602, guid: ec48085d8b1ed18499cf1411d42005a0, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2575,8 +2575,8 @@ MonoBehaviour: m_Calls: [] m_text: Nickname m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: ec48085d8b1ed18499cf1411d42005a0, type: 2} + m_sharedMaterial: {fileID: 2122602, guid: ec48085d8b1ed18499cf1411d42005a0, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -2600,7 +2600,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36.75 + m_fontSize: 27.5 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 From ff0fc39fa97f58e13bd26290ec3e50bcd0572b61 Mon Sep 17 00:00:00 2001 From: Riccardo Bovo Date: Wed, 15 Jan 2025 20:23:28 +0000 Subject: [PATCH 07/25] Adjust Spatialized Audio Spatialized max distance needs to be adjusted based on the `App.Scene.Pose.scale` to do so we introduce a new script `MultiplayerAudioSourcesManager` which set all of the remote users audioSources max distance whenever the scene scales up or down --- .../Multiplayer/Photon/SpeakerPrefab.prefab | 22 +++--- Assets/Scenes/Main.unity | 13 ++++ .../MultiplayerAudioSourcesManager.cs | 67 +++++++++++++++++++ .../MultiplayerAudioSourcesManager.cs.meta | 11 +++ .../Scripts/Multiplayer/MultiplayerManager.cs | 9 +++ 5 files changed, 111 insertions(+), 11 deletions(-) create mode 100644 Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs create mode 100644 Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs.meta diff --git a/Assets/Resources/Multiplayer/Photon/SpeakerPrefab.prefab b/Assets/Resources/Multiplayer/Photon/SpeakerPrefab.prefab index 19a3ac997..63c50a119 100644 --- a/Assets/Resources/Multiplayer/Photon/SpeakerPrefab.prefab +++ b/Assets/Resources/Multiplayer/Photon/SpeakerPrefab.prefab @@ -56,7 +56,7 @@ AudioSource: MinDistance: 1 MaxDistance: 500 Pan2D: 0 - rolloffMode: 0 + rolloffMode: 2 BypassEffects: 0 BypassListenerEffects: 0 BypassReverbZones: 0 @@ -66,21 +66,21 @@ AudioSource: - serializedVersion: 3 time: 0 value: 1 - inSlope: 0 - outSlope: 0 + inSlope: -0.7447439 + outSlope: -0.7447439 tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0.32808557 - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 + time: 0.99664307 + value: 0.305542 + inSlope: -0.7058288 + outSlope: -0.7058288 tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0.12208462 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 54e73264c..d0f05d0f3 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -15179,6 +15179,7 @@ GameObject: - component: {fileID: 1052269837} - component: {fileID: 1052269836} - component: {fileID: 1052269835} + - component: {fileID: 1052269838} m_Layer: 0 m_Name: MultiplayerManager m_TagString: Untagged @@ -15321,6 +15322,18 @@ MonoBehaviour: m_SyncType: 0 numberOfCommandsExpected: 0 numberOfCommandsSent: 0 +--- !u!114 &1052269838 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1052269830} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e5dc8298e822c34698aa17ff24b2b77, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1057179852 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs b/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs new file mode 100644 index 000000000..8c9aaaaa5 --- /dev/null +++ b/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs @@ -0,0 +1,67 @@ +// Copyright 2023 The Open Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +using System.Collections.Generic; +using System.Linq; +using TiltBrush; +using UnityEngine; + +public class MultiplayerAudioSourcesManager : MonoBehaviour +{ + public static MultiplayerAudioSourcesManager m_Instance; + private List sources; + private float _previousScale; + + public void AddAudioSource(AudioSource source) + { + + sources.Append(source); + + } + + void Update() + { + float currentScale = App.Scene.Pose.scale; + + if (!Mathf.Approximately(currentScale, _previousScale)) + { + _previousScale = currentScale; + UpdateAudioSources(currentScale); + } + } + + private void UpdateAudioSources(float sceneScale) + { + // Loop backward to remove invalid AudioSources + for (int i = sources.Count - 1; i >= 0; i--) + { + var source = sources[i]; + if (source != null) + { + float adjustedMaxDistance = CalculateMaxDistance(sceneScale); + source.maxDistance = adjustedMaxDistance; + } + else sources.RemoveAt(i); + } + } + + private float CalculateMaxDistance(float sceneScale) + { + // This is based on OpenBrush default scene max radius + // - At scale 0.1, the mountains diameter is 200 (close range). + // - At scale 1.0,the mountains diameter is 20000 (far range). + return Mathf.Lerp(200f, 20000f, Mathf.Clamp01(sceneScale)); + } + +} diff --git a/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs.meta b/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs.meta new file mode 100644 index 000000000..5c765d57e --- /dev/null +++ b/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5e5dc8298e822c34698aa17ff24b2b77 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Multiplayer/MultiplayerManager.cs b/Assets/Scripts/Multiplayer/MultiplayerManager.cs index 4a0bca4e0..d917814d7 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerManager.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerManager.cs @@ -418,6 +418,7 @@ void OnRemotePlayerJoined(int id, ITransientData playerData) { MultiplayerSceneSync.m_Instance.StartSyncronizationForUser(id); } + } public void OnRemoteVoiceConnected(int id, GameObject voicePrefab) @@ -446,6 +447,14 @@ public void OnRemoteVoiceConnected(int id, GameObject voicePrefab) { Debug.LogWarning($"HeadTransform not found in {RemotePlayerGameObject.name}"); } + + AudioSource audioSource = voicePrefab.GetComponent(); + if (audioSource == null) + { + Debug.LogWarning($"VoicePrefab with ID {id} lack AudioSource :S "); + return; + } + MultiplayerAudioSourcesManager.m_Instance.AddAudioSource(audioSource); } public void SendLargeDataToPlayer(int playerId, byte[] Data, int percentage) From a7879bbee3b362bb855ec4fccfc89aa0d9ab7442 Mon Sep 17 00:00:00 2001 From: Riccardo Bovo Date: Sat, 18 Jan 2025 14:44:01 +0000 Subject: [PATCH 08/25] Prepare Remote Player List for Display Introduce a `RemotePlayer` class with `PlayerId`, `Nickname` and `ItransientData`, extendable with Role (e.g., observer/editor/owner) and VoiceStatus (e.g., muted/active speaker). Abstracts player details from the Photon SDK for better flexibility and clarity. Includes a list of `RemotePlayer` ready to be displayed and interacted with on a panel. --- .../Multiplayer/MultiplayerDataStructs.cs | 2 ++ .../Scripts/Multiplayer/MultiplayerManager.cs | 34 +++++++++--------- .../Multiplayer/Photon/PhotonManager.cs | 21 ++++++++++- Assets/Scripts/Multiplayer/RemotePlayer.cs | 36 +++++++++++++++++++ .../Scripts/Multiplayer/RemotePlayer.cs.meta | 11 ++++++ 5 files changed, 86 insertions(+), 18 deletions(-) create mode 100644 Assets/Scripts/Multiplayer/RemotePlayer.cs create mode 100644 Assets/Scripts/Multiplayer/RemotePlayer.cs.meta diff --git a/Assets/Scripts/Multiplayer/MultiplayerDataStructs.cs b/Assets/Scripts/Multiplayer/MultiplayerDataStructs.cs index 8c7a63cdf..e8e044313 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerDataStructs.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerDataStructs.cs @@ -83,4 +83,6 @@ public struct ConnectionUserInfo public string Nickname; public string Role; } + + } diff --git a/Assets/Scripts/Multiplayer/MultiplayerManager.cs b/Assets/Scripts/Multiplayer/MultiplayerManager.cs index d917814d7..0d3d3e680 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerManager.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerManager.cs @@ -42,10 +42,10 @@ public class MultiplayerManager : MonoBehaviour private IVoiceConnectionHandler m_VoiceManager; public ITransientData m_LocalPlayer; - public List> m_RemotePlayers; + public List m_RemotePlayers; public Action> localPlayerJoined; - public Action> remotePlayerJoined; + public Action remotePlayerJoined; public Action remoteVoiceAdded; public Action playerLeft; public Action> roomDataRefreshed; @@ -110,7 +110,7 @@ void Awake() { m_Instance = this; oculusPlayerIds = new List(); - m_RemotePlayers = new List>(); + m_RemotePlayers = new List(); } void Start() @@ -374,8 +374,10 @@ void Update() // Update remote user refs, and send Anchors if new player joins. bool newUser = false; - foreach (var player in m_RemotePlayers) + foreach (var playerData in m_RemotePlayers) { + ITransientData player = playerData.TransientData; + if (!player.IsSpawned) continue; data = player.ReceiveData(); @@ -409,43 +411,41 @@ void OnLocalPlayerJoined(int id, ITransientData playerData) } - void OnRemotePlayerJoined(int id, ITransientData playerData) - { - playerData.PlayerId = id; - m_RemotePlayers.Add(playerData); + void OnRemotePlayerJoined(RemotePlayer newRemotePlayer) + { + m_RemotePlayers.Add(newRemotePlayer); if (isUserRoomOwner) { - MultiplayerSceneSync.m_Instance.StartSyncronizationForUser(id); + MultiplayerSceneSync.m_Instance.StartSyncronizationForUser(newRemotePlayer.PlayerId); } } public void OnRemoteVoiceConnected(int id, GameObject voicePrefab) { - ITransientData playerData = m_RemotePlayers.First(x => x.PlayerId == id); - if (playerData == null) + RemotePlayer playerData = m_RemotePlayers.First(x => x.PlayerId == id); + if (playerData == default) { Debug.LogWarning($"PlayerRigData with ID {id} not found"); return; } - - GameObject RemotePlayerGameObject = m_Manager.GetPlayerPrefab(id); - if (RemotePlayerGameObject == null) + if (playerData.PlayerGameObject == null) { Debug.LogWarning($"RemotePlayerGameObject with ID {id} not found"); return; } - Transform headTransform = RemotePlayerGameObject.transform.Find("HeadTransform"); + Transform headTransform = playerData.PlayerGameObject.transform.Find("HeadTransform"); if (headTransform != null) { voicePrefab.transform.SetParent(headTransform, false); + playerData.VoiceGameObject = voicePrefab; } else { - Debug.LogWarning($"HeadTransform not found in {RemotePlayerGameObject.name}"); + Debug.LogWarning($"HeadTransform not found in {playerData.PlayerGameObject.name}"); } AudioSource audioSource = voicePrefab.GetComponent(); @@ -496,7 +496,7 @@ void OnPlayerLeft(int id) // Since There are other players left // Determine the new room owner by the lowest PlayerId - var allPlayers = new List> { m_LocalPlayer }; + var allPlayers = new List { new RemotePlayer { PlayerId = m_LocalPlayer.PlayerId } }; allPlayers.AddRange(m_RemotePlayers); // Find the player with the lowest PlayerId diff --git a/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs b/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs index 9c14007af..d43a36580 100644 --- a/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs +++ b/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs @@ -93,7 +93,15 @@ public void Update() NetworkObject newPlayer = m_Runner.GetPlayerObject(player); if (newPlayer != null) { - m_Manager.remotePlayerJoined?.Invoke(player.RawEncoded, newPlayer.GetComponent()); + RemotePlayer newRemotePlayer = new RemotePlayer + { + PlayerId = player.RawEncoded, + Nickname = GetPlayerNickname(player.RawEncoded), + TransientData = newPlayer.GetComponent(), + PlayerGameObject = newPlayer.gameObject + }; + + m_Manager.remotePlayerJoined?.Invoke(newRemotePlayer); m_PlayersSpawning.Remove(player); } } @@ -272,6 +280,17 @@ public bool GetPlayerRoomOwnershipStatus(int playerId) else return false; } + public string GetPlayerNickname(int playerId) + { + var remotePlayer = m_PlayersSpawning + .Select(playerRef => m_Runner.GetPlayerObject(playerRef)?.GetComponent()) + .FirstOrDefault(playerRig => playerRig != null && playerRig.PlayerId == playerId); + + if (remotePlayer != null && remotePlayer.Object != null && remotePlayer.Object.IsValid) + return remotePlayer.Nickname; + else return "default"; + } + public GameObject GetPlayerPrefab(int playerId) { if (m_Runner == null) return null; diff --git a/Assets/Scripts/Multiplayer/RemotePlayer.cs b/Assets/Scripts/Multiplayer/RemotePlayer.cs new file mode 100644 index 000000000..d1060b2af --- /dev/null +++ b/Assets/Scripts/Multiplayer/RemotePlayer.cs @@ -0,0 +1,36 @@ +// Copyright 2023 The Open Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace OpenBrush.Multiplayer +{ + + [System.Serializable] + public class RemotePlayer + { + public int PlayerId; + public string Nickname; + + // send/receive rig data interface + public ITransientData TransientData; + + // The underlying GameObjects in the scene that represents this player + public GameObject PlayerGameObject; + public GameObject VoiceGameObject; + } + +} diff --git a/Assets/Scripts/Multiplayer/RemotePlayer.cs.meta b/Assets/Scripts/Multiplayer/RemotePlayer.cs.meta new file mode 100644 index 000000000..017e58d0a --- /dev/null +++ b/Assets/Scripts/Multiplayer/RemotePlayer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 86d00ed09e5bf194594a61456245bb4d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From cd49bb84c8824d03326d907cb4dd868d3fdf40d4 Mon Sep 17 00:00:00 2001 From: Riccardo Bovo Date: Sat, 18 Jan 2025 17:19:25 +0000 Subject: [PATCH 09/25] Adding Room Options Pop Up Window This Pop Up Window will enable the user to list the users, pass ownership, turn on and off users voice and edit user role --- Assets/Prefabs/Panels/MultiplayerPanel.prefab | 3614 +++-------------- .../PopUps/PopUpWindow_RoomOptions.prefab | 505 +++ .../PopUpWindow_RoomOptions.prefab.meta | 7 + .../GUI/MultiplayerRoomOptionsPopUpWindow.cs | 48 + .../MultiplayerRoomOptionsPopUpWindow.cs.meta | 11 + Assets/Scripts/SketchControlsScript.cs | 6 + 6 files changed, 1180 insertions(+), 3011 deletions(-) create mode 100644 Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab create mode 100644 Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab.meta create mode 100644 Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs create mode 100644 Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs.meta diff --git a/Assets/Prefabs/Panels/MultiplayerPanel.prefab b/Assets/Prefabs/Panels/MultiplayerPanel.prefab index 875727125..66d123d9d 100644 --- a/Assets/Prefabs/Panels/MultiplayerPanel.prefab +++ b/Assets/Prefabs/Panels/MultiplayerPanel.prefab @@ -31,13 +31,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2965947989537662772} - {fileID: 8346410928580794432} - - {fileID: 438733611317437076} - - {fileID: 3405719730669880946} - - {fileID: 1954481780995984980} - - {fileID: 4000011007410470} - - {fileID: 498528} - {fileID: 499980} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -54,7 +48,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_PanelType: 34 - m_Collider: {fileID: 6536704} + m_Collider: {fileID: 0} m_Mesh: {fileID: 184986} m_Border: {fileID: 23425245546884932} m_MeshCollider: {fileID: 6569620} @@ -66,6 +60,8 @@ MonoBehaviour: - m_PopUpPrefab: {fileID: 8644332587479430734, guid: bdb7d2ac05cca8346b210c2b576878cb, type: 3} m_Command: 1009 + - m_PopUpPrefab: {fileID: 197348, guid: dcd3065b75d04fa4a8c7381d4513ccd9, type: 3} + m_Command: 1010 m_PanelDescription: m_LocalizedPanelDescription: m_TableReference: @@ -256,59 +252,6 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1.94, y: 2.55, z: 0.02} m_Center: {x: 0.06, y: -0.06, z: 0} ---- !u!1 &173754 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 498528} - - component: {fileID: 6536704} - m_Layer: 16 - m_Name: Collider - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &498528 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 173754} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.674, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 415082} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &6536704 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 173754} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 2, y: 2, z: 0.5} - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &176750 GameObject: m_ObjectHideFlags: 0 @@ -386,89 +329,6 @@ Transform: - {fileID: 4410849844686322} m_Father: {fileID: 415082} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1000013067707022 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4000011007410470} - - component: {fileID: 33000014291051348} - - component: {fileID: 23000013088760582} - m_Layer: 16 - m_Name: _Bounds(inactive) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &4000011007410470 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1000013067707022} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 2.5, z: 2.55} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 415082} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33000014291051348 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1000013067707022} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &23000013088760582 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1000013067707022} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 0 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - 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: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - 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 &1007290988937762 GameObject: m_ObjectHideFlags: 0 @@ -838,7 +698,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &4887086521611946 Transform: m_ObjectHideFlags: 0 @@ -847,9 +707,9 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1850095996710182} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -0, y: 0, z: 0} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.01} + m_LocalScale: {x: 1, y: 1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4696385544466816} @@ -861,7 +721,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1850095996710182} - m_Mesh: {fileID: 4300000, guid: 90e92f1d849f0b448ac3e9a402f08bed, type: 3} + m_Mesh: {fileID: 43303297887633632, guid: eb32a73de999860498953bf6c8960982, type: 3} --- !u!23 &23979510237070564 MeshRenderer: m_ObjectHideFlags: 0 @@ -1707,7 +1567,90 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_renderer: {fileID: 3100622910448847287} m_maskType: 0 ---- !u!1 &1697630693985053451 +--- !u!1 &3214184211823652001 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1641104114940865418} + - component: {fileID: 6601465140255059263} + - component: {fileID: 4866733623279814698} + m_Layer: 16 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1641104114940865418 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3214184211823652001} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067} + m_LocalPosition: {x: 0, y: 0.0041000843, z: 0.004} + m_LocalScale: {x: 10.75, y: 10.75, z: 7} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3728028955869875737} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6601465140255059263 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3214184211823652001} + m_Mesh: {fileID: 4300002, guid: 3efe5b86b55995545a231ce66a53b402, type: 3} +--- !u!23 &4866733623279814698 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3214184211823652001} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: d153b453067a0724889fb677fef801a1, 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: 0 + 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 &4513402330335811974 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1715,49 +1658,48 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1141409664942745479} - - component: {fileID: 1760323139199521700} - - component: {fileID: 4490950674500302730} - - component: {fileID: 6816865797365254487} - - component: {fileID: 7781273403086602364} + - component: {fileID: 7486361010185590075} + - component: {fileID: 604789049251219148} + - component: {fileID: 6675207043370599506} + - component: {fileID: 4873125866289393846} + - component: {fileID: 5322833515426493788} m_Layer: 16 - m_Name: join Button + m_Name: MultiplayerRoomSettings m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1141409664942745479 +--- !u!4 &7486361010185590075 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1697630693985053451} + m_GameObject: {fileID: 4513402330335811974} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.329, y: 0.31899986, z: -0.042} - m_LocalScale: {x: 0.4, y: 0.4, z: 0.35} + m_LocalPosition: {x: 0.63, y: -0.44700006, z: -0.042} + m_LocalScale: {x: 0.33, y: 0.33, z: 0.33} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7015233605674447413} - m_Father: {fileID: 2965947989537662772} + m_Children: [] + m_Father: {fileID: 8346410928580794432} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &1760323139199521700 +--- !u!33 &604789049251219148 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1697630693985053451} - m_Mesh: {fileID: 4300000, guid: 70d5ab47bcc3aa0439e20bd40350c05a, type: 3} ---- !u!23 &4490950674500302730 + m_GameObject: {fileID: 4513402330335811974} + m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} +--- !u!23 &6675207043370599506 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1697630693985053451} + m_GameObject: {fileID: 4513402330335811974} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -1793,13 +1735,13 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &6816865797365254487 +--- !u!65 &4873125866289393846 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1697630693985053451} + m_GameObject: {fileID: 4513402330335811974} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -1812,15 +1754,15 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1.4, y: 1, z: 0.1} + m_Size: {x: 1.1, y: 1.1, z: 0.1} m_Center: {x: -0.000000074505806, y: 0.000000022351742, z: 0} ---- !u!114 &7781273403086602364 +--- !u!114 &5322833515426493788 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1697630693985053451} + m_GameObject: {fileID: 4513402330335811974} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b78a8d7209bbdc546979b549a875d550, type: 3} @@ -1831,9 +1773,9 @@ MonoBehaviour: m_DescriptionText: m_LocalizedDescription: m_TableReference: - m_TableCollectionName: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: - m_KeyId: 0 + m_KeyId: 294637000357126144 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -1850,7 +1792,7 @@ MonoBehaviour: m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 - m_ButtonTexture: {fileID: 2800000, guid: cdc7d38d9e0b30443961d1cc27195586, type: 3} + m_ButtonTexture: {fileID: 2800000, guid: 2048a8fe7283bdf4ab7fb42386663290, type: 3} m_AtlasTexture: 1 m_ToggleButton: 0 m_LongPressReleaseButton: 0 @@ -1860,10 +1802,10 @@ MonoBehaviour: m_HoverScale: 1.1 m_HoverBoxColliderGrow: 0.2 m_AddOverlay: 0 - m_Command: 1004 + m_Command: 1010 m_CommandParam: 1 m_CommandParam2: -1 - m_RequiresPopup: 0 + m_RequiresPopup: 1 m_CenterPopupOnButton: 0 m_PopupOffset: {x: 0, y: 0, z: 0} m_PopupText: @@ -1893,7 +1835,7 @@ MonoBehaviour: references: version: 2 RefIds: [] ---- !u!1 &2296016956045778647 +--- !u!1 &4683949721667896528 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1901,43 +1843,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 47429484269554977} - - component: {fileID: 3374390498020739628} - - component: {fileID: 5985317331042495584} - - component: {fileID: 2841728730450484306} + - component: {fileID: 4609499178869085959} + - component: {fileID: 8677733851088090031} + - component: {fileID: 9160963822650286723} m_Layer: 16 - m_Name: AllertBeginnerMode + m_Name: Room m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &47429484269554977 + m_IsActive: 1 +--- !u!224 &4609499178869085959 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2296016956045778647} + m_GameObject: {fileID: 4683949721667896528} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.05} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2965947989537662772} + m_Father: {fileID: 8346410928580794432} 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.143, y: 1.355} + m_AnchoredPosition: {x: 0.466, y: -0.1400001} m_SizeDelta: {x: 1.104868, y: 1.4460607} m_Pivot: {x: 0.5, y: 0.5} ---- !u!23 &3374390498020739628 +--- !u!23 &8677733851088090031 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2296016956045778647} + m_GameObject: {fileID: 4683949721667896528} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -1973,13 +1914,13 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &5985317331042495584 +--- !u!114 &9160963822650286723 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2296016956045778647} + m_GameObject: {fileID: 4683949721667896528} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} @@ -1993,7 +1934,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: To enter a room turn first set to beginner mode + m_text: RoomName m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} @@ -2002,8 +1943,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190335 - m_fontColor: {r: 1, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2020,15 +1961,15 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 0.8 - m_fontSizeBase: 0.8 + m_fontSize: 1.5 + m_fontSizeBase: 1.5 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 1024 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -2056,32 +1997,16 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: 0.74942493, z: 0.083378464, w: 0.49275255} + m_margin: {x: -0.31141979, y: -0.12023544, z: 0.19494265, w: 1.1764753} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 m_hasFontAssetChanged: 0 - m_renderer: {fileID: 3374390498020739628} + m_renderer: {fileID: 8677733851088090031} m_maskType: 0 ---- !u!114 &2841728730450484306 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2296016956045778647} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjects: [] - references: - version: 2 - RefIds: [] ---- !u!1 &2571361884171689698 +--- !u!1 &5874556256608128191 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2089,42 +2014,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6876281661055682962} - - component: {fileID: 5708211407015971906} - - component: {fileID: 3923005959821366055} + - component: {fileID: 2677652558882906679} + - component: {fileID: 2426349157769062346} + - component: {fileID: 4888819335275065630} m_Layer: 16 - m_Name: Label + m_Name: NickName m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6876281661055682962 +--- !u!224 &2677652558882906679 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2571361884171689698} + m_GameObject: {fileID: 5874556256608128191} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.057142857} - m_LocalScale: {x: 2.5, y: 2.5, z: 2.8571427} + m_LocalPosition: {x: 0, y: 0, z: -0.05} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7383649761766971007} + m_Father: {fileID: 8346410928580794432} 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.56, y: 0.8399991} + m_AnchoredPosition: {x: 0.466, y: -0.44200057} m_SizeDelta: {x: 1.104868, y: 1.4460607} m_Pivot: {x: 0.5, y: 0.5} ---- !u!23 &5708211407015971906 +--- !u!23 &2426349157769062346 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2571361884171689698} + m_GameObject: {fileID: 5874556256608128191} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -2160,13 +2085,13 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &3923005959821366055 +--- !u!114 &4888819335275065630 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2571361884171689698} + m_GameObject: {fileID: 5874556256608128191} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} @@ -2180,7 +2105,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Edit + m_text: NickName m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} @@ -2207,14 +2132,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 1.4 - m_fontSizeBase: 1.4 + m_fontSize: 1.5 + m_fontSizeBase: 1.5 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -2243,16 +2168,16 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0.48827845, y: 0.8604479, z: 0.054796636, w: 0.19184232} + m_margin: {x: -0.31141979, y: -0.12023544, z: 0.19494265, w: 1.1764753} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 m_hasFontAssetChanged: 0 - m_renderer: {fileID: 5708211407015971906} + m_renderer: {fileID: 2426349157769062346} m_maskType: 0 ---- !u!1 &2994060372226562491 +--- !u!1 &5899900900417153719 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2260,43 +2185,48 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3068395288206314123} - - component: {fileID: 3015414681375869025} - - component: {fileID: 2890656081255549429} - - component: {fileID: 942730275356831299} + - component: {fileID: 3858004711376697373} + - component: {fileID: 9157174449584494178} + - component: {fileID: 4845429684781977610} + - component: {fileID: 1175572973535382090} + - component: {fileID: 2867525648481663953} m_Layer: 16 - m_Name: Text + m_Name: DisconnectButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3068395288206314123 -RectTransform: + m_IsActive: 0 +--- !u!4 &3858004711376697373 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2994060372226562491} + m_GameObject: {fileID: 5899900900417153719} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.05} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 0.62, y: -0.48400003, z: -0.042} + m_LocalScale: {x: 0.33, y: 0.33, z: 0.33} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 438733611317437076} + m_Father: {fileID: 8346410928580794432} 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.104, y: 0.9} - m_SizeDelta: {x: 1.104868, y: 1.4460607} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!23 &3015414681375869025 +--- !u!33 &9157174449584494178 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5899900900417153719} + m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} +--- !u!23 &4845429684781977610 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2994060372226562491} + m_GameObject: {fileID: 5899900900417153719} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -2310,7 +2240,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + - {fileID: 2100000, guid: 40d29de2bdc11f04dbfa25059165916e, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2332,116 +2262,107 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &2890656081255549429 -MonoBehaviour: +--- !u!65 &1175572973535382090 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2994060372226562491} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} - m_Name: - m_EditorClassIdentifier: + m_GameObject: {fileID: 5899900900417153719} 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: You have successfully joined the room! Share the room number with your - collaborators so they can join too. - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: + m_IncludeLayers: 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: + m_Bits: 0 + m_ExcludeLayers: serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 1.4 - m_fontSizeBase: 1.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: -30 - 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: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: 0.6332202, z: -0.094255626, w: -0.027681828} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 3015414681375869025} - m_maskType: 0 ---- !u!114 &942730275356831299 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1.1, y: 1.1, z: 0.1} + m_Center: {x: -0.000000074505806, y: 0.000000022351742, z: 0} +--- !u!114 &2867525648481663953 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2994060372226562491} + m_GameObject: {fileID: 5899900900417153719} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} + m_Script: {fileID: 11500000, guid: b78a8d7209bbdc546979b549a875d550, type: 3} m_Name: m_EditorClassIdentifier: - m_TrackedObjects: [] + m_DescriptionType: 0 + m_DescriptionYOffset: 0 + m_DescriptionText: + m_LocalizedDescription: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 294637000357126144 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionActivateSpeed: 12 + m_DescriptionZScale: 1 + m_ButtonTexture: {fileID: 2800000, guid: 56e5ebeba70465c44bf75491d40b6f3d, type: 3} + m_AtlasTexture: 1 + m_ToggleButton: 0 + m_LongPressReleaseButton: 0 + m_ButtonHasPressedAudio: 1 + m_ZAdjustHover: -0.02 + m_ZAdjustClick: 0.02 + m_HoverScale: 1.1 + m_HoverBoxColliderGrow: 0.2 + m_AddOverlay: 0 + m_Command: 1008 + m_CommandParam: 1 + m_CommandParam2: -1 + m_RequiresPopup: 0 + m_CenterPopupOnButton: 0 + m_PopupOffset: {x: 0, y: 0, z: 0} + m_PopupText: + m_LocalizedPopup: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnDescription: + m_LocalizedToggleOnDescription: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnTexture: {fileID: 0} + m_AllowUnavailable: 1 + m_LinkedUIObject: {fileID: 0} + m_CommandIgnored: 0 references: version: 2 RefIds: [] ---- !u!1 &3134540981707160973 +--- !u!1 &6083642199730771223 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2449,2186 +2370,91 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7015233605674447413} - - component: {fileID: 6931700069523288738} - - component: {fileID: 8426405893577217330} + - component: {fileID: 8346410928580794432} m_Layer: 16 - m_Name: Label + m_Name: Elements m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7015233605674447413 -RectTransform: +--- !u!4 &8346410928580794432 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3134540981707160973} + m_GameObject: {fileID: 6083642199730771223} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.057142857} - m_LocalScale: {x: 2.5, y: 2.5, z: 2.8571427} + m_LocalPosition: {x: 0, y: 0.336, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1141409664942745479} + m_Children: + - {fileID: 682210897750110130} + - {fileID: 332726704664592371} + - {fileID: 3830748526666750540} + - {fileID: 3858004711376697373} + - {fileID: 7486361010185590075} + - {fileID: 8148098001997981085} + - {fileID: 2683548132759635989} + - {fileID: 4609499178869085959} + - {fileID: 2677652558882906679} + - {fileID: 8994233172856634412} + - {fileID: 3004064693637687833} + - {fileID: 5239577752120043582} + m_Father: {fileID: 415082} 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.56, y: 0.8399991} - m_SizeDelta: {x: 1.104868, y: 1.4460607} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!23 &6931700069523288738 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3134540981707160973} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 - 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!114 &8426405893577217330 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3134540981707160973} - 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: Join - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.4 - m_fontSizeBase: 1.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: -30 - 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: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0.48827845, y: 0.8604479, z: 0.054796636, w: 0.19184232} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 6931700069523288738} - m_maskType: 0 ---- !u!1 &3214184211823652001 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1641104114940865418} - - component: {fileID: 6601465140255059263} - - component: {fileID: 4866733623279814698} - m_Layer: 16 - m_Name: Border - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1641104114940865418 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3214184211823652001} - serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067} - m_LocalPosition: {x: 0, y: 0.0041000843, z: 0.004} - m_LocalScale: {x: 10.75, y: 10.75, z: 7} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3728028955869875737} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &6601465140255059263 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3214184211823652001} - m_Mesh: {fileID: 4300002, guid: 3efe5b86b55995545a231ce66a53b402, type: 3} ---- !u!23 &4866733623279814698 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3214184211823652001} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - 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: d153b453067a0724889fb677fef801a1, 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: 0 - 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 &3644177191085397888 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2965947989537662772} - m_Layer: 16 - m_Name: LobbyElements - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &2965947989537662772 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3644177191085397888} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.113, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 6321725960906406704} - - {fileID: 47429484269554977} - - {fileID: 1141409664942745479} - - {fileID: 7383649761766971007} - - {fileID: 1616599776894361023} - - {fileID: 7584752043559634152} - m_Father: {fileID: 415082} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4076170750158864688 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7584752043559634152} - - component: {fileID: 8238648932876523510} - - component: {fileID: 1974621732855197313} - m_Layer: 16 - m_Name: RoomNumber - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7584752043559634152 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4076170750158864688} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.05} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2965947989537662772} - 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.586, y: 0.13399984} - m_SizeDelta: {x: 1.104868, y: 1.4460607} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!23 &8238648932876523510 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4076170750158864688} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 - 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!114 &1974621732855197313 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4076170750158864688} - 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: 202020 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.7 - m_fontSizeBase: 1.7 - 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: -30 - 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: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: -0.12023544, z: 0.49373662, w: 1.1764753} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 8238648932876523510} - m_maskType: 0 ---- !u!1 &4597522067460985994 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6321725960906406704} - - component: {fileID: 2972459032532661851} - - component: {fileID: 5365545856024163458} - - component: {fileID: 2149637936205218271} - m_Layer: 16 - m_Name: DoesRoomExistLabel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6321725960906406704 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4597522067460985994} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.05} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2965947989537662772} - 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.143, y: 1.138} - m_SizeDelta: {x: 1.104868, y: 1.4460607} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!23 &2972459032532661851 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4597522067460985994} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 - 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!114 &5365545856024163458 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4597522067460985994} - 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: This room does not exist yet. By pressing join, the room will be created. - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0.8 - m_fontSizeBase: 0.8 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 1024 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: -30 - 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: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: 0.6332202, z: 0.083378464, w: 0.49275255} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 2972459032532661851} - m_maskType: 0 ---- !u!114 &2149637936205218271 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4597522067460985994} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjects: [] - references: - version: 2 - RefIds: [] ---- !u!1 &4649946342403727185 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3577413846294365787} - - component: {fileID: 1001195632747271077} - - component: {fileID: 404572183770810615} - m_Layer: 16 - m_Name: Label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3577413846294365787 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4649946342403727185} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.05} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 438733611317437076} - 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.36000013} - m_SizeDelta: {x: 1.104868, y: 1.4460607} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!23 &1001195632747271077 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4649946342403727185} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 - 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!114 &404572183770810615 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4649946342403727185} - 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: ' Room :' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.7 - m_fontSizeBase: 1.7 - 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: -30 - 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: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: -0.12023544, z: 0.49373662, w: 1.1764753} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 1001195632747271077} - m_maskType: 0 ---- !u!1 &4683949721667896528 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4609499178869085959} - - component: {fileID: 8677733851088090031} - - component: {fileID: 9160963822650286723} - m_Layer: 16 - m_Name: Room - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4609499178869085959 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4683949721667896528} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.05} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8346410928580794432} - 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.466, y: -0.1400001} - m_SizeDelta: {x: 1.104868, y: 1.4460607} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!23 &8677733851088090031 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4683949721667896528} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 - 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!114 &9160963822650286723 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4683949721667896528} - 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: RoomName - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.5 - m_fontSizeBase: 1.5 - 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: -30 - 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: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: -0.12023544, z: 0.19494265, w: 1.1764753} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 8677733851088090031} - m_maskType: 0 ---- !u!1 &5874556256608128191 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2677652558882906679} - - component: {fileID: 2426349157769062346} - - component: {fileID: 4888819335275065630} - m_Layer: 16 - m_Name: NickName - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2677652558882906679 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5874556256608128191} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.05} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8346410928580794432} - 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.466, y: -0.44200057} - m_SizeDelta: {x: 1.104868, y: 1.4460607} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!23 &2426349157769062346 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5874556256608128191} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 - 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!114 &4888819335275065630 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5874556256608128191} - 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: NickName - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.5 - m_fontSizeBase: 1.5 - 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: -30 - 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: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: -0.12023544, z: 0.19494265, w: 1.1764753} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 2426349157769062346} - m_maskType: 0 ---- !u!1 &5899900900417153719 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3858004711376697373} - - component: {fileID: 9157174449584494178} - - component: {fileID: 4845429684781977610} - - component: {fileID: 1175572973535382090} - - component: {fileID: 2867525648481663953} - m_Layer: 16 - m_Name: DisconnectButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &3858004711376697373 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5899900900417153719} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.62, y: -0.48400003, z: -0.042} - m_LocalScale: {x: 0.33, y: 0.33, z: 0.33} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8346410928580794432} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &9157174449584494178 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5899900900417153719} - m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} ---- !u!23 &4845429684781977610 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5899900900417153719} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - 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: 40d29de2bdc11f04dbfa25059165916e, 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: 0 - 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!65 &1175572973535382090 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5899900900417153719} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1.1, y: 1.1, z: 0.1} - m_Center: {x: -0.000000074505806, y: 0.000000022351742, z: 0} ---- !u!114 &2867525648481663953 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5899900900417153719} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b78a8d7209bbdc546979b549a875d550, type: 3} - m_Name: - m_EditorClassIdentifier: - m_DescriptionType: 0 - m_DescriptionYOffset: 0 - m_DescriptionText: - m_LocalizedDescription: - m_TableReference: - m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 - m_TableEntryReference: - m_KeyId: 294637000357126144 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_DescriptionTextExtra: - m_LocalizedDescriptionExtra: - m_TableReference: - m_TableCollectionName: - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_DescriptionActivateSpeed: 12 - m_DescriptionZScale: 1 - m_ButtonTexture: {fileID: 2800000, guid: 56e5ebeba70465c44bf75491d40b6f3d, type: 3} - m_AtlasTexture: 1 - m_ToggleButton: 0 - m_LongPressReleaseButton: 0 - m_ButtonHasPressedAudio: 1 - m_ZAdjustHover: -0.02 - m_ZAdjustClick: 0.02 - m_HoverScale: 1.1 - m_HoverBoxColliderGrow: 0.2 - m_AddOverlay: 0 - m_Command: 1008 - m_CommandParam: 1 - m_CommandParam2: -1 - m_RequiresPopup: 0 - m_CenterPopupOnButton: 0 - m_PopupOffset: {x: 0, y: 0, z: 0} - m_PopupText: - m_LocalizedPopup: - m_TableReference: - m_TableCollectionName: - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_ToggleOnDescription: - m_LocalizedToggleOnDescription: - m_TableReference: - m_TableCollectionName: - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_ToggleOnTexture: {fileID: 0} - m_AllowUnavailable: 1 - m_LinkedUIObject: {fileID: 0} - m_CommandIgnored: 0 - references: - version: 2 - RefIds: [] ---- !u!1 &5921902206488690915 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7383649761766971007} - - component: {fileID: 2926107150197885019} - - component: {fileID: 8582249604316496249} - - component: {fileID: 3106886073238925572} - - component: {fileID: 1443552876586975744} - m_Layer: 16 - m_Name: Edit Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7383649761766971007 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5921902206488690915} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.337, y: 0.319, z: -0.042} - m_LocalScale: {x: 0.4, y: 0.4, z: 0.35} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 6876281661055682962} - m_Father: {fileID: 2965947989537662772} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &2926107150197885019 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5921902206488690915} - m_Mesh: {fileID: 4300000, guid: 70d5ab47bcc3aa0439e20bd40350c05a, type: 3} ---- !u!23 &8582249604316496249 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5921902206488690915} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - 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: 40d29de2bdc11f04dbfa25059165916e, 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: 0 - 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!65 &3106886073238925572 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5921902206488690915} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1.4, y: 1, z: 0.1} - m_Center: {x: -0.000000074505806, y: 0.000000022351742, z: 0} ---- !u!114 &1443552876586975744 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5921902206488690915} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b78a8d7209bbdc546979b549a875d550, type: 3} - m_Name: - m_EditorClassIdentifier: - m_DescriptionType: 0 - m_DescriptionYOffset: 0 - m_DescriptionText: - m_LocalizedDescription: - m_TableReference: - m_TableCollectionName: - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_DescriptionTextExtra: - m_LocalizedDescriptionExtra: - m_TableReference: - m_TableCollectionName: - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_DescriptionActivateSpeed: 12 - m_DescriptionZScale: 1 - m_ButtonTexture: {fileID: 2800000, guid: cdc7d38d9e0b30443961d1cc27195586, type: 3} - m_AtlasTexture: 1 - m_ToggleButton: 0 - m_LongPressReleaseButton: 0 - m_ButtonHasPressedAudio: 1 - m_ZAdjustHover: -0.02 - m_ZAdjustClick: 0.02 - m_HoverScale: 1.1 - m_HoverBoxColliderGrow: 0.2 - m_AddOverlay: 0 - m_Command: 1005 - m_CommandParam: 1 - m_CommandParam2: -1 - m_RequiresPopup: 1 - m_CenterPopupOnButton: 0 - m_PopupOffset: {x: 0, y: 0, z: 0} - m_PopupText: - m_LocalizedPopup: - m_TableReference: - m_TableCollectionName: - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_ToggleOnDescription: - m_LocalizedToggleOnDescription: - m_TableReference: - m_TableCollectionName: - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_ToggleOnTexture: {fileID: 0} - m_AllowUnavailable: 0 - m_LinkedUIObject: {fileID: 0} - m_CommandIgnored: 0 - references: - version: 2 - RefIds: [] ---- !u!1 &6083642199730771223 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8346410928580794432} - m_Layer: 16 - m_Name: Elements - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8346410928580794432 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6083642199730771223} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.336, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 682210897750110130} - - {fileID: 332726704664592371} - - {fileID: 3830748526666750540} - - {fileID: 3858004711376697373} - - {fileID: 8148098001997981085} - - {fileID: 2683548132759635989} - - {fileID: 4609499178869085959} - - {fileID: 2677652558882906679} - - {fileID: 8994233172856634412} - - {fileID: 3004064693637687833} - - {fileID: 5239577752120043582} - m_Father: {fileID: 415082} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &6171746570159008301 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 438733611317437076} - m_Layer: 16 - m_Name: JoinedElements - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &438733611317437076 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6171746570159008301} - serializedVersion: 2 - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3068395288206314123} - - {fileID: 3577413846294365787} - - {fileID: 4072971569122874247} - - {fileID: 977540286295220915} - m_Father: {fileID: 415082} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &6437768756802778087 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4072971569122874247} - - component: {fileID: 6918572163598264854} - - component: {fileID: 932498118536074667} - m_Layer: 16 - m_Name: RoomNumber - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4072971569122874247 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6437768756802778087} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.05} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 438733611317437076} - 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.586, y: 0.353} - m_SizeDelta: {x: 1.104868, y: 1.4460607} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!23 &6918572163598264854 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6437768756802778087} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 - 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!114 &932498118536074667 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6437768756802778087} - 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: 202020 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.7 - m_fontSizeBase: 1.7 - 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: -30 - 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: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: -0.12023544, z: 0.49373662, w: 1.1764753} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 6918572163598264854} - m_maskType: 0 ---- !u!1 &6530187638887373145 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3830748526666750540} - - component: {fileID: 500043193495277236} - - component: {fileID: 7032505750277561405} - - component: {fileID: 6109381147238388491} - - component: {fileID: 8427148437490211341} - m_Layer: 16 - m_Name: LeaveRoomButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3830748526666750540 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6530187638887373145} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.208, y: -0.4470001, z: -0.042} - m_LocalScale: {x: 0.33, y: 0.33, z: 0.33} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8346410928580794432} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &500043193495277236 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6530187638887373145} - m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} ---- !u!23 &7032505750277561405 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6530187638887373145} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - 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: 40d29de2bdc11f04dbfa25059165916e, 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: 0 - 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!65 &6109381147238388491 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6530187638887373145} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1.1, y: 1.1, z: 0.1} - m_Center: {x: -0.000000074505806, y: 0.000000022351742, z: 0} ---- !u!114 &8427148437490211341 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6530187638887373145} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b78a8d7209bbdc546979b549a875d550, type: 3} - m_Name: - m_EditorClassIdentifier: - m_DescriptionType: 0 - m_DescriptionYOffset: 0 - m_DescriptionText: - m_LocalizedDescription: - m_TableReference: - m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 - m_TableEntryReference: - m_KeyId: 294636908816441344 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_DescriptionTextExtra: - m_LocalizedDescriptionExtra: - m_TableReference: - m_TableCollectionName: - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_DescriptionActivateSpeed: 12 - m_DescriptionZScale: 1 - m_ButtonTexture: {fileID: 2800000, guid: f856211cd511f8445b96396ddd0c59bf, type: 3} - m_AtlasTexture: 1 - m_ToggleButton: 0 - m_LongPressReleaseButton: 0 - m_ButtonHasPressedAudio: 1 - m_ZAdjustHover: -0.02 - m_ZAdjustClick: 0.02 - m_HoverScale: 1.1 - m_HoverBoxColliderGrow: 0.2 - m_AddOverlay: 0 - m_Command: 1006 - m_CommandParam: 1 - m_CommandParam2: -1 - m_RequiresPopup: 0 - m_CenterPopupOnButton: 0 - m_PopupOffset: {x: 0, y: 0, z: 0} - m_PopupText: - m_LocalizedPopup: - m_TableReference: - m_TableCollectionName: - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_ToggleOnDescription: - m_LocalizedToggleOnDescription: - m_TableReference: - m_TableCollectionName: - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_ToggleOnTexture: {fileID: 0} - m_AllowUnavailable: 1 - m_LinkedUIObject: {fileID: 0} - m_CommandIgnored: 0 - references: - version: 2 - RefIds: [] ---- !u!1 &6603807884407399516 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3004064693637687833} - - component: {fileID: 4811598343171871539} - - component: {fileID: 1415528830258304631} - m_Layer: 16 - m_Name: Room Ownership Status - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3004064693637687833 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6603807884407399516} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.05} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8346410928580794432} - 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.147, y: -0.755} - m_SizeDelta: {x: 1.104868, y: 1.4460607} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!23 &4811598343171871539 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6603807884407399516} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 - 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!114 &1415528830258304631 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6603807884407399516} - 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: Room Owner - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.5 - m_fontSizeBase: 1.5 - 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: -30 - 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: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: -0.12023544, z: -0.1872099, w: 1.1764753} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 4811598343171871539} - m_maskType: 0 ---- !u!1 &7101128147202961155 -GameObject: +--- !u!1 &6530187638887373145 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 332726704664592371} - - component: {fileID: 5687544308279590595} - - component: {fileID: 8038925281922313174} - - component: {fileID: 1407599492849254995} - - component: {fileID: 9055833328840286294} + - component: {fileID: 3830748526666750540} + - component: {fileID: 500043193495277236} + - component: {fileID: 7032505750277561405} + - component: {fileID: 6109381147238388491} + - component: {fileID: 8427148437490211341} m_Layer: 16 - m_Name: JoinRoomButton + m_Name: LeaveRoomButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &332726704664592371 +--- !u!4 &3830748526666750540 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7101128147202961155} + m_GameObject: {fileID: 6530187638887373145} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.206, y: -0.447, z: -0.042} + m_LocalPosition: {x: 0.208, y: -0.4470001, z: -0.042} m_LocalScale: {x: 0.33, y: 0.33, z: 0.33} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8346410928580794432} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &5687544308279590595 +--- !u!33 &500043193495277236 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7101128147202961155} + m_GameObject: {fileID: 6530187638887373145} m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} ---- !u!23 &8038925281922313174 +--- !u!23 &7032505750277561405 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7101128147202961155} + m_GameObject: {fileID: 6530187638887373145} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -4664,13 +2490,13 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &1407599492849254995 +--- !u!65 &6109381147238388491 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7101128147202961155} + m_GameObject: {fileID: 6530187638887373145} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -4685,13 +2511,13 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1.1, y: 1.1, z: 0.1} m_Center: {x: -0.000000074505806, y: 0.000000022351742, z: 0} ---- !u!114 &9055833328840286294 +--- !u!114 &8427148437490211341 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7101128147202961155} + m_GameObject: {fileID: 6530187638887373145} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b78a8d7209bbdc546979b549a875d550, type: 3} @@ -4704,7 +2530,7 @@ MonoBehaviour: m_TableReference: m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: - m_KeyId: 294636769901092864 + m_KeyId: 294636908816441344 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -4721,7 +2547,7 @@ MonoBehaviour: m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 - m_ButtonTexture: {fileID: 2800000, guid: 1ac81545f10c4fb4d9ada583e88b2f43, type: 3} + m_ButtonTexture: {fileID: 2800000, guid: f856211cd511f8445b96396ddd0c59bf, type: 3} m_AtlasTexture: 1 m_ToggleButton: 0 m_LongPressReleaseButton: 0 @@ -4731,7 +2557,7 @@ MonoBehaviour: m_HoverScale: 1.1 m_HoverBoxColliderGrow: 0.2 m_AddOverlay: 0 - m_Command: 1004 + m_Command: 1006 m_CommandParam: 1 m_CommandParam2: -1 m_RequiresPopup: 0 @@ -4764,7 +2590,7 @@ MonoBehaviour: references: version: 2 RefIds: [] ---- !u!1 &7355810358076377629 +--- !u!1 &6603807884407399516 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4772,48 +2598,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2683548132759635989} - - component: {fileID: 5233991143414185181} - - component: {fileID: 454729548256029537} - - component: {fileID: 3902811276401445089} - - component: {fileID: 8163065677955154448} + - component: {fileID: 3004064693637687833} + - component: {fileID: 4811598343171871539} + - component: {fileID: 1415528830258304631} m_Layer: 16 - m_Name: NickNameEditButton + m_Name: Room Ownership Status m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2683548132759635989 -Transform: +--- !u!224 &3004064693637687833 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7355810358076377629} - serializedVersion: 2 + m_GameObject: {fileID: 6603807884407399516} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.619, y: 0.20199952, z: -0.042} - m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} + m_LocalPosition: {x: 0, y: 0, z: -0.05} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8346410928580794432} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &5233991143414185181 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7355810358076377629} - m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} ---- !u!23 &454729548256029537 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.147, y: -0.755} + m_SizeDelta: {x: 1.104868, y: 1.4460607} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &4811598343171871539 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7355810358076377629} + m_GameObject: {fileID: 6603807884407399516} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -4827,7 +2647,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 40d29de2bdc11f04dbfa25059165916e, type: 2} + - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4849,107 +2669,99 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &3902811276401445089 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7355810358076377629} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1.1, y: 1.1, z: 0.1} - m_Center: {x: -0.000000074505806, y: 0.000000022351742, z: 0} ---- !u!114 &8163065677955154448 +--- !u!114 &1415528830258304631 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7355810358076377629} + m_GameObject: {fileID: 6603807884407399516} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b78a8d7209bbdc546979b549a875d550, type: 3} + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} m_Name: m_EditorClassIdentifier: - m_DescriptionType: 0 - m_DescriptionYOffset: 0 - m_DescriptionText: - m_LocalizedDescription: - m_TableReference: - m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 - m_TableEntryReference: - m_KeyId: 294637384320491520 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_DescriptionTextExtra: - m_LocalizedDescriptionExtra: - m_TableReference: - m_TableCollectionName: - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_DescriptionActivateSpeed: 12 - m_DescriptionZScale: 1 - m_ButtonTexture: {fileID: 2800000, guid: 0141ac6bf9f578f4e95706cdd2117914, type: 3} - m_AtlasTexture: 1 - m_ToggleButton: 0 - m_LongPressReleaseButton: 0 - m_ButtonHasPressedAudio: 1 - m_ZAdjustHover: -0.02 - m_ZAdjustClick: 0.02 - m_HoverScale: 1.1 - m_HoverBoxColliderGrow: 0.2 - m_AddOverlay: 0 - m_Command: 1009 - m_CommandParam: 1 - m_CommandParam2: -1 - m_RequiresPopup: 1 - m_CenterPopupOnButton: 0 - m_PopupOffset: {x: 0, y: 0, z: 0} - m_PopupText: - m_LocalizedPopup: - m_TableReference: - m_TableCollectionName: - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_ToggleOnDescription: - m_LocalizedToggleOnDescription: - m_TableReference: - m_TableCollectionName: - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_ToggleOnTexture: {fileID: 0} - m_AllowUnavailable: 1 - m_LinkedUIObject: {fileID: 0} - m_CommandIgnored: 0 - references: - version: 2 - RefIds: [] ---- !u!1 &7389879374748736206 + 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: Room Owner + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.5 + m_fontSizeBase: 1.5 + 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: -30 + 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: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -0.31141979, y: -0.12023544, z: -0.1872099, w: 1.1764753} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 4811598343171871539} + m_maskType: 0 +--- !u!1 &7101128147202961155 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4957,49 +2769,48 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 977540286295220915} - - component: {fileID: 1862823799823796671} - - component: {fileID: 6441155883621675907} - - component: {fileID: 837553751123664783} - - component: {fileID: 4434619620066107605} + - component: {fileID: 332726704664592371} + - component: {fileID: 5687544308279590595} + - component: {fileID: 8038925281922313174} + - component: {fileID: 1407599492849254995} + - component: {fileID: 9055833328840286294} m_Layer: 16 - m_Name: Disconnect Button + m_Name: JoinRoomButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &977540286295220915 +--- !u!4 &332726704664592371 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389879374748736206} + m_GameObject: {fileID: 7101128147202961155} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.01, y: -0.008, z: -0.042} - m_LocalScale: {x: 0.5, y: 0.4, z: 0.35} + m_LocalPosition: {x: -0.206, y: -0.447, z: -0.042} + m_LocalScale: {x: 0.33, y: 0.33, z: 0.33} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5290855516666066687} - m_Father: {fileID: 438733611317437076} + m_Children: [] + m_Father: {fileID: 8346410928580794432} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &1862823799823796671 +--- !u!33 &5687544308279590595 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389879374748736206} - m_Mesh: {fileID: 4300000, guid: 70d5ab47bcc3aa0439e20bd40350c05a, type: 3} ---- !u!23 &6441155883621675907 + m_GameObject: {fileID: 7101128147202961155} + m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} +--- !u!23 &8038925281922313174 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389879374748736206} + m_GameObject: {fileID: 7101128147202961155} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -5035,13 +2846,13 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &837553751123664783 +--- !u!65 &1407599492849254995 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389879374748736206} + m_GameObject: {fileID: 7101128147202961155} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -5054,15 +2865,15 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1.5, y: 1, z: 0.1} + m_Size: {x: 1.1, y: 1.1, z: 0.1} m_Center: {x: -0.000000074505806, y: 0.000000022351742, z: 0} ---- !u!114 &4434619620066107605 +--- !u!114 &9055833328840286294 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7389879374748736206} + m_GameObject: {fileID: 7101128147202961155} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b78a8d7209bbdc546979b549a875d550, type: 3} @@ -5073,9 +2884,9 @@ MonoBehaviour: m_DescriptionText: m_LocalizedDescription: m_TableReference: - m_TableCollectionName: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: - m_KeyId: 0 + m_KeyId: 294636769901092864 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -5092,7 +2903,7 @@ MonoBehaviour: m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 - m_ButtonTexture: {fileID: 2800000, guid: cdc7d38d9e0b30443961d1cc27195586, type: 3} + m_ButtonTexture: {fileID: 2800000, guid: 1ac81545f10c4fb4d9ada583e88b2f43, type: 3} m_AtlasTexture: 1 m_ToggleButton: 0 m_LongPressReleaseButton: 0 @@ -5102,7 +2913,7 @@ MonoBehaviour: m_HoverScale: 1.1 m_HoverBoxColliderGrow: 0.2 m_AddOverlay: 0 - m_Command: 1006 + m_Command: 1004 m_CommandParam: 1 m_CommandParam2: -1 m_RequiresPopup: 0 @@ -5129,13 +2940,13 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_ToggleOnTexture: {fileID: 0} - m_AllowUnavailable: 0 + m_AllowUnavailable: 1 m_LinkedUIObject: {fileID: 0} m_CommandIgnored: 0 references: version: 2 RefIds: [] ---- !u!1 &7521510091458286424 +--- !u!1 &7355810358076377629 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5143,48 +2954,48 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8148098001997981085} - - component: {fileID: 4216493873191797517} - - component: {fileID: 1879947414287806692} - - component: {fileID: 2655394652004014560} - - component: {fileID: 6215490754924617493} + - component: {fileID: 2683548132759635989} + - component: {fileID: 5233991143414185181} + - component: {fileID: 454729548256029537} + - component: {fileID: 3902811276401445089} + - component: {fileID: 8163065677955154448} m_Layer: 16 - m_Name: RoomNameEditButton + m_Name: NickNameEditButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8148098001997981085 +--- !u!4 &2683548132759635989 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7521510091458286424} + m_GameObject: {fileID: 7355810358076377629} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.619, y: 0.504, z: -0.042} + m_LocalPosition: {x: -0.619, y: 0.20199952, z: -0.042} m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8346410928580794432} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &4216493873191797517 +--- !u!33 &5233991143414185181 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7521510091458286424} + m_GameObject: {fileID: 7355810358076377629} m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} ---- !u!23 &1879947414287806692 +--- !u!23 &454729548256029537 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7521510091458286424} + m_GameObject: {fileID: 7355810358076377629} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -5220,13 +3031,13 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &2655394652004014560 +--- !u!65 &3902811276401445089 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7521510091458286424} + m_GameObject: {fileID: 7355810358076377629} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -5241,13 +3052,13 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1.1, y: 1.1, z: 0.1} m_Center: {x: -0.000000074505806, y: 0.000000022351742, z: 0} ---- !u!114 &6215490754924617493 +--- !u!114 &8163065677955154448 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7521510091458286424} + m_GameObject: {fileID: 7355810358076377629} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b78a8d7209bbdc546979b549a875d550, type: 3} @@ -5260,7 +3071,7 @@ MonoBehaviour: m_TableReference: m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: - m_KeyId: 294637073212186624 + m_KeyId: 294637384320491520 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -5287,7 +3098,7 @@ MonoBehaviour: m_HoverScale: 1.1 m_HoverBoxColliderGrow: 0.2 m_AddOverlay: 0 - m_Command: 1005 + m_Command: 1009 m_CommandParam: 1 m_CommandParam2: -1 m_RequiresPopup: 1 @@ -5320,7 +3131,7 @@ MonoBehaviour: references: version: 2 RefIds: [] ---- !u!1 &7868523408258216887 +--- !u!1 &7521510091458286424 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5328,213 +3139,48 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5239577752120043582} - - component: {fileID: 8722975735802607274} - - component: {fileID: 6437857310660163665} + - component: {fileID: 8148098001997981085} + - component: {fileID: 4216493873191797517} + - component: {fileID: 1879947414287806692} + - component: {fileID: 2655394652004014560} + - component: {fileID: 6215490754924617493} m_Layer: 16 - m_Name: AlertsErrors + m_Name: RoomNameEditButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &5239577752120043582 -RectTransform: + m_IsActive: 1 +--- !u!4 &8148098001997981085 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7868523408258216887} + m_GameObject: {fileID: 7521510091458286424} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.05} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: -0.619, y: 0.504, z: -0.042} + m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8346410928580794432} 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.088, y: 0.614} - m_SizeDelta: {x: 1.104868, y: 1.4460607} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!23 &8722975735802607274 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7868523408258216887} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 - 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!114 &6437857310660163665 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7868523408258216887} - 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: Alerts - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190335 - m_fontColor: {r: 1, g: 0, b: 0, 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: 1.5 - m_fontSizeBase: 1.5 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 1024 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: -30 - 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: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: -1.0333014, z: -0.1872099, w: 1.1764753} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 8722975735802607274} - m_maskType: 0 ---- !u!1 &8016613551395990211 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1616599776894361023} - - component: {fileID: 9202472902960767262} - - component: {fileID: 6387985900290305946} - m_Layer: 16 - m_Name: Label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1616599776894361023 -RectTransform: +--- !u!33 &4216493873191797517 +MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8016613551395990211} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.05} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2965947989537662772} - 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.14099984} - m_SizeDelta: {x: 1.104868, y: 1.4460607} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!23 &9202472902960767262 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7521510091458286424} + m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} +--- !u!23 &1879947414287806692 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8016613551395990211} + m_GameObject: {fileID: 7521510091458286424} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -5548,7 +3194,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + - {fileID: 2100000, guid: 40d29de2bdc11f04dbfa25059165916e, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -5570,99 +3216,107 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &6387985900290305946 +--- !u!65 &2655394652004014560 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7521510091458286424} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1.1, y: 1.1, z: 0.1} + m_Center: {x: -0.000000074505806, y: 0.000000022351742, z: 0} +--- !u!114 &6215490754924617493 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8016613551395990211} + m_GameObject: {fileID: 7521510091458286424} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Script: {fileID: 11500000, guid: b78a8d7209bbdc546979b549a875d550, 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: ' Room :' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.7 - m_fontSizeBase: 1.7 - 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: -30 - 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: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: -0.12023544, z: 0.49373662, w: 1.1764753} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 9202472902960767262} - m_maskType: 0 ---- !u!1 &8600076904461278434 + m_DescriptionType: 0 + m_DescriptionYOffset: 0 + m_DescriptionText: + m_LocalizedDescription: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 294637073212186624 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionActivateSpeed: 12 + m_DescriptionZScale: 1 + m_ButtonTexture: {fileID: 2800000, guid: 0141ac6bf9f578f4e95706cdd2117914, type: 3} + m_AtlasTexture: 1 + m_ToggleButton: 0 + m_LongPressReleaseButton: 0 + m_ButtonHasPressedAudio: 1 + m_ZAdjustHover: -0.02 + m_ZAdjustClick: 0.02 + m_HoverScale: 1.1 + m_HoverBoxColliderGrow: 0.2 + m_AddOverlay: 0 + m_Command: 1005 + m_CommandParam: 1 + m_CommandParam2: -1 + m_RequiresPopup: 1 + m_CenterPopupOnButton: 0 + m_PopupOffset: {x: 0, y: 0, z: 0} + m_PopupText: + m_LocalizedPopup: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnDescription: + m_LocalizedToggleOnDescription: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnTexture: {fileID: 0} + m_AllowUnavailable: 1 + m_LinkedUIObject: {fileID: 0} + m_CommandIgnored: 0 + references: + version: 2 + RefIds: [] +--- !u!1 &7868523408258216887 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5670,42 +3324,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5290855516666066687} - - component: {fileID: 6290074660409098260} - - component: {fileID: 9129926250020437674} + - component: {fileID: 5239577752120043582} + - component: {fileID: 8722975735802607274} + - component: {fileID: 6437857310660163665} m_Layer: 16 - m_Name: Label + m_Name: AlertsErrors m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5290855516666066687 + m_IsActive: 0 +--- !u!224 &5239577752120043582 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8600076904461278434} + m_GameObject: {fileID: 7868523408258216887} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.057142857} - m_LocalScale: {x: 2.5, y: 2.5, z: 2.8571427} + m_LocalPosition: {x: 0, y: 0, z: -0.05} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 977540286295220915} + m_Father: {fileID: 8346410928580794432} 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.56, y: 0.8399991} + m_AnchoredPosition: {x: 0.088, y: 0.614} m_SizeDelta: {x: 1.104868, y: 1.4460607} m_Pivot: {x: 0.5, y: 0.5} ---- !u!23 &6290074660409098260 +--- !u!23 &8722975735802607274 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8600076904461278434} + m_GameObject: {fileID: 7868523408258216887} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -5741,13 +3395,13 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &9129926250020437674 +--- !u!114 &6437857310660163665 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8600076904461278434} + m_GameObject: {fileID: 7868523408258216887} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} @@ -5761,7 +3415,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Disconnect + m_text: Alerts m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} @@ -5770,8 +3424,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4278190335 + m_fontColor: {r: 1, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -5788,15 +3442,15 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 1.4 - m_fontSizeBase: 1.4 + m_fontSize: 1.5 + m_fontSizeBase: 1.5 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 + m_VerticalAlignment: 1024 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -5824,77 +3478,15 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0.48827845, y: 0.8604479, z: 0.054796636, w: 0.19184232} + m_margin: {x: -0.31141979, y: -1.0333014, z: -0.1872099, w: 1.1764753} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 m_hasFontAssetChanged: 0 - m_renderer: {fileID: 6290074660409098260} + m_renderer: {fileID: 8722975735802607274} m_maskType: 0 ---- !u!1 &8667602655244155954 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1954481780995984980} - m_Layer: 16 - m_Name: GeneralSettingsElements - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1954481780995984980 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8667602655244155954} - serializedVersion: 2 - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 415082} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &8921512026995007485 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3405719730669880946} - m_Layer: 16 - m_Name: RoomSettingsElements - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &3405719730669880946 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8921512026995007485} - serializedVersion: 2 - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 415082} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &7380239823636675985 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab b/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab new file mode 100644 index 000000000..7b64edc96 --- /dev/null +++ b/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab @@ -0,0 +1,505 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &197348 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 461372} + - component: {fileID: 6590698} + - component: {fileID: 114378360279916084} + - component: {fileID: 8874513985202052663} + m_Layer: 16 + m_Name: PopUpWindow_RoomOptions + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &461372 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 197348} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4000013863059372} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6590698 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 197348} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1.45, y: 1.59, z: 0.01} + m_Center: {x: 0, y: -0.19, z: -0.0125} +--- !u!114 &114378360279916084 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 197348} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 739d5b1996234d64992a2ae60c3723e9, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &8874513985202052663 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 197348} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e80552387ef3e034ba2eaef6078f4e44, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Background: {fileID: 1000011805813252} + m_TopBorder: {fileID: 1000011506748792} + m_BottomBorder: {fileID: 0} + m_WindowText: {fileID: 1292692450780755510} + m_CharacterWidth: 0.175 + m_SubtitleCharacterWidth: 0.05625 + m_ButtonWidth: 0.5 + m_BaseButtonOffset: {x: 0, y: 0, z: 0} + m_ReticleBounds: {x: 0, y: 0, z: 0} + m_PopUpForwardOffset: -0.2 + m_AutoPlaceButtons: [] + m_TransitionDuration: 0 + m_OpenDelay: 0 + m_Persistent: 0 + m_AudioOnOpen: 1 + m_BlockUndoRedo: 0 + m_IsLongPressPopUp: 0 + m_OrderedPageButtons: [] + m_PrevButton: {fileID: 0} + m_NextButton: {fileID: 0} +--- !u!1 &1000011506748792 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4000011863039138} + - component: {fileID: 33000013223101232} + - component: {fileID: 23000011128244564} + m_Layer: 16 + m_Name: PopupBorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4000011863039138 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000011506748792} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4000014139754862} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33000013223101232 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000011506748792} + m_Mesh: {fileID: 4300000, guid: 4c92adde9aa17d84cb52c19fafe88a50, type: 3} +--- !u!23 &23000011128244564 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000011506748792} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 77dd4ff8b1158a84397aba783cd0af05, 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: 0 + 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 &1000011805813252 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4000011965635686} + - component: {fileID: 33000010302420914} + - component: {fileID: 23000013678226396} + m_Layer: 16 + m_Name: PopupBg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4000011965635686 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000011805813252} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0, y: 0, z: 0.01} + m_LocalScale: {x: 1, y: 1, z: 0.1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4000014139754862} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33000010302420914 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000011805813252} + m_Mesh: {fileID: 4300000, guid: a524f41603b1e5546948ccac51c14251, type: 3} +--- !u!23 &23000013678226396 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000011805813252} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: db0305ff9081c3b448ac79e85d26e5d4, 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: 0 + 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 &1000013661770288 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4000013863059372} + m_Layer: 16 + m_Name: Mesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4000013863059372 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000013661770288} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6430284205569547491} + - {fileID: 4000014139754862} + m_Father: {fileID: 461372} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1000013872528560 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4000014139754862} + m_Layer: 16 + m_Name: MorePopupMesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4000014139754862 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000013872528560} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.191, z: 0} + m_LocalScale: {x: 1, y: 1.3, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4000011965635686} + - {fileID: 4000011863039138} + m_Father: {fileID: 4000013863059372} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1193448101192846 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6430284205569547491} + - component: {fileID: 1774099923887302603} + - component: {fileID: 1292692450780755510} + m_Layer: 16 + m_Name: TextLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6430284205569547491 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1193448101192846} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.002} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4000013863059372} + 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.795, y: 0.915} + m_SizeDelta: {x: 1.5, y: 0.25} + m_Pivot: {x: 0, y: 1} +--- !u!23 &1774099923887302603 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1193448101192846} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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!114 &1292692450780755510 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1193448101192846} + 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: Description + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.93 + m_fontSizeBase: 1.93 + 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: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 1774099923887302603} + m_maskType: 0 diff --git a/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab.meta b/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab.meta new file mode 100644 index 000000000..8b6900706 --- /dev/null +++ b/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: dcd3065b75d04fa4a8c7381d4513ccd9 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs b/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs new file mode 100644 index 000000000..0839bfe19 --- /dev/null +++ b/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs @@ -0,0 +1,48 @@ +// Copyright 2020 The Tilt Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +using UnityEngine; + +namespace TiltBrush +{ + + public class MultiplayerRoomOptionsPopUpWindow : PopUpWindow + { + + override public void Init(GameObject rParent, string sText) + { + base.Init(rParent, sText); + } + + override protected void BaseUpdate() + { + base.BaseUpdate(); + } + + protected override void UpdateOpening() + { + base.UpdateOpening(); + } + + protected override void UpdateClosing() + { + base.UpdateClosing(); + } + + override public void UpdateUIComponents(Ray rCastRay, bool inputValid, Collider parentCollider) + { + base.UpdateUIComponents(rCastRay, inputValid, parentCollider); + } + } +} // namespace TiltBrush diff --git a/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs.meta b/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs.meta new file mode 100644 index 000000000..2692cb676 --- /dev/null +++ b/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e80552387ef3e034ba2eaef6078f4e44 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/SketchControlsScript.cs b/Assets/Scripts/SketchControlsScript.cs index b32a8f2c6..19fccb973 100644 --- a/Assets/Scripts/SketchControlsScript.cs +++ b/Assets/Scripts/SketchControlsScript.cs @@ -156,6 +156,7 @@ public enum GlobalCommands MultiplayerConnect = 1007, MultiplayerDisconnect = 1008, EditMultiplayerNickName = 1009, + OpenRoomSettings = 1010, RenameSketch = 5200, OpenLayerOptionsPopup = 5201, @@ -4530,6 +4531,11 @@ public void IssueGlobalCommand(GlobalCommands rEnum, int iParam1 = -1, DismissPopupOnCurrentGazeObject(false); break; } + case GlobalCommands.OpenRoomSettings: + { + DismissPopupOnCurrentGazeObject(false); + break; + } case GlobalCommands.ShowWindowGUI: break; case GlobalCommands.Disco: From 69686077e7db05391002dd210981e043b4ec9ef9 Mon Sep 17 00:00:00 2001 From: Riccardo Bovo Date: Sun, 19 Jan 2025 14:30:48 +0000 Subject: [PATCH 10/25] Apply .gitattributes normalization --- Assets/Editor/BrushLister.cs | 2 +- Assets/Editor/ConvertNormalMaps.cs | 2 +- Assets/Editor/PanelLister.cs | 2 +- Assets/Plugins/CSharp/ColorExtensions.cs | 2 +- Assets/Scripts/Commands/TransformItems.cs | 2 +- Assets/Scripts/Multiplayer/MultiplayerManager.cs | 2 +- Assets/Scripts/Multiplayer/MultiplayerSceneSync.cs | 2 +- Assets/Scripts/Multiplayer/Photon/PhotonRPCBatcher.cs | 2 +- Assets/Scripts/Multiplayer/Photon/PhotonVoiceManager.cs | 2 +- Assets/Scripts/OpenBrushLightsImport.cs | 2 +- Assets/Scripts/Save/SketchWriter.cs | 2 +- Assets/Scripts/TextToStrokes/Editor/CHRImporter.cs | 2 +- Assets/Scripts/TextToStrokes/TextToStrokes.cs | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Assets/Editor/BrushLister.cs b/Assets/Editor/BrushLister.cs index f7f055b9c..da4c50aa3 100644 --- a/Assets/Editor/BrushLister.cs +++ b/Assets/Editor/BrushLister.cs @@ -109,4 +109,4 @@ public static void AppendValidBrushString(BrushDescriptor brush, bool experiment } } -} \ No newline at end of file +} diff --git a/Assets/Editor/ConvertNormalMaps.cs b/Assets/Editor/ConvertNormalMaps.cs index 60a802f2e..0765eb291 100644 --- a/Assets/Editor/ConvertNormalMaps.cs +++ b/Assets/Editor/ConvertNormalMaps.cs @@ -91,4 +91,4 @@ private static bool RemoveConversion(string assetPath) } return true; } -} \ No newline at end of file +} diff --git a/Assets/Editor/PanelLister.cs b/Assets/Editor/PanelLister.cs index e0d328e3c..96e548050 100644 --- a/Assets/Editor/PanelLister.cs +++ b/Assets/Editor/PanelLister.cs @@ -57,4 +57,4 @@ static void ListPopups() Debug.Log($"{popupList}"); } -} \ No newline at end of file +} diff --git a/Assets/Plugins/CSharp/ColorExtensions.cs b/Assets/Plugins/CSharp/ColorExtensions.cs index 0db1e66f9..09ded7ee6 100644 --- a/Assets/Plugins/CSharp/ColorExtensions.cs +++ b/Assets/Plugins/CSharp/ColorExtensions.cs @@ -27,4 +27,4 @@ public static class Colors public static readonly Color lightpurple = new Color(0.75f, 0, 1, 1); public static readonly Color fuscia = new Color(1, 0, 0.75f, 1); public static readonly Color rose = new Color(1, 0, 0.05f, 1); -} \ No newline at end of file +} diff --git a/Assets/Scripts/Commands/TransformItems.cs b/Assets/Scripts/Commands/TransformItems.cs index 0b348f4ee..2e2d1f260 100644 --- a/Assets/Scripts/Commands/TransformItems.cs +++ b/Assets/Scripts/Commands/TransformItems.cs @@ -144,4 +144,4 @@ public static void SnapSelectionToGrid() ); } } -} \ No newline at end of file +} diff --git a/Assets/Scripts/Multiplayer/MultiplayerManager.cs b/Assets/Scripts/Multiplayer/MultiplayerManager.cs index 0d3d3e680..1c26b8dd2 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerManager.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerManager.cs @@ -412,7 +412,7 @@ void OnLocalPlayerJoined(int id, ITransientData playerData) } void OnRemotePlayerJoined(RemotePlayer newRemotePlayer) - { + { m_RemotePlayers.Add(newRemotePlayer); if (isUserRoomOwner) diff --git a/Assets/Scripts/Multiplayer/MultiplayerSceneSync.cs b/Assets/Scripts/Multiplayer/MultiplayerSceneSync.cs index c9a0e3196..2c3c0d99b 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerSceneSync.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerSceneSync.cs @@ -291,4 +291,4 @@ public enum SyncType Strokes, Commands } -} \ No newline at end of file +} diff --git a/Assets/Scripts/Multiplayer/Photon/PhotonRPCBatcher.cs b/Assets/Scripts/Multiplayer/Photon/PhotonRPCBatcher.cs index 94bf17856..fa2cf33ba 100644 --- a/Assets/Scripts/Multiplayer/Photon/PhotonRPCBatcher.cs +++ b/Assets/Scripts/Multiplayer/Photon/PhotonRPCBatcher.cs @@ -70,4 +70,4 @@ public static void Stop() } } -#endif \ No newline at end of file +#endif diff --git a/Assets/Scripts/Multiplayer/Photon/PhotonVoiceManager.cs b/Assets/Scripts/Multiplayer/Photon/PhotonVoiceManager.cs index 932f59872..6a16bcc02 100644 --- a/Assets/Scripts/Multiplayer/Photon/PhotonVoiceManager.cs +++ b/Assets/Scripts/Multiplayer/Photon/PhotonVoiceManager.cs @@ -367,4 +367,4 @@ public void OnCustomAuthenticationFailed(string debugMessage) #endregion } -#endif \ No newline at end of file +#endif diff --git a/Assets/Scripts/OpenBrushLightsImport.cs b/Assets/Scripts/OpenBrushLightsImport.cs index 7fa0f6681..560570f67 100644 --- a/Assets/Scripts/OpenBrushLightsImport.cs +++ b/Assets/Scripts/OpenBrushLightsImport.cs @@ -52,4 +52,4 @@ public override void OnAfterImportNode(Node node, int nodeIndex, GameObject node } } } -} \ No newline at end of file +} diff --git a/Assets/Scripts/Save/SketchWriter.cs b/Assets/Scripts/Save/SketchWriter.cs index adf23a469..acb4a9525 100644 --- a/Assets/Scripts/Save/SketchWriter.cs +++ b/Assets/Scripts/Save/SketchWriter.cs @@ -773,4 +773,4 @@ public static List GetStrokes( } } -}// namespace TiltBrush \ No newline at end of file +}// namespace TiltBrush diff --git a/Assets/Scripts/TextToStrokes/Editor/CHRImporter.cs b/Assets/Scripts/TextToStrokes/Editor/CHRImporter.cs index cd81550db..1f0de4975 100644 --- a/Assets/Scripts/TextToStrokes/Editor/CHRImporter.cs +++ b/Assets/Scripts/TextToStrokes/Editor/CHRImporter.cs @@ -28,4 +28,4 @@ public override void OnImportAsset(AssetImportContext ctx) ctx.SetMainObject(font); } } -} \ No newline at end of file +} diff --git a/Assets/Scripts/TextToStrokes/TextToStrokes.cs b/Assets/Scripts/TextToStrokes/TextToStrokes.cs index 674900f73..f98e80977 100644 --- a/Assets/Scripts/TextToStrokes/TextToStrokes.cs +++ b/Assets/Scripts/TextToStrokes/TextToStrokes.cs @@ -61,4 +61,4 @@ public List> Build(string text) return shape; } } -} \ No newline at end of file +} From 1fc6efb61f364e007c499d0df51063f5113d9602 Mon Sep 17 00:00:00 2001 From: Riccardo Bovo Date: Sun, 19 Jan 2025 20:16:16 +0000 Subject: [PATCH 11/25] Adding dynamic Player List to the PopUpWindow --- Assets/Editor/MultiplayerManagerEditor.cs | 4 +- ...MultiplayerRoomOptionsPopUpWindowEditor.cs | 80 + ...playerRoomOptionsPopUpWindowEditor.cs.meta | 11 + .../PopUps/PopUpWindow_RoomOptions.prefab | 3316 ++++++++++++++++- .../GUI/MultiplayerRoomOptionsPopUpWindow.cs | 127 + Assets/Scripts/GUI/PlayerListItemPrefab.cs | 21 + .../Scripts/GUI/PlayerListItemPrefab.cs.meta | 11 + .../Scripts/Multiplayer/MultiplayerManager.cs | 29 +- Assets/Scripts/Multiplayer/RemotePlayer.cs | 54 + 9 files changed, 3631 insertions(+), 22 deletions(-) create mode 100644 Assets/Editor/MultiplayerRoomOptionsPopUpWindowEditor.cs create mode 100644 Assets/Editor/MultiplayerRoomOptionsPopUpWindowEditor.cs.meta create mode 100644 Assets/Scripts/GUI/PlayerListItemPrefab.cs create mode 100644 Assets/Scripts/GUI/PlayerListItemPrefab.cs.meta diff --git a/Assets/Editor/MultiplayerManagerEditor.cs b/Assets/Editor/MultiplayerManagerEditor.cs index 91434ebf7..606876c39 100644 --- a/Assets/Editor/MultiplayerManagerEditor.cs +++ b/Assets/Editor/MultiplayerManagerEditor.cs @@ -98,10 +98,10 @@ public override void OnInspectorGUI() //Remote Users string remoteUsersRegistered = ""; - if (multiplayerManager.m_RemotePlayers != null && multiplayerManager.m_RemotePlayers.Count > 0) + if (multiplayerManager.m_RemotePlayers != null && multiplayerManager.m_RemotePlayers.List.Count > 0) { remoteUsersRegistered = "UserIds:[ "; - foreach (var remotePlayer in multiplayerManager.m_RemotePlayers) + foreach (var remotePlayer in multiplayerManager.m_RemotePlayers.List) { remoteUsersRegistered += remotePlayer.PlayerId.ToString() + ","; } diff --git a/Assets/Editor/MultiplayerRoomOptionsPopUpWindowEditor.cs b/Assets/Editor/MultiplayerRoomOptionsPopUpWindowEditor.cs new file mode 100644 index 000000000..063feb540 --- /dev/null +++ b/Assets/Editor/MultiplayerRoomOptionsPopUpWindowEditor.cs @@ -0,0 +1,80 @@ +#if UNITY_EDITOR +using OpenBrush.Multiplayer; +using TiltBrush; +using UnityEditor; +using UnityEngine; + +[CustomEditor(typeof(MultiplayerRoomOptionsPopUpWindow))] +public class MultiplayerRoomOptionsPopUpWindowEditor : Editor +{ + RemotePlayers remotePlayers = new RemotePlayers { }; + + public override void OnInspectorGUI() + { + base.OnInspectorGUI(); + + MultiplayerRoomOptionsPopUpWindow popupWindow = (MultiplayerRoomOptionsPopUpWindow)target; + + if (GUILayout.Button("Add Player")) + if (!Application.isPlaying) + AddPlayer(popupWindow); + + if (GUILayout.Button("Remove Player")) + if (!Application.isPlaying) + RemovePlayer(popupWindow); + + if (GUILayout.Button("Populate Players list")) + if (!Application.isPlaying) + RegeneratePlayerList(popupWindow); + + } + + private void AddPlayer(MultiplayerRoomOptionsPopUpWindow popupWindow) + { + if (popupWindow.m_playerGuiPrefab == null) + { + Debug.LogWarning("Player GUI Prefab is not assigned!"); + return; + } + + int newIndex = remotePlayers.List.Count > 0 + ? remotePlayers.List[remotePlayers.List.Count - 1].PlayerId + 1 + : 0; + + remotePlayers.AddPlayer(new RemotePlayer + { + PlayerId = newIndex, + Nickname = $"testPlayer{newIndex}", + }); + + } + + private void RemovePlayer(MultiplayerRoomOptionsPopUpWindow popupWindow) + { + if (popupWindow.m_playerGuiPrefab == null) + { + Debug.LogWarning("Player GUI Prefab is not assigned!"); + return; + } + + int RemoveIndex = remotePlayers.List[remotePlayers.List.Count-1].PlayerId; + + remotePlayers.RemovePlayerById(RemoveIndex); + + } + + + + private void RegeneratePlayerList(MultiplayerRoomOptionsPopUpWindow popupWindow) + { + + if (popupWindow.m_playerGuiPrefab == null) + { + Debug.LogWarning("Player GUI Prefab is not assigned!"); + return; + } + + popupWindow.GeneratePlayerList(remotePlayers.List); + } +} +#endif diff --git a/Assets/Editor/MultiplayerRoomOptionsPopUpWindowEditor.cs.meta b/Assets/Editor/MultiplayerRoomOptionsPopUpWindowEditor.cs.meta new file mode 100644 index 000000000..a76c53d8c --- /dev/null +++ b/Assets/Editor/MultiplayerRoomOptionsPopUpWindowEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dcddf8b3ee7e0fb43810e85b8cb93869 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab b/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab index 7b64edc96..6448cbff8 100644 --- a/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab +++ b/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab @@ -33,6 +33,12 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4000013863059372} + - {fileID: 8179569077979998440} + - {fileID: 7392762193378026434} + - {fileID: 320205614807127358} + - {fileID: 7296585441038696811} + - {fileID: 21378304894574439} + - {fileID: 3564450395060031296} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &6590698 @@ -54,7 +60,7 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1.45, y: 1.59, z: 0.01} + m_Size: {x: 1.9, y: 2.5, z: 0.01} m_Center: {x: 0, y: -0.19, z: -0.0125} --- !u!114 &114378360279916084 MonoBehaviour: @@ -100,6 +106,10 @@ MonoBehaviour: m_OrderedPageButtons: [] m_PrevButton: {fileID: 0} m_NextButton: {fileID: 0} + m_playerGuiPrefab: {fileID: 2414029554072440725} + PlayerGuiPrefabSize: {x: 0.7, y: 0.15} + PlayerListOffset: {x: 0, y: -0.85} + PlayerListArea: {x: 1.6, y: 0.8} --- !u!1 &1000011506748792 GameObject: m_ObjectHideFlags: 0 @@ -296,6 +306,10 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6430284205569547491} + - {fileID: 4650316152798292590} + - {fileID: 6209009506960773324} + - {fileID: 6792340811292829086} + - {fileID: 1196226204731840579} - {fileID: 4000014139754862} m_Father: {fileID: 461372} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -431,7 +445,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Description + m_text: Room Settings m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} @@ -503,3 +517,3301 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_renderer: {fileID: 1774099923887302603} m_maskType: 0 +--- !u!1 &153480382984230626 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3240525278412876640} + - component: {fileID: 5871753085037369241} + - component: {fileID: 4873271370203748162} + m_Layer: 16 + m_Name: ID + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3240525278412876640 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 153480382984230626} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8179569077979998440} + 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: 1, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!23 &5871753085037369241 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 153480382984230626} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 + 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!114 &4873271370203748162 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 153480382984230626} + 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: ID + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.2 + m_fontSizeBase: 1.2 + 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: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -0.31141979, y: 0.077819824, z: 1.1845207, w: 0.06854248} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 5871753085037369241} + m_maskType: 0 +--- !u!1 &513571741569304716 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3180017156695656229} + - component: {fileID: 8055557402958044442} + - component: {fileID: 4508949308213063257} + m_Layer: 16 + m_Name: Nickname + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3180017156695656229 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 513571741569304716} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7392762193378026434} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.131, y: 0} + m_SizeDelta: {x: 1, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!23 &8055557402958044442 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 513571741569304716} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 + 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!114 &4508949308213063257 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 513571741569304716} + 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: testPlayer0 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.2 + m_fontSizeBase: 1.2 + 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: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -0.31141979, y: -0.055374146, z: 0.42066336, w: -0.06769562} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 8055557402958044442} + m_maskType: 0 +--- !u!1 &679135365067901709 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1196226204731840579} + m_Layer: 16 + m_Name: PlayersList + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1196226204731840579 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 679135365067901709} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2513099590842416612} + - {fileID: 5720222177919667581} + m_Father: {fileID: 4000013863059372} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &839512890901822249 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4801838056584329165} + - component: {fileID: 5824354997464212482} + - component: {fileID: 3688252749320687778} + m_Layer: 16 + m_Name: ID + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4801838056584329165 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 839512890901822249} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 320205614807127358} + 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: 1, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!23 &5824354997464212482 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 839512890901822249} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 + 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!114 &3688252749320687778 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 839512890901822249} + 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: 1 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.2 + m_fontSizeBase: 1.2 + 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: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -0.31141979, y: 0.077819824, z: 1.1845207, w: 0.06854248} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 5824354997464212482} + m_maskType: 0 +--- !u!1 &1020480228254418875 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5114263697058651145} + - component: {fileID: 2557246441992726044} + - component: {fileID: 1798382661626105731} + m_Layer: 16 + m_Name: Nickname + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5114263697058651145 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1020480228254418875} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8179569077979998440} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.131, y: 0} + m_SizeDelta: {x: 1, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!23 &2557246441992726044 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1020480228254418875} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 + 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!114 &1798382661626105731 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1020480228254418875} + 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: PlayerNickname + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.2 + m_fontSizeBase: 1.2 + 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: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -0.31141979, y: -0.055374146, z: 0.42066336, w: -0.06769562} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 2557246441992726044} + m_maskType: 0 +--- !u!1 &1149475022291703227 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7296585441038696811} + - component: {fileID: 2850680294846149528} + m_Layer: 0 + m_Name: Player_2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7296585441038696811 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1149475022291703227} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.45000002, y: -0.82500005, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5356063530363255750} + - {fileID: 5438881841448438657} + m_Father: {fileID: 461372} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2850680294846149528 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1149475022291703227} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699ce61a16cf82840b0e5af897647ec9, type: 3} + m_Name: + m_EditorClassIdentifier: + PlayerId: {fileID: 647324137100573901} + NickName: {fileID: 5717903971144814196} + remotePlayer: + PlayerId: 2 + Nickname: testPlayer2 + PlayerGameObject: {fileID: 0} + VoiceGameObject: {fileID: 0} +--- !u!1 &1354989483249718091 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4199485391807292361} + - component: {fileID: 4013695320284821526} + - component: {fileID: 6698410408993192826} + m_Layer: 16 + m_Name: Nickname + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4199485391807292361 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1354989483249718091} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 21378304894574439} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.131, y: 0} + m_SizeDelta: {x: 1, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!23 &4013695320284821526 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1354989483249718091} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 + 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!114 &6698410408993192826 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1354989483249718091} + 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: testPlayer3 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.2 + m_fontSizeBase: 1.2 + 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: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -0.31141979, y: -0.055374146, z: 0.42066336, w: -0.06769562} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 4013695320284821526} + m_maskType: 0 +--- !u!1 &1513818574748650382 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 320205614807127358} + - component: {fileID: 7017652289537427018} + m_Layer: 0 + m_Name: Player_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &320205614807127358 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1513818574748650382} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.45000002, y: -0.6750001, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4801838056584329165} + - {fileID: 4783016729148011441} + m_Father: {fileID: 461372} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7017652289537427018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1513818574748650382} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699ce61a16cf82840b0e5af897647ec9, type: 3} + m_Name: + m_EditorClassIdentifier: + PlayerId: {fileID: 3688252749320687778} + NickName: {fileID: 7572858237545715544} + remotePlayer: + PlayerId: 1 + Nickname: testPlayer1 + PlayerGameObject: {fileID: 0} + VoiceGameObject: {fileID: 0} +--- !u!1 &1647840589375695008 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5356063530363255750} + - component: {fileID: 6733258295810344408} + - component: {fileID: 647324137100573901} + m_Layer: 16 + m_Name: ID + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5356063530363255750 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1647840589375695008} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7296585441038696811} + 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: 1, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!23 &6733258295810344408 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1647840589375695008} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 + 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!114 &647324137100573901 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1647840589375695008} + 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: 2 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.2 + m_fontSizeBase: 1.2 + 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: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -0.31141979, y: 0.077819824, z: 1.1845207, w: 0.06854248} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 6733258295810344408} + m_maskType: 0 +--- !u!1 &1660661214499456472 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1840143052362000901} + - component: {fileID: 8077756397714947917} + - component: {fileID: 6439348432499794056} + m_Layer: 16 + m_Name: ListBorderUp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1840143052362000901 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1660661214499456472} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5720222177919667581} + m_LocalEulerAnglesHint: {x: 180, y: 180, 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!33 &8077756397714947917 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1660661214499456472} + m_Mesh: {fileID: 1220556274848135419, guid: a343604c10f606040a21af265cde7858, type: 3} +--- !u!23 &6439348432499794056 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1660661214499456472} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 77dd4ff8b1158a84397aba783cd0af05, 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 &1969159737782794172 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5898731982046344760} + - component: {fileID: 1922773804320731880} + - component: {fileID: 4617326837389647367} + m_Layer: 16 + m_Name: ID + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5898731982046344760 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1969159737782794172} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3564450395060031296} + 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: 1, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!23 &1922773804320731880 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1969159737782794172} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 + 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!114 &4617326837389647367 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1969159737782794172} + 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: 4 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.2 + m_fontSizeBase: 1.2 + 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: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -0.31141979, y: 0.077819824, z: 1.1845207, w: 0.06854248} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 1922773804320731880} + m_maskType: 0 +--- !u!1 &2304814148540785761 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5720222177919667581} + m_Layer: 16 + m_Name: Meshes + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5720222177919667581 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2304814148540785761} + m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.9, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1840143052362000901} + - {fileID: 228334323036961790} + m_Father: {fileID: 1196226204731840579} + 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.021400094, y: -1.269} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2414029554072440725 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8179569077979998440} + - component: {fileID: 8958483938599195323} + m_Layer: 0 + m_Name: PlayerListItemPrefab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &8179569077979998440 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2414029554072440725} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3240525278412876640} + - {fileID: 5114263697058651145} + m_Father: {fileID: 461372} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8958483938599195323 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2414029554072440725} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699ce61a16cf82840b0e5af897647ec9, type: 3} + m_Name: + m_EditorClassIdentifier: + PlayerId: {fileID: 4873271370203748162} + NickName: {fileID: 1798382661626105731} + remotePlayer: + PlayerId: 0 + Nickname: + PlayerGameObject: {fileID: 0} + VoiceGameObject: {fileID: 0} +--- !u!1 &2696262575679085747 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7392762193378026434} + - component: {fileID: 2327811110148241121} + m_Layer: 0 + m_Name: Player_0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7392762193378026434 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2696262575679085747} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.45000002, y: -0.52500004, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6666857010766461615} + - {fileID: 3180017156695656229} + m_Father: {fileID: 461372} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2327811110148241121 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2696262575679085747} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699ce61a16cf82840b0e5af897647ec9, type: 3} + m_Name: + m_EditorClassIdentifier: + PlayerId: {fileID: 5505884937170044365} + NickName: {fileID: 4508949308213063257} + remotePlayer: + PlayerId: 0 + Nickname: testPlayer0 + PlayerGameObject: {fileID: 0} + VoiceGameObject: {fileID: 0} +--- !u!1 &2988438625162171754 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5438881841448438657} + - component: {fileID: 525645258293006421} + - component: {fileID: 5717903971144814196} + m_Layer: 16 + m_Name: Nickname + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5438881841448438657 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2988438625162171754} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7296585441038696811} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.131, y: 0} + m_SizeDelta: {x: 1, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!23 &525645258293006421 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2988438625162171754} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 + 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!114 &5717903971144814196 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2988438625162171754} + 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: testPlayer2 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.2 + m_fontSizeBase: 1.2 + 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: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -0.31141979, y: -0.055374146, z: 0.42066336, w: -0.06769562} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 525645258293006421} + m_maskType: 0 +--- !u!1 &3443785268297259808 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 21378304894574439} + - component: {fileID: 348169012328294334} + m_Layer: 0 + m_Name: Player_3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &21378304894574439 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3443785268297259808} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.45000002, y: -0.975, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2077359043226585784} + - {fileID: 4199485391807292361} + m_Father: {fileID: 461372} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &348169012328294334 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3443785268297259808} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699ce61a16cf82840b0e5af897647ec9, type: 3} + m_Name: + m_EditorClassIdentifier: + PlayerId: {fileID: 6263782809766715304} + NickName: {fileID: 6698410408993192826} + remotePlayer: + PlayerId: 3 + Nickname: testPlayer3 + PlayerGameObject: {fileID: 0} + VoiceGameObject: {fileID: 0} +--- !u!1 &3484548605011139972 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6666857010766461615} + - component: {fileID: 2011497536940097822} + - component: {fileID: 5505884937170044365} + m_Layer: 16 + m_Name: ID + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6666857010766461615 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3484548605011139972} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7392762193378026434} + 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: 1, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!23 &2011497536940097822 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3484548605011139972} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 + 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!114 &5505884937170044365 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3484548605011139972} + 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: 0 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.2 + m_fontSizeBase: 1.2 + 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: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -0.31141979, y: 0.077819824, z: 1.1845207, w: 0.06854248} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 2011497536940097822} + m_maskType: 0 +--- !u!1 &4723078638993166571 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 228334323036961790} + - component: {fileID: 8846632708018233640} + - component: {fileID: 5264728200170257136} + m_Layer: 16 + m_Name: ListBorderDown + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &228334323036961790 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4723078638993166571} + m_LocalRotation: {x: -0, y: -0, z: 1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5720222177919667581} + 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: -1.177} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!33 &8846632708018233640 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4723078638993166571} + m_Mesh: {fileID: 1220556274848135419, guid: a343604c10f606040a21af265cde7858, type: 3} +--- !u!23 &5264728200170257136 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4723078638993166571} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 77dd4ff8b1158a84397aba783cd0af05, 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 &5790573738914507767 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3564450395060031296} + - component: {fileID: 8314447639666752603} + m_Layer: 0 + m_Name: Player_4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3564450395060031296 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5790573738914507767} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.45000002, y: -1.125, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5898731982046344760} + - {fileID: 4625999914535135374} + m_Father: {fileID: 461372} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8314447639666752603 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5790573738914507767} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699ce61a16cf82840b0e5af897647ec9, type: 3} + m_Name: + m_EditorClassIdentifier: + PlayerId: {fileID: 4617326837389647367} + NickName: {fileID: 4501463642685253836} + remotePlayer: + PlayerId: 4 + Nickname: testPlayer4 + PlayerGameObject: {fileID: 0} + VoiceGameObject: {fileID: 0} +--- !u!1 &6614870679551821437 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4650316152798292590} + - component: {fileID: 3661853299119540901} + - component: {fileID: 1185496136212610254} + m_Layer: 16 + m_Name: Max players + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4650316152798292590 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6614870679551821437} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4000013863059372} + 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.445, y: -0.154} + m_SizeDelta: {x: 2, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!23 &3661853299119540901 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6614870679551821437} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 + 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!114 &1185496136212610254 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6614870679551821437} + 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: Max players + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.5 + m_fontSizeBase: 1.5 + 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: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -0.31141979, y: -0.12023544, z: 0.19494265, w: 1.1764753} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 3661853299119540901} + m_maskType: 0 +--- !u!1 &6932523609421564514 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4625999914535135374} + - component: {fileID: 7966331034873567159} + - component: {fileID: 4501463642685253836} + m_Layer: 16 + m_Name: Nickname + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4625999914535135374 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6932523609421564514} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3564450395060031296} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.131, y: 0} + m_SizeDelta: {x: 1, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!23 &7966331034873567159 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6932523609421564514} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 + 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!114 &4501463642685253836 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6932523609421564514} + 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: testPlayer4 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.2 + m_fontSizeBase: 1.2 + 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: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -0.31141979, y: -0.055374146, z: 0.42066336, w: -0.06769562} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 7966331034873567159} + m_maskType: 0 +--- !u!1 &7111152122261735224 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2077359043226585784} + - component: {fileID: 4565650911436715844} + - component: {fileID: 6263782809766715304} + m_Layer: 16 + m_Name: ID + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2077359043226585784 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7111152122261735224} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 21378304894574439} + 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: 1, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!23 &4565650911436715844 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7111152122261735224} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 + 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!114 &6263782809766715304 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7111152122261735224} + 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: 3 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.2 + m_fontSizeBase: 1.2 + 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: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -0.31141979, y: 0.077819824, z: 1.1845207, w: 0.06854248} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 4565650911436715844} + m_maskType: 0 +--- !u!1 &7464894877112994450 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4783016729148011441} + - component: {fileID: 375688894760197537} + - component: {fileID: 7572858237545715544} + m_Layer: 16 + m_Name: Nickname + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4783016729148011441 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7464894877112994450} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 320205614807127358} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.131, y: 0} + m_SizeDelta: {x: 1, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!23 &375688894760197537 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7464894877112994450} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 + 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!114 &7572858237545715544 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7464894877112994450} + 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: testPlayer1 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.2 + m_fontSizeBase: 1.2 + 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: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -0.31141979, y: -0.055374146, z: 0.42066336, w: -0.06769562} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 375688894760197537} + m_maskType: 0 +--- !u!1 &7624598385178326493 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6209009506960773324} + - component: {fileID: 2039263249978755478} + - component: {fileID: 1368432156236954280} + m_Layer: 16 + m_Name: Room type + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6209009506960773324 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7624598385178326493} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4000013863059372} + 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.445, y: -0.347} + m_SizeDelta: {x: 2, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!23 &2039263249978755478 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7624598385178326493} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 + 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!114 &1368432156236954280 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7624598385178326493} + 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: Room type + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.5 + m_fontSizeBase: 1.5 + 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: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -0.31141979, y: -0.12023544, z: 0.19494265, w: 1.1764753} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 2039263249978755478} + m_maskType: 0 +--- !u!1 &8057700737876105238 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6792340811292829086} + - component: {fileID: 8680312576322523132} + - component: {fileID: 316393831736989700} + m_Layer: 16 + m_Name: Audio + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6792340811292829086 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8057700737876105238} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4000013863059372} + 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.445, y: -0.537} + m_SizeDelta: {x: 2, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!23 &8680312576322523132 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8057700737876105238} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 + 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!114 &316393831736989700 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8057700737876105238} + 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: Audio + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.5 + m_fontSizeBase: 1.5 + 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: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -0.31141979, y: -0.12023544, z: 0.19494265, w: 1.1764753} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 8680312576322523132} + m_maskType: 0 +--- !u!1 &8404568717583676973 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2513099590842416612} + - component: {fileID: 2390606770061799462} + - component: {fileID: 6880184433722633500} + m_Layer: 16 + m_Name: TextLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2513099590842416612 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8404568717583676973} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1196226204731840579} + 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.7710999, y: -0.10100001} + m_SizeDelta: {x: 1.5, y: 0.25} + m_Pivot: {x: 0, y: 1} +--- !u!23 &2390606770061799462 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8404568717583676973} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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!114 &6880184433722633500 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8404568717583676973} + 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: Players List + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.93 + m_fontSizeBase: 1.93 + 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: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -0.031108022, y: 0, z: -0.07259071, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 2390606770061799462} + m_maskType: 0 diff --git a/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs b/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs index 0839bfe19..09cab0af6 100644 --- a/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs +++ b/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs @@ -13,16 +13,53 @@ // limitations under the License. using UnityEngine; +using OpenBrush.Multiplayer; +using System; +using System.Collections.Generic; namespace TiltBrush { public class MultiplayerRoomOptionsPopUpWindow : PopUpWindow { + public GameObject m_playerGuiPrefab; + public Vector2 PlayerGuiPrefabSize; + public Vector2 PlayerListOffset; + public Vector2 PlayerListArea; + private List m_instantiatedGuiPrefabs; + + public RemotePlayers m_RemotePlayers + { + get + { + if (MultiplayerManager.m_Instance == null) + throw new InvalidOperationException("MultiplayerManager is not initialized."); + return MultiplayerManager.m_Instance.m_RemotePlayers; + } + + } + + public ITransientData m_LocalPlayer + { + get + { + if (MultiplayerManager.m_Instance == null) + throw new InvalidOperationException("MultiplayerManager is not initialized."); + return MultiplayerManager.m_Instance.m_LocalPlayer; + } + + } + + #region overrides base class override public void Init(GameObject rParent, string sText) { base.Init(rParent, sText); + + m_RemotePlayers.remotePlayerAdded += RemotePlayerAdded; + m_RemotePlayers.remotePlayerRemoved += RemotePlayerRemoved; + m_RemotePlayers.remotePlayersListCleared += RemotePlayersListCleared; + } override protected void BaseUpdate() @@ -44,5 +81,95 @@ override public void UpdateUIComponents(Ray rCastRay, bool inputValid, Collider { base.UpdateUIComponents(rCastRay, inputValid, parentCollider); } + + #endregion + + public void RemotePlayerAdded(int playerId) + { + GeneratePlayerList(); + } + + public void RemotePlayerRemoved(int playerId) + { + GeneratePlayerList(); + } + + public void RemotePlayersListCleared() + { + GeneratePlayerList(); + } + + public void GeneratePlayerList(List playersList = null) + { + if (m_playerGuiPrefab == null) + { + Debug.LogWarning("Player GUI Prefab is not assigned!"); + return; + } + + ClearGuiPrefabsList(); + + List playersToDisplay = playersList ?? m_RemotePlayers.List; + + Vector3 basePosition = transform.position + new Vector3(-PlayerListArea.x / 2 + PlayerGuiPrefabSize.x / 2, PlayerListOffset.y + PlayerListArea.y / 2 - PlayerGuiPrefabSize.y / 2, 0); + float yOffset = PlayerGuiPrefabSize.y; + + foreach (var remotePlayer in playersToDisplay) + { + GameObject playerListItem = Instantiate(m_playerGuiPrefab, basePosition, Quaternion.identity, transform); + playerListItem.name = $"Player_{remotePlayer.PlayerId}"; + playerListItem.transform.localPosition = basePosition; + + PlayerListItemPrefab playerGuiComponent = playerListItem.GetComponent(); + if (playerGuiComponent != null) + { + playerGuiComponent.SetRemotePlayer(remotePlayer); + } + + basePosition -= new Vector3(0, yOffset, 0); + playerListItem.SetActive(true); + AddTodGuiPrefabsList(playerListItem); + } + } + + private void AddTodGuiPrefabsList(GameObject item) + { + m_instantiatedGuiPrefabs.Add(item); + } + + private void ClearGuiPrefabsList() + { + foreach (GameObject g in m_instantiatedGuiPrefabs) DestroyImmediate(g); + m_instantiatedGuiPrefabs.Clear(); + } + + + #region player list + +#if UNITY_EDITOR + void OnDrawGizmos() + { + Gizmos.color = Color.red; + + Vector3 basePosition = transform.position + new Vector3(PlayerListOffset.x, PlayerListOffset.y, 0); + + Vector3 topLeft = basePosition + new Vector3(-PlayerListArea.x / 2, PlayerListArea.y / 2, 0); + Vector3 topRight = basePosition + new Vector3(PlayerListArea.x / 2, PlayerListArea.y / 2, 0); + Vector3 bottomLeft = basePosition + new Vector3(-PlayerListArea.x / 2, -PlayerListArea.y / 2, 0); + Vector3 bottomRight = basePosition + new Vector3(PlayerListArea.x / 2, -PlayerListArea.y / 2, 0); + + Gizmos.DrawLine(topLeft, topRight); + Gizmos.DrawLine(topRight, bottomRight); + Gizmos.DrawLine(bottomRight, bottomLeft); + Gizmos.DrawLine(bottomLeft, topLeft); + + Vector3 topEdgeCenter = (topLeft + topRight) / 2; + UnityEditor.Handles.Label(topEdgeCenter, "Player List Area"); + + } +#endif + #endregion + + } } // namespace TiltBrush diff --git a/Assets/Scripts/GUI/PlayerListItemPrefab.cs b/Assets/Scripts/GUI/PlayerListItemPrefab.cs new file mode 100644 index 000000000..d7c817579 --- /dev/null +++ b/Assets/Scripts/GUI/PlayerListItemPrefab.cs @@ -0,0 +1,21 @@ +using OpenBrush.Multiplayer; +using TMPro; +using UnityEngine; + +public class PlayerListItemPrefab : MonoBehaviour +{ + public TextMeshPro PlayerId; + public TextMeshPro NickName; + public RemotePlayer remotePlayer; + + public void SetRemotePlayer(RemotePlayer Player) + { + remotePlayer = Player; + SetPlayerId(); + SetNickname(); + } + + public void SetNickname() { NickName.text = remotePlayer.Nickname; } + public void SetPlayerId() { PlayerId.text = remotePlayer.PlayerId.ToString(); } + +} diff --git a/Assets/Scripts/GUI/PlayerListItemPrefab.cs.meta b/Assets/Scripts/GUI/PlayerListItemPrefab.cs.meta new file mode 100644 index 000000000..290160c2c --- /dev/null +++ b/Assets/Scripts/GUI/PlayerListItemPrefab.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 699ce61a16cf82840b0e5af897647ec9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Multiplayer/MultiplayerManager.cs b/Assets/Scripts/Multiplayer/MultiplayerManager.cs index 1c26b8dd2..b75b5799d 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerManager.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerManager.cs @@ -42,7 +42,7 @@ public class MultiplayerManager : MonoBehaviour private IVoiceConnectionHandler m_VoiceManager; public ITransientData m_LocalPlayer; - public List m_RemotePlayers; + public RemotePlayers m_RemotePlayers; public Action> localPlayerJoined; public Action remotePlayerJoined; @@ -110,7 +110,6 @@ void Awake() { m_Instance = this; oculusPlayerIds = new List(); - m_RemotePlayers = new List(); } void Start() @@ -374,7 +373,7 @@ void Update() // Update remote user refs, and send Anchors if new player joins. bool newUser = false; - foreach (var playerData in m_RemotePlayers) + foreach (var playerData in m_RemotePlayers.List) { ITransientData player = playerData.TransientData; @@ -413,7 +412,7 @@ void OnLocalPlayerJoined(int id, ITransientData playerData) void OnRemotePlayerJoined(RemotePlayer newRemotePlayer) { - m_RemotePlayers.Add(newRemotePlayer); + m_RemotePlayers.AddPlayer(newRemotePlayer); if (isUserRoomOwner) { @@ -424,7 +423,7 @@ void OnRemotePlayerJoined(RemotePlayer newRemotePlayer) public void OnRemoteVoiceConnected(int id, GameObject voicePrefab) { - RemotePlayer playerData = m_RemotePlayers.First(x => x.PlayerId == id); + RemotePlayer playerData = m_RemotePlayers.List.First(x => x.PlayerId == id); if (playerData == default) { Debug.LogWarning($"PlayerRigData with ID {id} not found"); @@ -470,25 +469,19 @@ void OnPlayerLeft(int id) Debug.Log("Possible to get here!"); return; } - var copy = m_RemotePlayers.ToList(); - foreach (var player in copy) - { - if (player.PlayerId == id) - { - m_RemotePlayers.Remove(player); - } - } + + m_RemotePlayers.RemovePlayerById(id); // Reassign Ownership if needed // Check if any remaining player is the room owner - bool anyRoomOwner = m_RemotePlayers.Any(player => m_Manager.GetPlayerRoomOwnershipStatus(player.PlayerId)) + bool anyRoomOwner = m_RemotePlayers.List.Any(player => m_Manager.GetPlayerRoomOwnershipStatus(player.PlayerId)) || isUserRoomOwner; // If there's still a room owner, no reassignment is needed if (anyRoomOwner) return; // If there are no other players left, the local player becomes the room owner - if (m_RemotePlayers.Count == 0) + if (m_RemotePlayers.List.Count == 0) { isUserRoomOwner = true; return; @@ -497,7 +490,7 @@ void OnPlayerLeft(int id) // Since There are other players left // Determine the new room owner by the lowest PlayerId var allPlayers = new List { new RemotePlayer { PlayerId = m_LocalPlayer.PlayerId } }; - allPlayers.AddRange(m_RemotePlayers); + allPlayers.AddRange(m_RemotePlayers.List); // Find the player with the lowest PlayerId var newOwner = allPlayers.OrderBy(player => player.PlayerId).First(); @@ -578,7 +571,7 @@ async void ShareAnchors() private void OnConnectionHandlerDisconnected() { m_LocalPlayer = null;// Clean up local player reference - m_RemotePlayers.Clear();// Clean up remote player references + m_RemotePlayers.ClearList();// Clean up remote player references LastError = null; State = ConnectionState.DISCONNECTED; StateUpdated?.Invoke(State); @@ -623,7 +616,7 @@ public bool IsUserRoomOwner() public bool IsRemotePlayerStillConnected(int playerId) { - if (m_RemotePlayers.Any(player => player.PlayerId == playerId)) return true; + if (m_RemotePlayers.List.Any(player => player.PlayerId == playerId)) return true; return false; } diff --git a/Assets/Scripts/Multiplayer/RemotePlayer.cs b/Assets/Scripts/Multiplayer/RemotePlayer.cs index d1060b2af..ee1053169 100644 --- a/Assets/Scripts/Multiplayer/RemotePlayer.cs +++ b/Assets/Scripts/Multiplayer/RemotePlayer.cs @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -33,4 +34,57 @@ public class RemotePlayer public GameObject VoiceGameObject; } + + [System.Serializable] + public class RemotePlayers + { + public Action remotePlayerAdded; + public Action remotePlayerRemoved; + public Action remotePlayersListCleared; + + private List list = new List(); + + public List List + { + get { return list; } + } + + public void AddPlayer(RemotePlayer player) + { + if (player != null) + { + list.Add(player); + remotePlayerAdded?.Invoke(player.PlayerId); + } + } + + public void RemovePlayer(RemotePlayer player) + { + if (player != null && list.Remove(player)) + remotePlayerRemoved?.Invoke(player.PlayerId); + } + + public void RemovePlayerById(int playerId) + { + RemotePlayer playerToRemove = GetPlayerById(playerId); + + if (playerToRemove != null && list.Remove(playerToRemove)) + remotePlayerRemoved?.Invoke(playerId); + + } + + public RemotePlayer GetPlayerById(int playerId) + { + RemotePlayer playerToRemove = list.Find(player => player.PlayerId == playerId); + + return playerToRemove; + } + + public void ClearList() + { + list.Clear(); + remotePlayersListCleared?.Invoke(); + } + } + } From 6ceebe2b31c7669e79455b6a08245a872397cdbb Mon Sep 17 00:00:00 2001 From: Riccardo Bovo Date: Mon, 20 Jan 2025 18:08:30 +0000 Subject: [PATCH 12/25] Update MultiplayerAudioSourcesManager.cs --- .../Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs b/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs index 8c9aaaaa5..f39a9c492 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs @@ -23,11 +23,15 @@ public class MultiplayerAudioSourcesManager : MonoBehaviour private List sources; private float _previousScale; - public void AddAudioSource(AudioSource source) + private void Awake() { + if (m_Instance == null) m_Instance = this; + else Debug.LogWarning("Multiple instances of MultiplayerAudioSourcesManager detected!"); + } + public void AddAudioSource(AudioSource source) + { sources.Append(source); - } void Update() From 91f3ab46ebc84cc88b130cdc7adfe26009c6cc5a Mon Sep 17 00:00:00 2001 From: Riccardo Bovo Date: Mon, 20 Jan 2025 18:15:43 +0000 Subject: [PATCH 13/25] Update MultiplayerAudioSourcesManager.cs --- Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs b/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs index f39a9c492..d2291a463 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs @@ -25,6 +25,8 @@ public class MultiplayerAudioSourcesManager : MonoBehaviour private void Awake() { + sources = new List(); + if (m_Instance == null) m_Instance = this; else Debug.LogWarning("Multiple instances of MultiplayerAudioSourcesManager detected!"); } From 24ac3817e022c4e2aa8dc3ab8df7668e63beb89f Mon Sep 17 00:00:00 2001 From: Riccardo Bovo Date: Mon, 20 Jan 2025 19:47:19 +0000 Subject: [PATCH 14/25] Nickname Nickname is empty by default in editor mode hence for testing purposes this changeset enable the nickname to be set from editor. --- Assets/Editor/MultiplayerManagerEditor.cs | 25 +++++++++++++++++++ .../GUI/MultiplayerRoomOptionsPopUpWindow.cs | 16 ++++++------ .../Scripts/Multiplayer/MultiplayerManager.cs | 2 +- .../Multiplayer/Photon/PhotonManager.cs | 5 ++-- .../Multiplayer/Photon/PhotonPlayerRig.cs | 4 +++ Assets/Scripts/Multiplayer/RemotePlayer.cs | 23 ++++++++++++++++- 6 files changed, 63 insertions(+), 12 deletions(-) diff --git a/Assets/Editor/MultiplayerManagerEditor.cs b/Assets/Editor/MultiplayerManagerEditor.cs index 606876c39..4d8a0123a 100644 --- a/Assets/Editor/MultiplayerManagerEditor.cs +++ b/Assets/Editor/MultiplayerManagerEditor.cs @@ -11,6 +11,8 @@ public class MultiplayerManagerInspector : Editor { private MultiplayerManager multiplayerManager; private string roomName = "1234"; + private string nickname = "PlayerNickname"; + private string oldNickname = "PlayerNickname"; private bool isPrivate = false; private int maxPlayers = 4; private bool voiceDisabled = false; @@ -26,6 +28,14 @@ public override void OnInspectorGUI() GUILayout.Space(10); roomName = EditorGUILayout.TextField("Room Name", roomName); + nickname = EditorGUILayout.TextField("Nickname", nickname); + + if (nickname != oldNickname) + { + SetNickname(); + oldNickname = nickname; + EditorUtility.SetDirty(target); + } //State string connectionState = ""; @@ -160,6 +170,21 @@ private async void ConnectToRoom() } } + private async void SetNickname() + { + if (multiplayerManager != null) + { + + ConnectionUserInfo ui = new ConnectionUserInfo + { + Nickname = nickname, + UserId = MultiplayerManager.m_Instance.UserInfo.UserId, + Role = MultiplayerManager.m_Instance.UserInfo.Role + }; + MultiplayerManager.m_Instance.UserInfo = ui; + } + } + private async void DisconnectFromRoom() { if (multiplayerManager != null) diff --git a/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs b/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs index 09cab0af6..2f52e09db 100644 --- a/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs +++ b/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs @@ -26,7 +26,7 @@ public class MultiplayerRoomOptionsPopUpWindow : PopUpWindow public Vector2 PlayerGuiPrefabSize; public Vector2 PlayerListOffset; public Vector2 PlayerListArea; - private List m_instantiatedGuiPrefabs; + private List m_instantiatedGuiPrefabs = new List(); public RemotePlayers m_RemotePlayers { @@ -70,6 +70,7 @@ override protected void BaseUpdate() protected override void UpdateOpening() { base.UpdateOpening(); + GeneratePlayerList(); } protected override void UpdateClosing() @@ -111,20 +112,21 @@ public void GeneratePlayerList(List playersList = null) List playersToDisplay = playersList ?? m_RemotePlayers.List; - Vector3 basePosition = transform.position + new Vector3(-PlayerListArea.x / 2 + PlayerGuiPrefabSize.x / 2, PlayerListOffset.y + PlayerListArea.y / 2 - PlayerGuiPrefabSize.y / 2, 0); + Vector3 basePosition = new Vector3( + -PlayerListArea.x / 2 + PlayerGuiPrefabSize.x / 2, + PlayerListOffset.y + PlayerListArea.y / 2 - PlayerGuiPrefabSize.y / 2, + 0 + ); float yOffset = PlayerGuiPrefabSize.y; foreach (var remotePlayer in playersToDisplay) { - GameObject playerListItem = Instantiate(m_playerGuiPrefab, basePosition, Quaternion.identity, transform); + GameObject playerListItem = Instantiate(m_playerGuiPrefab, basePosition, transform.rotation, transform); playerListItem.name = $"Player_{remotePlayer.PlayerId}"; playerListItem.transform.localPosition = basePosition; PlayerListItemPrefab playerGuiComponent = playerListItem.GetComponent(); - if (playerGuiComponent != null) - { - playerGuiComponent.SetRemotePlayer(remotePlayer); - } + if (playerGuiComponent != null) playerGuiComponent.SetRemotePlayer(remotePlayer); basePosition -= new Vector3(0, yOffset, 0); playerListItem.SetActive(true); diff --git a/Assets/Scripts/Multiplayer/MultiplayerManager.cs b/Assets/Scripts/Multiplayer/MultiplayerManager.cs index b75b5799d..a02dad347 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerManager.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerManager.cs @@ -42,7 +42,7 @@ public class MultiplayerManager : MonoBehaviour private IVoiceConnectionHandler m_VoiceManager; public ITransientData m_LocalPlayer; - public RemotePlayers m_RemotePlayers; + [HideInInspector] public RemotePlayers m_RemotePlayers; public Action> localPlayerJoined; public Action remotePlayerJoined; diff --git a/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs b/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs index d43a36580..b98016b86 100644 --- a/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs +++ b/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs @@ -107,7 +107,6 @@ public void Update() } } - #region IConnectionHandler Methods public async Task Connect() @@ -287,8 +286,8 @@ public string GetPlayerNickname(int playerId) .FirstOrDefault(playerRig => playerRig != null && playerRig.PlayerId == playerId); if (remotePlayer != null && remotePlayer.Object != null && remotePlayer.Object.IsValid) - return remotePlayer.Nickname; - else return "default"; + return remotePlayer.PersistentNickname; + else return ""; } public GameObject GetPlayerPrefab(int playerId) diff --git a/Assets/Scripts/Multiplayer/Photon/PhotonPlayerRig.cs b/Assets/Scripts/Multiplayer/Photon/PhotonPlayerRig.cs index 6e6f167d8..7810afe9f 100644 --- a/Assets/Scripts/Multiplayer/Photon/PhotonPlayerRig.cs +++ b/Assets/Scripts/Multiplayer/Photon/PhotonPlayerRig.cs @@ -40,6 +40,9 @@ public class PhotonPlayerRig : NetworkBehaviour, ITransientData [Networked] public float SceneScale { get; set; } [Networked] public bool isReceivingVoiceTransmission { get; set; } [Networked] public string Nickname { get; set; } + + public string PersistentNickname = ""; + PointerScript transientPointer; // The offset transforms. @@ -130,6 +133,7 @@ public PlayerRigData ReceiveData() { data.Nickname = this.Nickname; NicknameText.text = this.Nickname; + PersistentNickname = this.Nickname; } } diff --git a/Assets/Scripts/Multiplayer/RemotePlayer.cs b/Assets/Scripts/Multiplayer/RemotePlayer.cs index ee1053169..8a4770ead 100644 --- a/Assets/Scripts/Multiplayer/RemotePlayer.cs +++ b/Assets/Scripts/Multiplayer/RemotePlayer.cs @@ -24,7 +24,18 @@ namespace OpenBrush.Multiplayer public class RemotePlayer { public int PlayerId; - public string Nickname; + private string _nickname; + public string Nickname + { + + get + { + if (_nickname == "") _nickname = RetrieveNickNameFromRig(); + return _nickname; + } + set { _nickname = value; } + + } // send/receive rig data interface public ITransientData TransientData; @@ -32,6 +43,16 @@ public class RemotePlayer // The underlying GameObjects in the scene that represents this player public GameObject PlayerGameObject; public GameObject VoiceGameObject; + + private string RetrieveNickNameFromRig() + { + + if (PlayerGameObject == null) return ""; + PhotonPlayerRig Rig = PlayerGameObject.GetComponent(); + if (Rig == null) return ""; + return Rig.PersistentNickname; + + } } From ab586992348ed25f88aebe606877f122f176dd00 Mon Sep 17 00:00:00 2001 From: Riccardo Bovo Date: Mon, 20 Jan 2025 20:08:42 +0000 Subject: [PATCH 15/25] Update MultiplayerPanel.prefab fix missing collider --- Assets/Prefabs/Panels/MultiplayerPanel.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Prefabs/Panels/MultiplayerPanel.prefab b/Assets/Prefabs/Panels/MultiplayerPanel.prefab index 66d123d9d..1ca54dfcd 100644 --- a/Assets/Prefabs/Panels/MultiplayerPanel.prefab +++ b/Assets/Prefabs/Panels/MultiplayerPanel.prefab @@ -48,7 +48,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_PanelType: 34 - m_Collider: {fileID: 0} + m_Collider: {fileID: 6569620} m_Mesh: {fileID: 184986} m_Border: {fileID: 23425245546884932} m_MeshCollider: {fileID: 6569620} From 3c1bd2a74ae4f0228d8d2ae4e587bfe234462dae Mon Sep 17 00:00:00 2001 From: Riccardo Bovo Date: Mon, 20 Jan 2025 21:49:41 +0000 Subject: [PATCH 16/25] Mute Unmute -> turn off local audio source This shout the local audio source of the corresponding remote player --- .../PopUps/PopUpWindow_RoomOptions.prefab | 2276 ++--------------- .../GUI/MultiplayerRoomOptionsPanelButton.cs | 46 + .../MultiplayerRoomOptionsPanelButton.cs.meta | 11 + .../GUI/MultiplayerRoomOptionsPopUpWindow.cs | 19 +- Assets/Scripts/GUI/PlayerListItemPrefab.cs | 45 +- .../MultiplayerAudioSourcesManager.cs | 105 +- .../Scripts/Multiplayer/MultiplayerManager.cs | 2 +- Assets/Scripts/SketchControlsScript.cs | 4 + 8 files changed, 418 insertions(+), 2090 deletions(-) create mode 100644 Assets/Scripts/GUI/MultiplayerRoomOptionsPanelButton.cs create mode 100644 Assets/Scripts/GUI/MultiplayerRoomOptionsPanelButton.cs.meta diff --git a/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab b/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab index 6448cbff8..8254d22cd 100644 --- a/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab +++ b/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab @@ -34,11 +34,6 @@ Transform: m_Children: - {fileID: 4000013863059372} - {fileID: 8179569077979998440} - - {fileID: 7392762193378026434} - - {fileID: 320205614807127358} - - {fileID: 7296585441038696811} - - {fileID: 21378304894574439} - - {fileID: 3564450395060031296} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &6590698 @@ -688,177 +683,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_renderer: {fileID: 5871753085037369241} m_maskType: 0 ---- !u!1 &513571741569304716 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3180017156695656229} - - component: {fileID: 8055557402958044442} - - component: {fileID: 4508949308213063257} - m_Layer: 16 - m_Name: Nickname - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3180017156695656229 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 513571741569304716} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7392762193378026434} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0.131, y: 0} - m_SizeDelta: {x: 1, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!23 &8055557402958044442 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 513571741569304716} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 - 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!114 &4508949308213063257 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 513571741569304716} - 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: testPlayer0 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.2 - m_fontSizeBase: 1.2 - 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: 0 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: -0.055374146, z: 0.42066336, w: -0.06769562} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 8055557402958044442} - m_maskType: 0 --- !u!1 &679135365067901709 GameObject: m_ObjectHideFlags: 0 @@ -892,7 +716,7 @@ Transform: - {fileID: 5720222177919667581} m_Father: {fileID: 4000013863059372} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &839512890901822249 +--- !u!1 &1020480228254418875 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -900,1458 +724,43 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4801838056584329165} - - component: {fileID: 5824354997464212482} - - component: {fileID: 3688252749320687778} + - component: {fileID: 5114263697058651145} + - component: {fileID: 2557246441992726044} + - component: {fileID: 1798382661626105731} m_Layer: 16 - m_Name: ID + m_Name: Nickname m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4801838056584329165 +--- !u!224 &5114263697058651145 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 839512890901822249} + m_GameObject: {fileID: 1020480228254418875} 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 320205614807127358} + m_Father: {fileID: 8179569077979998440} 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_AnchoredPosition: {x: 0.131, y: 0} m_SizeDelta: {x: 1, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!23 &5824354997464212482 +--- !u!23 &2557246441992726044 MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 839512890901822249} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 - 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!114 &3688252749320687778 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 839512890901822249} - 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: 1 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.2 - m_fontSizeBase: 1.2 - 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: 0 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: 0.077819824, z: 1.1845207, w: 0.06854248} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 5824354997464212482} - m_maskType: 0 ---- !u!1 &1020480228254418875 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5114263697058651145} - - component: {fileID: 2557246441992726044} - - component: {fileID: 1798382661626105731} - m_Layer: 16 - m_Name: Nickname - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5114263697058651145 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1020480228254418875} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8179569077979998440} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0.131, y: 0} - m_SizeDelta: {x: 1, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!23 &2557246441992726044 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1020480228254418875} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 - 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!114 &1798382661626105731 -MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1020480228254418875} 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: PlayerNickname - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.2 - m_fontSizeBase: 1.2 - 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: 0 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: -0.055374146, z: 0.42066336, w: -0.06769562} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 2557246441992726044} - m_maskType: 0 ---- !u!1 &1149475022291703227 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7296585441038696811} - - component: {fileID: 2850680294846149528} - m_Layer: 0 - m_Name: Player_2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7296585441038696811 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1149475022291703227} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.45000002, y: -0.82500005, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5356063530363255750} - - {fileID: 5438881841448438657} - m_Father: {fileID: 461372} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2850680294846149528 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1149475022291703227} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 699ce61a16cf82840b0e5af897647ec9, type: 3} - m_Name: - m_EditorClassIdentifier: - PlayerId: {fileID: 647324137100573901} - NickName: {fileID: 5717903971144814196} - remotePlayer: - PlayerId: 2 - Nickname: testPlayer2 - PlayerGameObject: {fileID: 0} - VoiceGameObject: {fileID: 0} ---- !u!1 &1354989483249718091 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4199485391807292361} - - component: {fileID: 4013695320284821526} - - component: {fileID: 6698410408993192826} - m_Layer: 16 - m_Name: Nickname - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4199485391807292361 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1354989483249718091} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 21378304894574439} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0.131, y: 0} - m_SizeDelta: {x: 1, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!23 &4013695320284821526 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1354989483249718091} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 - 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!114 &6698410408993192826 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1354989483249718091} - 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: testPlayer3 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.2 - m_fontSizeBase: 1.2 - 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: 0 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: -0.055374146, z: 0.42066336, w: -0.06769562} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 4013695320284821526} - m_maskType: 0 ---- !u!1 &1513818574748650382 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 320205614807127358} - - component: {fileID: 7017652289537427018} - m_Layer: 0 - m_Name: Player_1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &320205614807127358 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1513818574748650382} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.45000002, y: -0.6750001, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4801838056584329165} - - {fileID: 4783016729148011441} - m_Father: {fileID: 461372} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7017652289537427018 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1513818574748650382} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 699ce61a16cf82840b0e5af897647ec9, type: 3} - m_Name: - m_EditorClassIdentifier: - PlayerId: {fileID: 3688252749320687778} - NickName: {fileID: 7572858237545715544} - remotePlayer: - PlayerId: 1 - Nickname: testPlayer1 - PlayerGameObject: {fileID: 0} - VoiceGameObject: {fileID: 0} ---- !u!1 &1647840589375695008 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5356063530363255750} - - component: {fileID: 6733258295810344408} - - component: {fileID: 647324137100573901} - m_Layer: 16 - m_Name: ID - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5356063530363255750 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1647840589375695008} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7296585441038696811} - 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: 1, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!23 &6733258295810344408 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1647840589375695008} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 - 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!114 &647324137100573901 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1647840589375695008} - 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: 2 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.2 - m_fontSizeBase: 1.2 - 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: 0 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: 0.077819824, z: 1.1845207, w: 0.06854248} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 6733258295810344408} - m_maskType: 0 ---- !u!1 &1660661214499456472 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1840143052362000901} - - component: {fileID: 8077756397714947917} - - component: {fileID: 6439348432499794056} - m_Layer: 16 - m_Name: ListBorderUp - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1840143052362000901 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1660661214499456472} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5720222177919667581} - m_LocalEulerAnglesHint: {x: 180, y: 180, 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: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!33 &8077756397714947917 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1660661214499456472} - m_Mesh: {fileID: 1220556274848135419, guid: a343604c10f606040a21af265cde7858, type: 3} ---- !u!23 &6439348432499794056 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1660661214499456472} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - 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: 77dd4ff8b1158a84397aba783cd0af05, 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 &1969159737782794172 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5898731982046344760} - - component: {fileID: 1922773804320731880} - - component: {fileID: 4617326837389647367} - m_Layer: 16 - m_Name: ID - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5898731982046344760 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1969159737782794172} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3564450395060031296} - 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: 1, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!23 &1922773804320731880 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1969159737782794172} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 - 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!114 &4617326837389647367 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1969159737782794172} - 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: 4 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.2 - m_fontSizeBase: 1.2 - 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: 0 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: 0.077819824, z: 1.1845207, w: 0.06854248} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 1922773804320731880} - m_maskType: 0 ---- !u!1 &2304814148540785761 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5720222177919667581} - m_Layer: 16 - m_Name: Meshes - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5720222177919667581 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2304814148540785761} - m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.9, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1840143052362000901} - - {fileID: 228334323036961790} - m_Father: {fileID: 1196226204731840579} - 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.021400094, y: -1.269} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &2414029554072440725 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8179569077979998440} - - component: {fileID: 8958483938599195323} - m_Layer: 0 - m_Name: PlayerListItemPrefab - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &8179569077979998440 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2414029554072440725} - serializedVersion: 2 - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3240525278412876640} - - {fileID: 5114263697058651145} - m_Father: {fileID: 461372} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8958483938599195323 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2414029554072440725} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 699ce61a16cf82840b0e5af897647ec9, type: 3} - m_Name: - m_EditorClassIdentifier: - PlayerId: {fileID: 4873271370203748162} - NickName: {fileID: 1798382661626105731} - remotePlayer: - PlayerId: 0 - Nickname: - PlayerGameObject: {fileID: 0} - VoiceGameObject: {fileID: 0} ---- !u!1 &2696262575679085747 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7392762193378026434} - - component: {fileID: 2327811110148241121} - m_Layer: 0 - m_Name: Player_0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7392762193378026434 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2696262575679085747} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.45000002, y: -0.52500004, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 6666857010766461615} - - {fileID: 3180017156695656229} - m_Father: {fileID: 461372} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2327811110148241121 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2696262575679085747} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 699ce61a16cf82840b0e5af897647ec9, type: 3} - m_Name: - m_EditorClassIdentifier: - PlayerId: {fileID: 5505884937170044365} - NickName: {fileID: 4508949308213063257} - remotePlayer: - PlayerId: 0 - Nickname: testPlayer0 - PlayerGameObject: {fileID: 0} - VoiceGameObject: {fileID: 0} ---- !u!1 &2988438625162171754 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5438881841448438657} - - component: {fileID: 525645258293006421} - - component: {fileID: 5717903971144814196} - m_Layer: 16 - m_Name: Nickname - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5438881841448438657 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2988438625162171754} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7296585441038696811} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0.131, y: 0} - m_SizeDelta: {x: 1, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!23 &525645258293006421 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2988438625162171754} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 - 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!114 &5717903971144814196 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2988438625162171754} - 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: testPlayer2 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.2 - m_fontSizeBase: 1.2 - 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: 0 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: -0.055374146, z: 0.42066336, w: -0.06769562} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 525645258293006421} - m_maskType: 0 ---- !u!1 &3443785268297259808 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 21378304894574439} - - component: {fileID: 348169012328294334} - m_Layer: 0 - m_Name: Player_3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &21378304894574439 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3443785268297259808} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.45000002, y: -0.975, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2077359043226585784} - - {fileID: 4199485391807292361} - m_Father: {fileID: 461372} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &348169012328294334 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3443785268297259808} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 699ce61a16cf82840b0e5af897647ec9, type: 3} - m_Name: - m_EditorClassIdentifier: - PlayerId: {fileID: 6263782809766715304} - NickName: {fileID: 6698410408993192826} - remotePlayer: - PlayerId: 3 - Nickname: testPlayer3 - PlayerGameObject: {fileID: 0} - VoiceGameObject: {fileID: 0} ---- !u!1 &3484548605011139972 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6666857010766461615} - - component: {fileID: 2011497536940097822} - - component: {fileID: 5505884937170044365} - m_Layer: 16 - m_Name: ID - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6666857010766461615 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3484548605011139972} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7392762193378026434} - 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: 1, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!23 &2011497536940097822 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3484548605011139972} - m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -2386,13 +795,13 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &5505884937170044365 +--- !u!114 &1798382661626105731 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3484548605011139972} + m_GameObject: {fileID: 1020480228254418875} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} @@ -2406,7 +815,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 0 + m_text: PlayerNickname m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} @@ -2469,16 +878,16 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: 0.077819824, z: 1.1845207, w: 0.06854248} + m_margin: {x: -0.31141979, y: -0.055374146, z: 0.42066336, w: -0.06769562} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 m_hasFontAssetChanged: 0 - m_renderer: {fileID: 2011497536940097822} + m_renderer: {fileID: 2557246441992726044} m_maskType: 0 ---- !u!1 &4723078638993166571 +--- !u!1 &1660661214499456472 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2486,50 +895,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 228334323036961790} - - component: {fileID: 8846632708018233640} - - component: {fileID: 5264728200170257136} + - component: {fileID: 1840143052362000901} + - component: {fileID: 8077756397714947917} + - component: {fileID: 6439348432499794056} m_Layer: 16 - m_Name: ListBorderDown + m_Name: ListBorderUp m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &228334323036961790 +--- !u!224 &1840143052362000901 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4723078638993166571} - m_LocalRotation: {x: -0, y: -0, z: 1, w: 0} + m_GameObject: {fileID: 1660661214499456472} + 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5720222177919667581} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 180, y: 180, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -1.177} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!33 &8846632708018233640 +--- !u!33 &8077756397714947917 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4723078638993166571} + m_GameObject: {fileID: 1660661214499456472} m_Mesh: {fileID: 1220556274848135419, guid: a343604c10f606040a21af265cde7858, type: 3} ---- !u!23 &5264728200170257136 +--- !u!23 &6439348432499794056 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4723078638993166571} + m_GameObject: {fileID: 1660661214499456472} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -2565,7 +974,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &5790573738914507767 +--- !u!1 &2304814148540785761 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2573,52 +982,36 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3564450395060031296} - - component: {fileID: 8314447639666752603} - m_Layer: 0 - m_Name: Player_4 + - component: {fileID: 5720222177919667581} + m_Layer: 16 + m_Name: Meshes m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &3564450395060031296 -Transform: +--- !u!224 &5720222177919667581 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5790573738914507767} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.45000002, y: -1.125, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_GameObject: {fileID: 2304814148540785761} + m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.9, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5898731982046344760} - - {fileID: 4625999914535135374} - m_Father: {fileID: 461372} + - {fileID: 1840143052362000901} + - {fileID: 228334323036961790} + m_Father: {fileID: 1196226204731840579} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8314447639666752603 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5790573738914507767} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 699ce61a16cf82840b0e5af897647ec9, type: 3} - m_Name: - m_EditorClassIdentifier: - PlayerId: {fileID: 4617326837389647367} - NickName: {fileID: 4501463642685253836} - remotePlayer: - PlayerId: 4 - Nickname: testPlayer4 - PlayerGameObject: {fileID: 0} - VoiceGameObject: {fileID: 0} ---- !u!1 &6614870679551821437 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.021400094, y: -1.269} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2414029554072440725 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2626,170 +1019,53 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4650316152798292590} - - component: {fileID: 3661853299119540901} - - component: {fileID: 1185496136212610254} - m_Layer: 16 - m_Name: Max players + - component: {fileID: 8179569077979998440} + - component: {fileID: 8958483938599195323} + m_Layer: 0 + m_Name: PlayerListItemPrefab m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4650316152798292590 -RectTransform: +--- !u!4 &8179569077979998440 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6614870679551821437} + m_GameObject: {fileID: 2414029554072440725} + serializedVersion: 2 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4000013863059372} + m_Children: + - {fileID: 3240525278412876640} + - {fileID: 5114263697058651145} + - {fileID: 2962397487389710043} + m_Father: {fileID: 461372} 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.445, y: -0.154} - m_SizeDelta: {x: 2, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!23 &3661853299119540901 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6614870679551821437} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 - 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!114 &1185496136212610254 +--- !u!114 &8958483938599195323 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6614870679551821437} + m_GameObject: {fileID: 2414029554072440725} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Script: {fileID: 11500000, guid: 699ce61a16cf82840b0e5af897647ec9, 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: Max players - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.5 - m_fontSizeBase: 1.5 - 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: 0 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: -0.12023544, z: 0.19494265, w: 1.1764753} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 3661853299119540901} - m_maskType: 0 ---- !u!1 &6932523609421564514 + PlayerIdObject: {fileID: 4873271370203748162} + NickNameObject: {fileID: 1798382661626105731} + MuteButton: {fileID: 2918817422897490678} + remotePlayer: + PlayerId: 0 + PlayerGameObject: {fileID: 0} + VoiceGameObject: {fileID: 0} +--- !u!1 &4723078638993166571 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2797,45 +1073,53 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4625999914535135374} - - component: {fileID: 7966331034873567159} - - component: {fileID: 4501463642685253836} + - component: {fileID: 228334323036961790} + - component: {fileID: 8846632708018233640} + - component: {fileID: 5264728200170257136} m_Layer: 16 - m_Name: Nickname + m_Name: ListBorderDown m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4625999914535135374 +--- !u!224 &228334323036961790 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6932523609421564514} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3564450395060031296} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0.131, y: 0} - m_SizeDelta: {x: 1, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!23 &7966331034873567159 + m_GameObject: {fileID: 4723078638993166571} + m_LocalRotation: {x: -0, y: -0, z: 1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5720222177919667581} + 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: -1.177} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!33 &8846632708018233640 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4723078638993166571} + m_Mesh: {fileID: 1220556274848135419, guid: a343604c10f606040a21af265cde7858, type: 3} +--- !u!23 &5264728200170257136 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6932523609421564514} + m_GameObject: {fileID: 4723078638993166571} m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 m_DynamicOccludee: 1 m_StaticShadowCaster: 0 m_MotionVectors: 1 @@ -2846,7 +1130,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + - {fileID: 2100000, guid: 77dd4ff8b1158a84397aba783cd0af05, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2858,7 +1142,7 @@ MeshRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_StitchLightmapSeams: 0 + m_StitchLightmapSeams: 1 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -2868,99 +1152,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &4501463642685253836 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6932523609421564514} - 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: testPlayer4 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.2 - m_fontSizeBase: 1.2 - 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: 0 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: -0.055374146, z: 0.42066336, w: -0.06769562} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 7966331034873567159} - m_maskType: 0 ---- !u!1 &7111152122261735224 +--- !u!1 &5962557757813627302 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2968,42 +1160,48 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2077359043226585784} - - component: {fileID: 4565650911436715844} - - component: {fileID: 6263782809766715304} + - component: {fileID: 2962397487389710043} + - component: {fileID: 1683758306941744166} + - component: {fileID: 1285568165018723520} + - component: {fileID: 3067514523684327492} + - component: {fileID: 2918817422897490678} m_Layer: 16 - m_Name: ID + m_Name: MuteButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2077359043226585784 -RectTransform: +--- !u!4 &2962397487389710043 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7111152122261735224} + m_GameObject: {fileID: 5962557757813627302} + serializedVersion: 2 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_LocalPosition: {x: 0.797, y: 0, z: 0} + m_LocalScale: {x: 0.14999999, y: 0.14999999, z: 0.14999999} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 21378304894574439} + m_Father: {fileID: 8179569077979998440} 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: 1, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!23 &4565650911436715844 +--- !u!33 &1683758306941744166 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5962557757813627302} + m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} +--- !u!23 &1285568165018723520 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7111152122261735224} + m_GameObject: {fileID: 5962557757813627302} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -3017,7 +1215,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + - {fileID: 2100000, guid: 40d29de2bdc11f04dbfa25059165916e, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3039,99 +1237,107 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &6263782809766715304 +--- !u!65 &3067514523684327492 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5962557757813627302} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1.1, y: 1.1, z: 0.1} + m_Center: {x: -0.000000074505806, y: 0.000000022351742, z: 0} +--- !u!114 &2918817422897490678 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7111152122261735224} + m_GameObject: {fileID: 5962557757813627302} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Script: {fileID: 11500000, guid: 650d89a0f5c4ffe449d970ac10b2e6bb, 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: 3 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.2 - m_fontSizeBase: 1.2 - 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: 0 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: 0.077819824, z: 1.1845207, w: 0.06854248} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 4565650911436715844} - m_maskType: 0 ---- !u!1 &7464894877112994450 + m_DescriptionType: 0 + m_DescriptionYOffset: 0 + m_DescriptionText: + m_LocalizedDescription: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionActivateSpeed: 12 + m_DescriptionZScale: 1 + m_ButtonTexture: {fileID: 2800000, guid: 464883c791528804496b8c8ef7126e52, type: 3} + m_AtlasTexture: 1 + m_ToggleButton: 1 + m_LongPressReleaseButton: 0 + m_ButtonHasPressedAudio: 1 + m_ZAdjustHover: -0.02 + m_ZAdjustClick: 0.05 + m_HoverScale: 1.1 + m_HoverBoxColliderGrow: 0.2 + m_AddOverlay: 0 + m_Command: 0 + m_CommandParam: -1 + m_CommandParam2: -1 + m_RequiresPopup: 0 + m_CenterPopupOnButton: 0 + m_PopupOffset: {x: 0, y: 0, z: 0} + m_PopupText: + m_LocalizedPopup: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnDescription: + m_LocalizedToggleOnDescription: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnTexture: {fileID: 0} + m_AllowUnavailable: 0 + m_LinkedUIObject: {fileID: 0} + m_CommandIgnored: 0 + references: + version: 2 + RefIds: [] +--- !u!1 &6614870679551821437 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3139,42 +1345,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4783016729148011441} - - component: {fileID: 375688894760197537} - - component: {fileID: 7572858237545715544} + - component: {fileID: 4650316152798292590} + - component: {fileID: 3661853299119540901} + - component: {fileID: 1185496136212610254} m_Layer: 16 - m_Name: Nickname + m_Name: Max players m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4783016729148011441 +--- !u!224 &4650316152798292590 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7464894877112994450} + m_GameObject: {fileID: 6614870679551821437} 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 320205614807127358} + m_Father: {fileID: 4000013863059372} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0.131, y: 0} - m_SizeDelta: {x: 1, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.445, y: -0.154} + m_SizeDelta: {x: 2, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!23 &375688894760197537 +--- !u!23 &3661853299119540901 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7464894877112994450} + m_GameObject: {fileID: 6614870679551821437} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -3210,13 +1416,13 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &7572858237545715544 +--- !u!114 &1185496136212610254 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7464894877112994450} + m_GameObject: {fileID: 6614870679551821437} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} @@ -3230,7 +1436,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: testPlayer1 + m_text: Max players m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} @@ -3257,8 +1463,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 1.2 - m_fontSizeBase: 1.2 + m_fontSize: 1.5 + m_fontSizeBase: 1.5 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -3293,14 +1499,14 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: -0.055374146, z: 0.42066336, w: -0.06769562} + m_margin: {x: -0.31141979, y: -0.12023544, z: 0.19494265, w: 1.1764753} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 m_hasFontAssetChanged: 0 - m_renderer: {fileID: 375688894760197537} + m_renderer: {fileID: 3661853299119540901} m_maskType: 0 --- !u!1 &7624598385178326493 GameObject: diff --git a/Assets/Scripts/GUI/MultiplayerRoomOptionsPanelButton.cs b/Assets/Scripts/GUI/MultiplayerRoomOptionsPanelButton.cs new file mode 100644 index 000000000..695131167 --- /dev/null +++ b/Assets/Scripts/GUI/MultiplayerRoomOptionsPanelButton.cs @@ -0,0 +1,46 @@ +// Copyright 2023 The Open Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +using UnityEngine; + +namespace TiltBrush +{ + public class MultiplayerRoomOptionsPanelButton : OptionButton + { + [SerializeField] private bool m_CommandIgnored = false; + [HideInInspector] public int playerId; + + override protected void OnButtonPressed() + { + + MultiplayerRoomOptionsPopUpWindow popup = m_Manager.GetComponent(); + + // For some circumstances on mobile, we want to ignore the command, but still + // notify the popup that we were pressed. Which happens below. + if (!m_CommandIgnored) + { + if (m_RequiresPopup & m_Command == SketchControlsScript.GlobalCommands.MuteUserInMultiplayer) + { + + } + + base.OnButtonPressed(); + } + + + Debug.Assert(popup != null); + popup.OnMultiplayerRoomOptionsPopUpWindowButtonPressed(this); + } + } +} // namespace TiltBrush diff --git a/Assets/Scripts/GUI/MultiplayerRoomOptionsPanelButton.cs.meta b/Assets/Scripts/GUI/MultiplayerRoomOptionsPanelButton.cs.meta new file mode 100644 index 000000000..ccbee302d --- /dev/null +++ b/Assets/Scripts/GUI/MultiplayerRoomOptionsPanelButton.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 650d89a0f5c4ffe449d970ac10b2e6bb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs b/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs index 2f52e09db..489c5c51d 100644 --- a/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs +++ b/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs @@ -16,10 +16,10 @@ using OpenBrush.Multiplayer; using System; using System.Collections.Generic; +using OpenBrush; namespace TiltBrush { - public class MultiplayerRoomOptionsPopUpWindow : PopUpWindow { public GameObject m_playerGuiPrefab; @@ -145,8 +145,20 @@ private void ClearGuiPrefabsList() m_instantiatedGuiPrefabs.Clear(); } - - #region player list + public void OnMultiplayerRoomOptionsPopUpWindowButtonPressed(MultiplayerRoomOptionsPanelButton button) + { + switch (button.m_Command) + { + case SketchControlsScript.GlobalCommands.Null: + break; + case SketchControlsScript.GlobalCommands.MuteUserInMultiplayer: + MultiplayerAudioSourcesManager.m_Instance.MuteAudioSourcesForPlayer(button.playerId); + break; + case SketchControlsScript.GlobalCommands.UnmuteUserInMultiplayer: + MultiplayerAudioSourcesManager.m_Instance.UnmuteAudioSourcesForPlayer(button.playerId); + break; + } + } #if UNITY_EDITOR void OnDrawGizmos() @@ -170,7 +182,6 @@ void OnDrawGizmos() } #endif - #endregion } diff --git a/Assets/Scripts/GUI/PlayerListItemPrefab.cs b/Assets/Scripts/GUI/PlayerListItemPrefab.cs index d7c817579..caf2e58bf 100644 --- a/Assets/Scripts/GUI/PlayerListItemPrefab.cs +++ b/Assets/Scripts/GUI/PlayerListItemPrefab.cs @@ -1,21 +1,42 @@ +// Copyright 2023 The Open Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + using OpenBrush.Multiplayer; using TMPro; using UnityEngine; -public class PlayerListItemPrefab : MonoBehaviour +namespace TiltBrush { - public TextMeshPro PlayerId; - public TextMeshPro NickName; - public RemotePlayer remotePlayer; - - public void SetRemotePlayer(RemotePlayer Player) + public class PlayerListItemPrefab : MonoBehaviour { - remotePlayer = Player; - SetPlayerId(); - SetNickname(); - } + public TextMeshPro PlayerIdObject; + public TextMeshPro NickNameObject; + public MultiplayerRoomOptionsPanelButton MuteButton; + public RemotePlayer remotePlayer; - public void SetNickname() { NickName.text = remotePlayer.Nickname; } - public void SetPlayerId() { PlayerId.text = remotePlayer.PlayerId.ToString(); } + public void SetRemotePlayer(RemotePlayer Player) + { + remotePlayer = Player; + SetPlayerId(); + SetNickname(); + } + public void SetNickname() { NickNameObject.text = remotePlayer.Nickname; } + public void SetPlayerId() + { + PlayerIdObject.text = remotePlayer.PlayerId.ToString(); + MuteButton.playerId = remotePlayer.PlayerId; + } + } } diff --git a/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs b/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs index d2291a463..57abeb8f6 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs @@ -13,61 +13,90 @@ // limitations under the License. using System.Collections.Generic; -using System.Linq; using TiltBrush; using UnityEngine; -public class MultiplayerAudioSourcesManager : MonoBehaviour +namespace OpenBrush { - public static MultiplayerAudioSourcesManager m_Instance; - private List sources; - private float _previousScale; - private void Awake() + public class MultiplayerAudioSourcesManager : MonoBehaviour { - sources = new List(); + public static MultiplayerAudioSourcesManager m_Instance; + private Dictionary sources; // Key: playerId, Value: AudioSource + private float _previousScale; - if (m_Instance == null) m_Instance = this; - else Debug.LogWarning("Multiple instances of MultiplayerAudioSourcesManager detected!"); - } + private void Awake() + { + sources = new Dictionary(); - public void AddAudioSource(AudioSource source) - { - sources.Append(source); - } + if (m_Instance == null) m_Instance = this; + else Debug.LogWarning("Multiple instances of MultiplayerAudioSourcesManager detected!"); - void Update() - { - float currentScale = App.Scene.Pose.scale; + } - if (!Mathf.Approximately(currentScale, _previousScale)) + public void AddAudioSource(int playerId, AudioSource source) { - _previousScale = currentScale; - UpdateAudioSources(currentScale); + if (source != null) + sources[playerId] = source; } - } - private void UpdateAudioSources(float sceneScale) - { - // Loop backward to remove invalid AudioSources - for (int i = sources.Count - 1; i >= 0; i--) + void Update() { - var source = sources[i]; - if (source != null) + float currentScale = App.Scene.Pose.scale; + + if (!Mathf.Approximately(currentScale, _previousScale)) { - float adjustedMaxDistance = CalculateMaxDistance(sceneScale); - source.maxDistance = adjustedMaxDistance; + _previousScale = currentScale; + UpdateAudioSources(currentScale); } - else sources.RemoveAt(i); } - } - private float CalculateMaxDistance(float sceneScale) - { - // This is based on OpenBrush default scene max radius - // - At scale 0.1, the mountains diameter is 200 (close range). - // - At scale 1.0,the mountains diameter is 20000 (far range). - return Mathf.Lerp(200f, 20000f, Mathf.Clamp01(sceneScale)); - } + private void UpdateAudioSources(float sceneScale) + { + // Loop backward to remove invalid AudioSources + foreach (var kvp in new List>(sources)) + { + var source = kvp.Value; + if (source != null) + { + float adjustedMaxDistance = CalculateMaxDistance(sceneScale); + source.maxDistance = adjustedMaxDistance; + } + else sources.Remove(kvp.Key); // Remove invalid AudioSource by playerId + } + } + + private float CalculateMaxDistance(float sceneScale) + { + // This is based on OpenBrush default scene max radius + // - At scale 0.1, the mountains diameter is 200 (close range). + // - At scale 1.0, the mountains diameter is 20000 (far range). + return Mathf.Lerp(200f, 20000f, Mathf.Clamp01(sceneScale)); + } + + public void MuteAudioSources() + { + foreach (var source in sources.Values) + if (source != null) source.mute = true; + } + public void UnmuteAudioSources() + { + foreach (var source in sources.Values) + if (source != null) source.mute = false; + } + + public void MuteAudioSourcesForPlayer(int playerId) + { AudioSourcesMuteStateForPlayer(playerId, true); } + + public void UnmuteAudioSourcesForPlayer(int playerId) + { AudioSourcesMuteStateForPlayer(playerId, false); } + + public void AudioSourcesMuteStateForPlayer(int playerId, bool state) + { + sources.TryGetValue(playerId, out AudioSource source); + if (source == null) return; + source.mute = state; + } + } } diff --git a/Assets/Scripts/Multiplayer/MultiplayerManager.cs b/Assets/Scripts/Multiplayer/MultiplayerManager.cs index a02dad347..c76d9d012 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerManager.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerManager.cs @@ -453,7 +453,7 @@ public void OnRemoteVoiceConnected(int id, GameObject voicePrefab) Debug.LogWarning($"VoicePrefab with ID {id} lack AudioSource :S "); return; } - MultiplayerAudioSourcesManager.m_Instance.AddAudioSource(audioSource); + MultiplayerAudioSourcesManager.m_Instance.AddAudioSource(id, audioSource); } public void SendLargeDataToPlayer(int playerId, byte[] Data, int percentage) diff --git a/Assets/Scripts/SketchControlsScript.cs b/Assets/Scripts/SketchControlsScript.cs index 19fccb973..9dce75a02 100644 --- a/Assets/Scripts/SketchControlsScript.cs +++ b/Assets/Scripts/SketchControlsScript.cs @@ -157,6 +157,8 @@ public enum GlobalCommands MultiplayerDisconnect = 1008, EditMultiplayerNickName = 1009, OpenRoomSettings = 1010, + MuteUserInMultiplayer = 1011, + UnmuteUserInMultiplayer = 1012, RenameSketch = 5200, OpenLayerOptionsPopup = 5201, @@ -4871,6 +4873,8 @@ public void IssueGlobalCommand(GlobalCommands rEnum, int iParam1 = -1, case GlobalCommands.MultiplayerLeaveRoom: break; // Intentionally blank. case GlobalCommands.MultiplayerConnect: break; // Intentionally blank. case GlobalCommands.MultiplayerDisconnect: break; // Intentionally blank. + case GlobalCommands.MuteUserInMultiplayer: break; // Intentionally blank. + case GlobalCommands.UnmuteUserInMultiplayer: break; // Intentionally blank. case GlobalCommands.WhatIsNew: break;// Intentionally blank. default: Debug.LogError($"Unrecognized command {rEnum}"); From 973e6ef0b84c29605f1a8a7ba0e62443c6f7e8a7 Mon Sep 17 00:00:00 2001 From: Riccardo Bovo Date: Sat, 25 Jan 2025 18:12:51 +0000 Subject: [PATCH 17/25] Max Players setting add to Multiplayer Panel --- Assets/Prefabs/Panels/MultiplayerPanel.prefab | 395 +++++++++++++++++- Assets/Scripts/GUI/MultiplayerPanel.cs | 36 ++ Assets/Scripts/GUI/MultiplayerPanelButton.cs | 8 + Assets/Scripts/SketchControlsScript.cs | 10 + .../Strings/Strings Shared Data.asset | 4 + .../Localization/Strings/Strings_de.asset | 4 + .../Localization/Strings/Strings_en.asset | 4 + .../Localization/Strings/Strings_es.asset | 4 + .../Localization/Strings/Strings_fr.asset | 4 + .../Localization/Strings/Strings_ja.asset | 4 + .../Localization/Strings/Strings_ko.asset | 4 + .../Localization/Strings/Strings_zh.asset | 4 + 12 files changed, 469 insertions(+), 12 deletions(-) diff --git a/Assets/Prefabs/Panels/MultiplayerPanel.prefab b/Assets/Prefabs/Panels/MultiplayerPanel.prefab index 1ca54dfcd..109f2481f 100644 --- a/Assets/Prefabs/Panels/MultiplayerPanel.prefab +++ b/Assets/Prefabs/Panels/MultiplayerPanel.prefab @@ -62,6 +62,9 @@ MonoBehaviour: m_Command: 1009 - m_PopUpPrefab: {fileID: 197348, guid: dcd3065b75d04fa4a8c7381d4513ccd9, type: 3} m_Command: 1010 + - m_PopUpPrefab: {fileID: 8644332587479430734, guid: 51ce29df58ccd0343a277023a12c50ff, + type: 3} + m_Command: 1013 m_PanelDescription: m_LocalizedPanelDescription: m_TableReference: @@ -156,6 +159,16 @@ MonoBehaviour: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] + m_RoomMaxPlayer: {fileID: 1828976745358772435} + m_RoomMaxPlayerString: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 326532953040941056 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_AlertsErrors: {fileID: 6437857310660163665} m_AlertsErrorBeginnerModeActive: m_TableReference: @@ -1092,6 +1105,177 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_PropertyPath: m_text +--- !u!1 &641146320768746674 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5956357078512931190} + - component: {fileID: 5377226912068943702} + - component: {fileID: 1828976745358772435} + m_Layer: 16 + m_Name: Max Players + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5956357078512931190 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641146320768746674} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.05} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8346410928580794432} + 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.466, y: -0.14600028} + m_SizeDelta: {x: 1.104868, y: 1.4460607} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &5377226912068943702 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641146320768746674} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 0 + 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!114 &1828976745358772435 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641146320768746674} + 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: Max Players + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.5 + m_fontSizeBase: 1.5 + 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: -30 + 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: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -0.31141979, y: 0.10428953, z: 0.19494265, w: 1.1764753} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 5377226912068943702} + m_maskType: 0 --- !u!1 &696592855043656688 GameObject: m_ObjectHideFlags: 0 @@ -1394,6 +1578,191 @@ Transform: - {fileID: 1641104114940865418} m_Father: {fileID: 499980} m_LocalEulerAnglesHint: {x: 0, y: 0, z: -45} +--- !u!1 &1458507807089661463 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8965778440775414572} + - component: {fileID: 4632533079058493562} + - component: {fileID: 1247160408282321822} + - component: {fileID: 667034840418696469} + - component: {fileID: 6642975676601608853} + m_Layer: 16 + m_Name: MaxPlayerNumberEditButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8965778440775414572 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1458507807089661463} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.619, y: 0.396, z: -0.042} + m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8346410928580794432} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4632533079058493562 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1458507807089661463} + m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} +--- !u!23 &1247160408282321822 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1458507807089661463} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 40d29de2bdc11f04dbfa25059165916e, 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: 0 + 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!65 &667034840418696469 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1458507807089661463} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1.1, y: 1.1, z: 0.1} + m_Center: {x: -0.000000074505806, y: 0.000000022351742, z: 0} +--- !u!114 &6642975676601608853 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1458507807089661463} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b78a8d7209bbdc546979b549a875d550, type: 3} + m_Name: + m_EditorClassIdentifier: + m_DescriptionType: 0 + m_DescriptionYOffset: 0 + m_DescriptionText: + m_LocalizedDescription: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 294637073212186624 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionActivateSpeed: 12 + m_DescriptionZScale: 1 + m_ButtonTexture: {fileID: 2800000, guid: 0141ac6bf9f578f4e95706cdd2117914, type: 3} + m_AtlasTexture: 1 + m_ToggleButton: 0 + m_LongPressReleaseButton: 0 + m_ButtonHasPressedAudio: 1 + m_ZAdjustHover: -0.02 + m_ZAdjustClick: 0.02 + m_HoverScale: 1.1 + m_HoverBoxColliderGrow: 0.2 + m_AddOverlay: 0 + m_Command: 1013 + m_CommandParam: 1 + m_CommandParam2: -1 + m_RequiresPopup: 1 + m_CenterPopupOnButton: 0 + m_PopupOffset: {x: 0, y: 0, z: 0} + m_PopupText: + m_LocalizedPopup: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnDescription: + m_LocalizedToggleOnDescription: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnTexture: {fileID: 0} + m_AllowUnavailable: 1 + m_LinkedUIObject: {fileID: 0} + m_CommandIgnored: 0 + references: + version: 2 + RefIds: [] --- !u!1 &1499154774102387286 GameObject: m_ObjectHideFlags: 0 @@ -1428,7 +1797,7 @@ RectTransform: 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.147, y: 0.138} + m_AnchoredPosition: {x: 0.147, y: 0.102} m_SizeDelta: {x: 1.104868, y: 1.4460607} m_Pivot: {x: 0.5, y: 0.5} --- !u!23 &3100622910448847287 @@ -1558,7 +1927,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: -0.12023544, z: -0.1872099, w: 1.1764753} + m_margin: {x: -0.31141979, y: -0.12023544, z: -0.1872099, w: 1.3839676} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 _SortingLayer: 0 @@ -1847,7 +2216,7 @@ GameObject: - component: {fileID: 8677733851088090031} - component: {fileID: 9160963822650286723} m_Layer: 16 - m_Name: Room + m_Name: RoomName m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1869,7 +2238,7 @@ RectTransform: 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.466, y: -0.1400001} + m_AnchoredPosition: {x: 0.466, y: 0.09299956} m_SizeDelta: {x: 1.104868, y: 1.4460607} m_Pivot: {x: 0.5, y: 0.5} --- !u!23 &8677733851088090031 @@ -1997,7 +2366,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: -0.12023544, z: 0.19494265, w: 1.1764753} + m_margin: {x: -0.31141979, y: 0.10428953, z: 0.19494265, w: 1.1764753} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 _SortingLayer: 0 @@ -2040,7 +2409,7 @@ RectTransform: 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.466, y: -0.44200057} + m_AnchoredPosition: {x: 0.466, y: -0.8699996} m_SizeDelta: {x: 1.104868, y: 1.4460607} m_Pivot: {x: 0.5, y: 0.5} --- !u!23 &2426349157769062346 @@ -2168,7 +2537,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: -0.12023544, z: 0.19494265, w: 1.1764753} + m_margin: {x: -0.31141979, y: -0.12023544, z: 0.19494265, w: 1.4200528} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 _SortingLayer: 0 @@ -2397,8 +2766,10 @@ Transform: - {fileID: 3858004711376697373} - {fileID: 7486361010185590075} - {fileID: 8148098001997981085} - - {fileID: 2683548132759635989} - {fileID: 4609499178869085959} + - {fileID: 8965778440775414572} + - {fileID: 5956357078512931190} + - {fileID: 2683548132759635989} - {fileID: 2677652558882906679} - {fileID: 8994233172856634412} - {fileID: 3004064693637687833} @@ -2624,7 +2995,7 @@ RectTransform: 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.147, y: -0.755} + m_AnchoredPosition: {x: 0.161, y: -0.605} m_SizeDelta: {x: 1.104868, y: 1.4460607} m_Pivot: {x: 0.5, y: 0.5} --- !u!23 &4811598343171871539 @@ -2752,7 +3123,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: -0.12023544, z: -0.1872099, w: 1.1764753} + m_margin: {x: -0.31141979, y: -0.12023544, z: -0.1872099, w: 1.4065211} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 _SortingLayer: 0 @@ -2975,7 +3346,7 @@ Transform: m_GameObject: {fileID: 7355810358076377629} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.619, y: 0.20199952, z: -0.042} + m_LocalPosition: {x: -0.619, y: -0.1, z: -0.042} m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3160,7 +3531,7 @@ Transform: m_GameObject: {fileID: 7521510091458286424} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.619, y: 0.504, z: -0.042} + m_LocalPosition: {x: -0.619, y: 0.635, z: -0.042} m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Scripts/GUI/MultiplayerPanel.cs b/Assets/Scripts/GUI/MultiplayerPanel.cs index 0fc3e6c47..49c1959ed 100644 --- a/Assets/Scripts/GUI/MultiplayerPanel.cs +++ b/Assets/Scripts/GUI/MultiplayerPanel.cs @@ -34,6 +34,8 @@ public class MultiplayerPanel : BasePanel [SerializeField] private TextMeshPro m_RoomOwnership; [SerializeField] private LocalizedString m_RoomOwnerString; [SerializeField] private LocalizedString m_NotRoomOwnerString; + [SerializeField] private TextMeshPro m_RoomMaxPlayer; + [SerializeField] private LocalizedString m_RoomMaxPlayerString; [SerializeField] private TextMeshPro m_AlertsErrors; [SerializeField] private LocalizedString m_AlertsErrorBeginnerModeActive; [SerializeField] private LocalizedString m_AlertsRoomAlreadyExistent; @@ -75,6 +77,20 @@ public string NickName } } + private Tuple MaxPlayersRange = new Tuple(2, 8); + public int MaxPlayers + { + get { return data.maxPlayers; } + set + { + if (value < MaxPlayersRange.Item1) data.maxPlayers = MaxPlayersRange.Item1; + else if (value > MaxPlayersRange.Item2) data.maxPlayers = MaxPlayersRange.Item2; + else data.maxPlayers = value; + UpdateDisplay(); + SaveMaxPlayerNumber(value); + } + } + private RoomCreateData data; private List>> alertChecks; @@ -134,6 +150,24 @@ private async void SaveNickname(string nickname) await m_multiplayer.StoreAsync("nickname", nickname); } + public async void RetrieveMaxPlayers() + { + try + { + var storedMaxPlayers = await m_multiplayer.GetAsync("maxPlayers"); + MaxPlayers = storedMaxPlayers; + } + catch (KeyNotFoundException) + { + MaxPlayers = 4; + } + } + + private async void SaveMaxPlayerNumber(int maxPlayers) + { + await m_multiplayer.StoreAsync("maxPlayers", maxPlayers); + } + protected override void OnEnablePanel() { base.OnEnablePanel(); @@ -141,6 +175,7 @@ protected override void OnEnablePanel() m_multiplayer = new PlayerPrefsDataStore("Multiplayer"); RetrieveUsername(); RetrieveRoomName(); + RetrieveMaxPlayers(); if (MultiplayerManager.m_Instance == null) return; if (MultiplayerManager.m_Instance.State == ConnectionState.INITIALIZED || MultiplayerManager.m_Instance.State == ConnectionState.DISCONNECTED) @@ -194,6 +229,7 @@ private void UpdateDisplay() { if (m_RoomNumber) m_RoomNumber.text = m_RoomNumberString.GetLocalizedString() + data.roomName; if (m_Nickname) m_Nickname.text = m_NicknameString.GetLocalizedString() + NickName; + if (m_RoomMaxPlayer) m_RoomMaxPlayer.text = m_RoomMaxPlayerString.GetLocalizedString() + MaxPlayers; Alerts(); updateDisplay = false; } diff --git a/Assets/Scripts/GUI/MultiplayerPanelButton.cs b/Assets/Scripts/GUI/MultiplayerPanelButton.cs index 2a78479bc..66a4809f3 100644 --- a/Assets/Scripts/GUI/MultiplayerPanelButton.cs +++ b/Assets/Scripts/GUI/MultiplayerPanelButton.cs @@ -33,6 +33,14 @@ override protected void OnButtonPressed() { KeyboardPopUpWindow.m_InitialText = popup.RoomName; } + else if (m_RequiresPopup & m_Command == SketchControlsScript.GlobalCommands.EditMultiplayerNickName) + { + KeyboardPopUpWindow.m_InitialText = popup.NickName; + } + else if (m_RequiresPopup & m_Command == SketchControlsScript.GlobalCommands.EditMultiplayerRoomMaxPlayers) + { + KeyboardPopUpWindow.m_InitialText = popup.MaxPlayers.ToString(); + } base.OnButtonPressed(); } diff --git a/Assets/Scripts/SketchControlsScript.cs b/Assets/Scripts/SketchControlsScript.cs index 9dce75a02..ee59eace9 100644 --- a/Assets/Scripts/SketchControlsScript.cs +++ b/Assets/Scripts/SketchControlsScript.cs @@ -159,6 +159,7 @@ public enum GlobalCommands OpenRoomSettings = 1010, MuteUserInMultiplayer = 1011, UnmuteUserInMultiplayer = 1012, + EditMultiplayerRoomMaxPlayers = 1013, RenameSketch = 5200, OpenLayerOptionsPopup = 5201, @@ -4526,6 +4527,14 @@ public void IssueGlobalCommand(GlobalCommands rEnum, int iParam1 = -1, DismissPopupOnCurrentGazeObject(false); break; } + case GlobalCommands.EditMultiplayerRoomMaxPlayers: + { + var panel = (MultiplayerPanel)m_PanelManager.GetActivePanelByType(BasePanel.PanelType.Multiplayer); + if (int.TryParse(KeyboardPopUpWindow.m_LastInput, out var parsedMaxPlayers)) + panel.MaxPlayers = parsedMaxPlayers; + DismissPopupOnCurrentGazeObject(false); + break; + } case GlobalCommands.EditMultiplayerNickName: { var panel = (MultiplayerPanel)m_PanelManager.GetActivePanelByType(BasePanel.PanelType.Multiplayer); @@ -5104,6 +5113,7 @@ public bool IsCommandAvailable(GlobalCommands rEnum, int iParam = -1) case GlobalCommands.SketchbookMenu: case GlobalCommands.EditMultiplayerNickName: case GlobalCommands.EditMultiplayerRoomName: + case GlobalCommands.EditMultiplayerRoomMaxPlayers: return !(MultiplayerManager.m_Instance.State == ConnectionState.IN_ROOM); case GlobalCommands.WhatIsNew: return false; diff --git a/Assets/Settings/Localization/Strings/Strings Shared Data.asset b/Assets/Settings/Localization/Strings/Strings Shared Data.asset index 5bc5787fd..8c332cdd6 100644 --- a/Assets/Settings/Localization/Strings/Strings Shared Data.asset +++ b/Assets/Settings/Localization/Strings/Strings Shared Data.asset @@ -3439,6 +3439,10 @@ MonoBehaviour: m_Key: ADMIN_PANEL_MULTIPLAYER_DESCRIPTION m_Metadata: m_Items: [] + - m_Id: 326532953040941056 + m_Key: MULTIPLAYER_PANEL_MAX_ROOM_NUMBER + m_Metadata: + m_Items: [] m_Metadata: m_Items: [] m_KeyGenerator: diff --git a/Assets/Settings/Localization/Strings/Strings_de.asset b/Assets/Settings/Localization/Strings/Strings_de.asset index acda5ad1d..42b8265e7 100644 --- a/Assets/Settings/Localization/Strings/Strings_de.asset +++ b/Assets/Settings/Localization/Strings/Strings_de.asset @@ -3638,6 +3638,10 @@ MonoBehaviour: m_Localized: "Mehrspieler-Men\xFC" m_Metadata: m_Items: [] + - m_Id: 326532953040941056 + m_Localized: 'Maximale Spieler: ' + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_en.asset b/Assets/Settings/Localization/Strings/Strings_en.asset index ffe9a7d28..f1d1bf677 100644 --- a/Assets/Settings/Localization/Strings/Strings_en.asset +++ b/Assets/Settings/Localization/Strings/Strings_en.asset @@ -3608,6 +3608,10 @@ MonoBehaviour: m_Localized: 'Multiplayer Menu ' m_Metadata: m_Items: [] + - m_Id: 326532953040941056 + m_Localized: 'Max Players: ' + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_es.asset b/Assets/Settings/Localization/Strings/Strings_es.asset index 6af4360f3..e0a670ab9 100644 --- a/Assets/Settings/Localization/Strings/Strings_es.asset +++ b/Assets/Settings/Localization/Strings/Strings_es.asset @@ -3608,6 +3608,10 @@ MonoBehaviour: m_Localized: "Men\xFA Multijugador" m_Metadata: m_Items: [] + - m_Id: 326532953040941056 + m_Localized: "Jugadores M\xE1ximos: " + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_fr.asset b/Assets/Settings/Localization/Strings/Strings_fr.asset index 528dd733e..8ada5efea 100644 --- a/Assets/Settings/Localization/Strings/Strings_fr.asset +++ b/Assets/Settings/Localization/Strings/Strings_fr.asset @@ -3578,6 +3578,10 @@ MonoBehaviour: m_Localized: Menu Multijoueur m_Metadata: m_Items: [] + - m_Id: 326532953040941056 + m_Localized: 'Joueurs Max: ' + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_ja.asset b/Assets/Settings/Localization/Strings/Strings_ja.asset index 4379c4df5..483ba0e0f 100644 --- a/Assets/Settings/Localization/Strings/Strings_ja.asset +++ b/Assets/Settings/Localization/Strings/Strings_ja.asset @@ -3530,6 +3530,10 @@ MonoBehaviour: m_Localized: "\u30DE\u30EB\u30C1\u30D7\u30EC\u30A4\u30E4\u30FC\u30E1\u30CB\u30E5\u30FC" m_Metadata: m_Items: [] + - m_Id: 326532953040941056 + m_Localized: "\u6700\u5927\u30D7\u30EC\u30A4\u30E4\u30FC\u6570: " + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_ko.asset b/Assets/Settings/Localization/Strings/Strings_ko.asset index 47251b9d1..567f31059 100644 --- a/Assets/Settings/Localization/Strings/Strings_ko.asset +++ b/Assets/Settings/Localization/Strings/Strings_ko.asset @@ -3599,6 +3599,10 @@ MonoBehaviour: m_Localized: "\uBA40\uD2F0\uD50C\uB808\uC774 \uBA54\uB274" m_Metadata: m_Items: [] + - m_Id: 326532953040941056 + m_Localized: "\uCD5C\uB300 \uD50C\uB808\uC774\uC5B4 \uC218: " + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_zh.asset b/Assets/Settings/Localization/Strings/Strings_zh.asset index 578696a8c..bf40359d3 100644 --- a/Assets/Settings/Localization/Strings/Strings_zh.asset +++ b/Assets/Settings/Localization/Strings/Strings_zh.asset @@ -3526,6 +3526,10 @@ MonoBehaviour: m_Localized: "\u591A\u4EBA\u83DC\u5355" m_Metadata: m_Items: [] + - m_Id: 326532953040941056 + m_Localized: "\u6700\u5927\u73A9\u5BB6\u6570: " + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] From e8547c9e8892fd672fb4e8890d71f052d583f270 Mon Sep 17 00:00:00 2001 From: Riccardo Bovo Date: Sat, 25 Jan 2025 19:28:05 +0000 Subject: [PATCH 18/25] Show hide room settings button --- Assets/Prefabs/Panels/MultiplayerPanel.prefab | 13 +++++----- Assets/Scripts/GUI/MultiplayerPanel.cs | 25 +++++++++++++++++++ .../Strings/Strings Shared Data.asset | 12 +++++++++ .../Localization/Strings/Strings_de.asset | 12 +++++++++ .../Localization/Strings/Strings_en.asset | 12 +++++++++ .../Localization/Strings/Strings_es.asset | 12 +++++++++ .../Localization/Strings/Strings_fr.asset | 12 +++++++++ .../Localization/Strings/Strings_ja.asset | 12 +++++++++ .../Localization/Strings/Strings_ko.asset | 12 +++++++++ .../Localization/Strings/Strings_zh.asset | 12 +++++++++ ProjectSettings/ProjectSettings.asset | 23 +++++++++++++---- 11 files changed, 146 insertions(+), 11 deletions(-) diff --git a/Assets/Prefabs/Panels/MultiplayerPanel.prefab b/Assets/Prefabs/Panels/MultiplayerPanel.prefab index 109f2481f..56fe6848f 100644 --- a/Assets/Prefabs/Panels/MultiplayerPanel.prefab +++ b/Assets/Prefabs/Panels/MultiplayerPanel.prefab @@ -197,6 +197,7 @@ MonoBehaviour: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] + m_RoomSettingsButton: {fileID: 4513402330335811974} references: version: 2 RefIds: [] @@ -1703,7 +1704,7 @@ MonoBehaviour: m_TableReference: m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: - m_KeyId: 294637073212186624 + m_KeyId: 326572252843143168 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -2033,12 +2034,12 @@ GameObject: - component: {fileID: 4873125866289393846} - component: {fileID: 5322833515426493788} m_Layer: 16 - m_Name: MultiplayerRoomSettings + m_Name: RoomSettings m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &7486361010185590075 Transform: m_ObjectHideFlags: 0 @@ -2048,8 +2049,8 @@ Transform: m_GameObject: {fileID: 4513402330335811974} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.63, y: -0.44700006, z: -0.042} - m_LocalScale: {x: 0.33, y: 0.33, z: 0.33} + m_LocalPosition: {x: 0.177, y: 0.853, z: -0.042} + m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8346410928580794432} @@ -2144,7 +2145,7 @@ MonoBehaviour: m_TableReference: m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: - m_KeyId: 294637000357126144 + m_KeyId: 326570591894564864 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 diff --git a/Assets/Scripts/GUI/MultiplayerPanel.cs b/Assets/Scripts/GUI/MultiplayerPanel.cs index 49c1959ed..967da2ea9 100644 --- a/Assets/Scripts/GUI/MultiplayerPanel.cs +++ b/Assets/Scripts/GUI/MultiplayerPanel.cs @@ -40,6 +40,7 @@ public class MultiplayerPanel : BasePanel [SerializeField] private LocalizedString m_AlertsErrorBeginnerModeActive; [SerializeField] private LocalizedString m_AlertsRoomAlreadyExistent; [SerializeField] private LocalizedString m_AlertsPassThroughAcive; + [SerializeField] private GameObject m_RoomSettingsButton; private PlayerPrefsDataStore m_multiplayer; private bool updateDisplay = false; @@ -271,6 +272,7 @@ private void OnStateUpdated(ConnectionState newState) { if (!m_State) return; m_State.text = m_StatString.GetLocalizedString() + StateToString(newState); + DisplayRoomSettingsButton(newState); UpdateDisplay(); } @@ -301,6 +303,29 @@ private string StateToString(ConnectionState newState) } } + private void DisplayRoomSettingsButton(ConnectionState newState) + { + if (!m_RoomSettingsButton) return; + + switch (newState) + { + case ConnectionState.IN_ROOM: + m_RoomSettingsButton.SetActive(true); + break; + case ConnectionState.INITIALIZING: + case ConnectionState.INITIALIZED: + case ConnectionState.DISCONNECTED: + case ConnectionState.DISCONNECTING: + case ConnectionState.CONNECTING: + case ConnectionState.AUTHENTICATING: + case ConnectionState.IN_LOBBY: + case ConnectionState.ERROR: + default: + m_RoomSettingsButton.SetActive(false); + break; + } + } + private void OnRoomOwnershipUpdated(bool isRoomOwner) { if (!m_RoomOwnership) return; diff --git a/Assets/Settings/Localization/Strings/Strings Shared Data.asset b/Assets/Settings/Localization/Strings/Strings Shared Data.asset index 8c332cdd6..b146e88c5 100644 --- a/Assets/Settings/Localization/Strings/Strings Shared Data.asset +++ b/Assets/Settings/Localization/Strings/Strings Shared Data.asset @@ -3443,6 +3443,18 @@ MonoBehaviour: m_Key: MULTIPLAYER_PANEL_MAX_ROOM_NUMBER m_Metadata: m_Items: [] + - m_Id: 326549804571619328 + m_Key: MULTIPLAYER_ROOM_SETTINGS + m_Metadata: + m_Items: [] + - m_Id: 326570591894564864 + m_Key: MULTIPLAYER_IN_ROOM_PANEL_BUTTON + m_Metadata: + m_Items: [] + - m_Id: 326572252843143168 + m_Key: MULTIPLAYER_EDIT_MAX_PLAYERS + m_Metadata: + m_Items: [] m_Metadata: m_Items: [] m_KeyGenerator: diff --git a/Assets/Settings/Localization/Strings/Strings_de.asset b/Assets/Settings/Localization/Strings/Strings_de.asset index 42b8265e7..3a48d4310 100644 --- a/Assets/Settings/Localization/Strings/Strings_de.asset +++ b/Assets/Settings/Localization/Strings/Strings_de.asset @@ -3642,6 +3642,18 @@ MonoBehaviour: m_Localized: 'Maximale Spieler: ' m_Metadata: m_Items: [] + - m_Id: 326549804571619328 + m_Localized: 'Raumeinstellungen: ' + m_Metadata: + m_Items: [] + - m_Id: 326570591894564864 + m_Localized: 'Raum-Panel: ' + m_Metadata: + m_Items: [] + - m_Id: 326572252843143168 + m_Localized: 'Maximale Spieler bearbeiten: ' + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_en.asset b/Assets/Settings/Localization/Strings/Strings_en.asset index f1d1bf677..6a7d724e8 100644 --- a/Assets/Settings/Localization/Strings/Strings_en.asset +++ b/Assets/Settings/Localization/Strings/Strings_en.asset @@ -3612,6 +3612,18 @@ MonoBehaviour: m_Localized: 'Max Players: ' m_Metadata: m_Items: [] + - m_Id: 326549804571619328 + m_Localized: 'Room Settings: ' + m_Metadata: + m_Items: [] + - m_Id: 326570591894564864 + m_Localized: 'In Room Panel: ' + m_Metadata: + m_Items: [] + - m_Id: 326572252843143168 + m_Localized: 'Edit max PLayers: ' + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_es.asset b/Assets/Settings/Localization/Strings/Strings_es.asset index e0a670ab9..e21f9f598 100644 --- a/Assets/Settings/Localization/Strings/Strings_es.asset +++ b/Assets/Settings/Localization/Strings/Strings_es.asset @@ -3612,6 +3612,18 @@ MonoBehaviour: m_Localized: "Jugadores M\xE1ximos: " m_Metadata: m_Items: [] + - m_Id: 326549804571619328 + m_Localized: "Configuraci\xF3n de la Sala: " + m_Metadata: + m_Items: [] + - m_Id: 326570591894564864 + m_Localized: "Panel de Habitaci\xF3n: " + m_Metadata: + m_Items: [] + - m_Id: 326572252843143168 + m_Localized: "Editar m\xE1ximo de jugadores: " + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_fr.asset b/Assets/Settings/Localization/Strings/Strings_fr.asset index 8ada5efea..3873da75e 100644 --- a/Assets/Settings/Localization/Strings/Strings_fr.asset +++ b/Assets/Settings/Localization/Strings/Strings_fr.asset @@ -3582,6 +3582,18 @@ MonoBehaviour: m_Localized: 'Joueurs Max: ' m_Metadata: m_Items: [] + - m_Id: 326549804571619328 + m_Localized: "Param\xE8tres de la Salle: " + m_Metadata: + m_Items: [] + - m_Id: 326570591894564864 + m_Localized: 'Panneau de Salle: ' + m_Metadata: + m_Items: [] + - m_Id: 326572252843143168 + m_Localized: 'Modifier le nombre max de joueurs : ' + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_ja.asset b/Assets/Settings/Localization/Strings/Strings_ja.asset index 483ba0e0f..54a47c410 100644 --- a/Assets/Settings/Localization/Strings/Strings_ja.asset +++ b/Assets/Settings/Localization/Strings/Strings_ja.asset @@ -3534,6 +3534,18 @@ MonoBehaviour: m_Localized: "\u6700\u5927\u30D7\u30EC\u30A4\u30E4\u30FC\u6570: " m_Metadata: m_Items: [] + - m_Id: 326549804571619328 + m_Localized: "\u30EB\u30FC\u30E0\u8A2D\u5B9A: " + m_Metadata: + m_Items: [] + - m_Id: 326570591894564864 + m_Localized: "\u30EB\u30FC\u30E0\u30D1\u30CD\u30EB\uFF1A" + m_Metadata: + m_Items: [] + - m_Id: 326572252843143168 + m_Localized: "\u6700\u5927\u30D7\u30EC\u30A4\u30E4\u30FC\u6570\u3092\u7DE8\u96C6\uFF1A" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_ko.asset b/Assets/Settings/Localization/Strings/Strings_ko.asset index 567f31059..a26b15d0b 100644 --- a/Assets/Settings/Localization/Strings/Strings_ko.asset +++ b/Assets/Settings/Localization/Strings/Strings_ko.asset @@ -3603,6 +3603,18 @@ MonoBehaviour: m_Localized: "\uCD5C\uB300 \uD50C\uB808\uC774\uC5B4 \uC218: " m_Metadata: m_Items: [] + - m_Id: 326549804571619328 + m_Localized: "\uBC29 \uC124\uC815: " + m_Metadata: + m_Items: [] + - m_Id: 326570591894564864 + m_Localized: "\uBC29 \uD328\uB110: " + m_Metadata: + m_Items: [] + - m_Id: 326572252843143168 + m_Localized: "\uCD5C\uB300 \uD50C\uB808\uC774\uC5B4 \uC218 \uD3B8\uC9D1: " + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_zh.asset b/Assets/Settings/Localization/Strings/Strings_zh.asset index bf40359d3..8525fd655 100644 --- a/Assets/Settings/Localization/Strings/Strings_zh.asset +++ b/Assets/Settings/Localization/Strings/Strings_zh.asset @@ -3530,6 +3530,18 @@ MonoBehaviour: m_Localized: "\u6700\u5927\u73A9\u5BB6\u6570: " m_Metadata: m_Items: [] + - m_Id: 326549804571619328 + m_Localized: "\u623F\u95F4\u8BBE\u7F6E: " + m_Metadata: + m_Items: [] + - m_Id: 326570591894564864 + m_Localized: "\u623F\u95F4\u9762\u677F\uFF1A" + m_Metadata: + m_Items: [] + - m_Id: 326572252843143168 + m_Localized: "\u7F16\u8F91\u6700\u5927\u73A9\u5BB6\u6570\uFF1A" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index d5b5c2e53..2e1dfed83 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -17,7 +17,7 @@ PlayerSettings: defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} - m_ShowUnitySplashScreen: 0 + m_ShowUnitySplashScreen: 1 m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 1 m_SplashScreenAnimation: 0 @@ -893,10 +893,23 @@ PlayerSettings: webGLMemoryGeometricGrowthCap: 96 webGLPowerPreference: 2 scriptingDefineSymbols: - Android: TILT_BRUSH - Standalone: TILT_BRUSH;USD_SUPPORTED;FBX_SUPPORTED;FBXSDK_RUNTIME;HAVE_GLTFAST; - Windows Store Apps: TILT_BRUSH;USD_SUPPORTED - iPhone: TILT_BRUSH + Android: TILT_BRUSH;PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;CROSS_PLATFORM_INPUT;MOBILE_INPUT;PHOTON_VOICE_DEFINED;MP_PHOTON;FUSION_WEAVER;FUSION2 + EmbeddedLinux: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;PHOTON_VOICE_DEFINED + GameCoreScarlett: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;PHOTON_VOICE_DEFINED + GameCoreXboxOne: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;PHOTON_VOICE_DEFINED + LinuxHeadlessSimulation: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;PHOTON_VOICE_DEFINED + Nintendo Switch: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;PHOTON_VOICE_DEFINED + PS4: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;PHOTON_VOICE_DEFINED + PS5: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;PHOTON_VOICE_DEFINED + QNX: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;PHOTON_VOICE_DEFINED + Stadia: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;PHOTON_VOICE_DEFINED + Standalone: TILT_BRUSH;USD_SUPPORTED;FBX_SUPPORTED;FBXSDK_RUNTIME;HAVE_GLTFAST;PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;CROSS_PLATFORM_INPUT;PHOTON_VOICE_DEFINED;FUSION_WEAVER;FUSION2;MP_PHOTON + VisionOS: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;PHOTON_VOICE_DEFINED + WebGL: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;PHOTON_VOICE_DEFINED + Windows Store Apps: TILT_BRUSH;USD_SUPPORTED;PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;MOBILE_INPUT;PHOTON_VOICE_DEFINED + XboxOne: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;PHOTON_VOICE_DEFINED + iPhone: TILT_BRUSH;PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;CROSS_PLATFORM_INPUT;MOBILE_INPUT;PHOTON_VOICE_DEFINED + tvOS: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;PHOTON_VOICE_DEFINED additionalCompilerArguments: {} platformArchitecture: iPhone: 1 From 23313a7322375a0a140848ee008b450ab2ff69a3 Mon Sep 17 00:00:00 2001 From: Riccardo Bovo Date: Sun, 26 Jan 2025 11:33:56 +0000 Subject: [PATCH 19/25] Transfer Ownership RPC Method --- .../PopUps/PopUpWindow_RoomOptions.prefab | 201 +++++++++++++++++- .../GUI/MultiplayerRoomOptionsPopUpWindow.cs | 3 + Assets/Scripts/GUI/PlayerListItemPrefab.cs | 8 +- .../Multiplayer/MultiplayerInterfaces.cs | 1 + .../Scripts/Multiplayer/MultiplayerManager.cs | 12 ++ .../Multiplayer/Photon/PhotonManager.cs | 7 + .../Scripts/Multiplayer/Photon/PhotonRPC.cs | 12 ++ Assets/Scripts/SketchControlsScript.cs | 3 + .../Strings/Strings Shared Data.asset | 12 ++ .../Localization/Strings/Strings_de.asset | 12 ++ .../Localization/Strings/Strings_en.asset | 12 ++ .../Localization/Strings/Strings_es.asset | 12 ++ .../Localization/Strings/Strings_fr.asset | 12 ++ .../Localization/Strings/Strings_ja.asset | 12 ++ .../Localization/Strings/Strings_ko.asset | 13 ++ .../Localization/Strings/Strings_zh.asset | 12 ++ 16 files changed, 335 insertions(+), 9 deletions(-) diff --git a/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab b/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab index 8254d22cd..8a9773611 100644 --- a/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab +++ b/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab @@ -887,6 +887,192 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_renderer: {fileID: 2557246441992726044} m_maskType: 0 +--- !u!1 &1461296043633818204 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5902158930843246765} + - component: {fileID: 8694467600949283236} + - component: {fileID: 6176569567491431832} + - component: {fileID: 5181048296988181000} + - component: {fileID: 2588245756299914869} + m_Layer: 16 + m_Name: TransferOwnershipButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5902158930843246765 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1461296043633818204} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.018, y: 0, z: 0} + m_LocalScale: {x: 0.14999999, y: 0.14999999, z: 0.14999999} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8179569077979998440} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8694467600949283236 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1461296043633818204} + m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} +--- !u!23 &6176569567491431832 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1461296043633818204} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 40d29de2bdc11f04dbfa25059165916e, 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: 0 + 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!65 &5181048296988181000 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1461296043633818204} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1.1, y: 1.1, z: 0.1} + m_Center: {x: -0.000000074505806, y: 0.000000022351742, z: 0} +--- !u!114 &2588245756299914869 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1461296043633818204} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 650d89a0f5c4ffe449d970ac10b2e6bb, type: 3} + m_Name: + m_EditorClassIdentifier: + m_DescriptionType: 0 + m_DescriptionYOffset: 0 + m_DescriptionText: + m_LocalizedDescription: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 326807657823793152 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionActivateSpeed: 12 + m_DescriptionZScale: 1 + m_ButtonTexture: {fileID: 2800000, guid: 464883c791528804496b8c8ef7126e52, type: 3} + m_AtlasTexture: 1 + m_ToggleButton: 1 + m_LongPressReleaseButton: 0 + m_ButtonHasPressedAudio: 1 + m_ZAdjustHover: -0.02 + m_ZAdjustClick: 0.05 + m_HoverScale: 1.1 + m_HoverBoxColliderGrow: 0.2 + m_AddOverlay: 0 + m_Command: 1014 + m_CommandParam: -1 + m_CommandParam2: -1 + m_RequiresPopup: 0 + m_CenterPopupOnButton: 0 + m_PopupOffset: {x: 0, y: 0, z: 0} + m_PopupText: + m_LocalizedPopup: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnDescription: + m_LocalizedToggleOnDescription: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnTexture: {fileID: 2800000, guid: e5a95db3eceb2ac48bd574c538be1470, type: 3} + m_AllowUnavailable: 0 + m_LinkedUIObject: {fileID: 0} + m_CommandIgnored: 0 + playerId: 0 + references: + version: 2 + RefIds: [] --- !u!1 &1660661214499456472 GameObject: m_ObjectHideFlags: 0 @@ -1027,7 +1213,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &8179569077979998440 Transform: m_ObjectHideFlags: 0 @@ -1044,6 +1230,7 @@ Transform: - {fileID: 3240525278412876640} - {fileID: 5114263697058651145} - {fileID: 2962397487389710043} + - {fileID: 5902158930843246765} m_Father: {fileID: 461372} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8958483938599195323 @@ -1061,6 +1248,7 @@ MonoBehaviour: PlayerIdObject: {fileID: 4873271370203748162} NickNameObject: {fileID: 1798382661626105731} MuteButton: {fileID: 2918817422897490678} + TransferOwnershipButton: {fileID: 2588245756299914869} remotePlayer: PlayerId: 0 PlayerGameObject: {fileID: 0} @@ -1285,9 +1473,9 @@ MonoBehaviour: m_DescriptionTextExtra: m_LocalizedDescriptionExtra: m_TableReference: - m_TableCollectionName: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: - m_KeyId: 0 + m_KeyId: 326808393542463488 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -1304,7 +1492,7 @@ MonoBehaviour: m_HoverScale: 1.1 m_HoverBoxColliderGrow: 0.2 m_AddOverlay: 0 - m_Command: 0 + m_Command: 1011 m_CommandParam: -1 m_CommandParam2: -1 m_RequiresPopup: 0 @@ -1323,9 +1511,9 @@ MonoBehaviour: m_ToggleOnDescription: m_LocalizedToggleOnDescription: m_TableReference: - m_TableCollectionName: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: - m_KeyId: 0 + m_KeyId: 326808972507410432 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -1334,6 +1522,7 @@ MonoBehaviour: m_AllowUnavailable: 0 m_LinkedUIObject: {fileID: 0} m_CommandIgnored: 0 + playerId: 0 references: version: 2 RefIds: [] diff --git a/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs b/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs index 489c5c51d..e1d368126 100644 --- a/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs +++ b/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs @@ -157,6 +157,9 @@ public void OnMultiplayerRoomOptionsPopUpWindowButtonPressed(MultiplayerRoomOpti case SketchControlsScript.GlobalCommands.UnmuteUserInMultiplayer: MultiplayerAudioSourcesManager.m_Instance.UnmuteAudioSourcesForPlayer(button.playerId); break; + case SketchControlsScript.GlobalCommands.MultiplayerTransferRoomOwnership: + MultiplayerManager.m_Instance.RoomOwnershipTransferedToUser(button.playerId); + break; } } diff --git a/Assets/Scripts/GUI/PlayerListItemPrefab.cs b/Assets/Scripts/GUI/PlayerListItemPrefab.cs index caf2e58bf..c9ae10fd4 100644 --- a/Assets/Scripts/GUI/PlayerListItemPrefab.cs +++ b/Assets/Scripts/GUI/PlayerListItemPrefab.cs @@ -23,7 +23,8 @@ public class PlayerListItemPrefab : MonoBehaviour public TextMeshPro PlayerIdObject; public TextMeshPro NickNameObject; public MultiplayerRoomOptionsPanelButton MuteButton; - public RemotePlayer remotePlayer; + public MultiplayerRoomOptionsPanelButton TransferOwnershipButton; + [HideInInspector] public RemotePlayer remotePlayer; public void SetRemotePlayer(RemotePlayer Player) { @@ -35,8 +36,9 @@ public void SetRemotePlayer(RemotePlayer Player) public void SetNickname() { NickNameObject.text = remotePlayer.Nickname; } public void SetPlayerId() { - PlayerIdObject.text = remotePlayer.PlayerId.ToString(); - MuteButton.playerId = remotePlayer.PlayerId; + if (PlayerIdObject) PlayerIdObject.text = remotePlayer.PlayerId.ToString(); + if (TransferOwnershipButton) TransferOwnershipButton.playerId = remotePlayer.PlayerId; + if (MuteButton) MuteButton.playerId = remotePlayer.PlayerId; } } } diff --git a/Assets/Scripts/Multiplayer/MultiplayerInterfaces.cs b/Assets/Scripts/Multiplayer/MultiplayerInterfaces.cs index 055a5e547..76d9114b4 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerInterfaces.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerInterfaces.cs @@ -46,6 +46,7 @@ public interface IDataConnectionHandler : IConnectionHandler Task UndoCommand(BaseCommand command); Task RedoCommand(BaseCommand command); Task RpcSyncToSharedAnchor(string uuid); + Task RpcTransferRoomOnwership(int playerId); event Action Disconnected; diff --git a/Assets/Scripts/Multiplayer/MultiplayerManager.cs b/Assets/Scripts/Multiplayer/MultiplayerManager.cs index c76d9d012..d341b595b 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerManager.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerManager.cs @@ -306,6 +306,18 @@ public bool DoesRoomNameExist(string roomName) return true; } + public void RoomOwnershipReceived() + { + isUserRoomOwner = true; + } + + public void RoomOwnershipTransferedToUser(int playerId) + { + if (!isUserRoomOwner) return; + m_Manager.RpcTransferRoomOnwership(playerId); + isUserRoomOwner = false; + } + void OnRoomDataRefreshed(List rooms) { m_RoomData = rooms; diff --git a/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs b/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs index b98016b86..6d3fc03ce 100644 --- a/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs +++ b/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs @@ -359,6 +359,13 @@ public async Task RpcSyncToSharedAnchor(string uuid) return true; } + public async Task RpcTransferRoomOnwership(int playerId) + { + PlayerRef targetPlayer = PlayerRef.FromEncoded(playerId); + PhotonRPCBatcher.EnqueueRPC(() => + { PhotonRPC.RPC_TransferRoomOwnership(m_Runner, targetPlayer); }); + return true; + } public void SendLargeDataToPlayer(int playerId, byte[] largeData, int percentage) { sequenceNumber++; diff --git a/Assets/Scripts/Multiplayer/Photon/PhotonRPC.cs b/Assets/Scripts/Multiplayer/Photon/PhotonRPC.cs index 84d1f1e83..34b977c3a 100644 --- a/Assets/Scripts/Multiplayer/Photon/PhotonRPC.cs +++ b/Assets/Scripts/Multiplayer/Photon/PhotonRPC.cs @@ -402,6 +402,12 @@ public static async Task WaitForAcknowledgment(Guid commandGuid, int timeo } } + private static void TransferRoomOwnership() + { + if (!MultiplayerManager.m_Instance) return; + MultiplayerManager.m_Instance.RoomOwnershipReceived(); + } + #region RPCS [Rpc(InvokeLocal = false)] public static void RPC_SyncToSharedAnchor(NetworkRunner runner, string uuid) @@ -563,6 +569,12 @@ public static void RPC_Confirm(NetworkRunner runner, Guid commandGuid, bool isCo } } + [Rpc(InvokeLocal = false)] + public static void RPC_TransferRoomOwnership(NetworkRunner runner, [RpcTarget] PlayerRef targetPlayer) + { + TransferRoomOwnership(); + } + #endregion } } diff --git a/Assets/Scripts/SketchControlsScript.cs b/Assets/Scripts/SketchControlsScript.cs index ee59eace9..8f1cb4a04 100644 --- a/Assets/Scripts/SketchControlsScript.cs +++ b/Assets/Scripts/SketchControlsScript.cs @@ -160,6 +160,7 @@ public enum GlobalCommands MuteUserInMultiplayer = 1011, UnmuteUserInMultiplayer = 1012, EditMultiplayerRoomMaxPlayers = 1013, + MultiplayerTransferRoomOwnership = 1014, RenameSketch = 5200, OpenLayerOptionsPopup = 5201, @@ -5115,6 +5116,8 @@ public bool IsCommandAvailable(GlobalCommands rEnum, int iParam = -1) case GlobalCommands.EditMultiplayerRoomName: case GlobalCommands.EditMultiplayerRoomMaxPlayers: return !(MultiplayerManager.m_Instance.State == ConnectionState.IN_ROOM); + case GlobalCommands.MultiplayerTransferRoomOwnership: + return (MultiplayerManager.m_Instance.State == ConnectionState.IN_ROOM && MultiplayerManager.m_Instance.IsUserRoomOwner()); case GlobalCommands.WhatIsNew: return false; } diff --git a/Assets/Settings/Localization/Strings/Strings Shared Data.asset b/Assets/Settings/Localization/Strings/Strings Shared Data.asset index b146e88c5..dd0f90918 100644 --- a/Assets/Settings/Localization/Strings/Strings Shared Data.asset +++ b/Assets/Settings/Localization/Strings/Strings Shared Data.asset @@ -3455,6 +3455,18 @@ MonoBehaviour: m_Key: MULTIPLAYER_EDIT_MAX_PLAYERS m_Metadata: m_Items: [] + - m_Id: 326807657823793152 + m_Key: MULTIPLAYER_ROOM_OWNERSHIP_TRANSFER_BUTTON + m_Metadata: + m_Items: [] + - m_Id: 326808393542463488 + m_Key: MULTIPLAYER_MUTE_UNMUTE_PLAYERBUTTON + m_Metadata: + m_Items: [] + - m_Id: 326808972507410432 + m_Key: MULTIPLAYER_UNMUTE_PLAYER_BUTTON + m_Metadata: + m_Items: [] m_Metadata: m_Items: [] m_KeyGenerator: diff --git a/Assets/Settings/Localization/Strings/Strings_de.asset b/Assets/Settings/Localization/Strings/Strings_de.asset index 3a48d4310..6cec7d586 100644 --- a/Assets/Settings/Localization/Strings/Strings_de.asset +++ b/Assets/Settings/Localization/Strings/Strings_de.asset @@ -3654,6 +3654,18 @@ MonoBehaviour: m_Localized: 'Maximale Spieler bearbeiten: ' m_Metadata: m_Items: [] + - m_Id: 326807657823793152 + m_Localized: "\xDCbertrage die Raumverwaltung an diesen Spieler" + m_Metadata: + m_Items: [] + - m_Id: 326808393542463488 + m_Localized: Spieler stummschalten + m_Metadata: + m_Items: [] + - m_Id: 326808972507410432 + m_Localized: Spieler stumm schalten aufheben + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_en.asset b/Assets/Settings/Localization/Strings/Strings_en.asset index 6a7d724e8..fbd22b6ea 100644 --- a/Assets/Settings/Localization/Strings/Strings_en.asset +++ b/Assets/Settings/Localization/Strings/Strings_en.asset @@ -3624,6 +3624,18 @@ MonoBehaviour: m_Localized: 'Edit max PLayers: ' m_Metadata: m_Items: [] + - m_Id: 326807657823793152 + m_Localized: Transfer room ownership to this player + m_Metadata: + m_Items: [] + - m_Id: 326808393542463488 + m_Localized: Mute Player + m_Metadata: + m_Items: [] + - m_Id: 326808972507410432 + m_Localized: Unmute Player + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_es.asset b/Assets/Settings/Localization/Strings/Strings_es.asset index e21f9f598..d71ddd929 100644 --- a/Assets/Settings/Localization/Strings/Strings_es.asset +++ b/Assets/Settings/Localization/Strings/Strings_es.asset @@ -3624,6 +3624,18 @@ MonoBehaviour: m_Localized: "Editar m\xE1ximo de jugadores: " m_Metadata: m_Items: [] + - m_Id: 326807657823793152 + m_Localized: ' Transferir la propiedad de la sala a este jugador' + m_Metadata: + m_Items: [] + - m_Id: 326808393542463488 + m_Localized: Silenciar jugador + m_Metadata: + m_Items: [] + - m_Id: 326808972507410432 + m_Localized: Activar el sonido del jugador + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_fr.asset b/Assets/Settings/Localization/Strings/Strings_fr.asset index 3873da75e..4bc00c8c2 100644 --- a/Assets/Settings/Localization/Strings/Strings_fr.asset +++ b/Assets/Settings/Localization/Strings/Strings_fr.asset @@ -3594,6 +3594,18 @@ MonoBehaviour: m_Localized: 'Modifier le nombre max de joueurs : ' m_Metadata: m_Items: [] + - m_Id: 326807657823793152 + m_Localized: "Transf\xE9rer la propri\xE9t\xE9 de la salle \xE0 ce joueur" + m_Metadata: + m_Items: [] + - m_Id: 326808393542463488 + m_Localized: Mettre le joueur en sourdine + m_Metadata: + m_Items: [] + - m_Id: 326808972507410432 + m_Localized: "R\xE9activer le son du joueur" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_ja.asset b/Assets/Settings/Localization/Strings/Strings_ja.asset index 54a47c410..1a03e1a66 100644 --- a/Assets/Settings/Localization/Strings/Strings_ja.asset +++ b/Assets/Settings/Localization/Strings/Strings_ja.asset @@ -3546,6 +3546,18 @@ MonoBehaviour: m_Localized: "\u6700\u5927\u30D7\u30EC\u30A4\u30E4\u30FC\u6570\u3092\u7DE8\u96C6\uFF1A" m_Metadata: m_Items: [] + - m_Id: 326807657823793152 + m_Localized: "\u3053\u306E\u30D7\u30EC\u30A4\u30E4\u30FC\u306B\u30EB\u30FC\u30E0\u6240\u6709\u6A29\u3092\u8B72\u6E21\u3059\u308B" + m_Metadata: + m_Items: [] + - m_Id: 326808393542463488 + m_Localized: "\u30D7\u30EC\u30A4\u30E4\u30FC\u3092\u30DF\u30E5\u30FC\u30C8\u3059\u308B" + m_Metadata: + m_Items: [] + - m_Id: 326808972507410432 + m_Localized: "\u30D7\u30EC\u30A4\u30E4\u30FC\u306E\u30DF\u30E5\u30FC\u30C8\u3092\u89E3\u9664\u3059\u308B" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_ko.asset b/Assets/Settings/Localization/Strings/Strings_ko.asset index a26b15d0b..331cb3fb9 100644 --- a/Assets/Settings/Localization/Strings/Strings_ko.asset +++ b/Assets/Settings/Localization/Strings/Strings_ko.asset @@ -3615,6 +3615,19 @@ MonoBehaviour: m_Localized: "\uCD5C\uB300 \uD50C\uB808\uC774\uC5B4 \uC218 \uD3B8\uC9D1: " m_Metadata: m_Items: [] + - m_Id: 326807657823793152 + m_Localized: "\uC774 \uD50C\uB808\uC774\uC5B4\uC5D0\uAC8C \uBC29 \uC18C\uC720\uAD8C\uC744 + \uC591\uB3C4\uD569\uB2C8\uB2E4" + m_Metadata: + m_Items: [] + - m_Id: 326808393542463488 + m_Localized: "\uD50C\uB808\uC774\uC5B4 \uC74C\uC18C\uAC70" + m_Metadata: + m_Items: [] + - m_Id: 326808972507410432 + m_Localized: "\uD50C\uB808\uC774\uC5B4 \uC74C\uC18C\uAC70 \uD574\uC81C" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_zh.asset b/Assets/Settings/Localization/Strings/Strings_zh.asset index 8525fd655..0e37c7a3e 100644 --- a/Assets/Settings/Localization/Strings/Strings_zh.asset +++ b/Assets/Settings/Localization/Strings/Strings_zh.asset @@ -3542,6 +3542,18 @@ MonoBehaviour: m_Localized: "\u7F16\u8F91\u6700\u5927\u73A9\u5BB6\u6570\uFF1A" m_Metadata: m_Items: [] + - m_Id: 326807657823793152 + m_Localized: " \u5C06\u623F\u95F4\u6240\u6709\u6743\u8F6C\u79FB\u7ED9\u8BE5\u73A9\u5BB6" + m_Metadata: + m_Items: [] + - m_Id: 326808393542463488 + m_Localized: "\u9759\u97F3\u73A9\u5BB6" + m_Metadata: + m_Items: [] + - m_Id: 326808972507410432 + m_Localized: "\u53D6\u6D88\u9759\u97F3\u73A9\u5BB6" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] From 9aa31424ca2026f11ae53237b329a9f31dfdf59b Mon Sep 17 00:00:00 2001 From: Riccardo Bovo Date: Sun, 26 Jan 2025 11:45:40 +0000 Subject: [PATCH 20/25] Mute/Unmute -> Toggle --- .../GUI/MultiplayerRoomOptionsPanelButton.cs | 2 +- .../GUI/MultiplayerRoomOptionsPopUpWindow.cs | 7 ++--- .../MultiplayerAudioSourcesManager.cs | 8 ++++++ Assets/Scripts/SketchControlsScript.cs | 28 +++++++++---------- 4 files changed, 25 insertions(+), 20 deletions(-) diff --git a/Assets/Scripts/GUI/MultiplayerRoomOptionsPanelButton.cs b/Assets/Scripts/GUI/MultiplayerRoomOptionsPanelButton.cs index 695131167..694305040 100644 --- a/Assets/Scripts/GUI/MultiplayerRoomOptionsPanelButton.cs +++ b/Assets/Scripts/GUI/MultiplayerRoomOptionsPanelButton.cs @@ -30,7 +30,7 @@ override protected void OnButtonPressed() // notify the popup that we were pressed. Which happens below. if (!m_CommandIgnored) { - if (m_RequiresPopup & m_Command == SketchControlsScript.GlobalCommands.MuteUserInMultiplayer) + if (m_RequiresPopup & m_Command == SketchControlsScript.GlobalCommands.ToggleUserVoiceInMultiplayer) { } diff --git a/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs b/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs index e1d368126..d8384ae29 100644 --- a/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs +++ b/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs @@ -151,11 +151,8 @@ public void OnMultiplayerRoomOptionsPopUpWindowButtonPressed(MultiplayerRoomOpti { case SketchControlsScript.GlobalCommands.Null: break; - case SketchControlsScript.GlobalCommands.MuteUserInMultiplayer: - MultiplayerAudioSourcesManager.m_Instance.MuteAudioSourcesForPlayer(button.playerId); - break; - case SketchControlsScript.GlobalCommands.UnmuteUserInMultiplayer: - MultiplayerAudioSourcesManager.m_Instance.UnmuteAudioSourcesForPlayer(button.playerId); + case SketchControlsScript.GlobalCommands.ToggleUserVoiceInMultiplayer: + MultiplayerAudioSourcesManager.m_Instance.ToggleAudioMuteForPlayer(button.playerId); break; case SketchControlsScript.GlobalCommands.MultiplayerTransferRoomOwnership: MultiplayerManager.m_Instance.RoomOwnershipTransferedToUser(button.playerId); diff --git a/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs b/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs index 57abeb8f6..93fc3220d 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs @@ -98,5 +98,13 @@ public void AudioSourcesMuteStateForPlayer(int playerId, bool state) if (source == null) return; source.mute = state; } + + public void ToggleAudioMuteForPlayer(int playerId) + { + if (sources.TryGetValue(playerId, out AudioSource source)) + { + source.mute = !source.mute; + } + } } } diff --git a/Assets/Scripts/SketchControlsScript.cs b/Assets/Scripts/SketchControlsScript.cs index 8f1cb4a04..f0d0bec5f 100644 --- a/Assets/Scripts/SketchControlsScript.cs +++ b/Assets/Scripts/SketchControlsScript.cs @@ -157,10 +157,9 @@ public enum GlobalCommands MultiplayerDisconnect = 1008, EditMultiplayerNickName = 1009, OpenRoomSettings = 1010, - MuteUserInMultiplayer = 1011, - UnmuteUserInMultiplayer = 1012, - EditMultiplayerRoomMaxPlayers = 1013, - MultiplayerTransferRoomOwnership = 1014, + ToggleUserVoiceInMultiplayer = 1011, + EditMultiplayerRoomMaxPlayers = 1012, + MultiplayerTransferRoomOwnership = 1013, RenameSketch = 5200, OpenLayerOptionsPopup = 5201, @@ -4876,16 +4875,17 @@ public void IssueGlobalCommand(GlobalCommands rEnum, int iParam1 = -1, PointerManager.m_Instance.EatLineEnabledInput(); SketchSurfacePanel.m_Instance.EatToolsInput(); break; - case GlobalCommands.RepaintOptions: break; // Intentionally blank. - case GlobalCommands.Null: break; // Intentionally blank. - case GlobalCommands.MultiplayerPanelOptions: break; // Intentionally blank. - case GlobalCommands.MultiplayerJoinRoom: break; // Intentionally blank. - case GlobalCommands.MultiplayerLeaveRoom: break; // Intentionally blank. - case GlobalCommands.MultiplayerConnect: break; // Intentionally blank. - case GlobalCommands.MultiplayerDisconnect: break; // Intentionally blank. - case GlobalCommands.MuteUserInMultiplayer: break; // Intentionally blank. - case GlobalCommands.UnmuteUserInMultiplayer: break; // Intentionally blank. - case GlobalCommands.WhatIsNew: break;// Intentionally blank. + case GlobalCommands.RepaintOptions: + case GlobalCommands.Null: + case GlobalCommands.MultiplayerPanelOptions: + case GlobalCommands.MultiplayerJoinRoom: + case GlobalCommands.MultiplayerLeaveRoom: + case GlobalCommands.MultiplayerConnect: + case GlobalCommands.MultiplayerDisconnect: + case GlobalCommands.ToggleUserVoiceInMultiplayer: + case GlobalCommands.MultiplayerTransferRoomOwnership: + case GlobalCommands.WhatIsNew: + break;// Intentionally blank. default: Debug.LogError($"Unrecognized command {rEnum}"); break; From 8ac62dfea1ffee45f1ccdd8800b1d2af2223a5fe Mon Sep 17 00:00:00 2001 From: Riccardo Bovo Date: Sun, 26 Jan 2025 13:22:40 +0000 Subject: [PATCH 21/25] Toggle View mode only --- .../PopUps/PopUpWindow_RoomOptions.prefab | 198 +++++++++++++++++- .../GUI/MultiplayerRoomOptionsPopUpWindow.cs | 5 +- Assets/Scripts/GUI/PlayerListItemPrefab.cs | 2 + .../MultiplayerAudioSourcesManager.cs | 4 +- .../Multiplayer/MultiplayerInterfaces.cs | 2 +- .../Scripts/Multiplayer/MultiplayerManager.cs | 6 + .../Multiplayer/Photon/PhotonManager.cs | 10 + .../Scripts/Multiplayer/Photon/PhotonRPC.cs | 12 ++ Assets/Scripts/SketchControlsScript.cs | 4 + .../Strings/Strings Shared Data.asset | 8 + .../Localization/Strings/Strings_de.asset | 8 + .../Localization/Strings/Strings_en.asset | 8 + .../Localization/Strings/Strings_es.asset | 8 + .../Localization/Strings/Strings_fr.asset | 8 + .../Localization/Strings/Strings_ja.asset | 8 + .../Localization/Strings/Strings_ko.asset | 8 + .../Localization/Strings/Strings_zh.asset | 8 + 17 files changed, 298 insertions(+), 9 deletions(-) diff --git a/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab b/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab index 8a9773611..cfca0c694 100644 --- a/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab +++ b/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab @@ -102,7 +102,7 @@ MonoBehaviour: m_PrevButton: {fileID: 0} m_NextButton: {fileID: 0} m_playerGuiPrefab: {fileID: 2414029554072440725} - PlayerGuiPrefabSize: {x: 0.7, y: 0.15} + PlayerGuiPrefabSize: {x: 0.6, y: 0.175} PlayerListOffset: {x: 0, y: -0.85} PlayerListArea: {x: 1.6, y: 0.8} --- !u!1 &1000011506748792 @@ -1031,7 +1031,7 @@ MonoBehaviour: m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 2800000, guid: 464883c791528804496b8c8ef7126e52, type: 3} m_AtlasTexture: 1 - m_ToggleButton: 1 + m_ToggleButton: 0 m_LongPressReleaseButton: 0 m_ButtonHasPressedAudio: 1 m_ZAdjustHover: -0.02 @@ -1039,7 +1039,7 @@ MonoBehaviour: m_HoverScale: 1.1 m_HoverBoxColliderGrow: 0.2 m_AddOverlay: 0 - m_Command: 1014 + m_Command: 1013 m_CommandParam: -1 m_CommandParam2: -1 m_RequiresPopup: 0 @@ -1066,7 +1066,7 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_ToggleOnTexture: {fileID: 2800000, guid: e5a95db3eceb2ac48bd574c538be1470, type: 3} - m_AllowUnavailable: 0 + m_AllowUnavailable: 1 m_LinkedUIObject: {fileID: 0} m_CommandIgnored: 0 playerId: 0 @@ -1224,13 +1224,14 @@ Transform: serializedVersion: 2 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_LocalScale: {x: 0.8, y: 0.8, z: 0.8} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3240525278412876640} - {fileID: 5114263697058651145} - {fileID: 2962397487389710043} - {fileID: 5902158930843246765} + - {fileID: 8756030045986842438} m_Father: {fileID: 461372} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8958483938599195323 @@ -1249,10 +1250,197 @@ MonoBehaviour: NickNameObject: {fileID: 1798382661626105731} MuteButton: {fileID: 2918817422897490678} TransferOwnershipButton: {fileID: 2588245756299914869} + ToggleViewOnly: {fileID: 8042277596490285762} remotePlayer: PlayerId: 0 PlayerGameObject: {fileID: 0} VoiceGameObject: {fileID: 0} +--- !u!1 &3989332755205052522 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8756030045986842438} + - component: {fileID: 2672147561250290764} + - component: {fileID: 8903591752317418214} + - component: {fileID: 820006243264167913} + - component: {fileID: 8042277596490285762} + m_Layer: 16 + m_Name: ToggleUserDrawingAbility + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8756030045986842438 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3989332755205052522} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.245, y: 0, z: 0} + m_LocalScale: {x: 0.14999999, y: 0.14999999, z: 0.14999999} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8179569077979998440} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2672147561250290764 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3989332755205052522} + m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} +--- !u!23 &8903591752317418214 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3989332755205052522} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 40d29de2bdc11f04dbfa25059165916e, 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: 0 + 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!65 &820006243264167913 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3989332755205052522} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1.1, y: 1.1, z: 0.1} + m_Center: {x: -0.000000074505806, y: 0.000000022351742, z: 0} +--- !u!114 &8042277596490285762 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3989332755205052522} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 650d89a0f5c4ffe449d970ac10b2e6bb, type: 3} + m_Name: + m_EditorClassIdentifier: + m_DescriptionType: 0 + m_DescriptionYOffset: 0 + m_DescriptionText: + m_LocalizedDescription: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 326832067431559168 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionActivateSpeed: 12 + m_DescriptionZScale: 1 + m_ButtonTexture: {fileID: 2800000, guid: 464883c791528804496b8c8ef7126e52, type: 3} + m_AtlasTexture: 1 + m_ToggleButton: 1 + m_LongPressReleaseButton: 0 + m_ButtonHasPressedAudio: 1 + m_ZAdjustHover: -0.02 + m_ZAdjustClick: 0.05 + m_HoverScale: 1.1 + m_HoverBoxColliderGrow: 0.2 + m_AddOverlay: 0 + m_Command: 1014 + m_CommandParam: -1 + m_CommandParam2: -1 + m_RequiresPopup: 0 + m_CenterPopupOnButton: 0 + m_PopupOffset: {x: 0, y: 0, z: 0} + m_PopupText: + m_LocalizedPopup: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnDescription: + m_LocalizedToggleOnDescription: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 326833306865168384 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnTexture: {fileID: 2800000, guid: 97a84a57c58583a48a834c393578618d, type: 3} + m_AllowUnavailable: 1 + m_LinkedUIObject: {fileID: 0} + m_CommandIgnored: 0 + playerId: 0 + references: + version: 2 + RefIds: [] --- !u!1 &4723078638993166571 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs b/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs index d8384ae29..bc8d1f1a2 100644 --- a/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs +++ b/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs @@ -152,11 +152,14 @@ public void OnMultiplayerRoomOptionsPopUpWindowButtonPressed(MultiplayerRoomOpti case SketchControlsScript.GlobalCommands.Null: break; case SketchControlsScript.GlobalCommands.ToggleUserVoiceInMultiplayer: - MultiplayerAudioSourcesManager.m_Instance.ToggleAudioMuteForPlayer(button.playerId); + MultiplayerAudioSourcesManager.m_Instance.ToggleAudioMuteForPlayer(button.IsButtonActive(), button.playerId); break; case SketchControlsScript.GlobalCommands.MultiplayerTransferRoomOwnership: MultiplayerManager.m_Instance.RoomOwnershipTransferedToUser(button.playerId); break; + case SketchControlsScript.GlobalCommands.MultiplayerToggleUserStrokeGeneration: + MultiplayerManager.m_Instance.ToggleUserViewOnlyMode(button.IsButtonActive(), button.playerId); + break; } } diff --git a/Assets/Scripts/GUI/PlayerListItemPrefab.cs b/Assets/Scripts/GUI/PlayerListItemPrefab.cs index c9ae10fd4..161ebf643 100644 --- a/Assets/Scripts/GUI/PlayerListItemPrefab.cs +++ b/Assets/Scripts/GUI/PlayerListItemPrefab.cs @@ -24,6 +24,7 @@ public class PlayerListItemPrefab : MonoBehaviour public TextMeshPro NickNameObject; public MultiplayerRoomOptionsPanelButton MuteButton; public MultiplayerRoomOptionsPanelButton TransferOwnershipButton; + public MultiplayerRoomOptionsPanelButton ToggleViewOnly; [HideInInspector] public RemotePlayer remotePlayer; public void SetRemotePlayer(RemotePlayer Player) @@ -39,6 +40,7 @@ public void SetPlayerId() if (PlayerIdObject) PlayerIdObject.text = remotePlayer.PlayerId.ToString(); if (TransferOwnershipButton) TransferOwnershipButton.playerId = remotePlayer.PlayerId; if (MuteButton) MuteButton.playerId = remotePlayer.PlayerId; + if (ToggleViewOnly) ToggleViewOnly.playerId = remotePlayer.PlayerId; } } } diff --git a/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs b/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs index 93fc3220d..5904974db 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs @@ -99,11 +99,11 @@ public void AudioSourcesMuteStateForPlayer(int playerId, bool state) source.mute = state; } - public void ToggleAudioMuteForPlayer(int playerId) + public void ToggleAudioMuteForPlayer(bool value, int playerId) { if (sources.TryGetValue(playerId, out AudioSource source)) { - source.mute = !source.mute; + source.mute = value; } } } diff --git a/Assets/Scripts/Multiplayer/MultiplayerInterfaces.cs b/Assets/Scripts/Multiplayer/MultiplayerInterfaces.cs index 76d9114b4..82bb9f554 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerInterfaces.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerInterfaces.cs @@ -47,9 +47,9 @@ public interface IDataConnectionHandler : IConnectionHandler Task RedoCommand(BaseCommand command); Task RpcSyncToSharedAnchor(string uuid); Task RpcTransferRoomOnwership(int playerId); + Task RpcToggleUserViewOnlyMode(bool value, int playerId); event Action Disconnected; - } public interface IVoiceConnectionHandler : IConnectionHandler diff --git a/Assets/Scripts/Multiplayer/MultiplayerManager.cs b/Assets/Scripts/Multiplayer/MultiplayerManager.cs index d341b595b..a9dd1b648 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerManager.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerManager.cs @@ -318,6 +318,12 @@ public void RoomOwnershipTransferedToUser(int playerId) isUserRoomOwner = false; } + public void ToggleUserViewOnlyMode(bool value, int playerId) + { + if (!isUserRoomOwner) return; + m_Manager.RpcToggleUserViewOnlyMode(value, playerId); + } + void OnRoomDataRefreshed(List rooms) { m_RoomData = rooms; diff --git a/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs b/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs index 6d3fc03ce..e7e6cd57e 100644 --- a/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs +++ b/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs @@ -366,6 +366,15 @@ public async Task RpcTransferRoomOnwership(int playerId) { PhotonRPC.RPC_TransferRoomOwnership(m_Runner, targetPlayer); }); return true; } + + public async Task RpcToggleUserViewOnlyMode(bool value,int playerId) + { + PlayerRef targetPlayer = PlayerRef.FromEncoded(playerId); + PhotonRPCBatcher.EnqueueRPC(() => + { PhotonRPC.RPC_ToggleUserViewOnlyMode(m_Runner,value, targetPlayer); }); + return true; + } + public void SendLargeDataToPlayer(int playerId, byte[] largeData, int percentage) { sequenceNumber++; @@ -607,6 +616,7 @@ public void OnObjectExitAOI(NetworkRunner runner, NetworkObject obj, PlayerRef p public void OnObjectEnterAOI(NetworkRunner runner, NetworkObject obj, PlayerRef player) { } public void OnDisconnectedFromServer(NetworkRunner runner, NetDisconnectReason reason) { } + #endregion } } diff --git a/Assets/Scripts/Multiplayer/Photon/PhotonRPC.cs b/Assets/Scripts/Multiplayer/Photon/PhotonRPC.cs index 34b977c3a..2265c0519 100644 --- a/Assets/Scripts/Multiplayer/Photon/PhotonRPC.cs +++ b/Assets/Scripts/Multiplayer/Photon/PhotonRPC.cs @@ -408,6 +408,12 @@ private static void TransferRoomOwnership() MultiplayerManager.m_Instance.RoomOwnershipReceived(); } + private static void ToggleDrawing(bool isEnabled) + { + PointerManager.m_Instance.EnableLine(isEnabled); + PointerManager.m_Instance.EnablePointerStrokeGeneration(isEnabled); + } + #region RPCS [Rpc(InvokeLocal = false)] public static void RPC_SyncToSharedAnchor(NetworkRunner runner, string uuid) @@ -575,6 +581,12 @@ public static void RPC_TransferRoomOwnership(NetworkRunner runner, [RpcTarget] P TransferRoomOwnership(); } + [Rpc(InvokeLocal = false)] + public static void RPC_ToggleUserViewOnlyMode(NetworkRunner runner, bool value, [RpcTarget] PlayerRef targetPlayer) + { + ToggleDrawing(value); + } + #endregion } } diff --git a/Assets/Scripts/SketchControlsScript.cs b/Assets/Scripts/SketchControlsScript.cs index f0d0bec5f..678e38a89 100644 --- a/Assets/Scripts/SketchControlsScript.cs +++ b/Assets/Scripts/SketchControlsScript.cs @@ -160,6 +160,8 @@ public enum GlobalCommands ToggleUserVoiceInMultiplayer = 1011, EditMultiplayerRoomMaxPlayers = 1012, MultiplayerTransferRoomOwnership = 1013, + MultiplayerToggleUserStrokeGeneration = 1014, + RenameSketch = 5200, OpenLayerOptionsPopup = 5201, @@ -4884,6 +4886,7 @@ public void IssueGlobalCommand(GlobalCommands rEnum, int iParam1 = -1, case GlobalCommands.MultiplayerDisconnect: case GlobalCommands.ToggleUserVoiceInMultiplayer: case GlobalCommands.MultiplayerTransferRoomOwnership: + case GlobalCommands.MultiplayerToggleUserStrokeGeneration: case GlobalCommands.WhatIsNew: break;// Intentionally blank. default: @@ -5117,6 +5120,7 @@ public bool IsCommandAvailable(GlobalCommands rEnum, int iParam = -1) case GlobalCommands.EditMultiplayerRoomMaxPlayers: return !(MultiplayerManager.m_Instance.State == ConnectionState.IN_ROOM); case GlobalCommands.MultiplayerTransferRoomOwnership: + case GlobalCommands.MultiplayerToggleUserStrokeGeneration: return (MultiplayerManager.m_Instance.State == ConnectionState.IN_ROOM && MultiplayerManager.m_Instance.IsUserRoomOwner()); case GlobalCommands.WhatIsNew: return false; diff --git a/Assets/Settings/Localization/Strings/Strings Shared Data.asset b/Assets/Settings/Localization/Strings/Strings Shared Data.asset index dd0f90918..b8767185b 100644 --- a/Assets/Settings/Localization/Strings/Strings Shared Data.asset +++ b/Assets/Settings/Localization/Strings/Strings Shared Data.asset @@ -3467,6 +3467,14 @@ MonoBehaviour: m_Key: MULTIPLAYER_UNMUTE_PLAYER_BUTTON m_Metadata: m_Items: [] + - m_Id: 326832067431559168 + m_Key: MULTIPLAYER_ENABLE_USER_VIEW_ONLY_BUTTON + m_Metadata: + m_Items: [] + - m_Id: 326833306865168384 + m_Key: MULTIPLAYER_DISABLE_USER_VIEW_ONLY_BUTTON + m_Metadata: + m_Items: [] m_Metadata: m_Items: [] m_KeyGenerator: diff --git a/Assets/Settings/Localization/Strings/Strings_de.asset b/Assets/Settings/Localization/Strings/Strings_de.asset index 6cec7d586..6a7e67ccd 100644 --- a/Assets/Settings/Localization/Strings/Strings_de.asset +++ b/Assets/Settings/Localization/Strings/Strings_de.asset @@ -3666,6 +3666,14 @@ MonoBehaviour: m_Localized: Spieler stumm schalten aufheben m_Metadata: m_Items: [] + - m_Id: 326832067431559168 + m_Localized: Nur Benutzeransicht festlegen + m_Metadata: + m_Items: [] + - m_Id: 326833306865168384 + m_Localized: Nur Benutzeransicht deaktivieren + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_en.asset b/Assets/Settings/Localization/Strings/Strings_en.asset index fbd22b6ea..3049034f4 100644 --- a/Assets/Settings/Localization/Strings/Strings_en.asset +++ b/Assets/Settings/Localization/Strings/Strings_en.asset @@ -3636,6 +3636,14 @@ MonoBehaviour: m_Localized: Unmute Player m_Metadata: m_Items: [] + - m_Id: 326832067431559168 + m_Localized: Enable user view only + m_Metadata: + m_Items: [] + - m_Id: 326833306865168384 + m_Localized: Disable user view only + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_es.asset b/Assets/Settings/Localization/Strings/Strings_es.asset index d71ddd929..2801f1b57 100644 --- a/Assets/Settings/Localization/Strings/Strings_es.asset +++ b/Assets/Settings/Localization/Strings/Strings_es.asset @@ -3636,6 +3636,14 @@ MonoBehaviour: m_Localized: Activar el sonido del jugador m_Metadata: m_Items: [] + - m_Id: 326832067431559168 + m_Localized: Establecer solo vista de usuario + m_Metadata: + m_Items: [] + - m_Id: 326833306865168384 + m_Localized: Desactivar solo vista de usuario + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_fr.asset b/Assets/Settings/Localization/Strings/Strings_fr.asset index 4bc00c8c2..051d634d0 100644 --- a/Assets/Settings/Localization/Strings/Strings_fr.asset +++ b/Assets/Settings/Localization/Strings/Strings_fr.asset @@ -3606,6 +3606,14 @@ MonoBehaviour: m_Localized: "R\xE9activer le son du joueur" m_Metadata: m_Items: [] + - m_Id: 326832067431559168 + m_Localized: "D\xE9finir uniquement la vue utilisateur" + m_Metadata: + m_Items: [] + - m_Id: 326833306865168384 + m_Localized: "D\xE9sactiver uniquement la vue utilisateur" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_ja.asset b/Assets/Settings/Localization/Strings/Strings_ja.asset index 1a03e1a66..a8da5f142 100644 --- a/Assets/Settings/Localization/Strings/Strings_ja.asset +++ b/Assets/Settings/Localization/Strings/Strings_ja.asset @@ -3558,6 +3558,14 @@ MonoBehaviour: m_Localized: "\u30D7\u30EC\u30A4\u30E4\u30FC\u306E\u30DF\u30E5\u30FC\u30C8\u3092\u89E3\u9664\u3059\u308B" m_Metadata: m_Items: [] + - m_Id: 326832067431559168 + m_Localized: "\u30E6\u30FC\u30B6\u30FC\u8868\u793A\u306E\u307F\u8A2D\u5B9A" + m_Metadata: + m_Items: [] + - m_Id: 326833306865168384 + m_Localized: "\u30E6\u30FC\u30B6\u30FC\u8868\u793A\u306E\u307F\u7121\u52B9\u5316" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_ko.asset b/Assets/Settings/Localization/Strings/Strings_ko.asset index 331cb3fb9..1517cd7f4 100644 --- a/Assets/Settings/Localization/Strings/Strings_ko.asset +++ b/Assets/Settings/Localization/Strings/Strings_ko.asset @@ -3628,6 +3628,14 @@ MonoBehaviour: m_Localized: "\uD50C\uB808\uC774\uC5B4 \uC74C\uC18C\uAC70 \uD574\uC81C" m_Metadata: m_Items: [] + - m_Id: 326832067431559168 + m_Localized: "\uC0AC\uC6A9\uC790 \uBCF4\uAE30\uB9CC \uC124\uC815" + m_Metadata: + m_Items: [] + - m_Id: 326833306865168384 + m_Localized: "\uC0AC\uC6A9\uC790 \uBCF4\uAE30\uB9CC \uBE44\uD65C\uC131\uD654" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_zh.asset b/Assets/Settings/Localization/Strings/Strings_zh.asset index 0e37c7a3e..c0ea4cd0b 100644 --- a/Assets/Settings/Localization/Strings/Strings_zh.asset +++ b/Assets/Settings/Localization/Strings/Strings_zh.asset @@ -3554,6 +3554,14 @@ MonoBehaviour: m_Localized: "\u53D6\u6D88\u9759\u97F3\u73A9\u5BB6" m_Metadata: m_Items: [] + - m_Id: 326832067431559168 + m_Localized: "\u4EC5\u8BBE\u7F6E\u7528\u6237\u89C6\u56FE" + m_Metadata: + m_Items: [] + - m_Id: 326833306865168384 + m_Localized: "\u7981\u7528\u4EC5\u7528\u6237\u89C6\u56FE" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] From 781d0e18ee3a32c02fa4134a0434dc0bdd849a91 Mon Sep 17 00:00:00 2001 From: Riccardo Bovo Date: Sun, 26 Jan 2025 14:10:16 +0000 Subject: [PATCH 22/25] Update MultiplayerManagerEditor.cs removing redundant code and adding max player for testing --- Assets/Editor/MultiplayerManagerEditor.cs | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/Assets/Editor/MultiplayerManagerEditor.cs b/Assets/Editor/MultiplayerManagerEditor.cs index 4d8a0123a..1104149ea 100644 --- a/Assets/Editor/MultiplayerManagerEditor.cs +++ b/Assets/Editor/MultiplayerManagerEditor.cs @@ -27,15 +27,16 @@ public override void OnInspectorGUI() EditorGUILayout.LabelField("", GUI.skin.horizontalSlider); GUILayout.Space(10); + roomName = EditorGUILayout.TextField("Room Name", roomName); nickname = EditorGUILayout.TextField("Nickname", nickname); - if (nickname != oldNickname) { SetNickname(); oldNickname = nickname; EditorUtility.SetDirty(target); } + maxPlayers = EditorGUILayout.IntField("MaxPlayers", maxPlayers); //State string connectionState = ""; @@ -126,19 +127,6 @@ public override void OnInspectorGUI() EditorGUILayout.LabelField($"{remoteUsersRegistered}"); EditorGUILayout.EndHorizontal(); - // Display and edit Nickname - GUILayout.Space(10); - EditorGUILayout.LabelField("Nickname", GUI.skin.horizontalSlider); - string currentNickname = multiplayerManager.UserInfo.Nickname; - GUILayout.Label("Nickname", EditorStyles.boldLabel); - string newNickname = EditorGUILayout.TextField("Edit Nickname", currentNickname); - if (newNickname != currentNickname) - { - ConnectionUserInfo updatedUserInfo = multiplayerManager.UserInfo; - updatedUserInfo.Nickname = newNickname; - multiplayerManager.UserInfo = updatedUserInfo; - EditorUtility.SetDirty(target); // Mark the target as dirty to apply changes - } Repaint(); From 53f6d4dcc4346210c5a070f36e6accd71f228bc2 Mon Sep 17 00:00:00 2001 From: Riccardo Bovo Date: Sun, 26 Jan 2025 15:14:21 +0000 Subject: [PATCH 23/25] Kick users --- .../PopUps/PopUpWindow_RoomOptions.prefab | 742 ++++++++++-------- .../GUI/MultiplayerRoomOptionsPopUpWindow.cs | 18 +- Assets/Scripts/GUI/PlayerListItemPrefab.cs | 2 + .../Multiplayer/MultiplayerInterfaces.cs | 2 +- .../Scripts/Multiplayer/MultiplayerManager.cs | 6 + .../Multiplayer/Photon/PhotonManager.cs | 8 + .../Scripts/Multiplayer/Photon/PhotonRPC.cs | 6 + Assets/Scripts/SketchControlsScript.cs | 3 + .../Strings/Strings Shared Data.asset | 12 + .../Localization/Strings/Strings_de.asset | 12 + .../Localization/Strings/Strings_en.asset | 12 + .../Localization/Strings/Strings_es.asset | 12 + .../Localization/Strings/Strings_fr.asset | 12 + .../Localization/Strings/Strings_ja.asset | 12 + .../Localization/Strings/Strings_ko.asset | 12 + .../Localization/Strings/Strings_zh.asset | 12 + 16 files changed, 544 insertions(+), 339 deletions(-) diff --git a/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab b/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab index cfca0c694..24f85fbea 100644 --- a/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab +++ b/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab @@ -34,6 +34,8 @@ Transform: m_Children: - {fileID: 4000013863059372} - {fileID: 8179569077979998440} + - {fileID: 1341011025080659155} + - {fileID: 6814929247049593294} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &6590698 @@ -103,8 +105,30 @@ MonoBehaviour: m_NextButton: {fileID: 0} m_playerGuiPrefab: {fileID: 2414029554072440725} PlayerGuiPrefabSize: {x: 0.6, y: 0.175} - PlayerListOffset: {x: 0, y: -0.85} - PlayerListArea: {x: 1.6, y: 0.8} + PlayerListOffset: {x: -0.02, y: -0.7} + PlayerListArea: {x: 1.6, y: 1.1} + m_popupWindowTitleString: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 326852018926186496 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_playerLIstTitle: {fileID: 6880184433722633500} + m_playerLIstTitleString: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 326852593516474368 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + references: + version: 2 + RefIds: [] --- !u!1 &1000011506748792 GameObject: m_ObjectHideFlags: 0 @@ -301,9 +325,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6430284205569547491} - - {fileID: 4650316152798292590} - - {fileID: 6209009506960773324} - - {fileID: 6792340811292829086} - {fileID: 1196226204731840579} - {fileID: 4000014139754862} m_Father: {fileID: 461372} @@ -440,7 +461,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Room Settings + m_text: In Room Settings m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} @@ -1090,7 +1111,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1840143052362000901 RectTransform: m_ObjectHideFlags: 0 @@ -1232,6 +1253,7 @@ Transform: - {fileID: 2962397487389710043} - {fileID: 5902158930843246765} - {fileID: 8756030045986842438} + - {fileID: 7276864798255666015} m_Father: {fileID: 461372} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8958483938599195323 @@ -1251,6 +1273,7 @@ MonoBehaviour: MuteButton: {fileID: 2918817422897490678} TransferOwnershipButton: {fileID: 2588245756299914869} ToggleViewOnly: {fileID: 8042277596490285762} + KickPlayerOut: {fileID: 8974035494957902845} remotePlayer: PlayerId: 0 PlayerGameObject: {fileID: 0} @@ -1458,7 +1481,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &228334323036961790 RectTransform: m_ObjectHideFlags: 0 @@ -1714,7 +1737,7 @@ MonoBehaviour: references: version: 2 RefIds: [] ---- !u!1 &6614870679551821437 +--- !u!1 &8183740404449640297 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1722,42 +1745,48 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4650316152798292590} - - component: {fileID: 3661853299119540901} - - component: {fileID: 1185496136212610254} + - component: {fileID: 7276864798255666015} + - component: {fileID: 2343712047889410814} + - component: {fileID: 2761586738992191295} + - component: {fileID: 7372616648850819689} + - component: {fileID: 8974035494957902845} m_Layer: 16 - m_Name: Max players + m_Name: KickUser m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4650316152798292590 -RectTransform: +--- !u!4 &7276864798255666015 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6614870679551821437} + m_GameObject: {fileID: 8183740404449640297} + serializedVersion: 2 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_LocalPosition: {x: 1.473, y: 0, z: 0} + m_LocalScale: {x: 0.14999999, y: 0.14999999, z: 0.14999999} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4000013863059372} + m_Father: {fileID: 8179569077979998440} 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.445, y: -0.154} - m_SizeDelta: {x: 2, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!23 &3661853299119540901 +--- !u!33 &2343712047889410814 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8183740404449640297} + m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} +--- !u!23 &2761586738992191295 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6614870679551821437} + m_GameObject: {fileID: 8183740404449640297} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -1771,7 +1800,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + - {fileID: 2100000, guid: 40d29de2bdc11f04dbfa25059165916e, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1793,99 +1822,108 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &1185496136212610254 +--- !u!65 &7372616648850819689 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8183740404449640297} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1.1, y: 1.1, z: 0.1} + m_Center: {x: -0.000000074505806, y: 0.000000022351742, z: 0} +--- !u!114 &8974035494957902845 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6614870679551821437} + m_GameObject: {fileID: 8183740404449640297} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Script: {fileID: 11500000, guid: 650d89a0f5c4ffe449d970ac10b2e6bb, 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: Max players - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.5 - m_fontSizeBase: 1.5 - 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: 0 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: -0.12023544, z: 0.19494265, w: 1.1764753} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 3661853299119540901} - m_maskType: 0 ---- !u!1 &7624598385178326493 + m_DescriptionType: 0 + m_DescriptionYOffset: 0 + m_DescriptionText: + m_LocalizedDescription: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 326864334061236224 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionActivateSpeed: 12 + m_DescriptionZScale: 1 + m_ButtonTexture: {fileID: 2800000, guid: 0c91e975bed1cd948a150b672f3fec48, type: 3} + m_AtlasTexture: 1 + m_ToggleButton: 0 + m_LongPressReleaseButton: 0 + m_ButtonHasPressedAudio: 1 + m_ZAdjustHover: -0.02 + m_ZAdjustClick: 0.05 + m_HoverScale: 1.1 + m_HoverBoxColliderGrow: 0.2 + m_AddOverlay: 0 + m_Command: 1015 + m_CommandParam: -1 + m_CommandParam2: -1 + m_RequiresPopup: 0 + m_CenterPopupOnButton: 0 + m_PopupOffset: {x: 0, y: 0, z: 0} + m_PopupText: + m_LocalizedPopup: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnDescription: + m_LocalizedToggleOnDescription: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnTexture: {fileID: 2800000, guid: 97a84a57c58583a48a834c393578618d, type: 3} + m_AllowUnavailable: 1 + m_LinkedUIObject: {fileID: 0} + m_CommandIgnored: 0 + playerId: 0 + references: + version: 2 + RefIds: [] +--- !u!1 &8401036954015826580 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1893,42 +1931,48 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6209009506960773324} - - component: {fileID: 2039263249978755478} - - component: {fileID: 1368432156236954280} + - component: {fileID: 1341011025080659155} + - component: {fileID: 6509213577252960574} + - component: {fileID: 3239205105783632024} + - component: {fileID: 4900626740900270521} + - component: {fileID: 6330845168842661360} m_Layer: 16 - m_Name: Room type + m_Name: ToggleAllUserToViewOnly m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6209009506960773324 -RectTransform: +--- !u!4 &1341011025080659155 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7624598385178326493} + m_GameObject: {fileID: 8401036954015826580} + serializedVersion: 2 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_LocalPosition: {x: -0.648, y: 0.421, z: 0} + m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4000013863059372} + m_Father: {fileID: 461372} 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.445, y: -0.347} - m_SizeDelta: {x: 2, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!23 &2039263249978755478 +--- !u!33 &6509213577252960574 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8401036954015826580} + m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} +--- !u!23 &3239205105783632024 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7624598385178326493} + m_GameObject: {fileID: 8401036954015826580} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -1942,7 +1986,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + - {fileID: 2100000, guid: 40d29de2bdc11f04dbfa25059165916e, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1964,99 +2008,108 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &1368432156236954280 +--- !u!65 &4900626740900270521 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8401036954015826580} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1.1, y: 1.1, z: 0.1} + m_Center: {x: -0.000000074505806, y: 0.000000022351742, z: 0} +--- !u!114 &6330845168842661360 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7624598385178326493} + m_GameObject: {fileID: 8401036954015826580} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Script: {fileID: 11500000, guid: 650d89a0f5c4ffe449d970ac10b2e6bb, 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: Room type - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.5 - m_fontSizeBase: 1.5 - 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: 0 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: -0.12023544, z: 0.19494265, w: 1.1764753} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 2039263249978755478} - m_maskType: 0 ---- !u!1 &8057700737876105238 + m_DescriptionType: 0 + m_DescriptionYOffset: 0 + m_DescriptionText: + m_LocalizedDescription: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 326832067431559168 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionActivateSpeed: 12 + m_DescriptionZScale: 1 + m_ButtonTexture: {fileID: 2800000, guid: 464883c791528804496b8c8ef7126e52, type: 3} + m_AtlasTexture: 1 + m_ToggleButton: 1 + m_LongPressReleaseButton: 0 + m_ButtonHasPressedAudio: 1 + m_ZAdjustHover: -0.02 + m_ZAdjustClick: 0.05 + m_HoverScale: 1.1 + m_HoverBoxColliderGrow: 0.2 + m_AddOverlay: 0 + m_Command: 1014 + m_CommandParam: -1 + m_CommandParam2: -1 + m_RequiresPopup: 0 + m_CenterPopupOnButton: 0 + m_PopupOffset: {x: 0, y: 0, z: 0} + m_PopupText: + m_LocalizedPopup: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnDescription: + m_LocalizedToggleOnDescription: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 326833306865168384 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnTexture: {fileID: 2800000, guid: 97a84a57c58583a48a834c393578618d, type: 3} + m_AllowUnavailable: 1 + m_LinkedUIObject: {fileID: 0} + m_CommandIgnored: 0 + playerId: 0 + references: + version: 2 + RefIds: [] +--- !u!1 &8404568717583676973 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2064,42 +2117,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6792340811292829086} - - component: {fileID: 8680312576322523132} - - component: {fileID: 316393831736989700} + - component: {fileID: 2513099590842416612} + - component: {fileID: 2390606770061799462} + - component: {fileID: 6880184433722633500} m_Layer: 16 - m_Name: Audio + m_Name: TextLine m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6792340811292829086 +--- !u!224 &2513099590842416612 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8057700737876105238} + m_GameObject: {fileID: 8404568717583676973} 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4000013863059372} + m_Father: {fileID: 1196226204731840579} 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.445, y: -0.537} - m_SizeDelta: {x: 2, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!23 &8680312576322523132 + m_AnchoredPosition: {x: -0.7710999, y: 0.076} + m_SizeDelta: {x: 1.5, y: 0.25} + m_Pivot: {x: 0, y: 1} +--- !u!23 &2390606770061799462 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8057700737876105238} + m_GameObject: {fileID: 8404568717583676973} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -2125,7 +2178,7 @@ MeshRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_StitchLightmapSeams: 0 + m_StitchLightmapSeams: 1 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -2135,13 +2188,13 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &316393831736989700 +--- !u!114 &6880184433722633500 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8057700737876105238} + m_GameObject: {fileID: 8404568717583676973} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} @@ -2155,7 +2208,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Audio + m_text: Players List m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} @@ -2182,15 +2235,15 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 1.5 - m_fontSizeBase: 1.5 + m_fontSize: 1.3 + m_fontSizeBase: 1.3 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 + m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -2218,16 +2271,16 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: -0.31141979, y: -0.12023544, z: 0.19494265, w: 1.1764753} + m_margin: {x: -0.031108022, y: 0, z: -0.07259071, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 m_hasFontAssetChanged: 0 - m_renderer: {fileID: 8680312576322523132} + m_renderer: {fileID: 2390606770061799462} m_maskType: 0 ---- !u!1 &8404568717583676973 +--- !u!1 &8947761366766059199 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2235,42 +2288,48 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2513099590842416612} - - component: {fileID: 2390606770061799462} - - component: {fileID: 6880184433722633500} + - component: {fileID: 6814929247049593294} + - component: {fileID: 1249068969844500751} + - component: {fileID: 8263307977098437769} + - component: {fileID: 4169815332714835414} + - component: {fileID: 5661515221701686702} m_Layer: 16 - m_Name: TextLine + m_Name: ToggleAllUserVoice m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2513099590842416612 -RectTransform: +--- !u!4 &6814929247049593294 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8404568717583676973} + m_GameObject: {fileID: 8947761366766059199} + serializedVersion: 2 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_LocalPosition: {x: -0.312, y: 0.421, z: 0} + m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1196226204731840579} + m_Father: {fileID: 461372} 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.7710999, y: -0.10100001} - m_SizeDelta: {x: 1.5, y: 0.25} - m_Pivot: {x: 0, y: 1} ---- !u!23 &2390606770061799462 +--- !u!33 &1249068969844500751 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8947761366766059199} + m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} +--- !u!23 &8263307977098437769 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8404568717583676973} + m_GameObject: {fileID: 8947761366766059199} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -2284,7 +2343,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + - {fileID: 2100000, guid: 40d29de2bdc11f04dbfa25059165916e, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2296,7 +2355,7 @@ MeshRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_StitchLightmapSeams: 1 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -2306,95 +2365,104 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &6880184433722633500 +--- !u!65 &4169815332714835414 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8947761366766059199} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1.1, y: 1.1, z: 0.1} + m_Center: {x: -0.000000074505806, y: 0.000000022351742, z: 0} +--- !u!114 &5661515221701686702 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8404568717583676973} + m_GameObject: {fileID: 8947761366766059199} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Script: {fileID: 11500000, guid: 650d89a0f5c4ffe449d970ac10b2e6bb, 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: Players List - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, 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: 1.93 - m_fontSizeBase: 1.93 - 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: 0 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -0.031108022, y: 0, z: -0.07259071, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 2390606770061799462} - m_maskType: 0 + m_DescriptionType: 0 + m_DescriptionYOffset: 0 + m_DescriptionText: + m_LocalizedDescription: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 326832067431559168 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionActivateSpeed: 12 + m_DescriptionZScale: 1 + m_ButtonTexture: {fileID: 2800000, guid: 464883c791528804496b8c8ef7126e52, type: 3} + m_AtlasTexture: 1 + m_ToggleButton: 1 + m_LongPressReleaseButton: 0 + m_ButtonHasPressedAudio: 1 + m_ZAdjustHover: -0.02 + m_ZAdjustClick: 0.05 + m_HoverScale: 1.1 + m_HoverBoxColliderGrow: 0.2 + m_AddOverlay: 0 + m_Command: 1014 + m_CommandParam: -1 + m_CommandParam2: -1 + m_RequiresPopup: 0 + m_CenterPopupOnButton: 0 + m_PopupOffset: {x: 0, y: 0, z: 0} + m_PopupText: + m_LocalizedPopup: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnDescription: + m_LocalizedToggleOnDescription: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 326833306865168384 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnTexture: {fileID: 2800000, guid: 97a84a57c58583a48a834c393578618d, type: 3} + m_AllowUnavailable: 1 + m_LinkedUIObject: {fileID: 0} + m_CommandIgnored: 0 + playerId: 0 + references: + version: 2 + RefIds: [] diff --git a/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs b/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs index bc8d1f1a2..f0ee53827 100644 --- a/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs +++ b/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs @@ -17,17 +17,23 @@ using System; using System.Collections.Generic; using OpenBrush; +using UnityEngine.Localization; +using TMPro; namespace TiltBrush { public class MultiplayerRoomOptionsPopUpWindow : PopUpWindow { - public GameObject m_playerGuiPrefab; + [SerializeField] public GameObject m_playerGuiPrefab; public Vector2 PlayerGuiPrefabSize; public Vector2 PlayerListOffset; public Vector2 PlayerListArea; private List m_instantiatedGuiPrefabs = new List(); + [SerializeField] private LocalizedString m_popupWindowTitleString; + [SerializeField] public TextMeshPro m_playerLIstTitle; + [SerializeField] private LocalizedString m_playerLIstTitleString; + public RemotePlayers m_RemotePlayers { get @@ -70,6 +76,7 @@ override protected void BaseUpdate() protected override void UpdateOpening() { base.UpdateOpening(); + UpdateTitles(); GeneratePlayerList(); } @@ -100,6 +107,12 @@ public void RemotePlayersListCleared() GeneratePlayerList(); } + public void UpdateTitles() + { + if (m_WindowText) m_WindowText.text = m_popupWindowTitleString.GetLocalizedString(); + if (m_playerLIstTitle) m_playerLIstTitle.text = m_playerLIstTitleString.GetLocalizedString(); + } + public void GeneratePlayerList(List playersList = null) { if (m_playerGuiPrefab == null) @@ -160,6 +173,9 @@ public void OnMultiplayerRoomOptionsPopUpWindowButtonPressed(MultiplayerRoomOpti case SketchControlsScript.GlobalCommands.MultiplayerToggleUserStrokeGeneration: MultiplayerManager.m_Instance.ToggleUserViewOnlyMode(button.IsButtonActive(), button.playerId); break; + case SketchControlsScript.GlobalCommands.MultiplayerKickPlayerOut: + MultiplayerManager.m_Instance.KickPlayerOut(button.playerId); + break; } } diff --git a/Assets/Scripts/GUI/PlayerListItemPrefab.cs b/Assets/Scripts/GUI/PlayerListItemPrefab.cs index 161ebf643..1e782c99c 100644 --- a/Assets/Scripts/GUI/PlayerListItemPrefab.cs +++ b/Assets/Scripts/GUI/PlayerListItemPrefab.cs @@ -25,6 +25,7 @@ public class PlayerListItemPrefab : MonoBehaviour public MultiplayerRoomOptionsPanelButton MuteButton; public MultiplayerRoomOptionsPanelButton TransferOwnershipButton; public MultiplayerRoomOptionsPanelButton ToggleViewOnly; + public MultiplayerRoomOptionsPanelButton KickPlayerOut; [HideInInspector] public RemotePlayer remotePlayer; public void SetRemotePlayer(RemotePlayer Player) @@ -41,6 +42,7 @@ public void SetPlayerId() if (TransferOwnershipButton) TransferOwnershipButton.playerId = remotePlayer.PlayerId; if (MuteButton) MuteButton.playerId = remotePlayer.PlayerId; if (ToggleViewOnly) ToggleViewOnly.playerId = remotePlayer.PlayerId; + if (KickPlayerOut) KickPlayerOut.playerId = remotePlayer.PlayerId; } } } diff --git a/Assets/Scripts/Multiplayer/MultiplayerInterfaces.cs b/Assets/Scripts/Multiplayer/MultiplayerInterfaces.cs index 82bb9f554..88b02bb6c 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerInterfaces.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerInterfaces.cs @@ -32,7 +32,6 @@ public interface IConnectionHandler public interface IDataConnectionHandler : IConnectionHandler { - void Update(); int GetPlayerCount(); int GetNetworkedTimestampMilliseconds(); @@ -48,6 +47,7 @@ public interface IDataConnectionHandler : IConnectionHandler Task RpcSyncToSharedAnchor(string uuid); Task RpcTransferRoomOnwership(int playerId); Task RpcToggleUserViewOnlyMode(bool value, int playerId); + Task RpcKickPlayerOut(int playerId); event Action Disconnected; } diff --git a/Assets/Scripts/Multiplayer/MultiplayerManager.cs b/Assets/Scripts/Multiplayer/MultiplayerManager.cs index a9dd1b648..a9bceb1a0 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerManager.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerManager.cs @@ -324,6 +324,12 @@ public void ToggleUserViewOnlyMode(bool value, int playerId) m_Manager.RpcToggleUserViewOnlyMode(value, playerId); } + public void KickPlayerOut(int playerId) + { + if (!isUserRoomOwner) return; + m_Manager.RpcKickPlayerOut(playerId); + } + void OnRoomDataRefreshed(List rooms) { m_RoomData = rooms; diff --git a/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs b/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs index e7e6cd57e..6ce3a9a4b 100644 --- a/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs +++ b/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs @@ -375,6 +375,14 @@ public async Task RpcToggleUserViewOnlyMode(bool value,int playerId) return true; } + public async Task RpcKickPlayerOut(int playerId) + { + PlayerRef targetPlayer = PlayerRef.FromEncoded(playerId); + PhotonRPCBatcher.EnqueueRPC(() => + { PhotonRPC.RPC_DisconnectRemoteUser(m_Runner, targetPlayer); }); + return true; + } + public void SendLargeDataToPlayer(int playerId, byte[] largeData, int percentage) { sequenceNumber++; diff --git a/Assets/Scripts/Multiplayer/Photon/PhotonRPC.cs b/Assets/Scripts/Multiplayer/Photon/PhotonRPC.cs index 2265c0519..e91771859 100644 --- a/Assets/Scripts/Multiplayer/Photon/PhotonRPC.cs +++ b/Assets/Scripts/Multiplayer/Photon/PhotonRPC.cs @@ -587,6 +587,12 @@ public static void RPC_ToggleUserViewOnlyMode(NetworkRunner runner, bool value, ToggleDrawing(value); } + [Rpc(InvokeLocal = false)] + public static void RPC_DisconnectRemoteUser(NetworkRunner runner,[RpcTarget] PlayerRef targetPlayer) + { + MultiplayerManager.m_Instance.Disconnect(); + } + #endregion } } diff --git a/Assets/Scripts/SketchControlsScript.cs b/Assets/Scripts/SketchControlsScript.cs index 678e38a89..e51fd70af 100644 --- a/Assets/Scripts/SketchControlsScript.cs +++ b/Assets/Scripts/SketchControlsScript.cs @@ -161,6 +161,7 @@ public enum GlobalCommands EditMultiplayerRoomMaxPlayers = 1012, MultiplayerTransferRoomOwnership = 1013, MultiplayerToggleUserStrokeGeneration = 1014, + MultiplayerKickPlayerOut = 1015, RenameSketch = 5200, @@ -4887,6 +4888,7 @@ public void IssueGlobalCommand(GlobalCommands rEnum, int iParam1 = -1, case GlobalCommands.ToggleUserVoiceInMultiplayer: case GlobalCommands.MultiplayerTransferRoomOwnership: case GlobalCommands.MultiplayerToggleUserStrokeGeneration: + case GlobalCommands.MultiplayerKickPlayerOut: case GlobalCommands.WhatIsNew: break;// Intentionally blank. default: @@ -5121,6 +5123,7 @@ public bool IsCommandAvailable(GlobalCommands rEnum, int iParam = -1) return !(MultiplayerManager.m_Instance.State == ConnectionState.IN_ROOM); case GlobalCommands.MultiplayerTransferRoomOwnership: case GlobalCommands.MultiplayerToggleUserStrokeGeneration: + case GlobalCommands.MultiplayerKickPlayerOut: return (MultiplayerManager.m_Instance.State == ConnectionState.IN_ROOM && MultiplayerManager.m_Instance.IsUserRoomOwner()); case GlobalCommands.WhatIsNew: return false; diff --git a/Assets/Settings/Localization/Strings/Strings Shared Data.asset b/Assets/Settings/Localization/Strings/Strings Shared Data.asset index b8767185b..37a6bc770 100644 --- a/Assets/Settings/Localization/Strings/Strings Shared Data.asset +++ b/Assets/Settings/Localization/Strings/Strings Shared Data.asset @@ -3475,6 +3475,18 @@ MonoBehaviour: m_Key: MULTIPLAYER_DISABLE_USER_VIEW_ONLY_BUTTON m_Metadata: m_Items: [] + - m_Id: 326852018926186496 + m_Key: MULTIPLAYER_IN_ROOM_SETTINGS + m_Metadata: + m_Items: [] + - m_Id: 326852593516474368 + m_Key: MULTIPLAYER_PLAYERS_LIST_TITLE + m_Metadata: + m_Items: [] + - m_Id: 326864334061236224 + m_Key: MULTIPLAYER_KICK_OUT_USER + m_Metadata: + m_Items: [] m_Metadata: m_Items: [] m_KeyGenerator: diff --git a/Assets/Settings/Localization/Strings/Strings_de.asset b/Assets/Settings/Localization/Strings/Strings_de.asset index 6a7e67ccd..4ed72b6a4 100644 --- a/Assets/Settings/Localization/Strings/Strings_de.asset +++ b/Assets/Settings/Localization/Strings/Strings_de.asset @@ -3674,6 +3674,18 @@ MonoBehaviour: m_Localized: Nur Benutzeransicht deaktivieren m_Metadata: m_Items: [] + - m_Id: 326852018926186496 + m_Localized: In den Raumeinstellungen + m_Metadata: + m_Items: [] + - m_Id: 326852593516474368 + m_Localized: Spielerliste + m_Metadata: + m_Items: [] + - m_Id: 326864334061236224 + m_Localized: Spieler entfernen + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_en.asset b/Assets/Settings/Localization/Strings/Strings_en.asset index 3049034f4..c4504671e 100644 --- a/Assets/Settings/Localization/Strings/Strings_en.asset +++ b/Assets/Settings/Localization/Strings/Strings_en.asset @@ -3644,6 +3644,18 @@ MonoBehaviour: m_Localized: Disable user view only m_Metadata: m_Items: [] + - m_Id: 326852018926186496 + m_Localized: In room settings + m_Metadata: + m_Items: [] + - m_Id: 326852593516474368 + m_Localized: Players list + m_Metadata: + m_Items: [] + - m_Id: 326864334061236224 + m_Localized: Kick User Out + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_es.asset b/Assets/Settings/Localization/Strings/Strings_es.asset index 2801f1b57..a79862845 100644 --- a/Assets/Settings/Localization/Strings/Strings_es.asset +++ b/Assets/Settings/Localization/Strings/Strings_es.asset @@ -3644,6 +3644,18 @@ MonoBehaviour: m_Localized: Desactivar solo vista de usuario m_Metadata: m_Items: [] + - m_Id: 326852018926186496 + m_Localized: "En la configuraci\xF3n de la sala" + m_Metadata: + m_Items: [] + - m_Id: 326852593516474368 + m_Localized: Lista de jugadores + m_Metadata: + m_Items: [] + - m_Id: 326864334061236224 + m_Localized: Expulsar al jugador + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_fr.asset b/Assets/Settings/Localization/Strings/Strings_fr.asset index 051d634d0..1f87222bd 100644 --- a/Assets/Settings/Localization/Strings/Strings_fr.asset +++ b/Assets/Settings/Localization/Strings/Strings_fr.asset @@ -3614,6 +3614,18 @@ MonoBehaviour: m_Localized: "D\xE9sactiver uniquement la vue utilisateur" m_Metadata: m_Items: [] + - m_Id: 326852018926186496 + m_Localized: "Dans les param\xE8tres de la salle" + m_Metadata: + m_Items: [] + - m_Id: 326852593516474368 + m_Localized: Liste des joueurs + m_Metadata: + m_Items: [] + - m_Id: 326864334061236224 + m_Localized: Expulser le joueur + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_ja.asset b/Assets/Settings/Localization/Strings/Strings_ja.asset index a8da5f142..2316e601a 100644 --- a/Assets/Settings/Localization/Strings/Strings_ja.asset +++ b/Assets/Settings/Localization/Strings/Strings_ja.asset @@ -3566,6 +3566,18 @@ MonoBehaviour: m_Localized: "\u30E6\u30FC\u30B6\u30FC\u8868\u793A\u306E\u307F\u7121\u52B9\u5316" m_Metadata: m_Items: [] + - m_Id: 326852018926186496 + m_Localized: "\u30EB\u30FC\u30E0\u8A2D\u5B9A\u5185" + m_Metadata: + m_Items: [] + - m_Id: 326852593516474368 + m_Localized: "\u30D7\u30EC\u30A4\u30E4\u30FC\u30EA\u30B9\u30C8" + m_Metadata: + m_Items: [] + - m_Id: 326864334061236224 + m_Localized: "\u30D7\u30EC\u30A4\u30E4\u30FC\u3092\u8FFD\u3044\u51FA\u3059" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_ko.asset b/Assets/Settings/Localization/Strings/Strings_ko.asset index 1517cd7f4..3a4372e46 100644 --- a/Assets/Settings/Localization/Strings/Strings_ko.asset +++ b/Assets/Settings/Localization/Strings/Strings_ko.asset @@ -3636,6 +3636,18 @@ MonoBehaviour: m_Localized: "\uC0AC\uC6A9\uC790 \uBCF4\uAE30\uB9CC \uBE44\uD65C\uC131\uD654" m_Metadata: m_Items: [] + - m_Id: 326852018926186496 + m_Localized: "\uBC29 \uC124\uC815\uC5D0\uC11C" + m_Metadata: + m_Items: [] + - m_Id: 326852593516474368 + m_Localized: "\uD50C\uB808\uC774\uC5B4 \uBAA9\uB85D" + m_Metadata: + m_Items: [] + - m_Id: 326864334061236224 + m_Localized: "\uD50C\uB808\uC774\uC5B4\uB97C \uAC15\uD1F4\uD569\uB2C8\uB2E4" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_zh.asset b/Assets/Settings/Localization/Strings/Strings_zh.asset index c0ea4cd0b..f6e9daf6e 100644 --- a/Assets/Settings/Localization/Strings/Strings_zh.asset +++ b/Assets/Settings/Localization/Strings/Strings_zh.asset @@ -3562,6 +3562,18 @@ MonoBehaviour: m_Localized: "\u7981\u7528\u4EC5\u7528\u6237\u89C6\u56FE" m_Metadata: m_Items: [] + - m_Id: 326852018926186496 + m_Localized: "\u5728\u623F\u95F4\u8BBE\u7F6E\u4E2D" + m_Metadata: + m_Items: [] + - m_Id: 326852593516474368 + m_Localized: "\u73A9\u5BB6\u5217\u8868" + m_Metadata: + m_Items: [] + - m_Id: 326864334061236224 + m_Localized: " \u8E22\u51FA\u73A9\u5BB6" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] From cdb635563fdf66e1ebd005f5c01902b5f934091f Mon Sep 17 00:00:00 2001 From: Riccardo Bovo Date: Sun, 26 Jan 2025 15:43:11 +0000 Subject: [PATCH 24/25] Mute All and View Only All --- .../PopUps/PopUpWindow_RoomOptions.prefab | 36 +++++++++---------- .../GUI/MultiplayerRoomOptionsPanelButton.cs | 6 ++++ .../GUI/MultiplayerRoomOptionsPopUpWindow.cs | 35 +++++++++++++++++- Assets/Scripts/GUI/PlayerListItemPrefab.cs | 11 ++++++ .../MultiplayerAudioSourcesManager.cs | 1 + Assets/Scripts/SketchControlsScript.cs | 12 +++++-- .../Strings/Strings Shared Data.asset | 16 +++++++++ .../Localization/Strings/Strings_de.asset | 16 +++++++++ .../Localization/Strings/Strings_en.asset | 16 +++++++++ .../Localization/Strings/Strings_es.asset | 16 +++++++++ .../Localization/Strings/Strings_fr.asset | 16 +++++++++ .../Localization/Strings/Strings_ja.asset | 16 +++++++++ .../Localization/Strings/Strings_ko.asset | 18 ++++++++++ .../Localization/Strings/Strings_zh.asset | 16 +++++++++ 14 files changed, 209 insertions(+), 22 deletions(-) diff --git a/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab b/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab index 24f85fbea..20a8ba320 100644 --- a/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab +++ b/Assets/Prefabs/PopUps/PopUpWindow_RoomOptions.prefab @@ -1050,7 +1050,7 @@ MonoBehaviour: m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 - m_ButtonTexture: {fileID: 2800000, guid: 464883c791528804496b8c8ef7126e52, type: 3} + m_ButtonTexture: {fileID: 2800000, guid: e5a95db3eceb2ac48bd574c538be1470, type: 3} m_AtlasTexture: 1 m_ToggleButton: 0 m_LongPressReleaseButton: 0 @@ -1420,7 +1420,7 @@ MonoBehaviour: m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 - m_ButtonTexture: {fileID: 2800000, guid: 464883c791528804496b8c8ef7126e52, type: 3} + m_ButtonTexture: {fileID: 2800000, guid: 0141ac6bf9f578f4e95706cdd2117914, type: 3} m_AtlasTexture: 1 m_ToggleButton: 1 m_LongPressReleaseButton: 0 @@ -1729,7 +1729,7 @@ MonoBehaviour: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] - m_ToggleOnTexture: {fileID: 0} + m_ToggleOnTexture: {fileID: 2800000, guid: 89c869f76d8c0474a8da08e71510f0f2, type: 3} m_AllowUnavailable: 0 m_LinkedUIObject: {fileID: 0} m_CommandIgnored: 0 @@ -1915,7 +1915,7 @@ MonoBehaviour: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] - m_ToggleOnTexture: {fileID: 2800000, guid: 97a84a57c58583a48a834c393578618d, type: 3} + m_ToggleOnTexture: {fileID: 2800000, guid: 0c91e975bed1cd948a150b672f3fec48, type: 3} m_AllowUnavailable: 1 m_LinkedUIObject: {fileID: 0} m_CommandIgnored: 0 @@ -1952,8 +1952,8 @@ Transform: m_GameObject: {fileID: 8401036954015826580} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.648, y: 0.421, z: 0} - m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} + m_LocalPosition: {x: -0.648, y: 0.404, z: 0} + m_LocalScale: {x: 0.33, y: 0.33, z: 0.33} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 461372} @@ -2048,7 +2048,7 @@ MonoBehaviour: m_TableReference: m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: - m_KeyId: 326832067431559168 + m_KeyId: 326871085665939456 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -2065,7 +2065,7 @@ MonoBehaviour: m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 - m_ButtonTexture: {fileID: 2800000, guid: 464883c791528804496b8c8ef7126e52, type: 3} + m_ButtonTexture: {fileID: 2800000, guid: 97a84a57c58583a48a834c393578618d, type: 3} m_AtlasTexture: 1 m_ToggleButton: 1 m_LongPressReleaseButton: 0 @@ -2075,7 +2075,7 @@ MonoBehaviour: m_HoverScale: 1.1 m_HoverBoxColliderGrow: 0.2 m_AddOverlay: 0 - m_Command: 1014 + m_Command: 1017 m_CommandParam: -1 m_CommandParam2: -1 m_RequiresPopup: 0 @@ -2096,12 +2096,12 @@ MonoBehaviour: m_TableReference: m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: - m_KeyId: 326833306865168384 + m_KeyId: 326871757446639616 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] - m_ToggleOnTexture: {fileID: 2800000, guid: 97a84a57c58583a48a834c393578618d, type: 3} + m_ToggleOnTexture: {fileID: 2800000, guid: 0141ac6bf9f578f4e95706cdd2117914, type: 3} m_AllowUnavailable: 1 m_LinkedUIObject: {fileID: 0} m_CommandIgnored: 0 @@ -2309,8 +2309,8 @@ Transform: m_GameObject: {fileID: 8947761366766059199} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.312, y: 0.421, z: 0} - m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} + m_LocalPosition: {x: -0.221, y: 0.404, z: 0} + m_LocalScale: {x: 0.33, y: 0.33, z: 0.33} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 461372} @@ -2405,7 +2405,7 @@ MonoBehaviour: m_TableReference: m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: - m_KeyId: 326832067431559168 + m_KeyId: 326869993834082304 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -2422,7 +2422,7 @@ MonoBehaviour: m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 - m_ButtonTexture: {fileID: 2800000, guid: 464883c791528804496b8c8ef7126e52, type: 3} + m_ButtonTexture: {fileID: 2800000, guid: 89c869f76d8c0474a8da08e71510f0f2, type: 3} m_AtlasTexture: 1 m_ToggleButton: 1 m_LongPressReleaseButton: 0 @@ -2432,7 +2432,7 @@ MonoBehaviour: m_HoverScale: 1.1 m_HoverBoxColliderGrow: 0.2 m_AddOverlay: 0 - m_Command: 1014 + m_Command: 1016 m_CommandParam: -1 m_CommandParam2: -1 m_RequiresPopup: 0 @@ -2453,12 +2453,12 @@ MonoBehaviour: m_TableReference: m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: - m_KeyId: 326833306865168384 + m_KeyId: 326870578603945984 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] - m_ToggleOnTexture: {fileID: 2800000, guid: 97a84a57c58583a48a834c393578618d, type: 3} + m_ToggleOnTexture: {fileID: 2800000, guid: 464883c791528804496b8c8ef7126e52, type: 3} m_AllowUnavailable: 1 m_LinkedUIObject: {fileID: 0} m_CommandIgnored: 0 diff --git a/Assets/Scripts/GUI/MultiplayerRoomOptionsPanelButton.cs b/Assets/Scripts/GUI/MultiplayerRoomOptionsPanelButton.cs index 694305040..fb4651ea4 100644 --- a/Assets/Scripts/GUI/MultiplayerRoomOptionsPanelButton.cs +++ b/Assets/Scripts/GUI/MultiplayerRoomOptionsPanelButton.cs @@ -42,5 +42,11 @@ override protected void OnButtonPressed() Debug.Assert(popup != null); popup.OnMultiplayerRoomOptionsPopUpWindowButtonPressed(this); } + + public void SetToggleState(bool isActive) + { + m_ToggleActive = isActive; + UpdateVisuals(); + } } } // namespace TiltBrush diff --git a/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs b/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs index f0ee53827..23d0735d0 100644 --- a/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs +++ b/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs @@ -158,6 +158,19 @@ private void ClearGuiPrefabsList() m_instantiatedGuiPrefabs.Clear(); } + private PlayerListItemPrefab GetGameobjectWithPlayerId(int playerID) + { + foreach (GameObject playerGui in m_instantiatedGuiPrefabs) + { + PlayerListItemPrefab playerComponent = playerGui.GetComponent(); + if (playerComponent != null && playerComponent.remotePlayer.PlayerId == playerID) + return playerComponent; + } + + return null; + } + + public void OnMultiplayerRoomOptionsPopUpWindowButtonPressed(MultiplayerRoomOptionsPanelButton button) { switch (button.m_Command) @@ -170,11 +183,31 @@ public void OnMultiplayerRoomOptionsPopUpWindowButtonPressed(MultiplayerRoomOpti case SketchControlsScript.GlobalCommands.MultiplayerTransferRoomOwnership: MultiplayerManager.m_Instance.RoomOwnershipTransferedToUser(button.playerId); break; - case SketchControlsScript.GlobalCommands.MultiplayerToggleUserStrokeGeneration: + case SketchControlsScript.GlobalCommands.MultiplayerToggleUserViewEditMode: MultiplayerManager.m_Instance.ToggleUserViewOnlyMode(button.IsButtonActive(), button.playerId); break; case SketchControlsScript.GlobalCommands.MultiplayerKickPlayerOut: MultiplayerManager.m_Instance.KickPlayerOut(button.playerId); + break; + case SketchControlsScript.GlobalCommands.MultiplayerToggleAllUserAudio: + + foreach (var remotePlayer in m_RemotePlayers.List) + { + MultiplayerAudioSourcesManager.m_Instance.ToggleAudioMuteForPlayer(button.IsButtonActive(), remotePlayer.PlayerId); + PlayerListItemPrefab playerComponent = GetGameobjectWithPlayerId(remotePlayer.PlayerId); + if (playerComponent) playerComponent.SetAudioToggleState(button.IsButtonActive()); + } + + break; + case SketchControlsScript.GlobalCommands.MultiplayerToggleAllUserViewEditMode: + + foreach (var remotePlayer in m_RemotePlayers.List) + { + MultiplayerManager.m_Instance.ToggleUserViewOnlyMode(button.IsButtonActive(), remotePlayer.PlayerId); + PlayerListItemPrefab playerComponent = GetGameobjectWithPlayerId(remotePlayer.PlayerId); + if (playerComponent) playerComponent.SetViewOnlyToggleState(button.IsButtonActive()); + } + break; } } diff --git a/Assets/Scripts/GUI/PlayerListItemPrefab.cs b/Assets/Scripts/GUI/PlayerListItemPrefab.cs index 1e782c99c..9079f2717 100644 --- a/Assets/Scripts/GUI/PlayerListItemPrefab.cs +++ b/Assets/Scripts/GUI/PlayerListItemPrefab.cs @@ -44,5 +44,16 @@ public void SetPlayerId() if (ToggleViewOnly) ToggleViewOnly.playerId = remotePlayer.PlayerId; if (KickPlayerOut) KickPlayerOut.playerId = remotePlayer.PlayerId; } + + public void SetAudioToggleState(bool isActive) + { + if (MuteButton) MuteButton.SetToggleState(isActive); + } + + public void SetViewOnlyToggleState(bool isActive) + { + if (ToggleViewOnly) ToggleViewOnly.SetToggleState(isActive); + } + } } diff --git a/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs b/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs index 5904974db..904ebafe5 100644 --- a/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs +++ b/Assets/Scripts/Multiplayer/MultiplayerAudioSourcesManager.cs @@ -106,5 +106,6 @@ public void ToggleAudioMuteForPlayer(bool value, int playerId) source.mute = value; } } + } } diff --git a/Assets/Scripts/SketchControlsScript.cs b/Assets/Scripts/SketchControlsScript.cs index e51fd70af..24399ada4 100644 --- a/Assets/Scripts/SketchControlsScript.cs +++ b/Assets/Scripts/SketchControlsScript.cs @@ -160,8 +160,10 @@ public enum GlobalCommands ToggleUserVoiceInMultiplayer = 1011, EditMultiplayerRoomMaxPlayers = 1012, MultiplayerTransferRoomOwnership = 1013, - MultiplayerToggleUserStrokeGeneration = 1014, + MultiplayerToggleUserViewEditMode = 1014, MultiplayerKickPlayerOut = 1015, + MultiplayerToggleAllUserAudio = 1016, + MultiplayerToggleAllUserViewEditMode = 1017, RenameSketch = 5200, @@ -4887,7 +4889,9 @@ public void IssueGlobalCommand(GlobalCommands rEnum, int iParam1 = -1, case GlobalCommands.MultiplayerDisconnect: case GlobalCommands.ToggleUserVoiceInMultiplayer: case GlobalCommands.MultiplayerTransferRoomOwnership: - case GlobalCommands.MultiplayerToggleUserStrokeGeneration: + case GlobalCommands.MultiplayerToggleUserViewEditMode: + case GlobalCommands.MultiplayerToggleAllUserAudio: + case GlobalCommands.MultiplayerToggleAllUserViewEditMode: case GlobalCommands.MultiplayerKickPlayerOut: case GlobalCommands.WhatIsNew: break;// Intentionally blank. @@ -5120,10 +5124,12 @@ public bool IsCommandAvailable(GlobalCommands rEnum, int iParam = -1) case GlobalCommands.EditMultiplayerNickName: case GlobalCommands.EditMultiplayerRoomName: case GlobalCommands.EditMultiplayerRoomMaxPlayers: + case GlobalCommands.MultiplayerToggleAllUserAudio: return !(MultiplayerManager.m_Instance.State == ConnectionState.IN_ROOM); case GlobalCommands.MultiplayerTransferRoomOwnership: - case GlobalCommands.MultiplayerToggleUserStrokeGeneration: + case GlobalCommands.MultiplayerToggleUserViewEditMode: case GlobalCommands.MultiplayerKickPlayerOut: + case GlobalCommands.MultiplayerToggleAllUserViewEditMode: return (MultiplayerManager.m_Instance.State == ConnectionState.IN_ROOM && MultiplayerManager.m_Instance.IsUserRoomOwner()); case GlobalCommands.WhatIsNew: return false; diff --git a/Assets/Settings/Localization/Strings/Strings Shared Data.asset b/Assets/Settings/Localization/Strings/Strings Shared Data.asset index 37a6bc770..371bf2327 100644 --- a/Assets/Settings/Localization/Strings/Strings Shared Data.asset +++ b/Assets/Settings/Localization/Strings/Strings Shared Data.asset @@ -3487,6 +3487,22 @@ MonoBehaviour: m_Key: MULTIPLAYER_KICK_OUT_USER m_Metadata: m_Items: [] + - m_Id: 326869993834082304 + m_Key: MULTIPLAYER_MUTE_ALL_USER_BUTTON + m_Metadata: + m_Items: [] + - m_Id: 326870578603945984 + m_Key: MULTIPLAYER_UNMUTE_ALL_PLAYERS_BUTTON + m_Metadata: + m_Items: [] + - m_Id: 326871085665939456 + m_Key: MULTIPLAYER_SET_ALL_PLAYERS_TO_VIEWONLY + m_Metadata: + m_Items: [] + - m_Id: 326871757446639616 + m_Key: MULTIPLAYER_UNSET_ALL_PLAYERS_TO_VIEWONLY + m_Metadata: + m_Items: [] m_Metadata: m_Items: [] m_KeyGenerator: diff --git a/Assets/Settings/Localization/Strings/Strings_de.asset b/Assets/Settings/Localization/Strings/Strings_de.asset index 4ed72b6a4..b2435f51b 100644 --- a/Assets/Settings/Localization/Strings/Strings_de.asset +++ b/Assets/Settings/Localization/Strings/Strings_de.asset @@ -3686,6 +3686,22 @@ MonoBehaviour: m_Localized: Spieler entfernen m_Metadata: m_Items: [] + - m_Id: 326869993834082304 + m_Localized: Alle Spieler stummschalten + m_Metadata: + m_Items: [] + - m_Id: 326870578603945984 + m_Localized: Alle Spieler stumm schalten aufheben + m_Metadata: + m_Items: [] + - m_Id: 326871085665939456 + m_Localized: Alle Spieler auf Nur-Ansicht setzen + m_Metadata: + m_Items: [] + - m_Id: 326871757446639616 + m_Localized: Allen Spielern das Bearbeiten erlauben + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_en.asset b/Assets/Settings/Localization/Strings/Strings_en.asset index c4504671e..305f5ab91 100644 --- a/Assets/Settings/Localization/Strings/Strings_en.asset +++ b/Assets/Settings/Localization/Strings/Strings_en.asset @@ -3656,6 +3656,22 @@ MonoBehaviour: m_Localized: Kick User Out m_Metadata: m_Items: [] + - m_Id: 326869993834082304 + m_Localized: Mute all players + m_Metadata: + m_Items: [] + - m_Id: 326870578603945984 + m_Localized: Unmute all players + m_Metadata: + m_Items: [] + - m_Id: 326871085665939456 + m_Localized: Set all players to view only + m_Metadata: + m_Items: [] + - m_Id: 326871757446639616 + m_Localized: Allow all players to edit + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_es.asset b/Assets/Settings/Localization/Strings/Strings_es.asset index a79862845..1793dddb3 100644 --- a/Assets/Settings/Localization/Strings/Strings_es.asset +++ b/Assets/Settings/Localization/Strings/Strings_es.asset @@ -3656,6 +3656,22 @@ MonoBehaviour: m_Localized: Expulsar al jugador m_Metadata: m_Items: [] + - m_Id: 326869993834082304 + m_Localized: Silenciar a todos los jugadores + m_Metadata: + m_Items: [] + - m_Id: 326870578603945984 + m_Localized: Activar el sonido de todos los jugadores + m_Metadata: + m_Items: [] + - m_Id: 326871085665939456 + m_Localized: "Configurar a todos los jugadores en modo solo visualizaci\xF3n" + m_Metadata: + m_Items: [] + - m_Id: 326871757446639616 + m_Localized: Permitir que todos los jugadores editen + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_fr.asset b/Assets/Settings/Localization/Strings/Strings_fr.asset index 1f87222bd..05daabcf6 100644 --- a/Assets/Settings/Localization/Strings/Strings_fr.asset +++ b/Assets/Settings/Localization/Strings/Strings_fr.asset @@ -3626,6 +3626,22 @@ MonoBehaviour: m_Localized: Expulser le joueur m_Metadata: m_Items: [] + - m_Id: 326869993834082304 + m_Localized: Mettre tous les joueurs en sourdine + m_Metadata: + m_Items: [] + - m_Id: 326870578603945984 + m_Localized: "R\xE9activer le son de tous les joueurs" + m_Metadata: + m_Items: [] + - m_Id: 326871085665939456 + m_Localized: Mettre tous les joueurs en mode visualisation uniquement + m_Metadata: + m_Items: [] + - m_Id: 326871757446639616 + m_Localized: "Permettre \xE0 tous les joueurs de modifier" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_ja.asset b/Assets/Settings/Localization/Strings/Strings_ja.asset index 2316e601a..d2a185c43 100644 --- a/Assets/Settings/Localization/Strings/Strings_ja.asset +++ b/Assets/Settings/Localization/Strings/Strings_ja.asset @@ -3578,6 +3578,22 @@ MonoBehaviour: m_Localized: "\u30D7\u30EC\u30A4\u30E4\u30FC\u3092\u8FFD\u3044\u51FA\u3059" m_Metadata: m_Items: [] + - m_Id: 326869993834082304 + m_Localized: "\u3059\u3079\u3066\u306E\u30D7\u30EC\u30A4\u30E4\u30FC\u3092\u30DF\u30E5\u30FC\u30C8\u3059\u308B" + m_Metadata: + m_Items: [] + - m_Id: 326870578603945984 + m_Localized: "\u3059\u3079\u3066\u306E\u30D7\u30EC\u30A4\u30E4\u30FC\u306E\u30DF\u30E5\u30FC\u30C8\u3092\u89E3\u9664\u3059\u308B" + m_Metadata: + m_Items: [] + - m_Id: 326871085665939456 + m_Localized: "\u3059\u3079\u3066\u306E\u30D7\u30EC\u30A4\u30E4\u30FC\u3092\u95B2\u89A7\u306E\u307F\u30E2\u30FC\u30C9\u306B\u8A2D\u5B9A\u3059\u308B" + m_Metadata: + m_Items: [] + - m_Id: 326871757446639616 + m_Localized: "\u3059\u3079\u3066\u306E\u30D7\u30EC\u30A4\u30E4\u30FC\u306B\u7DE8\u96C6\u3092\u8A31\u53EF\u3059\u308B" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_ko.asset b/Assets/Settings/Localization/Strings/Strings_ko.asset index 3a4372e46..c8689f80f 100644 --- a/Assets/Settings/Localization/Strings/Strings_ko.asset +++ b/Assets/Settings/Localization/Strings/Strings_ko.asset @@ -3648,6 +3648,24 @@ MonoBehaviour: m_Localized: "\uD50C\uB808\uC774\uC5B4\uB97C \uAC15\uD1F4\uD569\uB2C8\uB2E4" m_Metadata: m_Items: [] + - m_Id: 326869993834082304 + m_Localized: "\uBAA8\uB4E0 \uD50C\uB808\uC774\uC5B4 \uC74C\uC18C\uAC70" + m_Metadata: + m_Items: [] + - m_Id: 326870578603945984 + m_Localized: "\uBAA8\uB4E0 \uD50C\uB808\uC774\uC5B4 \uC74C\uC18C\uAC70 \uD574\uC81C" + m_Metadata: + m_Items: [] + - m_Id: 326871085665939456 + m_Localized: "\uBAA8\uB4E0 \uD50C\uB808\uC774\uC5B4\uB97C \uBCF4\uAE30 \uC804\uC6A9\uC73C\uB85C + \uC124\uC815" + m_Metadata: + m_Items: [] + - m_Id: 326871757446639616 + m_Localized: "\uBAA8\uB4E0 \uD50C\uB808\uC774\uC5B4\uAC00 \uD3B8\uC9D1\uD560 + \uC218 \uC788\uB3C4\uB85D \uD5C8\uC6A9" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_zh.asset b/Assets/Settings/Localization/Strings/Strings_zh.asset index f6e9daf6e..24d21b431 100644 --- a/Assets/Settings/Localization/Strings/Strings_zh.asset +++ b/Assets/Settings/Localization/Strings/Strings_zh.asset @@ -3574,6 +3574,22 @@ MonoBehaviour: m_Localized: " \u8E22\u51FA\u73A9\u5BB6" m_Metadata: m_Items: [] + - m_Id: 326869993834082304 + m_Localized: "\u9759\u97F3\u6240\u6709\u73A9\u5BB6" + m_Metadata: + m_Items: [] + - m_Id: 326870578603945984 + m_Localized: "\u53D6\u6D88\u9759\u97F3\u6240\u6709\u73A9\u5BB6" + m_Metadata: + m_Items: [] + - m_Id: 326871085665939456 + m_Localized: "\u5C06\u6240\u6709\u73A9\u5BB6\u8BBE\u7F6E\u4E3A\u4EC5\u89C2\u770B\u6A21\u5F0F" + m_Metadata: + m_Items: [] + - m_Id: 326871757446639616 + m_Localized: "\u5141\u8BB8\u6240\u6709\u73A9\u5BB6\u7F16\u8F91" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] From cf7f4d8ccb28a0e014842c7f80eaa9ef2dfb584d Mon Sep 17 00:00:00 2001 From: Riccardo Bovo Date: Sun, 26 Jan 2025 17:35:19 +0000 Subject: [PATCH 25/25] Update MultiplayerPanel.prefab --- Assets/Prefabs/Panels/MultiplayerPanel.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Prefabs/Panels/MultiplayerPanel.prefab b/Assets/Prefabs/Panels/MultiplayerPanel.prefab index 56fe6848f..374ff9e63 100644 --- a/Assets/Prefabs/Panels/MultiplayerPanel.prefab +++ b/Assets/Prefabs/Panels/MultiplayerPanel.prefab @@ -1731,7 +1731,7 @@ MonoBehaviour: m_HoverScale: 1.1 m_HoverBoxColliderGrow: 0.2 m_AddOverlay: 0 - m_Command: 1013 + m_Command: 1009 m_CommandParam: 1 m_CommandParam2: -1 m_RequiresPopup: 1