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 | 35 ++++++++++++++++++++++++++--------- 1 files changed, 26 insertions(+), 9 deletions(-) diff --git a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs index d8fcdf7..26c4370 100644 --- a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs +++ b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs @@ -53,6 +53,7 @@ //transform.Find("Panel/Button (1)").GetComponent<Button>().onClick.AddListener(OnClickResetBtn); + if (Application.platform == RuntimePlatform.Android) { //GetetDeviceIMEI();//获取安卓手机IMEI @@ -74,15 +75,27 @@ { waitTime = 2f; - OnClickLoginBtn(); + 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; @@ -129,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 { -- Gitblit v1.9.1