Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile

Assets/Scripts/Scenes/MainController.cs

@@ -24,6 +24,7 @@ public class MainController : BaseScene
 #if UNITY_ANDROID || UNITY_IOS
         transform.GetComponent<CanvasScaler>().referenceResolution = new Vector2(844, 390);
         transform.Find("Panel").GetComponent<RectTransform>().sizeDelta = new Vector2(844, 390);
+        transform.Find("ModalPanel").GetComponent<RectTransform>().sizeDelta = new Vector2(844, 390);
 #endif
         App.MainDeviceAdapter.StartScan();
     }

Assets/Scripts/Scenes/Ride/Scripts/NearByFactory.cs

@@ -1,6 +1,7 @@
 using Assets.Scenes.Ride.Scripts.Model;
 using System.Linq;
 using UnityEngine;
+using UnityEngine.EventSystems;
 using UnityEngine.UI;
 
 namespace Assets.Scenes.Ride.Scripts
@@ -24,7 +25,7 @@ namespace Assets.Scenes.Ride.Scripts
 
             Title = transform.Find("Title").GetComponent<Text>();
             OnlineUserNum = transform.Find("NearByView/OnlineUserNum").GetComponent<Text>();
-            pageSize = 999;//开启无线下拉
+            pageSize = 5;//开启无线下拉
         }
         protected override void CreateList()
         {
@@ -49,6 +50,7 @@ namespace Assets.Scenes.Ride.Scripts
                 Create(nearList[i]);
             }
         }
+
         private void Create(NearRiderModel item)
         {
             var rankingList = FindObjectsOfType<NearByItemScript>();