diff --git a/Assets/Temp/Scripts/Mastermanagement.cs b/Assets/Temp/Scripts/Mastermanagement.cs index 743a4bc4..b4ad2e47 100644 --- a/Assets/Temp/Scripts/Mastermanagement.cs +++ b/Assets/Temp/Scripts/Mastermanagement.cs @@ -20,7 +20,7 @@ public class Mastermanagement : MonoBehaviour private IEnumerator WaitGetAllDevice() { yield return new WaitForSeconds(0.1f); - Debug.Log("wew"); + weapongames = DeviceManager.Instance.GetPlayerDecive1(); if (weapongames.Count > 0) { diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs index 9e2f1955..2a51e677 100644 --- a/Assets/Zion/Scripts/Adam/GameManager.cs +++ b/Assets/Zion/Scripts/Adam/GameManager.cs @@ -157,6 +157,7 @@ public class GameManager : MonoSingleton tenkokuModule.mainCamera = spt.transform; AddPlayers(spt); + DeviceManager.Instance.isStartRehearsing = GlobalFlag.isStartRehearsing; } @@ -306,6 +307,7 @@ public class GameManager : MonoSingleton if (GlobalFlag.currentUser.role_code == "04") { currentSpt.GetComponent().cullingMask = -1; + currentSpt.GetComponent().cullingMask &= ~(1 << 15); } } } @@ -404,7 +406,6 @@ public class GameManager : MonoSingleton if (!userIds.Contains(ulong.Parse(userInfo[0]))) { SyncPlayerTransform spt = Instantiate(playerTransformPrefab); - spt.GetComponent().cullingMask = ~(1 << 15); //0 red 1 blue if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) == "0") { diff --git a/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs b/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs index b8cb9aee..2a357448 100644 --- a/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs +++ b/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs @@ -262,9 +262,9 @@ public class EquipmentCommon : MonoBehaviour } break; case "SingleDronePosition"://无人机攻击目标锁定 - Debug.Log("接受...:"+data[0] +","+ data[1] + "," + data[2] + "," + data[3] + "," + data[4]); + Debug.Log("接受...:" + data[0] + "," + data[1] + "," + data[2] + "," + data[3] + "," + data[4]); UnmannedAerialVehicleManage unmannedAerialVehicleManage = GetComponent(); - if (unmannedAerialVehicleManage&& unmannedAerialVehicleManage.wrjModel== WRJModel.自杀式无人机) + if (unmannedAerialVehicleManage && unmannedAerialVehicleManage.wrjModel == WRJModel.自杀式无人机) { for (int i = 0; i < unmannedAerialVehicleManage.unmannedAerialVehicles.Count; i++) { @@ -313,7 +313,8 @@ public class EquipmentCommon : MonoBehaviour } } - IEnumerator UnmannedAerialVehicleAddBao(UnmannedAerialVehicle unmannedAerialVehicle) { + IEnumerator UnmannedAerialVehicleAddBao(UnmannedAerialVehicle unmannedAerialVehicle) + { yield return new WaitForSeconds(0.6f); unmannedAerialVehicle.AddBao(false); }