第一次进地球，登录页bug修改，主页面交互修改，其它细节

Assets/Resources/Images/home/Entrance - MATCH_nomal.png.meta

@@ -1,116 +0,0 @@
-fileFormatVersion: 2
-guid: 1c1d5291a57a2984596d7f086396b597
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  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
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
-    wrapU: 1
-    wrapV: 1
-    wrapW: -1
-  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
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  applyGammaDecoding: 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: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    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: 

Assets/Resources/Images/home/Entrance - MATCH_soon.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e91479d24bb71174580462da88c1d0f1
+guid: 66d048b771d02ce44a691f354a213d98
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Resources/Images/home/Entrance - MATCH_soon_hover.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 13d4ce9f909744641b6646a679615085
+guid: cd66bc3cb96fe354fbdad53baf49c343
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Resources/Images/home/Entrance - ROUTES_soon.png.meta

@@ -1,116 +0,0 @@
-fileFormatVersion: 2
-guid: 4215c36f667196e408a6804dec0602a8
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  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
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
-    wrapU: 1
-    wrapV: 1
-    wrapW: -1
-  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
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  applyGammaDecoding: 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: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    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: 

Assets/Resources/Images/home/Entrance - TRAINING_nomal.png.meta

@@ -1,116 +0,0 @@
-fileFormatVersion: 2
-guid: 584ce6ff4a2b2cf49b539cfd2074fb68
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  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
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
-    wrapU: 1
-    wrapV: 1
-    wrapW: -1
-  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
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  applyGammaDecoding: 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: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    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: 

Assets/Resources/Images/home/Entrance - TRAINING_soon.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 618b2e039244563478ab9a84ff90f6f7
+guid: 8d004e6a6e82b544bbab7c3db02cf43c
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Resources/Images/home/Entrance - TRAINING_soon_hover.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4e508428c26b0044482b18ef177748aa
+guid: 8abd0d7ac02a9c044be2ee8a4603f6e3
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab

@@ -1164,7 +1164,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 306, y: -30}
+  m_AnchoredPosition: {x: 252, y: -30}
   m_SizeDelta: {x: 64, y: 64}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &4997743358586351338

Assets/Resources/UI/Prefab/Panel/EditUserPanel.prefab

@@ -732,7 +732,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1569894539192063989}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
@@ -850,7 +850,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1569894539194797783}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
@@ -968,7 +968,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1569894539226892727}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
@@ -1966,7 +1966,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1569894541186943686}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 

Assets/Resources/UI/Prefab/Panel/HomePanel.prefab

@@ -1,5 +1,199 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &336444651028137214
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4724252519165528491}
+  - component: {fileID: 881481780408985935}
+  - component: {fileID: 8333208245392476465}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4724252519165528491
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 336444651028137214}
+  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: 4160894300255257250}
+  m_RootOrder: 1
+  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, y: 0}
+  m_SizeDelta: {x: 258, y: 476}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &881481780408985935
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 336444651028137214}
+  m_CullTransparentMesh: 0
+--- !u!114 &8333208245392476465
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 336444651028137214}
+  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_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 8d004e6a6e82b544bbab7c3db02cf43c, 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 &584266343485612241
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4160894300255257250}
+  - component: {fileID: 5710239185448587990}
+  - component: {fileID: 4459460310394799626}
+  - component: {fileID: 5930237659555212358}
+  m_Layer: 5
+  m_Name: BtnTraining
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4160894300255257250
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 584266343485612241}
+  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: 9029656237557237746}
+  - {fileID: 4724252519165528491}
+  m_Father: {fileID: 3931130817493022313}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 745, y: -263}
+  m_SizeDelta: {x: 258, y: 526}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5710239185448587990
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 584266343485612241}
+  m_CullTransparentMesh: 0
+--- !u!114 &4459460310394799626
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 584266343485612241}
+  m_Enabled: 0
+  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_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!114 &5930237659555212358
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 584266343485612241}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    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: 4459460310394799626}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &1777885814862178516
 GameObject:
   m_ObjectHideFlags: 0
