1

SFGgouhuo/Assets/Bundles/UI/Prefab/Dlg/DlgLoginFaild.prefab

@@ -331,6 +331,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   button: {fileID: 9135375882623986701}
+  faildMsg: {fileID: 6679059285912752888}
 --- !u!1 &4218211301158804282
 GameObject:
   m_ObjectHideFlags: 0

SFGgouhuo/Assets/Scripts/Manager/GameManager.cs

@@ -17,11 +17,6 @@ public class GameManager : MonoBehaviour
     private YooAssetManager m_YooAssetManager;
     private CharacterManager m_CharacterManager;
     private StepManager m_StepManager;
-    public WhiteList whiteList;
-    /// <summary>
-    /// °×Ãûµ¥URL
-    /// </summary>
-    string urlWhiteList = "https://sfgdemo-1303083714.cos.ap-hongkong.myqcloud.com/WhiteList.json";
     private async void Awake()
     {
         Debug.Log("½øÈëGameManager");
@@ -39,26 +34,6 @@ public class GameManager : MonoBehaviour
         m_AudioManager = gameObject.AddComponent<AudioManager>();
         m_CharacterManager = gameObject.AddComponent<CharacterManager>();
         m_StepManager= gameObject.AddComponent<StepManager>();
-        StartCoroutine(GetWhiteList());
-    }
-    /// <summary>
-    /// ÇëÇó°×Ãûµ¥
-    /// </summary>
-    /// <returns></returns>
-    IEnumerator GetWhiteList()
-    {
-        UnityWebRequest request = UnityWebRequest.Get(urlWhiteList);
-        yield return request.SendWebRequest();
-        if (request.result == UnityWebRequest.Result.Success)
-        {
-            whiteList = JsonMapper.ToObject<WhiteList>(request.downloadHandler.text);
-            StepManager.timeStamp = whiteList.TimeStamp;
-        }
-        else
-        {
-            Debug.Log(request.error);
-        }
-
     }
     public GameManager GetGameManager() { return this; }
 }

SFGgouhuo/Assets/Scripts/UI/Loading/DlgLogin.cs

@@ -22,7 +22,7 @@ namespace Assets
         /// <summary>
         /// 白名单URL
         /// </summary>
-        string urlWhiteList = "https://sfgdemo-1303083714.cos.ap-hongkong.myqcloud.com/WhiteList.json";
+        string urlWhiteList = "http://172.18.10.22/WhiteList.json";
         /// <summary>
         /// 是否验证Mac地址
         /// </summary>
@@ -39,34 +39,9 @@ namespace Assets
         public override void OnInitWindow()
         {
             GetMacAddress();
-            whiteList = GameManager.Instance.whiteList;
-            confirmBtn.onClick.AddListener(async () =>
+            confirmBtn.onClick.AddListener(() =>
             {
-                if (isVerify)
-                {
-                    if (whiteList.table.Contains(inputField.text))
-                    {
-                        StepManager.userID = inputField.text;
-                        StartCoroutine(GetSecretKey());
-                    }
-                    else
-                    {
-                        await UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
-                    }
-                }
-                else
-                {
-                    if (whiteList.table.Contains(inputField.text))
-                    {
-                        StepManager.userID = inputField.text;
-                        UIManager.Instance.HideUI(WindowID.DlgLogin);
-                        await UIManager.Instance.ShowUI(WindowID.FaceBuildPanel);
-                    }
-                    else
-                    {
-                        await UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
-                    }
-                }
+                StartCoroutine(GetWhiteList());
             });
         }
 
@@ -74,6 +49,7 @@ namespace Assets
         {
 
         }
+
         /// <summary>
         /// 获取秘钥
         /// </summary>
@@ -158,6 +134,7 @@ namespace Assets
             {
                 whiteList = JsonMapper.ToObject<WhiteList>(request.downloadHandler.text);
                 StepManager.timeStamp = whiteList.TimeStamp;
+                VerifyAccount();
             }
             else
             {
@@ -166,6 +143,37 @@ namespace Assets
 
         }
         /// <summary>
+        /// 验证账号
+        /// </summary>
+        async void VerifyAccount()
+        {
+            if (isVerify)
+            {
+                if (whiteList.table.Contains(inputField.text))
+                {
+                    StepManager.userID = inputField.text;
+                    StartCoroutine(GetSecretKey());
+                }
+                else
+                {
+                    await UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
+                }
+            }
+            else
+            {
+                if (whiteList.table.Contains(inputField.text))
+                {
+                    StepManager.userID = inputField.text;
+                    UIManager.Instance.HideUI(WindowID.DlgLogin);
+                    await UIManager.Instance.ShowUI(WindowID.FaceBuildPanel);
+                }
+                else
+                {
+                    await UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
+                }
+            }
+        }
+        /// <summary>
         /// 获取本机Mac地址
         /// </summary>
         /// <returns></returns>
@@ -237,7 +245,7 @@ namespace Assets
     /// <summary>
     /// 白名单数据
     /// </summary>
-    public struct WhiteList
+    struct WhiteList
     {
         public string[] table;
         public string TimeStamp;

SFGgouhuo/Assets/Scripts/UI/Loading/DlgLoginFaild.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -11,6 +12,7 @@ namespace Assets
     public class DlgLoginFaild : BasePanel
     {
         public Button button;
+        public TextMeshProUGUI faildMsg;
 
         public override void OnCloseWindow()
         {