From f1beca22d879a316b392528dd7b4486b671ec919 Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Thu, 10 Dec 2020 17:40:03 +0800
Subject: [PATCH] Merge commit 'bd0ba263761a866ca0d698169d2d83b6a11c35e7'
---
Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs | 81 +++++++++++++++++++++-------------------
1 files changed, 42 insertions(+), 39 deletions(-)
diff --git a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
index 622dd1b..38af7bf 100644
--- a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
+++ b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
@@ -22,7 +22,6 @@
private Text versionTxt;//版本号
private Text resVersion;//资源版本号
- float waitTime;//切换场景等待时间
// Start is called before the first frame update
@@ -54,22 +53,8 @@
//transform.Find("Panel/Button (1)").GetComponent<Button>().onClick.AddListener(OnClickResetBtn);
-
- if (Application.platform == RuntimePlatform.Android)
- {
- //GetetDeviceIMEI();//获取安卓手机IMEI
- imei0 = TDAA_SDKManager.Ins.GetDeviceId();//使用设备ID
- }
- else if (Application.platform == RuntimePlatform.WindowsEditor)
- {
- imei0 = "MyTestGemBattle123";
- }
-
- GameConfig.PlayerName = imei0;
-
- versionTxt.text = "版本号：" + Application.version;
- //resVersion.text 暂时没有使用
- transform.Find("Panel/PlayerID").GetComponent<Text>().text = "玩家ID:" + imei0;
+
+
if (!GameConfig.isFirstStart)//后续直接加载
@@ -82,19 +67,29 @@
{
waitTime = 0f;
//第一次启动，初始化并且埋点
- if (!GameConfig.useSDK)
- {
- TDAA_SDKManager.Ins.SDKInit(ChannelID.Gm.ToString());
- TDAA_SDKManager.Ins.Statistics(1);//成功加载登陆界面的人数
- }
+ //TDAA_SDKManager.Ins.SDKInit(ChannelID.Gm.ToString());
+ //TDAA_SDKManager.Ins.Statistics(1);//成功加载登陆界面的人数
}
}
- /// <summary>
- /// 开始游戏
- /// </summary>
void loginNext()
{
+ //if (Application.platform == RuntimePlatform.Android)
+ //{
+ // //GetetDeviceIMEI();//获取安卓手机IMEI
+ // imei0 = TDAA_SDKManager.Ins.GetDeviceId();//使用设备ID
+ //}
+ //else if (Application.platform == RuntimePlatform.WindowsEditor)
+ //{
+ // imei0 = "MyTestGemBattle123";
+ //}
+
+ GameConfig.PlayerName = SDKManager.ins.sdk.uid;
+
+ versionTxt.text = "版本号：" + Application.version;
+ //resVersion.text 暂时没有使用
+ transform.Find("Panel/PlayerID").GetComponent<Text>().text = "玩家ID:" + SDKManager.ins.sdk.uid;
+
progressSlider.gameObject.SetActive(true);
startBtn.gameObject.SetActive(false);
@@ -105,16 +100,24 @@
StartCoroutine(loginMy());
}
+ float waitTime;
+ // private void OnEnable()
+ // {
+ // SocketEvent.Ins.Add<IMessage>((int)Opcode.LoginS2C, LoginS2C);
+ // }
+
+ // private void OnDestroy()
+ // {
+ // SocketEvent.Ins.Remove<IMessage>((int)Opcode.LoginS2C, LoginS2C);
+
+ // }
#region 获得安卓手机上的IMEI号
public string imei0 = "";
public string imei1 = "";
public string meid = "";
- /// <summary>
- /// 已弃用
- /// </summary>
void GetetDeviceIMEI()
{
var unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
@@ -142,17 +145,17 @@
if (!isLogining)
{
// CoderM: 在这里要使用SDK来进行登录了
- if (GameConfig.useSDK)
- {
- //设置login的回调
- SDKCallBack.ins.setNextAction("login", loginNext);
- SDKManager.ins.sdk.login();
- }
- else
- {
- //没有使用SDK
- loginNext();
- }
+ SDKCallBack.ins.setNextAction("login", loginNext);
+ SDKManager.ins.sdk.login();
+
+ //progressSlider.gameObject.SetActive(true);
+ //startBtn.gameObject.SetActive(false);
+
+ //AudioSourceManager.Ins.Play(AudioEnum.UI);
+ //TDAA_SDKManager.Ins.Statistics(2);//埋点
+
+ //GameConfig.isFirstStart = false;
+ //StartCoroutine(loginMy());
}
else
{
--
Gitblit v1.9.1