pc修改

Assets/Resources/Images/64-10.png.meta

@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: 2c5f3f1e5f1564e469edfeecf2804f61
+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: 10, y: 10, z: 10, w: 10}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/Prefab/MapList/MapItem.prefab

@@ -469,7 +469,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1}
+  m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -799,7 +799,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1}
+  m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -1795,7 +1795,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.2392157, g: 0.24313727, b: 0.3019608, a: 1}
+  m_Color: {r: 0.43137255, g: 0.43137255, b: 0.49019608, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -2121,7 +2121,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.2392157, g: 0.24313727, b: 0.3019608, a: 1}
+  m_Color: {r: 0.43137255, g: 0.43137255, b: 0.49019608, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -2942,12 +2942,12 @@ PrefabInstance:
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
         type: 3}

Assets/Resources/UI/Prefab/NewRoute/UserInfo.prefab

@@ -0,0 +1,214 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &727010653398515220
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 855809320942944095}
+  - component: {fileID: 1906905118980539361}
+  - component: {fileID: 1816719013343740752}
+  m_Layer: 5
+  m_Name: NickName
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &855809320942944095
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 727010653398515220}
+  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: 5992468442936236375}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -24}
+  m_SizeDelta: {x: 0, y: 22}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &1906905118980539361
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 727010653398515220}
+  m_CullTransparentMesh: 0
+--- !u!114 &1816719013343740752
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 727010653398515220}
+  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.61960787, g: 0.61960787, b: 0.6784314, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
+    m_FontSize: 8
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 8
+    m_MaxSize: 40
+    m_Alignment: 1
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+--- !u!1 &2508160585134113376
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3399657810546528119}
+  - component: {fileID: 4851986678425313050}
+  - component: {fileID: 2696346680040285015}
+  - component: {fileID: 7974616677074391344}
+  m_Layer: 5
+  m_Name: Avatar
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3399657810546528119
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2508160585134113376}
+  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: 5992468442936236375}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 20, y: 20}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &4851986678425313050
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2508160585134113376}
+  m_CullTransparentMesh: 0
+--- !u!114 &2696346680040285015
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2508160585134113376}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &7974616677074391344
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2508160585134113376}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  radius: 10
+--- !u!1 &3688802075276480131
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5992468442936236375}
+  - component: {fileID: 3571262997660941405}
+  m_Layer: 5
+  m_Name: UserInfo
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5992468442936236375
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3688802075276480131}
+  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: 3399657810546528119}
+  - {fileID: 855809320942944095}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3571262997660941405
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3688802075276480131}
+  m_CullTransparentMesh: 0

Assets/Resources/UI/Prefab/NewRoute/UserInfo.prefab.meta

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

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

@@ -464,7 +464,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -675,7 +675,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -843,7 +843,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -1062,8 +1062,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -35}
+  m_AnchoredPosition: {x: 0, y: -22}
-  m_SizeDelta: {x: 35, y: 35}
+  m_SizeDelta: {x: 55, y: 55}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3728196982934195722
 CanvasRenderer:
@@ -1161,7 +1161,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -1228,8 +1228,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -35}
+  m_AnchoredPosition: {x: 0, y: -22}
-  m_SizeDelta: {x: 35, y: 35}
+  m_SizeDelta: {x: 55, y: 55}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3728196983254984104
 CanvasRenderer:
@@ -1684,8 +1684,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -35}
+  m_AnchoredPosition: {x: 0, y: -22}
-  m_SizeDelta: {x: 35, y: 35}
+  m_SizeDelta: {x: 55, y: 55}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3728196984118981631
 CanvasRenderer:
@@ -1758,8 +1758,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -35}
+  m_AnchoredPosition: {x: 0, y: -22}
-  m_SizeDelta: {x: 35, y: 35}
+  m_SizeDelta: {x: 55, y: 55}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3728196984181025721
 CanvasRenderer:
@@ -2644,9 +2644,9 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 132, y: -662}
+  m_AnchoredPosition: {x: 30, y: -590}
-  m_SizeDelta: {x: 48, y: 48}
+  m_SizeDelta: {x: 167, y: 48}
-  m_Pivot: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &12646086589693467
 CanvasRenderer:
   m_ObjectHideFlags: 0

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

@@ -195,7 +195,7 @@ RectTransform:
   m_GameObject: {fileID: 7004216017408824980}
   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_LocalScale: {x: 1.3, y: 1.3, z: 1}
   m_Children:
   - {fileID: 2909894636121885848}
   - {fileID: 2898988518583278953}

Assets/Scripts/Apis/Models/MapRouteArea.cs

@@ -141,6 +141,14 @@ namespace Assets.Scripts.Apis.Models
         public bool IsFav { get; set; }
         public string CreateUserHead { get; set; }
         public string CreateUserName { get; set; }
+        public List<MapRouteAreaDetailUser> UserList { get; set; }
+    }
+    public class MapRouteAreaDetailUser
+    {
+        public int Id { get; set; }
+        public string NickName { get; set; }
+        public string WxHeadImg { get; set; }
+        public string Phone { get; set; }
     }
 
     public class MapRouteAreaRouteList

Assets/Scripts/App.cs

@@ -19,7 +19,7 @@ public delegate void ChangeLanguageDelegate();
 
 public static class App
 {
-    public static string Host = "http://192.168.0.101:5083/";
+    public static string Host = "http://192.168.0.101:5085/";
 
     public static string AppVersion = Application.version;
 
@@ -152,6 +152,9 @@ public static class App
         {
             language = "en";
         }
+#if UNITY_EDITOR
+        language = "en";
+#endif
         var a = Resources.Load<TextAsset>("UI/language");
         dic = JsonConvert.DeserializeObject<Dictionary<string, Dictionary<string, string>>>(a.text);
         if (dic.ContainsKey(language))

Assets/Scripts/Scenes/MainController.cs

@@ -251,16 +251,16 @@ public class MainController : BaseScene
     }
     void FinishMessageLeft() 
     {
-#if UNITY_STANDALONE_WIN
+//#if UNITY_STANDALONE_WIN
-        msgIndex = 0;
+//        msgIndex = 0;
-        if (msgs != null) 
+//        if (msgs != null) 
-        {
+//        {
-            foreach (var item in msgs)
+//            foreach (var item in msgs)
-            {
+//            {
-                item.DOFade(0, 0.3f);
+//                item.DOFade(0, 0.3f);
-            }
+//            }
-        }
+//        }
-#endif
+//#endif
     }
 
     void FinishMessageRight() 
@@ -453,13 +453,13 @@ public class MainController : BaseScene
                 //距离50
                 if (item.EndDistance >= 50)
                 {
-                    var message = lang == "zh" ? $"在<color=#f93086>{item.RouteName}</color>中骑行里程达到<color=#e3d427>{"50KM"}</color>！" : $"riding distance reaches <color=#e3d427>{"50KM"}</color> in <color=#f93086>${item.RouteName}</color>!";
+                    var message = lang == "zh" ? $"在<color=#f93086>{item.RouteName}</color>中骑行里程达到<color=#e3d427>{"50KM"}</color>！" : $"riding distance reaches <color=#e3d427>{"50KM"}</color> in <color=#f93086>{item.RouteName}</color>!";
                     EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}50KM");
                 }
                 //距离100
                 if (item.EndDistance >= 100)
                 {
-                    var message = lang == "zh" ? $"在<color=#f93086>{item.RouteName}</color>中骑行里程达到<color=#e3d427>{"100KM"}</color>！" : $"riding distance reaches <color=#e3d427>{"100KM"}</color> in <color=#f93086>${item.RouteName}</color>!";
+                    var message = lang == "zh" ? $"在<color=#f93086>{item.RouteName}</color>中骑行里程达到<color=#e3d427>{"100KM"}</color>！" : $"riding distance reaches <color=#e3d427>{"100KM"}</color> in <color=#f93086>{item.RouteName}</color>!";
                     EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}100KM");
                 }
                 ////速度35
