解决海图索引超过2000头像不显示问题

Assets/Chart And Graph/Script/GraphChart/GraphData.cs

@@ -565,6 +565,23 @@ namespace ChartAndGraph
             return true;
         }
 
+        public int GetViewIndex(int dataIndex,string category)
+        {
+            CategoryData data = (CategoryData)mData[category];
+            int viewIndex = 0;
+            List<DoubleVector3> points = data.getPoints();
+            if (points.Count == 0)
+                viewIndex = 0;
+            if (dataIndex < 0)
+                viewIndex = 0;
+            for (int i = 0; i < points.Count; i++)
+            {
+                if (points[i].x == dataIndex)
+                    viewIndex = i;
+            }
+            return viewIndex;
+        }
+
         public DoubleVector3 GetPoint(string category, int index)
         {
             CategoryData data = (CategoryData)mData[category];

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

@@ -1,5 +1,79 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &82065173456659075
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8307431894315046440}
+  - component: {fileID: 988096766456857417}
+  - component: {fileID: 2035646531741651786}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8307431894315046440
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 82065173456659075}
+  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: 4167844827205442559}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 20, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &988096766456857417
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 82065173456659075}
+  m_CullTransparentMesh: 0
+--- !u!114 &2035646531741651786
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 82065173456659075}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 7e0689758fd8c8e4faf236660ef9ab96, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &465239218947862518
 GameObject:
   m_ObjectHideFlags: 0
@@ -1888,9 +1962,8 @@ GameObject:
   m_Component:
   - component: {fileID: 4167844827205442559}
   - component: {fileID: 4167844827205442557}
-  - component: {fileID: 4167844827205442556}
-  - component: {fileID: 4167844827205442554}
   - component: {fileID: 4167844827205442546}
+  - component: {fileID: 1800254645157554092}
   m_Layer: 5
   m_Name: Button
   m_TagString: Untagged
@@ -1908,15 +1981,16 @@ 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: []
+  m_Children:
+  - {fileID: 8307431894315046440}
   m_Father: {fileID: 7944455583227005010}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMin: {x: 1, y: 0.5}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -10, y: -10}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 20, y: 20}
+  m_SizeDelta: {x: 40, y: 40}
-  m_Pivot: {x: 1, y: 1}
+  m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &4167844827205442557
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1925,51 +1999,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4167844827205442558}
   m_CullTransparentMesh: 0
---- !u!114 &4167844827205442556
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4167844827205442558}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 7e0689758fd8c8e4faf236660ef9ab96, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &4167844827205442554
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4167844827205442558}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 97bc2ebab6563400c95b036136d26ea6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Inverse: 0
-  m_MaskInteraction: 85
-  m_UseStencil: 1
-  m_RaycastFilter: 0
 --- !u!114 &4167844827205442546
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2009,10 +2038,39 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 4167844827205442556}
+  m_TargetGraphic: {fileID: 1800254645157554092}
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &1800254645157554092
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4167844827205442558}
+  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: 0}
+  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!1 &4273405908919975550
 GameObject:
   m_ObjectHideFlags: 0
@@ -5438,12 +5496,12 @@ PrefabInstance:
     - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -5453,7 +5511,7 @@ PrefabInstance:
     - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -9
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -5648,12 +5706,12 @@ PrefabInstance:
     - target: {fileID: 5249748558008090706, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5249748558008090706, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5249748558008090706, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -5663,7 +5721,7 @@ PrefabInstance:
     - target: {fileID: 5249748558008090706, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -9
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5972488954695143433, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -5673,12 +5731,12 @@ PrefabInstance:
     - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -5688,7 +5746,7 @@ PrefabInstance:
     - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -9
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6731556475519980336, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -5733,12 +5791,12 @@ PrefabInstance:
     - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -5748,17 +5806,17 @@ PrefabInstance:
     - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -9
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -5768,7 +5826,7 @@ PrefabInstance:
     - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -2
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 9135822971364406318, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -5987,9 +6045,15 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 5321188461237024149}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &3344798044730818033 stripped
+--- !u!1 &4951052648640690816 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c,
+  m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c,
+    type: 3}
+  m_PrefabInstance: {fileID: 5321188461237024149}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &2234182990056195463 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c,
     type: 3}
   m_PrefabInstance: {fileID: 5321188461237024149}
   m_PrefabAsset: {fileID: 0}
