From dce760e536df2fa5863e25bb7031ac8e1ec3441f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=90=8D?= <3077614386@qq.com>
Date: Thu, 7 Mar 2024 10:26:26 +0800
Subject: [PATCH] 1

---
 Assets/Temp/Scripts/Microwaveweapon.cs        |  1 +
 .../ModelFunction/Radar/RadarManger.cs        |  2 +-
 .../UAV/UnmannedAerialVehicleManage.cs        | 60 ++++++++++---------
 .../Zion/Scripts/WRJ0125/DroneViewDisplay.cs  |  2 +-
 4 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/Assets/Temp/Scripts/Microwaveweapon.cs b/Assets/Temp/Scripts/Microwaveweapon.cs
index 6a45851c..9ff50db5 100644
--- a/Assets/Temp/Scripts/Microwaveweapon.cs
+++ b/Assets/Temp/Scripts/Microwaveweapon.cs
@@ -251,6 +251,7 @@ public class Microwaveweapon : MonoBehaviour
         //MQTTManager.instance.SendData(MQTTManager.instance.Planedata, newdata);
         yield return new WaitForSeconds(0.5f);
         GameObject game = Instantiate(Destructioneffect, unmannedAerialVehicle.transform);
+        yield return new WaitForSeconds(0.1f);
         game.transform.localPosition = Vector3.zero;
         game.transform.SetParent(null);
         game.SetActive(true);
diff --git a/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs b/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs
index 674ec754..551ceae2 100644
--- a/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs
+++ b/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs
@@ -391,7 +391,7 @@ public class RadarManger : MonoBehaviour
                 if (unmannedAerialVehicle)
                 {
                     bool isnearBlindArea = Vector3.Distance(transform.position, unmannedAerialVehicle.transform.position) > nearBlindArea;
-                    if (isnearBlindArea)
+                    if (!isnearBlindArea)
                         continue;
                     attackColliders1.Add(colliders[i]);
                     LaserFireControlPlatformManger laserFireControlPlatformManger = LaserFireControlPlatformManger.laserFireControlPlatformMangers.Find(x => (x != null&& x.isLasing == false&& x.lasertime <= 0));                   
diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs
index ec0c2fca..38331f91 100644
--- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs
+++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs
@@ -354,8 +354,8 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
         {
             if (gxWRJCamera && dzWRJCamera)
             {
-                gxWRJCamera.orthographicSize = Spectrumdetection.Radius * 1000;
-                dzWRJCamera.orthographicSize = Spectrumdetection.Radius * 1000;
+                //gxWRJCamera.orthographicSize = Spectrumdetection.Radius * 1000;
+                
                 switch (Spectrumdetection.Radius)
                 {
                     case 1:
@@ -383,35 +383,35 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
                 }
             }
         }
-        Judgingdistance();
+        //Judgingdistance();
     }
 
-    private void Judgingdistance()
-    {
-        RaycastHit hit;
-        //Debug.LogError("调用了");
-        if (Physics.Raycast(transform.position, Vector3.down, out hit))
-        {
-            Debug.Log(hit.distance);
-            if (hit.distance <= 1f)
-            {
-                if (gamemap && gamePos)
-                {
-                    gamePos.gameObject.SetActive(false);
-                    gamemap.gameObject.SetActive(false);
-                }
-            }
-            else
-            {
-                if (gamemap && gamePos)
-                {
-                    gamePos.gameObject.SetActive(true);
-                    gamemap.gameObject.SetActive(true);
-                }
-            }
+    //private void Judgingdistance()
+    //{
+    //    RaycastHit hit;
+    //    //Debug.LogError("调用了");
+    //    if (Physics.Raycast(transform.position, Vector3.down, out hit))
+    //    {
+    //        Debug.Log(hit.distance);
+    //        if (hit.distance <= 1f)
+    //        {
+    //            if (gamemap && gamePos)
+    //            {
+    //                gamePos.gameObject.SetActive(false);
+    //                gamemap.gameObject.SetActive(false);
+    //            }
+    //        }
+    //        else
+    //        {
+    //            if (gamemap && gamePos)
+    //            {
+    //                gamePos.gameObject.SetActive(true);
+    //                gamemap.gameObject.SetActive(true);
+    //            }
+    //        }
 
-        }
-    }
+    //    }
+    //}
 
     /// <summary>
     ///上传日志
@@ -1145,6 +1145,8 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
         if (isMove && positions.Count > 0)
         {
             isMove = false;
+            gamePos.gameObject.SetActive(true);
+            gamemap.gameObject.SetActive(true);
             Vector3 _positions = positions.Dequeue();
             var nowData = GetSyncData(_positions);
             MyNetMQClient.instance.Send(nowData);
@@ -1161,6 +1163,8 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
     /// <returns></returns>
     public IEnumerator MoveObjectAlongPath(Vector3 _positions) // 协程：按路线移动物体
     {
+        gamePos.gameObject.SetActive(true);
+        gamemap.gameObject.SetActive(true);
         Vector3 targetPosition = new Vector3(_positions.x, hight, _positions.z);// 目标位置为当前顶点坐标
         float _distance = Vector3.Distance(transform.position, targetPosition);
         float _time = _distance / FireSpeed;
diff --git a/Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs b/Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs
index acfd9081..3d43d227 100644
--- a/Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs
+++ b/Assets/Zion/Scripts/WRJ0125/DroneViewDisplay.cs
@@ -118,7 +118,7 @@ public class DroneViewDisplay : MonoSingleton<DroneViewDisplay>
     }
 
     /// <summary>
-    /// 
+    /// 其他非无人机设备生成RenderTexture
     /// </summary>
     /// <param name="deviceID"></param>
     /// <param name="camera"></param>