2.0.8发布

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

@@ -565,23 +565,6 @@ 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,79 +1,5 @@
 %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
@@ -1962,8 +1888,9 @@ 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
@@ -1981,16 +1908,15 @@ 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: 0.5}
+  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: -10, y: -10}
-  m_SizeDelta: {x: 40, y: 40}
+  m_SizeDelta: {x: 20, y: 20}
-  m_Pivot: {x: 1, y: 0.5}
+  m_Pivot: {x: 1, y: 1}
 --- !u!222 &4167844827205442557
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1999,6 +1925,51 @@ 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
@@ -2038,39 +2009,10 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 1800254645157554092}
+  m_TargetGraphic: {fileID: 4167844827205442556}
   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
@@ -5496,12 +5438,12 @@ PrefabInstance:
     - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -5511,7 +5453,7 @@ PrefabInstance:
     - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -9
       objectReference: {fileID: 0}
     - target: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -5706,12 +5648,12 @@ PrefabInstance:
     - target: {fileID: 5249748558008090706, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5249748558008090706, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5249748558008090706, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -5721,7 +5663,7 @@ PrefabInstance:
     - target: {fileID: 5249748558008090706, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -9
       objectReference: {fileID: 0}
     - target: {fileID: 5972488954695143433, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -5731,12 +5673,12 @@ PrefabInstance:
     - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -5746,7 +5688,7 @@ PrefabInstance:
     - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -9
       objectReference: {fileID: 0}
     - target: {fileID: 6731556475519980336, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -5791,12 +5733,12 @@ PrefabInstance:
     - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -5806,17 +5748,17 @@ PrefabInstance:
     - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -9
       objectReference: {fileID: 0}
     - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -5826,7 +5768,7 @@ PrefabInstance:
     - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -2
       objectReference: {fileID: 0}
     - target: {fileID: 9135822971364406318, guid: a1999d0576fee6248a9c5a507ae8d10e,
         type: 3}
@@ -6045,15 +5987,9 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 5321188461237024149}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &4951052648640690816 stripped
+--- !u!1 &3344798044730818033 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c,
+  m_CorrespondingSourceObject: {fileID: 7472514873862735972, 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}
@@ -6063,6 +5999,12 @@ 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,
@@ -6075,15 +6017,15 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 5321188461237024149}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &3344798044730818033 stripped
+--- !u!224 &2234182990056195463 stripped
-GameObject:
+RectTransform:
-  m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c,
+  m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c,
     type: 3}
   m_PrefabInstance: {fileID: 5321188461237024149}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &5464789140640568869 stripped
+--- !u!1 &4951052648640690816 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c,
+  m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c,
     type: 3}
   m_PrefabInstance: {fileID: 5321188461237024149}
   m_PrefabAsset: {fileID: 0}
@@ -6242,6 +6184,18 @@ 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,
@@ -6254,9 +6208,9 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 6073211655158443556}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &5594525415673429112 stripped
+--- !u!1 &3980532922793874755 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c,
+  m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c,
     type: 3}
   m_PrefabInstance: {fileID: 6073211655158443556}
   m_PrefabAsset: {fileID: 0}
@@ -6266,24 +6220,12 @@ 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,
@@ -6417,25 +6359,10 @@ 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: -50
+      value: -20
       objectReference: {fileID: 0}
     - target: {fileID: 8098460543711191387, guid: 07e45aecba1a2d542b043157aa2e9322,
         type: 3}
@@ -6445,7 +6372,7 @@ PrefabInstance:
     - target: {fileID: 8306171861788952873, guid: 07e45aecba1a2d542b043157aa2e9322,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: -50
+      value: -20
       objectReference: {fileID: 0}
     - target: {fileID: 8306171861788952873, guid: 07e45aecba1a2d542b043157aa2e9322,
         type: 3}

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

@@ -916,80 +916,6 @@ 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
@@ -2746,8 +2672,9 @@ 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
@@ -2765,16 +2692,15 @@ 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: 0.5}
+  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: -10, y: -10}
-  m_SizeDelta: {x: 40, y: 40}
+  m_SizeDelta: {x: 20, y: 20}
-  m_Pivot: {x: 1, y: 0.5}
+  m_Pivot: {x: 1, y: 1}
 --- !u!222 &3398068556692691702
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -2783,6 +2709,51 @@ 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
@@ -2822,39 +2793,10 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 2019057423038839423}
+  m_TargetGraphic: {fileID: 2024560652851735204}
   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
