Merge branch 'main' of http://139.155.244.27:822/LSR/gouhuo

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

@@ -330,7 +330,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e83ccb3591651b946b13033357fc4f1a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  button: {fileID: 9135375882623986701}
+  confirm: {fileID: 9135375882623986701}
   faildMsg: {fileID: 6679059285912752888}
 --- !u!1 &4218211301158804282
 GameObject:

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

@@ -330,7 +330,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e83ccb3591651b946b13033357fc4f1a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  button: {fileID: 9135375882623986701}
+  confirm: {fileID: 0}
   faildMsg: {fileID: 0}
 --- !u!1 &4218211301158804282
 GameObject:

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

@@ -0,0 +1,274 @@
+%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: 2
+  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 &3377092947349533002
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3659606013067826496}
+  - component: {fileID: 5374589607244033148}
+  - component: {fileID: 6898463092305472896}
+  m_Layer: 5
+  m_Name: Image (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3659606013067826496
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3377092947349533002}
+  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, 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 &5374589607244033148
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3377092947349533002}
+  m_CullTransparentMesh: 1
+--- !u!114 &6898463092305472896
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3377092947349533002}
+  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: 0, g: 0, b: 0, a: 0.8}
+  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: 0}
+  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: DlgMacLoading
+  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: 6217929465354721855}
+  - {fileID: 3659606013067826496}
+  - {fileID: 3543098821856029668}
+  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: 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, 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/DlgMacLoading.prefab.meta

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

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

