From 14fd34b9bec53b818279b86085ee426c34aac021 Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Fri, 11 Dec 2020 21:37:50 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle
---
Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
index 9d7168b..8e577d7 100644
--- a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
+++ b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
@@ -31,7 +31,7 @@
private Image bg;
[SerializeField]
- private GameObject other;
+ private List<GameObject> other;
// Start is called before the first frame update
void Start()
@@ -41,12 +41,12 @@
isLogining = false;
- repairBtn = transform.Find("Panel/Other/RepairBtn").GetComponent<Button>();
+ repairBtn = transform.Find("Panel/RepairBtn").GetComponent<Button>();
startBtn = transform.Find("Panel/StartBtn").GetComponent<Button>();
- versionTxt = transform.Find("Panel/Other/Version").GetComponent<Text>();
+ versionTxt = transform.Find("Panel/Version").GetComponent<Text>();
- progressSlider = transform.Find("Panel/Other/Progress").GetComponent<Slider>();
+ progressSlider = transform.Find("Panel/Progress").GetComponent<Slider>();
progressSlider.value = 0;
progressSlider.gameObject.SetActive(false);
@@ -75,7 +75,7 @@
versionTxt.text = "版本号：" + Application.version;
//resVersion.text 暂时没有使用
- transform.Find("Panel/Other/PlayerID").GetComponent<Text>().text = "玩家ID:" + imei0;
+ transform.Find("Panel/PlayerID").GetComponent<Text>().text = "玩家ID:" + imei0;
if (GameConfig.isFirstStart)
@@ -105,7 +105,10 @@
if (GameConfig.GameCompletedCount > 0)
{
- other.SetActive(false);
+ for (int i = 0; i < other.Count; ++i)
+ {
+ other[i].SetActive(false);
+ }
bg.sprite = nextSprite;
bg.SetNativeSize();
}
--
Gitblit v1.9.1