Browse Source

后台接口接入,用户ID显示

ZengXingxing 1 year ago
parent
commit
5e7a321aaa

+ 3 - 3
SFGgouhuo/Assets/Bundles/UI/Prefab/Dlg/DlgLogin.prefab

@@ -213,7 +213,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u200B"
+  m_text: "2\u200B"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -601,7 +601,7 @@ MonoBehaviour:
   m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_CustomCaretColor: 0
   m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
-  m_Text: 
+  m_Text: 2
   m_CaretBlinkRate: 0.85
   m_CaretWidth: 1
   m_ReadOnly: 0
@@ -1077,7 +1077,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8347018673477348233}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 

+ 136 - 0
SFGgouhuo/Assets/Bundles/UI/Prefab/Dlg/ES/lan_ID.prefab

@@ -0,0 +1,136 @@
+%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}
+  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}

+ 7 - 0
SFGgouhuo/Assets/Bundles/UI/Prefab/Dlg/ES/lan_ID.prefab.meta

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

+ 103 - 80
SFGgouhuo/Assets/Bundles/UI/Prefab/GuidePanel.prefab

@@ -518,85 +518,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: Button
---- !u!1 &6727101909737295218
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8546222414969042375}
-  - component: {fileID: 3014078672280888576}
-  - component: {fileID: 7970445609344134612}
-  m_Layer: 5
-  m_Name: HashText
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8546222414969042375
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6727101909737295218}
-  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: 1129305638867053375}
-  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.7405, y: 0}
-  m_SizeDelta: {x: 468.919, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3014078672280888576
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6727101909737295218}
-  m_CullTransparentMesh: 1
---- !u!114 &7970445609344134612
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6727101909737295218}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.4}
-  m_RaycastTarget: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 3
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: 'ID: U2FsdGVkX1+erPhLQfX5pgUdGNjTOmWAY9t3EIgN2ZI='
 --- !u!1 &7394752334662599655
 GameObject:
   m_ObjectHideFlags: 0
@@ -701,7 +622,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1.7944, y: 1.7944, z: 1.7944}
   m_Children:
-  - {fileID: 8546222414969042375}
+  - {fileID: 4008756905326232547}
   m_Father: {fileID: 592131115250203524}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -883,6 +804,108 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   configName: ReturnImg
+--- !u!1001 &2427719262668996746
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1129305638867053375}
+    m_Modifications:
+    - target: {fileID: 1590064118027453289, guid: 3fa0c3fb217cbf749b4fb54c94ff4616, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1590064118027453289, guid: 3fa0c3fb217cbf749b4fb54c94ff4616, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1590064118027453289, guid: 3fa0c3fb217cbf749b4fb54c94ff4616, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1590064118027453289, guid: 3fa0c3fb217cbf749b4fb54c94ff4616, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1590064118027453289, guid: 3fa0c3fb217cbf749b4fb54c94ff4616, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1590064118027453289, guid: 3fa0c3fb217cbf749b4fb54c94ff4616, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1590064118027453289, guid: 3fa0c3fb217cbf749b4fb54c94ff4616, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1590064118027453289, guid: 3fa0c3fb217cbf749b4fb54c94ff4616, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 468
+      objectReference: {fileID: 0}
+    - target: {fileID: 1590064118027453289, guid: 3fa0c3fb217cbf749b4fb54c94ff4616, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 30
+      objectReference: {fileID: 0}
+    - target: {fileID: 1590064118027453289, guid: 3fa0c3fb217cbf749b4fb54c94ff4616, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1590064118027453289, guid: 3fa0c3fb217cbf749b4fb54c94ff4616, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1590064118027453289, guid: 3fa0c3fb217cbf749b4fb54c94ff4616, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1590064118027453289, guid: 3fa0c3fb217cbf749b4fb54c94ff4616, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1590064118027453289, guid: 3fa0c3fb217cbf749b4fb54c94ff4616, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1590064118027453289, guid: 3fa0c3fb217cbf749b4fb54c94ff4616, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1590064118027453289, guid: 3fa0c3fb217cbf749b4fb54c94ff4616, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1590064118027453289, guid: 3fa0c3fb217cbf749b4fb54c94ff4616, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -1.7404919
+      objectReference: {fileID: 0}
+    - target: {fileID: 1590064118027453289, guid: 3fa0c3fb217cbf749b4fb54c94ff4616, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1590064118027453289, guid: 3fa0c3fb217cbf749b4fb54c94ff4616, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1590064118027453289, guid: 3fa0c3fb217cbf749b4fb54c94ff4616, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1590064118027453289, guid: 3fa0c3fb217cbf749b4fb54c94ff4616, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7704031896260914126, guid: 3fa0c3fb217cbf749b4fb54c94ff4616, type: 3}
+      propertyPath: m_Name
+      value: lan_ID
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 3fa0c3fb217cbf749b4fb54c94ff4616, type: 3}
+--- !u!224 &4008756905326232547 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 1590064118027453289, guid: 3fa0c3fb217cbf749b4fb54c94ff4616, type: 3}
+  m_PrefabInstance: {fileID: 2427719262668996746}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &3260549996402413372
 PrefabInstance:
   m_ObjectHideFlags: 0

+ 137 - 82
SFGgouhuo/Assets/Bundles/UI/Prefab/MainPanel.prefab

@@ -511,85 +511,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &4354690880152942766
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4354690880152942767}
-  - component: {fileID: 4354690880152942765}
-  - component: {fileID: 4354690880152942764}
-  m_Layer: 5
-  m_Name: HashText
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &4354690880152942767
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4354690880152942766}
-  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: 4354690880194401097}
-  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.7405, y: 0}
-  m_SizeDelta: {x: 468.919, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4354690880152942765
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4354690880152942766}
-  m_CullTransparentMesh: 1
---- !u!114 &4354690880152942764
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4354690880152942766}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.4}
-  m_RaycastTarget: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 3
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: 'ID: U2FsdGVkX1+erPhLQfX5pgUdGNjTOmWAY9t3EIgN2ZI='
 --- !u!1 &4354690880194401096
 GameObject:
   m_ObjectHideFlags: 0
