Merge commit '998ebc0dc00c103b365e36797c1a1ac4a6a2afa5' into master

chenxin

2020-11-19 fdfb88a9ee3652e716e603f759d3be5dcc0bd3bd

 Assets/Scripts/Core/Camera/ViewPortAdj.cs

@@ -1,4 +1,5 @@
using Core.Utilities;
using DG.Tweening;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@@ -10,20 +11,27 @@
    /// </summary>
    public UnityEngine.Camera cachedCamera { get; private set; }

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

    public bool bAdjViewPort = false;

    public void DOShakePosition(){
        cachedCamera.DOShakePosition(0.25f, 1.5f, 4);
        backGroundCamera.DOShakePosition(0.25f, 1.5f, 4);
    }

    public void adjViewportRect()
    {
        float wscale = 1080f/Screen.width;
        // River: 动态的处理ViewPortRect.
        float vpscale = (1920f / wscale / Screen.height);
        Rect vpRect = new Rect();
        vpRect.x = 0.0f;
        vpRect.y = (1.0f - vpscale) / 2.0f;
        vpRect.width = 1f;
        vpRect.height = vpscale;
        cachedCamera.rect = vpRect;
        bAdjViewPort = true;
        //float wscale = 1080f/Screen.width;
        //// River: 动态的处理ViewPortRect.
        //float vpscale = (1920f / wscale / Screen.height);
        //Rect vpRect = new Rect();
        //vpRect.x = 0.0f;
        //vpRect.y = (1.0f - vpscale) / 2.0f;
        //vpRect.width = 1f;
        //vpRect.height = vpscale;
        //cachedCamera.rect = vpRect;
        //bAdjViewPort = true;
    }

    
@@ -31,6 +39,7 @@
    {
        base.Awake();
        cachedCamera = GetComponent<UnityEngine.Camera>();
        backGroundCamera = GameObject.Find("BackCamera").GetComponent<UnityEngine.Camera>();
    }

    // Start is called before the first frame update