@@ -3710,18 +3652,18 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
---- !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!1 &3712583330546725488 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1827088261433348456, guid: 07e45aecba1a2d542b043157aa2e9322,
+    type: 3}
+  m_PrefabInstance: {fileID: 3089084281570681624}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5067779267173090679
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Scripts/App.cs

@@ -100,7 +100,6 @@ 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()
     {
@@ -110,7 +109,6 @@ 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: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

@@ -1239,7 +1239,10 @@ public class LoginController : BaseScene
         App.CurrentUser = data;
         App.RideSetting.Sensitivity = data.Sensitivity;
         //查询我参加的比赛
+        Task.Run(() =>
+        {
             UIManager.UpdateJoinCompetition();
+        });
         //SceneManager.LoadSceneAsync("MainScene");
         StartCoroutine("LoadMain");
     }

Assets/Scripts/Scenes/MainController.cs

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

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

@@ -49,7 +49,6 @@ namespace Assets.Scenes.Ride.Scripts
             altitudeGraph.gameObject.SetActive(false);
             //暂停按钮禁用
             pauseButton.interactable = false;
-            InitGameObject();
         }
         protected override void Update()
         {
@@ -67,11 +66,6 @@ namespace Assets.Scenes.Ride.Scripts
         GameObject watchPanel { get; set; }
         //开始骑行-加个5秒钟倒计时
         public override void StartRide()
-        {
-            
-        }
-
-        public void InitGameObject()
         {
             competitionModel = mainController.cyclingController as CompetitionModel;
 
@@ -102,7 +96,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,17 +23,13 @@ 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,8 +13,6 @@ namespace Assets.Scenes.Ride.Scripts.Network
 
         void Send(byte[] dgram, int bytes);
 
-        void Disconnect();
-
         void Close();
     }
 }

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

@@ -90,19 +90,10 @@ 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;
@@ -167,7 +158,6 @@ 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;
@@ -268,10 +258,6 @@ namespace Assets.Scenes.Ride.Scripts
             }
             finally
             {
-                if (_udpService != null)
-                {
-                    _udpService.Close();
-                }
                 //停止计时
                 if (heartbeat != null)
                 {
@@ -400,26 +386,9 @@ namespace Assets.Scenes.Ride.Scripts
                     var ids = msgs.Where(m => onlineUsers.All(u => u.Id != m.MemberId)).Select(m => m.MemberId);
                     if (ids.Any())
                     {
-                        List<int> notCachedIds = new List<int>();
+                        MapApi api = new MapApi();
-                        foreach (var userId in ids)
+                        var rangeUser = api.GetOnlineUserInfo(ids).data;
-                        {
-                            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)
                     {
@@ -460,11 +429,11 @@ namespace Assets.Scenes.Ride.Scripts
                     }
                     onlineUsers.RemoveAll(u => u.IsLost);
                 }
-                catch (Exception ex)
+                catch (Exception)
                 {
-                    Thread.Sleep(3000);
+#if DEBUG
-                    Debug.WriteLine(ex.Message);
+                    throw;
-                    //throw;
+#endif
                     //return new List<OnlineUser>();
                 }
             }

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

@@ -11,7 +11,6 @@ using System.Net.Sockets;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using NetCoreServer;
 
 namespace Assets.Scenes.Ride.Scripts.Network
 {
@@ -48,42 +47,16 @@ 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);
-            try
+            _tcpClient.Send(txt);
-            {
-                _tcpClient.SendAsync(txt);
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e);
-            }
-        }
-
-        public void Disconnect()
-        {
-            try
-            {
-                _tcpClient.DisconnectAsync();
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e);
-            }
         }
 
         public void Close()
-        {
-            try
         {
             isExit = true;
             _tcpClient.DisconnectAndStop();
 
             _tcpClient = null;
         }
-            catch(Exception e)
-            {
-                Console.WriteLine(e);
-            }      
-        }
 
 
         class PfTcpClient : NetCoreServer.TcpClient
@@ -98,15 +71,11 @@ namespace Assets.Scenes.Ride.Scripts.Network
             public void DisconnectAndStop()
             {
                 _stop = true;
-                Task.Run(() =>
-                {
                 DisconnectAsync();
-                });
+                while (IsConnected)
-                
+                {
-                //while (IsConnected)
+                    Thread.Yield();
-                //{
+                }
-                //    Thread.Yield();
-                //}
             }
 
             protected override void OnConnected()
