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

Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_galaxy.mat

@@ -48,7 +48,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
-    - _GIntensity: 0
+    - _GIntensity: 0.1
     - _Intensity: 0
     - _SIntensity: 1
     - _perturbation: 0.405

Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat

@@ -33,7 +33,7 @@ Material:
     - _overBright: 1
     m_Colors:
     - _AmbientTint: {r: 1, g: 1, b: 1, a: 1}
-    - _Color: {r: 0.5, g: 0.49803922, b: 0.49215686, a: 0.2}
+    - _Color: {r: 0, g: 0, b: 0, a: 1}
     - _GlowColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
     - _PrimaryTint: {r: 1, g: 1, b: 1, a: 1}
     - _TintColor: {r: 1, g: 1, b: 1, a: 1}

Assets/GameAssets/Prefebs/Models/moder/地面无线电干扰.prefab

@@ -3586,6 +3586,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1649737328956898976, guid: 38fb1def99b2cd147a96842efe5a355b,
+        type: 3}
+      propertyPath: m_TagString
+      value: Importance
+      objectReference: {fileID: 0}
     - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b,
         type: 3}
       propertyPath: m_LocalPosition.x

Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab

@@ -19623,7 +19623,7 @@ GameObject:
   - component: {fileID: 2807491000924113457}
   m_Layer: 12
   m_Name: Image
-  m_TagString: Untagged
+  m_TagString: Radar
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0

Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab

@@ -2122,6 +2122,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1649737328956898976, guid: 38fb1def99b2cd147a96842efe5a355b,
+        type: 3}
+      propertyPath: m_TagString
+      value: WRJParameter
+      objectReference: {fileID: 0}
     - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -2791,6 +2796,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1649737328956898976, guid: 38fb1def99b2cd147a96842efe5a355b,
+        type: 3}
+      propertyPath: m_TagString
+      value: WRJParameter
+      objectReference: {fileID: 0}
     - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b,
         type: 3}
       propertyPath: m_LocalPosition.x

Assets/GameAssets/Prefebs/Models/moder/激光火控平台.prefab

@@ -12822,6 +12822,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6102700022742998670, guid: b2cb817bb62743a4194cd9d89f07e27d,
+        type: 3}
+      propertyPath: m_TagString
+      value: Importance
+      objectReference: {fileID: 0}
     m_RemovedComponents:
     - {fileID: 1076142016709017099, guid: b2cb817bb62743a4194cd9d89f07e27d, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: b2cb817bb62743a4194cd9d89f07e27d, type: 3}

Assets/GameAssets/Prefebs/Models/moder/频谱探测.prefab

@@ -248,7 +248,7 @@ GameObject:
   - component: {fileID: 1578225509420461004}
   m_Layer: 12
   m_Name: Image
-  m_TagString: Untagged
+  m_TagString: Radar
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -944,6 +944,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1649737328956898976, guid: 38fb1def99b2cd147a96842efe5a355b,
+        type: 3}
+      propertyPath: m_TagString
+      value: Importance
+      objectReference: {fileID: 0}
     - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b,
         type: 3}
       propertyPath: m_LocalPosition.x

Assets/Resources/model/重点攻击目标1.prefab

@@ -1090,7 +1090,7 @@ GameObject:
   - component: {fileID: 8686255655278623726}
   m_Layer: 5
   m_Name: importance
-  m_TagString: Untagged
+  m_TagString: Importance
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -2653,13 +2653,6 @@ MonoBehaviour:
   ModerDamage: {fileID: 2840960697985760213}
   regulate: {fileID: 4820533728664913016}
   buttonreg: {fileID: 7363043795831063353}
-  toggle1: {fileID: 78723881495536872}
-  toggle2: {fileID: 3463523368336500832}
-  toggle3: {fileID: 3619221509897912575}
-  toggle4: {fileID: 28412645170237004}
-  toggle5: {fileID: 8932471483062020681}
-  toggle6: {fileID: 64890494959671527}
-  toggle7: {fileID: 4401106011680143311}
   togFrequencyBands:
   - {fileID: 78723881495536872}
   - {fileID: 3463523368336500832}