@@ -619,7 +540,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1.7944, y: 1.7944, z: 1.7944}
   m_Children:
-  - {fileID: 4354690880152942767}
+  - {fileID: 1279783124091728852}
   m_Father: {fileID: 4354690880285302333}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -767,7 +688,7 @@ MonoBehaviour:
   LanguageButton: {fileID: 4354690881870863918}
   ExitBtn: {fileID: 4354690881870863918}
   HashImage: {fileID: 4354690880194401094}
-  HashText: {fileID: 4354690880152942764}
+  HashText: {fileID: 0}
 --- !u!1 &4354690881642419826
 GameObject:
   m_ObjectHideFlags: 0
@@ -1100,7 +1021,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &5330125233178346069
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1447,6 +1368,140 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &7870463856948075379
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1279783124091728852}
+  - component: {fileID: 2636640634581046802}
+  - component: {fileID: 921401239883985813}
+  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 &1279783124091728852
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7870463856948075379}
+  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: 4354690880194401097}
+  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 &2636640634581046802
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7870463856948075379}
+  m_CullTransparentMesh: 1
+--- !u!114 &921401239883985813
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7870463856948075379}
+  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!1001 &2399776203314926159
 PrefabInstance:
   m_ObjectHideFlags: 0

+ 2 - 0
SFGgouhuo/Assets/Scripts/Manager/StepManager.cs