@@ -118,7 +87,7 @@ namespace Assets.Scenes.Ride.Scripts.Network
             protected override void OnDisconnected()
             {
                 //base.OnDisconnected();
-                Console.WriteLine("tcp断线，3秒后重连");
+                Debug.WriteLine("tcp断线，3秒后重连");
                 Thread.Sleep(3000);
 
                 if (!_stop)
@@ -203,10 +172,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,10 +84,6 @@ 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,7 +318,6 @@ namespace Assets.Scenes.Ride.Scripts
                 shadowButton.enabled = true;
                 shadowButton.interactable = true;
             }
-            RenderChart();//渲染海拔图
             //默认地图3d/2d
             DefaultView(routeInstance);
         }

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

@@ -32,8 +32,6 @@ 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;
@@ -159,17 +157,14 @@ namespace Assets.Scenes.Ride.Scripts
         }
         public int GetViewIndex(int index)
         {
-            if (graph == null)
+            foreach (var item in pointMap)
+            {
+                if (item.Key.Contains(index))
+                {
+                    return item.Value;
+                }
+            }
             return index;
-            return graph.DataSource.GetViewIndex(index, Category);
-            //foreach (var item in pointMap)
-            //{
-            //    if (item.Key.Contains(index))
-            //    {
-            //        return item.Value;
-            //    }
-            //}
-            //return index;
         }
 
         private IDictionary<IList<int>, int> pointMap = new Dictionary<IList<int>, int>();
@@ -243,10 +238,6 @@ 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,7 +89,6 @@ public class CyclingController : DeviceServiceMonoBase
 
     void OnDestroy()
     {
-        MapUDPService.Dispose();
         Resources.UnloadUnusedAssets();
         GC.Collect();
     }

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

@@ -19,7 +19,6 @@ namespace Assets.Scenes.Ride.Scripts
 
         public int CompetitionId { get; set;  }
         public int RouteId { get; set; }
-        public string SceneName { get; set; }
 
         protected override void Awake()
         {
@@ -58,17 +57,11 @@ 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"))
         {
-            var mRaceAlertPanel = ShowRaceAlertPanel();
+            ShowRaceAlertPanel();
             if (mRaceAlertPanel != null)
             {
                 mRaceAlertPanel.Set(e.StartTime.ToLocalTime(), Now.GetDateTime(), e.title, e.SceneName, e.competitionId, e.routeId);
@@ -717,11 +717,9 @@ public class UIManager : MonoBehaviour
         UIManager.Show(UIManager.Instance.EditUserPanel, UIManager.Instance.MainPanel);
     }
 
-    public static RaceAlertController ShowRaceAlertPanel()
+    public static void ShowRaceAlertPanel()
     {
-        var raceAlertPanel = UIManager.Instance.RaceAlertPanel;
+        UIManager.Show(UIManager.Instance.RaceAlertPanel, null, true);
-        UIManager.Show(raceAlertPanel, null, true);
-        return raceAlertPanel;
     }
 
     public static RaceAlertController ShowRaceAlertBanelPanel()

ProjectSettings/EditorBuildSettings.asset

@@ -6,8 +6,8 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/Scenes/Login-Mobile.unity
+    path: Assets/Scenes/Login.unity
-    guid: 4be878da00cf764499988cf403faf94d
+    guid: 6dce3e17997730b4492f91dd8fede429
   - enabled: 1
     path: Assets/Scenes/MainScene.unity
     guid: ab586a3c1bacd4a48a55178eb06fe0cc

ProjectSettings/GraphicsSettings.asset

@@ -38,7 +38,6 @@ 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}

ProjectSettings/ProjectSettings.asset

@@ -180,7 +180,7 @@ PlayerSettings:
     Android: com.ZhiXingPai.PowerFunUnity
   buildNumber:
     iPhone: 2.0.7.0
-  AndroidBundleVersionCode: 11
+  AndroidBundleVersionCode: 10
   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: 1
+  AndroidTargetArchitectures: 3
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
   AndroidKeystoreName: '{inproject}: Assets/Plugins/Android/powerfun.keystore'
@@ -868,7 +868,7 @@ PlayerSettings:
   platformArchitecture:
     iPhone: 1
   scriptingBackend:
-    Android: 0
+    Android: 1
     Standalone: 0
   il2cppCompilerConfiguration:
     Standalone: 0