FIXED THE COLORS!!!

dcmrobin · Mar 29, 2023 · 07d35bd · 07d35bd
1 parent 0d9053e
commit 07d35bd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/Assets/Game/Scripts/GameSetupController.cs b/Assets/Game/Scripts/GameSetupController.cs
@@ -4,13 +4,15 @@
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
+using Photon.Realtime;
 
-public class GameSetupController : MonoBehaviour
+public class GameSetupController : MonoBehaviourPunCallbacks
 {
     //public Camera[] cameras;
     public Camera[] cameras;
     Text usrText;
     public Color playerCol;
+    GameObject player;
     //public Camera SceneCam;
     // Start is called before the first frame update
     void Awake()
@@ -24,9 +26,16 @@ private void CreatePlayer()
     {
         Debug.Log("Creating Player");
         GameObject myPlayerGo = (GameObject)PhotonNetwork.Instantiate(Path.Combine("PhotonPrefabs", "Player"), Vector3.zero, Quaternion.identity);
+        player = myPlayerGo;
         myPlayerGo.transform.Find("Camerapivot").Find("Camera").GetComponent<Camera>().enabled = true;
         usrText = GameObject.FindGameObjectWithTag("lobbyController").GetComponent<LobbyController>().userNmText;
         myPlayerGo.GetComponent<PhotonView>().Owner.NickName = usrText.text;
         myPlayerGo.GetComponent<PhotonView>().RPC("GetColor", RpcTarget.All, playerCol.r, playerCol.g, playerCol.b);
     }
+
+    public override void OnPlayerEnteredRoom(Player newPlayer)
+    {
+        base.OnPlayerEnteredRoom(newPlayer);
+        player.GetComponent<PhotonView>().RPC("UpdatePlayerColor", RpcTarget.All, playerCol.r, playerCol.g, playerCol.b);
+    }
 }
diff --git a/Assets/Game/Scripts/PlayerController.cs b/Assets/Game/Scripts/PlayerController.cs
@@ -7,7 +7,6 @@
 
 public class PlayerController : MonoBehaviourPunCallbacks
 {
-    Color playerColor;
     public Text nickname;
     GameObject[] playerCrosshairs;
     public GameObject[] allCars;
@@ -49,18 +48,17 @@ public class PlayerController : MonoBehaviourPunCallbacks
     public bool isRunning = false;
     public PhotonView pv;
 
-    public override void OnPlayerEnteredRoom(Player newPlayer)
+    /*public override void OnPlayerEnteredRoom(Player newPlayer)
     {
         base.OnPlayerEnteredRoom(newPlayer);
         //PhotonNetwork.LocalPlayer.SetCustomProperties(WHAT DO I PUT IN HERE!!!!);
         pv.RPC("UpdatePlayerColor", RpcTarget.All, playerColor.r, playerColor.g, playerColor.b);
-    }
+    }*/
 
     void Start()
     {
         rb = GetComponent<Rigidbody>();
         nickname.text = pv.Owner.NickName;
-        playerColor = GameObject.Find("GameSetup").GetComponent<GameSetupController>().playerCol;
         //pauseMenu = GameObject.FindGameObjectWithTag("pausemenu");
         //crosshair = GameObject.FindGameObjectWithTag("crosshair");
         //pauseMenu.SetActive(false);