JiNan/VirtualFramework
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into LouDi_Quan

Browse Source
This commit is contained in:
shenjianxing 2025-01-08 14:57:31 +08:00
commit 8bdbf9af1c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Scripts/Actions/AnimationAction.cs
View File

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

2
Assets/Scripts/Conditions/ObjClickCondition.cs
View File

@ -45,7 +45,7 @@ namespace QFramework
obj = DeviceController.Instance.GetDeviceObj(deviceName); 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; Vector3 mousePos = Input.mousePosition;
Ray ray = Camera.main.ScreenPointToRay(mousePos); Ray ray = Camera.main.ScreenPointToRay(mousePos);