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

client_linchunjie

2018-08-30 d9ec38da76d0ab04b1496c6dcd75a573ed17ab85

 Fight/Stage/Dungeon/MapArea.cs

@@ -81,9 +81,9 @@
    {

        if (_type >= 3000)

        {

            StopCoroutine("MovingCamera");

            StopCoroutine("ResetCamera");

            StartCoroutine("MovingCamera");

            SnxxzGame.Instance.MovingCamera(false, _type);

            SnxxzGame.Instance.ResetCamera(false);

            SnxxzGame.Instance.MovingCamera(true, _type);

        }



        if (PlayerDatas.Instance.hero != null)

@@ -105,8 +105,8 @@
    {

        if (_type >= 3000)

        {

            StopCoroutine("MovingCamera");

            StartCoroutine("ResetCamera");

            SnxxzGame.Instance.MovingCamera(false, _type);

            SnxxzGame.Instance.ResetCamera(true);

        }



        if (PlayerDatas.Instance.hero != null)

@@ -125,68 +125,6 @@
        }

    }



    private IEnumerator MovingCamera()

    {

        AreaCameraConfig _areaCamera = Config.Instance.Get<AreaCameraConfig>(_type);



        if (_areaCamera == null)

        {

            yield break;

        }



        CameraController.Instance.AcceptInput = true;



        CameraController.Instance.ZoomDamping = 0.5f;

        CameraController.Instance.RotationDamping = 0.5f;



        CameraController.Instance.sceneDistance = CameraController.Instance.Distance = _areaCamera.Distance * Constants.F_DELTA;

        CameraController.Instance.rotationX = _areaCamera.RotX * Constants.F_DELTA;

        CameraController.Instance.rotationY = _areaCamera.RotY * Constants.F_DELTA;



        float _time = 2f;

        while (_time > 0)

        {

            _time -= Time.deltaTime;

            yield return null;

        }



        CameraController.Instance.AcceptInput = false;



        CameraController.Instance.Distance = _areaCamera.Distance * Constants.F_DELTA;

        CameraController.Instance.rotationX = _areaCamera.RotX * Constants.F_DELTA;

        CameraController.Instance.rotationY = _areaCamera.RotY * Constants.F_DELTA;



        CameraController.Instance.ZoomDamping = 0.1f;

        CameraController.Instance.RotationDamping = 0.02f;

    }



    private IEnumerator ResetCamera()

    {

        CameraController.Instance.AcceptInput = true;



        CameraController.Instance.ZoomDamping = 0.5f;

        CameraController.Instance.RotationDamping = 0.5f;



        CameraController.Instance.sceneDistance = CameraController.Instance.Distance = 9;

        CameraController.Instance.rotationX = -45;

        CameraController.Instance.rotationY = 40;



        float _time = 2f;

        while (_time > 0)

        {

            _time -= Time.deltaTime;

            yield return null;

        }



        CameraController.Instance.AcceptInput = false;



        CameraController.Instance.Distance = 9;

        CameraController.Instance.rotationX = -45;

        CameraController.Instance.rotationY = 40;



        CameraController.Instance.ZoomDamping = 0.1f;

        CameraController.Instance.RotationDamping = 0.02f;

    }



#if UNITY_EDITOR

    private void OnDrawGizmos()