Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 Fight/Actor/TestPlayerController.cs

@@ -52,7 +52,7 @@
            if (m_StartedRotateCamera)

            {

                CameraController.Instance.Distance = 11;

                CameraController.Instance.rotationX = -11;

                CameraController.Instance.rotationX = -110;

                CameraController.Instance.rotationY = 50;

            }

            else