Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-08-14 c6689f941359227f0b99b20b9400ccbab81b671c

 Fight/Actor/UserInputHandler.cs

@@ -188,21 +188,12 @@


        if (Input.GetMouseButtonDown(0))

        {

            if (UIUtility.IsPointerOverGameObject())

            {

                return;

            }



            Camera _mainCamera = CameraController.Instance.CameraObject;



#if UNITY_EDITOR

            if (EventSystem.current != null && EventSystem.current.IsPointerOverGameObject())

            {

                return;

            }

#else

            int id = Input.GetTouch(0).fingerId;

            if (EventSystem.current!=null &&EventSystem.current.IsPointerOverGameObject(id))

            {

                return;

            }

#endif



            RaycastHit _hitInfo;

            Ray _ray = _mainCamera.ScreenPointToRay(Input.mousePosition);