Assets/Resources/model/重点攻击目标2.prefab

@@ -770,7 +770,7 @@ GameObject:
   - component: {fileID: 1747500451976562533}
   m_Layer: 5
   m_Name: importance
-  m_TagString: Untagged
+  m_TagString: Importance
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -2826,13 +2826,6 @@ MonoBehaviour:
   ModerDamage: {fileID: 1467464424326605954}
   regulate: {fileID: 2445121072340223621}
   buttonreg: {fileID: 1893370117554305087}
-  toggle1: {fileID: 6760580611336481383}
-  toggle2: {fileID: 2327747177229680297}
-  toggle3: {fileID: 6205561511136672778}
-  toggle4: {fileID: 4866093980683021871}
-  toggle5: {fileID: 1595232079232995888}
-  toggle6: {fileID: 848134281435870856}
-  toggle7: {fileID: 6994627430635325071}
   togFrequencyBands:
   - {fileID: 6760580611336481383}
   - {fileID: 2327747177229680297}

Assets/Resources/model/重点攻击目标3.prefab

@@ -1558,7 +1558,7 @@ GameObject:
   - component: {fileID: 5969528349560588974}
   m_Layer: 5
   m_Name: importance
-  m_TagString: Untagged
+  m_TagString: Importance
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -2826,13 +2826,6 @@ MonoBehaviour:
   ModerDamage: {fileID: 7378831111228137673}
   regulate: {fileID: 5625621529173534083}
   buttonreg: {fileID: 2359957618957220921}
-  toggle1: {fileID: 2987344993920604129}
-  toggle2: {fileID: 4263437241937524701}
-  toggle3: {fileID: 2372794671036074061}
-  toggle4: {fileID: 6045683915690793988}
-  toggle5: {fileID: 3776191318234792201}
-  toggle6: {fileID: 6688120530323237334}
-  toggle7: {fileID: 8540854955145205225}
   togFrequencyBands:
   - {fileID: 2987344993920604129}
   - {fileID: 4263437241937524701}

Assets/StreamingAssets/IPPort.txt

@@ -1 +1 @@
-127.0.0.1:48888
+172.16.1.254:48888

Assets/StreamingAssets/confing.txt

@@ -1 +1 @@
-127.0.0.1
+172.16.1.119

Assets/StreamingAssets/mqttConfig.json

@@ -1 +1 @@
-{"ip":"172.16.1.120","port":54232,"userName":"server1234","passwd":"123456"}
+{"ip":"172.16.1.119","port":54232,"userName":"server1234","passwd":"123456"}

Assets/Temp/Scripts/Judgmentstate.cs

@@ -80,13 +80,14 @@ public class Judgmentstate : MonoBehaviour
             _ = SyncCreateRoom.SendMessageAsync(msg);
         });
         off_btn.onClick.AddListener(() => {
-            string url = Url_Exit + GlobalFlag.currentUser.login_name;
+            //string url = Url_Exit + GlobalFlag.currentUser.login_name;
-            StartCoroutine(GetString(url, data =>
+            //StartCoroutine(GetString(url, data =>
-            {
+            //{
-                Debug.Log(data);
+            //    Debug.Log(data);
-                Application.Quit();
 
-            }));
+
+            //}));
+            Application.Quit();
 
         });
     }

Assets/Temp/Scripts/Login_panl.cs

@@ -2,7 +2,6 @@ using LitJson;
 using System.Collections;
 using UnityEngine;
 using UnityEngine.Networking;
-using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 using static InterfaceManager;
 public class Login_panl : MonoBehaviour
@@ -23,8 +22,21 @@ public class Login_panl : MonoBehaviour
         login_btn.onClick.AddListener(Login);
         TZ();
         AdamSync.SyncCreateRoom.registRequset += OnRegist;
+        username_input.onEndEdit.AddListener(delegate { OnEndEdit(username_input); });
+        password_input.onEndEdit.AddListener(delegate { OnEndEdit(password_input); });
     }
 