@@ -0,0 +1,739 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &563891171840431227
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6138991784993066190}
+  - component: {fileID: 3639913658565422280}
+  - component: {fileID: 3616936547638178260}
+  - component: {fileID: 5514464907330587263}
+  m_Layer: 5
+  m_Name: lan_ReTryBtn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6138991784993066190
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 563891171840431227}
+  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: 1825576006299929661}
+  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: 1.300003, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3639913658565422280
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 563891171840431227}
+  m_CullTransparentMesh: 1
+--- !u!114 &3616936547638178260
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 563891171840431227}
+  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: "\u91CD \u8A66"
+  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: 4281479730
+  m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 18
+  m_fontSizeBase: 18
+  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 &5514464907330587263
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 563891171840431227}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: be71fff96e530c74b8d5582f4db61eed, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  configName: ReTryBtn
+--- !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}
+  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:
+  - {fileID: 954066039333713932}
+  - {fileID: 1554852150603331998}
+  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.000061035156}
+  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!1 &2476692845919094948
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1554852150603331998}
+  - component: {fileID: 6315713634764986670}
+  - component: {fileID: 4419644922565025753}
+  m_Layer: 5
+  m_Name: bg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1554852150603331998
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2476692845919094948}
+  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: 1958521934540893274}
+  - {fileID: 1825576006299929661}
+  m_Father: {fileID: 3543098821856029668}
+  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: -19}
+  m_SizeDelta: {x: 600, y: 300}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6315713634764986670
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2476692845919094948}
+  m_CullTransparentMesh: 1
+--- !u!114 &4419644922565025753
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2476692845919094948}
+  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: 8a2e6d4c99d419840be4bd947411c775, 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 &3225223130860974006
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1825576006299929661}
+  - component: {fileID: 3160899499194332490}
+  - component: {fileID: 6353628439378733691}
+  - component: {fileID: 6255458486368878511}
+  m_Layer: 5
+  m_Name: ReTryBtn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1825576006299929661
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3225223130860974006}
+  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: 6138991784993066190}
+  m_Father: {fileID: 1554852150603331998}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  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 &3160899499194332490
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3225223130860974006}
+  m_CullTransparentMesh: 1
+--- !u!114 &6353628439378733691
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3225223130860974006}
+  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: -8876641551535793593, guid: 0ac2686669301174d86d7c52b16ea75b, type: 3}
+  m_Type: 1
+  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!114 &6255458486368878511
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3225223130860974006}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 6353628439378733691}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !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}
+  - component: {fileID: 9051702436520646147}
+  m_Layer: 5
+  m_Name: DlgMacLoginFaild
+  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!114 &9051702436520646147
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3435214858010473456}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b174d8dfc6313c943b13d4bf7cfac52a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  reTryBtn: {fileID: 6255458486368878511}
+  faildMsg: {fileID: 6679059285912752888}
+--- !u!1 &4218211301158804282
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 954066039333713932}
+  - component: {fileID: 7789271012299036677}
+  - component: {fileID: 159965730450614312}
+  m_Layer: 5
+  m_Name: Mask
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &954066039333713932
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4218211301158804282}
+  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: 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 &7789271012299036677
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4218211301158804282}
+  m_CullTransparentMesh: 1
+--- !u!114 &159965730450614312
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4218211301158804282}
+  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: 0, g: 0, b: 0, a: 0.8}
+  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: 0}
+  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 &5063675149909411254
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1958521934540893274}
+  - component: {fileID: 5331973649320639028}
+  - component: {fileID: 6679059285912752888}
+  m_Layer: 5
+  m_Name: LoginFaild
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1958521934540893274
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5063675149909411254}
+  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: 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: -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:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5063675149909411254}
+  m_CullTransparentMesh: 1
+--- !u!114 &6679059285912752888
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5063675149909411254}
+  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: invalid token, please verify.
+  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: 4278254290
+  m_fontColor: {r: 0.8235295, g: 0.9803922, 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: 18
+  m_fontSizeBase: 18
+  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!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/DlgMacLoginFaild.prefab.meta

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

SFGgouhuo/Assets/Resources/localLanguage.asset

@@ -169,18 +169,6 @@ 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: HashFailed
     content:
     - content: Token invalid, please verify
@@ -197,7 +185,7 @@ MonoBehaviour:
     content:
     - content: Token and MAC address mismatch
       languageType: 1
-    - content: "Token \u548C MAC\u5730\u5740\u4E0D\u5339\u914D"
+    - content: "Token\u8207\u8A2D\u5099\u4E0D\u5339\u914D"
       languageType: 2
     - content: 
       languageType: 3
@@ -217,23 +205,11 @@ MonoBehaviour:
       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
+  - name: ReTryBtn
     content:
-    - content: The request is too frequent and the request exceeds the limit
+    - content: Retry
       languageType: 1
-    - content: "\u983B\u7E41\u8ACB\u6C42\uFF0C\u8ACB\u6C42\u8D85\u9650\u88FD"
+    - content: "\u91CD\u8A66"
       languageType: 2
     - content: 
       languageType: 3

SFGgouhuo/Assets/Scripts/LoginRequest.cs

@@ -0,0 +1,158 @@
+using LitJson;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.NetworkInformation;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine.Networking;
+using UnityEngine.UI;
+using UnityEngine;
+
+namespace Assets
+{
+    public class LoginRequest : MonoBehaviour 
+    {
+        public static LoginRequest Instance
+        {
+            get;private set;
+        }
+        /// <summary>
+        /// 是否验证Token
+        /// </summary>
+        public bool isVerify = true;
+
+        private void Awake()
+        {
+            Instance=this;
+        }
+        public async void MacLoginRequest()
+        {
+            await UIManager.Instance.ShowUI(WindowID.DlgMacLoading);
+            StartCoroutine(MacLogin());
+        }
+        public void TokenLoginRequest(string account)
+        {
+            StartCoroutine(Login(account));
+        }
+        /// <summary>
+        /// Mac登录验证
+        /// </summary>
+        /// <returns></returns>
+        IEnumerator MacLogin()
+        {
+            string url = "http://api.starmelody.art/api/Account/MacLogin";
+            Userdata userInfo = new Userdata();
+            userInfo.account = "";
+            userInfo.mac = GetMacAddress();
+            string json = JsonMapper.ToJson(userInfo);
+            byte[] postBytes = System.Text.Encoding.Default.GetBytes(json);
+            UnityWebRequest request = UnityWebRequest.Post(url, UnityWebRequest.kHttpVerbPOST);
+            request.uploadHandler = new UploadHandlerRaw(postBytes);
+            request.SetRequestHeader("Content-Type", "application/json");
+            yield return request.SendWebRequest();
+            if (request.result == UnityWebRequest.Result.Success)
+            {
+                Debug.Log(request.downloadHandler.text);
+                JsonData data = JsonMapper.ToObject(request.downloadHandler.text);
+                int code = (int)data["code"];
+                if (code == 0)
+                {
+                    StepManager.timeStamp = (long)data["data"];
+                    isVerify = false;
+                }
+                else
+                {
+                    isVerify = true;
+                }
+                yield return UIManager.Instance.ShowUI(WindowID.DlgLogin);
+            }
+            else
+            {
+                Debug.Log("Mac验证请求失败" + request.error);
+                StepManager.requestCode = 1007;
+                yield return UIManager.Instance.ShowUI(WindowID.DlgMacLoginFaild);
+            }
+            UIManager.Instance.HideUI(WindowID.DlgMacLoading);
+        }
+        /// <summary>
+        /// Mac+Token登录验证
+        /// </summary>
+        /// <param name="secretKey">秘钥</param>
+        /// <returns></returns>
+        IEnumerator Login(string account)
+        {
+            string url = "http://api.starmelody.art/api/Account/Login1";
+            Userdata userInfo = new Userdata();
+            userInfo.account = account;
+            userInfo.mac = GetMacAddress();
+            string json = JsonMapper.ToJson(userInfo);
+            byte[] postBytes = System.Text.Encoding.Default.GetBytes(json);
+
+            UnityWebRequest request = UnityWebRequest.Post(url, UnityWebRequest.kHttpVerbPOST);
+            request.uploadHandler = new UploadHandlerRaw(postBytes);
+            request.SetRequestHeader("Content-Type", "application/json");
+            yield return request.SendWebRequest();
+            if (request.result == UnityWebRequest.Result.Success)
+            {
+                Debug.Log(request.downloadHandler.text);
+                JsonData data = JsonMapper.ToObject(request.downloadHandler.text);
+                int code = (int)data["code"];
+                if (code == 0)
+                {
+                    StepManager.timeStamp = (long)data["data"];
+                    UIManager.Instance.HideUI(WindowID.DlgLogin);
+                    yield return UIManager.Instance.ShowUI(WindowID.FaceBuildPanel);
+                }
+                else
+                {
+                    StepManager.requestCode = code;
+                    yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
+                }
+            }
+            else
+            {
+                Debug.Log("Mac+Token验证请求失败" + request.error);
+                //网络连接失败
+                StepManager.requestCode = 1008;
+                yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
+            }
+        }
+        /// <summary>
+        /// 获取本机Mac地址
+        /// </summary>
+        /// <returns></returns>
+        private string GetMacAddress()
+        {
+#if UNITY_ANDROID
+            return SystemInfo.deviceUniqueIdentifier;
+#else
+            string physicalAddress = "";
+
+            NetworkInterface[] nice = NetworkInterface.GetAllNetworkInterfaces();
+
+            foreach (NetworkInterface adaper in nice)
+            {
+                if (adaper.Description == "en0")
+                {
+                    physicalAddress = adaper.GetPhysicalAddress().ToString();
+                    break;
+                }
+                else
+                {
+                    physicalAddress = adaper.GetPhysicalAddress().ToString();
+
+                    if (physicalAddress != "")
+                    {
+                        break;
+                    };
+                }
+            }
+            Debug.Log("Mac地址:" + physicalAddress);
+            //return physicalAddress;
+            return "00E26965E9E4";
+#endif
+        }
+    }
+}

SFGgouhuo/Assets/Scripts/LoginRequest.cs.meta

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

SFGgouhuo/Assets/Scripts/Manager/GameManager.cs

@@ -16,7 +16,8 @@ public class GameManager : MonoBehaviour
     private ScenesManager m_ScenesManager;
     private YooAssetManager m_YooAssetManager;
     private CharacterManager m_CharacterManager;
-    private StepManager m_StepManager;
+    private StepManager m_StepManager;
+    private LoginRequest m_LoginRequest;
     private async void Awake()
     {
         Debug.Log("½øÈëGameManager");
@@ -34,6 +35,12 @@ public class GameManager : MonoBehaviour
         m_AudioManager = gameObject.AddComponent<AudioManager>();
         m_CharacterManager = gameObject.AddComponent<CharacterManager>();
         m_StepManager= gameObject.AddComponent<StepManager>();
+        m_LoginRequest = gameObject.AddComponent<LoginRequest>();
+        LoginRequest.Instance.MacLoginRequest();
+        if (LoginRequest.Instance == null)
+        {
+            Debug.Log(1);
+        }
     }
     public GameManager GetGameManager() { return this; }
 }

