细节调整

Assets/Mapbox/User.meta

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

Assets/Resources/Sound.meta

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

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

@@ -487,6 +487,130 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 0
+--- !u!1 &394191259421430988
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7596543225826370523}
+  - component: {fileID: 1616657703676474664}
+  m_Layer: 5
+  m_Name: RightMatch
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &7596543225826370523
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 394191259421430988}
+  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: 7333143462917461189}
+  - {fileID: 4620552528893032614}
+  m_Father: {fileID: 4085630360285719620}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 482, y: 0}
+  m_SizeDelta: {x: -964, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1616657703676474664
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 394191259421430988}
+  m_CullTransparentMesh: 0
+--- !u!1 &3545011464969782806
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7333143462917461189}
+  - component: {fileID: 6410137277827500634}
+  - component: {fileID: 1124194809507677811}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7333143462917461189
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3545011464969782806}
+  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: 7596543225826370523}
+  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: -32}
+  m_SizeDelta: {x: 31, y: 17}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &6410137277827500634
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3545011464969782806}
+  m_CullTransparentMesh: 0
+--- !u!114 &1124194809507677811
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3545011464969782806}
+  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.25490198, g: 0.25882354, b: 0.31764707, 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: 12
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Rank
 --- !u!1 &3956325779266006875
 GameObject:
   m_ObjectHideFlags: 0
@@ -677,6 +801,7 @@ RectTransform:
   - {fileID: 8504920722886678745}
   - {fileID: 4085630360693585359}
   - {fileID: 5607096041038795515}
+  - {fileID: 7596543225826370523}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1228,6 +1353,84 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: <color=#5c5c6e>Riding time:</color>00:18:52
+--- !u!1 &5077901321725402009
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4620552528893032614}
+  - component: {fileID: 5939672542218804338}
+  - component: {fileID: 2716823427977179675}
+  m_Layer: 5
+  m_Name: Value
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4620552528893032614
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5077901321725402009}
+  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: 7596543225826370523}
+  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: -48}
+  m_SizeDelta: {x: 0, y: 60}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &5939672542218804338
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5077901321725402009}
+  m_CullTransparentMesh: 0
+--- !u!114 &2716823427977179675
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5077901321725402009}
+  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.36078432, g: 0.36078432, b: 0.43137255, 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: 52
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 5
+    m_MaxSize: 52
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 08
 --- !u!1 &5607096041038795514
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/Apis/MapInterruptRecordApi.cs

@@ -24,27 +24,9 @@ namespace Assets.Scripts.Apis
             return jsonResult;
         }
 
-        public JsonResult<List<RouteResult>> GetMapInterruptRecord(string keyword, int pageIndex, int pageSize)
+        public async Task<JsonResult<List<RouteResult>>> GetMapInterruptRecord(string keyword, int pageIndex, int pageSize, string type)
         {
-            var result = new JsonResult<List<RouteResult>>()
+            return await GetAsync<JsonResult<List<RouteResult>>>($"MapRecord/v1/GetList?keyword={keyword}&pageIndex={pageIndex}&pageSize={pageSize}&type={type}");
-            {
-                result = false,
-                data = null,
-                errMsg = ""
-            };
-            try
-            {
-                var r = Get<List<RouteResult>>($"MapRecord/GetMapInterruptRecord?keyword={keyword}&pageIndex={pageIndex}&pageSize={pageSize}");
-                result.result = true;
-                result.data = r;
-                return result;
-            }
-            catch (Exception e)
-            {
-                Debug.LogError(e.ToString());
-                return result;
-            }
-            
         }
         /// <summary>
         /// 通过ID获取设备商

Assets/Scripts/Apis/UserApi.cs

