登录页一些效果，接路线列表页

2021-03-30 14:14:24 +08:00
1 parent d1d9c92f1c
commit f45711f39f
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9a0a7989900f2c34abeee17c663d08dc
+guid: 3317df3565c7a5243b3fb5d0225e0018
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
@@ -42,7 +42,7 @@ TextureImporter:
  compressionQuality: 50
  spriteMode: 1
  spriteExtrude: 1
-  spriteMeshType: 1
+  spriteMeshType: 0
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
  spritePixelsToUnits: 100
@@ -86,7 +86,11 @@ TextureImporter:
  spriteSheet:
    serializedVersion: 2
    sprites: []
-    outline: []
+    outline:
+    - - {x: 0, y: 96}
+      - {x: -96, y: -0.000004196293}
+      - {x: 0.000008392586, y: -96}
+      - {x: 96, y: 0.0000011447885}
    physicsShape: []
    bones: []
    spriteID: 5e97eb03825dee720800000000000000
@@ -40,9 +40,9 @@ TextureImporter:
  nPOTScale: 0
  lightmap: 0
  compressionQuality: 50
-  spriteMode: 1
+  spriteMode: 3
  spriteExtrude: 1
-  spriteMeshType: 1
+  spriteMeshType: 0
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
  spritePixelsToUnits: 100
