From e1a9ed955b247e4cc4615e8700b0ea34d7683224 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Tue, 15 Dec 2020 17:19:48 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs | 138 ++++++++++++++++++++++++++++++++-------------
1 files changed, 97 insertions(+), 41 deletions(-)
diff --git a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
index 622dd1b..523e847 100644
--- a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
+++ b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
@@ -15,8 +15,8 @@
bool isLogining;
private JsonData loginData;
- private Button repairBtn;//修复
- private Button noticeBtn;//公告
+ //private Button repairBtn;//修复
+ //private Button noticeBtn;//公告
private Button startBtn;//开始游戏
private Slider progressSlider;//进度条
@@ -24,21 +24,29 @@
private Text resVersion;//资源版本号
float waitTime;//切换场景等待时间
+ [SerializeField]
+ private Sprite nextSprite;
+
+ [SerializeField]
+ private Image bg;
+
+ [SerializeField]
+ private List<GameObject> other;
// Start is called before the first frame update
void Start()
{
AudioSourceManager.Ins.Play(AudioEnum.BGM1);
+
EventCenter.Ins.RemoveAllListener();
+ TDAA_SDKManager.Ins.AddListener();
isLogining = false;
- repairBtn = transform.Find("Panel/RepairBtn").GetComponent<Button>();
- noticeBtn = transform.Find("Panel/NoticeBtn").GetComponent<Button>();
+ //repairBtn = transform.Find("Panel/RepairBtn").GetComponent<Button>();
startBtn = transform.Find("Panel/StartBtn").GetComponent<Button>();
versionTxt = transform.Find("Panel/Version").GetComponent<Text>();
- resVersion = transform.Find("Panel/ResVersion").GetComponent<Text>();
progressSlider = transform.Find("Panel/Progress").GetComponent<Slider>();
progressSlider.value = 0;
@@ -47,46 +55,62 @@
startBtn.onClick.AddListener(OnClickLoginBtn);
startBtn.gameObject.SetActive(true);
- repairBtn.onClick.AddListener(() =>
- {
- OnClickResetBtn();
- });
+ // repairBtn.onClick.AddListener(() =>
+ // {
+ // OnClickResetBtn();
+ // });
//transform.Find("Panel/Button (1)").GetComponent<Button>().onClick.AddListener(OnClickResetBtn);
-
- if (Application.platform == RuntimePlatform.Android)
+ if (!GameConfig.useSDK)
{
- //GetetDeviceIMEI();//获取安卓手机IMEI
- imei0 = TDAA_SDKManager.Ins.GetDeviceId();//使用设备ID
- }
- else if (Application.platform == RuntimePlatform.WindowsEditor)
- {
- imei0 = "MyTestGemBattle123";
- }
+ if (Application.platform == RuntimePlatform.Android)
+ {
+ //GetetDeviceIMEI();//获取安卓手机IMEI
+ imei0 = TDAA_SDKManager.Ins.GetDeviceId();//使用设备ID
+ }
+ else if (Application.platform == RuntimePlatform.WindowsEditor)
+ {
+ imei0 = "MyTestGemBattle123";
+ }
- GameConfig.PlayerName = imei0;
+ GameConfig.Imei = imei0;
+ }
versionTxt.text = "版本号：" + Application.version;
//resVersion.text 暂时没有使用
transform.Find("Panel/PlayerID").GetComponent<Text>().text = "玩家ID:" + imei0;
-
- if (!GameConfig.isFirstStart)//后续直接加载
- {
- waitTime = 2f;
-
- loginNext();
- }
- else
+ if (GameConfig.isFirstStart)
{
waitTime = 0f;
- //第一次启动，初始化并且埋点
- if (!GameConfig.useSDK)
+ Debug.Log("初始化TDAA_SDKManager");
+ TDAA_SDKManager.Ins.SDKInit(ChannelID.Gm.ToString());
+ TDAA_SDKManager.Ins.Statistics(1);//成功加载登陆界面的人数
+ }
+
+ SetStart();
+ }
+
+ /// <summary>
+ /// 设置开始状态
+ /// </summary>
+ private void SetStart()
+ {
+ startBtn.gameObject.SetActive(true);
+ int resId = Mathf.FloorToInt(Mathf.Clamp01(GameConfig.GameCompletedCount));
+ Image img = startBtn.transform.GetChild(0).GetComponent<Image>();
+ img.sprite = Resources.Load<Sprite>($"UI/Loading/{resId}");
+ img.SetNativeSize();
+
+ if (GameConfig.GameCompletedCount > 0)
+ {
+ for (int i = 0; i < other.Count; ++i)
{
- TDAA_SDKManager.Ins.SDKInit(ChannelID.Gm.ToString());
- TDAA_SDKManager.Ins.Statistics(1);//成功加载登陆界面的人数
+ other[i].SetActive(false);
}
+ bg.sprite = nextSprite;
+ bg.SetNativeSize();
}
}
@@ -105,6 +129,17 @@
StartCoroutine(loginMy());
}
+ /// <summary>
+ /// 使用SDK登录
+ /// </summary>
+ void SDKloginNext()
+ {
+ GameConfig.Imei = SDKManager.ins.sdk.uid;
+ Debug.Log("SDK登录,修改Imei：" + GameConfig.Imei);
+ transform.Find("Panel/PlayerID").GetComponent<Text>().text = "玩家ID:" + GameConfig.Imei;
+
+ loginNext();
+ }
#region 获得安卓手机上的IMEI号
@@ -131,9 +166,12 @@
private void OnClickResetBtn()
{
- Debug.LogError("清空了所有数据");
- PlayerPrefs.DeleteAll();
- TDAA_SDKManager.Ins.Reset();
+ if (!GameConfig.useSDK)
+ {
+ Debug.LogError("清空了所有数据");
+ PlayerPrefs.DeleteAll();
+ TDAA_SDKManager.Ins.Reset();
+ }
}
@@ -141,18 +179,36 @@
{
if (!isLogining)
{
- // CoderM: 在这里要使用SDK来进行登录了
- if (GameConfig.useSDK)
+ isLogining = true;
+ if (GameConfig.isFirstStart)
{
- //设置login的回调
- SDKCallBack.ins.setNextAction("login", loginNext);
- SDKManager.ins.sdk.login();
+ // CoderM: 在这里要使用SDK来进行登录了
+ if (GameConfig.useSDK)
+ {
+ Debug.Log("使用SDK来进行登录了");
+ //设置login的回调
+ SDKCallBack.ins.setNextAction("login", SDKloginNext);
+ SDKManager.ins.sdk.login();
+ }
+ else
+ {
+ Debug.Log("没有使用SDK");
+
+ //没有使用SDK
+ loginNext();
+ }
}
else
{
- //没有使用SDK
- loginNext();
+ Debug.Log("重玩");
+ progressSlider.gameObject.SetActive(true);
+ startBtn.gameObject.SetActive(false);
+
+ AudioSourceManager.Ins.Play(AudioEnum.UI);
+ TDAA_SDKManager.Ins.OnClickRestartBtn();//重玩
+ StartCoroutine(loginMy());
}
+
}
else
{
--
Gitblit v1.9.1