Merge branch 'dev_lishuo' into dev_mobile

Assets/Scripts/UI/Prefab/MapList/MapFilterOptions.cs

@@ -40,7 +40,7 @@ namespace Assets.Scripts.UI.Prefab.MapList
             {"HC","750-99999" },
         };
         public static List<Dropdown.OptionData> sorts = new string[] {
-            "Trend","Name","Distance","Difficulty"//,"Times"
+           "Near", "Trend","Name","Distance","Difficulty","Time"
         }.Select(x => new Dropdown.OptionData(x)).ToList();
         public static Dictionary<string, string> diffDisplayDict = new Dictionary<string, string>()
         {

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

@@ -43,6 +43,8 @@ public class MapListController : PFUIPanel
     private bool isEnd = false;
     protected override void Start()
     {
+        sort = "Near";
+        sortDire = "asc";
         //if (hardSelector != null) 
         //{
         //    hardSelector.onValueChanged.AddListener(ChangeHard);
@@ -179,8 +181,17 @@ public class MapListController : PFUIPanel
                     sort = "Hot";
                 }
                 var image = sortDir.Find("Image").GetComponent<Image>();
-                image.sprite = Resources.Load<Sprite>("Images/DOWN");
-                sortDire = "desc";
+                if (sort == "Near")
+                {
+                    image.sprite = Resources.Load<Sprite>("Images/UP");
+                    sortDire = "asc";
+                }
+                else 
+                {
+                    image.sprite = Resources.Load<Sprite>("Images/DOWN");
+                    sortDire = "desc";
+                }
+                
                 Refresh();
             });
         }
@@ -265,7 +276,7 @@ public class MapListController : PFUIPanel
     string distance = "";
     List<string> hands = new List<string>();
     bool is3d = false,isFav = false;
-    string sort = "Hot",sortDire = "desc";
+    string sort = "",sortDire = "";
     //string name = "";
     //string name = "";
     async void GetList()