From 5f6fb6dccd1330b5b0bcb2d721167a6ac062f3ad Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Thu, 10 Dec 2020 10:04:11 +0800
Subject: [PATCH] Merge commit 'd8cf63f1b6ab597f279ee106527379a50bfb63d2'
---
Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs | 50 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
index add4710..26c4370 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,7 +27,7 @@
// Start is called before the first frame update
void Start()
{
-
+ AudioSourceManager.Ins.Play(AudioEnum.BGM1);
EventCenter.Ins.RemoveAllListener();
isLogining = false;
@@ -52,6 +53,7 @@
//transform.Find("Panel/Button (1)").GetComponent<Button>().onClick.AddListener(OnClickResetBtn);
+
if (Application.platform == RuntimePlatform.Android)
{
//GetetDeviceIMEI();//获取安卓手机IMEI
@@ -62,6 +64,8 @@
imei0 = "MyTestGemBattle123";
}
+ GameConfig.PlayerName = imei0;
+
versionTxt.text = "版本号：" + Application.version;
//resVersion.text 暂时没有使用
transform.Find("Panel/PlayerID").GetComponent<Text>().text = "玩家ID:" + imei0;
@@ -69,15 +73,32 @@
if (!GameConfig.isFirstStart)//后续直接加载
{
- OnClickLoginBtn();
+ waitTime = 2f;
+
+ loginNext();
}
else
{
+ waitTime = 0f;
//第一次启动，初始化并且埋点
- TDAA_SDKManager.Ins.SDKInit(ChannelID.Gm.ToString());
- TDAA_SDKManager.Ins.Statistics(1);//成功加载登陆界面的人数
+ //TDAA_SDKManager.Ins.SDKInit(ChannelID.Gm.ToString());
+ //TDAA_SDKManager.Ins.Statistics(1);//成功加载登陆界面的人数
}
}
+
+ void loginNext()
+ {
+ progressSlider.gameObject.SetActive(true);
+ startBtn.gameObject.SetActive(false);
+
+ AudioSourceManager.Ins.Play(AudioEnum.UI);
+ TDAA_SDKManager.Ins.Statistics(2);//埋点
+
+ GameConfig.isFirstStart = false;
+ StartCoroutine(loginMy());
+ }
+
+ float waitTime;
// private void OnEnable()
// {
@@ -121,14 +142,18 @@
{
if (!isLogining)
{
- progressSlider.gameObject.SetActive(true);
- startBtn.gameObject.SetActive(false);
+ // CoderM: 在这里要使用SDK来进行登录了
+ SDKCallBack.ins.setNextAction("login", loginNext);
+ SDKManager.ins.sdk.login();
- AudioSourceManager.Ins.Play(AudioEnum.UI);
- TDAA_SDKManager.Ins.Statistics(2);//埋点
+ //progressSlider.gameObject.SetActive(true);
+ //startBtn.gameObject.SetActive(false);
- GameConfig.isFirstStart = false;
- StartCoroutine(loginMy());
+ //AudioSourceManager.Ins.Play(AudioEnum.UI);
+ //TDAA_SDKManager.Ins.Statistics(2);//埋点
+
+ //GameConfig.isFirstStart = false;
+ //StartCoroutine(loginMy());
}
else
{
@@ -138,6 +163,11 @@
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("Endless2D");
--
Gitblit v1.9.1