This commit is contained in:
parent
32798355eb
commit
26cdd8ed03
File diff suppressed because it is too large
Load Diff
|
@ -220,7 +220,6 @@ public class GameManager : MonoSingleton<GameManager>
|
||||||
{
|
{
|
||||||
yield return new WaitForSeconds(0.5f);
|
yield return new WaitForSeconds(0.5f);
|
||||||
string[] data = msg.Split(',');
|
string[] data = msg.Split(',');
|
||||||
//Debug.Log($"<color=green>{data[0]}+{data[1]}</color>");
|
|
||||||
switch (data[0])
|
switch (data[0])
|
||||||
{
|
{
|
||||||
case "online":
|
case "online":
|
||||||
|
@ -228,11 +227,9 @@ public class GameManager : MonoSingleton<GameManager>
|
||||||
if (!userIds.Contains(userId))
|
if (!userIds.Contains(userId))
|
||||||
{
|
{
|
||||||
SyncPlayerTransform spt = Instantiate(playerTransformPrefab);
|
SyncPlayerTransform spt = Instantiate(playerTransformPrefab);
|
||||||
//spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
|
|
||||||
//0 red 1 blue
|
//0 red 1 blue
|
||||||
if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) == "0")
|
if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) == "0")
|
||||||
{
|
{
|
||||||
//spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
|
|
||||||
spt.gameObject.transform.position = redSpawnPos.position;
|
spt.gameObject.transform.position = redSpawnPos.position;
|
||||||
spt.gameObject.transform.eulerAngles = redSpawnPos.eulerAngles;
|
spt.gameObject.transform.eulerAngles = redSpawnPos.eulerAngles;
|
||||||
}
|
}
|
||||||
|
@ -243,7 +240,7 @@ public class GameManager : MonoSingleton<GameManager>
|
||||||
}
|
}
|
||||||
spt.gameObject.SetActive(true);
|
spt.gameObject.SetActive(true);
|
||||||
spt.SetPlayerInfo(userId, data[2], ulong.Parse(data[3]), false);
|
spt.SetPlayerInfo(userId, data[2], ulong.Parse(data[3]), false);
|
||||||
spt.GetComponent<Camera>().cullingMask &= ~(1 << 15);
|
//spt.GetComponent<Camera>().cullingMask &= ~(1 << 15);
|
||||||
AddPlayers(spt);
|
AddPlayers(spt);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue