From 6baa5a654138a2e0a9871adaef311a74e132dd6e Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 25 Dec 2020 15:53:56 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master
---
Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
index 523e847..908f905 100644
--- a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
+++ b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
@@ -33,6 +33,8 @@
[SerializeField]
private List<GameObject> other;
+ private GameObject MainUI;
+
// Start is called before the first frame update
void Start()
{
@@ -40,8 +42,12 @@
EventCenter.Ins.RemoveAllListener();
TDAA_SDKManager.Ins.AddListener();
+ EventCenter.Ins.Add((int)KTGMGemClient.EventType.ChangeScene, ChangeScene);
isLogining = false;
+
+ MainUI = transform.Find("Panel/MainPanel").gameObject;
+ MainUI.SetActive(false);
//repairBtn = transform.Find("Panel/RepairBtn").GetComponent<Button>();
startBtn = transform.Find("Panel/StartBtn").GetComponent<Button>();
@@ -89,7 +95,7 @@
TDAA_SDKManager.Ins.Statistics(1);//成功加载登陆界面的人数
}
- SetStart();
+ //SetStart();
}
/// <summary>
@@ -119,14 +125,13 @@
/// </summary>
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());
+ //GameConfig.isFirstStart = false;
+ MainUI.SetActive(true);
}
/// <summary>
@@ -139,6 +144,13 @@
transform.Find("Panel/PlayerID").GetComponent<Text>().text = "玩家ID:" + GameConfig.Imei;
loginNext();
+ }
+
+ private void ChangeScene()
+ {
+ progressSlider.gameObject.SetActive(true);
+
+ StartCoroutine(loginMy());
}
@@ -210,10 +222,7 @@
}
}
- else
- {
- }
}
IEnumerator loginMy()
--
Gitblit v1.9.1