+    // 当用户提交输入（按下回车键）时调用
+    public void OnEndEdit(InputField field)
+    {
+        // 检查是否是因为按下回车键（或"Enter"键）而提交
+        if (Input.GetKeyDown(KeyCode.Return) || Input.GetKeyDown(KeyCode.KeypadEnter))
+        {
+            //Debug.Log("用户输入并按下了回车键: " + field.text);
+            // 在这里执行你需要的操作
+            Login();
+        }
+    }
     private void TZ()
     {
         if (GameMain.tiao == true)
@@ -109,20 +121,20 @@ public class Login_panl : MonoBehaviour
     /// <param name="exirOrQuit">返回 退出</param>
     public void AddGetString(bool exirOrQuit)
     {
-        string url = Url_Exit + GlobalFlag.currentUser.login_name;
+        //string url = Url_Exit + GlobalFlag.currentUser.login_name;
-        StartCoroutine(GetString(url, data =>
+        //StartCoroutine(GetString(url, data =>
-        {
+        //{
-            Debug.Log(data);
+        //    Debug.Log(data);
-            if (exirOrQuit)
+        //    if (exirOrQuit)
-            {
+        //    {
-                SceneManager.LoadScene("SampleScene");
+        //        SceneManager.LoadScene("SampleScene");
-            }
+        //    }
-            else
+        //    else
-            {
+        //    {
-                Application.Quit();
+        //        Application.Quit();
-            }
+        //    }
            
-        }));
+        //}));
     }
 
     public void OnRegist(string msg)

Assets/Temp/Scripts/Microwaveweapon.cs

@@ -157,7 +157,10 @@ public class Microwaveweapon : MonoBehaviour
         //Debug.Log("上传位置");
         return string.Format("{0},{1},{2},{3},{4}", "Micow", equipment.deviceID, miceopos.transform.position.x, miceopos.transform.position.y, miceopos.transform.position.z);
     }
-
+    private void OnMouseDown()
+    {
+        GameManager.Instance.GetAllImportance();
+    }
     /// <summary>
     /// 获取设备的参数
     /// </summary>
@@ -273,7 +276,8 @@ public class Microwaveweapon : MonoBehaviour
         //接收激光下发的位置
         Vector3 vector = new Vector3(float.Parse(data[2]), float.Parse(data[3]), float.Parse(data[4]));
         float _micdistance = Vector3.Distance(vector, transform.position);
-        microwavepoint.transform.DOLookAt(vector, 0.1f).SetEase(Ease.Linear).OnComplete(() => {
+        microwavepoint.transform.DOLookAt(vector, 0.1f).SetEase(Ease.Linear).OnComplete(() =>
+        {
             microblog.MicrowaveDisplay(_micdistance / 10 + 1, 0.5f);
             StartCoroutine(Offlaserstrike());
         });

Assets/Temp/Scripts/Spectrumdetection.cs

@@ -395,12 +395,9 @@ public class Spectrumdetection : MonoBehaviour
 
     private void OnMouseDown()
     {
-        if (equipmentCommon.isPlayer)
-        {
-            SpectrumdetectionUI.SetActive(true);
-        }
         if (!GlobalFlag.isStartRehearsing && GlobalFlag.blueOrRed == 1)
         {
+            GameManager.Instance.GetAllImportance();
             EquipmentCommon equipmentCommon1 = GetComponent<EquipmentCommon>();
             if (equipmentCommon.deviceID == equipmentCommon1.deviceID)
             {
@@ -408,6 +405,10 @@ public class Spectrumdetection : MonoBehaviour
                 Frequencyiamge.gameObject.SetActive(true);
             }
         }
+        if (equipmentCommon.isPlayer)
+        {
+            SpectrumdetectionUI.SetActive(true);
+        }
         //SpectrumdetectionUI.SetActive(true);
     }
     private void OnDestroy()

Assets/Temp/Scripts/Switchinginput.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.EventSystems;
@@ -24,7 +24,8 @@ public class Switchinginput : MonoBehaviour
             {
                 index = 0;
             }
-        }
             _eventSystem.SetSelectedGameObject(inputFields[index].gameObject, new BaseEventDate(_eventSystem));
         }
+       
+    }
 }

Assets/Temp/Scripts/Taskpanel.cs