@@ -5999,12 +6063,6 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 5321188461237024149}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &5464789140640568869 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c,
-    type: 3}
-  m_PrefabInstance: {fileID: 5321188461237024149}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &5779092891361109961 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c,
@@ -6017,15 +6075,15 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 5321188461237024149}
   m_PrefabAsset: {fileID: 0}
---- !u!224 &2234182990056195463 stripped
+--- !u!1 &3344798044730818033 stripped
-RectTransform:
+GameObject:
-  m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c,
+  m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c,
     type: 3}
   m_PrefabInstance: {fileID: 5321188461237024149}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &4951052648640690816 stripped
+--- !u!1 &5464789140640568869 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c,
+  m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c,
     type: 3}
   m_PrefabInstance: {fileID: 5321188461237024149}
   m_PrefabAsset: {fileID: 0}
@@ -6184,18 +6242,6 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 6073211655158443556}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &6749386026079657654 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c,
-    type: 3}
-  m_PrefabInstance: {fileID: 6073211655158443556}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &5594525415673429112 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c,
-    type: 3}
-  m_PrefabInstance: {fileID: 6073211655158443556}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &3745822250017908288 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c,
@@ -6208,9 +6254,9 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 6073211655158443556}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &3980532922793874755 stripped
+--- !u!1 &5594525415673429112 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c,
+  m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c,
     type: 3}
   m_PrefabInstance: {fileID: 6073211655158443556}
   m_PrefabAsset: {fileID: 0}
@@ -6220,12 +6266,24 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 6073211655158443556}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &3980532922793874755 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c,
+    type: 3}
+  m_PrefabInstance: {fileID: 6073211655158443556}
+  m_PrefabAsset: {fileID: 0}
 --- !u!224 &185106026378206774 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c,
     type: 3}
   m_PrefabInstance: {fileID: 6073211655158443556}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &6749386026079657654 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c,
+    type: 3}
+  m_PrefabInstance: {fileID: 6073211655158443556}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &4998415483215112909 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
@@ -6359,10 +6417,25 @@ PrefabInstance:
       propertyPath: m_Text
       value: Route Name
       objectReference: {fileID: 0}
+    - target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
+        type: 3}
+      propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.size
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
+        type: 3}
+      propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
+        type: 3}
+      propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: 8098460543711191387, guid: 07e45aecba1a2d542b043157aa2e9322,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: -20
+      value: -50
       objectReference: {fileID: 0}
     - target: {fileID: 8098460543711191387, guid: 07e45aecba1a2d542b043157aa2e9322,
         type: 3}
@@ -6372,7 +6445,7 @@ PrefabInstance:
     - target: {fileID: 8306171861788952873, guid: 07e45aecba1a2d542b043157aa2e9322,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: -20
+      value: -50
       objectReference: {fileID: 0}
     - target: {fileID: 8306171861788952873, guid: 07e45aecba1a2d542b043157aa2e9322,
         type: 3}

Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab

@@ -916,6 +916,80 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &1666079404136861968
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5986387743058620222}
+  - component: {fileID: 1108190590139244821}
+  - component: {fileID: 2895518778347635672}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5986387743058620222
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1666079404136861968}
+  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: 667989898749050068}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 20, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1108190590139244821
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1666079404136861968}
+  m_CullTransparentMesh: 0
+--- !u!114 &2895518778347635672
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1666079404136861968}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 7e0689758fd8c8e4faf236660ef9ab96, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &1673965681348374007
 GameObject:
   m_ObjectHideFlags: 0
@@ -2672,9 +2746,8 @@ GameObject:
   m_Component:
   - component: {fileID: 667989898749050068}
   - component: {fileID: 3398068556692691702}
-  - component: {fileID: 2024560652851735204}
-  - component: {fileID: 493883056891517441}
   - component: {fileID: 6855301250549161376}
+  - component: {fileID: 2019057423038839423}
   m_Layer: 5
   m_Name: Button
   m_TagString: Untagged
