diff --git a/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab index 012f0cab..883a0167 100644 --- a/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab @@ -1502,7 +1502,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bf6cef625b150984384b02d2e94b91ff, type: 3} + m_Sprite: {fileID: 21300000, guid: 998c9c31435c99f498b189bcc65c5650, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Scripts/Apis/MapApi.cs b/Assets/Scripts/Apis/MapApi.cs index e2a363fc..be738a26 100644 --- a/Assets/Scripts/Apis/MapApi.cs +++ b/Assets/Scripts/Apis/MapApi.cs @@ -60,7 +60,7 @@ namespace Assets.Scripts.Apis public Task>> GetList(int pageIndex, int pageSize, string name, string distance="", string hands="", bool is3D=false, string sort="", string sortDire = "", bool isFav = false) { string lngLat = ""; - if (string.IsNullOrEmpty(name) && string.IsNullOrEmpty(distance) && string.IsNullOrEmpty(hands) && !is3D && sort.Equals("Hot") && sortDire.Equals("desc") && !isFav) + if (string.IsNullOrEmpty(name) && string.IsNullOrEmpty(distance) && string.IsNullOrEmpty(hands) && !is3D && sort.Equals("Near") && !isFav) { lngLat = $"{App.longitude},{App.latitude}"; } diff --git a/Assets/Scripts/UI/Prefab/MapList/MapFilterOptions.cs b/Assets/Scripts/UI/Prefab/MapList/MapFilterOptions.cs index d8c58fb1..3027cfbb 100644 --- a/Assets/Scripts/UI/Prefab/MapList/MapFilterOptions.cs +++ b/Assets/Scripts/UI/Prefab/MapList/MapFilterOptions.cs @@ -40,7 +40,7 @@ namespace Assets.Scripts.UI.Prefab.MapList {"HC","750-99999" }, }; public static List sorts = new string[] { - "Trend","Name","Distance","Difficulty","Time" + "Near", "Trend","Name","Distance","Difficulty","Time" }.Select(x => new Dropdown.OptionData(x)).ToList(); public static Dictionary diffDisplayDict = new Dictionary() { diff --git a/Assets/Scripts/UI/Prefab/Panel/MapListController.cs b/Assets/Scripts/UI/Prefab/Panel/MapListController.cs index d2af3a18..6b3916bd 100644 --- a/Assets/Scripts/UI/Prefab/Panel/MapListController.cs +++ b/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); @@ -265,7 +267,7 @@ public class MapListController : PFUIPanel string distance = ""; List hands = new List(); bool is3d = false,isFav = false; - string sort = "Hot",sortDire = "desc"; + string sort = "",sortDire = ""; //string name = ""; //string name = ""; async void GetList()