登录页调整 增加半圆角组件 基本完成路线列表功能 基本完成骑行列表 开始做编辑页

Assets/Mapbox/User.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 95a41acefc4f5e04a9a456f8ce06938e
+guid: 102e792eaf910f74e9acb0b9a6182219
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/NuGet.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9a0a7989900f2c34abeee17c663d08dc
+guid: 217cb7caed5f7fb49b339428b1d80974
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/NuGet/Apis.meta

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

Assets/Resources/Circle/ImageWithIndependentRoundedCorners.cs

@@ -0,0 +1,89 @@
+using System;
+using UnityEngine;
+using UnityEngine.UI;
+
+[ExecuteInEditMode]
+public class ImageWithIndependentRoundedCorners : MonoBehaviour {
+	
+	public Vector4 r;
+	private Material material;
+	
+	// xy - position,
+	// zw - halfSize
+	[HideInInspector, SerializeField] private Vector4 rect2props;
+
+	private readonly int prop_halfSize = Shader.PropertyToID("_halfSize");
+	private readonly int prop_radiuses = Shader.PropertyToID("_r");
+	private readonly int prop_rect2props = Shader.PropertyToID("_rect2props");
+	
+	// Vector2.right rotated clockwise by 45 degrees
+	private static readonly Vector2 wNorm = new Vector2(.7071068f, -.7071068f);
+	// Vector2.right rotated counter-clockwise by 45 degrees
+	private static readonly Vector2 hNorm = new Vector2(.7071068f, .7071068f);
+
+    private void Start()
+    {
+		Refresh();
+    }
+    void OnRectTransformDimensionsChange(){
+		Refresh();
+	}
+	
+	private void OnValidate(){
+		Refresh();
+	}
+	
+	private void RecalculateProps(Vector2 size){
+
+		// Vector that goes from left to right sides of rect2
+		var aVec = new Vector2(size.x, -size.y + r.x + r.z);
+
+		// Project vector aVec to wNorm to get magnitude of rect2 width vector
+		var halfWidth = Vector2.Dot(aVec, wNorm) * .5f;
+		rect2props.z = halfWidth;
+		
+		
+		// Vector that goes from bottom to top sides of rect2
+		var bVec = new Vector2(size.x, size.y - r.w - r.y);
+		
+		// Project vector bVec to hNorm to get magnitude of rect2 height vector
+		var halfHeight = Vector2.Dot(bVec, hNorm) * .5f;
+		rect2props.w = halfHeight;
+		
+		
+		// Vector that goes from left to top sides of rect2
+		var efVec = new Vector2(size.x - r.x - r.y, 0);
+		// Vector that goes from point E to point G, which is top-left of rect2
+		var egVec = hNorm * Vector2.Dot(efVec, hNorm);
+		// Position of point E relative to center of coord system
+		var ePoint = new Vector2(r.x - (size.x / 2), size.y / 2);
+		// Origin of rect2 relative to center of coord system
+		// ePoint + egVec == vector to top-left corner of rect2
+		// wNorm * halfWidth + hNorm * -halfHeight == vector from top-left corner to center
+		var origin = ePoint + egVec + wNorm * halfWidth + hNorm * -halfHeight;
+		rect2props.x = origin.x;
+		rect2props.y = origin.y;
+	}
+
+	private void Refresh(){
+		if (material == null)
+		{
+			material = Instantiate(Resources.Load<Material>("UI/Material/IndependentCornersMaterial"));
+		}
+		var rect = ((RectTransform) transform).rect;
+		RecalculateProps(rect.size);
+		material.SetVector(prop_rect2props, rect2props);
+		material.SetVector(prop_halfSize, rect.size * .5f);
+		material.SetVector(prop_radiuses, r);
+		if (gameObject.GetComponent<Image>() != null)
+		{
+			gameObject.GetComponent<Image>().material = material;
+			gameObject.GetComponent<Image>().sprite = null;
+		}
+		else if (gameObject.GetComponent<RawImage>() != null)
+		{
+			gameObject.GetComponent<RawImage>().material = material;
+		}
+	}
+
+}

Assets/Resources/Circle/ImageWithIndependentRoundedCorners.cs.meta

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

Assets/Resources/Circle/IndependentRoundedCorners.shader

@@ -0,0 +1,67 @@
+Shader "UI/RoundedCorners/IndependentRoundedCorners" {
+    
+    Properties {
+        [HideInInspector] _MainTex ("Texture", 2D) = "white" {}
+        
+        // --- Mask support ---
+        [HideInInspector] _StencilComp ("Stencil Comparison", Float) = 8
+        [HideInInspector] _Stencil ("Stencil ID", Float) = 0
+        [HideInInspector] _StencilOp ("Stencil Operation", Float) = 0
+        [HideInInspector] _StencilWriteMask ("Stencil Write Mask", Float) = 255
+        [HideInInspector] _StencilReadMask ("Stencil Read Mask", Float) = 255
+        [HideInInspector] _ColorMask ("Color Mask", Float) = 15
+        [HideInInspector] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0
+        // Definition in Properties section is required to Mask works properly
+        _r ("r", Vector) = (0,0,0,0)
+        _halfSize ("halfSize", Vector) = (0,0,0,0)
+        _rect2props ("rect2props", Vector) = (0,0,0,0)
+        // ---
+    }
+    
+    SubShader {
+        Tags { 
+            "RenderType"="Transparent"
+            "Queue"="Transparent" 
+        }
+        
+        // --- Mask support ---
+        Stencil {
+            Ref [_Stencil]
+            Comp [_StencilComp]
+            Pass [_StencilOp]
+            ReadMask [_StencilReadMask]
+            WriteMask [_StencilWriteMask]
+        }    
+        Cull Off
+        Lighting Off
+        ZTest [unity_GUIZTestMode]
+        ColorMask [_ColorMask]
+        // ---
+        
+        Blend SrcAlpha OneMinusSrcAlpha
+        ZWrite Off
+
+        Pass {
+            CGPROGRAM
+            
+            #include "UnityCG.cginc"
+            #include "SDFUtils.cginc"
+            #include "ShaderSetup.cginc"
+            
+            #pragma vertex vert
+            #pragma fragment frag
+            
+            float4 _r;
+            float4 _halfSize;
+            float4 _rect2props;
+            sampler2D _MainTex;
+            
+            fixed4 frag (v2f i) : SV_Target {
+                float alpha = CalcAlphaForIndependentCorners(i.uv, _halfSize.xy, _rect2props, _r);
+                return mixAlpha(tex2D(_MainTex, i.uv), i.color, alpha);
+            }
+            
+            ENDCG
+        }
+    }
+}

Assets/Resources/Circle/IndependentRoundedCorners.shader.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: d3beb88e61f88ca4393acdefb005fa70
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Images/1280x720.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: 60705e3e465673d4686e583eaea3c88f
+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
+  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/64-20.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: 426bc972b7c244d40b428c79111a0d76
+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: 20, y: 20, z: 20, w: 20}
+  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
+  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/DOWN.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: bf6cef625b150984384b02d2e94b91ff
+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
+  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/UP.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: 998c9c31435c99f498b189bcc65c5650
+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
+  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/login_delete.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: 58454ee2b28f482499043e02f83ec4eb
+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
+  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/p-1.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: 870e2503d230c8d4f9283cb2b5ef204e
+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
+  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/p-10.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: b2c1508eb4114424b8cc31999d94c079
+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
+  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/p-11.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: a94c02f4494a048428b9aed3978f88ba
+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
+  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/p-12.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: fd6c9d96d81875b419b4b411a248ccc4
+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
+  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/p-13.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: 98f92b5e975e0c4499757c042e515628
+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
+  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/p-14.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: 5b0e0289728a87d44bbe344a820e979e
+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
+  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/p-15.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: 144255f1f22aaa64f9e1f50ebd121df8
+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
+  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/p-2.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: 68b20d712b105e046b8fb8450ea60050
+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
+  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/p-3.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: be80a5497a75b1d4194d3f7cbd04d72d
+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
+  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/p-4.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: 7c2626727948cc44aa1c453b746a578d
+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
+  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/p-4灰.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: 0d7be661bc9e6754c9258047bb489ccd
+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
+  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/p-5.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: 7e0689758fd8c8e4faf236660ef9ab96
+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
+  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/p-6.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: 415109a50bc816a409dc0f7b73d9ba70
+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
+  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/p-7.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: a949c4dc2497a024c87f54242c7fa903
+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
+  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/p-8.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: 095d056d4cfa9b04aac79ae91a02cc5d
+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
+  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/p-9.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: a957deee4a0b45f47afc55318ce3e0fe
+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
+  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/圈.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: fb83a01b0c819fc4a8da735d117e0618
+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
+  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/编组 12.png.meta