@@ -119,13 +119,13 @@ public class Taskpanel : MonoBehaviour
         });
         guanji_button.onClick.AddListener(() =>
         {
-            string url = Url_Exit + GlobalFlag.currentUser.login_name;
+            //string url = Url_Exit + GlobalFlag.currentUser.login_name;
-            StartCoroutine(GetString(url, data =>
+            //StartCoroutine(GetString(url, data =>
-            {
+            //{
-                Debug.Log(data);
+            //    Debug.Log(data);
+            //    Application.Quit();
+            //}));
             Application.Quit();
-            }));
-           
         });
         menu_button.onClick.AddListener(() =>
         {

Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 1113159741}
-  m_IndirectSpecularColor: {r: 0.066868424, g: 0.12216938, b: 0.2541184, a: 1}
+  m_IndirectSpecularColor: {r: 0.030100383, g: 0.03369107, b: 0.03534769, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -6834,7 +6834,7 @@ GameObject:
   - component: {fileID: 147647013}
   - component: {fileID: 147647014}
   m_Layer: 5
-  m_Name: Canvas
+  m_Name: MainCanvas
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -13803,12 +13803,12 @@ Light:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 250950117}
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 10
   m_Type: 1
   m_Shape: 0
-  m_Color: {r: 1, g: 0.99607843, b: 0.9843137, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 0}
-  m_Intensity: 1.088
+  m_Intensity: 0.001
   m_Range: 10
   m_SpotAngle: 30
   m_InnerSpotAngle: 21.80208
@@ -20176,7 +20176,7 @@ Camera:
   m_Enabled: 0
   serializedVersion: 2
   m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.39735296, g: 0.46529412, b: 0.52294123, a: 0.6}
+  m_BackGroundColor: {r: 0.0041176477, g: 0.0041176477, b: 0.0041176477, a: 0.6}
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0
@@ -53945,6 +53945,7 @@ GameObject:
   - component: {fileID: 1436809534}
   - component: {fileID: 1436809535}
   - component: {fileID: 1436809536}
+  - component: {fileID: 1436809537}
   m_Layer: 0
   m_Name: Bootstraps
   m_TagString: Untagged
@@ -54142,6 +54143,21 @@ MonoBehaviour:
   SweepFrequencyBand: SweepFrequencyBand
   KeyTarget: KeyTarget
   identification: 
+--- !u!114 &1436809537
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1436809528}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f072abdc6ffe11f459a53ff73c2d0984, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  startFormationBtn: {fileID: 0}
+  submitFormationBtn: {fileID: 0}
+  isStartFormation: 0
 --- !u!1 &1444599844
 GameObject:
   m_ObjectHideFlags: 0
@@ -54383,7 +54399,7 @@ Light:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1452191771}
-  m_Enabled: 0
+  m_Enabled: 1
   serializedVersion: 10
   m_Type: 1
   m_Shape: 0
@@ -69477,15 +69493,15 @@ MonoBehaviour:
   moonlightObject: {fileID: 639984703}
   moonLightAmt: 0.90791565
   moonPhase: 0.54604214
-  ambientCol: {r: 1, g: 1, b: 1, a: 1}
+  ambientCol: {r: 0, g: 0, b: 0, a: 1}
-  colorSun: {r: 1, g: 0.99607843, b: 0.9843137, a: 1}
+  colorSun: {r: 0, g: 0, b: 0, a: 1}
   colorMoon: {r: 0.4392157, g: 0.5921569, b: 0.69803923, a: 1}
