Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

liuzhiwei

2020-12-08 ed4fb637a9a0477750d284bf0a42569ed0c0c26a

 Assets/Scripts/Core/Camera/ViewPortAdj.cs

@@ -11,7 +11,10 @@
    /// </summary>
    public UnityEngine.Camera cachedCamera { get; private set; }

    private Vector3 cachedCameraPos;

    public UnityEngine.Camera backGroundCamera { get; private set; }
    private Vector3 backGroundCameraPos;

    public bool bAdjViewPort = false;

@@ -21,8 +24,13 @@
        cachedCamera.DOShakePosition(0.25f, 1.5f, 4).OnComplete(() =>
        {
            KTGMGemClient.GameConfig.IsShaking = false;
            cachedCamera.transform.position = cachedCameraPos;

        });
        backGroundCamera.DOShakePosition(0.25f, 1.5f, 4);
        backGroundCamera.DOShakePosition(0.25f, 1.5f, 4).OnComplete(() =>
        {
            backGroundCamera.transform.position = backGroundCameraPos;
        });
    }


@@ -47,6 +55,9 @@
        base.Awake();
        cachedCamera = GetComponent<UnityEngine.Camera>();
        backGroundCamera = GameObject.Find("BackCamera").GetComponent<UnityEngine.Camera>();

        cachedCameraPos = cachedCamera.transform.position;
        backGroundCameraPos = backGroundCamera.transform.position;
    }

    // Start is called before the first frame update