Skip to content

Private Lobby + Username + Prevent same team #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ArthurRibeirox wants to merge 3 commits into
base: Final-Version
Choose a base branch
from
Open

Private Lobby + Username + Prevent same team #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
760dc1e
Join private lobby logic
ArthurRibeirox Jun 30, 2022
e31f695
Change username logic
ArthurRibeirox Jun 30, 2022
b5badc0
Prevent same team tanks
ArthurRibeirox Jun 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Assets/Scripts/Menus/CreateLobbyPopup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ private void OnCreateButtonClicked()
{
if (string.IsNullOrEmpty(lobbyNameInput.text)) return;

RoomOptions roomOptions = new RoomOptions { IsOpen = true, MaxPlayers = 4 };
RoomOptions roomOptions = new RoomOptions { IsVisible = !IsPrivate, IsOpen = true, MaxPlayers = 4 };
PhotonNetwork.CreateRoom(lobbyNameInput.text, roomOptions, TypedLobby.Default);
}

Expand Down
3 changes: 2 additions & 1 deletion Assets/Scripts/Menus/JoinPrivateLobbyPopup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using Photon.Pun;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
Expand Down Expand Up @@ -33,7 +34,7 @@ private void OnEnterClicked()
if (string.IsNullOrEmpty(lobbyNameInput.text)) return;
LoadingGraphics.Enable();

// TODO: Join target room
PhotonNetwork.JoinRoom(lobbyNameInput.text);
}
}
}
28 changes: 26 additions & 2 deletions Assets/Scripts/Menus/PlayerLobbyEntry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public void Setup(Player entryPlayer)

if (IsLocalPlayer)
{
PlayerTeam = (player.ActorNumber - 1) % PhotonNetwork.CurrentRoom.MaxPlayers;
PlayerTeam = GetAvailableTeam(0);
}

playerName.text = player.NickName;
Expand Down Expand Up @@ -82,9 +82,33 @@ private void Start()
readyButton.gameObject.SetActive(false);
}

private int GetAvailableTeam(int desiredTeam)
{
while (true)
{
bool available = true;

foreach (var currentPlayer in PhotonNetwork.PlayerList)
{
if (currentPlayer == PhotonNetwork.LocalPlayer) continue;

int team = currentPlayer.CustomProperties.ContainsKey("Team") ?
(int) currentPlayer.CustomProperties["Team"] : 0;

if (team == desiredTeam)
{
available = false;
desiredTeam = (desiredTeam + 1) % PhotonNetwork.CurrentRoom.MaxPlayers;
}
}

if (available) return desiredTeam;
}
}

private void OnChangeTeamButtonClicked()
{
PlayerTeam = (PlayerTeam + 1) % PhotonNetwork.CurrentRoom.MaxPlayers;
PlayerTeam = GetAvailableTeam((PlayerTeam + 1) % PhotonNetwork.CurrentRoom.MaxPlayers);
}

private void OnReadyButtonClick(bool isReady)
Expand Down
4 changes: 2 additions & 2 deletions Assets/Scripts/Menus/SettingsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using Photon.Pun;
using TMPro;
using UnityEngine;
using UnityEngine.Audio;
Expand Down Expand Up @@ -56,8 +57,7 @@ private void OnCloseButtonClicked()
gameObject.SetActive(false);

PlayerPrefs.SetString("PlayerName", playerNameInput.text);

// TODO: Update photon local player nickname
PhotonNetwork.NickName = playerNameInput.text;
}

private void SetSound(string id, bool newValue, Button disabledButton, Button enabledButton)
Expand Down