@@ -108,6 +108,7 @@ namespace Assets.Scripts.Apis
             try
             {
                 ret = await PostAsync<JsonResult<UserResultModel>>("NoAuth/v1/Register", param);
+                ret.data.cookie = cookies[0].Value;
             }
             catch (Exception ex)
             {
@@ -139,9 +140,17 @@ namespace Assets.Scripts.Apis
             var r = await PostAsync<JsonResult<object>>("NoAuth/OnWebWxLoginCheckUnionId", new { unionId, openId });
             if (r.result)
             {
-                var data = JObject.FromObject(r.data).ToObject<UserResultModel>();
+                var data = JObject.FromObject(r.data);
-                data.cookie = cookies[0].Value;
+                if (data.Value<string>("success") != null && data.Value<string>("success") == "False")
-                r.data = data;
+                {
+                    return r;
+                }
+                else 
+                {
+                    var user = data.ToObject<UserResultModel>();
+                    user.cookie = cookies[0].Value;
+                    r.data = user;
+                }
             }
             return r;
         }

Assets/Scripts/App.cs

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

Assets/Scripts/Scenes/LoginController.cs

@@ -325,8 +325,8 @@ public class LoginController : MonoBehaviour
         {
             wxLogin2.Find("return").GetComponent<Button>().onClick.AddListener(() => {
                 wxLogin2.gameObject.SetActive(false);
-                wxLogin3.gameObject.SetActive(false);
+                //wxLogin3.gameObject.SetActive(false);
-                pageNums = 3;
+                pageNums = 4;
                 Canvas.ForceUpdateCanvases();
                 StartScrollPanel(1); 
             });
@@ -347,7 +347,8 @@ public class LoginController : MonoBehaviour
                 else 
                 {
                     signContainer.gameObject.SetActive(true);
-                    wxLogin3.gameObject.SetActive(false);
+                    pageNums = 4;
+                    //wxLogin3.gameObject.SetActive(false);
                     StartScrollPanel(1);
                 }
             });
@@ -588,14 +589,7 @@ public class LoginController : MonoBehaviour
         }
         if (r!=null && r.result)
         {
-            if (signType == 1)
+            RefreshWx3(r.data);
-            {
-                RefreshWx3(r.data);
-            }
-            else 
-            {
-                userResult = r.data;
-            }
             LoadInfo();
             StartScrollSign(1);
         }
@@ -643,8 +637,7 @@ public class LoginController : MonoBehaviour
         }
         else
         {
-            App.CurrentUser = userResult;
+            this.StartScrollPanel(3);
-            SceneManager.LoadScene("MainScene");
         }
         //throw new NotImplementedException();
     }
@@ -691,7 +684,10 @@ public class LoginController : MonoBehaviour
         userResult.Unit = _units.SelectedIndex;
         userResult.Weight = int.Parse(_weight.Text);
         userResult.Height = int.Parse(_height.Text);
-        userResult.Nickname = userResult.Phone;
+        if (string.IsNullOrEmpty(userResult.Nickname)) 
+        {
+            userResult.Nickname = userResult.Phone;
+        }
         var r = await ConfigHelper.userApi.Update(userResult);
         return r.result;
         //userResult.Birthday.v
@@ -699,8 +695,8 @@ public class LoginController : MonoBehaviour
     private void goLoginReturn2()
     {
         if (wxLogin2.gameObject.activeSelf) wxLogin2.gameObject.SetActive(false);
-        if (wxLogin3.gameObject.activeSelf) wxLogin3.gameObject.SetActive(false);
+        //if (wxLogin3.gameObject.activeSelf) wxLogin3.gameObject.SetActive(false);
-        pageNums = 3;
+        pageNums = 4;
         Canvas.ForceUpdateCanvases();
         this.StartScrollPanel(1);
     }
@@ -744,7 +740,7 @@ public class LoginController : MonoBehaviour
         }
         else 
         {
-            pageNums = 3;
+            pageNums = 4;
             wxLogin2.gameObject.SetActive(false);
             
             signPage1.Find("next").gameObject.SetActive(true);
@@ -877,7 +873,7 @@ public class LoginController : MonoBehaviour
         scrollPanelIndex = index;
         startScrollPanel = true;
     }
