yulong
/
NewN_UAVPlane
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

212

This commit is contained in:
YangHua 2024-01-23 13:52:06 +08:00
parent 4a171571f3
commit b23c788ecd
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/Zion/Scripts/Adam/GameManager.cs
View File

@ -82,7 +82,6 @@ public class GameManager : MonoSingleton<GameManager>
spt.transform.eulerAngles = blueSpawnPos.eulerAngles; spt.transform.eulerAngles = blueSpawnPos.eulerAngles;
spt.gameObject.SetActive(true); spt.gameObject.SetActive(true);
spt.GetComponent<Camera>().cullingMask = ~(1 << 11); spt.GetComponent<Camera>().cullingMask = ~(1 << 11);
//spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
if (UIBootstrap.Instance.GetDeviceByName("探测雷达").device_count > 0) if (UIBootstrap.Instance.GetDeviceByName("探测雷达").device_count > 0)
{ {
for (int i = 0; i < UIBootstrap.Instance.GetDeviceByName("探测雷达").device_count; i++) for (int i = 0; i < UIBootstrap.Instance.GetDeviceByName("探测雷达").device_count; i++)
@ -139,7 +138,6 @@ public class GameManager : MonoSingleton<GameManager>
if (GlobalFlag.isStartRehearsing) if (GlobalFlag.isStartRehearsing)
{ {
spt.GetComponent<Camera>().cullingMask = -1; spt.GetComponent<Camera>().cullingMask = -1;
//spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
} }
} }
if (GlobalFlag.currentUser.role_code == "03") if (GlobalFlag.currentUser.role_code == "03")
@ -147,7 +145,6 @@ public class GameManager : MonoSingleton<GameManager>
Teacher.gameObject.SetActive(true); Teacher.gameObject.SetActive(true);
student.gameObject.SetActive(false); student.gameObject.SetActive(false);
spt.GetComponent<Camera>().cullingMask = -1; spt.GetComponent<Camera>().cullingMask = -1;
//spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
} }
if (GlobalFlag.currentUser.role_code == "02") if (GlobalFlag.currentUser.role_code == "02")
{ {
@ -155,8 +152,8 @@ public class GameManager : MonoSingleton<GameManager>
student.gameObject.SetActive(false); student.gameObject.SetActive(false);
posture.gameObject.SetActive(true); posture.gameObject.SetActive(true);
spt.GetComponent<Camera>().cullingMask = -1; spt.GetComponent<Camera>().cullingMask = -1;
//spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
} }
spt.GetComponent<Camera>().cullingMask &= ~(1 << 15);
tenkokuModule.mainCamera = spt.transform; tenkokuModule.mainCamera = spt.transform;
AddPlayers(spt); AddPlayers(spt);
@ -239,12 +236,12 @@ public class GameManager : MonoSingleton<GameManager>
} }
else else
{ {
//spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
spt.gameObject.transform.position = blueSpawnPos.position; spt.gameObject.transform.position = blueSpawnPos.position;
spt.gameObject.transform.eulerAngles = blueSpawnPos.eulerAngles; spt.gameObject.transform.eulerAngles = blueSpawnPos.eulerAngles;
} }
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);
AddPlayers(spt); AddPlayers(spt);
} }
break; break;