@@ -0,0 +1,104 @@
+fileFormatVersion: 2
+guid: d5fcda62813afb0448f832ca12db2011
+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
+  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/UI/Control/PfUIButton.prefab

@@ -9,10 +9,10 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3150550772099312288}
-  - component: {fileID: 3150550772099312290}
   - component: {fileID: 3150550772099312291}
   - component: {fileID: 53319763305559075}
   - component: {fileID: 2665063159965378333}
+  - component: {fileID: 8688565590564084001}
   m_Layer: 5
   m_Name: PfUIButton
   m_TagString: Untagged
@@ -40,19 +40,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &3150550772099312290
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3150550772099312289}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cb33d8ce76885d8438909e96ff897bf3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  mType: 0
 --- !u!114 &3150550772099312291
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -133,6 +120,19 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &8688565590564084001
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3150550772099312289}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cb33d8ce76885d8438909e96ff897bf3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mType: 0
 --- !u!1 &3150550772916003705
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/UI/Material/IndependentCornersMaterial.mat

@@ -0,0 +1,87 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: IndependentCornersMaterial
+  m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _ColorMask: 15
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UVSec: 0
+    - _UseUIAlphaClip: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _halfSize: {r: 172.5, g: 87, b: 0, a: 0}
+    - _r: {r: 20, g: 20, b: 0, a: 0}
+    - _rect2props: {r: 0.000030517578, g: -10, b: 176.42316, a: 176.42316}

Assets/Resources/UI/Material/IndependentCornersMaterial.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ce377a4eca9240442aabbf8f828b346c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/Material/Round10.mat

@@ -0,0 +1,85 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Round10
+  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _ColorMask: 15
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UVSec: 0
+    - _UseUIAlphaClip: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _WidthHeightRadius: {r: 54, g: 40, b: 20, a: 0}

Assets/Resources/UI/Material/Round10.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f7f6b9f4550b962489e4a4d6f3d718ec
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/Prefab/Login/QuickUserInfo.prefab

@@ -104,84 +104,6 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
---- !u!1 &6551767551246502341
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6551767551246502338}
-  - component: {fileID: 6551767551246502336}
-  - component: {fileID: 6551767551246502339}
-  m_Layer: 5
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &6551767551246502338
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6551767551246502341}
-  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: 6551767552143342237}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6551767551246502336
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6551767551246502341}
-  m_CullTransparentMesh: 0
---- !u!114 &6551767551246502339
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6551767551246502341}
-  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.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: Button
 --- !u!1 &6551767552143342236
 GameObject:
   m_ObjectHideFlags: 0
@@ -211,8 +133,7 @@ RectTransform:
   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: 6551767551246502338}
+  m_Children: []
   m_Father: {fileID: 6551767551188845506}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -242,14 +163,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9843138, g: 0.29411766, b: 0.5176471, a: 1}
+  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: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
+  m_Sprite: {fileID: 21300000, guid: 58454ee2b28f482499043e02f83ec4eb, type: 3}
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4

Assets/Resources/UI/Prefab/ResultList.meta

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

Assets/Resources/UI/Prefab/ResultList/RideResultList.prefab.meta

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

Assets/Resources/UI/Prefab/ResultList/RouteItem.prefab.meta

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

Assets/Scripts/Apis/MapApi.cs

@@ -55,9 +55,9 @@ namespace Assets.Scripts.Apis
         /// <param name="sort">hot, distance</param>
         /// <param name="sortDire">asc</param>
         /// <returns></returns>
-        public JsonResult<List<MapRoute>> GetList(int pageIndex, int pageSize, string name, string distance="", string hands="", bool is3D=false, string sort="", string sortDire = "")
+        public JsonResult<List<MapRoute>> GetList(int pageIndex, int pageSize, string name, string distance="", string hands="", bool is3D=false, string sort="", string sortDire = "", bool isFav = false)
         {
-            var url = $"Map/GetRoute?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&distance={ distance }&hands={ hands }&is3D={ is3D }&sort={ sort }&sortDire={ sortDire }";
+            var url = $"Map/GetRoute?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&distance={ distance }&hands={ hands }&is3D={ is3D }&sort={ sort }&sortDire={ sortDire }&isFav={isFav}";
 
             return Get<JsonResult<List<MapRoute>>>(url);
         }

Assets/Scripts/Apis/MapInterruptRecordApi.cs

@@ -1,10 +1,12 @@
 using Assets.Scripts.Apis.Models;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using UnityEngine;
 
 namespace Assets.Scripts.Apis
 {
@@ -21,5 +23,28 @@ namespace Assets.Scripts.Apis
             var jsonResult = JsonConvert.DeserializeObject<JsonResult<AddMapRecordResultModel>>(result);
             return jsonResult;
         }
+
+        public JsonResult<List<RouteResult>> GetMapInterruptRecord(string keyword, int pageIndex, int pageSize)
+        {
+            var result = new JsonResult<List<RouteResult>>()
+            {
+                result = false,
+                data = null,
+                errMsg = ""
+            };
+            try
+            {
+                var r = Get<List<RouteResult>>($"MapRecord/GetMapInterruptRecord?keyword={keyword}&pageIndex={pageIndex}&pageSize={pageSize}");
+                result.result = true;
+                result.data = r;
+                return result;
+            }
+            catch (Exception e)
+            {
+                Debug.Log(e.ToString());
+                return result;
+            }
+            
+        }
     }
 }

Assets/Scripts/Apis/Models/MapRoute.cs

@@ -100,5 +100,7 @@ namespace Assets.Scripts.Apis.Models
         public bool IsFavorite { get; set; }
 
         public bool Enable3D { get; set; }
+        public int TheHeat { get; set; }
+        public string Hard { get; set; }
     }
 }

Assets/Scripts/Apis/Models/RouteResult.cs

