Merge remote-tracking branch 'origin/main'

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

@@ -0,0 +1,198 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2417939163120027061
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3543098821856029668}
+  - component: {fileID: 958762145002707113}
+  - component: {fileID: 4355026739251276902}
+  m_Layer: 5
+  m_Name: div
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3543098821856029668
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2417939163120027061}
+  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: 8636962958587706246}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &958762145002707113
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2417939163120027061}
+  m_CullTransparentMesh: 1
+--- !u!114 &4355026739251276902
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2417939163120027061}
+  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: 14788867eae28164c888e38575da0c22, 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!1 &3435214858010473456
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8636962958587706246}
+  - component: {fileID: 7407440858644285731}
+  m_Layer: 5
+  m_Name: DlgLoading
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8636962958587706246
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3435214858010473456}
+  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: 3543098821856029668}
+  - {fileID: 6217929465354721855}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7407440858644285731
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3435214858010473456}
+  m_CullTransparentMesh: 1
+--- !u!1 &6593826257331370467
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6217929465354721855}
+  - component: {fileID: 3301488026723802601}
+  - component: {fileID: 2362079203317444623}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &6217929465354721855
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6593826257331370467}
+  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: 8636962958587706246}
+  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: 0}
+  m_SizeDelta: {x: 1920, y: 1080}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3301488026723802601
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6593826257331370467}
+  m_CullTransparentMesh: 1
+--- !u!114 &2362079203317444623
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6593826257331370467}
+  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: 0.40392157}
+  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: 52617effdafd380439d065230470bbfc, 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

SFGgouhuo/Assets/Bundles/UI/Prefab/Dlg/ES/Mid.prefab.meta → SFGgouhuo/Assets/Bundles/UI/Prefab/Dlg/DlgLoading.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9e679f2d6c812034c83a6ded08210b13
+guid: 1b927f6ff37100a4a9cae34b7301f480
 PrefabImporter:
   externalObjects: {}
   userData: 

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
@@ -439,10 +440,10 @@ RectTransform:
   m_Father: {fileID: 1554852150603331998}
   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.26677, y: 26.1}
-  m_SizeDelta: {x: 557.3651, y: 141.46}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: -0.26677, y: -123.9}
+  m_SizeDelta: {x: 557.3651, y: 141.46002}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5331973649320639028
 CanvasRenderer:
@@ -663,9 +664,9 @@ RectTransform:
   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.2668, y: -90.3}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: -0.2668, y: 59.699997}
   m_SizeDelta: {x: 474.2762, y: 56}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7627816916744911306

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

@@ -331,6 +331,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   button: {fileID: 9135375882623986701}
+  faildMsg: {fileID: 0}
 --- !u!1 &4218211301158804282
 GameObject:
   m_ObjectHideFlags: 0
@@ -439,10 +440,10 @@ RectTransform:
   m_Father: {fileID: 1554852150603331998}
   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: -4.2, y: 25.46}
-  m_SizeDelta: {x: 557.3651, y: 141.46}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: -4.2, y: -124.54}
+  m_SizeDelta: {x: 557.3651, y: 141.46002}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5331973649320639028
 CanvasRenderer:
@@ -663,9 +664,9 @@ RectTransform:
   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.2479, y: -89.1}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0.2479, y: 60.9}
   m_SizeDelta: {x: 472.9229, y: 56}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7627816916744911306

SFGgouhuo/Assets/Bundles/UI/Prefab/Dlg/ES/Mid.prefab

@@ -1,226 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &1865448273395345381
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3261258484302229271}
-  - component: {fileID: 821510044535524053}
-  - component: {fileID: 6678284792754509996}
-  - component: {fileID: 6702041422713474725}
-  m_Layer: 5
-  m_Name: lan_Operation
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &3261258484302229271
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1865448273395345381}
-  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: 8824953399996093497}
-  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: -1.1, y: -3}
-  m_SizeDelta: {x: 200, y: 50}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &821510044535524053
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1865448273395345381}
-  m_CullTransparentMesh: 1
---- !u!114 &6678284792754509996
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1865448273395345381}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\u64CD\u4F5C"
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 1da915fddf6778d4481dd258c143281c, type: 2}
-  m_sharedMaterial: {fileID: 7433113812165889742, guid: 1da915fddf6778d4481dd258c143281c, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4278190080
-  m_fontColor: {r: 0, g: 0, b: 0, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 26
-  m_fontSizeBase: 26
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 0
-  m_HorizontalAlignment: 2
-  m_VerticalAlignment: 512
-  m_textAlignment: 65535
-  m_characterSpacing: 20
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!114 &6702041422713474725
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1865448273395345381}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: be71fff96e530c74b8d5582f4db61eed, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  configName: Operation
---- !u!1 &4187300914427357225
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8824953399996093497}
-  - component: {fileID: 5106915928048902425}
-  - component: {fileID: 6416963365779077522}
-  m_Layer: 5
-  m_Name: Mid
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8824953399996093497
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4187300914427357225}
-  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: 3261258484302229271}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 9.7, y: -63.521}
-  m_SizeDelta: {x: 384, y: 56}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5106915928048902425
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4187300914427357225}
-  m_CullTransparentMesh: 1
---- !u!114 &6416963365779077522
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4187300914427357225}
-  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: bdeecc23700e3f24d865d60cc0d82cf6, 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