@@ -75,6 +269,204 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
+--- !u!1 &2805785350616967088
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8344415755716207944}
+  - component: {fileID: 8557832133597349620}
+  - component: {fileID: 7756627206782382592}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8344415755716207944
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2805785350616967088}
+  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: 4007984775395188520}
+  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, y: -501}
+  m_SizeDelta: {x: 154, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8557832133597349620
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2805785350616967088}
+  m_CullTransparentMesh: 0
+--- !u!114 &7756627206782382592
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2805785350616967088}
+  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: 0.36078432, g: 0.36078432, b: 0.43137255, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_FontSize: 36
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: RACE
+--- !u!1 &2894462968154619168
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4007984775395188520}
+  - component: {fileID: 8346800866131681677}
+  - component: {fileID: 5955336027748969523}
+  - component: {fileID: 6467497820373862012}
+  m_Layer: 5
+  m_Name: BtnMatch
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4007984775395188520
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2894462968154619168}
+  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: 8344415755716207944}
+  - {fileID: 742838098299125995}
+  m_Father: {fileID: 3931130817493022313}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 469, y: -263}
+  m_SizeDelta: {x: 258, y: 526}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8346800866131681677
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2894462968154619168}
+  m_CullTransparentMesh: 0
+--- !u!114 &5955336027748969523
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2894462968154619168}
+  m_Enabled: 0
+  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_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!114 &6467497820373862012
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2894462968154619168}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    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: 5955336027748969523}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3931130817493022318
 GameObject:
   m_ObjectHideFlags: 0
@@ -104,8 +496,8 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 3931130818032720428}
-  - {fileID: 3931130819380923828}
+  - {fileID: 4007984775395188520}
-  - {fileID: 3931130818808089736}
+  - {fileID: 4160894300255257250}
   m_Father: {fileID: 1777885814862178517}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -320,7 +712,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
---- !u!1 &3931130818561728455
+--- !u!1 &5294646333661244148
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -328,284 +720,50 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 3931130818561728454}
+  - component: {fileID: 742838098299125995}
-  - component: {fileID: 3931130818561728448}
+  - component: {fileID: 1529141268411229688}
-  - component: {fileID: 3931130818561728449}
+  - component: {fileID: 3534726878579603916}
   m_Layer: 5
-  m_Name: MatchText
+  m_Name: Image
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &3931130818561728454
+--- !u!224 &742838098299125995
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3931130818561728455}
+  m_GameObject: {fileID: 5294646333661244148}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 3931130818808089736}
+  m_Father: {fileID: 4007984775395188520}
-  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, y: -501}
-  m_SizeDelta: {x: 131, y: 50}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3931130818561728448
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3931130818561728455}
-  m_CullTransparentMesh: 0
---- !u!114 &3931130818561728449
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3931130818561728455}
-  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: 0.36078432, g: 0.36078432, b: 0.43137258, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
-    m_FontSize: 36
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 3
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: RACE
---- !u!1 &3931130818808089737
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3931130818808089736}
-  - component: {fileID: 3931130818808089732}
-  - component: {fileID: 3931130818808089733}
-  m_Layer: 5
-  m_Name: BtnMatch
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &3931130818808089736
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3931130818808089737}
-  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: 3931130818561728454}
-  m_Father: {fileID: 3931130817493022313}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 467, y: -238}
-  m_SizeDelta: {x: 258, y: 476}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3931130818808089732
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3931130818808089737}
-  m_CullTransparentMesh: 0
---- !u!114 &3931130818808089733
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3931130818808089737}
-  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_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: e91479d24bb71174580462da88c1d0f1, 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 &3931130819009217340
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3931130819009217343}
-  - component: {fileID: 3931130819009217337}
-  - component: {fileID: 3931130819009217342}
-  m_Layer: 5
-  m_Name: TrainingText
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &3931130819009217343
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3931130819009217340}
-  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: 3931130819380923828}
-  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, y: -501}
-  m_SizeDelta: {x: 179, y: 50}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3931130819009217337
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3931130819009217340}
-  m_CullTransparentMesh: 0
---- !u!114 &3931130819009217342
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3931130819009217340}
-  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: 0.36078432, g: 0.36078432, b: 0.43137258, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
-    m_FontSize: 36
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 3
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: 'TRAINING
-
-'
---- !u!1 &3931130819380923829
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3931130819380923828}
-  - component: {fileID: 3931130819380923824}
-  - component: {fileID: 3931130819380923825}
-  m_Layer: 5
-  m_Name: BtnTraining
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &3931130819380923828
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3931130819380923829}
-  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: 3931130819009217343}
-  m_Father: {fileID: 3931130817493022313}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 745, y: -238}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 258, y: 476}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0.5, y: 1}
---- !u!222 &3931130819380923824
+--- !u!222 &1529141268411229688
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3931130819380923829}
+  m_GameObject: {fileID: 5294646333661244148}
   m_CullTransparentMesh: 0
