Merge remote-tracking branch 'origin/master' into SpringFestival

client_Zxw

2019-01-28 f47ea60f59e0b2b8601583351e269151237c6708

 Utility/UIUtility.cs

@@ -210,8 +210,6 @@
            return false;

        }



        if (Application.platform == RuntimePlatform.IPhonePlayer)

        {

            var eventData = new PointerEventData(EventSystem.current);

            eventData.pressPosition = Input.mousePosition;

            eventData.position = Input.mousePosition;

@@ -220,11 +218,6 @@
            EventSystem.current.RaycastAll(eventData, list);



            return list.Count > 0;

        }

        else

        {

            return EventSystem.current.IsPointerOverGameObject();

        }

    }



    struct Quadrangle