SFGgouhuo/Assets/Scripts/Manager/StepManager.cs

@@ -49,7 +49,6 @@ public class StepManager : MonoBehaviour
     {
         Instance = this;
         //await UIManager.Instance.ShowUI(WindowID.FaceBuildPanel);
-        await UIManager.Instance.ShowUI(WindowID.DlgLogin);
         var characterRender = await YooAssetManager.Instance.LoadAsset<GameObject>("player_dress");
         player_dress = Instantiate(characterRender);
         player_dress.transform.position = new Vector3(7.3f, 1000.29f, 109.78f);

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

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

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

@@ -28,7 +28,7 @@ namespace Assets
         /// </summary>
         string urlWhiteList = "http://txcdn.starmelody.art/WhiteList.json";
         /// <summary>
-        /// 是否验证Mac地址
+        /// 是否验证
         /// </summary>
         bool isVerify = true;
         public override void OnCloseWindow()
@@ -42,7 +42,6 @@ namespace Assets
 
         public override void OnInitWindow()
         {
-            PlayerPrefs.DeleteKey("account");
 
             confirmBtn.onClick.AddListener(async () =>
             {
@@ -54,141 +53,119 @@ namespace Assets
 
         public override void OnShowWindow()
         {
-            string account = PlayerPrefs.GetString("account");
-            if (string.IsNullOrEmpty(account))
+            if (LoginRequest.Instance.isVerify)
             {
-                Debug.Log("没有本地保存的账号");
+                Debug.Log("需要Token验证");
                 inputCode.SetActive(true);
                 comeBackImg.SetActive(false);
             }
             else
             {
-                Debug.Log("已有本地保存的账号");
-                Debug.Log("本地账号" + account);
+                Debug.Log("不需要Token验证");
                 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)
+            //StartCoroutine(MacLogin());
+
+            if (LoginRequest.Instance.isVerify)
             {
-                StartCoroutine(GetSecretKey());
+                LoginRequest.Instance.TokenLoginRequest(inputField.text);
             }
             else
             {
-                await UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
+                UIManager.Instance.HideUI(WindowID.DlgLogin);
+                await UIManager.Instance.ShowUI(WindowID.FaceBuildPanel);
             }
         }
         /// <summary>
-        /// 获取秘钥
+        /// Mac登录验证
         /// </summary>
         /// <returns></returns>
-        IEnumerator GetSecretKey()
-        {
-            string url = "http://api.starmelody.art/api/Account/SecretKey";
-            AccountMsg accountMsg = new AccountMsg();
-            accountMsg.Account = inputField.text;
-            string json = JsonMapper.ToJson(accountMsg);
-            byte[] postBytes = System.Text.Encoding.Default.GetBytes(json);
-            UnityWebRequest request = UnityWebRequest.Post(url, UnityWebRequest.kHttpVerbPOST);
-            request.uploadHandler =new UploadHandlerRaw(postBytes);
-            request.SetRequestHeader("Content-Type", "application/json");
-            yield return request.SendWebRequest();
-            if (request.result == UnityWebRequest.Result.Success)
-            {
-                Debug.Log(request.downloadHandler.text);
-                JsonData data = JsonMapper.ToObject(request.downloadHandler.text);
-                int code = (int)data["code"];
-                if (code == 0)
-                {
-                    StartCoroutine(Login((string)data["message"]));
-                }
-                else
-                {
-                    Debug.Log($"获取秘钥失败：{(string)data["message"]}");
-                    StepManager.requestCode = code;
-                    yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
-                }
-            }
-            else
-            {
-                Debug.Log("密钥请求失败"+request.error);
-                StepManager.requestCode = 1;
-                yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
-            }
-        }
+        //IEnumerator MacLogin()
+        //{
+        //    string url = "http://api.starmelody.art/api/Account/MacLogin";
+        //    Userdata userInfo = new Userdata();
+        //    userInfo.account = inputField.text;
+        //    userInfo.mac = GetMacAddress();
+        //    string json = JsonMapper.ToJson(userInfo);
+        //    byte[] postBytes = System.Text.Encoding.Default.GetBytes(json);
+        //    UnityWebRequest request = UnityWebRequest.Post(url, UnityWebRequest.kHttpVerbPOST);
+        //    request.uploadHandler =new UploadHandlerRaw(postBytes);
+        //    request.SetRequestHeader("Content-Type", "application/json");
+        //    yield return request.SendWebRequest();
+        //    if (request.result == UnityWebRequest.Result.Success)
+        //    {
+        //        Debug.Log(request.downloadHandler.text);
+        //        JsonData data = JsonMapper.ToObject(request.downloadHandler.text);
+        //        int code = (int)data["code"];
+        //        if (code == 0)
+        //        {
+        //            PlayerPrefs.SetString("account", inputField.text);
+        //            PlayerPrefs.Save();
+        //            StepManager.timeStamp = (long)data["data"];
+        //            isVerify = false;
+        //        }
+        //        else
+        //        {
+        //            isVerify = true;
+        //        }
+        //    }
+        //    else
+        //    {
+        //        Debug.Log("Mac验证请求失败"+request.error);
+        //        StepManager.requestCode = 1;
+        //        yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
+        //    }
+        //}
         /// <summary>
-        /// 登录请求
+        /// Mac+Token登录验证
         /// </summary>
         /// <param name="secretKey">秘钥</param>
         /// <returns></returns>
-        IEnumerator Login(string secretKey)
-        {
-            string url = "http://api.starmelody.art/api/Account/Login";
-            Userdata userInfo = new Userdata();
-            userInfo.account = inputField.text;
-            userInfo.mac = DesEncryptHelper.Encrypt(GetMacAddress(), secretKey);
-            string json = JsonMapper.ToJson(userInfo);
-            byte[] postBytes = System.Text.Encoding.Default.GetBytes(json);
+        //IEnumerator Login(string account)
+        //{
+        //    string url = "http://api.starmelody.art/api/Account/Login";
+        //    Userdata userInfo = new Userdata();
+        //    userInfo.account = account;
+        //    userInfo.mac = GetMacAddress();
+        //    string json = JsonMapper.ToJson(userInfo);
+        //    byte[] postBytes = System.Text.Encoding.Default.GetBytes(json);
 
-            UnityWebRequest request = UnityWebRequest.Post(url, UnityWebRequest.kHttpVerbPOST);
-            request.uploadHandler = new UploadHandlerRaw(postBytes);
-            request.SetRequestHeader("Content-Type", "application/json");
-            yield return request.SendWebRequest();
-            if (request.result == UnityWebRequest.Result.Success)
-            {
-                Debug.Log(request.downloadHandler.text);
-                JsonData data = JsonMapper.ToObject(request.downloadHandler.text);
-                int code = (int)data["code"];
-                if (code==0)
-                {
-                    PlayerPrefs.SetString("account", inputField.text);
-                    PlayerPrefs.Save();
-                    StepManager.timeStamp = (long)data["data"];
-                    UIManager.Instance.HideUI(WindowID.DlgLogin);
-                    yield return UIManager.Instance.ShowUI(WindowID.FaceBuildPanel);
-                }
-                else
-                {
-                    StepManager.requestCode = code;
-                    yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
-                }
-            }
-            else
-            {
-                Debug.Log("登录请求"+request.error);
-                //网络连接失败
-                StepManager.requestCode = 1;
-                yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
-            }
-        }
+        //    UnityWebRequest request = UnityWebRequest.Post(url, UnityWebRequest.kHttpVerbPOST);
+        //    request.uploadHandler = new UploadHandlerRaw(postBytes);
+        //    request.SetRequestHeader("Content-Type", "application/json");
+        //    yield return request.SendWebRequest();
+        //    if (request.result == UnityWebRequest.Result.Success)
+        //    {
+        //        Debug.Log(request.downloadHandler.text);
+        //        JsonData data = JsonMapper.ToObject(request.downloadHandler.text);
+        //        int code = (int)data["code"];
+        //        if (code==0)
+        //        {
+        //            StepManager.timeStamp = (long)data["data"];
+        //            UIManager.Instance.HideUI(WindowID.DlgLogin);
+        //            yield return UIManager.Instance.ShowUI(WindowID.FaceBuildPanel);
+        //        }
+        //        else
+        //        {
+        //            StepManager.requestCode = code;
+        //            yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
+        //        }
+        //    }
+        //    else
+        //    {
+        //        Debug.Log("Mac+Token验证请求失败" + request.error);
+        //        //网络连接失败
+        //        StepManager.requestCode = 1008;
+        //        yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
+        //    }
+        //}
 
         /// <summary>
         /// 获取本机Mac地址
@@ -196,6 +173,9 @@ namespace Assets
         /// <returns></returns>
         private string GetMacAddress()
         {
+#if UNITY_ANDROID
+            return SystemInfo.deviceUniqueIdentifier;
+#else
             string physicalAddress = "";
 
             NetworkInterface[] nice = NetworkInterface.GetAllNetworkInterfaces();
@@ -217,14 +197,11 @@ namespace Assets
                     };
                 }
             }
-            Debug.Log("Mac地址:"+physicalAddress);
-
-#if UNITY_ANDROID
-            return SystemInfo.deviceUniqueIdentifier;
-#else
+            Debug.Log("Mac地址:" + physicalAddress);
             return physicalAddress;
 #endif
         }
+
         public async void LoadJson()
         {
             

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

@@ -22,11 +22,11 @@ namespace Assets
         /// <summary> 频繁请求，请求超限制 </summary>
         Frequently,
         /// <summary> 网络连接失败 </summary>
-        URLFailed
+        URLFailed,
     }
     public class DlgLoginFaild : BasePanel
     {
-        public Button button;
+        public Button confirm;
         public TextMeshProUGUI faildMsg;
         RequestState requestState;
         public override void OnCloseWindow()
@@ -64,27 +64,43 @@ namespace Assets
                     break;
                 case 1002:
                     //登录超时
-                    requestState = RequestState.TimeOut;
+                    requestState = RequestState.URLFailed;
                     break;
                 case 1003:
                     //频繁请求，请求超限制
-                    requestState = RequestState.Frequently;
+                    requestState = RequestState.URLFailed;
                     break;
                 case 1004:
                     //不在白名单
                     requestState = RequestState.HashFailed;
                     break;
+                case 1005:
+                    //Mac未绑定
+                    requestState = RequestState.MacFailed;
+                    break;
+                case 1006:
+                    //账号已绑定Mac地址
+                    requestState = RequestState.MacFailed;
+                    break;
+                case 1007:
+                    //Mac请求网络错误
+                    requestState = RequestState.URLFailed;
+                    break;
+                case 1008:
+                    //Login请求网络错误
+                    requestState = RequestState.URLFailed;
+                    break;
             }
-            //faildMsg.text = LanguageMatchManager.Instance.GetLanByKey(StepManager.requestState.ToString());
             faildMsg.text = LanguageMatchManager.Instance.GetLanByKey(requestState.ToString());
-            UIManager.Instance.HideUI(WindowID.DlgLoading);
         }
 
         private void Awake()
         {
-            button.onClick.AddListener(() =>
+            confirm.onClick.AddListener(() =>
             {
                 UIManager.Instance.HideUI(WindowID.DlgLoginFaild);
+                UIManager.Instance.HideUI(WindowID.DlgLoading);
+
             });
         }
     }

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