@@ -0,0 +1,167 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Assets.Scripts.Apis.Models
+{
+    public class RouteResultParam
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? OnlineUserId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string ContinueMark { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? ContinueIndex { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? RouteId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? CompetitionId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double EndDistance { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string RankingsId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string GlobalContinue { get; set; }
+    }
+    public class RouteResult
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Id { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int RankingId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string IsCompleted { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string IsDelete { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string ManufacturerName { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int MapCompetitionId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public List<double> Point { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double Progress { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int RouteId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string RouteImage { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string RouteName { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double TotalDistance { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Ticks { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string TrainingTime { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int UserId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double EndDistance { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Mode { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double TripDistance { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string CanAgain { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public RouteResultParam Param { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string CanContinueCycling { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public RouteResultParam ContinueCyclingParam { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Address { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Count { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string CyclingEquipmentName { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string CanDelete { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Ranking { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double CurrentRouteStartDistance { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string CanShareOnStrava { get; set; }
+    }
+}

Assets/Scripts/Apis/Models/RouteResult.cs.meta

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

Assets/Scripts/Apis/UserApi.cs

@@ -115,9 +115,9 @@ namespace Assets.Scripts.Apis
             }
             return ret;
         }
-        public async Task<JsonResult<object>> GetCaptcha(string phone) 
+        public async Task<JsonResult<JObject>> GetCaptcha(string phone) 
         {
-            return await PostAsync<JsonResult<object>>("NoAuth/v1/GetCaptcha",new {phone });
+            return await PostAsync<JsonResult<JObject>>("NoAuth/v1/GetCaptcha",new {phone });
         }
         public async Task<JsonResult<object>> UpdateUserInfo(UserResultModel user) 
         {
@@ -127,6 +127,10 @@ namespace Assets.Scripts.Apis
         {
             return Get<JsonResult<JObject>>("User/GetCurrentUser");
         }
+        public async Task<JsonResult<UserResultModel>> QuickLogin() 
+        {
+            return await PostAsync<JsonResult<UserResultModel>>("NoAuth/QuickLogin",null);
+        }
 
         public async Task<JsonResult<object>> OnWebWxLoginCheckUnionId(string unionId, string openId)
         {

Assets/Scripts/App.cs

@@ -5,7 +5,7 @@ using UnityEngine;
 
 public static class App
 {
-    public static string Host = "http://192.168.0.97:5082/";
+    public static string Host = "http://192.168.0.101:5087/";
 
     public static string AppVersion = "1.0.0";
 

Assets/Scripts/Scenes/LoginController.cs

@@ -27,6 +27,11 @@ public class QUserInfo
     public string Avatar { get; set; }
     public string Cookie { get; set; }
 }
+public class LoginForm 
+{
+    public InputField email { get; set; }
+    public InputField password { get; set; }
+}
 public class SignForm 
 {
     //页面1
@@ -46,31 +51,32 @@ public class SignForm
 }
 public class LoginController : MonoBehaviour
 {
-    [SerializeField] InputField[] loginForm;
-    [SerializeField] Button login;
-    [SerializeField] Button loginNewAccount;
+    private Transform mainContent;
+    /*初始页面*/
+    private Transform quickContainer;
+    private Transform loginContainer;
+    private Transform signContainer;
+    /*初始页面*/
+    LoginForm loginForm;
     [SerializeField] Button loginReturn2;
-    [SerializeField] Button returnQuick;
-    [SerializeField] Button sign;
-    [SerializeField] Button remember;
-    [SerializeField] Button wechatLogin;
+    private Button remember;
+    /*滑动相关*/
     [SerializeField] GameObject loginScrollView;
     [SerializeField] GameObject signScrollView;
+    [SerializeField] GameObject avatarScrollView;
+    /*滑动相关*/
+    //注册
     private Transform signPage1;
     private Transform signPage2;
     private Transform signScrollBar;
     private SignForm signForm;
     private LoginRegOptions regOptions;
-    [SerializeField] GameObject avatarScrollView;
-    [SerializeField] RawImage loading;
-    [SerializeField] Button exit;
+    
     private ScrollRect scrollPanel;
     private ScrollRect scrollSign;
     private ScrollRect scrollAvatar;
     private Transform imagexf;
-    private Transform mainContent;
     //注册主页面
-    private Transform signContainer;
     private UserResultModel userResult;
     /*微信相关*/
     private Browser wxBrowser;
@@ -81,8 +87,13 @@ public class LoginController : MonoBehaviour
     private JObject wxInfoJson;
     private bool wxLock;
     /*微信相关*/
-
     private List<QUserInfo> userInfos;
+
+    /*退出按钮*/
+    [SerializeField] Button exit;
+    /*退出按钮*/
+    //其他
+    [SerializeField] RawImage loading;
     // Start is called before the first frame update
     void Start()
     {
@@ -92,24 +103,21 @@ public class LoginController : MonoBehaviour
         //userInfos.RemoveAt(0);
         //PlayerPrefs.SetString("UserInfos", "");
         //transform.Find("RawImage").DOMove(new Vector3(0.5f,0.5f,0),1);
-        if (loginForm.Length == 2 && loginForm[0] != null && loginForm[1] != null)
-        {
-            foreach (var ipt in loginForm)
-            {
-                UIManager.AddEvent(ipt.gameObject, EventTriggerType.PointerClick, new UnityAction<BaseEventData>
-                    ((BaseEventData arg0) => { OnLoginInputSelect(arg0, ipt.gameObject); }));
-                UIManager.AddEvent(ipt.gameObject, EventTriggerType.Select, new UnityAction<BaseEventData>
-                    ((BaseEventData arg0) => { OnLoginInputSelect(arg0, ipt.gameObject); }));
-                UIManager.AddEvent(ipt.gameObject, EventTriggerType.Deselect, new UnityAction<BaseEventData>
-                    ((BaseEventData arg0) => { OnLoginInputDeSelect(arg0, ipt.gameObject); }));
-            }
-            //loginForm[0].
-        }
-        if (login != null)
-        {
-            login.onClick.AddListener(Submit);
-            //login.onClick.AddListener(Submit);
-        }
+        
+        //if (loginForm.Length == 2 && loginForm[0] != null && loginForm[1] != null)
+        //{
+        //    foreach (var ipt in loginForm)
+        //    {
+        //        UIManager.AddEvent(ipt.gameObject, EventTriggerType.PointerClick, new UnityAction<BaseEventData>
+        //            ((BaseEventData arg0) => { OnLoginInputSelect(arg0, ipt.gameObject); }));
+        //        UIManager.AddEvent(ipt.gameObject, EventTriggerType.Select, new UnityAction<BaseEventData>
+        //            ((BaseEventData arg0) => { OnLoginInputSelect(arg0, ipt.gameObject); }));
+        //        UIManager.AddEvent(ipt.gameObject, EventTriggerType.Deselect, new UnityAction<BaseEventData>
+        //            ((BaseEventData arg0) => { OnLoginInputDeSelect(arg0, ipt.gameObject); }));
+        //    }
+        //    //loginForm[0].
+        //}
+        
         if (loading != null)
         {
             loading.texture.wrapMode = TextureWrapMode.Repeat;
@@ -118,6 +126,9 @@ public class LoginController : MonoBehaviour
         {
             scrollPanel = loginScrollView.GetComponent<ScrollRect>();
             mainContent = loginScrollView.transform.Find("Viewport").Find("Content");
+            quickContainer = mainContent.Find("FormContainer-Quick");
+            loginContainer = mainContent.Find("FormContainer-Login").Find("FormContainer");
+            signContainer = mainContent.Find("FormContainer-Sign");
         }
         if (signScrollView != null)
         {
@@ -208,29 +219,18 @@ public class LoginController : MonoBehaviour
             content.Find("empty2").transform.SetSiblingIndex(content.childCount-1);
             scrollAvatar.GetComponent<QuickLoginScroll>().Initial();
         }
-        if (loginNewAccount != null)
+        if (quickContainer != null) 
         {
+            var loginNewAccount = quickContainer.Find("loginNewAccount").GetComponent<Button>();
             loginNewAccount.onClick.AddListener(goLogin);
         }
-        if (returnQuick != null)
+        if (loginContainer != null) 
         {
+            var returnQuick = loginContainer.Find("returnQuick").GetComponent<Button>();
             returnQuick.onClick.AddListener(ReturnQuick);
-        }
-        if (sign != null)
-        {
-            sign.onClick.AddListener(()=>goSign());
-        }
-        if (loginReturn2 != null)
-        {
-            loginReturn2.onClick.AddListener(goLoginReturn2);
-        }
-        if (exit != null)
-        {
-            exit.onClick.AddListener(() => Application.Quit());
-        }
-        signContainer = mainContent.Find("FormContainer-Sign");
-        if (remember != null)
-        {
+            var sign = loginContainer.Find("reg").GetComponent<Button>();
+            sign.onClick.AddListener(() => goSign());
+            remember = loginContainer.Find("rememberButton").GetComponent<Button>();
             remember.onClick.AddListener(() =>
             {
                 var gou = remember.transform.Find("Gou");
@@ -243,29 +243,49 @@ public class LoginController : MonoBehaviour
                     gou.gameObject.SetActive(true);
                 }
             });
-        }
-        if (wechatLogin != null)
-        {
+            var wechatLogin = loginContainer.Find("otherContainer").Find("Wechat").GetComponent<Button>();
             wechatLogin.onClick.AddListener(() =>
             {
                 if (wxLock) return;
                 wxLock = true;
-                
-                wxState = (DateTime.Now.ToUniversalTime().Ticks / 10000 * new System.Random().Next(1,5)).ToString();
+
+                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();
+                //AdjustWxQrCode();
                 var wx1 = mainContent.Find("FormContainer-Login").Find("FormContainer-wx1");
                 wx1.gameObject.SetActive(true);
-                Debug.Log(178+ "已经开启"+ wx1.gameObject.activeSelf);
-                wx1.DOLocalMoveY(0, 0.3f).onComplete = ()=> { wxLock = false; };
+                Debug.Log(178 + "已经开启" + wx1.gameObject.activeSelf);
+                wx1.DOLocalMoveY(0, 0.3f).onComplete = () => { wxLock = false; };
             });
+            var login = loginContainer.Find("login").GetComponent<Button>();
+            login.onClick.AddListener(Submit);
+            loginForm = new LoginForm()
+            {
+                email = loginContainer.Find("phone").GetComponent<InputField>(),
+                password = loginContainer.Find("pwd").GetComponent<InputField>()
+            };
         }
+        //if (loginReturn2 != null)
+        //{
+        //    loginReturn2.onClick.AddListener(goLoginReturn2);
+        //}
+        if (signContainer != null) 
+        {
+            var loginr2 = signContainer.Find("loginr2").GetComponent<Button>();
+            loginr2.onClick.AddListener(goLoginReturn2);
+        }
+        if (exit != null)
+        {
+            exit.onClick.AddListener(() => Application.Quit());
+        }
+        
         wxLogin1 = mainContent.Find("FormContainer-Login").Find("FormContainer-wx1");
         if (wxLogin1 != null)
         {
             wxLogin1.Find("Image").GetComponent<Button>().onClick.AddListener(() =>
             {
                 wxLock = true;
+                wxBrowser.Url = "chrome://version/";
                 wxLogin1.DOMoveY(-573, 0.8f).onComplete = () =>
                 {
                     wxLock = false;
@@ -338,12 +358,11 @@ public class LoginController : MonoBehaviour
             });
         }
         imagexf = transform.Find("Panel").Find("LoginContainer").Find("Imagexf");
-        
-
     }
     private void AdjustWxQrCode() 
     {
         wxBrowser.EvalJS(@"
+            console.log(document.getElementsByClassName('qrcode')[0]);
                             document.getElementsByClassName('qrcode')[0].style.marginTop = 0;
                             document.getElementsByClassName('title')[0].style.display = 'none';
                             document.body.style.background = '#272732';
@@ -397,12 +416,12 @@ public class LoginController : MonoBehaviour
                     }
                     else
                     {
-                        userResult = data.ToObject<UserResultModel>();
+                        RefreshWx3(data.ToObject<UserResultModel>());
                         wxLogin3.gameObject.SetActive(true);
-                        Utils.DisplayImage(StartCoroutine,
-                        wxLogin3.Find("Avatar").GetComponent<RawImage>(),
-                        wxInfoJson.Value<string>("headimgurl"));
-                        wxLogin3.Find("NickName").GetComponent<Text>().text = wxInfoJson.Value<string>("nickname");
+                        //Utils.DisplayImage(StartCoroutine,
+                        //wxLogin3.Find("Avatar").GetComponent<RawImage>(),
+                        //wxInfoJson.Value<string>("headimgurl"));
+                        //wxLogin3.Find("NickName").GetComponent<Text>().text = wxInfoJson.Value<string>("nickname");
                         signContainer.gameObject.SetActive(false);
                         pageNums = 3;
                         //this.goSign();
@@ -444,6 +463,10 @@ public class LoginController : MonoBehaviour
         //Timer t = new Ti
         if (r.result)
         {
+            if (r.data.Value<bool>("isExist") && pageNums == 5) 
+            {
+                HidePassword();
+            }
             time = 60;
             btnText.text = $"Again({time})";
             System.Timers.Timer timer = new System.Timers.Timer();
@@ -461,6 +484,22 @@ public class LoginController : MonoBehaviour
         }
     }
 
+    void HidePassword()
+    {
+        signPage1.Find("Password").gameObject.SetActive(false);
+        signPage1.Find("CPassword").gameObject.SetActive(false);
+        signPage1.Find("signThird").GetComponent<Button>().onClick.RemoveAllListeners();
+        signPage1.Find("signThird").GetComponent<Button>().onClick.AddListener(goRegNextWithoutPass);
+    }
+
+
+    void ShowPassword()
+    {
+        signPage1.Find("Password").gameObject.SetActive(true);
+        signPage1.Find("CPassword").gameObject.SetActive(true);
+        signPage1.Find("signThird").GetComponent<Button>().onClick.RemoveAllListeners();
+        signPage1.Find("signThird").GetComponent<Button>().onClick.AddListener(() => { goRegNext(1); });
+    }
     void CaptchaTimerTick() 
     {
         timer -= Time.deltaTime;
@@ -507,6 +546,11 @@ public class LoginController : MonoBehaviour
         var Captcha = signForm.captcha;
         var Password = signForm.password;
         var CPassword = signForm.cpassword;
+        if (Password.text != CPassword.text) 
+        {
+            Utils.showToast(gameObject,"两次密码输入不一致");
+            return;
+        }
         //JsonConvert
         JsonResult<UserResultModel> r = null;
         if (signType == 0)
@@ -526,14 +570,44 @@ public class LoginController : MonoBehaviour
         }
         if (r!=null && r.result)
         {
+            RefreshWx3(r.data);
             StartScrollSign(1);
         }
         else 
         {
-            StartScrollSign(1);
-            //Utils.showToast(gameObject, r.errMsg, 1);
+            Utils.showToast(gameObject, r.errMsg, 1);
         }
     }
+    async void goRegNextWithoutPass()
+    {
+        var Email = signForm.email;
+        var Captcha = signForm.captcha;
+        var r = await ConfigHelper.userApi.OnWebWxLogin(Email.text,
+                Captcha.text,
+                wxInfoJson.Value<string>("unionid"),
+                wxInfoJson.Value<string>("openid"),
+                wxInfoJson.Value<string>("headimgurl"),
+                wxInfoJson.Value<string>("nickname"),
+                wxInfoJson.Value<int>("sex"),
+                "");
+        if (r.result)
+        {
+            RefreshWx3(r.data);
+            StartScrollPanel(4);
+        }
+        else
+        {
+            Utils.showToast(gameObject, r.errMsg);
+        }
+    }
+    void RefreshWx3(UserResultModel data) 
+    {
+        Utils.DisplayImage(StartCoroutine,
+                    wxLogin3.Find("Avatar").GetComponent<RawImage>(),
+                    data.WxHeadImg);
+        wxLogin3.Find("NickName").GetComponent<Text>().text = data.Nickname;
+        userResult = data;
+    }
     private void goRegEnd()
     {
         if (pageNums == 5) 
@@ -577,6 +651,7 @@ public class LoginController : MonoBehaviour
             signPage1.Find("next").gameObject.SetActive(false);
             signPage1.Find("previousThird").gameObject.SetActive(true);
             signPage1.Find("signThird").gameObject.SetActive(true);
+            ShowPassword();
             this.StartScrollPanel(3);
             this.StartScrollSign(0);
         }
@@ -588,6 +663,7 @@ public class LoginController : MonoBehaviour
             signPage1.Find("next").gameObject.SetActive(true);
             signPage1.Find("previousThird").gameObject.SetActive(false);
             signPage1.Find("signThird").gameObject.SetActive(false);
+            ShowPassword();
             this.StartScrollPanel(2);
             this.StartScrollSign(0);
         }
@@ -609,6 +685,7 @@ public class LoginController : MonoBehaviour
             });
             PlayerPrefs.SetString("UserInfos", JsonConvert.SerializeObject(userInfos));
         }
+        App.CurrentUser = data;
         //App.CurrentUser = new UserModel
         //{
         //    NickName = data.Nickname,
@@ -624,19 +701,19 @@ public class LoginController : MonoBehaviour
     }
     async void Submit() 
     {
-        if (loginForm[0] == null || loginForm[1] == null)
+        if (loginForm.email == null || loginForm.password == null)
         {
             Utils.showToast(gameObject, "未绑定", 1);
             return;
         }
-        if (string.IsNullOrEmpty(loginForm[0].text) || string.IsNullOrEmpty(loginForm[1].text))
+        if (string.IsNullOrEmpty(loginForm.email.text) || string.IsNullOrEmpty(loginForm.password.text))
         {
             Utils.showToast(gameObject, "请输入信息", 1);
             return;
         }
         //var res = await Global.userApi.Login(phone.text, pwd.text, "");
         //测试用
-        var res = await ConfigHelper.userApi.Login(loginForm[0].text, loginForm[1].text, "");
+        var res = await ConfigHelper.userApi.Login(loginForm.email.text, loginForm.password.text, "");
         //var res = await NoAuthApi.Login(phone.text, pwd.text);
         if (res.result)
         {
@@ -652,9 +729,9 @@ public class LoginController : MonoBehaviour
     void Update()
     {
         //Debug.Log($"{phone.isFocused}, ${pwd != null}, ${Input.GetKeyDown(KeyCode.Tab)}");
-        if (loginForm[0].isFocused && loginForm[1] != null && Input.GetKeyDown(KeyCode.Tab))
+        if (Input.GetKeyDown(KeyCode.Tab) && loginForm !=null && loginForm.email.isFocused && loginForm.password != null)
         {
-            loginForm[1].ActivateInputField();
+            loginForm.password.ActivateInputField();
         }
         if (startCaptcha) 
         {

Assets/Scripts/UI/Prefab/Login/LoginRegOptions.cs

@@ -21,10 +21,10 @@ namespace Assets.Scripts.UI.Prefab.Login
             }
             return op.options;
         }
-        public static List<Dropdown.OptionData> dayOption28 = SetOptions(28);
-        public static List<Dropdown.OptionData> dayOption29 = SetOptions(29);
-        public static List<Dropdown.OptionData> dayOption30 = SetOptions(30);
-        public static List<Dropdown.OptionData> dayOption31 = SetOptions(31);
+        public static Dictionary<int, List<Dropdown.OptionData>> dayOption = new Dictionary<int, List<Dropdown.OptionData>>()
+        {
+            {28,SetOptions(28) },{29,SetOptions(29) },{30,SetOptions(30) },{31,SetOptions(31) }
+        };
     }
     public class CountryModel 
     {
@@ -76,22 +76,8 @@ namespace Assets.Scripts.UI.Prefab.Login
         }
         public List<Dropdown.OptionData> GetDayOptions(int year,int month) 
         {
-            if (new int[] { 1, 3, 5, 7, 8, 10, 12 }.Contains(month))
-            {
-                return DayOptions.dayOption31;
-            }
-            else if (new int[] { 4, 6, 9, 11 }.Contains(month))
-            {
-                return DayOptions.dayOption30;
-            }
-            else if (month == 2)
-            {
-                return DateTime.IsLeapYear(year) ? DayOptions.dayOption29 : DayOptions.dayOption28;
-            }
-            else 
-            {
-                return days;
-            }
+            int day = DateTime.DaysInMonth(year, month);
+            return DayOptions.dayOption[day];
         }
     }
 }

Assets/Scripts/UI/Prefab/Login/QuickLoginUser.cs

@@ -20,16 +20,17 @@ public class QuickLoginUser : MonoBehaviour
     }
     public void Initial(QUserInfo user) 
     {
-        if (user ==null) return;
-        transform.GetComponent<Button>().onClick.AddListener(() => 
+        if (user == null) return;
+        transform.GetComponent<Button>().onClick.AddListener(async () => 
         {
             ApiBase.SetCookie(user.Cookie);
-            var r = ConfigHelper.userApi.GetUserInfo();
+            var r = await ConfigHelper.userApi.QuickLogin();
             if (r.result)
             {
+                App.CurrentUser = r.data;
                 //ConfigHelper.CurrentUser = r.data.Value<UserResultModel>("user");
                 //ConfigHelper.CurrentUser = re;
-                var usermodel = r.data.Value<JObject>("user");
+                //var usermodel = r.data.Value<JObject>("user");
                 //App.CurrentUser = new UserModel
                 //{
                 //    NickName = usermodel.Value<string>("NickName"),
@@ -41,6 +42,7 @@ public class QuickLoginUser : MonoBehaviour
                 //    Distance = 0,
                 //    Climb = "",
                 //};
+
                 SceneManager.LoadScene("MainScene");
             }
             else 
@@ -94,6 +96,7 @@ public class QuickLoginUser : MonoBehaviour
         transform.Find("Avatar").GetComponent<RawImage>().DOFade(1f, 0.3f);
         transform.GetComponent<Button>().enabled = true;
         transform.Find("NickNameText").GetComponent<Text>().enabled = true;
+        transform.Find("BtnDelete").GetComponent<Button>().gameObject.SetActive(true);
     }
     public void setNoActive()
     {
@@ -102,5 +105,6 @@ public class QuickLoginUser : MonoBehaviour
         transform.Find("Avatar").GetComponent<RawImage>().DOFade(0.5f, 0.3f);
         transform.GetComponent<Button>().enabled = false;
         transform.Find("NickNameText").GetComponent<Text>().enabled = false;
+        transform.Find("BtnDelete").GetComponent<Button>().gameObject.SetActive(false);
     }
 }

Assets/Scripts/UI/Prefab/MapList/MapFilterOptions.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine.UI;
+
+namespace Assets.Scripts.UI.Prefab.MapList
+{
+    public class MapFilterOptions
+    {
+        public static List<Dropdown.OptionData> distances = new string[] {"全部",
+                "0-5KM",
+                "5-10KM",
+                "10-20KM",
+                "20-30KM",
+                "30-50KM",
+                "50-100KM",
+                "100-200KM",
+                "200-无限制", }.Select(x=>new Dropdown.OptionData(x)).ToList();
+        public static Dictionary<string, string> distanceDict = new Dictionary<string, string>()
+        {
+            {"全部","" },
+            {"0-5KM","0-5" },
+            {"5-10KM","5-10" },
+            {"10-20KM","10-20" },
+            {"20-30KM","20-30" },
+            {"50-100KM","50-100" },
+            {"100-200KM","100-200" },
+            {"200-无限制","200-99999" },
+        };
+        public static Dictionary<string,string> diffDict = new Dictionary<string, string>()
+        {
+            {"FLAT","0-100" },
+            {"LV.4","100-250" },
+            {"LV.3","250-350" },
+            {"LV.2","350-550" },
+            {"LV.1","550-750" },
+            {"HC","750-99999" },
+        };
+        public static List<Dropdown.OptionData> sorts = new string[] {
+            "Distance","Name","Difficulty","Hot"//,"Times"
+        }.Select(x => new Dropdown.OptionData(x)).ToList();
+        public static Dictionary<string, string> diffDisplayDict = new Dictionary<string, string>()
+        {
+            {"FLAT","0-100" },
+            {"LV.4","100-250" },
+            {"LV.3","250-350" },
+            {"LV.2","350-550" },
+            {"LV.1","550-750" },
+            {"HC","750-99999" },
+        };
+    }
+}

Assets/Scripts/UI/Prefab/MapList/MapFilterOptions.cs.meta

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

Assets/Scripts/UI/Prefab/MapList/MapItem.cs

@@ -1,4 +1,4 @@
-using Assets.Cyp.Common;
+using Assets.Scripts;
 using Assets.Scripts.Apis.Models;
 using System.Collections;
 using System.Collections.Generic;
@@ -6,12 +6,6 @@ using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 
-public class MyMap 
-{
-    public string name { get; set; }
-    public int rank { get; set; }
-    public string image { get; set; }
-}
 public class MapItem : MonoBehaviour
 {
     // Start is called before the first frame update
@@ -36,9 +30,15 @@ public class MapItem : MonoBehaviour
         });
         transform.Find("Name").GetComponent<Text>().text = myMap.Name;
         Utils.DisplayImage(StartCoroutine, transform.Find("MapTitleImg").GetComponent<RawImage>(), myMap.CoverImage);
-        var props = transform.Find("Props");
+        transform.Find("CollectImg").gameObject.SetActive(myMap.IsFavorite);
+        var props = transform.Find("Props");        
         props.Find("DistanceText").GetComponent<Text>().text = $"{myMap.Distance.ToString("#0.00")}KM";
         props.Find("EleText").GetComponent<Text>().text = $"{(myMap.TotalClimb ?? 0.0).ToString("#0.00")}M";
         props.Find("SlopeText").GetComponent<Text>().text = $"{myMap.AverageGrade.ToString("#0.00")}%";
+        props.Find("rideText").GetComponent<Text>().text = myMap.TheHeat.ToString();
+        var tabContainer = transform.Find("TabContainer");
+        var diff = tabContainer.Find("Diff");
+        diff.Find("Text").GetComponent<Text>().text = myMap.Hard;
+        tabContainer.Find("3d").gameObject.SetActive(myMap.Enable3D);
     }
 }

Assets/Scripts/UI/Prefab/MapList/RotateBg.cs

@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class RotateBg : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        transform.Rotate(new Vector3(0,0,-0.01f*1/3));
+    }
+}

Assets/Scripts/UI/Prefab/MapList/RotateBg.cs.meta

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

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

@@ -95,29 +95,29 @@ public class EditUserController : PFUIPanel
         material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, rect.height, 0));
         mHeadImage.material = material;
 
-        var currentUser = App.CurrentUser;
-        mIdText.text = "ID:" + currentUser.Id.ToString();
-        mNameText.text = currentUser.Nickname;
+        //var currentUser = App.CurrentUser;
+        //mIdText.text = "ID:" + currentUser.Id.ToString();
+        //mNameText.text = currentUser.Nickname;
 
-        if (!string.IsNullOrWhiteSpace(currentUser.WxHeadImg))
-        {
-            Utils.DisplayImage(StartCoroutine, mHeadImage, currentUser.WxHeadImg);
-        }
-        if (currentUser.Sex == 1)
-        {
-            mSexDropdown.SelectValue("男");
-        }
-        else
-        {
-            mSexDropdown.SelectValue("女");
-        }
-        if (currentUser.Birthday.HasValue)
-        {
-            var birthday = currentUser.Birthday.Value;
-            mYearDropdown.SelectValue(birthday.Year.ToString());
-            mMonthDropdown.SelectValue(birthday.Month.ToString());
-            mDayDropdown.SelectValue(birthday.Day.ToString());
-        }
+        //if (!string.IsNullOrWhiteSpace(currentUser.WxHeadImg))
+        //{
+        //    Utils.DisplayImage(StartCoroutine, mHeadImage, currentUser.WxHeadImg);
+        //}
+        //if (currentUser.Sex == 1)
+        //{
+        //    mSexDropdown.SelectValue("男");
+        //}
+        //else
+        //{
+        //    mSexDropdown.SelectValue("女");
+        //}
+        //if (currentUser.Birthday.HasValue)
+        //{
+        //    var birthday = currentUser.Birthday.Value;
+        //    mYearDropdown.SelectValue(birthday.Year.ToString());
+        //    mMonthDropdown.SelectValue(birthday.Month.ToString());
+        //    mDayDropdown.SelectValue(birthday.Day.ToString());
+        //}
 
         UIManager.AddEvent(mSaveButton.gameObject, EventTriggerType.PointerClick, Save);
     }

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

@@ -115,7 +115,7 @@ public class HomeController : PFUIPanel
             //App.CurrentUser.Distance = res.data.TotalDistance;
             //App.CurrentUser.Climb = res.data.TotalClimb;
             //App.CurrentUser.Carlories = res.data.Kcal;
-            SetCurrentUser();
+            //SetCurrentUser();
             //Climb.text = $"{res.data.TotalClimb.ToString()}M";
             //Calories.text = $"{res.data.Kcal.ToString()}KCAL";
             //Calories.text = res.data.

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

@@ -1,6 +1,7 @@
-using Assets.Cyp.Common;
-using Assets.Scripts;
+using Assets.Scripts;
+using Assets.Scripts.Apis;
 using Assets.Scripts.Apis.Models;
+using Assets.Scripts.UI.Prefab.MapList;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -20,7 +21,15 @@ public class MapListController : PFUIPanel
     [HideInInspector] public int pageIndex = 0;
     [HideInInspector] public int pageSize = 20;
     [HideInInspector] public string hard = "全部";
-
+    private Transform distanceOptions;
+    private Transform diffOptions;
+    private Transform tdContainer;
+    private Transform favContainer;
+    private Transform sorts;
+    private Transform sortDir;
+    private Transform searchInput;
+    //private Transform distanceOption;
+    //private Transform distanceOption;
     private Button returnBtn;
     public GameObject Content {
         get 
@@ -31,6 +40,7 @@ public class MapListController : PFUIPanel
     private bool isEnd = false;
     protected override void Start() 
     {
+        ApiBase.SetCookie("73385F5F719B610D132C1ECF3E9143272BF15214D57ED91CD7A9DFD832407471535112AAEB8E9271F75D54FBBF2D99F18FA313C1EEA5676F5D722D7FBB07C926BEC5905591BF9AFDDC6336552DF273112C2DA1794E6FA2F465B11FECD2E82E52");
         //if (hardSelector != null) 
         //{
         //    hardSelector.onValueChanged.AddListener(ChangeHard);
@@ -45,6 +55,44 @@ public class MapListController : PFUIPanel
             //    layout.cellSize = new Vector2((width - 120) / 5, (width - 120) / 5);
             //}
         }
+        distanceOptions = transform.Find("Panel").Find("Panel").Find("distanceOptions");
+        if (distanceOptions != null) 
+        {
+            var dDropdown = distanceOptions.GetComponent<Dropdown>();
+            dDropdown.options = MapFilterOptions.distances;
+            dDropdown.onValueChanged.AddListener(ChangeDistance);
+        }
+        diffOptions = transform.Find("Panel").Find("Panel").Find("DifficultyContainer");
+        if (diffOptions != null) 
+        {
+            foreach (Transform t in diffOptions)
+            {
+                var button = t.GetComponent<Button>();
+                var image = t.GetComponent<Image>();
+                var text = t.Find("Text").GetComponent<Text>();
+                button.onClick.AddListener(() =>
+                {
+                    ColorUtility.TryParseHtmlString("#23232D", out Color c1);
+                    if (image.color.r == c1.r && image.color.g == c1.g && image.color.b == c1.b)
+                    {
+                        ColorUtility.TryParseHtmlString("#F93086", out Color c);
+                        image.color = c;
+                        text.color = new Color(1, 1, 1,1);
+                        hands.Add(MapFilterOptions.diffDict[text.text]);
+                    }
+                    else
+                    {
+                        ColorUtility.TryParseHtmlString("#6E6E7D", out Color c);
+                        image.color = c1;
+                        text.color = c;
+                        hands.Remove(MapFilterOptions.diffDict[text.text]);
+                    }
+                    scroll.GetComponent<ScrollRect>().verticalNormalizedPosition = 1;
+                    Refresh();
+                });
+            }
+        }
+        
         GetList();
         if (scroll != null) 
         {
@@ -63,6 +111,73 @@ public class MapListController : PFUIPanel
                 UIManager.ShowHomePanel();
             });
         }
+        tdContainer = transform.Find("Panel").Find("Panel").Find("3dContainer");
+        favContainer = transform.Find("Panel").Find("Panel").Find("FavContainer");
+        if (tdContainer != null) 
+        {
+            tdContainer.GetComponent<Button>().onClick.AddListener(() => 
+            {
+                var gou = tdContainer.Find("Gou").gameObject;
+                bool v = !gou.activeSelf;
+                gou.SetActive(v);
+                is3d = v;
+                Refresh();
+            });
+        }
+        if (favContainer != null)
+        {
+            favContainer.GetComponent<Button>().onClick.AddListener(() =>
+            {
+                var gou = favContainer.Find("Gou").gameObject;
+                bool v = !gou.activeSelf;
+                gou.SetActive(v);
+                isFav = v;
+                Refresh();
+            });
+        }
+        searchInput = transform.Find("Panel").Find("Panel").Find("SearchInput");
+        if (searchInput != null) 
+        {
+            searchInput.Find("Button").GetComponent<Button>().onClick.AddListener(() =>
+            {
+                ftname = searchInput.GetComponent<InputField>().text;
+                Refresh();
+            });
+        }
+        sorts = transform.Find("Panel").Find("Panel").Find("FilterOptions");
+        if (sorts != null) 
+        {
+            var drop = sorts.GetComponent<Dropdown>();
+            drop.options = MapFilterOptions.sorts;
+            drop.value = 3;
+            drop.onValueChanged.AddListener((int index)=> 
+            {
+                sort = drop.options[index].text;
+                var image = sortDir.Find("Image").GetComponent<Image>();
+                image.sprite = Resources.Load<Sprite>("Images/DOWN");
+                sortDire = "desc";
+                Refresh();
+            });
+        }
+        sortDir = transform.Find("Panel").Find("Panel").Find("Dir");
+        if (sortDir) 
+        {
+            var image = sortDir.Find("Image").GetComponent<Image>();
+            sortDir.GetComponent<Button>().onClick.AddListener(() => 
+            {
+                if (image.sprite.name == "DOWN")
+                {
+                    image.sprite = Resources.Load<Sprite>("Images/UP");
+                    sortDire = "asc";
+                }
+                else 
+                {
+                    image.sprite = Resources.Load<Sprite>("Images/DOWN");
+                    sortDire = "desc";
+                }
+                Refresh();
+            });
+        }
     }
 
     private void OnEndDrag(BaseEventData arg0)
@@ -73,7 +188,6 @@ public class MapListController : PFUIPanel
             Debug.Log(scrollrect.verticalNormalizedPosition);
             pageIndex++;
             GetList();
-            
         }
         if (scrollrect.verticalNormalizedPosition >= 1) 
         {
@@ -81,28 +195,39 @@ public class MapListController : PFUIPanel
         }
     }
 
-    private void ChangeHard(int index)
+    private void ChangeDistance(int index)
     {
+        var text = distanceOptions.GetComponent<Dropdown>().options[index].text;
+        distance = MapFilterOptions.distanceDict[text];
+        scroll.GetComponent<ScrollRect>().verticalNormalizedPosition = 1;
+        Refresh();
         //var text = hardSelector.options[index].text;
         //if (text == "全部难度") 
         //{
             
         //}
     }
-
+    //查询条件
+    string ftname = "";
+    string distance = "";
+    List<string> hands = new List<string>();
+    bool is3d = false,isFav = false;
+    string sort = "Hot",sortDire = "desc";
+    //string name = "";
+    //string name = "";
     public void GetList() 
     {
         if (isEnd) return;
-        var res = Global.mapApi.GetList(pageIndex, pageSize, "");
+        var res = ConfigHelper.mapApi.GetList(pageIndex, pageSize, ftname,distance,string.Join(",",hands),is3d,sort,sortDire,isFav);
         if (res.result)
         {
-            
-            if (res.data.Count == 0)
+            if (res.data.Count == 0 && pageIndex != 0)
             {
                 isEnd = true;
             }
             else 
             {
+                isEnd = false;
                 DisplayMaps(res.data);
             }
         }
@@ -128,6 +253,13 @@ public class MapListController : PFUIPanel
         pageIndex = 0;
         GetList();
     }
+    void ResetList()
+    {
+        distance = "";
+        hands = new List<string>();
+        name = "";
+        Refresh();
+    }
     // Update is called once per frame
     void Update()
     {

Assets/Scripts/UI/Prefab/ResultList.meta

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

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

@@ -0,0 +1,216 @@
+using Assets.Scripts;
+using Assets.Scripts.Apis;
+using Assets.Scripts.Apis.Models;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+
+public class ResultListController : MonoBehaviour
+{
+    [SerializeField]Transform routeResult;
+    Transform scrollContent;
+    Transform routeScroll, matchScroll;
+    Transform routeContent, matchContent;
+    Transform btnRoute, btnMatch,searchInput;
+    Color c1, c2;
+    // Start is called before the first frame update
+    int pageIndex = 0, pageSize = 20;
+    string name = "";
+    void Start()
+    {
+        ApiBase.SetCookie("73385F5F719B610D132C1ECF3E9143272BF15214D57ED91CD7A9DFD832407471535112AAEB8E9271F75D54FBBF2D99F18FA313C1EEA5676F5D722D7FBB07C926BEC5905591BF9AFDDC6336552DF273112C2DA1794E6FA2F465B11FECD2E82E52");
+        InitialColor();
+        scroll = transform.Find("ListPanel").Find("Scroll").GetComponent<ScrollRect>();
+        btnMatch = transform.Find("ListPanel").Find("BtnMatch");
+        btnRoute = transform.Find("ListPanel").Find("BtnRoute");
+        searchInput = transform.Find("ListPanel").Find("SearchInput");
+        scrollContent = scroll.transform.Find("Viewport").Find("Content");
+        routeScroll = scrollContent.Find("RouteList");
+        routeContent = routeScroll.Find("Viewport").Find("Content");
+        matchScroll = scrollContent.Find("MatchList");
+        matchContent = matchScroll.Find("Viewport").Find("Content");
+        if (btnMatch != null) 
+        {
+            btnMatch.GetComponent<Button>().onClick.AddListener(() => StartScroll(0));
+        }
+        if (btnRoute != null) 
+        {
+            btnRoute.GetComponent<Button>().onClick.AddListener(() => StartScroll(1));
+        }
+        if (searchInput != null) 
+        {
+            searchInput.Find("Button").GetComponent<Button>().onClick.AddListener(() =>
+            {
+                name = searchInput.GetComponent<InputField>().text;
+                Refresh();
+            });
+        }
+        if (routeScroll != null)
+        {
+            UIManager.AddEvent(routeScroll.gameObject, UnityEngine.EventSystems.EventTriggerType.EndDrag, OnEndDrag);
+        }
+        if (matchScroll) 
+        {
+            UIManager.AddEvent(matchScroll.gameObject, UnityEngine.EventSystems.EventTriggerType.EndDrag, OnEndDrag);
+        }
+        GetList();
+    }
+
+    private void OnEndDrag(BaseEventData e)
+    {
+        var pe = (PointerEventData)e;
+        var scrollrect = pe.pointerDrag.GetComponent<ScrollRect>();
+        if (scrollrect.verticalNormalizedPosition <= 0)
+        {
+            Debug.Log(scrollrect.verticalNormalizedPosition);
+            pageIndex++;
+            GetList();
+        }
+        if (scrollrect.verticalNormalizedPosition >= 1)
+        {
+            Refresh();
+        }
+    }
+
+    private void Refresh()
+    {
+        routeContent.transform.DestroyChildren();
+        pageIndex = 0;
+        GetList();
+    }
+    bool isEnd = false;
+    void GetList()
+    {
+        var r =ConfigHelper.mapInterruptRecordApi.GetMapInterruptRecord(name, pageIndex, 20);
+        if (r.result)
+        {
+            if (r.data.Count == 0 && pageIndex != 0)
+            {
+                isEnd = true;
+            }
+            else
+            {
+                isEnd = false;
+                DisplayRouteResult(r.data,routeContent);
+                DisplayRouteResult(r.data, matchContent);
+            }
+        }
+        else 
+        {
+            Utils.showToast(gameObject, r.errMsg);
+        }
+    }
+    void DisplayRouteResult(List<RouteResult> list,Transform content)
+    {
+        if (routeResult != null)
+        {
+            foreach (var item in list)
+            {
+                var obj = Instantiate(routeResult);
+                obj.GetComponent<RouteItem>().Initial(item);
+                //obj.SendMessage("Initial", );
+                obj.transform.parent = content;
+                obj.transform.localScale = new Vector3(1, 1, 1);
+            }
+        }
+    }
+    void InitialColor()
+    {
+        ColorUtility.TryParseHtmlString("#FFFFFF", out c1);
+        ColorUtility.TryParseHtmlString("#5C5C6E", out c2);
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        GoScroll();
+    }
+    void StartScroll(int index) 
+    {
+        if (startScroll) return;
+        if (index == 0)
+        {
+            //翻到比赛页，比赛按钮变白，线路按钮变灰
+            scrollIndex = 1;
+            startScroll = true;
+            btnRoute.GetComponent<Text>().color = c2;
+            btnMatch.GetComponent<Text>().color = c1;
+        } 
+        else if (index == 1) 
+        {
+            //反过来
+            scrollIndex = 0;
+            startScroll = true;
+            btnRoute.GetComponent<Text>().color = c1;
+            btnMatch.GetComponent<Text>().color = c2;
+        }
+    }
+    #region 主页面滑动逻辑
+    int scrollIndex = 0;
+    bool startScroll = false;
+    ScrollRect scroll;
+    //private float scrollValue = 0.5f;
+    int pageNums = 2;
+    void GoScroll()
+    {
+        var index = scrollIndex;
+        var scrollValue = 1f / (pageNums - 1);
+        var value = index * scrollValue;
+        if (scroll != null && startScroll)
+        {
+            if (scroll.horizontalNormalizedPosition >= value)
+            {
+                scroll.horizontalNormalizedPosition -= (scrollValue / 20);
+                if (scroll.horizontalNormalizedPosition <= value)
+                {
+                    Debug.Log(index);
+                    scroll.horizontalNormalizedPosition = value;
+                    startScroll = false;
+                }
+            }
+            else
+            {
+                scroll.horizontalNormalizedPosition += (scrollValue / 20);
+                if (scroll.horizontalNormalizedPosition >= value)
+                {
+                    Debug.Log(index);
+                    scroll.horizontalNormalizedPosition = value;
+                    startScroll = false;
+                }
+            }
+        }
+    }
+    #endregion
+    //float scrollIndex = 0;
+    //bool startScroll = false;
+    //ScrollRect scroll;
+    //void GoScroll()
+    //{
+    //    float value = scrollIndex;
+    //    if (scroll != null && startScroll)
+    //    {
+    //        if (scrollIndex == 0)
+    //        {
+    //            scroll.horizontalNormalizedPosition -= (1f / 20);
+    //            if (scroll.horizontalNormalizedPosition <= 0)
+    //            {
+    //                scroll.horizontalNormalizedPosition = 0;
+    //                startScroll = false;
+
+    //            }
+    //        }
+    //        else if (scrollIndex == 1)
+    //        {
+    //            scroll.horizontalNormalizedPosition += (1f / 20);
+    //            if (scroll.horizontalNormalizedPosition >= 1)
+    //            {
+    //                scroll.horizontalNormalizedPosition = 1;
+    //                startScroll = false;
+    //            }
+    //        }
+    //    }
+    //}
+}

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

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

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

@@ -0,0 +1,122 @@
+using Assets.Scripts;
+using Assets.Scripts.Apis.Models;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+
+public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler
+{
+    // Start is called before the first frame update
+    Transform left,row1,row2,right;
+    Transform btnReRide, btnContinue, btnDelete;
+    void Start()
+    {
+
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+    string titleColor = "#5c5c6e";
+    public void Initial(RouteResult result)
+    {
+        left = transform.Find("Left");
+        row1 = left.Find("Main").Find("Row1");
+        row2 = left.Find("Main").Find("Row2");
+        Utils.DisplayImage(StartCoroutine, transform.Find("CoverImage").GetComponent<RawImage>(), result.RouteImage);
+        left.Find("Main").Find("Name").GetComponent<Text>().text = result.RouteName;
+        left.Find("Main").Find("Time").GetComponent<Text>().text = result.CreateTime.ToString("yyyy-MM-dd HH-mm-ss");
+        row1.Find("Time").GetComponent<Text>().text = $"<color={titleColor}>Riding time:</color>{result.TrainingTime}";
+        row1.Find("Distance").GetComponent<Text>().text = $"<color={titleColor}>Mileage:</color>{result.EndDistance.ToString("#0.00")}KM";
+        row1.Find("Times").GetComponent<Text>().text = $"<color={titleColor}>Times:</color>{result.Count}";
+        row1.Find("Rank").GetComponent<Text>().text = $"<color={titleColor}>Rank:</color>{result.Ranking}";
+        left.Find("Progress").Find("Image").GetComponent<Image>().fillAmount = (float)result.Progress;
+        left.Find("Progress").Find("Value").GetComponent<Text>().text = (result.Progress * 100).ToString("#0");
+        row2.Find("Device").GetComponent<Text>().text = $"<color={titleColor}>Cycling equipment:</color>{result.ManufacturerName}";
+        right = transform.Find("Right");
+        btnContinue = right.Find("BtnContinue");
+        if (btnContinue) 
+        {
+            btnContinue.gameObject.SetActive(false);
+            btnContinue.GetComponent<Button>().onClick.AddListener(GoContinue);
+        }
+        btnReRide = right.Find("BtnReRide");
+        if (btnReRide)
+        {
+            btnReRide.gameObject.SetActive(false);
+            btnReRide.GetComponent<Button>().onClick.AddListener(GoReRide);
+        }
+        btnDelete = right.Find("BtnDelete");
+        if (btnDelete)
+        {
+            btnDelete.gameObject.SetActive(false);
+            btnDelete.GetComponent<Button>().onClick.AddListener(Delete);
+        }
+    }
+
+    private void Delete()
+    {
+        throw new NotImplementedException();
+    }
+
+    private void GoReRide()
+    {
+        throw new NotImplementedException();
+    }
+
+    private void GoContinue()
+    {
+        throw new NotImplementedException();
+    }
+
+    public void OnPointerExit(PointerEventData eventData)
+    {
+        transform.GetComponent<Image>().color = Utils.HexToColorHtml("#23232d");
+        if (left != null) 
+        {
+            left.Find("Main").Find("Time").GetComponent<Text>().color = Utils.HexToColorHtml("#414251");
+            left.Find("Progress").Find("Image").GetComponent<Image>().color = Utils.HexToColorHtml("#5c5c6e");
+            left.Find("Progress").Find("Value").GetComponent<Text>().color = Utils.HexToColorHtml("#414251");
+            left.Find("Progress").Find("bf").GetComponent<Text>().color = Utils.HexToColorHtml("#414251");
+        }
+        if (row1 != null) 
+        {
+            row1.Find("Time").GetComponent<Text>().color = Utils.HexToColorHtml("#9E9EAD");
+            row1.Find("Distance").GetComponent<Text>().color = Utils.HexToColorHtml("#9E9EAD");
+            row1.Find("Times").GetComponent<Text>().color = Utils.HexToColorHtml("#9E9EAD");
+            row1.Find("Rank").GetComponent<Text>().color = Utils.HexToColorHtml("#9E9EAD");
+        }
+        titleColor = "#414251";
+        btnContinue.gameObject.SetActive(false);
+        btnReRide.gameObject.SetActive(false);
+        btnDelete.gameObject.SetActive(false);
+    }
+
+    public void OnPointerEnter(PointerEventData eventData)
+    {
+        transform.GetComponent<Image>().color = Utils.HexToColorHtml("#353543");
+        if (left != null)
+        {
+            left.Find("Main").Find("Time").GetComponent<Text>().color = Utils.HexToColorHtml("#5c5c6e");
+            left.Find("Progress").Find("Image").GetComponent<Image>().color = Utils.HexToColorHtml("#F93086");
+            left.Find("Progress").Find("Value").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
+            left.Find("Progress").Find("bf").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
+        }
+        if (row1 != null) 
+        {
+            row1.Find("Time").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
+            row1.Find("Distance").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
+            row1.Find("Times").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
+            row1.Find("Rank").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
+        }
+        titleColor = "#5c5c6e";
+        btnContinue.gameObject.SetActive(true);
+        btnReRide.gameObject.SetActive(true);
+        btnDelete.gameObject.SetActive(true);
+    }
+}

Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs.meta

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

Assets/Scripts/Utils/Utils.cs

@@ -91,5 +91,10 @@ namespace Assets.Scripts
             byte b = byte.Parse(hex.Substring(4, 2), NumberStyles.HexNumber);
             return new Color32(r, g, b, byte.MaxValue);
         }
+        public static Color HexToColorHtml(string hex)
+        {
+            ColorUtility.TryParseHtmlString(hex, out Color c);
+            return c;
+        }
     }
 }

ProjectSettings/GraphicsSettings.asset

@@ -38,6 +38,7 @@ GraphicsSettings:
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}