---- !u!114 &3931130819380923825
+--- !u!114 &3534726878579603916
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3931130819380923829}
+  m_GameObject: {fileID: 5294646333661244148}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@@ -618,7 +776,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 618b2e039244563478ab9a84ff90f6f7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 66d048b771d02ce44a691f354a213d98, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -628,6 +786,84 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &8058388555972429588
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 9029656237557237746}
+  - component: {fileID: 379167247127675585}
+  - component: {fileID: 3461807895860038868}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9029656237557237746
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8058388555972429588}
+  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: 4160894300255257250}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -501}
+  m_SizeDelta: {x: 0, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &379167247127675585
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8058388555972429588}
+  m_CullTransparentMesh: 0
+--- !u!114 &3461807895860038868
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8058388555972429588}
+  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: 0.36078432, g: 0.36078432, b: 0.43137255, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_FontSize: 36
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: TRAINING
 --- !u!1 &8432177435281415079
 GameObject:
   m_ObjectHideFlags: 0
@@ -1138,7 +1374,7 @@ PrefabInstance:
     - target: {fileID: 8600990077643662720, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 20
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8600990077643662720, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
         type: 3}
@@ -1248,7 +1484,7 @@ PrefabInstance:
     - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 20
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -1483,7 +1719,7 @@ PrefabInstance:
     - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 20
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -1518,7 +1754,7 @@ PrefabInstance:
     - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 20
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -1543,7 +1779,7 @@ PrefabInstance:
     - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 20
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}

Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab

@@ -4211,7 +4211,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 306, y: -30}
+  m_AnchoredPosition: {x: 252, y: -30}
   m_SizeDelta: {x: 64, y: 64}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &2704666254422893685

Assets/Resources/UI/Prefab/Panel/UserInfoPanel.prefab

@@ -2073,10 +2073,10 @@ RectTransform:
   m_Father: {fileID: 6411762837200755527}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: -469}
-  m_SizeDelta: {x: 180, y: 34}
+  m_SizeDelta: {x: 0, y: 34}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &5404217438189736392
 CanvasRenderer:

Assets/Scripts/App.cs

@@ -38,4 +38,6 @@ public static class App
     public static string notifyContent { get; internal set; }
 
     public static RideSetting rideSetting = new RideSetting();
+    public static string pageName { get; set; }
+    public static int firstEnter { get; set; }
 }

Assets/Scripts/Scenes/LoginController.cs

@@ -146,6 +146,8 @@ public class LoginController : MonoBehaviour
             signPage2 = content.Find("NextPage");
             UIManager.AddEvent(signPage2.Find("previous").GetComponent<Button>().gameObject,
                  EventTriggerType.PointerClick, (b) => goRegPrev());
+            signPage2.Find("previous").GetComponent<Button>().enabled = false;
+            signPage2.Find("previous").GetComponent<Button>().interactable = false;
             //signPage2.Find("previous").GetComponent<Button>().onClick.AddListener(goRegPrev);
             UIManager.AddEvent(signPage2.Find("sign").GetComponent<Button>().gameObject,
                  EventTriggerType.PointerClick, (b) => goRegEnd());