@@ -0,0 +1,256 @@
+fileFormatVersion: 2
+guid: 6ab82263af6297c409a983013c26f174
+TextureImporter:
+  internalIDToNameTable:
+  - first:
+      213: 134134969389708294
+    second: png-4_0
+  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: 2
+  spriteExtrude: 1
+  spriteMeshType: 0
+  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: 0
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: png-4_0
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 100
+        height: 60
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 28, y: 0, z: 25, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 6047e624b0b8cd100800000000000000
+      internalID: 134134969389708294
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline:
+    - - {x: 0, y: 30}
+      - {x: -2.453384, y: 29.963863}
+      - {x: -4.900857, y: 29.855541}
+      - {x: -7.3365235, y: 29.675295}
+      - {x: -9.754517, y: 29.423557}
+      - {x: -12.14901, y: 29.100937}
+      - {x: -14.514234, y: 28.70821}
+      - {x: -16.844492, y: 28.246323}
+      - {x: -19.13417, y: 27.716387}
+      - {x: -21.377752, y: 27.119678}
+      - {x: -23.569836, y: 26.457638}
+      - {x: -25.705137, y: 25.731857}
+      - {x: -27.778513, y: 24.944088}
+      - {x: -29.784966, y: 24.096226}
+      - {x: -31.719667, y: 23.190313}
+      - {x: -33.57795, y: 22.22853}
+      - {x: -35.355343, y: 21.213202}
+      - {x: -37.047558, y: 20.146767}
+      - {x: -38.650528, y: 19.031796}
+      - {x: -40.16038, y: 17.870975}
+      - {x: -41.573486, y: 16.667103}
+      - {x: -42.886436, y: 15.423078}
+      - {x: -44.09607, y: 14.141897}
+      - {x: -45.19947, y: 12.826647}
+      - {x: -46.19398, y: 11.480496}
+      - {x: -47.07721, y: 10.106688}
+      - {x: -47.84702, y: 8.708532}
+      - {x: -48.501568, y: 7.2893963}
+      - {x: -49.03927, y: 5.8527}
+      - {x: -49.458828, y: 4.401904}
+      - {x: -49.75924, y: 2.9405036}
+      - {x: -49.939774, y: 1.4720187}
+      - {x: -50, y: -0.000012040178}
+      - {x: -49.939774, y: -1.4720428}
+      - {x: -49.75923, y: -2.9405274}
+      - {x: -49.458824, y: -4.401928}
+      - {x: -49.03926, y: -5.852724}
+      - {x: -48.501556, y: -7.2894197}
+      - {x: -47.847008, y: -8.708555}
+      - {x: -47.077194, y: -10.106711}
+      - {x: -46.193966, y: -11.480519}
+      - {x: -45.199455, y: -12.826665}
+      - {x: -44.096054, y: -14.1419115}
+      - {x: -42.886425, y: -15.42309}
+      - {x: -41.57348, y: -16.66711}
+      - {x: -40.160378, y: -17.870981}
+      - {x: -38.650524, y: -19.031797}
+      - {x: -37.04756, y: -20.146767}
+      - {x: -35.355347, y: -21.213198}
+      - {x: -33.57796, y: -22.228527}
+      - {x: -31.71968, y: -23.190306}
+      - {x: -29.784986, y: -24.096216}
+      - {x: -27.77854, y: -24.944077}
+      - {x: -25.705168, y: -25.731848}
+      - {x: -23.569874, y: -26.457626}
+      - {x: -21.377796, y: -27.119667}
+      - {x: -19.134218, y: -27.716373}
+      - {x: -16.844545, y: -28.246311}
+      - {x: -14.514293, y: -28.7082}
+      - {x: -12.149074, y: -29.100927}
+      - {x: -9.754586, y: -29.42355}
+      - {x: -7.3365993, y: -29.67529}
+      - {x: -4.9009376, y: -29.855536}
+      - {x: -2.4534698, y: -29.963861}
+      - {x: -0.00009099629, y: -30}
+      - {x: 2.4532878, y: -29.963867}
+      - {x: 4.9007564, y: -29.855547}
+      - {x: 7.336419, y: -29.675304}
+      - {x: 9.754408, y: -29.423573}
+      - {x: 12.148896, y: -29.100954}
+      - {x: 14.514118, y: -28.708231}
+      - {x: 16.844374, y: -28.246347}
+      - {x: 19.13405, y: -27.716415}
+      - {x: 21.377632, y: -27.119713}
+      - {x: 23.569714, y: -26.457678}
+      - {x: 25.705013, y: -25.731903}
+      - {x: 27.778387, y: -24.944138}
+      - {x: 29.78484, y: -24.096281}
+      - {x: 31.719542, y: -23.190374}
+      - {x: 33.577827, y: -22.2286}
+      - {x: 35.35522, y: -21.213276}
+      - {x: 37.04744, y: -20.146847}
+      - {x: 38.650417, y: -19.031878}
+      - {x: 40.160282, y: -17.871056}
+      - {x: 41.573395, y: -16.667185}
+      - {x: 42.886356, y: -15.423158}
+      - {x: 44.095997, y: -14.141976}
+      - {x: 45.199406, y: -12.826725}
+      - {x: 46.193928, y: -11.480574}
+      - {x: 47.077164, y: -10.106763}
+      - {x: 47.846985, y: -8.708605}
+      - {x: 48.501537, y: -7.2894673}
+      - {x: 49.039246, y: -5.852768}
+      - {x: 49.45881, y: -4.4019685}
+      - {x: 49.759228, y: -2.9405649}
+      - {x: 49.93977, y: -1.4720769}
+      - {x: 50, y: -0.0000425576}
+      - {x: 49.939774, y: 1.4719919}
+      - {x: 49.759243, y: 2.9404802}
+      - {x: 49.45883, y: 4.4018846}
+      - {x: 49.039272, y: 5.852684}
+      - {x: 48.50157, y: 7.2893844}
+      - {x: 47.847027, y: 8.708524}
+      - {x: 47.077213, y: 10.106684}
+      - {x: 46.19398, y: 11.4804945}
+      - {x: 45.19947, y: 12.826648}
+      - {x: 44.096066, y: 14.141901}
+      - {x: 42.88643, y: 15.423084}
+      - {x: 41.573475, y: 16.667112}
+      - {x: 40.160362, y: 17.870989}
+      - {x: 38.650505, y: 19.03181}
+      - {x: 37.047535, y: 20.146784}
+      - {x: 35.355312, y: 21.21322}
+      - {x: 33.57791, y: 22.228554}
+      - {x: 31.719622, y: 23.190334}
+      - {x: 29.784914, y: 24.096249}
+      - {x: 27.778456, y: 24.94411}
+      - {x: 25.705072, y: 25.731882}
+      - {x: 23.569765, y: 26.457663}
+      - {x: 21.377674, y: 27.119701}
+      - {x: 19.134083, y: 27.716408}
+      - {x: 16.844397, y: 28.246344}
+      - {x: 14.514129, y: 28.70823}
+      - {x: 12.148896, y: 29.100954}
+      - {x: 9.754395, y: 29.423574}
+      - {x: 7.3363943, y: 29.675306}
+      - {x: 4.90072, y: 29.85555}
+      - {x: 2.453239, y: 29.963867}
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a5eed52ed925c904ba7c55084b662377
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -1,4 +1,5 @@
-using System;
+using DG.Tweening;
+using System;
 using UnityEngine;
 using UnityEngine.UI;