-  colorSkyBase: {r: 0.6054902, g: 0.7090196, b: 0.7968628, a: 0.8}
+  colorSkyBase: {r: 0.00627451, g: 0.00627451, b: 0.00627451, a: 0.8}
-  colorSkyBaseLow: {r: 0.75686276, g: 0.88627446, b: 0.9960785, a: 1}
+  colorSkyBaseLow: {r: 0.007843138, g: 0.007843138, b: 0.007843138, a: 1}
-  colorHorizon: {r: 0.9082354, g: 1.0682354, b: 1.1952941, a: 1.2}
+  colorHorizon: {r: 0.12235295, g: 0.2964706, b: 0.36705884, a: 1.2}
-  colorHorizonLow: {r: 0.12235295, g: 0.2964706, b: 0.36705884, a: 1.2}
+  colorHorizonLow: {r: 0.9082354, g: 1.0682354, b: 1.1952941, a: 1.2}
-  colorSkyAmbient: {r: 1, g: 1, b: 1, a: 1}
+  colorSkyAmbient: {r: 0, g: 0, b: 0, a: 1}
-  colorClouds: {r: 1, g: 1, b: 1, a: 1}
+  colorClouds: {r: 0, g: 0, b: 0, a: 1}
   colorHighlightClouds: {r: 0, g: 0, b: 0, a: 1}
   colorSkyboxGround: {r: 0.1102941, g: 0.08836951, b: 0.06487888, a: 1}
   colorSkyboxMie: {r: 1, g: 1, b: 1, a: 1}
@@ -69824,7 +69840,7 @@ MonoBehaviour:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
-  randSeed: 25527625
+  randSeed: 150061843
   isDoingTransition: 0
   minimumHeight: 0
 --- !u!114 &1820978574

Assets/Zion/Scenes/InitConnect.unity

@@ -212,6 +212,8 @@ MonoBehaviour:
     data: []
   loadingPanel: {fileID: 460561659324528917, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
     type: 3}
+  go: {fileID: 0}
+  loadTem: {fileID: 0}
 --- !u!1 &2132962757
 GameObject:
   m_ObjectHideFlags: 0

Assets/Zion/Scenes/SampleScene.unity

@@ -1037,7 +1037,7 @@ MonoBehaviour:
   m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
   m_Text: 
   m_CaretBlinkRate: 0.85
-  m_CaretWidth: 1
+  m_CaretWidth: 5
   m_ReadOnly: 0
 --- !u!114 &514598458
 MonoBehaviour:
@@ -1421,7 +1421,7 @@ MonoBehaviour:
   m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
   m_Text: 
   m_CaretBlinkRate: 0.85
-  m_CaretWidth: 1
+  m_CaretWidth: 5
   m_ReadOnly: 0
 --- !u!114 &835460218
 MonoBehaviour:

Assets/Zion/Scripts/Adam/DragController.cs

@@ -20,9 +20,9 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler,
 
     public Mastermanagement mastermanagement;
 
-    void Start()
+    void Awake()
     {
-        mastermanagement = GameObject.Find("Canvas").GetComponent<Mastermanagement>();
+        mastermanagement = GameObject.Find("MainCanvas").GetComponent<Mastermanagement>();
     }
     public void OnBeginDrag(PointerEventData eventData)
     {

Assets/Zion/Scripts/Adam/FormationManager.cs

@@ -0,0 +1,43 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+/// <summary>
+/// 编队控制脚本
+/// </summary>
+public class FormationManager : MonoBehaviour
+{
+    public Button startFormationBtn;
+    public Button submitFormationBtn;
+    public bool isStartFormation;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        startFormationBtn.onClick.AddListener(OnStartFormation);
+        submitFormationBtn.onClick.AddListener(OnSubmit);
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        if (isStartFormation)
+        {
+            if (Input.GetKeyDown(KeyCode.LeftControl) && Input.GetMouseButtonDown(0))
+            {
+                Debug.Log("拾取");
+            }
+        }
+    }
+
+    public void OnStartFormation()
+    {
+        isStartFormation = true;
+    }
+
+    public void OnSubmit()
+    {
+        isStartFormation = false;
+    }
+}

Assets/Zion/Scripts/Adam/FormationManager.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f072abdc6ffe11f459a53ff73c2d0984
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Zion/Scripts/Adam/GameManager.cs

@@ -525,6 +525,35 @@ public class GameManager : MonoSingleton<GameManager>
         }
     }
 