@@ -252,15 +254,22 @@ public class LoginController : MonoBehaviour
             {
                 if (wxLock) return;
                 wxLock = true;
-
                 wxState = (DateTime.Now.ToUniversalTime().Ticks / 10000 * new System.Random().Next(1, 5)).ToString();
                 wxBrowser.Url = $"https://open.weixin.qq.com/connect/qrconnect?appid={App.WxAppId}&redirect_uri=https%3A%2F%2Fwx.powerfun.com.cn%2FNoAuth%2Fv1%2FWxWebLogin&response_type=code&scope=snsapi_login&state={wxState}#wechat_redirect";
                 AdjustWxQrCode();
-                var wx1 = mainContent.Find("FormContainer-Login").Find("Mask").Find("FormContainer-wx1");
+                //wxBrowser.RegisterFunction("isFinish", args =>
-                wx1.gameObject.SetActive(true);
+                //{
-                Debug.Log(178 + "已经开启" + wx1.gameObject.activeSelf);
+                //    Debug.Log(331);
+                //    startJs = false;
+                //});
+                ////AdjustWxQrCode();
+                //startJs = true;
+                //var wx1 = mainContent.Find("FormContainer-Login").Find("Mask").Find("FormContainer-wx1");
+                wxLogin1.gameObject.SetActive(true);
+                //Debug.Log(178 + "已经开启" + wx1.gameObject.activeSelf);
                 //wx1.GetComponent<CanvasGroup>().DOFade(1, 0.8f).onComplete = () => { wxLock = false; };
-                wx1.DOLocalMoveY(0, 0.3f).onComplete = () => { wxLock = false; };
+                wxLogin1.DOLocalMoveY(0, 0.3f).onComplete = () => { wxLock = false; };
+                
             });
             
             var login = loginContainer.Find("login").GetComponent<Button>();
@@ -326,6 +335,7 @@ public class LoginController : MonoBehaviour
                 //    writable: false
                 //  }
                 //});");
+                
                 wxBrowser.onTextureUpdated += OnUserScan;
                 //browser.Zoom = 0.5f;
                 //browser.
