diff --git a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab index 7965e137..a412c397 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab @@ -620,6 +620,9 @@ MonoBehaviour: opticalReconnaissanceCapability: 1 attackColliders1: [] currentCollider: {fileID: 0} + layerMask: + serializedVersion: 2 + m_Bits: 256 --- !u!1 &7326748669528570608 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GameAssets/Prefebs/Models/无人机.prefab b/Assets/GameAssets/Prefebs/Models/无人机.prefab index e3b52630..6515ec39 100644 --- a/Assets/GameAssets/Prefebs/Models/无人机.prefab +++ b/Assets/GameAssets/Prefebs/Models/无人机.prefab @@ -8361,7 +8361,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: + wrjModel: 0 unmannedAerialVehicleManage: {fileID: 0} + serialNumber: batteryLife: classificationWindResistance: maximumFlyingSpeed: @@ -8374,6 +8376,13 @@ MonoBehaviour: detectionRadius: 50 explodePrefab: {fileID: 1000013462590818, guid: ecdd96beb7f93494880c052dfccf9dc1, type: 3} + tips: {fileID: 0} + attackTarget: {fileID: 0} + bulletPrefab: {fileID: 0} + bulletPoint: {fileID: 0} + layerMask: + serializedVersion: 2 + m_Bits: 256 --- !u!65 &6107446376952425967 BoxCollider: m_ObjectHideFlags: 0 diff --git a/Assets/Zion/Scripts/Adam/DeviceManager.cs b/Assets/Zion/Scripts/Adam/DeviceManager.cs index 9d2017f6..0d11ccdf 100644 --- a/Assets/Zion/Scripts/Adam/DeviceManager.cs +++ b/Assets/Zion/Scripts/Adam/DeviceManager.cs @@ -209,7 +209,7 @@ public class DeviceManager : MonoSingleton } else { - if (equipmentCommon) + if (equipmentCommon&& !equipmentCommon.isPlayer) { equipmentCommon.ReceivingPositionAngle(info); diff --git a/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs b/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs index 3165f504..e66dea66 100644 --- a/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs +++ b/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs @@ -292,7 +292,7 @@ public class EquipmentCommon : MonoBehaviour UnmannedAerialVehicleManage unmannedAerialVehicleManageExpel = GetComponent(); if (unmannedAerialVehicleManageExpel) { - unmannedAerialVehicleManageExpel.CheckSatellitePositioningFrequency(data[2], int.Parse(data[2])); + unmannedAerialVehicleManageExpel.CheckSatellitePositioningFrequency(data[2]); } break; case "DroneWasDestroyed"://单个无人机被销毁 @@ -313,7 +313,7 @@ public class EquipmentCommon : MonoBehaviour UnmannedAerialVehicle unmannedAerialVehicle = _unmannedAerialVehicleManageDitch.unmannedAerialVehicles.Find(x => x.serialNumber == data[2]); if (unmannedAerialVehicle) { - unmannedAerialVehicle.CheckSatellitePositioningFrequency(data[3], int.Parse(data[4])); + unmannedAerialVehicle.CheckSatellitePositioningFrequency(data[3]); } } break; diff --git a/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs b/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs index b48a4fe4..9a60e703 100644 --- a/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs @@ -319,8 +319,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour { unmannedAerialVehicleManage = wrj.GetComponent(); unmannedAerialVehicleManage.CheckSatellitePositioningFrequency( - InterferenceMode, - ground); + InterferenceMode); var nowData = GetSyncData(unmannedAerialVehicleManage); DeviceManager.Instance.send2roomStr.Enqueue(nowData); } @@ -329,8 +328,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour { unmannedAerialVehicle = wrj.GetComponent(); unmannedAerialVehicle.CheckSatellitePositioningFrequency( - InterferenceMode, - ground); + InterferenceMode); var nowData = GetSyncData(unmannedAerialVehicle); DeviceManager.Instance.send2roomStr.Enqueue(nowData); } @@ -342,12 +340,12 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour /// protected string GetSyncData(UnmannedAerialVehicleManage unmannedAerialVehicleManage) { - return string.Format("{0},{1},{2},{3}", "WRJExpel", unmannedAerialVehicleManage.equipmentCommon.deviceID, InterferenceMode, LayerMask.LayerToName(ground)); + return string.Format("{0},{1},{2}", "WRJExpel", unmannedAerialVehicleManage.equipmentCommon.deviceID, InterferenceMode); } protected string GetSyncData(UnmannedAerialVehicle unmannedAerialVehicle) { - return string.Format("{0},{1},{2},{3},{4}", "WRJDitch", unmannedAerialVehicle.unmannedAerialVehicleManage.equipmentCommon.deviceID, unmannedAerialVehicle.serialNumber, InterferenceMode, LayerMask.LayerToName(ground)); + return string.Format("{0},{1},{2},{3}", "WRJDitch", unmannedAerialVehicle.unmannedAerialVehicleManage.equipmentCommon.deviceID, unmannedAerialVehicle.serialNumber, InterferenceMode); } /// /// 开启无线电干扰 diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs index 7b60587a..5fbd7a2d 100644 --- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs +++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs @@ -193,10 +193,9 @@ public class UnmannedAerialVehicle : MonoBehaviour Debug.Log(data); })); } - + public LayerMask layerMask = new LayerMask(); public void CheckSatellitePositioningFrequency( - string interferenceMode, - LayerMask ground) + string interferenceMode) { if (interferenceMode == "驱离") @@ -209,7 +208,7 @@ public class UnmannedAerialVehicle : MonoBehaviour { transform.DOKill(); RaycastHit hit; - if (Physics.Raycast(transform.position, Vector3.down, out hit, Mathf.Infinity, ground)) + if (Physics.Raycast(transform.position, Vector3.down, out hit, Mathf.Infinity, layerMask)) { if (hit.distance > 1f) { diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs index 9280049e..727665df 100644 --- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs +++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs @@ -533,7 +533,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour tips.gameObject.SetActive(true); } } - + public LayerMask layerMask = new LayerMask(); /// /// 检测无线电频率 /// @@ -544,8 +544,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour /// 干扰角度 /// 地面的图层 public void CheckSatellitePositioningFrequency( - string interferenceMode, - LayerMask ground) + string interferenceMode) { if (interferenceMode == "驱离") @@ -558,7 +557,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour { transform.DOKill(); RaycastHit hit; - if (Physics.Raycast(transform.position, Vector3.down, out hit, Mathf.Infinity, ground)) + if (Physics.Raycast(transform.position, Vector3.down, out hit, Mathf.Infinity, layerMask)) { if (hit.distance > 1f) {