@@ -2692,15 +2765,16 @@ 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: []
+  m_Children:
+  - {fileID: 5986387743058620222}
   m_Father: {fileID: 1786430169159750715}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMin: {x: 1, y: 0.5}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -10, y: -10}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 20, y: 20}
+  m_SizeDelta: {x: 40, y: 40}
-  m_Pivot: {x: 1, y: 1}
+  m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &3398068556692691702
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -2709,51 +2783,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5948476992245059236}
   m_CullTransparentMesh: 0
---- !u!114 &2024560652851735204
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5948476992245059236}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 7e0689758fd8c8e4faf236660ef9ab96, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &493883056891517441
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5948476992245059236}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 97bc2ebab6563400c95b036136d26ea6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Inverse: 0
-  m_MaskInteraction: 85
-  m_UseStencil: 1
-  m_RaycastFilter: 0
 --- !u!114 &6855301250549161376
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2793,10 +2822,39 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 2024560652851735204}
+  m_TargetGraphic: {fileID: 2019057423038839423}
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &2019057423038839423
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5948476992245059236}
+  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: 0}
+  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!1 &5957950172520614784
 GameObject:
   m_ObjectHideFlags: 0
@@ -3652,18 +3710,18 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
---- !u!224 &1786430169159750715 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
-    type: 3}
-  m_PrefabInstance: {fileID: 3089084281570681624}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &3712583330546725488 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 1827088261433348456, guid: 07e45aecba1a2d542b043157aa2e9322,
     type: 3}
   m_PrefabInstance: {fileID: 3089084281570681624}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &1786430169159750715 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
+    type: 3}
+  m_PrefabInstance: {fileID: 3089084281570681624}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5067779267173090679
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Scripts/App.cs

@@ -54,7 +54,7 @@ public static class App
     public static IDictionary<string, Texture> TextureCache = new Dictionary<string, Texture>();
     public static Texture CurrentUserHeadTexture;
     public static RouteResult routeResult;//骑行记录向骑行场景传值
-    public static Texture DefaultRotateTexture;
+    public static Texture DefaultRotateTexture { get; set; }
     //全局用 输入框或者下拉框修改标志位
     public static bool isChanged { get; set; }
     public static string notifyContent { get; internal set; }
@@ -100,6 +100,7 @@ public static class App
     public static float canvasWidth { get; set; }
     public static string WorkoutsUrl { get; internal set; }
     public static long delayTime { get; set; }
+    public static List<OnlineUser> userList = new List<OnlineUser>();
 
     static App()
     {
@@ -109,7 +110,7 @@ public static class App
       //UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
       //TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001);
         Host = "https://wx.powerfun.com.cn/";
-        //Host = "http://192.168.0.101:5084/";
+        //Host = "http://192.168.0.101:5085/";
         UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000);
         TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001);
         Debug.unityLogger.logEnabled = false;

Assets/Scripts/Scenes/LoginController.cs

@@ -611,7 +611,7 @@ public class LoginController : BaseScene
             //}
             Debug.Log(JsonConvert.SerializeObject(locationInfo));
             var i = await ConfigHelper.thirdPartApi.GetMapImage(locationInfo);
-            var t = new Texture2D(4, 4,TextureFormat.DXT5, false);
+            var t = new Texture2D(2, 2, TextureFormat.DXT5, false);
             if (t.LoadImage(Utils.StreamToBytes(i)))
             {
                 Debug.Log("成功");
@@ -1239,10 +1239,7 @@ public class LoginController : BaseScene
         App.CurrentUser = data;
         App.RideSetting.Sensitivity = data.Sensitivity;
         //查询我参加的比赛
-        Task.Run(() =>
+        UIManager.UpdateJoinCompetition();
-        {
-            UIManager.UpdateJoinCompetition();
-        });
         //SceneManager.LoadSceneAsync("MainScene");
         StartCoroutine("LoadMain");
     }

Assets/Scripts/Scenes/MainController.cs

@@ -108,9 +108,7 @@ public class MainController : BaseScene
             //UIManager.ShowEarthPanel();
         }
 
-        Task.Run(() => {
+        UIManager.UpdateJoinCompetition();//查询当前我参加的赛事
-            UIManager.UpdateJoinCompetition();//查询当前我参加的赛事
-        });
     }
 
 