@@ -0,0 +1,46 @@
+using TMPro;
+using UnityEngine.UI;
+
+namespace Assets
+{
+    public class DlgMacLoginFailed : BasePanel
+    {
+        public Button reTryBtn;
+        public TextMeshProUGUI faildMsg;
+        RequestState requestState = RequestState.URLFailed;
+        public override void OnCloseWindow()
+        {
+        }
+
+        public override void OnDestroyWindow()
+        {
+        }
+
+        public override void OnInitWindow()
+        {
+            OnShowWindow();
+            LanguageMatchManager.Instance.changeLanguage += () =>
+            {
+                faildMsg.text = LanguageMatchManager.Instance.GetLanByKey(requestState.ToString());
+            };
+        }
+        public void Update()
+        {
+
+
+        }
+        public override void OnShowWindow()
+        {
+            faildMsg.text = LanguageMatchManager.Instance.GetLanByKey(requestState.ToString());
+        }
+
+        private void Awake()
+        {
+            reTryBtn.onClick.AddListener(() =>
+            {
+                UIManager.Instance.HideUI(WindowID.DlgMacLoginFaild);
+                LoginRequest.Instance.MacLoginRequest();
+            });
+        }
+    }
+}

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

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

SFGgouhuo/ProjectSettings/ProjectSettings.asset

@@ -695,7 +695,7 @@ PlayerSettings:
   webGLThreadsSupport: 0
   webGLDecompressionFallback: 0
   scriptingDefineSymbols:
-    1: BAKERY_INCLUDED;UNITY_ANDROID
+    1: BAKERY_INCLUDED
     7: BAKERY_INCLUDED
   additionalCompilerArguments: {}
   platformArchitecture: {}