From 69e0fea6c92fd4e153d45e5f26ef89baecf0405a Mon Sep 17 00:00:00 2001
From: weixudong <weixudong4700@ktgame.com>
Date: Thu, 19 Nov 2020 08:51:09 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master
---
Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
index e3f60ea..0f6d89d 100644
--- a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
+++ b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
@@ -8,6 +8,7 @@
using UnityEngine.Networking;
using Protobuf;
using Google.Protobuf;
+using DG.Tweening;
public class LoginUI : MonoBehaviour
{
@@ -26,6 +27,8 @@
// Start is called before the first frame update
void Start()
{
+ AudioSourceManager.Ins.Play(AudioEnum.BGM1);
+ EventCenter.Ins.RemoveAllListener();
isLogining = false;
@@ -67,15 +70,20 @@
if (!GameConfig.isFirstStart)//后续直接加载
{
+ waitTime = 2f;
+
OnClickLoginBtn();
}
else
{
+ waitTime = 0f;
//第一次启动，初始化并且埋点
TDAA_SDKManager.Ins.SDKInit(ChannelID.Gm.ToString());
TDAA_SDKManager.Ins.Statistics(1);//成功加载登陆界面的人数
}
}
+
+ float waitTime;
// private void OnEnable()
// {
@@ -136,9 +144,15 @@
IEnumerator loginMy()
{
+ progressSlider.value = 0.0f;
+ System.GC.Collect();
+ DOTween.Clear();
+ Debug.Log("开始清理GC,清理DOTween");
+ yield return new WaitForSeconds(waitTime);
int displayProgress = 0;
int toProgress = 0;
- AsyncOperation op = SceneManager.LoadSceneAsync(GameConfig.NextSceneName);
+ AsyncOperation op = SceneManager.LoadSceneAsync("Endless2D");
+ // AsyncOperation op = SceneManager.LoadSceneAsync(GameConfig.NextSceneName);
op.allowSceneActivation = false;
while (op.progress < 0.9f) //此处如果是 <= 0.9f 则会出现死循环所以必须小0.9
{
--
Gitblit v1.9.1