+    /// <summary>
+    /// 获取 所有 参数 修改 面板
+    /// </summary>
+    /// <returns></returns>
+    public void GetAllImportance()
+    {
+        GameObject[] radar = GameObject.FindGameObjectsWithTag("Radar");
+        GameObject[] objs = GameObject.FindGameObjectsWithTag("Importance");
+        for (int i = 0; i < objs.Length; i++)
+        {
+            objs[i].SetActive(false);
+        }
+        for (int i = 0; i < radar.Length; i++)
+        {
+            radar[i].SetActive(false);
+        }
+    }
+    /// <summary>
+    /// 获取无人机参数面板
+    /// </summary>
+    public void GetWRJParameter()
+    {
+        GameObject[] wrjParameter = GameObject.FindGameObjectsWithTag("WRJParameter");
+        for (int i = 0; i < wrjParameter.Length; i++)
+        {
+            wrjParameter[i].SetActive(false);
+        }
+    }
+
 
 
     private void OnDisable()

Assets/Zion/Scripts/Adam/WRJManager.cs

@@ -23,6 +23,7 @@ namespace Assets.Zion.Scripts.Adam
         {
             if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) == "0" && Input.GetMouseButtonDown(0))
             {
+                if (EventSystem.current.IsPointerOverGameObject()) return; 
                 Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
                 RaycastHit hitInfo;
                 if (Physics.Raycast(ray, out hitInfo, 1000))
@@ -40,16 +41,19 @@ namespace Assets.Zion.Scripts.Adam
                         }
                         else
                         {
+                            GameManager.Instance.GetWRJParameter();
                             wrjMenuSetPanel.localScale = Vector3.zero;
                         }
                     }
                     else
                     {
+                        GameManager.Instance.GetWRJParameter();
                         wrjMenuSetPanel.localScale = Vector3.zero;
                     }
                 }
                 else
                 {
+                    GameManager.Instance.GetWRJParameter();
                     wrjMenuSetPanel.localScale = Vector3.zero;
                 }
             }

Assets/Zion/Scripts/AddConfing.cs

@@ -57,12 +57,4 @@ public class AddConfing : MonoBehaviour
         }
     }
 
-    private void OnDestroy()
-    {
-        string url = Url_Exit + GlobalFlag.currentUser.login_name;
-        StartCoroutine(GetString(url, data =>
-        {
-            Debug.Log(data);
-        }));
-    }
 }

Assets/Zion/Scripts/HighPriorityTarget.cs

@@ -60,7 +60,7 @@ public class HighPriorityTarget : MonoBehaviour
     /// <summary>
     /// 频率选择
     /// </summary>
-    public Toggle toggle1, toggle2, toggle3, toggle4, toggle5, toggle6, toggle7;
+    //public Toggle toggle1, toggle2, toggle3, toggle4, toggle5, toggle6, toggle7;
     /// <summary>
     /// 频段设置
     /// </summary>
@@ -104,88 +104,7 @@ public class HighPriorityTarget : MonoBehaviour
             MQTTManager.instance.SendData(MQTTManager.instance.BandSetting, nowData);
         }
     }