@@ -7,6 +7,8 @@ using UnityEngine;
 public class StepManager : MonoBehaviour
 {
     public static StepManager Instance { get; private set; }
+    /// <summary> 用户ID </summary>
+    public static string userID;
     /// <summary> 是否开始初始化步骤 </summary>
     public static bool isInit = true;
     /// <summary> 是否在捏脸换装界面 </summary>

+ 3 - 0
SFGgouhuo/Assets/Scripts/UI/Component/GuidePanel.cs

@@ -1,11 +1,13 @@
 using System.Collections;
 using System.Collections.Generic;
+using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
 
 public class GuidePanel : BasePanel
 {
     public Button return_Button;
+    public TextMeshPro HashText;
     private void Awake()
     {
         return_Button.onClick.AddListener(async() =>
@@ -42,6 +44,7 @@ public class GuidePanel : BasePanel
 
     public override void OnShowWindow()
     {
+        HashText.text = "ID: " + StepManager.userID;
         UIManager.Instance.HideUI(WindowID.MainPanel);
         StepManager.isFaceBuidling = true;
     }

+ 2 - 1
SFGgouhuo/Assets/Scripts/UI/Component/MainPanel.cs

@@ -15,7 +15,7 @@ public class MainPanel : BasePanel
     public Button LanguageButton;
     public Button ExitBtn;
     public Image HashImage;
-    public Text HashText;
+    public TextMeshPro HashText;
 
     private void Awake()
     {
@@ -75,6 +75,7 @@ public class MainPanel : BasePanel
 
     public override void OnShowWindow()
     {
+        HashText.text = "ID: " + StepManager.userID;
         BagButtonBG.GetComponent<BagButtonChangeUI>().ResetUI();
         GuideButton.GetComponent<GuideButtonChangeUI>().ResetUI();
     }

+ 67 - 16
SFGgouhuo/Assets/Scripts/UI/Loading/DlgLogin.cs

@@ -19,8 +19,7 @@ namespace Assets
         public TMP_InputField inputField;
         public Button confirmBtn;
         WhiteList whiteList;
-
-        string url = "http://172.18.10.189:8000/swagger/index.html";
+        bool isVerify = false;
         public override void OnCloseWindow()
         {
 
@@ -36,18 +35,33 @@ namespace Assets
             GetMacAddress();
             confirmBtn.onClick.AddListener(async () =>
             {
-                
-
-                if (whiteList.table.Contains(inputField.text))
+                if (isVerify)
                 {
-                    StartCoroutine(GetSecretKey());
-
 
+                    if (whiteList.table.Contains(inputField.text))
+                    {
+                        StepManager.userID = inputField.text;
+                        StartCoroutine(GetSecretKey());
+                    }
+                    else
+                    {
+                        await UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
+                    }
                 }
-                else
+                else
                 {
-                    await UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
+                    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);
+                    }
                 }
+
             });
         }
 
@@ -55,6 +69,10 @@ namespace Assets
         {
 
         }
+        /// <summary>
+        /// 获取秘钥
+        /// </summary>
+        /// <returns></returns>
         IEnumerator GetSecretKey()
         {
             string url = "http://172.18.10.189:8000/api/Account/SecretKey";
@@ -71,13 +89,25 @@ namespace Assets
             {
                 Debug.Log(request.downloadHandler.text);
                 GetSecretKeyResult result = JsonMapper.ToObject<GetSecretKeyResult>(request.downloadHandler.text);
-                StartCoroutine(Login(result.message));
+                if (result.code==0)
+                {
+                    StartCoroutine(Login(result.message));
+                }
+                else
+                {
+                    Debug.Log($"获取秘钥失败:{result.message}");
+                }
             }
             else
             {
                 Debug.Log(request.error);
             }
         }
+        /// <summary>
+        /// 登录请求
+        /// </summary>
+        /// <param name="secretKey">秘钥</param>
+        /// <returns></returns>
         IEnumerator Login(string secretKey)
         {
             string url = "http://172.18.10.189:8000/api/Account/Login";
@@ -95,8 +125,16 @@ namespace Assets
             if (request.result == UnityWebRequest.Result.Success)
             {
                 Debug.Log(request.downloadHandler.text);
-                UIManager.Instance.HideUI(WindowID.DlgLogin);
-                UIManager.Instance.ShowUI(WindowID.FaceBuildPanel);
+                LoginResult loginResult = JsonMapper.ToObject<LoginResult>(request.downloadHandler.text);
+                if (loginResult.code==0)
+                {
+                    UIManager.Instance.HideUI(WindowID.DlgLogin);
+                    yield return UIManager.Instance.ShowUI(WindowID.FaceBuildPanel);
+                }
+                else
+                {
+                    yield return UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
+                }
             }
             else
             {
@@ -139,7 +177,7 @@ namespace Assets
     /// <summary>
     /// 账号和Mac地址
     /// </summary>
-    class Userdata
+    struct Userdata
     {
         public string account;
         public string mac;
@@ -147,19 +185,32 @@ namespace Assets
     /// <summary>
     /// 输入账号
     /// </summary>
-    class AccountMsg
+    struct AccountMsg
     {
         public string Account;
     }
-
+    /// <summary>
+    /// 秘钥返回值
+    /// </summary>
     struct GetSecretKeyResult
     {
         public int code;
         public string message;
         public string data;
     }
+    /// <summary>
+    /// 登录返回值
+    /// </summary>
+    struct LoginResult
+    {
+        public int code;
+        public string message;
+    }
 
-    class WhiteList
+    /// <summary>
+    /// 白名单数据
+    /// </summary>
+    struct WhiteList
     {
         public string[] table;
     }