Assets/Scripts/Scenes/Ride/Competiton/CompetitionUIManager.cs

@@ -49,6 +49,7 @@ namespace Assets.Scenes.Ride.Scripts
             altitudeGraph.gameObject.SetActive(false);
             //暂停按钮禁用
             pauseButton.interactable = false;
+            InitGameObject();
         }
         protected override void Update()
         {
@@ -67,7 +68,12 @@ namespace Assets.Scenes.Ride.Scripts
         //开始骑行-加个5秒钟倒计时
         public override void StartRide()
         {
-            competitionModel = mainController.cyclingController as CompetitionModel;
+            
+        }
+
+        public void InitGameObject()
+        {
+           competitionModel = mainController.cyclingController as CompetitionModel;
 
 #if UNITY_IOS || UNITY_ANDROID
             countDownPanel = Instantiate(Resources.Load<GameObject>("UI/Prefab/Match/Mobile/CountDownPanel"), uipanel.transform);
@@ -96,7 +102,7 @@ namespace Assets.Scenes.Ride.Scripts
             miniMap.SetActive(false); //隐藏小地图
             //viewButton.gameObject.SetActive(false);//隐藏切换视角
             headPanel.SetActive(!mainController.isWatch); //隐藏海拔图观察者的头像
-            
+            competitionModel = mainController.cyclingController as CompetitionModel;
             if (competitionModel == null)
                 return;
 

Assets/Scripts/Scenes/Ride/Competiton/CountDownFactory.cs

@@ -23,13 +23,17 @@ namespace Assets.Scenes.Ride.Scripts
             CountTimer = transform.Find("Timer").GetComponent<Text>();
             TimerTitle = transform.Find("ConpetitionTimerTitle").GetComponent<Text>();
             Timer = transform.Find("ConpetitionTimer").GetComponent<Text>();
-            competitionModel = cyclingController.cyclingController as CompetitionModel;
+            
          
         }
         GameObject competitionResultPanel { get; set; }
 
         private void Update()
         {
+            if (competitionModel == null)
+            {
+                competitionModel = cyclingController.cyclingController as CompetitionModel;
+            }
             if (competitionModel != null)
             {
                 var count = competitionModel.StartCountdown();

Assets/Scripts/Scenes/Ride/Network/IService.cs

@@ -13,6 +13,8 @@ namespace Assets.Scenes.Ride.Scripts.Network
 
         void Send(byte[] dgram, int bytes);
 
+        void Disconnect();
+
         void Close();
     }
 }

Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs

@@ -90,10 +90,19 @@ namespace Assets.Scenes.Ride.Scripts
         {
             var now = DateTime.Now;
             //超过一秒没有收到消息
+            Console.WriteLine($"Heartbeat_Elapsed{(now - LastActiveTime).TotalSeconds}");
             if ((now - LastActiveTime).TotalSeconds > 1)
             {
                 onlineUserHelper.SetOnlineUser(new List<ReceiveMsgModel>());
             }
+#if UNITY_IOS
+            //超过5s没收到消息断开重连一次
+            if ((now - LastActiveTime).TotalSeconds > 5)
+            {
+                LastActiveTime = now;
+                _udpService.Disconnect();
+            }
+#endif
             if (now.Second % 20 == 0)
             {
                 //LastActiveTime = now;
@@ -158,6 +167,7 @@ namespace Assets.Scenes.Ride.Scripts
         /// </summary>
         public static void SendGizpModel()
         {
+            LastActiveTime = DateTime.Now;
             var client = App.AppVersion;
 #if UNITY_ANDROID
             client = "Unity-Android" + App.AppVersion;
@@ -258,6 +268,10 @@ namespace Assets.Scenes.Ride.Scripts
             }
             finally
             {
+                if (_udpService != null)
+                {
+                    _udpService.Close();
+                }
                 //停止计时
                 if (heartbeat != null)
                 {
@@ -386,9 +400,26 @@ namespace Assets.Scenes.Ride.Scripts
                     var ids = msgs.Where(m => onlineUsers.All(u => u.Id != m.MemberId)).Select(m => m.MemberId);
                     if (ids.Any())
                     {
-                        MapApi api = new MapApi();
+                        List<int> notCachedIds = new List<int>();
-                        var rangeUser = api.GetOnlineUserInfo(ids).data;
+                        foreach (var userId in ids)
-                        onlineUsers.AddRange(rangeUser);
+                        {
+                            var user = App.userList.Where(c => c.Id == userId).FirstOrDefault();
+                            if (user != null)
+                            {
+                                onlineUsers.Add(user);
+                            }
+                            else
+                            {
+                                notCachedIds.Add(userId);
+                            }
+                        }
+
+                        if (notCachedIds.Count > 0)
+                        {
+                            var rangeUser = ConfigHelper.mapApi.GetOnlineUserInfo(ids).data;
+                            onlineUsers.AddRange(rangeUser);
+                            App.userList.AddRange(rangeUser);
+                        }
                     }
                     foreach (var user in onlineUsers)
                     {
@@ -429,11 +460,11 @@ namespace Assets.Scenes.Ride.Scripts
                     }
                     onlineUsers.RemoveAll(u => u.IsLost);
                 }
-                catch (Exception)
+                catch (Exception ex)
                 {
-#if DEBUG
+                    Thread.Sleep(3000);
-                    throw;
+                    Debug.WriteLine(ex.Message);
-#endif
+                    //throw;
                     //return new List<OnlineUser>();
                 }
             }

Assets/Scripts/Scenes/Ride/Network/TcpService1.cs

@@ -11,6 +11,7 @@ using System.Net.Sockets;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using NetCoreServer;
 
 namespace Assets.Scenes.Ride.Scripts.Network
 {
@@ -47,15 +48,41 @@ namespace Assets.Scenes.Ride.Scripts.Network
             //_tcpClient.WriteLine(System.Text.Encoding.ASCII.GetString(dgram));
             var txt = System.Text.Encoding.ASCII.GetString(dgram);
             //Debug.WriteLine("发送："+txt);
-            _tcpClient.Send(txt);
+            try
+            {
+                _tcpClient.SendAsync(txt);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+            }
+        }
+
+        public void Disconnect()
+        {
+            try
+            {
+                _tcpClient.DisconnectAsync();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+            }
         }
 
         public void Close()
         {
-            isExit = true;
+            try
-            _tcpClient.DisconnectAndStop();
+            {
+                isExit = true;
+                _tcpClient.DisconnectAndStop();
 
-            _tcpClient = null;
+                _tcpClient = null;
+            }
+            catch(Exception e)
+            {
+                Console.WriteLine(e);
+            }      
         }
 
 
@@ -71,11 +98,15 @@ namespace Assets.Scenes.Ride.Scripts.Network
             public void DisconnectAndStop()
             {
                 _stop = true;
-                DisconnectAsync();
+                Task.Run(() =>
-                while (IsConnected)
                 {
-                    Thread.Yield();
+                    DisconnectAsync();
-                }
+                });
+                
+                //while (IsConnected)
+                //{
+                //    Thread.Yield();
+                //}
             }
 
             protected override void OnConnected()
@@ -87,7 +118,7 @@ namespace Assets.Scenes.Ride.Scripts.Network
             protected override void OnDisconnected()
             {
                 //base.OnDisconnected();
-                Debug.WriteLine("tcp断线，3秒后重连");
+                Console.WriteLine("tcp断线，3秒后重连");
                 Thread.Sleep(3000);
 
                 if (!_stop)
@@ -172,10 +203,10 @@ namespace Assets.Scenes.Ride.Scripts.Network
                 //Debug.WriteLine("收到：" + returnData+"\r\n");
                 //System.IO.File.AppendAllText(System.Environment.CurrentDirectory + "接收到的数据.txt", returnData.Trim().Replace("\0", "")+"\r\n", Encoding.UTF8);
             }
-
             protected override void OnError(SocketError error)
             {
                 //base.OnError(error);
+                Console.WriteLine("出错后重启");
                 Debug.WriteLine(error);
             }
         }

Assets/Scripts/Scenes/Ride/Network/UdpService.cs

@@ -84,6 +84,10 @@ namespace Assets.Scenes.Ride.Scripts.Network
             udpClient?.Send(dgram, bytes);
         }
 
