diff --git a/Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab b/Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab index 0071e50e..3945f09d 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab @@ -11063,7 +11063,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 8090299037542606275} m_MethodName: SetActive m_Mode: 6 m_Arguments: @@ -13615,7 +13615,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5575961237249078487} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] diff --git a/Assets/GameAssets/Prefebs/Models/moder/频谱探测.prefab b/Assets/GameAssets/Prefebs/Models/moder/频谱探测.prefab index 09bade1d..74c0e0c1 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/频谱探测.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/频谱探测.prefab @@ -550,7 +550,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 5136179047312290042} + - m_Target: {fileID: 4504370092153585706} m_MethodName: SetActive m_Mode: 6 m_Arguments: diff --git a/Assets/Temp/Scripts/Spectrumdetection.cs b/Assets/Temp/Scripts/Spectrumdetection.cs index d6fbcb6d..55d92df6 100644 --- a/Assets/Temp/Scripts/Spectrumdetection.cs +++ b/Assets/Temp/Scripts/Spectrumdetection.cs @@ -314,7 +314,7 @@ public class Spectrumdetection : MonoBehaviour void Update() { Search();//微波武器朝向无人机 - Emittedray(); + //Emittedray(); } /// /// 点击物体生成页面 @@ -322,27 +322,7 @@ public class Spectrumdetection : MonoBehaviour /// private void Emittedray() { - if (Input.GetMouseButtonDown(0) && UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) != "0") - { - Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); - RaycastHit hit; - if (EventSystem.current.IsPointerOverGameObject()) - { - return; - } - if (Physics.Raycast(ray, out hit, 1000)) - { - if (hit.collider.GetComponent()) - { - EquipmentCommon equipmentCommon1 = hit.collider.GetComponent(); - if (equipmentCommon.deviceID == equipmentCommon1.deviceID) - { - Frequencyiamge.transform.position = Camera.main.WorldToScreenPoint(hit.point); - Frequencyiamge.gameObject.SetActive(true); - } - } - } - } + } /// @@ -382,6 +362,15 @@ public class Spectrumdetection : MonoBehaviour { SpectrumdetectionUI.SetActive(true); } + if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) != "0") + { + EquipmentCommon equipmentCommon1 = GetComponent(); + if (equipmentCommon.deviceID == equipmentCommon1.deviceID) + { + Frequencyiamge.transform.position = Camera.main.WorldToScreenPoint(transform.position); + Frequencyiamge.gameObject.SetActive(true); + } + } //SpectrumdetectionUI.SetActive(true); } private void OnDestroy()