登录验证修改

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

@@ -1,5 +1,55 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &311143509050067991
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2608116568865456568}
+  - component: {fileID: 8351425640503938065}
+  m_Layer: 5
+  m_Name: InputCode
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2608116568865456568
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 311143509050067991}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 7089335706447185301}
+  - {fileID: 1182406225665168388}
+  m_Father: {fileID: 1554852150603331998}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 20.498013}
+  m_SizeDelta: {x: 536.8253, y: 137.4}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!225 &8351425640503938065
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 311143509050067991}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &1384016074312052176
 GameObject:
   m_ObjectHideFlags: 0
@@ -313,6 +363,7 @@ RectTransform:
   m_Children:
   - {fileID: 8295510529158963079}
   - {fileID: 1554852150603331998}
+  - {fileID: 6484524922202883034}
   m_Father: {fileID: 8636962958587706246}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -389,9 +440,8 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 6528338760501590299}
-  - {fileID: 7089335706447185301}
+  - {fileID: 2608116568865456568}
   - {fileID: 1563935865507785136}
-  - {fileID: 1182406225665168388}
   m_Father: {fileID: 3543098821856029668}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -464,17 +514,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2594794526240006094}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 3276352295360316573}
-  m_Father: {fileID: 1554852150603331998}
-  m_RootOrder: 1
+  m_Father: {fileID: 2608116568865456568}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.000014842, y: -19.0595}
+  m_AnchoredPosition: {x: 0.000014842, y: -39.557487}
   m_SizeDelta: {x: 538, y: 56}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3173663027042185301
@@ -613,6 +663,94 @@ MonoBehaviour:
   m_isRichTextEditingAllowed: 0
   m_LineLimit: 0
   m_InputValidator: {fileID: 0}
+--- !u!1 &3105527972255814510
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6484524922202883034}
+  - component: {fileID: 1045278946380145332}
+  - component: {fileID: 6246380735567912947}
+  - component: {fileID: 5064020220023345764}
+  m_Layer: 5
+  m_Name: ComeBack
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &6484524922202883034
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3105527972255814510}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 3543098821856029668}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 16.7, y: 2.800061}
+  m_SizeDelta: {x: 482, y: 221}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1045278946380145332
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3105527972255814510}
+  m_CullTransparentMesh: 1
+--- !u!114 &6246380735567912947
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3105527972255814510}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 5399a47f637ac2c49b0a73c4b0780635, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!225 &5064020220023345764
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3105527972255814510}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &3435214858010473456
 GameObject:
   m_ObjectHideFlags: 0
@@ -674,6 +812,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   inputField: {fileID: 8243674991062294011}
   confirmBtn: {fileID: 9135375882623986701}
+  inputCode: {fileID: 311143509050067991}
+  comeBackImg: {fileID: 3105527972255814510}
 --- !u!1 &4388028791637824176
 GameObject:
   m_ObjectHideFlags: 0