SFGgouhuo/Assets/Bundles/UI/Prefab/Dlg/ES/lan_ID.prefab

@@ -1,150 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &7704031896260914126
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1590064118027453289}
-  - component: {fileID: 2541300866657920687}
-  - component: {fileID: 800163639506649896}
-  - component: {fileID: 2787493459381584810}
-  m_Layer: 5
-  m_Name: lan_ID
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1590064118027453289
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7704031896260914126}
-  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: 0}
-  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: -1.7404919, y: 0}
-  m_SizeDelta: {x: 468, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2541300866657920687
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7704031896260914126}
-  m_CullTransparentMesh: 1
---- !u!114 &800163639506649896
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7704031896260914126}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 'ID: U2FsdGVkX1+erPhLQfX5pgUdGNjTOmWAY9t3EIgN2ZI='
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 18cb8b8d5310b5d49ae0ec1b446a2110, type: 2}
-  m_sharedMaterial: {fileID: -8851797225679313563, guid: 18cb8b8d5310b5d49ae0ec1b446a2110, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 1728053247
-  m_fontColor: {r: 1, g: 1, b: 1, a: 0.4}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 14
-  m_fontSizeBase: 14
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 512
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 10
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!114 &2787493459381584810
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7704031896260914126}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: be71fff96e530c74b8d5582f4db61eed, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  configName: ID

SFGgouhuo/Assets/Bundles/UI/Prefab/Dlg/ES/lan_ID.prefab.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 3fa0c3fb217cbf749b4fb54c94ff4616
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

SFGgouhuo/Assets/GameResources/Player/eyes.mat

@@ -38,7 +38,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: eyes
   m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_ShaderKeywords: _NORMALMAP