@@ -471,13 +471,13 @@ public class MainController : BaseScene
                 //速度50
                 if (item.Speed >= 50)
                 {
-                    var message = lang == "zh" ? $"在<color=#f93086>{item.RouteName}</color>中骑行速度达到<color=#e3d427>{Math.Round(item.Speed,2)}KM/H</color>！" : $"riding speed reaches <color=#e3d427>{Math.Round(item.Speed, 2)}KM/H</color> in <color=#f93086>${item.RouteName}</color>!";
+                    var message = lang == "zh" ? $"在<color=#f93086>{item.RouteName}</color>中骑行速度达到<color=#e3d427>{Math.Round(item.Speed,2)}KM/H</color>！" : $"riding speed reaches <color=#e3d427>{Math.Round(item.Speed, 2)}KM/H</color> in <color=#f93086>{item.RouteName}</color>!";
                     EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}50KM/H");
                 }
                 //功体比
                 if (item.WeightKg >= 4)
                 {
-                    var message = lang == "zh" ? $"在<color=#f93086>{item.RouteName}</color>中功体比达到<color=#e3d427>{Math.Round(item.WeightKg, 2)}w/kg</color>！" : $" riding PWR reaches <color=#e3d427>{Math.Round(item.WeightKg, 2)}w/kg</color> in <color=#f93086>${item.RouteName}</color>!";
+                    var message = lang == "zh" ? $"在<color=#f93086>{item.RouteName}</color>中功体比达到<color=#e3d427>{Math.Round(item.WeightKg, 2)}w/kg</color>！" : $" riding PWR reaches <color=#e3d427>{Math.Round(item.WeightKg, 2)}w/kg</color> in <color=#f93086>{item.RouteName}</color>!";
                     EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}3WeightKg");
                 }
             }

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

@@ -35,19 +35,24 @@ public class HomeController : PFUIPanel
     protected override void Start()
     {
         base.Start();
+        UIManager.AddEvent(transform.Find("TodayData/Avatar").gameObject, EventTriggerType.PointerClick, b =>
+        {
+            UIManager.ShowUserInfoPanel();
+        });
+
 #if UNITY_ANDROID || UNITY_IOS
         var nav = transform.Find("MainNav-mobile").GetComponent<NewMainNav>();
         nav.SetButtonActive(new List<int> { 1, 3, 4, 6 });
         newNav = nav;
-        UIManager.AddEvent(transform.Find("TodayData/Avatar").gameObject, EventTriggerType.PointerClick, b =>
-         {
-             UIManager.ShowUserInfoPanel();
-         });
         UIManager.AddEvent(transform.Find("TodayData/Datas/Distance").gameObject, EventTriggerType.PointerClick, b =>
         {
             UIManager.ShowResultListPanel();
         });
 #else
+        UIManager.AddEvent(transform.Find("TodayData/Datas/Distance").gameObject, EventTriggerType.PointerClick, b =>
+        {
+            UIManager.ShowUserInfoPanel();
+        });
         mainNav = this.transform.Find("MainNav").GetComponent<MainNav>();
         mainNav.ShowExit();
 #endif
@@ -251,6 +256,10 @@ public class HomeController : PFUIPanel
             //todayData.Find("Datas/Distance/Rank").GetComponent<Text>().text = summary.CurrentTotalDistance == 0 ? "——" : $"+{summary.CurrentTotalDistance.ToString("#0")}";
             todayData.Find("Datas/Climb/Rank").GetComponent<Text>().text = summary.CurrentTotalDistance == 0 ? "——" : $"+{summary.CurrentTotalDistance.ToString("#0.0")}";
             todayData.Find("Datas/Carlories/Rank").GetComponent<Text>().text = summary.CurrentTotalKcal == 0 ? "——" : $"+{summary.CurrentTotalKcal.ToString("#0")}";
+#if UNITY_STANDALONE_WIN
+            todayData.Find("NickName").GetComponent<Text>().text = App.CurrentUser.Nickname;
+            todayData.Find("ID").GetComponent<Text>().text = $"ID:{App.CurrentUser.Id.ToString("000000")}";
+#endif
         }
         
     }

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

