diff --git a/Assets/GameAssets/Prefebs/Models/moder/地面无线电干扰.prefab b/Assets/GameAssets/Prefebs/Models/moder/地面无线电干扰.prefab index 52c78c48..19eab9a5 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/地面无线电干扰.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/地面无线电干扰.prefab @@ -208,6 +208,8 @@ MonoBehaviour: buttonoff: {fileID: 1637704249957273881} disturb: InterferingFrequency1: + eventsystem: {fileID: 0} + RaycastInCanvas: {fileID: 2225246166402166303} --- !u!65 &2497641324939056363 BoxCollider: m_ObjectHideFlags: 0 diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity index ceeb388d..b5ef10eb 100644 --- a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity +++ b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} 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 --- !u!157 &3 LightmapSettings: @@ -51047,6 +51047,7 @@ MonoBehaviour: - {fileID: 745447508} - {fileID: 1213021907} mastermanagement: {fileID: 147647013} + eventsystem: {fileID: 1646249875} postureBtn: {fileID: 1594140421} teacherBtn: {fileID: 1565322412} satelliteImagery: {fileID: 1378295486} @@ -62229,7 +62230,7 @@ PrefabInstance: - target: {fileID: 5302966787058760566, guid: c3d92615a09597d46aa740923029c15d, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000061035156 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5302966787058760566, guid: c3d92615a09597d46aa740923029c15d, type: 3} @@ -65955,7 +65956,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: 47800140 + randSeed: 18155593 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &1820978574 diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs index a22e76b0..0efedaa8 100644 --- a/Assets/Zion/Scripts/Adam/GameManager.cs +++ b/Assets/Zion/Scripts/Adam/GameManager.cs @@ -8,6 +8,7 @@ using System.Collections.Generic; using System.Linq; using Tenkoku.Core; using UnityEngine; +using UnityEngine.EventSystems; using UnityEngine.UI; using static InterfaceManager; @@ -38,6 +39,7 @@ public class GameManager : MonoSingleton public Mastermanagement mastermanagement; + public EventSystem eventsystem; /// /// 进入导调 /// diff --git a/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs b/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs index 39e76847..47494723 100644 --- a/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs @@ -245,7 +245,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour Detection(); } - public EventSystem eventsystem; + public GraphicRaycaster RaycastInCanvas; /// /// 点击无线电显示UI @@ -258,7 +258,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour RaycastHit hit; if (Physics.Raycast(ray, out hit)) { - if (GlobalFlag.CheckGuiRaycastObjects(eventsystem, RaycastInCanvas)) + if (GlobalFlag.CheckGuiRaycastObjects(GameManager.Instance.eventsystem, RaycastInCanvas)) { return; }