+  m_ShaderKeywords: _PARALLAXMAP
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -75,7 +75,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BumpMap:
-        m_Texture: {fileID: 2800000, guid: 9b5554a4fe239f94ab4fd907de2d63fd, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _CoatMaskMap:
@@ -143,7 +143,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _ParallaxMap:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 2800000, guid: 9b5554a4fe239f94ab4fd907de2d63fd, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _SpecGlossMap:
@@ -268,14 +268,14 @@ Material:
     - _PPDMinSamples: 5
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
-    - _Parallax: 0.02
+    - _Parallax: 0.08
     - _QueueOffset: 0
     - _RayTracing: 0
     - _ReceiveShadows: 1
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
     - _RefractionModel: 0
-    - _Smoothness: 0.14142138
+    - _Smoothness: 1
     - _SmoothnessRemapMax: 1
     - _SmoothnessRemapMin: 0
     - _SmoothnessTextureChannel: 0

SFGgouhuo/Assets/GameResources/UI/Image/Loading.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: 14788867eae28164c888e38575da0c22
+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: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    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

@@ -169,6 +169,54 @@ MonoBehaviour:
       languageType: 4
     - content: 
       languageType: 5
+  - name: Success
+    content:
+    - content: Success
+      languageType: 1
+    - content: "\u767B\u9678\u6210\u529F"
+      languageType: 2
+    - content: 
+      languageType: 3
+    - content: 
+      languageType: 4
+    - content: 
+      languageType: 5
+  - name: HashFaild
+    content:
+    - content: HashFaild
+      languageType: 1
+    - content: "\u8CEC\u865F\u9A57\u8B49\u5931\u6557"
+      languageType: 2
+    - content: 
+      languageType: 3
+    - content: 
+      languageType: 4
+    - content: 
+      languageType: 5
+  - name: MacFaild
+    content:
+    - content: MacFaild
+      languageType: 1
+    - content: "Mac\u5730\u5740\u9A8C\u8BC1\u5931\u8D25"
+      languageType: 2
+    - content: 
+      languageType: 3
+    - content: 
+      languageType: 4
+    - content: 
+      languageType: 5
+  - name: URLFaild
+    content:
+    - content: URLFaild
+      languageType: 1
+    - content: "\u7DB2\u7D61\u8ACB\u6C42\u5931\u6557"
+      languageType: 2
+    - content: 
+      languageType: 3
+    - content: 
+      languageType: 4
+    - content: 
+      languageType: 5
   - name: ExitNotice
     content:
     - content: Quit the game?

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/Manager/StepManager.cs

@@ -27,11 +27,12 @@ public class StepManager : MonoBehaviour
     public enum RequestState
     {
         Success,
-        HashFaied,
-        URLFaied
+        HashFaild,
+        MacFaild,
+        URLFaild
     }
     /// <summary> µ±Ç°ÇëÇó״̬ </summary>
-    public static RequestState requestState;
+    public static RequestState requestState=RequestState.URLFaild;
 
     private async void Start()
     {

SFGgouhuo/Assets/Scripts/MoveController.cs

@@ -65,6 +65,7 @@ public class MoveController : MonoBehaviour
     /// </summary>
     void CharacterMovement()
     {
+        Debug.Log(state+"  /  "+playerInput.JumpInput);
         if (hasLand)
         {
             jumpTime += Time.deltaTime;
@@ -136,7 +137,7 @@ public class MoveController : MonoBehaviour
         // Ӧ��������ģ������Ĵ�ֱ�˶�
         verticalVelocity += gravity * Time.deltaTime;
         // ���ݴ�ֱ�ٶ��ƶ�����
-        if (verticalVelocity < 0.1f && verticalVelocity > -0.1f && state == PlayerState.JumpUp)
+        if (verticalVelocity < 0.1f  && state == PlayerState.JumpUp)
         {
             //Debug.Log("*************");
             state = PlayerState.JumpDown;

SFGgouhuo/Assets/Scripts/UI/Base/BasePanel.cs

@@ -20,6 +20,7 @@ public enum WindowID
     FaceBuildPanel,
     DlgLogin,
     DlgLoginFaild,
+    DlgLoading,
     DlgOperation,
     DlgExitPop,
     DlgLoginMobile,

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

@@ -0,0 +1,22 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class DlgLoading : BasePanel
+{
+    public override void OnCloseWindow()
+    {
+    }
+
+    public override void OnDestroyWindow()
+    {
+    }
+
+    public override void OnInitWindow()
+    {
+    }
+
+    public override void OnShowWindow()
+    {
+    }
+}

SFGgouhuo/Assets/Scripts/UI/Loading/DlgLoading.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: dbad91dc338a9dd4286abefd37018640
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -1,4 +1,5 @@
 using AR.Core;
+using Cysharp.Threading.Tasks;
 using LitJson;
 using System;
 using System.Collections;
@@ -22,14 +23,14 @@ 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>
         bool isVerify = false;
         public override void OnCloseWindow()
         {
-
+            UIManager.Instance.HideUI(WindowID.DlgLoading);
         }
 
         public override void OnDestroyWindow()
@@ -39,40 +40,71 @@ namespace Assets
         public override void OnInitWindow()
         {
             GetMacAddress();
-            whiteList = GameManager.Instance.whiteList;
             confirmBtn.onClick.AddListener(async () =>
             {
-                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);
-                    }
-                }
+                await UIManager.Instance.ShowUI(WindowID.DlgLoading);
+                //await UniTask.Delay(3000);
+                StartCoroutine(GetWhiteList());
             });
         }
 
         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)
+            {
+                whiteList = JsonMapper.ToObject<WhiteList>(request.downloadHandler.text);
+                StepManager.timeStamp = whiteList.TimeStamp;
+                VerifyAccount();
+            }
+            else
+            {
+                Debug.Log(request.error);
+                StepManager.requestState = StepManager.RequestState.URLFaild;
+                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
+                {
+                    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
+                {
+                    StepManager.requestState = StepManager.RequestState.HashFaild;
+                    await UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
+                }
+            }
         }
         /// <summary>
         /// 获取秘钥
@@ -101,11 +133,14 @@ namespace Assets
                 else
                 {
                     Debug.Log($"获取秘钥失败：{result.message}");
+                    yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
                 }
             }
             else
             {
                 Debug.Log(request.error);
+                StepManager.requestState = StepManager.RequestState.URLFaild;
+                yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
             }
         }
         /// <summary>
@@ -138,33 +173,18 @@ namespace Assets
                 }
                 else
                 {
+                    StepManager.requestState = StepManager.RequestState.MacFaild;
                     yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
                 }
             }
             else
             {
                 Debug.Log(request.error);
+                StepManager.requestState = StepManager.RequestState.URLFaild;
+                yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
             }
         }
-        /// <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);
-            }
 
-        }
         /// <summary>
         /// 获取本机Mac地址
         /// </summary>
@@ -237,7 +257,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()
         {
@@ -22,10 +24,13 @@ namespace Assets
 
         public override void OnInitWindow()
         {
+            OnShowWindow();
         }
 
         public override void OnShowWindow()
         {
+            faildMsg.text = LanguageMatchManager.Instance.GetLanByKey(StepManager.requestState.ToString());
+            UIManager.Instance.HideUI(WindowID.DlgLoading);
         }
 
         private void Awake()

SFGgouhuo/ProjectSettings/ProjectSettings.asset

@@ -135,7 +135,8 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleVersion: 0.1
-  preloadedAssets: []
+  preloadedAssets:
+  - {fileID: 11400000, guid: 4b8185399a4cfc5428357ac6a5795f11, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -154,7 +155,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.DefaultCompany.SFGgouhuo
+    Android: com.WS.StarMelodyDemo
     Standalone: com.WS.StarMelodyDemo
   buildNumber:
     Standalone: 0