From 845a7ca7400aa6abf180cdd639ec58057d6974fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=90=8D?= <3077614386@qq.com> Date: Mon, 29 Jan 2024 14:43:43 +0800 Subject: [PATCH] 1 --- .../ModelFunction/Radar/RadarManger.cs | 2 +- .../TerrestrialRadioInterferenceManger.cs | 47 +++++-------------- 2 files changed, 12 insertions(+), 37 deletions(-) diff --git a/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs b/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs index a8611134..d329c9cb 100644 --- a/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs @@ -190,7 +190,7 @@ public class RadarManger : MonoBehaviour { if (equipmentCommon.isPlayer && timerCoroutine == null) { - //timerCoroutine = StartCoroutine(Timer()); + timerCoroutine = StartCoroutine(Timer()); isTimerRunning = true; } } diff --git a/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs b/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs index 47494723..d33ca0c0 100644 --- a/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs @@ -240,44 +240,10 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour //Interferencemode(); //Angularrange(); } - void LateUpdate() - { - Detection(); - - } + public GraphicRaycaster RaycastInCanvas; - /// - /// 点击无线电显示UI - /// - private void Detection() - { - if (GlobalFlag.blueOrRed == 1 && Input.GetMouseButtonDown(0)) - { - Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); - RaycastHit hit; - if (Physics.Raycast(ray, out hit)) - { - if (GlobalFlag.CheckGuiRaycastObjects(GameManager.Instance.eventsystem, RaycastInCanvas)) - { - return; - } - if (EventSystem.current.IsPointerOverGameObject()) - { - return; - } - if (hit.collider.GetComponent()) - { - EquipmentCommon equipment = hit.collider.GetComponent(); - if (equipmentCommon.deviceID == equipment.deviceID) - { - Waveimage.transform.position = Camera.main.WorldToScreenPoint(hit.point); - Waveimage.gameObject.SetActive(true); - } - } - } - } - } + #region 启动暂停 @@ -604,4 +570,13 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour } } } + + void OnMouseDwon() + { + if (GlobalFlag.blueOrRed == 1 && Input.GetMouseButtonDown(0)) + { + Waveimage.transform.position = Camera.main.WorldToScreenPoint(transform.position); + Waveimage.gameObject.SetActive(true); + } + } }