Merge branch 'SXE_HQB' of http://git.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXE_HQB

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;
+
         }
 
 

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;
 
 /// <summary>
 /// Ñéµç±Ê
@@ -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;