+        public void Disconnect()
+        {
+        }
+
         public void Close()
         {
             isExit = true;

Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs

@@ -113,7 +113,7 @@ namespace Assets.Scenes.Ride.Scripts
         protected virtual void Start()
         {
             InitData();//初始
-            RenderChart();//渲染海拔图
+         
         }
         Text totalDistanceCompetition { get; set; }
         GameObject distanceIconCompetition { get; set; }
@@ -318,6 +318,7 @@ namespace Assets.Scenes.Ride.Scripts
                 shadowButton.enabled = true;
                 shadowButton.interactable = true;
             }
+            RenderChart();//渲染海拔图
             //默认地图3d/2d
             DefaultView(routeInstance);
         }

Assets/Scripts/Scenes/Ride/Scripts/ChartDataSourceScript.cs

@@ -32,6 +32,8 @@ namespace Assets.Scenes.Ride.Scripts
 
         public double GetCurrentStart(int currentIndex)
         {
+            if (currentIndex == 0)
+                return 0;
             int i = currentIndex / targetPoints;
             int max = mData.Count() - targetPoints;
             var current = i * targetPoints;
@@ -157,14 +159,17 @@ namespace Assets.Scenes.Ride.Scripts
         }
         public int GetViewIndex(int index)
         {
-            foreach (var item in pointMap)
+            if (graph == null)
-            {
+                return index;
-                if (item.Key.Contains(index))
+            return graph.DataSource.GetViewIndex(index, Category);
-                {
+            //foreach (var item in pointMap)
-                    return item.Value;
+            //{
-                }
+            //    if (item.Key.Contains(index))
-            }
+            //    {
-            return index;
+            //        return item.Value;
+            //    }
+            //}
+            //return index;
         }
 
         private IDictionary<IList<int>, int> pointMap = new Dictionary<IList<int>, int>();
