diff --git a/Assets/Temp/Scripts/Backpack.cs b/Assets/Temp/Scripts/Backpack.cs index 28e50fce..c6596141 100644 --- a/Assets/Temp/Scripts/Backpack.cs +++ b/Assets/Temp/Scripts/Backpack.cs @@ -28,6 +28,7 @@ public class Backpack : MonoBehaviour void Update() { + if (GlobalFlag.isStartRehearsing) return; if (Input.GetMouseButtonDown(1)) { time = 0.2f; diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs index 0efedaa8..9efe8b71 100644 --- a/Assets/Zion/Scripts/Adam/GameManager.cs +++ b/Assets/Zion/Scripts/Adam/GameManager.cs @@ -211,11 +211,13 @@ public class GameManager : MonoSingleton { if (hitInfo.collider.tag == "WRJ") { - UnmannedAerialVehicleManage unmannedAerialVehicleManage = hitInfo.collider.GetComponent(); - UnmannedAerialVehicleUI.Instance.unmannedAerialVehicleManage = unmannedAerialVehicleManage; - UnmannedAerialVehicleUI.Instance.ShowButton(); - - DroneViewDisplay.Instance.CreateUI(unmannedAerialVehicleManage, true); + if (hitInfo.collider.GetComponent() != null) + { + UnmannedAerialVehicleManage unmannedAerialVehicleManage = hitInfo.collider.GetComponent(); + UnmannedAerialVehicleUI.Instance.unmannedAerialVehicleManage = unmannedAerialVehicleManage; + UnmannedAerialVehicleUI.Instance.ShowButton(); + DroneViewDisplay.Instance.CreateUI(unmannedAerialVehicleManage, true); + } } } } diff --git a/Assets/Zion/Scripts/Adam/UIBootstrap.cs b/Assets/Zion/Scripts/Adam/UIBootstrap.cs index 8a0932cf..a253c5f8 100644 --- a/Assets/Zion/Scripts/Adam/UIBootstrap.cs +++ b/Assets/Zion/Scripts/Adam/UIBootstrap.cs @@ -115,8 +115,6 @@ public class UIBootstrap : MonoSingleton return false; } - - public void OnGetWorldInfo(string msg) { Debug.Log("OnGetWorldInfo====" + msg); diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs index 71b150d7..bf5b3275 100644 --- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs +++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs @@ -269,10 +269,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour } break; } - - } - var _unmannedAerialVehicle = unmannedAerialVehicles.FindAll(x => x != null && x.gameObject.activeSelf); if (_unmannedAerialVehicle.Count == 0) { diff --git a/Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs b/Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs index 2423b029..7b068768 100644 --- a/Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs +++ b/Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs @@ -64,7 +64,6 @@ public class DroneViewDisplay : MonoSingleton /// 是否显示 public void CreateUI(UnmannedAerialVehicleManage unmannedAerialVehicleManage, bool isShow) { - Debug.Log("生成:" + unmannedAerialVehicleManage.transform.name); if (unmannedAerialVehicleManage.equipmentCommon.deviceID.Length < 10) return; RadioAngleView radioAngleView = radioAngleViews.Find(x => x.deviceID == unmannedAerialVehicleManage.equipmentCommon.deviceID); if (radioAngleView)