Compare commits

..

No commits in common. "4b228771e5ee9411caccdb3c23d6a45e05282cf7" and "05ace5aea38f164b78ed901a86c1f9188f4aa5a8" have entirely different histories.

2 changed files with 8 additions and 16 deletions

View File

@ -35,10 +35,11 @@ public class NetworkedGameSetup : NetworkBehaviour
bool isServer = SteamManager.IsServer || LocalManager.IsServer; bool isServer = SteamManager.IsServer || LocalManager.IsServer;
GameObject[] players; GameObject[] players;
if (isServer) players = SpawnPlayers(playerIds);
players = SpawnPlayers(playerIds); //if (isServer)
else // players = SpawnPlayers(playerIds);
players = GetPlayers(playerIds); //else
// players = GetPlayers(playerIds);
//StartCoroutine(LateSetupProcedue(players)); //StartCoroutine(LateSetupProcedue(players));
} }

View File

@ -73,7 +73,7 @@ public class RopeSimulator : MonoBehaviour
public static RopeSimulator instance; public static RopeSimulator instance;
private bool IsInitialized => !(start == null || end == null); private bool IsInitialized => start == null || end == null;
private void Awake() private void Awake()
{ {
@ -88,7 +88,7 @@ public class RopeSimulator : MonoBehaviour
GameManager.OnPlayersReady += PlayersReady; GameManager.OnPlayersReady += PlayersReady;
} }
private void OnEnable() private void Start()
{ {
// Example of using rope builder // Example of using rope builder
//rope = new RopeBuilder() //rope = new RopeBuilder()
@ -243,13 +243,6 @@ public class RopeSimulator : MonoBehaviour
private void RebuildRopeColliders() private void RebuildRopeColliders()
{ {
// Benjamin forgor... to assign
if (ropeCollidersParent == null)
{
var holder = new GameObject("RopeHolder");
ropeCollidersParent = holder.transform;
}
for (int i = 0; i < ropeCollidersParent.childCount; i++) for (int i = 0; i < ropeCollidersParent.childCount; i++)
{ {
Destroy(ropeCollidersParent.GetChild(i)); Destroy(ropeCollidersParent.GetChild(i));
@ -273,7 +266,7 @@ public class RopeSimulator : MonoBehaviour
private void Update() private void Update()
{ {
if (!IsInitialized) if (IsInitialized)
return; return;
colliderToSquezeForce.Clear(); colliderToSquezeForce.Clear();
@ -385,8 +378,6 @@ public class RopeSimulator : MonoBehaviour
private void OnDrawGizmos() private void OnDrawGizmos()
{ {
return;
if (IsInitialized) return; if (IsInitialized) return;
if (!Application.isPlaying) return; if (!Application.isPlaying) return;