From c2e0f2472650e59c1870bbfb14554864974ec555 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Fri, 22 Mar 2024 14:47:54 +0800 Subject: [PATCH] 3232 --- .../Prefebs/Models/moder/无人机List.prefab | 64 +++++++++--------- .../UAV/UnmannedAerialVehicleManage.cs | 65 ++++++++++--------- 2 files changed, 63 insertions(+), 66 deletions(-) diff --git a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab index 0d518c02..da185e72 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab @@ -1626,8 +1626,6 @@ MonoBehaviour: SurveillanceFrequencyBand: {fileID: 8129871292636694301} flySpeedPlane: {fileID: 9020723963205404446} flySpeedSlider: {fileID: 608716198515631330} - gamePos: {fileID: 3441049289142467652} - gamemap: {fileID: 9017854076308260405} reveal: 0 Ground: serializedVersion: 2 @@ -2798,14 +2796,13 @@ PrefabInstance: propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: 8500934962979638684, guid: 91b685a7f0a6f7643b8ae61842f883de, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} ---- !u!1 &9017854076308260405 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8500934962979638684, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - m_PrefabInstance: {fileID: 638589549675547561} - m_PrefabAsset: {fileID: 0} --- !u!4 &5172610439169658982 stripped Transform: m_CorrespondingSourceObject: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, @@ -3067,6 +3064,11 @@ PrefabInstance: propertyPath: m_Layer value: 16 objectReference: {fileID: 0} + - target: {fileID: 8500934962979638684, guid: 91b685a7f0a6f7643b8ae61842f883de, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} --- !u!4 &1525602421726030359 stripped @@ -3075,12 +3077,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 6501072882878902744} m_PrefabAsset: {fileID: 0} ---- !u!1 &3441049289142467652 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8500934962979638684, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - m_PrefabInstance: {fileID: 6501072882878902744} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6738463286047272674 PrefabInstance: m_ObjectHideFlags: 0 @@ -3542,9 +3538,9 @@ PrefabInstance: - {fileID: 5839716182141322363, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} - {fileID: 2022963561981901188, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} ---- !u!114 &1189649587738053663 stripped +--- !u!114 &7739009189435305960 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5548909004573041405, guid: 38fb1def99b2cd147a96842efe5a355b, + m_CorrespondingSourceObject: {fileID: 3955760755921223946, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} m_PrefabInstance: {fileID: 6738463286047272674} m_PrefabAsset: {fileID: 0} @@ -3566,9 +3562,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &805817557573538235 stripped +--- !u!114 &6599785080451423720 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6245650889842523993, guid: 38fb1def99b2cd147a96842efe5a355b, + m_CorrespondingSourceObject: {fileID: 438240288241169162, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} m_PrefabInstance: {fileID: 6738463286047272674} m_PrefabAsset: {fileID: 0} @@ -3596,9 +3592,9 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 6738463286047272674} m_PrefabAsset: {fileID: 0} ---- !u!114 &6599785080451423720 stripped +--- !u!114 &1189649587738053663 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 438240288241169162, guid: 38fb1def99b2cd147a96842efe5a355b, + m_CorrespondingSourceObject: {fileID: 5548909004573041405, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} m_PrefabInstance: {fileID: 6738463286047272674} m_PrefabAsset: {fileID: 0} @@ -3632,9 +3628,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &7739009189435305960 stripped +--- !u!114 &805817557573538235 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3955760755921223946, guid: 38fb1def99b2cd147a96842efe5a355b, + m_CorrespondingSourceObject: {fileID: 6245650889842523993, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} m_PrefabInstance: {fileID: 6738463286047272674} m_PrefabAsset: {fileID: 0} @@ -4100,6 +4096,18 @@ PrefabInstance: - {fileID: 5839716182141322363, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} - {fileID: 2022963561981901188, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} +--- !u!114 &3114167497287670592 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5548909004573041405, guid: 38fb1def99b2cd147a96842efe5a355b, + type: 3} + m_PrefabInstance: {fileID: 7365093489755617725} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &8959769708417747035 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1900922108148937190, guid: 38fb1def99b2cd147a96842efe5a355b, @@ -4190,15 +4198,3 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 7365093489755617725} m_PrefabAsset: {fileID: 0} ---- !u!114 &3114167497287670592 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5548909004573041405, guid: 38fb1def99b2cd147a96842efe5a355b, - type: 3} - m_PrefabInstance: {fileID: 7365093489755617725} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs index 226cf8e0..3df0d1f2 100644 --- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs +++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs @@ -184,14 +184,14 @@ public class UnmannedAerialVehicleManage : MonoBehaviour /// public ExtendedSlider flySpeedSlider; - /// - /// 显示频谱地图上的位置 - /// - public GameObject gamePos; - /// - /// 显示在雷达上的位置 - /// - public GameObject gamemap; + ///// + ///// 显示频谱地图上的位置 + ///// + //public GameObject gamePos; + ///// + ///// 显示在雷达上的位置 + ///// + //public GameObject gamemap; /// /// 频谱显示无人机大小 /// @@ -206,7 +206,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour public bool boisp = true; void Start() { - gamePos.gameObject.SetActive(false); + //gamePos.gameObject.SetActive(false); MatrixFormation(30, 1); for (int i = 0; i < unmannedAerialVehicles.Count; i++) { @@ -231,14 +231,14 @@ public class UnmannedAerialVehicleManage : MonoBehaviour flySpeedSlider.DragStop.AddListener(ChanagerFlySpeed); } - private void Mapdisplay() - { - if (reveal > 1) - { - gamePos.transform.localScale = new Vector3(reveal, 1, reveal); - boisp = false; - } - } + //private void Mapdisplay() + //{ + // if (reveal > 1) + // { + // gamePos.transform.localScale = new Vector3(reveal, 1, reveal); + // boisp = false; + // } + //} /// /// 设置组得标志 @@ -277,7 +277,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour { dataLinkCommunicationFrequency = change.transform.name; int layerValue = LayerMask.NameToLayer(dataLinkCommunicationFrequency); - gamePos.layer = layerValue; + //gamePos.layer = layerValue; string nowData = GetSyncDataTwo(); MyNetMQClient.instance.Send(nowData); equipmentCommon.SetDatabaseInfo("my_rate", dataLinkCommunicationFrequency); @@ -325,7 +325,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour { int layerValue = LayerMask.NameToLayer(_frequency); dataLinkCommunicationFrequency = _frequency; - gamePos.layer = layerValue; + //gamePos.layer = layerValue; } /// /// 接受同步消息 @@ -348,10 +348,10 @@ public class UnmannedAerialVehicleManage : MonoBehaviour { Rotation_Angle.transform.Rotate(Vector3.up*10*Time.deltaTime); } - if (isStartRehearsing) - { - gamePos.gameObject.SetActive(true); - } + //if (isStartRehearsing) + //{ + // //gamePos.gameObject.SetActive(true); + //} if (isStartRehearsing && equipmentCommon.isPlayer) { switch (pattern) @@ -395,23 +395,23 @@ public class UnmannedAerialVehicleManage : MonoBehaviour { case 1: reveal = 30; - Mapdisplay(); + //Mapdisplay(); break; case 2: reveal = 60; - Mapdisplay(); + //Mapdisplay(); break; case 3: reveal = 90; - Mapdisplay(); + //Mapdisplay(); break; case 4: reveal = 120; - Mapdisplay(); + //Mapdisplay(); break; case 5: reveal = 150; - Mapdisplay(); + //Mapdisplay(); break; default: break; @@ -509,6 +509,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour && allColliders[i].transform.GetComponent() && allColliders[i].transform.GetComponent().frequency == electronicReconnaissanceCapability) { + attackColliders1.Add(allColliders[i]); } @@ -698,8 +699,8 @@ public class UnmannedAerialVehicleManage : MonoBehaviour togFrequencyBands[k].gameObject.SetActive(date1.Contains(togFrequencyBands[k].transform.name)); } dataLinkCommunicationFrequency = dates1[0]; - int layerValue = LayerMask.NameToLayer(dataLinkCommunicationFrequency); - gamePos.layer = layerValue; + //int layerValue = LayerMask.NameToLayer(dataLinkCommunicationFrequency); + //gamePos.layer = layerValue; foreach (Toggle toggle in togFrequencyBands) { if (toggle.transform.name == dataLinkCommunicationFrequency) @@ -1162,7 +1163,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour if (isMove && positions.Count > 0) { isMove = false; - gamePos.gameObject.SetActive(true); + //gamePos.gameObject.SetActive(true); //gamemap.gameObject.SetActive(true); Vector3 _positions = positions.Dequeue(); var nowData = GetSyncData(_positions); @@ -1180,7 +1181,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour /// public IEnumerator MoveObjectAlongPath(Vector3 _positions) // 协程：按路线移动物体 { - gamePos.gameObject.SetActive(true); + //gamePos.gameObject.SetActive(true); //gamemap.gameObject.SetActive(true); Vector3 targetPosition = new Vector3(_positions.x, hight, _positions.z);// 目标位置为当前顶点坐标 float _distance = Vector3.Distance(transform.position, targetPosition);