@@ -238,6 +243,10 @@ namespace Assets.Scenes.Ride.Scripts
                 return;
             }
             mData = data;
+            if (targetPoints > mData.Count)
+            {
+                targetPoints = mData.Count;
+            }
             LoadPage(currentPagePosition); // load the page at position 0
         }
 

Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs

@@ -89,6 +89,7 @@ public class CyclingController : DeviceServiceMonoBase
 
     void OnDestroy()
     {
+        MapUDPService.Dispose();
         Resources.UnloadUnusedAssets();
         GC.Collect();
     }
@@ -510,7 +511,7 @@ public class CyclingController : DeviceServiceMonoBase
 #if UNITY_EDITOR
         check = true;
 #endif
-        if (check)
+        if (check || isWatch)
         {
             singleUIManager.StartRide();
             transform.Find("UI/Panel(Clone)/ToolBarPanel/StartOrPauseButton").GetComponent<Button>().enabled = true;
@@ -521,7 +522,7 @@ public class CyclingController : DeviceServiceMonoBase
             transform.Find("UI/Panel(Clone)/ToolBarPanel/StartOrPauseButton").GetComponent<Button>().enabled = false;
             transform.Find("UI/Panel(Clone)/ToolBarPanel/SettingButton").GetComponent<Button>().enabled = false;
             Utils.showToast(null, "Please connect the device!", duration: int.MaxValue, isLowest: true
-            , stopFunc: () => !(!CheckAnt() && !isWatch) || transform.Find("UI/Panel(Clone)/SelectPlayer").gameObject.activeInHierarchy
+            , stopFunc: () => isWatch || CheckAnt() || transform.Find("UI/Panel(Clone)/SelectPlayer").gameObject.activeInHierarchy
             , endCallback: () => 
             {
                 if (!transform.Find("UI/Panel(Clone)/SelectPlayer").gameObject.activeInHierarchy) 

Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs

@@ -61,7 +61,7 @@ namespace Assets.Scenes.Ride.Scripts
 				weight = App.CurrentUser.Weight;
 				bicycleWeight = App.CurrentUser.BicycleWeight;
 #if UNITY_EDITOR
-                power = 343;
+                power = 143;
 #endif
                 mainController.TrackResistance(currentSlope * App.RideSetting.Sensitivity / 100);
 			}

Assets/Scripts/UI/Prefab/Device/DeviceView.cs

@@ -70,10 +70,12 @@ public class DeviceView : MonoBehaviour
         mSearchButton = unconnectionPanel.transform.Find("SearchButton").gameObject;
         mPairButton = unconnectionPanel.transform.Find("PairButton").gameObject;
         searchState = unconnectionPanel.transform.Find("SearchState").GetComponent<Text>();
-        unconnectionButton = unconnectionPanel.GetComponent<Button>();
         mPairButton.SetActive(false);
         connectionPanel = this.transform.Find("ConnectionPanel").gameObject;
+#if UNITY_IOS || UNITY_ANDROID
+        unconnectionButton = unconnectionPanel.GetComponent<Button>();
         connectionButton = connectionPanel.GetComponent<Button>();
+#endif        
         var material = Instantiate(Resources.Load<Material>("UI/Material/RoundedCornersTextureMaterial"));        
         var rect = ((RectTransform)transform).rect;
         material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, rect.height * 0.2f, 0));