@@ -337,10 +347,12 @@ public class LoginController : MonoBehaviour
         {
             UIManager.AddEvent(wxLogin2.Find("return").gameObject, EventTriggerType.PointerClick, (b) =>
              {
+                 wxLogin1.gameObject.SetActive(false);
+                 wxLogin1.GetComponent<RectTransform>().localPosition = new Vector3(0, -573, 0);
                  wxLogin2.gameObject.SetActive(false);
                  //wxLogin3.gameObject.SetActive(false);
                  pageNums = 4;
-                 Canvas.ForceUpdateCanvases();
+                 //Canvas.ForceUpdateCanvases();
                  StartScrollPanel(1);
              });
             wxLogin2.Find("Next").GetComponent<Button>().onClick.AddListener(() =>
@@ -451,6 +463,8 @@ public class LoginController : MonoBehaviour
         userInfos = UIManager.Instance.userInfos;
         App.DefaultRotateTexture = Utils.ReadTextureFromPlayerPrefs("rotateImage");
         var notifyId = PlayerPrefs.GetInt("notifyId");
+        App.firstEnter = PlayerPrefs.GetInt("firstEnter");
+        PlayerPrefs.SetInt("firstEnter", 1);
         var r = await ConfigHelper.userApi.GetNotify();
         if (r.result)
         {
@@ -502,25 +516,26 @@ public class LoginController : MonoBehaviour
     /// </summary>
     private void AdjustWxQrCode()
     {
-        wxBrowser.EvalJS(@"
+        wxBrowser.EvalJSCSP(@"
-            let time = null;
+        const f = ()=>{
-            let f = ()=>{
+            //if(document.body.style.padding === '0px')
-                document.getElementsByClassName('qrcode')[0].style.marginTop = 0;
+            //{
-                document.getElementsByClassName('title')[0].style.display = 'none';
+            //    console.log('停止');
-                document.getElementById('wx_default_tip').childNodes[3].innerHTML = `""PowerFun""`;
+            //    isFinish();
-                document.body.style.background = '#272732';
+            //    return;
-                document.body.style.overflow = 'hidden';
+            //}
-                document.body.style.transformOrigin = 'top left';
+            console.log('js调整');
-                document.body.style.transform = 'scale(0.85106382978)';
+            document.getElementsByClassName('qrcode')[0].style.marginTop = 0;
-                document.body.style.padding = '0'; 
+            document.getElementsByClassName('title')[0].style.display = 'none';
-                if(document.body.style.padding === '0px' && time!=null){
+            document.getElementById('wx_default_tip').childNodes[3].innerHTML = `""PowerFun""`;
-                    clearInterval(time);
+            document.body.style.background = '#272732';
-                }
+            document.body.style.overflow = 'hidden';
-            }
+            document.body.style.transformOrigin = 'top left';
-            f();
+            document.body.style.transform = 'scale(0.85106382978)';
-            if(document.body.style.padding !== '0px'){
+            document.body.style.padding = '0'; 
-                time = setInterval(f,500);    
+            
-            }");
+        }
+        f();").Done();
     }
     //浏览器加载回调
     private async void OnUserScan()
@@ -529,12 +544,12 @@ public class LoginController : MonoBehaviour
         {
             //AdjustWxQrCode();
         }
-        Debug.Log(wxBrowser.Url);
+        //Debug.Log(wxBrowser.Url);
         var rgx = Regex.Match(wxBrowser.Url, @"https\:\/\/wx.powerfun.com.cn/NoAuth/v1/WxWebLogin\?code=(.*?)&state=(.*?)$");
         var groups = rgx.Groups;
         if (groups.Count == 3)
         {
-            wxLogin1.gameObject.SetActive(false);
+            wxBrowser.LoadHTML("<div />");
             var state = groups[2].Value;
             if (state == wxState)
             {
@@ -547,6 +562,7 @@ public class LoginController : MonoBehaviour
                 var r = await ConfigHelper.userApi.OnWebWxLoginCheckUnionId(unionId, openId);
                 if (r.result)
                 {
+                    
                     JObject data = JObject.FromObject(r.data);
                     if (data.Value<string>("success") != null && data.Value<string>("success") == "False")
                     {
@@ -1129,8 +1145,19 @@ public class LoginController : MonoBehaviour
         }
         goScrollPanel();
         goScrollSign();
+        //if (wxLogin1.gameObject.activeInHierarchy) 
+        //{
+        //    adjTime += Time.deltaTime;
+        //    if (adjTime >= 0.5 && wxLogin1.gameObject.activeInHierarchy && startJs) 
+        //    {
+        //        Debug.Log("在调整");
+        //        adjTime = 0;
+        //        AdjustWxQrCode();
+        //    }
+        //}
     }
-
+    //float adjTime = 0;
+    //bool startJs = false;
     #region 主页面滑动逻辑
     private int tmpImdex = 0;
     private int scrollPanelIndex = 2;

Assets/Scripts/UI/Prefab/Panel/BigMapController.cs

@@ -189,6 +189,7 @@ public class BigMapController : PFUIPanel
             maskImage.DOFade(1f, 0.9f).SetEase(Ease.InSine).OnComplete(() =>
             {
                 this.Close();
+                UIManager.PopStack();
                 UIManager.ShowEarthPanel(mapManager.CenterLatitudeLongitude.x, mapManager.CenterLatitudeLongitude.y);
             });
             return;

Assets/Scripts/UI/Prefab/Panel/EarthController.cs

@@ -204,6 +204,7 @@ public class EarthController : PFUIPanel
         maskImage.gameObject.SetActive(true);
         maskImage.DOFade(1f, 0.9f).SetEase(Ease.InSine).OnComplete(() => {
             Close();
+            UIManager.PopStack();
             UIManager.ShowBigMapPanel(latLon.x, latLon.y);
         });
     }

Assets/Scripts/UI/Prefab/Panel/EditUserController.cs

@@ -110,7 +110,7 @@ public class EditUserController : PFUIPanel
         mSexDropdown.ClearOptions();
         mSexDropdown.AddOptions(new List<string>
         {
-            "男","女"
+            "Male","Female"
         });
         mUnitDropdown.ClearOptions();
         mUnitDropdown.AddOptions(UIManager.Instance.loginRegOptions.units);
@@ -195,11 +195,11 @@ public class EditUserController : PFUIPanel
         }
         if (currentUser.Sex == 1)
         {
-            mSexDropdown.SelectValue("男");
+            mSexDropdown.SelectIndex(0);
         }
         else
         {
-            mSexDropdown.SelectValue("女");
+            mSexDropdown.SelectIndex(1);
         }
         mUnitDropdown.SelectIndex(currentUser.Unit);
         if (currentUser.Birthday.HasValue)
@@ -297,7 +297,7 @@ public class EditUserController : PFUIPanel
     {
         var user = JsonConvert.DeserializeObject<UserResultModel>(JsonConvert.SerializeObject(App.CurrentUser));
         user.Birthday = new DateTime(int.Parse(mYearDropdown.SelectedItem), int.Parse(mMonthDropdown.SelectedItem), int.Parse(mDayDropdown.SelectedItem));
-        user.Sex = mSexDropdown.SelectedItem == "男" ? 1 : 2;
+        user.Sex = mSexDropdown.SelectedIndex == 0 ? 1 : 2;
         user.Nickname = mNickName.Text;
         user.Country = UIManager.Instance.loginRegOptions.GetCountryName(mConutryDropdown.SelectedIndex);
         var errorList = new List<object>();

Assets/Scripts/UI/Prefab/Panel/HomeController.cs

@@ -26,8 +26,9 @@ public class HomeController : PFUIPanel
     //[SerializeField] Button More;
     [SerializeField] Button BtnRide;
     [SerializeField] Transform userInfo;
-
+    Transform BtnMatch, BtnTraining;
     private MainNav mainNav;
+    private Dictionary<string, Sprite[]> dict;
     // Start is called before the first frame update
     protected override void Start()
     {
@@ -35,10 +36,20 @@ public class HomeController : PFUIPanel
 
         mainNav = this.transform.Find("MainNav").GetComponent<MainNav>();
         mainNav.ShowExit();
-        
+        var BtnContainer = transform.Find("MainFuncContainer");
         UIManager.AddEvent(BtnRide.gameObject, EventTriggerType.PointerClick, GoRide);
         UIManager.AddEvent(BtnRide.gameObject, EventTriggerType.PointerEnter, OnHover);
         UIManager.AddEvent(BtnRide.gameObject, EventTriggerType.PointerExit, OnExit);
+        BtnMatch = BtnContainer.Find("BtnMatch");
+        //BtnMatch.GetComponent<Button>().onClick.AddListener(() => 
+        //{
+        //    Debug.Log(45);
+        //});
+        UIManager.AddEvent(BtnMatch.gameObject, EventTriggerType.PointerEnter, OnHover);
+        UIManager.AddEvent(BtnMatch.gameObject, EventTriggerType.PointerExit, OnExit);
+        BtnTraining = BtnContainer.Find("BtnTraining");
+        UIManager.AddEvent(BtnTraining.gameObject, EventTriggerType.PointerEnter, OnHover);
+        UIManager.AddEvent(BtnTraining.gameObject, EventTriggerType.PointerExit, OnExit);
         var avatar = userInfo.Find("Avatar").GetComponent<RawImage>();        
         var rect = ((RectTransform)avatar.transform).rect;       
         SetRounded(avatar.transform, rect.height);
@@ -54,16 +65,46 @@ public class HomeController : PFUIPanel
             //UIManager.ShowConfirm("Quit", "Do you want to quit PowerFun?", null);
         });
         //GetSummary();
+        dict = new Dictionary<string, Sprite[]>
+        {
+            {
+                "BtnMatch",new Sprite[]
+                {
+                    Resources.Load<Sprite>("Images/home/Entrance - MATCH_soon"),
+                    Resources.Load<Sprite>("Images/home/Entrance - MATCH_soon_hover"),
+                }
+            },
+            {
+                "BtnTraining",new Sprite[]
+                {
+                    Resources.Load<Sprite>("Images/home/Entrance - TRAINING_soon"),
+                    Resources.Load<Sprite>("Images/home/Entrance - TRAINING_soon_hover"),
+                }
+            },
+        };
     }    
     private void GoRide(BaseEventData e)
     {
-        UIManager.ShowMapListPanel();
+        //UIManager.ShowEarthPanel(App.latitude, App.longitude);
+        if (App.firstEnter == 0)
+        {
+            App.firstEnter = 1;
+            UIManager.ShowEarthPanel(App.latitude, App.longitude);
+        }
+        else
+        {
+            UIManager.ShowMapListPanel();
+        }
         OnExit(e);
     }
     private void OnHover(BaseEventData e) 
     {
         var pe = (PointerEventData)e;
         var parent = pe.pointerEnter.transform.parent;
+        if (dict.ContainsKey(parent.name))
+        {
+            parent.Find("Image").GetComponent<Image>().sprite = dict[parent.name][1];
+        }
         //parent.Find("Image").GetComponent<Image>().sprite = Resources.Load<Sprite>("Images/home/Entrance - ROUTES_hover");
         //parent.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
         parent.DOScale(new Vector3(1.05f, 1.05f, 0), 0.3f);
@@ -75,6 +116,10 @@ public class HomeController : PFUIPanel
         var parent = pe.pointerEnter.transform.parent;
         //parent.Find("Image").GetComponent<Image>().sprite = Resources.Load<Sprite>("Images/home/Entrance - ROUTES_nomal");
         //parent.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#5C5C6E");
+        if (dict.ContainsKey(parent.name)) 
+        {
+            parent.Find("Image").GetComponent<Image>().sprite = dict[parent.name][0];
+        }
         parent.DOScale(new Vector3(1f, 1f, 0), 0.3f);
         //parent.GetComponent<RectTransform>().localScale = new Vector3(1f, 1f, 0);
     }

Assets/Scripts/UI/Prefab/ResultList/ResultListController.cs

@@ -60,6 +60,10 @@ public class ResultListController : MonoBehaviour
             {
                 onEndEdit();
             });
+            searchInput.GetComponent<InputField>().onValueChanged.AddListener((v) =>
+            {
+                name = v;
+            });
             //searchInput.Find("Button").GetComponent<Button>().onClick.AddListener(() =>
             //{
             //    name = searchInput.GetComponent<InputField>().text;

Assets/Scripts/UIManager.cs

@@ -413,7 +413,14 @@ public class UIManager : MonoBehaviour
         var panel = stack.Pop();
         if (panel == null)
         {
-            ShowBigMapPanel();
+            if (App.pageName == "map")
+            {
+                ShowBigMapPanel();
+            }
+            else if (App.pageName == "earth") 
+            {
+                ShowEarthPanel();
+            }
         }
         else 
         {
@@ -436,7 +443,8 @@ public class UIManager : MonoBehaviour
         //var root = UIManager.Instance.MainPanel.transform.parent.parent;
         var bigMap = (GameObject)Instantiate(obj, UIManager.Instance.Root.transform);
         bigMap.GetComponent<BigMapController>().Show(lat, lon);
-        stack.Push(bigMap.GetComponent<PFUIPanel>());
+        stack.Push(null);
+        App.pageName = "map";
         //prePanel = bigMap.GetComponent<PFUIPanel>();
     }
 
@@ -453,6 +461,8 @@ public class UIManager : MonoBehaviour
             //var root = UIManager.Instance.MainPanel.transform.parent.parent;
             earthPanel = (GameObject)Instantiate(obj, UIManager.Instance.Root.transform);
         }
+        stack.Push(null);
+        App.pageName = "earth";
         earthPanel.GetComponent<EarthController>().Show(lat, lon);
     }