Skip to content

Commit 3bb17c4

Browse files
committed
Build
1 parent a76116f commit 3bb17c4

File tree

5 files changed

+15
-31
lines changed

5 files changed

+15
-31
lines changed

Assets/Models/Prefabs/Player/Player.prefab

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1189,7 +1189,6 @@ GameObject:
11891189
- component: {fileID: 8857613411308452221}
11901190
- component: {fileID: 736971308655080526}
11911191
- component: {fileID: 8589392940041840514}
1192-
- component: {fileID: 3569763299622590887}
11931192
- component: {fileID: 1006152179527841146}
11941193
- component: {fileID: 5166645992270126297}
11951194
- component: {fileID: 7601139367634706953}
@@ -1396,21 +1395,6 @@ MonoBehaviour:
13961395
syncDirection: 0
13971396
syncMode: 0
13981397
syncInterval: 0
1399-
--- !u!114 &3569763299622590887
1400-
MonoBehaviour:
1401-
m_ObjectHideFlags: 0
1402-
m_CorrespondingSourceObject: {fileID: 0}
1403-
m_PrefabInstance: {fileID: 0}
1404-
m_PrefabAsset: {fileID: 0}
1405-
m_GameObject: {fileID: 3457052791952885453}
1406-
m_Enabled: 1
1407-
m_EditorHideFlags: 0
1408-
m_Script: {fileID: 11500000, guid: 9021b6cc314944290986ab6feb48db79, type: 3}
1409-
m_Name:
1410-
m_EditorClassIdentifier:
1411-
height: 150
1412-
maxLogCount: 50
1413-
hotKey: 293
14141398
--- !u!114 &1006152179527841146
14151399
MonoBehaviour:
14161400
m_ObjectHideFlags: 0

Assets/Scenes/Level.unity

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4930,7 +4930,7 @@ MonoBehaviour:
49304930
m_Script: {fileID: 11500000, guid: 057e7bee18a05974fadb2326fc0d4887, type: 3}
49314931
m_Name:
49324932
m_EditorClassIdentifier:
4933-
_plawnPointsHolder: {fileID: 1237240234}
4933+
_spawnPointsHolder: {fileID: 1237240234}
49344934
--- !u!1 &1263622676
49354935
GameObject:
49364936
m_ObjectHideFlags: 0

Assets/Scripts/GameSession/NetworkPlayerManager.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ public override void OnServerAddPlayer(NetworkConnectionToClient conn)
2020

2121
private void InstantiatePlayer(NetworkConnectionToClient conn)
2222
{
23-
var randomPlace = Random.Range(0, SpawnPointsHolder.Instanse.AllSpawnPoints.Count - 1);
24-
var player = Instantiate(playerPrefab, SpawnPointsHolder.Instanse.AllSpawnPoints[randomPlace].position,
25-
SpawnPointsHolder.Instanse.AllSpawnPoints[randomPlace].rotation);
23+
var randomPlace = Random.Range(0, SpawnPointsHolder.Instance.AllSpawnPoints.Count - 1);
24+
var player = Instantiate(playerPrefab, SpawnPointsHolder.Instance.AllSpawnPoints[randomPlace].position,
25+
SpawnPointsHolder.Instance.AllSpawnPoints[randomPlace].rotation);
2626
player.name = $"{playerPrefab.name} {conn.connectionId + 1}";
2727
NetworkServer.AddPlayerForConnection(conn, player.gameObject);
28-
SpawnPointsHolder.Instanse.AllSpawnPoints.RemoveAt(randomPlace);
28+
SpawnPointsHolder.Instance.AllSpawnPoints.RemoveAt(randomPlace);
2929
}
3030

3131
public void EndOfGameSession()
@@ -43,7 +43,7 @@ private IEnumerator RestartSceneDelayed()
4343
yield break;
4444
}
4545

46-
SpawnPointsHolder.Instanse.FillListOfPoints();
46+
SpawnPointsHolder.Instance.FillListOfPoints();
4747

4848
for (var i = 0; i < FillPlayerInfo.Instance.PlayerScore.Count; i++)
4949
{
@@ -52,11 +52,11 @@ private IEnumerator RestartSceneDelayed()
5252

5353
foreach (var playerIdentity in NetworkClient.spawned.Values)
5454
{
55-
var randomPlace = Random.Range(0, SpawnPointsHolder.Instanse.AllSpawnPoints.Count - 1);
55+
var randomPlace = Random.Range(0, SpawnPointsHolder.Instance.AllSpawnPoints.Count - 1);
5656
var player = playerIdentity.transform;
57-
player.position = SpawnPointsHolder.Instanse.AllSpawnPoints[randomPlace].position;
58-
player.rotation = SpawnPointsHolder.Instanse.AllSpawnPoints[randomPlace].rotation;
59-
SpawnPointsHolder.Instanse.AllSpawnPoints.RemoveAt(randomPlace);
57+
player.position = SpawnPointsHolder.Instance.AllSpawnPoints[randomPlace].position;
58+
player.rotation = SpawnPointsHolder.Instance.AllSpawnPoints[randomPlace].rotation;
59+
SpawnPointsHolder.Instance.AllSpawnPoints.RemoveAt(randomPlace);
6060
player.gameObject.GetComponent<PlayerScore>().CmdChangeScore(0, player.gameObject.name);
6161
if (playerIdentity.isClient)
6262
{

Assets/Scripts/Spawn/SpawnPointsHolder.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@ public class SpawnPointsHolder : MonoBehaviour
1010
{
1111
public List<Transform> AllSpawnPoints { get; } = new();
1212

13-
public static SpawnPointsHolder Instanse { get; private set; }
13+
public static SpawnPointsHolder Instance { get; private set; }
1414

15-
[SerializeField] private Transform _plawnPointsHolder;
15+
[SerializeField] private Transform _spawnPointsHolder;
1616

1717
private void Awake()
1818
{
19-
Instanse = this;
19+
Instance = this;
2020
FillListOfPoints();
2121
}
2222

2323
public void FillListOfPoints()
2424
{
25-
foreach (var point in _plawnPointsHolder.GetComponentsInChildren<Transform>())
25+
foreach (var point in _spawnPointsHolder.GetComponentsInChildren<Transform>())
2626
{
27-
if (point == _plawnPointsHolder) continue;
27+
if (point == _spawnPointsHolder) continue;
2828
AllSpawnPoints.Add(point);
2929
}
3030
}

MultiWalker.zip

-55 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)