From fac697773b8cb65b3ab54569413e15fca03ad1d7 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 11 Dec 2020 20:21:14 +0800
Subject: [PATCH] Merge commit '31f0c1761b37dfd47408a93df9ed18468b50ef40' into master
---
Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
index 4a574c7..9d7168b 100644
--- a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
+++ b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
@@ -27,6 +27,12 @@
[SerializeField]
private Sprite nextSprite;
+ [SerializeField]
+ private Image bg;
+
+ [SerializeField]
+ private GameObject other;
+
// Start is called before the first frame update
void Start()
{
@@ -35,14 +41,12 @@
isLogining = false;
- repairBtn = transform.Find("Panel/RepairBtn").GetComponent<Button>();
- noticeBtn = transform.Find("Panel/NoticeBtn").GetComponent<Button>();
+ repairBtn = transform.Find("Panel/Other/RepairBtn").GetComponent<Button>();
startBtn = transform.Find("Panel/StartBtn").GetComponent<Button>();
- versionTxt = transform.Find("Panel/Version").GetComponent<Text>();
- resVersion = transform.Find("Panel/ResVersion").GetComponent<Text>();
+ versionTxt = transform.Find("Panel/Other/Version").GetComponent<Text>();
- progressSlider = transform.Find("Panel/Progress").GetComponent<Slider>();
+ progressSlider = transform.Find("Panel/Other/Progress").GetComponent<Slider>();
progressSlider.value = 0;
progressSlider.gameObject.SetActive(false);
@@ -71,7 +75,7 @@
versionTxt.text = "版本号：" + Application.version;
//resVersion.text 暂时没有使用
- transform.Find("Panel/PlayerID").GetComponent<Text>().text = "玩家ID:" + imei0;
+ transform.Find("Panel/Other/PlayerID").GetComponent<Text>().text = "玩家ID:" + imei0;
if (GameConfig.isFirstStart)
@@ -98,6 +102,13 @@
Image img = startBtn.transform.GetChild(0).GetComponent<Image>();
img.sprite = Resources.Load<Sprite>($"UI/Loading/{resId}");
img.SetNativeSize();
+
+ if (GameConfig.GameCompletedCount > 0)
+ {
+ other.SetActive(false);
+ bg.sprite = nextSprite;
+ bg.SetNativeSize();
+ }
}
/// <summary>
--
Gitblit v1.9.1