From 54181477c210344b037d88f17dbe2cddc5cbc930 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 02 Dec 2020 17:54:32 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/Core/Camera/ViewPortAdj.cs | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/Assets/Scripts/Core/Camera/ViewPortAdj.cs b/Assets/Scripts/Core/Camera/ViewPortAdj.cs
index 662b802..539abf8 100644
--- a/Assets/Scripts/Core/Camera/ViewPortAdj.cs
+++ b/Assets/Scripts/Core/Camera/ViewPortAdj.cs
@@ -15,10 +15,17 @@
public bool bAdjViewPort = false;
- public void DOShakePosition(){
- cachedCamera.DOShakePosition(0.25f, 1.5f, 4);
+ public void DOShakePosition()
+ {
+ KTGMGemClient.GameConfig.IsShaking = true;
+ cachedCamera.DOShakePosition(0.25f, 1.5f, 4).OnComplete(() =>
+ {
+ KTGMGemClient.GameConfig.IsShaking = false;
+ });
backGroundCamera.DOShakePosition(0.25f, 1.5f, 4);
}
+
+
public void adjViewportRect()
{
@@ -34,7 +41,7 @@
//bAdjViewPort = true;
}
-
+
protected override void Awake()
{
base.Awake();
@@ -47,12 +54,13 @@
{
// 初始化的时候调整视口就OK了.
this.adjViewportRect();
+ Application.targetFrameRate = 60;
}
// Update is called once per frame
void Update()
{
- this.adjViewportRect();
- Application.targetFrameRate = 60;
+ //this.adjViewportRect();
+ //Application.targetFrameRate = 60;
}
}
--
Gitblit v1.9.1