-    /*
-    private void Interferencefrequency()
-    {
-        toggle1.onValueChanged.AddListener((ison) =>
-        {
-            if (ison)
-            {
-                frequency = "UHF";
-                gamepos.layer = 16;
-                string nowData = GetSyncDataTwo();
-                DeviceManager.Instance.send2roomStr.Enqueue(nowData);
 
-            }
-        });
-        toggle2.onValueChanged.AddListener((ison) =>
-        {
-            if (ison)
-            {
-                frequency = "L";
-                gamepos.layer = 17;
-                string nowData = GetSyncDataTwo();
-                DeviceManager.Instance.send2roomStr.Enqueue(nowData);
-
-            }
-        });
-        toggle3.onValueChanged.AddListener((ison) =>
-        {
-            if (ison)
-            {
-                frequency = "S";
-                gamepos.layer = 18;
-                string nowData = GetSyncDataTwo();
-                DeviceManager.Instance.send2roomStr.Enqueue(nowData);
-
-            }
-        });
-        toggle4.onValueChanged.AddListener((ison) =>
-        {
-            if (ison)
-            {
-                frequency = "C";
-                gamepos.layer = 19;
-                string nowData = GetSyncDataTwo();
-                DeviceManager.Instance.send2roomStr.Enqueue(nowData);
-
-            }
-        });
-        toggle5.onValueChanged.AddListener((ison) =>
-        {
-            if (ison)
-            {
-                frequency = "X";
-                gamepos.layer = 20;
-                string nowData = GetSyncDataTwo();
-                DeviceManager.Instance.send2roomStr.Enqueue(nowData);
-
-            }
-        });
-        toggle6.onValueChanged.AddListener((ison) =>
-        {
-            if (ison)
-            {
-                frequency = "Ku";
-                gamepos.layer = 21;
-                string nowData = GetSyncDataTwo();
-                DeviceManager.Instance.send2roomStr.Enqueue(nowData);
-
-            }
-        });
-        toggle7.onValueChanged.AddListener((ison) =>
-        {
-            if (ison)
-            {
-                frequency = "Ka";
-                gamepos.layer = 22;
-                string nowData = GetSyncDataTwo();
-                DeviceManager.Instance.send2roomStr.Enqueue(nowData);
-
-            }
-        });
-    }
-    */
     public void FrequencyGamepos(string _frequency)
     {
         int layerValue = LayerMask.NameToLayer(_frequency);
@@ -214,6 +133,8 @@ public class HighPriorityTarget : MonoBehaviour
                     HighPriorityTarget highPriorityTarget = hit.transform.GetComponent<HighPriorityTarget>();
                     if (!GlobalFlag.isStartRehearsing && highPriorityTarget && highPriorityTarget.Number == Number)
                     {
+                        GameManager.Instance.GetAllImportance();
+
                         regulate.transform.position = Camera.main.WorldToScreenPoint(hit.point);
                         regulate.gameObject.SetActive(true);
                     }

Assets/Zion/Scripts/InterfaceManager.cs

@@ -145,7 +145,7 @@ public static class InterfaceManager
     /// <summary>
     /// 用户退出
     /// </summary>
-    public static string Url_Exit { get => IpAddress + "/Handler/User.ashx?action=exit&login_name="; }
+    //public static string Url_Exit { get => IpAddress + "/Handler/User.ashx?action=exit&login_name="; }
 
     #endregion
 

Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs

@@ -362,7 +362,7 @@ public class RadarManger : MonoBehaviour
     {
         if (equipmentCommon.isPlayer && GlobalFlag.blueOrRed == 1)
         {
-
+            GameManager.Instance.GetAllImportance();
             imageprs.gameObject.SetActive(true);
         }
     }

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

@@ -566,6 +566,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
     {
         if (!GlobalFlag.isStartRehearsing && GlobalFlag.blueOrRed == 1 && Input.GetMouseButtonDown(0))
         {
+            GameManager.Instance.GetAllImportance();
             Waveimage.transform.position = Camera.main.WorldToScreenPoint(transform.position);
             Waveimage.gameObject.SetActive(true);
         }

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

@@ -48,12 +48,14 @@ public class UnmannedAerialVehicleUI : MonoBehaviour
         btnFrequencyBand.onClick.AddListener(() => {
             if (unmannedAerialVehicleManage)
             {
+                GameManager.Instance.GetWRJParameter();
                 unmannedAerialVehicleManage.FrequencyBand.SetActive(true);
             }
         });
         btnSurveillanceFrequencyBand.onClick.AddListener(() => {
             if (unmannedAerialVehicleManage)
             {
+                GameManager.Instance.GetWRJParameter();
                 unmannedAerialVehicleManage.SurveillanceFrequencyBand.SetActive(true);
             }
         });
@@ -74,6 +76,7 @@ public class UnmannedAerialVehicleUI : MonoBehaviour
     {
         if (unmannedAerialVehicleManage)
         {
+            GameManager.Instance.GetWRJParameter();
             switch (unmannedAerialVehicleManage.wrjModel)
             {
                 case WRJModel.光学无人机:

ProjectSettings/TagManager.asset

@@ -9,6 +9,9 @@ TagManager:
   - AttackTarget
   - WRJ1
   - AttackTarget1
+  - Importance
+  - Radar
+  - WRJParameter
   layers:
   - Default
   - TransparentFX