diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/Device/CameraDevice.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/Device/CameraDevice.cs index 722a7a48..674f0c1f 100644 --- a/BulkCargo_UnityProject/Assets/Scripts/wj/Device/CameraDevice.cs +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Device/CameraDevice.cs @@ -9,6 +9,9 @@ public class CameraDevice : DeviceBase /// public void SetActiveState() { - DeviceUI.gameObject.SetActive(T_BAS_CAMERA != null); + if (DeviceUI != null) + { + DeviceUI.gameObject.SetActive(T_BAS_CAMERA != null); + } } } diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/ApiManager.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/ApiManager.cs index 46dce501..9edecbd7 100644 --- a/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/ApiManager.cs +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/ApiManager.cs @@ -155,6 +155,7 @@ public class ApiManager : Singleton } } })); + //return; //获取摄像机列表 StartCoroutine(GetCameraList()); //获取堆区列表 diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/MainScene.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/MainScene.cs index 5c208dc6..b2648f2f 100644 --- a/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/MainScene.cs +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/MainScene.cs @@ -112,6 +112,7 @@ public class MainScene : Singleton { DeviceBase.CameraList[i].T_BAS_CAMERA = _camera; DeviceBase.CameraList[i].DeviceUI.InitData(); + DeviceBase.CameraList[i].SetActiveState(); } else { diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/UI/DeviceUIBase.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/UI/DeviceUIBase.cs index 9a24eca2..f7796d16 100644 --- a/BulkCargo_UnityProject/Assets/Scripts/wj/UI/DeviceUIBase.cs +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/UI/DeviceUIBase.cs @@ -46,6 +46,8 @@ public class DeviceUIBase : MonoBehaviour, IPointerClickHandler { case DeviceType.CAMERA: transform.name = "Camera_UI_" + DeviceIndex; + //默认不展示摄像机 + gameObject.SetActive(false); break; case DeviceType.BELT_SCALE: break;