@@ -10,7 +11,7 @@ public class ImageWithRoundedCorners : MonoBehaviour {
 	public float radius;
    private void Start()
    {
-		
+
    }
    void OnRectTransformDimensionsChange(){
 		Refresh();
@@ -24,7 +25,7 @@ public class ImageWithRoundedCorners : MonoBehaviour {
 		if (material != null)
 		{
 			var rect = ((RectTransform)transform).rect;
-			material.SetVector(Props, new Vector4(rect.width, rect.height, radius, 0));
+			material.SetVector(Props, new Vector4(rect.width, rect.height, radius*2, 0));
 			gameObject.GetComponent<Image>().material = material;
 			gameObject.GetComponent<Image>().sprite = null;
 		}
@@ -60,6 +60,7 @@ MonoBehaviour:
  Climb: {fileID: 0}
  NickName: {fileID: 0}
  More: {fileID: 0}
+  BtnRide: {fileID: 3931130818032720424}
 --- !u!1001 &1777885815236836140
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -435,3 +436,15 @@ RectTransform:
    type: 3}
  m_PrefabInstance: {fileID: 1777885815720925687}
  m_PrefabAsset: {fileID: 0}
+--- !u!114 &3931130818032720424 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3324359235188163551, guid: 0cf36a704cf17794aab167386641cf2a,
+    type: 3}
+  m_PrefabInstance: {fileID: 1777885815720925687}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 23f9c63039087fb41b8f696afada9466
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,631 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_OcclusionBakeSettings:
+    smallestOccluder: 5
+    smallestHole: 0.25
+    backfaceThreshold: 100
+  m_SceneGUID: 00000000000000000000000000000000
+  m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 9
+  m_Fog: 0
+  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_FogMode: 3
+  m_FogDensity: 0.01
+  m_LinearFogStart: 0
+  m_LinearFogEnd: 300
+  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+  m_AmbientIntensity: 1
+  m_AmbientMode: 0
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+  m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
+  m_HaloStrength: 0.5
+  m_FlareStrength: 1
+  m_FlareFadeSpeed: 3
+  m_HaloTexture: {fileID: 0}
+  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+  m_DefaultReflectionMode: 0
+  m_DefaultReflectionResolution: 128
+  m_ReflectionBounces: 1
+  m_ReflectionIntensity: 1
+  m_CustomReflection: {fileID: 0}
+  m_Sun: {fileID: 0}
+  m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1}
+  m_UseRadianceAmbientProbe: 0
+--- !u!157 &3
+LightmapSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 11
+  m_GIWorkflowMode: 1
+  m_GISettings:
+    serializedVersion: 2
+    m_BounceScale: 1
+    m_IndirectOutputScale: 1
+    m_AlbedoBoost: 1
+    m_EnvironmentLightingMode: 0
+    m_EnableBakedLightmaps: 1
+    m_EnableRealtimeLightmaps: 0
+  m_LightmapEditorSettings:
+    serializedVersion: 12
+    m_Resolution: 2
+    m_BakeResolution: 40
+    m_AtlasSize: 1024
+    m_AO: 0
+    m_AOMaxDistance: 1
+    m_CompAOExponent: 1
+    m_CompAOExponentDirect: 0
+    m_ExtractAmbientOcclusion: 0
+    m_Padding: 2
+    m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
+    m_TextureCompression: 1
+    m_FinalGather: 0
+    m_FinalGatherFiltering: 1
+    m_FinalGatherRayCount: 256
+    m_ReflectionCompression: 2
+    m_MixedBakeMode: 2
+    m_BakeBackend: 1
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 512
+    m_PVRBounces: 2
+    m_PVREnvironmentSampleCount: 256
+    m_PVREnvironmentReferencePointCount: 2048
+    m_PVRFilteringMode: 1
+    m_PVRDenoiserTypeDirect: 1
+    m_PVRDenoiserTypeIndirect: 1
+    m_PVRDenoiserTypeAO: 1
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVREnvironmentMIS: 1
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
+  m_LightingDataAsset: {fileID: 0}
+  m_UseShadowmask: 1
+--- !u!196 &4
+NavMeshSettings:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_BuildSettings:
+    serializedVersion: 2
+    agentTypeID: 0
+    agentRadius: 0.5
+    agentHeight: 2
+    agentSlope: 45
+    agentClimb: 0.4
+    ledgeDropHeight: 0
+    maxJumpAcrossDistance: 0
+    minRegionArea: 2
+    manualCellSize: 0
+    cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
+    accuratePlacement: 0
+    debug:
+      m_Flags: 0
+  m_NavMeshData: {fileID: 0}
+--- !u!1 &845512357
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 845512359}
+  - component: {fileID: 845512358}
+  m_Layer: 0
+  m_Name: Directional Light
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!108 &845512358
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 845512357}
+  m_Enabled: 1
+  serializedVersion: 10
+  m_Type: 1
+  m_Shape: 0
+  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
+  m_Intensity: 1
+  m_Range: 10
+  m_SpotAngle: 30
+  m_InnerSpotAngle: 21.80208
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 2
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+    m_CullingMatrixOverride:
+      e00: 1
+      e01: 0
+      e02: 0
+      e03: 0
+      e10: 0
+      e11: 1
+      e12: 0
+      e13: 0
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+    m_UseCullingMatrixOverride: 0
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingLayerMask: 1
+  m_Lightmapping: 4
+  m_LightShadowCasterMode: 0
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
+  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_UseBoundingSphereOverride: 0
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
+--- !u!4 &845512359
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 845512357}
+  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
+  m_LocalPosition: {x: 0, y: 3, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1 &1015587860
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1015587863}
+  - component: {fileID: 1015587862}
+  - component: {fileID: 1015587861}
+  m_Layer: 0
+  m_Name: EventSystem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1015587861
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1015587860}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalAxis: Horizontal
+  m_VerticalAxis: Vertical
+  m_SubmitButton: Submit
+  m_CancelButton: Cancel
+  m_InputActionsPerSecond: 10
+  m_RepeatDelay: 0.5
+  m_ForceModuleActive: 0
+--- !u!114 &1015587862
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1015587860}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_FirstSelected: {fileID: 0}
+  m_sendNavigationEvents: 1
+  m_DragThreshold: 10
+--- !u!4 &1015587863
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1015587860}
+  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: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1198847121 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5779676823934981810, guid: 23f9c63039087fb41b8f696afada9466,
+    type: 3}
+  m_PrefabInstance: {fileID: 5779676824892547619}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1410840726 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5779676824154970805, guid: 23f9c63039087fb41b8f696afada9466,
+    type: 3}
+  m_PrefabInstance: {fileID: 5779676824892547619}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d0b652f32a2cc243917e4028fa0f046, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &1678571397
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1678571401}
+  - component: {fileID: 1678571400}
+  - component: {fileID: 1678571399}
+  - component: {fileID: 1678571398}
+  - component: {fileID: 1678571402}
+  m_Layer: 5
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1678571398
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1678571397}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &1678571399
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1678571397}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 1
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 1440, y: 1024}
+  m_ScreenMatchMode: 1
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+--- !u!223 &1678571400
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1678571397}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!224 &1678571401
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1678571397}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_Children:
+  - {fileID: 1929504118}
+  m_Father: {fileID: 0}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!114 &1678571402
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1678571397}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e87cee7d1f8eeb94d986bf6d6eaf4cbc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  map: {fileID: 5262667172184159175, guid: fb5f2cc3db40bc44589a1d265794a77b, type: 3}
+  content: {fileID: 1198847121}
+  hardSelector: {fileID: 1410840726}
+  pageIndex: 0
+  pageSize: 20
+  hard: "\u5168\u90E8"
+  isEnd: 0
+--- !u!224 &1929504118 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
+    type: 3}
+  m_PrefabInstance: {fileID: 5779676824892547619}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1944211662
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1944211665}
+  - component: {fileID: 1944211664}
+  - component: {fileID: 1944211663}
+  m_Layer: 0
+  m_Name: Main Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!81 &1944211663
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1944211662}
+  m_Enabled: 1
+--- !u!20 &1944211664
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1944211662}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_FocalLength: 50
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: -1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!4 &1944211665
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1944211662}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1, z: -10}
+  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}
+--- !u!1001 &5779676824892547619
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1678571401}
+    m_Modifications:
+    - target: {fileID: 5779676823934981809, guid: 23f9c63039087fb41b8f696afada9466,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 1440
+      objectReference: {fileID: 0}
+    - target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 1024
+      objectReference: {fileID: 0}
+    - target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5779676824674420566, guid: 23f9c63039087fb41b8f696afada9466,
+        type: 3}
+      propertyPath: m_Name
+      value: MapList
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 23f9c63039087fb41b8f696afada9466, type: 3}
@@ -10,27 +10,76 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
-
+//记录：小f 是-457和-681
 public class LoginController : MonoBehaviour
 {
    [SerializeField] InputField phone;
    [SerializeField] InputField pwd;
    [SerializeField] Button login;
+    [SerializeField] Button loginNewAccount;
+    [SerializeField] Button returnQuick;
+    [SerializeField] Button sign;
+    [SerializeField] GameObject loginScrollView;
+    [SerializeField] GameObject signScrollView;
    [SerializeField] RawImage loading;
+    private ScrollRect scrollPanel;
+    private ScrollRect scrollSign;
+    private Transform imagexf;
    // Start is called before the first frame update
    void Start()
    {
-        transform.Find("RawImage").DOMove(new Vector3(0.5f,0.5f,0),1);
-        if (login != null) 
+        //transform.Find("RawImage").DOMove(new Vector3(0.5f,0.5f,0),1);
+        if (login != null)
        {
            login.onClick.AddListener(Submit);
+            //login.onClick.AddListener(Submit);
        }
-        if (loading != null) 
+        if (loading != null)
        {
            loading.texture.wrapMode = TextureWrapMode.Repeat;
        }
+        if (loginScrollView != null)
+        {
+            scrollPanel = loginScrollView.GetComponent<ScrollRect>();
+        }
+        if (signScrollView != null)
+        {
+            scrollSign = signScrollView.GetComponent<ScrollRect>();
+        }
+        if (loginNewAccount != null)
+        {
+            loginNewAccount.onClick.AddListener(goLogin);
+        }
+        if (returnQuick != null) 
+        {
+            returnQuick.onClick.AddListener(ReturnQuick);
+        }
+        if (sign != null) 
+        {
+            sign.onClick.AddListener(goSign);
+        }
+        imagexf = transform.Find("Panel").Find("LoginContainer").Find("Imagexf");
+    }
+    void ReturnQuick() 
+    {
+        if (imagexf != null)
+        {
+            imagexf.DOLocalMove(new Vector3(0, -457, 0), 0.3f);
+        }
+        this.StartScrollPanel(0);
+    }
+    void goLogin()
+    {
+        if (imagexf != null) 
+        {
+            imagexf.DOLocalMove(new Vector3(0, -681, 0), 0.3f);
+        }
+        this.StartScrollPanel(1);
+    }
+    void goSign() 
+    {
+        this.StartScrollPanel(2);
    }
-    
    async void Submit() 
    {
        if (phone == null || pwd == null)
@@ -65,6 +114,8 @@ public class LoginController : MonoBehaviour
        {
            pwd.ActivateInputField();
        }
+        goScrollPanel();
+        goScrollSign();
        //if (Input.GetKeyDown(KeyCode.Return) && )
        //{
        //}
@@ -76,5 +127,86 @@ public class LoginController : MonoBehaviour
        //    }
        //}
    }
-    
+
+    #region 主页面滑动逻辑
+    private int tmpImdex = 0;
+    private int scrollPanelIndex = 2;
+    private float scrollValue = 0.5f;
+    private bool startScrollPanel = false;
+    private void StartScrollPanel(int index)
+    {
+        if (startScrollPanel) return;
+        scrollPanelIndex = index;
+        startScrollPanel = true;
+    }
+    private void goScrollPanel()
+    {
+        var index = scrollPanelIndex;
+        var value = index * scrollValue;
+        if (scrollPanel != null && startScrollPanel) 
+        {
+            if (scrollPanel.horizontalNormalizedPosition >= value)
+            {
+                scrollPanel.horizontalNormalizedPosition -= (scrollValue / 20);
+                if (scrollPanel.horizontalNormalizedPosition <= value) 
+                {
+                    scrollPanel.horizontalNormalizedPosition = value;
+                    startScrollPanel = false;
+                }
+            }
+            else 
+            {
+                scrollPanel.horizontalNormalizedPosition += (scrollValue / 20);
+                if (scrollPanel.horizontalNormalizedPosition >= value)
+                {
+                    scrollPanel.horizontalNormalizedPosition = value;
+                    startScrollPanel = false;
+                }
+            }
+        }
+    }
+    #endregion
+    private void Test()
+    {
+        //if (startScrollPanel) return;
+        //scrollPanelIndex = ((int)System.Math.Pow(tmpImdex, 3)
+        //    + 2*(int)System.Math.Pow(tmpImdex, 2)
+        //    + 1) % 4;
+        //tmpImdex++;
+        //Debug.Log(scrollPanelIndex);
+        //startScrollPanel = true;
+        if (startScrollSign) return;
+        scrollSignIndex = (scrollSignIndex + 1) % 2;
+        Debug.Log(scrollSignIndex);
+        startScrollSign = true;
+    }
+    #region 注册页面滑动逻辑
+    private bool startScrollSign = false;
+    private int scrollSignIndex = 0;
+    private void goScrollSign()
+    {
+        float value = scrollSignIndex;
+        if (scrollSign != null && startScrollSign)
+        {
+            if (scrollSignIndex == 0)
+            {
+                scrollSign.horizontalNormalizedPosition -= (1f / 20);
+                if (scrollSign.horizontalNormalizedPosition <= 0)
+                {
+                    scrollSign.horizontalNormalizedPosition = 0;
+                    startScrollSign = false;
+                }
+            }
+            else if (scrollSignIndex == 1)
+            {
+                scrollSign.horizontalNormalizedPosition += (1f / 20);
+                if (scrollSign.horizontalNormalizedPosition >= 1)
+                {
+                    scrollSign.horizontalNormalizedPosition = 1;
+                    startScrollSign = false;
+                }
+            }
+        }
+    }
+    #endregion
 }
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6b4cb8aeab1a46c42ae544f394538b87
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -7,7 +7,7 @@ public class MapListScript : MonoBehaviour, IEndDragHandler
 {
    public void OnEndDrag(PointerEventData eventData)
    {
-        var sc = gameObject.transform.parent.GetComponent<MapList>();
+        var sc = gameObject.transform.parent.GetComponent<MapListController>();
        if (eventData.position.y < 0) 
        {
            sc.Refresh();
@@ -31,7 +31,7 @@ public class MapScript : MonoBehaviour
    {
        gameObject.GetComponent<Button>().onClick.AddListener(()=> 
        {
-            SceneManager.LoadScene("4-Demo", LoadSceneMode.Additive);
+            //SceneManager.LoadScene("4-Demo", LoadSceneMode.Additive);
        });
        text.text = myMap.Name;
        Utils.DisplayImage(StartCoroutine, rawImage, myMap.CoverImage);
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.EventSystems;
+using UnityEngine.SceneManagement;
 using UnityEngine.UI;

 public class HomeController : MonoBehaviour
@@ -18,7 +19,8 @@ public class HomeController : MonoBehaviour
    [SerializeField] Text Climb;
    [SerializeField] Text NickName;
    [SerializeField] Button More;
-        
+    [SerializeField] Button BtnRide;
+
    // Start is called before the first frame update
    void Start()
    {
@@ -39,7 +41,7 @@ public class HomeController : MonoBehaviour
        //{
        //    More.onClick.AddListener(MoreFunc);
        //}
-
+        BtnRide.onClick.AddListener(GoRide);
        var wifi = this.transform.Find("MainToolContainer").Find("Wifi");
        UIManager.AddEvent(wifi.gameObject, EventTriggerType.PointerClick, x =>
        {
@@ -54,7 +56,11 @@ public class HomeController : MonoBehaviour
        });
    }

-    
+    private void GoRide()
+    {
+        UIManager.ShowMapListPanel();
+        //SceneManager.LoadScene("3-MapList");
+    }

    void MoreFunc()
    {
@@ -9,7 +9,7 @@ using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;

-public class MapList : MonoBehaviour
+public class MapListController : MonoBehaviour
 {
    // Start is called before the first frame update
    [SerializeField] GameObject map;
@@ -45,7 +45,14 @@ public class UIManager : MonoBehaviour
            return this.GetPanelInstance("DevicePanel", ref this.mDeviceController);
        }
    }
-
+    private MapListController mMapListController;
+    public MapListController MapListPanel
+    {
+        get
+        {
+            return this.GetPanelInstance("MapListPanel", ref this.mMapListController);
+        }
+    }
    public static UIManager Instance;

    private void Awake()
@@ -134,7 +141,10 @@ public class UIManager : MonoBehaviour
    public static void ShowLoadingDialogBox()
    {
    }
-
+    public static void ShowMapListPanel() 
+    {
+        UIManager.Show(UIManager.Instance.MapListPanel, UIManager.Instance.MainPanel);
+    }
    public static void AddEvent(GameObject gameObject, EventTriggerType eventTriggerType, UnityAction<BaseEventData> call)
    {
        EventTrigger et = gameObject.GetComponent<EventTrigger>();
@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using DG.Tweening;
+using Newtonsoft.Json;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -16,16 +17,21 @@ namespace Assets.Scripts
        /*显示简略提示，需要拖Toast的预制件，且保证其他组件名字不是Toast,ToastContainer*/
        public static void showToast(GameObject game,string text,int duration = 1) 
        {
-            var toast = Utils.FindUpParent(game.transform).Find("ToastContainer");
-            if (toast!=null) 
+            var parent = Utils.FindUpParent(game.transform);
+            var toast = parent.Find("ToastContainer");
+            if (toast == null) 
            {
-                toast.GetComponent<Toast>().showToast(JsonConvert.SerializeObject(new
-                {
-                    text,
-                    duration
-                }));
-                //toast.SendMessage("showToast", );
+                var newToast = MonoBehaviour.Instantiate(Resources.Load<GameObject>("UI/Prefab/ToastContainer"));
+                newToast.name = "ToastContainer";
+                newToast.GetComponent<RectTransform>().position = new Vector3(Screen.width / 2, Screen.height / 2, 0);
+                newToast.transform.parent = parent;
+                toast = newToast.transform;
            }
+            toast.GetComponent<Toast>().showToast(JsonConvert.SerializeObject(new
+            {
+                text,
+                duration
+            }));
        }
        /*显示简略提示，需要拖Toast的预制件，且保证其他组件名字不是Toast,ToastContainer*/

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 87b6a8c3122e3244c8f9460033906876
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: