diff --git a/Assets/StreamingAssets/IPPort.txt b/Assets/StreamingAssets/IPPort.txt index b2035e1f..298829e4 100644 --- a/Assets/StreamingAssets/IPPort.txt +++ b/Assets/StreamingAssets/IPPort.txt @@ -1 +1 @@ -192.168.1.5:48888 \ No newline at end of file +127.0.0.1:48888 \ No newline at end of file diff --git a/Assets/StreamingAssets/confing.txt b/Assets/StreamingAssets/confing.txt index 8de8d0dc..e56ea71e 100644 --- a/Assets/StreamingAssets/confing.txt +++ b/Assets/StreamingAssets/confing.txt @@ -1 +1 @@ -192.168.1.5 \ No newline at end of file +127.0.0.1 \ No newline at end of file diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs index 445def1a..d9bceddb 100644 --- a/Assets/Zion/Scripts/Adam/GameManager.cs +++ b/Assets/Zion/Scripts/Adam/GameManager.cs @@ -46,14 +46,14 @@ public class GameManager : MonoSingleton 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().cullingMask = ~(1 << 12); - spt.GetComponent().cullingMask = ~(1 << 15); + //spt.GetComponent().cullingMask = ~(1 << 15); AdamThinkDevicesData.DataItem diTemp = UIBootstrap.Instance.GetDeviceByName("蜂群无人机"); if (diTemp.device_count > 0) { @@ -82,7 +82,7 @@ public class GameManager : MonoSingleton spt.transform.eulerAngles = blueSpawnPos.eulerAngles; spt.gameObject.SetActive(true); spt.GetComponent().cullingMask = ~(1 << 11); - spt.GetComponent().cullingMask = ~(1 << 15); + //spt.GetComponent().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 if (GlobalFlag.isStartRehearsing) { spt.GetComponent().cullingMask = -1; - spt.GetComponent().cullingMask = ~(1 << 15); + //spt.GetComponent().cullingMask = ~(1 << 15); } } if (GlobalFlag.currentUser.role_code == "03") @@ -147,7 +147,7 @@ public class GameManager : MonoSingleton Teacher.gameObject.SetActive(true); student.gameObject.SetActive(false); spt.GetComponent().cullingMask = -1; - spt.GetComponent().cullingMask = ~(1 << 15); + //spt.GetComponent().cullingMask = ~(1 << 15); } if (GlobalFlag.currentUser.role_code == "02") { @@ -155,7 +155,7 @@ public class GameManager : MonoSingleton student.gameObject.SetActive(false); posture.gameObject.SetActive(true); spt.GetComponent().cullingMask = -1; - spt.GetComponent().cullingMask = ~(1 << 15); + //spt.GetComponent().cullingMask = ~(1 << 15); } tenkokuModule.mainCamera = spt.transform; @@ -229,17 +229,17 @@ public class GameManager : MonoSingleton if (!userIds.Contains(userId)) { SyncPlayerTransform spt = Instantiate(playerTransformPrefab); - spt.GetComponent().cullingMask = ~(1 << 15); + //spt.GetComponent().cullingMask = ~(1 << 15); //0 red 1 blue if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) == "0") { - spt.GetComponent().cullingMask = ~(1 << 15); + //spt.GetComponent().cullingMask = ~(1 << 15); spt.gameObject.transform.position = redSpawnPos.position; spt.gameObject.transform.eulerAngles = redSpawnPos.eulerAngles; } else { - spt.GetComponent().cullingMask = ~(1 << 15); + //spt.GetComponent().cullingMask = ~(1 << 15); spt.gameObject.transform.position = blueSpawnPos.position; spt.gameObject.transform.eulerAngles = blueSpawnPos.eulerAngles; }