@@ -110,7 +110,7 @@ public class MapListController : PFUIPanel
             }));
         newNav = nav;
 #else
-        topContainer = transform.Find("Panel").Find("Top");
+        topContainer = transform.Find("Panel/Top/Container");
 #endif
 #if UNITY_STANDALONE_WIN
         btnMapMode = this.transform.Find("SwitchMode").gameObject;
@@ -318,11 +318,13 @@ public class MapListController : PFUIPanel
         mc.gameObject.SetActive(true);
         mc.GetComponent<CanvasGroup>().alpha = 0;
         mc.GetComponent<CanvasGroup>().DOFade(1, 0.3f);
+#else
+        var topRect = topContainer;
+#endif
         if (isFocusSearch)
         {
             topRect.Find("SearchInput").GetComponent<InputField>().OnPointerClick(new PointerEventData(EventSystem.current));
         }
-#endif
     }
     void onEndEdit() 
     {
@@ -508,6 +510,8 @@ public class MapListController : PFUIPanel
         }
 #if UNITY_STANDALONE_WIN
         btnMapMode.SetActive(App.CurrentRouteType == "My Upload");
+        topContainer.Find("line2").gameObject.SetActive(App.CurrentRouteType == "All Route");
+        topContainer.Find("SearchInput").gameObject.SetActive(App.CurrentRouteType == "All Route");
 #else
         transform.Find("Upload").gameObject.SetActive(App.CurrentRouteType == "My Upload");
 #endif

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

@@ -43,25 +43,27 @@ public class MapListExtraController : PFUIPanel
         {
             typeSelector.Find("Container/Route").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
             typeSelector.Find("Container1/Collection").GetComponent<Text>().color = Utils.HexToColorHtml("#5c5c6e");
-            typeSelector.Find("Container/Line").gameObject.SetActive(true);
+            SetImageStyle(true);
-            typeSelector.Find("Container1/Line").gameObject.SetActive(false);
             p1.DOLocalMoveX(p1originx, 0.5f);
             p2.DOLocalMoveX(p2originx, 0.5f);
-            transform.Find("Tmp/MainNav-mobile").GetComponent<NewMainNav>().ShowButton("Custom");
+            HandleMobileNavCustom(true);
         });
         UIManager.AddEvent(typeSelector.Find("Container1/Collection").gameObject, EventTriggerType.PointerClick, b =>
         {
             typeSelector.Find("Container/Route").GetComponent<Text>().color = Utils.HexToColorHtml("#5c5c6e");
             typeSelector.Find("Container1/Collection").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
-            typeSelector.Find("Container/Line").gameObject.SetActive(false);
+            SetImageStyle(false);
-            typeSelector.Find("Container1/Line").gameObject.SetActive(true);
+            p1.DOLocalMoveX(p1originx - listWidth, 0.5f);
-            p1.DOLocalMoveX(p1originx - 764f, 0.5f);
+            p2.DOLocalMoveX(p2originx - listWidth, 0.5f);
-            p2.DOLocalMoveX(p2originx - 764f, 0.5f);
+            HandleMobileNavCustom(false);
-            transform.Find("Tmp/MainNav-mobile").GetComponent<NewMainNav>().HideButton("Custom");
         });
 
     }
-
+#if UNITY_STANDALONE_WIN
+    float listWidth = 1480f;
+#else
+    float listWidth = 764f;
+#endif
     protected override void Start()
     {
 
@@ -78,6 +80,40 @@ public class MapListExtraController : PFUIPanel
 
     }
     private int pageIndex = 0;
