This commit is contained in:
parent
f01a5b0f3f
commit
66d6a79fd8
|
@ -208,6 +208,8 @@ MonoBehaviour:
|
||||||
buttonoff: {fileID: 1637704249957273881}
|
buttonoff: {fileID: 1637704249957273881}
|
||||||
disturb:
|
disturb:
|
||||||
InterferingFrequency1:
|
InterferingFrequency1:
|
||||||
|
eventsystem: {fileID: 0}
|
||||||
|
RaycastInCanvas: {fileID: 2225246166402166303}
|
||||||
--- !u!65 &2497641324939056363
|
--- !u!65 &2497641324939056363
|
||||||
BoxCollider:
|
BoxCollider:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -38,7 +38,7 @@ RenderSettings:
|
||||||
m_ReflectionIntensity: 1
|
m_ReflectionIntensity: 1
|
||||||
m_CustomReflection: {fileID: 0}
|
m_CustomReflection: {fileID: 0}
|
||||||
m_Sun: {fileID: 1113159741}
|
m_Sun: {fileID: 1113159741}
|
||||||
m_IndirectSpecularColor: {r: 0.16230017, g: 0.30613676, b: 0.6693658, a: 1}
|
m_IndirectSpecularColor: {r: 0.1622918, g: 0.30613187, b: 0.6693923, a: 1}
|
||||||
m_UseRadianceAmbientProbe: 0
|
m_UseRadianceAmbientProbe: 0
|
||||||
--- !u!157 &3
|
--- !u!157 &3
|
||||||
LightmapSettings:
|
LightmapSettings:
|
||||||
|
@ -51047,6 +51047,7 @@ MonoBehaviour:
|
||||||
- {fileID: 745447508}
|
- {fileID: 745447508}
|
||||||
- {fileID: 1213021907}
|
- {fileID: 1213021907}
|
||||||
mastermanagement: {fileID: 147647013}
|
mastermanagement: {fileID: 147647013}
|
||||||
|
eventsystem: {fileID: 1646249875}
|
||||||
postureBtn: {fileID: 1594140421}
|
postureBtn: {fileID: 1594140421}
|
||||||
teacherBtn: {fileID: 1565322412}
|
teacherBtn: {fileID: 1565322412}
|
||||||
satelliteImagery: {fileID: 1378295486}
|
satelliteImagery: {fileID: 1378295486}
|
||||||
|
@ -62229,7 +62230,7 @@ PrefabInstance:
|
||||||
- target: {fileID: 5302966787058760566, guid: c3d92615a09597d46aa740923029c15d,
|
- target: {fileID: 5302966787058760566, guid: c3d92615a09597d46aa740923029c15d,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: -0.000061035156
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 5302966787058760566, guid: c3d92615a09597d46aa740923029c15d,
|
- target: {fileID: 5302966787058760566, guid: c3d92615a09597d46aa740923029c15d,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
@ -65955,7 +65956,7 @@ MonoBehaviour:
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
randSeed: 47800140
|
randSeed: 18155593
|
||||||
isDoingTransition: 0
|
isDoingTransition: 0
|
||||||
minimumHeight: 0
|
minimumHeight: 0
|
||||||
--- !u!114 &1820978574
|
--- !u!114 &1820978574
|
||||||
|
|
|
@ -8,6 +8,7 @@ using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using Tenkoku.Core;
|
using Tenkoku.Core;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using UnityEngine.EventSystems;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
using static InterfaceManager;
|
using static InterfaceManager;
|
||||||
|
|
||||||
|
@ -38,6 +39,7 @@ public class GameManager : MonoSingleton<GameManager>
|
||||||
|
|
||||||
public Mastermanagement mastermanagement;
|
public Mastermanagement mastermanagement;
|
||||||
|
|
||||||
|
public EventSystem eventsystem;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 进入导调
|
/// 进入导调
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -245,7 +245,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
|
||||||
Detection();
|
Detection();
|
||||||
|
|
||||||
}
|
}
|
||||||
public EventSystem eventsystem;
|
|
||||||
public GraphicRaycaster RaycastInCanvas;
|
public GraphicRaycaster RaycastInCanvas;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 点击无线电显示UI
|
/// 点击无线电显示UI
|
||||||
|
@ -258,7 +258,7 @@ 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))
|
if (GlobalFlag.CheckGuiRaycastObjects(GameManager.Instance.eventsystem, RaycastInCanvas))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue