Skip to content

Commit

Permalink
Remove Old Code
Browse files Browse the repository at this point in the history
  • Loading branch information
@SurajSSingh
SurajSSingh committed Dec 16, 2022
1 parent 691a460 commit 6de2bc9
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 313 deletions.
51 changes: 0 additions & 51 deletions Assets/SteamNGO/Examples/Scripts/LobbyManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ public class LobbyManager : MonoBehaviour
private const int WAIT_TIMEOUT = 60;
[Header("Lobby Screens")]
[SerializeField] GameObject generalLobbyScreen;
// [SerializeField] GameObject createNewLobbyScreen;
// [SerializeField] GameObject roomScreen;
[SerializeField] GameObject currentRoom;
[Header("Scroll Content")]
[SerializeField] Transform joinableRoomsContent;
Expand All @@ -31,7 +29,6 @@ public class LobbyManager : MonoBehaviour

[Header("Other UI")]
[SerializeField] GameObject hostGame;
// [SerializeField] GameObject readyButton;
private LobbyState currentLobbyState = LobbyState.PublicLobby;

private LogLevel LogLevel => NetworkManager.Singleton ? NetworkManager.Singleton.LogLevel : LogLevel.Nothing;
Expand Down Expand Up @@ -146,17 +143,6 @@ private void ClientEntered(ulong clientId)
private void ServerStarted()
{
DeveloperLog("Server has started!");
// Create a room manager
// GameObject roomManagerObject = new("Room Manager");
// currentRoom = roomManagerObject.AddComponent<RoomManager>();
// roomManagerObject.AddComponent<NetworkObject>().Spawn();
// Clone a room manager
// GameObject roomManagerObject = Instantiate(roomManagerPrefab);
// currentRoom = roomManagerObject.GetComponent<RoomManager>();
// roomManagerObject.GetComponent<NetworkObject>().Spawn();

// currentRoom.RefreshPlayersContent();
// Debug.Log("Created Current Room Manager!");
}

private void ClientExited(ulong clientId)
Expand All @@ -167,38 +153,8 @@ private void ClientExited(ulong clientId)
{
ShowLobbyScreen(LobbyState.PublicLobby);
}
// else
// {
// StartCoroutine(RunRefresh());
// }
}

// private IEnumerator RunRefresh()
// {
// while (!currentRoom.IsSpawned)
// {
// yield return new WaitForSeconds(0.1f);
// }
// currentRoom.RefreshPlayerContentServerRPC();
// }

// public void RunSelectRefresh()
// {
// if (!NetworkManager.Singleton.IsConnectedClient)
// {
// return;
// }
// else if (currentLobbyState == LobbyState.PublicLobby)
// {
// RefreshServerList();
// }
// else if (currentLobbyState == LobbyState.PrivateRoom)
// {
// StartCoroutine(RunRefresh());
// // currentRoom.RefreshPlayersContent();
// }
// }

public void RefreshServerList()
{
// Clear content
Expand Down Expand Up @@ -237,7 +193,6 @@ private IEnumerator WaitForNetworkManagerSingletonToSubscrible()
}
if (NetworkManager.Singleton)
{
// SteamNetworkingSockets.OnConnectionStatusChanged += OnConnectionChange;
NetworkManager.Singleton.OnClientConnectedCallback += ClientEntered;
NetworkManager.Singleton.OnClientDisconnectCallback += ClientExited;
NetworkManager.Singleton.OnServerStarted += ServerStarted;
Expand All @@ -249,10 +204,4 @@ private IEnumerator WaitForNetworkManagerSingletonToSubscrible()
Debug.LogError("Network Manger Singleton could not be found!");
}
}

private void OnConnectionChange(Connection connection, ConnectionInfo info)
{
Debug.Log($"[{nameof(LobbyManager)}: Connection] name = {connection.ConnectionName}, id = {connection.Id}");
Debug.Log($"[{nameof(LobbyManager)}: ConnectionInfo] addr = {info.Address}, state = {info.State}, end = {info.EndReason}");
}
}
208 changes: 0 additions & 208 deletions Assets/SteamNGO/Examples/Scripts/RoomManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ public class RoomManager : NetworkBehaviour
public GameObject ButtonPrefab => buttonPrefab;
[SerializeField] Button leaveButton;