+    void HandleMobileNavCustom(bool b) 
+    {
+#if !UNITY_STANDALONE_WIN
+        if (b)
+        {
+            transform.Find("Tmp/MainNav-mobile").GetComponent<NewMainNav>().ShowButton("Custom");
+        }
+        else 
+        {
+            transform.Find("Tmp/MainNav-mobile").GetComponent<NewMainNav>().HideButton("Custom");
+        }
+#else
+        transform.Find("Panel/Top/Container").gameObject.SetActive(b);
+#endif
+    }
+    void SetImageStyle(bool b) 
+    {
+#if !UNITY_STANDALONE_WIN
+        typeSelector.Find("Container/Line").gameObject.SetActive(b);
+        typeSelector.Find("Container1/Line").gameObject.SetActive(!b);
+#else
+        if (b)
+        {
+            typeSelector.Find("Container").GetComponent<Image>().color = Utils.HexToColorHtml("#f93086ff");
+            typeSelector.Find("Container1").GetComponent<Image>().color = Utils.HexToColorHtml("#f9308600");
+        }
+        else 
+        {
+            typeSelector.Find("Container").GetComponent<Image>().color = Utils.HexToColorHtml("#f9308600");
+            typeSelector.Find("Container1").GetComponent<Image>().color = Utils.HexToColorHtml("#f93086ff");
+        }
+        
+#endif
+    }
     public void HandleCollection()
     {
         if (App.CurrentRouteType == "My Collection")
@@ -93,9 +129,8 @@ public class MapListExtraController : PFUIPanel
         p2.localPosition = new Vector3(p2originx, p2.localPosition.y, p2.localPosition.z);
         typeSelector.Find("Container/Route").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
         typeSelector.Find("Container1/Collection").GetComponent<Text>().color = Utils.HexToColorHtml("#5c5c6e");
-        typeSelector.Find("Container/Line").gameObject.SetActive(true);
+        SetImageStyle(true);
-        typeSelector.Find("Container1/Line").gameObject.SetActive(false);
+        HandleMobileNavCustom(true);
-        transform.Find("Tmp/MainNav-mobile").GetComponent<NewMainNav>().ShowButton("Custom");
     }
     private async void GetList() 
     {

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

@@ -60,34 +60,35 @@ public class NewRouteDetailController : PFUIPanel
     }
     void Start()
     {
+        UIManager.AddEvent(transform.Find("Container/Left/Fav").gameObject, EventTriggerType.PointerClick, async b =>
+        {
+            Assets.Scripts.Apis.JsonResult<object> res = null;
+            var p = ((PointerEventData)b).pointerEnter;
+            var act = ((PointerEventData)b).pointerEnter.GetComponent<Image>().sprite.name == "icon_heji_like";
+            if (act)
+            {
+                res = await ConfigHelper.mapApi.CancelAreaFav(area.Id);
+            }
+            else
+            {
+                res = await ConfigHelper.mapApi.AddAreaFav(area.Id);
+            }
+
+            if (res.result)
+            {
+                p.GetComponent<Image>().sprite = FavDict[!act];
+                //Utils.showToast(null, App.GetLocalString("Success"), type: 1);
+            }
+            else
+            {
+                Utils.showToast(null, res.errMsg);
+            }
+        });
 #if UNITY_ANDROID || UNITY_IOS
         var nav = transform.Find("Tmp/MainNav-mobile").GetComponent<NewMainNav>();
         nav.SetButtonActive(new List<int> { 0, 3, 4, 6, 7 }, 0);
         newNav = nav;
-        UIManager.AddEvent(transform.Find("Container/Left/Fav").gameObject, EventTriggerType.PointerClick, async b =>
-         {
-             Assets.Scripts.Apis.JsonResult<object> res = null;
-             var p = ((PointerEventData)b).pointerEnter;
-             var act = ((PointerEventData)b).pointerEnter.GetComponent<Image>().sprite.name == "icon_heji_like";
-             if (act)
-             {
-                 res = await ConfigHelper.mapApi.CancelAreaFav(area.Id);
-             }
-             else 
-             {
-                 res = await ConfigHelper.mapApi.AddAreaFav(area.Id);
-             }
         
-             if (res.result)
-             {
-                 p.GetComponent<Image>().sprite = FavDict[!act];
-                 //Utils.showToast(null, App.GetLocalString("Success"), type: 1);
-             }
-             else 
-             {
-                 Utils.showToast(null, res.errMsg);
-             }
-         });
 #else
         transform.Find("MainNav").GetComponent<MainNav>().ShowBack();
 #endif
@@ -115,18 +116,19 @@ public class NewRouteDetailController : PFUIPanel
                 OnEndDrag(null);
             }
         }
