ada/project-undercover
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merged spy-ui-update

Browse source
This commit is contained in:
Steven Leal 2017-11-30 13:21:33 -06:00
parent 7f20ebd211
commit 68275766d4
3 changed files with 2337 additions and 317 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2650
Project Undercover/Assets/Scenes/GameScene.unity
View file

File diff suppressed because it is too large Load diff

2
Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/IdleClickAction.cs
View file

@ -23,6 +23,8 @@ public class IdleClickAction : Action
public override void Act(StateController controller) public override void Act(StateController controller)
{ {
// If the user clicks, but not on a UI object ... // If the user clicks, but not on a UI object ...
if (EventSystem.current.IsPointerOverGameObject())
Debug.Log("Clicking on UI element");
if (Input.GetMouseButtonDown(0) && !EventSystem.current.IsPointerOverGameObject()) if (Input.GetMouseButtonDown(0) && !EventSystem.current.IsPointerOverGameObject())
{ {
if (controller.Interactor) if (controller.Interactor)

2
Project Undercover/ProjectSettings/ProjectVersion.txt
View file

@ -1 +1 @@
m_EditorVersion: 2017.2.0f3 m_EditorVersion: 2017.1.2f1