From 56d95fa59a9f6dc12d0fc0723ea449e5b317f994 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Sat, 26 Dec 2020 14:05:00 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master
---
Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
index dcb5521..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>();
@@ -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());
+ 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());
}
@@ -222,7 +234,7 @@
yield return new WaitForSeconds(waitTime);
int displayProgress = 0;
int toProgress = 0;
- AsyncOperation op = SceneManager.LoadSceneAsync("LoadingScene");
+ 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