Merge branch 'master' into LouDi_Quan

Assets/Scripts/Actions/AnimationAction.cs

@@ -56,6 +56,10 @@ namespace QFramework
             }
             if (obj != null)
             {
+                if (obj.activeSelf == false)
+                {
+                    Debug.LogError(obj.name + "当前是隐藏状态");
+                }
                 try
                 {
                     anim = obj.GetComponent<Animation>();

Assets/Scripts/Conditions/ObjClickCondition.cs

@@ -45,7 +45,7 @@ namespace QFramework
                     obj = DeviceController.Instance.GetDeviceObj(deviceName);
                 }
             }
-            if (obj != null && Input.GetMouseButtonUp(0))
+            if (obj != null && Input.GetMouseButtonUp(0) && EventSystem.current.IsPointerOverGameObject() == false)
             {
                 Vector3 mousePos = Input.mousePosition;
                 Ray ray = Camera.main.ScreenPointToRay(mousePos);