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

Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane

This commit is contained in:
YangHua 2024-01-28 17:27:19 +08:00
parent 98f2297cb8 9f95bbadf3
commit 8dbbc60083
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Temp/Scripts/Spectrumdetection.cs
View File

@ -368,7 +368,7 @@ public class Spectrumdetection : MonoBehaviour
{ {
SpectrumdetectionUI.SetActive(true); SpectrumdetectionUI.SetActive(true);
} }
if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) != "0") if (GlobalFlag.blueOrRed == 1)
{ {
EquipmentCommon equipmentCommon1 = GetComponent<EquipmentCommon>(); EquipmentCommon equipmentCommon1 = GetComponent<EquipmentCommon>();
if (equipmentCommon.deviceID == equipmentCommon1.deviceID) if (equipmentCommon.deviceID == equipmentCommon1.deviceID)

13
Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs
View File

@ -131,14 +131,14 @@ public class RadarManger : MonoBehaviour
} }
void Start() void Start()
{ {
equipmentCommon = GetComponent<EquipmentCommon>(); equipmentCommon = GetComponent<EquipmentCommon>();
// 订阅布尔值变化事件 // 订阅布尔值变化事件
OnActivationChanged += OnActivationChangedHandler; OnActivationChanged += OnActivationChangedHandler;
DroneViewDisplay.Instance.CreateUI(equipmentCommon.deviceID, minCamera, rawImage); DroneViewDisplay.Instance.CreateUI(equipmentCommon.deviceID, minCamera, rawImage);
} }
#region 启动暂停 #region 启动暂停
/// <summary> /// <summary>
/// 导条变化调用 /// 导条变化调用
@ -199,10 +199,10 @@ public class RadarManger : MonoBehaviour
void CreateRadarUI() void CreateRadarUI()
{ {
imageprs.transform.localScale = Vector3.zero; imageprs.transform.localScale = Vector3.zero;
aniRandarUI =imageprs.GetComponent<Animator>(); aniRandarUI = imageprs.GetComponent<Animator>();
RadarRotationSpeed(TurntableSpeed); RadarRotationSpeed(TurntableSpeed);
} }
/// <summary> /// <summary>
/// 数据写入 /// 数据写入
/// </summary> /// </summary>
@ -324,8 +324,9 @@ public class RadarManger : MonoBehaviour
/// </summary> /// </summary>
private void OnMouseDown() private void OnMouseDown()
{ {
if (equipmentCommon.isPlayer) if (equipmentCommon.isPlayer && GlobalFlag.blueOrRed == 1)
{ {
imageprs.gameObject.SetActive(true); imageprs.gameObject.SetActive(true);
} }
} }

2
Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs
View File

@ -250,7 +250,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
/// <summary> /// <summary>
private void Detection() private void Detection()
{ {
if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) != "0" && Input.GetMouseButtonDown(0)) if (GlobalFlag.blueOrRed == 1 && Input.GetMouseButtonDown(0))
{ {
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
RaycastHit hit; RaycastHit hit;

4
Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs
View File

@ -1029,6 +1029,8 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
} }
private void OnDestroy() private void OnDestroy()
{ {
if (airRoute)
Destroy(airRoute.gameObject);
for (int i = 0; i < unmannedAerialVehicleManages.Count; i++) for (int i = 0; i < unmannedAerialVehicleManages.Count; i++)
{ {
if (unmannedAerialVehicleManages[i] == null) if (unmannedAerialVehicleManages[i] == null)
@ -1038,7 +1040,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
} }
StopCoroutine(ShowRadarTips(0, 0)); StopCoroutine(ShowRadarTips(0, 0));
OnActivationChanged -= OnActivationChangedHandler; OnActivationChanged -= OnActivationChangedHandler;
Destroy(airRoute.gameObject);
} }