-        timer -= Time.deltaTime;
+        //timer -= Time.deltaTime;
-        while (timer < 0)
+        //while (timer < 0)
-        {
+        //{
-            var list = MapUDPService.GetAllOnlineUserList();
+        //    var list = MapUDPService.GetAllOnlineUserList();
-            if (list.Count > 0 && routeIds != null)
+        //    if (list.Count > 0 && routeIds != null)
-            {
+        //    {
-                //当前集合骑行人数
+        //        var onlineUserList = list.Where(c => routeIds.Contains(c.RouteId)).ToList();
-                var currentUserCount = list.Where(c => routeIds.Contains(c.RouteId)).Count();
+        //        //当前集合骑行人数
-                Debug.Log($"当前集合骑行人数{currentUserCount}");
+        //        var currentUserCount = onlineUserList.Count();
-            }
+        //        Debug.Log($"当前集合骑行人数{currentUserCount}");
-            timer += 1f;
+        //    }
-        }
+        //    timer += 1f;
+        //}
     }
     MapRouteAreaItem area;
     int pageIndex = 0, pageSize = 10;
@@ -261,6 +263,18 @@ public class NewRouteDetailController : PFUIPanel
             LayoutRebuilder.ForceRebuildLayoutImmediate(transform.Find("Container/Left/DescScroll").GetComponent<ScrollRect>().content);
             transform.Find("Container/Left/Fav").GetComponent<Image>().sprite = FavDict[res.data.IsFav];
             LayoutRebuilder.ForceRebuildLayoutImmediate(transform.Find("Container/Left/RideContainer").GetComponent<RectTransform>());
+            var userinfo = Resources.Load<GameObject>("UI/Prefab/NewRoute/UserInfo");
+            transform.Find("Container/Left/NOData").gameObject.SetActive(res.data.UserList.Count == 0);
+            transform.Find("Container/Left/Users").DestroyChildren();
+            foreach (var item in res.data.UserList) 
+            {
+                var info = Instantiate<GameObject>(userinfo);
+                Utils.DisplayImageTempDict(info.transform.Find("Avatar").GetComponent<Image>(), item.WxHeadImg, caches);
+                info.transform.Find("NickName").GetComponent<Text>().text = item.NickName;
+
+                info.transform.SetParent(transform.Find("Container/Left/Users"));
+                info.transform.localScale = Vector3.one;
+            }
         }
     }
 

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

@@ -21,6 +21,7 @@ public class NewRouteOverviewController: PFUIPanel
     {
         caches = new Dictionary<string, Texture>();
         scroll = transform.Find("Container/Right/Scroll View").GetComponent<ScrollRect>();
+#if !UNITY_STANDALONE_WIN
         scroll.onValueChanged.RemoveAllListeners();
         scroll.onValueChanged.AddListener(p=> 
         {
@@ -35,6 +36,7 @@ public class NewRouteOverviewController: PFUIPanel
                 DOTween.To(() => rect.offsetMax, x => rect.offsetMax = x, new Vector2(rect.offsetMax.x, -68), 0.5f);
             }
         });
+#endif
         UIManager.AddEvent(scroll.gameObject, UnityEngine.EventSystems.EventTriggerType.EndDrag, OnEndDrag);
     }