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

Compare commits

base: yulong:6c9c44dabcdb6502a591b3d51cf8e3fbcaf8bc40
Branches Tags
yulong:master
...
compare: yulong:4a171571f3a77f172744253cdc309950dbfbb2b4
Branches Tags
yulong:master

2 Commits
6c9c44dabc ... 4a171571f3

Author SHA1 Message Date
YangHua 4a171571f3 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-23 13:40:23 +08:00
YangHua a4392b7793 w 2024-01-23 13:39:36 +08:00
3 changed files with 11 additions and 11 deletions
Show Stats Expand all files Collapse all files

2
Assets/StreamingAssets/IPPort.txt
View File

@ -1 +1 @@
192.168.1.5:48888
127.0.0.1:48888

2
Assets/StreamingAssets/confing.txt
View File

@ -1 +1 @@
192.168.1.5
127.0.0.1

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

@ -46,14 +46,14 @@ public class GameManager : MonoSingleton<GameManager>
spt.SetPlayerInfo(ulong.Parse(GlobalFlag.currentUser.user_id), GlobalFlag.currentUser.login_name, ulong.Parse(GlobalFlag.roomID), true);
currentSpt = spt;
ToolsBootstrap.Instance.SetCameraInfo(spt);
//0 red 1 blue
//0 red layer ==11 , 1 blue layer ==12
if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) == "0")
{
spt.transform.position = redSpawnPos.position;
spt.transform.eulerAngles = redSpawnPos.eulerAngles;
spt.gameObject.SetActive(true);
spt.GetComponent<Camera>().cullingMask = ~(1 << 12);
spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
//spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
AdamThinkDevicesData.DataItem diTemp = UIBootstrap.Instance.GetDeviceByName("蜂群无人机");
if (diTemp.device_count > 0)
{
@ -82,7 +82,7 @@ public class GameManager : MonoSingleton<GameManager>
spt.transform.eulerAngles = blueSpawnPos.eulerAngles;
spt.gameObject.SetActive(true);
spt.GetComponent<Camera>().cullingMask = ~(1 << 11);
spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
//spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
if (UIBootstrap.Instance.GetDeviceByName("探测雷达").device_count > 0)
{
for (int i = 0; i < UIBootstrap.Instance.GetDeviceByName("探测雷达").device_count; i++)
@ -139,7 +139,7 @@ public class GameManager : MonoSingleton<GameManager>
if (GlobalFlag.isStartRehearsing)
{
spt.GetComponent<Camera>().cullingMask = -1;
spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
//spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
}
}
if (GlobalFlag.currentUser.role_code == "03")
@ -147,7 +147,7 @@ public class GameManager : MonoSingleton<GameManager>
Teacher.gameObject.SetActive(true);
student.gameObject.SetActive(false);
spt.GetComponent<Camera>().cullingMask = -1;
spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
//spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
}
if (GlobalFlag.currentUser.role_code == "02")
{
@ -155,7 +155,7 @@ public class GameManager : MonoSingleton<GameManager>
student.gameObject.SetActive(false);
posture.gameObject.SetActive(true);
spt.GetComponent<Camera>().cullingMask = -1;
spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
//spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
}
tenkokuModule.mainCamera = spt.transform;
@ -229,17 +229,17 @@ public class GameManager : MonoSingleton<GameManager>
if (!userIds.Contains(userId))
{
SyncPlayerTransform spt = Instantiate(playerTransformPrefab);
spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
//spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
//0 red 1 blue
if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) == "0")
{
spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
//spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
spt.gameObject.transform.position = redSpawnPos.position;
spt.gameObject.transform.eulerAngles = redSpawnPos.eulerAngles;
}
else
{
spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
//spt.GetComponent<Camera>().cullingMask = ~(1 << 15);
spt.gameObject.transform.position = blueSpawnPos.position;
spt.gameObject.transform.eulerAngles = blueSpawnPos.eulerAngles;
}