-    private int pageNums = 3;
+    private int pageNums = 4;
     private void goScrollPanel()
     {
         var index = scrollPanelIndex;

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

@@ -19,11 +19,19 @@ public class QuickLoginScroll : MonoBehaviour
         //Initial();
         if (L != null)
         {
-            L.onClick.AddListener(goLeft);
+            UIManager.AddEvent(L.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick,(b)=> 
+            {
+                goLeft();
+            });
+            //L.onClick.AddListener(goLeft);
         }
         if (R != null)
         {
-            R.onClick.AddListener(goRight);
+            UIManager.AddEvent(R.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, (b) =>
+            {
+                goRight();
+            });
+            //R.onClick.AddListener(goRight);
         }
     }
     public void Initial() 

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

@@ -23,46 +23,40 @@ public class QuickLoginUser : MonoBehaviour
     {
         if (user == null) return;
         this.top = top;
-        transform.GetComponent<Button>().onClick.AddListener(async () => 
+        UIManager.AddEvent(gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, (b) =>
         {
-            ApiBase.SetCookie(user.Cookie);
+            goMain();
-            var r = await ConfigHelper.userApi.QuickLogin();
-            if (r.result)
-            {
-                //
-                top.GetComponent<LoginController>().SaveInfo(r.data);
-                App.CurrentUser = r.data;
-                //ConfigHelper.CurrentUser = r.data.Value<UserResultModel>("user");
-                //ConfigHelper.CurrentUser = re;
-                //var usermodel = r.data.Value<JObject>("user");
-                //App.CurrentUser = new UserModel
-                //{
-                //    NickName = usermodel.Value<string>("NickName"),
-                //    Ftp = usermodel.Value<int>("FTP"),
-                //    Weight = usermodel.Value<double>("Weight"),
-                //    BicycleWeight = usermodel.Value<double>("BicycleWeight"),
-                //    Carlories = "",
-                //    Avatar = usermodel.Value<string>("WxHeadImg"),
-                //    Distance = 0,
-                //    Climb = "",
-                //};
-
-                SceneManager.LoadScene("MainScene");
-            }
-            else 
-            {
-                Utils.showToast(gameObject, r.errMsg);
-            }
         });
+        //transform.GetComponent<Button>().onClick.AddListener();
         this.user = user;
         Utils.DisplayImage(StartCoroutine, transform.Find("Avatar").GetComponent<RawImage>(),user.Avatar);
         transform.Find("NickNameText").GetComponent<Text>().text = user.NickName;
-        transform.Find("BtnDelete").GetComponent<Button>().onClick.AddListener(DestroySelf);
+        UIManager.AddEvent(transform.Find("BtnDelete").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, (e) =>
+         {
+             DestroySelf();
+         });
+        //transform.Find("BtnDelete").GetComponent<Button>().onClick.AddListener(DestroySelf);
     }
     // Update is called once per frame
     void Update()
     {
         
+    }
+    async void goMain() 
+    {
+        ApiBase.SetCookie(user.Cookie);
+        var r = await ConfigHelper.userApi.QuickLogin();
+        if (r.result)
+        {
+            top.GetComponent<LoginController>().SaveInfo(r.data);
+            App.CurrentUser = r.data;
+
+            SceneManager.LoadScene("MainScene");
+        }
+        else
+        {
+            Utils.showToast(gameObject, r.errMsg);
+        }
     }
     private void OnDestroy()
     {

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

@@ -18,10 +18,14 @@ public class UserInfoController : PFUIPanel
 
         Button exitBtn = this.transform.Find("InfoPanel").Find("Button").GetComponent<Button>();
 
-        exitBtn.onClick.AddListener(() =>
+        UIManager.AddEvent(exitBtn.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, (b) =>
         {
             UIManager.ShowHomePanel();
         });
+        //exitBtn.onClick.AddListener(() =>
+        //{
+        //    UIManager.ShowHomePanel();
+        //});
         UIManager.AddEvent(transform.Find("InfoPanel").Find("SwitchAccountButton").gameObject,
              UnityEngine.EventSystems.EventTriggerType.PointerClick, (b) => 
              {
@@ -29,10 +33,14 @@ public class UserInfoController : PFUIPanel
              });
         infoPanel = transform.Find("InfoPanel").Find("P");
         Button editBtn = infoPanel.Find("EditButton").GetComponent<Button>();
-        editBtn.onClick.AddListener(() =>
+        UIManager.AddEvent(editBtn.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, (b) =>
-        {
+         {
-            UIManager.ShowEditUserPanel();
+             UIManager.ShowEditUserPanel();
-        });
+         });
+        //editBtn.onClick.AddListener(() =>
+        //{
+        //    UIManager.ShowEditUserPanel();
+        //});
         summaryPanel = transform.Find("SummaryPanel");
         Load();
     }

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

@@ -17,9 +17,13 @@ public class ResultListController : MonoBehaviour
     Transform btnRoute, btnMatch,searchInput;
     Color c1, c2;
     // Start is called before the first frame update
-    int pageIndex = 0, pageSize = 20;
+    int pageSize = 20;
     string name = "";
     Transform[] contents;
+    Dictionary<int, string> filterOptionDict = new Dictionary<int, string> 
+    {
+        {0,"routes" },{1,"competition" }
+    };
     void Start()
     {
         //ApiBase.SetCookie("73385F5F719B610D132C1ECF3E9143272BF15214D57ED91CD7A9DFD832407471535112AAEB8E9271F75D54FBBF2D99F18FA313C1EEA5676F5D722D7FBB07C926BEC5905591BF9AFDDC6336552DF273112C2DA1794E6FA2F465B11FECD2E82E52");
@@ -36,19 +40,32 @@ public class ResultListController : MonoBehaviour
         contents = new Transform[] { routeContent, matchContent};
         if (btnMatch != null) 
         {
-            btnMatch.GetComponent<Button>().onClick.AddListener(() => StartScroll(0));
+            UIManager.AddEvent(btnMatch.gameObject, EventTriggerType.PointerClick, (b) =>
+            {
+                StartScroll(0);
+            });
+            //btnMatch.GetComponent<Button>().onClick.AddListener(() => StartScroll(0));
         }
         if (btnRoute != null) 
         {
-            btnRoute.GetComponent<Button>().onClick.AddListener(() => StartScroll(1));
+            UIManager.AddEvent(btnRoute.gameObject, EventTriggerType.PointerClick, (b) =>
+            {
+                StartScroll(1);
+            });
+            //btnRoute.GetComponent<Button>().onClick.AddListener(() => StartScroll(1));
         }
         if (searchInput != null) 
         {
-            searchInput.Find("Button").GetComponent<Button>().onClick.AddListener(() =>
+            UIManager.AddEvent(searchInput.Find("Button").gameObject, EventTriggerType.PointerClick, (b) =>
             {
-                name = searchInput.GetComponent<InputField>().text;
+                 name = searchInput.GetComponent<InputField>().text;
-                Refresh(contents[scrollIndex]);
+                 Refresh(contents[scrollIndex]);
             });
+            //searchInput.Find("Button").GetComponent<Button>().onClick.AddListener(() =>
+            //{
+            //    name = searchInput.GetComponent<InputField>().text;
+            //    Refresh(contents[scrollIndex]);
+            //});
         }
         if (routeScroll != null)
         {
@@ -58,7 +75,8 @@ public class ResultListController : MonoBehaviour
         {
             UIManager.AddEvent(matchScroll.gameObject, UnityEngine.EventSystems.EventTriggerType.EndDrag, OnEndDrag);
         }
-        GetList();
+        GetList(0);
+        GetList(1);
     }
 
     private void OnEndDrag(BaseEventData e)
@@ -68,7 +86,7 @@ public class ResultListController : MonoBehaviour
         if (scrollrect.verticalNormalizedPosition <= 0)
         {
             Debug.Log(scrollrect.verticalNormalizedPosition);
-            pageIndex++;
+            pageIndex[scrollIndex]++;
             GetList();
         }
         if (scrollrect.verticalNormalizedPosition >= 1)
@@ -80,23 +98,33 @@ public class ResultListController : MonoBehaviour
     private void Refresh(Transform content)
     {
         content.transform.DestroyChildren();
-        pageIndex = 0;
+        isEnd[scrollIndex] = false;
+        pageIndex[scrollIndex] = 0;
         GetList();
     }
-    bool isEnd = false;
+    Dictionary<int, bool> isEnd = new Dictionary<int, bool> 
-    void GetList()
     {
-        var r =ConfigHelper.mapInterruptRecordApi.GetMapInterruptRecord(name, pageIndex, 20);
+        {0,false },{1,false }
+    };
+    Dictionary<int, int> pageIndex = new Dictionary<int, int>
+    {
+        {0,0 },{1,0 }
+    };
+    async void GetList(int? sindex = null)
+    {
+        var index = sindex ?? scrollIndex;
+        if (isEnd[index]) return;
+        var r = await ConfigHelper.mapInterruptRecordApi.GetMapInterruptRecord(name, pageIndex[index], 20,filterOptionDict[index]);
         if (r.result)
         {
-            if (r.data.Count == 0 && pageIndex != 0)
+            if (r.data.Count == 0 && pageIndex[index] != 0)
             {
-                isEnd = true;
+                isEnd[index] = true;
             }
             else
             {
-                isEnd = false;
+                isEnd[index] = false;
-                DisplayRouteResult(r.data,contents[scrollIndex]);
+                DisplayRouteResult(r.data, contents[index],index);
                 //DisplayRouteResult(r.data, matchContent);
             }
         }
@@ -105,14 +133,14 @@ public class ResultListController : MonoBehaviour
             Utils.showToast(gameObject, r.errMsg);
         }
     }
-    void DisplayRouteResult(List<RouteResult> list,Transform content)
+    void DisplayRouteResult(List<RouteResult> list,Transform content,int index)
     {
         if (routeResult != null)
         {
             foreach (var item in list)
             {
                 var obj = Instantiate(routeResult);
-                obj.GetComponent<RouteItem>().Initial(item);
+                obj.GetComponent<RouteItem>().Initial(item, index);
                 //obj.SendMessage("Initial", );
                 obj.transform.parent = content;
                 obj.transform.localScale = new Vector3(1, 1, 1);

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

@@ -26,7 +26,9 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
     }
     string titleColor = "#5c5c6e";
     RouteResult data;
-    public void Initial(RouteResult result)
+    //滑动索引 0route 1match
+    int index;
+    public void Initial(RouteResult result,int index)
     {
         routeResult = result;
         left = transform.Find("Left");
@@ -38,29 +40,49 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
         row1.Find("Time").GetComponent<Text>().text = $"<color={titleColor}>Riding time:</color>{result.TrainingTime}";
         row1.Find("Distance").GetComponent<Text>().text = $"<color={titleColor}>Mileage:</color>{result.EndDistance.ToString("#0.00")}KM";
         row1.Find("Times").GetComponent<Text>().text = $"<color={titleColor}>Times:</color>{result.Count}";
-        row1.Find("Rank").GetComponent<Text>().text = $"<color={titleColor}>Rank:</color>{result.Ranking}";
+        if (index == 0)
+        {
+            row1.Find("Rank").GetComponent<Text>().text = $"<color={titleColor}>Rank:</color>{result.Ranking}";
+        }
+        else 
+        {
+            row1.Find("Rank").GetComponent<Text>().text = $"";
+        }
         left.Find("Progress").Find("Image").GetComponent<Image>().fillAmount = (float)result.Progress;
         left.Find("Progress").Find("Value").GetComponent<Text>().text = (result.Progress * 100).ToString("#0");
         row2.Find("Device").GetComponent<Text>().text = $"<color={titleColor}>Cycling equipment:</color>{result.ManufacturerName}";
-        right = transform.Find("Right");
+        if (index == 0)
-        btnContinue = right.Find("BtnContinue");
-        if (btnContinue) 
         {
-            btnContinue.gameObject.SetActive(false);
+            right = transform.Find("Right");
-            btnContinue.GetComponent<Button>().onClick.AddListener(GoContinue);
+            btnContinue = right.Find("BtnContinue");
+            if (btnContinue)
+            {
+                //btnContinue.gameObject.SetActive(false);
+                btnContinue.GetComponent<Button>().onClick.AddListener(GoContinue);
+            }
+            btnReRide = right.Find("BtnReRide");
+            if (btnReRide)
+            {
+                //btnReRide.gameObject.SetActive(false);
+                btnReRide.GetComponent<Button>().onClick.AddListener(GoReRide);
+            }
+            btnDelete = right.Find("BtnDelete");
+            if (btnDelete)
+            {
+                //btnDelete.gameObject.SetActive(false);
+                btnDelete.GetComponent<Button>().onClick.AddListener(Delete);
+            }
+            SetButtonColor(false);
+            transform.Find("RightMatch").gameObject.SetActive(false);
         }
-        btnReRide = right.Find("BtnReRide");
+        else 
-        if (btnReRide)
         {
-            btnReRide.gameObject.SetActive(false);
+            right = transform.Find("RightMatch");
-            btnReRide.GetComponent<Button>().onClick.AddListener(GoReRide);
+            transform.Find("Right").gameObject.SetActive(false);
-        }
+            right.Find("Value").GetComponent<Text>().text = result.Ranking.ToString();
-        btnDelete = right.Find("BtnDelete");
-        if (btnDelete)
-        {
-            btnDelete.gameObject.SetActive(false);
-            btnDelete.GetComponent<Button>().onClick.AddListener(Delete);
         }
+        right.gameObject.SetActive(true);
+        this.index = index;
     }
 
     private void Delete()
@@ -86,10 +108,35 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
             SceneManager.LoadScene("Ride");
         }
     }
-
+    void SetButtonColor(bool f) 
+    {
+        if (f)
+        {
+            btnContinue.GetComponent<Image>().color = Utils.HexToColorHtml("#F93086");
+            btnReRide.GetComponent<Image>().color = Utils.HexToColorHtml("#F93086");
+            btnDelete.GetComponent<Image>().color = Utils.HexToColorHtml("#353543");
+            btnContinue.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
+            btnReRide.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
+            btnDelete.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#474759");
+        }
+        else 
+        {
+            btnContinue.GetComponent<Image>().color = Utils.HexToColorHtml("#414251");
+            btnReRide.GetComponent<Image>().color = Utils.HexToColorHtml("#414251");
+            btnDelete.GetComponent<Image>().color = Utils.HexToColorHtml("#23232D");
+            btnContinue.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#353543");
+            btnReRide.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#353543");
+            btnDelete.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#353543");
+        }
+    }
     public void OnPointerExit(PointerEventData eventData)
     {
         transform.GetComponent<Image>().color = Utils.HexToColorHtml("#23232d");
+        if (index == 1)
+        {
+            right.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#414251");
+            right.Find("Value").GetComponent<Text>().color = Utils.HexToColorHtml("#5c5c6e");
+        }
         if (left != null) 
         {
             left.Find("Main").Find("Time").GetComponent<Text>().color = Utils.HexToColorHtml("#414251");
@@ -105,14 +152,17 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
             row1.Find("Rank").GetComponent<Text>().color = Utils.HexToColorHtml("#9E9EAD");
         }
         titleColor = "#414251";
-        btnContinue.gameObject.SetActive(false);
+        SetButtonColor(false);
-        btnReRide.gameObject.SetActive(false);
-        btnDelete.gameObject.SetActive(false);
     }
 
     public void OnPointerEnter(PointerEventData eventData)
     {
         transform.GetComponent<Image>().color = Utils.HexToColorHtml("#353543");
+        if (index == 1) 
+        {
+            right.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#5c5c6e");
+            right.Find("Value").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
+        }
         if (left != null)
         {
             left.Find("Main").Find("Time").GetComponent<Text>().color = Utils.HexToColorHtml("#5c5c6e");
@@ -128,8 +178,6 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
             row1.Find("Rank").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
         }
         titleColor = "#5c5c6e";
-        btnContinue.gameObject.SetActive(true);
+        SetButtonColor(true);
-        btnReRide.gameObject.SetActive(true);
-        btnDelete.gameObject.SetActive(true);
     }
 }

Assets/StreamingAssets.meta

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