yulong
/
NewN_UAVPlane
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
YangHua 2024-01-29 11:47:50 +08:00
parent 0e62083e80 50a0800366
commit 2da0c9d838
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Assets/Zion/Scripts/Adam/Utility/GlobalFlag.cs
View File

@ -1,6 +1,8 @@
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
public class GlobalFlag public class GlobalFlag
{ {
@ -27,4 +29,13 @@ public class GlobalFlag
/// 红方蓝方 /// 红方蓝方
/// </summary> /// </summary>
public static int blueOrRed = -1; public static int blueOrRed = -1;
public static bool CheckGuiRaycastObjects(EventSystem eventSystem, GraphicRaycaster graphicRaycaster)
{
PointerEventData eventData = new PointerEventData(eventSystem);
eventData.pressPosition = Input.mousePosition;
eventData.position = Input.mousePosition;
List<RaycastResult> list = new List<RaycastResult>();
graphicRaycaster.Raycast(eventData, list);
return list.Count > 0;
}
} }

6
Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs
View File

@ -245,6 +245,8 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
Detection(); Detection();
} }
public EventSystem eventsystem;
public GraphicRaycaster RaycastInCanvas;
/// <summary> /// <summary>
/// 点击无线电显示UI /// 点击无线电显示UI
/// <summary> /// <summary>
@ -256,6 +258,10 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
RaycastHit hit; RaycastHit hit;
if (Physics.Raycast(ray, out hit)) if (Physics.Raycast(ray, out hit))
{ {
if (GlobalFlag.CheckGuiRaycastObjects(eventsystem, RaycastInCanvas))
{
return;
}
if (EventSystem.current.IsPointerOverGameObject()) if (EventSystem.current.IsPointerOverGameObject())
{ {
return; return;