@@ -125,7 +127,7 @@ public class DeviceView : MonoBehaviour
         title.text = GetTitle();
 
         connectionPanel.SetActive(false);
-
+#if UNITY_IOS || UNITY_ANDROID
         UIManager.AddEvent(unconnectionButton.gameObject, EventTriggerType.PointerClick, new UnityAction<UnityEngine.EventSystems.BaseEventData>(e =>
         {
             if (!mPairButton.activeSelf)
@@ -134,13 +136,13 @@ public class DeviceView : MonoBehaviour
             }
             connectButtonClick();
         }));
-
+#endif
 
         UIManager.AddEvent(mPairButton, EventTriggerType.PointerClick, new UnityAction<UnityEngine.EventSystems.BaseEventData>(e =>
         {
             connectButtonClick();
         }));
-
+#if UNITY_IOS || UNITY_ANDROID
         UIManager.AddEvent(connectionButton.gameObject, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction<BaseEventData>(e => {
             if (!connectionPanel.activeSelf)
             {
@@ -148,6 +150,7 @@ public class DeviceView : MonoBehaviour
             }
             mDisconnectButtonClick();
         }));
+#endif
 
 
         UIManager.AddEvent(mDisconnectButton, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction<BaseEventData>(e => {
@@ -283,6 +286,7 @@ public class DeviceView : MonoBehaviour
             else {
                 hasDevice = App.MainDeviceAdapter.GetDevices().Any(d => d.Sensor == SensorType);
             }
+            Debug.Log(hasDevice);
             if (hasDevice)
             {
                 mSearchButton.SetActive(false);

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

@@ -19,6 +19,7 @@ namespace Assets.Scenes.Ride.Scripts
 
         public int CompetitionId { get; set;  }
         public int RouteId { get; set; }
+        public string SceneName { get; set; }
 
         protected override void Awake()
         {
@@ -57,11 +58,17 @@ namespace Assets.Scenes.Ride.Scripts
             Content.text = content;
             CompetitionId = competitionId;
             RouteId = routeId;
+            SceneName = sceneName;
         }
 
         //切换到当前用户视角
         public void Go(BaseEventData baseEventData)
         {
+            if (SceneName.Equals("Ride"))
+            {
+                var playerController = FindObjectOfType<PlayerController>();
+                playerController.Upload();
+            }
             App.CompetitionIdList.Add(CompetitionId);
             App.CompetionId = CompetitionId;
             App.RouteIdParam = RouteId;

Assets/Scripts/UI/Prefab/Race/RaceListScript.cs

@@ -179,12 +179,12 @@ public class RaceListScript : RaceScript
             {
                 var t = searchInput.GetComponent<InputField>().text;
                 raceName = t;
-                //onEndEdit();
-            });
-            searchInput.GetComponent<InputField>().onEndEdit.AddListener((string s) => 
-            {
                 onEndEdit();
             });
+            //searchInput.GetComponent<InputField>().onEndEdit.AddListener((string s) => 
+            //{
+            //    onEndEdit();
+            //});
         }
         btnReturn = transform.Find("SwitchMode/BtnReturn");
         if (btnReturn != null) 

Assets/Scripts/UIManager.cs

@@ -416,7 +416,7 @@ public class UIManager : MonoBehaviour
     {
         if (App.CurrentScene.Equals("Ride"))
         {
-            ShowRaceAlertPanel();
+            var mRaceAlertPanel = ShowRaceAlertPanel();
             if (mRaceAlertPanel != null)
             {
                 mRaceAlertPanel.Set(e.StartTime.ToLocalTime(), Now.GetDateTime(), e.title, e.SceneName, e.competitionId, e.routeId);
@@ -717,9 +717,11 @@ public class UIManager : MonoBehaviour
         UIManager.Show(UIManager.Instance.EditUserPanel, UIManager.Instance.MainPanel);
     }
 
-    public static void ShowRaceAlertPanel()
+    public static RaceAlertController ShowRaceAlertPanel()
     {
-        UIManager.Show(UIManager.Instance.RaceAlertPanel, null, true);
+        var raceAlertPanel = UIManager.Instance.RaceAlertPanel;
+        UIManager.Show(raceAlertPanel, null, true);
+        return raceAlertPanel;
     }
 
     public static RaceAlertController ShowRaceAlertBanelPanel()

Assets/Scripts/Utils/Utils.cs

@@ -432,10 +432,29 @@ namespace Assets.Scripts
         }
         /*获取最顶层对象*/
         /*Texture相关*/
+        public static Texture2D DeCompress(this Texture2D source)
+        {
+            RenderTexture renderTex = RenderTexture.GetTemporary(
+                        source.width,
+                        source.height,
+                        0,
+                        RenderTextureFormat.Default,
+                        RenderTextureReadWrite.Linear);
+
+            Graphics.Blit(source, renderTex);
+            RenderTexture previous = RenderTexture.active;
+            RenderTexture.active = renderTex;
+            Texture2D readableText = new Texture2D(source.width, source.height);
+            readableText.ReadPixels(new Rect(0, 0, renderTex.width, renderTex.height), 0, 0);
+            readableText.Apply();
+            RenderTexture.active = previous;
+            RenderTexture.ReleaseTemporary(renderTex);
+            return readableText;
+        }
         public static void WriteTextureToPlayerPrefs(string tag, Texture2D tex)
         {
             // if texture is png otherwise you can use tex.EncodeToJPG().
-            byte[] texByte = tex.EncodeToPNG();
+            byte[] texByte = tex.DeCompress().EncodeToJPG();
 
             // convert byte array to base64 string
             string base64Tex = System.Convert.ToBase64String(texByte);

ProjectSettings/ProjectSettings.asset

@@ -86,7 +86,7 @@ PlayerSettings:
   submitAnalytics: 1
   usePlayerLog: 1
   bakeCollisionMeshes: 0
-  forceSingleInstance: 0
+  forceSingleInstance: 1
   useFlipModelSwapchain: 1
   resizableWindow: 0
   useMacAppStoreValidation: 0
@@ -133,7 +133,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 2.0.7
+  bundleVersion: 2.0.8
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -180,7 +180,7 @@ PlayerSettings:
     Android: com.ZhiXingPai.PowerFunUnity
   buildNumber:
     iPhone: 2.0.7.0
-  AndroidBundleVersionCode: 9
+  AndroidBundleVersionCode: 11
   AndroidMinSdkVersion: 24
   AndroidTargetSdkVersion: 30
   AndroidPreferredInstallLocation: 1
@@ -256,7 +256,7 @@ PlayerSettings:
   clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea
   templatePackageId: com.unity.template.3d@4.2.8
   templateDefaultScene: Assets/Scenes/SampleScene.unity
-  AndroidTargetArchitectures: 3
+  AndroidTargetArchitectures: 1
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
   AndroidKeystoreName: '{inproject}: Assets/Plugins/Android/powerfun.keystore'
@@ -868,7 +868,7 @@ PlayerSettings:
   platformArchitecture:
     iPhone: 1
   scriptingBackend:
-    Android: 1
+    Android: 0
     Standalone: 0
   il2cppCompilerConfiguration:
     Standalone: 0