Merge branch 'dev_lishuo' into dev_mobile

This commit is contained in:
lishuo committed 2021-08-19 18:11:12 +08:00
commit f6740d31bb
34 files changed
+1171 -109

No files matched your search

@@ -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()