1

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

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

Assets/Zion/Scripts/Adam/DeviceManager.cs

@@ -209,7 +209,7 @@ public class DeviceManager : MonoSingleton<DeviceManager>
         }
         else
         {
-            if (equipmentCommon)
+            if (equipmentCommon&& !equipmentCommon.isPlayer)
             {
                 equipmentCommon.ReceivingPositionAngle(info);
 

Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs

@@ -292,7 +292,7 @@ public class EquipmentCommon : MonoBehaviour
                 UnmannedAerialVehicleManage unmannedAerialVehicleManageExpel = GetComponent<UnmannedAerialVehicleManage>();
                 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;

Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs

@@ -319,8 +319,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
         {
             unmannedAerialVehicleManage = wrj.GetComponent<UnmannedAerialVehicleManage>();
             unmannedAerialVehicleManage.CheckSatellitePositioningFrequency(
-                InterferenceMode, 
+                InterferenceMode);
-                ground);
             var nowData = GetSyncData(unmannedAerialVehicleManage);
             DeviceManager.Instance.send2roomStr.Enqueue(nowData);
         }
@@ -329,8 +328,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
         {
             unmannedAerialVehicle = wrj.GetComponent<UnmannedAerialVehicle>();
             unmannedAerialVehicle.CheckSatellitePositioningFrequency(
-                InterferenceMode,
+                InterferenceMode);
-                ground);
             var nowData = GetSyncData(unmannedAerialVehicle);
             DeviceManager.Instance.send2roomStr.Enqueue(nowData);
         }
@@ -342,12 +340,12 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
     /// <returns></returns>
     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);
     }
     /// <summary>
     /// 开启无线电干扰

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,
+        string interferenceMode)
-        LayerMask ground)
     {
 
         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)
                 {

Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs

@@ -533,7 +533,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
             tips.gameObject.SetActive(true);
         }
     }
-
+    public LayerMask layerMask = new LayerMask();
     /// <summary>
     /// 检测无线电频率
     /// </summary>
@@ -544,8 +544,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
     /// <param name="interferenceAngle">干扰角度</param>
     /// <param name="ground">地面的图层</param>
     public void CheckSatellitePositioningFrequency(
-        string interferenceMode,
+        string interferenceMode)
-        LayerMask ground)
     {
        
         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)
                 {