From a9db3f3f06ef7d5f7176f2fcecf848939f9d9dc5 Mon Sep 17 00:00:00 2001 From: jiangbingqing <2321336183@qq.com> Date: Sat, 14 Sep 2024 18:04:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=BC=80=E8=83=8C?= =?UTF-8?q?=E5=8C=85=EF=BC=8C=E4=BC=9A=E8=A7=A6=E7=A2=B0=E5=88=B0=E5=90=8E?= =?UTF-8?q?=E9=9D=A2=E5=86=85=E5=AE=B9=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Scripts/ToolsPack/ToolsPackWindowManager.cs | 5 +++++ .../Assets/taoruiqi/Script/ElectricCheckPen.cs | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowManager.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowManager.cs index 487a2faa..a3dcc538 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowManager.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowManager.cs @@ -28,11 +28,14 @@ namespace ToolsPack [SerializeField] private Transform content; [SerializeField] private Toggle tog; + public static bool isOpenBag = false; + public void OnEnable() { // ChangePage(ModelTypeEnum.工具); StartCoroutine(SetToggleOnNextFrame(tog)); + isOpenBag = true; } private IEnumerator SetToggleOnNextFrame(Toggle toggle) @@ -48,6 +51,8 @@ namespace ToolsPack private void OnDisable() { + isOpenBag = false; + } diff --git a/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ElectricCheckPen.cs b/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ElectricCheckPen.cs index c1e7611e..f3a8fb1d 100644 --- a/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ElectricCheckPen.cs +++ b/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ElectricCheckPen.cs @@ -9,6 +9,7 @@ using UnityEngine; using Unity.VisualScripting; using UnityEngine.EventSystems; using static System.Windows.Forms.VisualStyles.VisualStyleElement.ProgressBar; +using ToolsPack; /// /// Ñéµç±Ê @@ -55,9 +56,9 @@ public class ElectricCheckPen : MonoBehaviour { //if (EventSystem.current.IsPointerOverGameObject()) // return; + - - if (Input.GetMouseButtonDown(0)) + if (Input.GetMouseButtonDown(0) && !ToolsPackWindowManager.isOpenBag) {//Camera.transform.forward Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); RaycastHit hit;