@@ -866,7 +1006,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 41df02d37a7384c4aa6344f4d9fce7f9, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 2850464076da7d9489f538d39f92774d, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -902,16 +1042,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7124772789589831140}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 1554852150603331998}
-  m_RootOrder: 3
+  m_Father: {fileID: 2608116568865456568}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.000024333, y: 64.2}
+  m_AnchoredPosition: {x: 0.000024333, y: 43.70195}
   m_SizeDelta: {x: 346.3038, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8377760830304398263

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

@@ -675,6 +675,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   inputField: {fileID: 8243674991062294011}
   confirmBtn: {fileID: 9135375882623986701}
+  inputCode: {fileID: 0}
+  comeBackImg: {fileID: 0}
 --- !u!1 &4388028791637824176
 GameObject:
   m_ObjectHideFlags: 0

SFGgouhuo/Assets/GameResources/UI/Image/login/Group 374.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: 5399a47f637ac2c49b0a73c4b0780635
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SFGgouhuo/Assets/GameResources/UI/Image/login/欢迎回来.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: 2850464076da7d9489f538d39f92774d
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SFGgouhuo/Assets/Resources/localLanguage.asset

@@ -207,9 +207,33 @@ MonoBehaviour:
       languageType: 5
   - name: URLFailed
     content:
-    - content: URLFaild
+    - content: Internet Faild
       languageType: 1
-    - content: "\u7DB2\u7D61\u8ACB\u6C42\u5931\u6557"
+    - content: "\u7DB2\u7D61\u93C8\u63A5\u5931\u6557"
+      languageType: 2
+    - content: 
+      languageType: 3
+    - content: 
+      languageType: 4
+    - content: 
+      languageType: 5
+  - name: TimeOut
+    content:
+    - content: Request TimeOut
+      languageType: 1
+    - content: "\u767B\u9304\u8D85\u6642"
+      languageType: 2
+    - content: 
+      languageType: 3
+    - content: 
+      languageType: 4
+    - content: 
+      languageType: 5
+  - name: Frequently
+    content:
+    - content: The request is too frequent and the request exceeds the limit
+      languageType: 1
+    - content: "\u983B\u7E41\u8ACB\u6C42\uFF0C\u8ACB\u6C42\u8D85\u9650\u88FD"
       languageType: 2
     - content: 
       languageType: 3

SFGgouhuo/Assets/Scripts/Manager/StepManager.cs

@@ -10,7 +10,7 @@ public class StepManager : MonoBehaviour
     /// <summary> 用户ID </summary>
     public static string userID;
     /// <summary> 时间戳 </summary>
-    public static string timeStamp;
+    public static long timeStamp;
     /// <summary> 是否开始初始化步骤 </summary>
     public static bool isInit = true;
     /// <summary> 是否在捏脸换装界面 </summary>
@@ -27,13 +27,22 @@ public class StepManager : MonoBehaviour
     public enum RequestState
     {
         Success,
+        /// <summary> 不在白名单 </summary>
         HashFailed,
+        /// <summary> Mac地址错误 </summary>
         MacFailed,
+        /// <summary> 请求超时 </summary>
+        TimeOut,
+        /// <summary> 频繁请求，请求超限制 </summary>
+        Frequently,
+        /// <summary> 网络连接失败 </summary>
         URLFailed
     }
     /// <summary> 当前请求状态 </summary>
     public static RequestState requestState=RequestState.URLFailed;
 
+    public static int requestCode=0;
+
     private async void Start()
     {
         Instance = this;

SFGgouhuo/Assets/Scripts/TimeCounting.cs

@@ -25,7 +25,7 @@ public class TimeCounting : MonoBehaviour
         //nowTime = (long)st.TotalMilliseconds;
         //sum = finishTime - nowTime;
         Debug.Log(StepManager.timeStamp);
-        finishTime = long.Parse(StepManager.timeStamp);
+        finishTime = StepManager.timeStamp;
         //finishTime = 1709168400;
         nowTime = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
         sum = finishTime - nowTime;

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

@@ -19,6 +19,9 @@ namespace Assets
     {
         public TMP_InputField inputField;
         public Button confirmBtn;
+        public GameObject inputCode;
+        public GameObject comeBackImg;
+
         WhiteList whiteList;
         /// <summary>
         /// 白名单URL
@@ -39,72 +42,68 @@ namespace Assets
 
         public override void OnInitWindow()
         {
-            //GetMacAddress();
+            //PlayerPrefs.DeleteKey("account");
+
             confirmBtn.onClick.AddListener(async () =>
             {
                 await UIManager.Instance.ShowUI(WindowID.DlgLoading);
-                //await UniTask.Delay(3000);
-                //StartCoroutine(GetWhiteList());
+                VerifyAccount();
             });
+            OnShowWindow();
         }
 
         public override void OnShowWindow()
         {
-
-        }
-        /// <summary>
-        /// 请求白名单
-        /// </summary>
-        /// <returns></returns>
-        IEnumerator GetWhiteList()
-        {
-            UnityWebRequest request = UnityWebRequest.Get(urlWhiteList);
-            yield return request.SendWebRequest();
-            if (request.result == UnityWebRequest.Result.Success)
+            string account = PlayerPrefs.GetString("account");
+            if (string.IsNullOrEmpty(account))
             {
-                whiteList = JsonMapper.ToObject<WhiteList>(request.downloadHandler.text);
-                StepManager.timeStamp = whiteList.TimeStamp;
-                VerifyAccount();
+                Debug.Log("没有本地保存的账号");
+                inputCode.SetActive(true);
+                comeBackImg.SetActive(false);
             }
             else
             {
-                Debug.Log(request.error);
-                StepManager.requestState = StepManager.RequestState.URLFailed;
-                yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
+                Debug.Log("已有本地保存的账号");
+                Debug.Log("本地账号" + account);
+                inputCode.SetActive(false);
+                comeBackImg.SetActive(true);
+                inputField.text = account;
             }
-
         }
         /// <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;
+        //        VerifyAccount();
+        //    }
+        //    else
+        //    {
+        //        Debug.Log(request.error);
+        //        StepManager.requestState = StepManager.RequestState.URLFailed;
+        //        yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
+        //    }
+
+        //}
+        /// <summary>
+        /// 验证本地账号
         /// </summary>
         async void VerifyAccount()
         {
             if (isVerify)
             {
-                if (whiteList.table.Contains(inputField.text))
-                {
-                    StepManager.userID = inputField.text;
-                    StartCoroutine(GetSecretKey());
-                }
-                else
-                {
-                    StepManager.requestState = StepManager.RequestState.HashFailed;
-                    await UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
-                }
+                StartCoroutine(GetSecretKey());
             }
             else
             {
-                if (whiteList.table.Contains(inputField.text))
-                {
-                    StepManager.userID = inputField.text;
-                    UIManager.Instance.HideUI(WindowID.DlgLogin);
-                    await UIManager.Instance.ShowUI(WindowID.FaceBuildPanel);
-                }
-                else
-                {
-                    StepManager.requestState = StepManager.RequestState.HashFailed;
-                    await UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
-                }
+                await UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
             }
         }
         /// <summary>
@@ -134,13 +133,14 @@ namespace Assets
                 else
                 {
                     Debug.Log($"获取秘钥失败：{result.message}");
+                    StepManager.requestCode = result.code;
                     yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
                 }
             }
             else
             {
-                Debug.Log("密钥失败"+request.error);
-                StepManager.requestState = StepManager.RequestState.URLFailed;
+                Debug.Log("密钥请求失败"+request.error);
+                StepManager.requestCode = 1;
                 yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
             }
         }
@@ -161,27 +161,61 @@ namespace Assets
             UnityWebRequest request = UnityWebRequest.Post(url, UnityWebRequest.kHttpVerbPOST);
             request.uploadHandler = new UploadHandlerRaw(postBytes);
             request.SetRequestHeader("Content-Type", "application/json");
-            request.timeout = 5;
             yield return request.SendWebRequest();
             if (request.result == UnityWebRequest.Result.Success)
             {
                 Debug.Log(request.downloadHandler.text);
                 LoginResult loginResult = JsonMapper.ToObject<LoginResult>(request.downloadHandler.text);
-                if (loginResult.code==0)
+
+                //switch (loginResult.code)
+                //{
+                //    case 0:
+                //        PlayerPrefs.SetString("account", inputField.text);
+                //        PlayerPrefs.Save();
+                //        StepManager.timeStamp = loginResult.data;
+                //        UIManager.Instance.HideUI(WindowID.DlgLogin);
+                //        yield return UIManager.Instance.ShowUI(WindowID.FaceBuildPanel);
+                //        break;
+                //    case 1001:
+                //        //Mac地址错误
+                //        StepManager.requestState = StepManager.RequestState.MacFailed;
+                //        yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
+                //        break;
+                //    case 1002:
+                //        //登录超时
+                //        StepManager.requestState = StepManager.RequestState.TimeOut;
+                //        yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
+                //        break;
+                //    case 1003:
+                //        //频繁请求，请求超限制
+                //        StepManager.requestState = StepManager.RequestState.Frequently;
+                //        yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
+                //        break;
+                //    case 1004:
+                //        //不在白名单
+                //        StepManager.requestState = StepManager.RequestState.HashFailed;
+                //        yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
+                //        break;
+                //}
+                if (loginResult.code == 0)
                 {
+                    PlayerPrefs.SetString("account", inputField.text);
+                    PlayerPrefs.Save();
+                    StepManager.timeStamp = loginResult.data;
                     UIManager.Instance.HideUI(WindowID.DlgLogin);
                     yield return UIManager.Instance.ShowUI(WindowID.FaceBuildPanel);
                 }
                 else
                 {
-                    StepManager.requestState = StepManager.RequestState.MacFailed;
+                    StepManager.requestCode = loginResult.code;
                     yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
                 }
             }
             else
             {
                 Debug.Log("登录请求"+request.error);
-                StepManager.requestState = StepManager.RequestState.URLFailed;
+                //网络连接失败
+                StepManager.requestCode = 1;
                 yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
             }
         }