// private Dictionary<ulong, GameObject> roomPlayerBtns = new();


// private NetworkList<RoomPlayer> allPlayers = new();
public override void OnNetworkSpawn()
{
base.OnNetworkSpawn();
Expand Down Expand Up @@ -48,8 +44,6 @@ private void ClearAllButtons()

private void OnEnable()
{
// NetworkManager.OnClientConnectedCallback += ClientConnected;
// NetworkManager.OnClientDisconnectCallback += ClientDisconnected;
if (leaveButton)
{
leaveButton.onClick.AddListener(OnClickLeave);
Expand All @@ -58,214 +52,12 @@ private void OnEnable()

private void OnDisable()
{
// NetworkManager.OnClientConnectedCallback -= ClientConnected;
// NetworkManager.OnClientDisconnectCallback -= ClientDisconnected;
if (leaveButton)
{
leaveButton.onClick.RemoveListener(OnClickLeave);
}
}

// private void ClientConnected(ulong clientId)
// {
// // RefreshPlayerContentServerRPC();
// var newPlayerButton = Instantiate(buttonPrefab, playersInRoomContent);
// if (IsLocalPlayer
// && newPlayerButton.GetComponent<Button>() is Button button
// && NetworkManager.LocalClient.PlayerObject.GetComponent<RoomPlayer>() is RoomPlayer roomPlayer)
// {
// roomPlayer.UpdateButtonRef(button);
// }
// roomPlayerBtns.Add(clientId, newPlayerButton);
// Debug.Log($"Refresh after client {clientId} enters");
// if (OwnerClientId == clientId) UpdateAllButtonsServerRpc();
// // RefreshPlayersInRoomClientRPC(clientId);
// }
// private void ClientDisconnected(ulong clientId)
// {
// // RefreshPlayerContentServerRPC();
// Debug.Log($"Refresh after client {clientId} leave");
// if (roomPlayerBtns.TryGetValue(clientId, out var buttonGO))
// {
// Destroy(buttonGO);
// }
// roomPlayerBtns.Remove(clientId);
// // if(OwnerClientId != clientId){
// // UpdateAllButtonsServerRpc();
// // }
// }

// [ServerRpc]
// public void UpdateAllButtonsServerRpc(bool hasIgnoreId = false, ulong ignoreId = 0)
// {

// }
// [ClientRpc]
// public void UpdateAllButtonsClientRpc()
// {

// }

// // [ServerRpc]
// // public void AddButtonServerRpc(Button x)
// // {

// // }

// // [ServerRpc]
// // public Button CreateOrGetPlayerButtonServerRpc(ulong clientId)
// // {
// // // Try finding button
// // foreach (var btn in roomPlayerBtns)
// // {
// // if (btn.GetComponent<NetworkObject>() is NetworkObject netObj && netObj.OwnerClientId == clientId)
// // {
// // return btn;
// // }
// // }
// // // Or create new if not found
// // var newPlayerButton = Instantiate(buttonPrefab, playersInRoomContent.transform);
// // if (newPlayerButton.GetComponent<Button>() is Button button)
// // {
// // roomPlayerBtns.Add(button);
// // return button;
// // }
// // return null;
// // }

// [ServerRpc(RequireOwnership = false)]
// public void RefreshPlayerContentServerRPC()
// {
// // Clear content
// // List<GameObject> roomPlayers = new();
// // foreach (Transform rp in playersInRoomContent.transform) roomPlayers.Add(rp.gameObject);
// // roomPlayers.ForEach(roomPlayer => Destroy(roomPlayer));
// // roomPlayerBtns.ForEach(roomPlayer => Destroy(roomPlayer));
// // roomPlayerBtns.Clear();
// RemoveAllButtonsClientRpc();
// Debug.Log("Called Refresh in room");
// foreach (var clientId in NetworkManager.Singleton.ConnectedClientsIds)
// {
// RefreshPlayersInRoomClientRPC(clientId);
// }
// // foreach (var networkPlayer in NetworkManager.Singleton.ConnectedClientsList)
// // {
// // if (networkPlayer.PlayerObject
// // && networkPlayer.PlayerObject.GetComponent<RoomPlayer>() is RoomPlayer roomPlayer)
// // {
// // var newPlayerButton = Instantiate(buttonPrefab, playersInRoomContent.transform);
// // roomPlayerBtns.Add(newPlayerButton);
// // if (newPlayerButton.GetComponent<NetworkObject>() is NetworkObject netObj)
// // {
// // netObj.SpawnWithOwnership(networkPlayer.ClientId);
// // }
// // if (newPlayerButton.GetComponent<Button>() is Button button)
// // {
// // roomPlayer.UpdateButton(button);
// // }
// // }
// // }
// }

// [ClientRpc]
// public void RemoveAllButtonsClientRpc()
// {
// // roomPlayerBtns.ForEach(roomPlayer => Destroy(roomPlayer));
// roomPlayerBtns.Clear();
// }

// [ClientRpc]
// // Refresh Player keeps everyone in sync becasue all players execute the same code
// public void RefreshPlayersInRoomClientRPC(ulong clientId)
// {
// // Spawn a button
// var newPlayerButton = Instantiate(buttonPrefab, playersInRoomContent);
// // roomPlayerBtns.Add(newPlayerButton);

// // Wire button for player if the id matches
// if (newPlayerButton.GetComponent<Button>() is Button button)
// {
// if (OwnerClientId == clientId
// && this.NetworkManager.LocalClient.PlayerObject.GetComponent<RoomPlayer>() is RoomPlayer localRoomPlayer)
// {
// localRoomPlayer.UpdateButtonRef(button);
// }
// else if (OwnerClientId != clientId)
// {
// foreach (RoomPlayer otherPlayer in FindObjectsOfType<RoomPlayer>())
// {
// if (otherPlayer.OwnerClientId == clientId)
// {
// otherPlayer.UpdateButtonRef(button, false);
// break;
// }
// }
// }
// }
// }

// public void RefreshPlayersContent()
// {
// if (IsHost || IsServer)
// {

// RefreshPlayerContentServerRPC();
// // if (playersInRoomContent == null)
// // {
// // playersInRoomContent = GameObject.FindGameObjectWithTag("PlayerList").transform;
// // }


// // if (NetworkManager)
// // {
// // foreach (var clientId in NetworkManager.ConnectedClientsIds)
// // {
// // Debug.LogWarning($"Creating name tag for client {clientId}");
// // var playerNameTag = Instantiate(roomPlayerPrefab, playersInRoomContent);
// // if (playerNameTag.GetComponent<NetworkObject>() is NetworkObject roomPlayerObj)
// // {

// // roomPlayerObj.TrySetParent(playersInRoomContent);
// // roomPlayerObj.SpawnWithOwnership(clientId);
// // }
// // roomPlayers.Add(playerNameTag);
// // }
// // }
// }
// else
// {
// RefreshPlayerContentServerRPC();
// }
// }

// [ClientRpc]
// public void RefreshPlayersInRoomClientRPC()
// {
// Debug.Log("Called Refresh in room");
// if (playersInRoomContent == null)
// {
// playersInRoomContent = GameObject.FindGameObjectWithTag("PlayerList").transform;
// }
// // Clear content
// roomPlayers.Clear();
// foreach (Transform rp in playersInRoomContent) roomPlayers.Add(rp.gameObject);
// roomPlayers.ForEach(roomPlayer => Destroy(roomPlayer));

// if (NetworkManager.Singleton is NetworkManager nm)
// {
// foreach (var clientId in nm.ConnectedClientsIds)
// {
// Debug.LogWarning($"Creating name tag for client {clientId}");
// var playerNameTag = Instantiate(roomPlayerPrefab, playersInRoomContent);
// if (playerNameTag.GetComponent<NetworkObject>() is NetworkObject roomPlayerObj)
// {
// roomPlayerObj.SpawnWithOwnership(clientId, true);
// }
// roomPlayers.Add(playerNameTag);
// }
// }
// }

public void OnClickLeave()
{
if (FindObjectOfType<LobbyManager>() is LobbyManager lobby)
Expand Down
Loading

0 comments on commit 6de2bc9

Please sign in to comment.