@@ -260,6 +294,7 @@ namespace Assets
     {
         public int code;
         public string message;
+        public long data;
     }
     /// <summary>
     /// 白名单数据

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

@@ -9,11 +9,26 @@ using UnityEngine.UI;
 
 namespace Assets
 {
+    /// <summary> 请求状态枚举 </summary>
+    public enum RequestState
+    {
+        Success,
+        /// <summary> 不在白名单 </summary>
+        HashFailed,
+        /// <summary> Mac地址错误 </summary>
+        MacFailed,
+        /// <summary> 请求超时 </summary>
+        TimeOut,
+        /// <summary> 频繁请求，请求超限制 </summary>
+        Frequently,
+        /// <summary> 网络连接失败 </summary>
+        URLFailed
+    }
     public class DlgLoginFaild : BasePanel
     {
         public Button button;
         public TextMeshProUGUI faildMsg;
-
+        RequestState requestState;
         public override void OnCloseWindow()
         {
         }
@@ -27,7 +42,7 @@ namespace Assets
             OnShowWindow();
             LanguageMatchManager.Instance.changeLanguage += () =>
             {
-                faildMsg.text = LanguageMatchManager.Instance.GetLanByKey(StepManager.requestState.ToString());
+                faildMsg.text = LanguageMatchManager.Instance.GetLanByKey(requestState.ToString());
             };
         }
         public void Update()
@@ -35,9 +50,33 @@ namespace Assets
 
 
         }
-        public override void OnShowWindow()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
+        public override void OnShowWindow()
         {
-            faildMsg.text = LanguageMatchManager.Instance.GetLanByKey(StepManager.requestState.ToString());
+            switch (StepManager.requestCode)
+            {
+                case 1:
+                    //网络连接失败
+                    requestState = RequestState.URLFailed;
+                    break;
+                case 1001:
+                    //Mac地址错误
+                    requestState = RequestState.MacFailed;
+                    break;
+                case 1002:
+                    //登录超时
+                    requestState = RequestState.TimeOut;
+                    break;
+                case 1003:
+                    //频繁请求，请求超限制
+                    requestState = RequestState.Frequently;
+                    break;
+                case 1004:
+                    //不在白名单
+                    requestState = RequestState.HashFailed;
+                    break;
+            }
+            //faildMsg.text = LanguageMatchManager.Instance.GetLanByKey(StepManager.requestState.ToString());
+            faildMsg.text = LanguageMatchManager.Instance.GetLanByKey(requestState.ToString());
             UIManager.Instance.HideUI(WindowID.DlgLoading);
         }