Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp
This commit is contained in:
commit
ebcc83ed6a
5 files changed
+44
-33
No files matched your search
@@ -22,15 +22,21 @@ public class NewRouteItemController : MonoBehaviour
|
||||
|
||||
public void Initial(MapRouteAreaItem area, Dictionary<string, Texture> caches = null)
|
||||
{
|
||||
if (area.CoverImage != null)
|
||||
{
|
||||
Utils.DisplayImageTempDict(GetComponent<RawImage>(), area.CoverImage, caches);
|
||||
}
|
||||
transform.Find("Panel/Text").GetComponent<Text>().text = area.Name;
|
||||
GetComponent<Button>().onClick.RemoveAllListeners();
|
||||
GetComponent<Button>().onClick.AddListener(() =>
|
||||
{
|
||||
UIManager.ShowNewRouteDetailPanel(area);
|
||||
});
|
||||
StartCoroutine(displayImage(area, caches));
|
||||
}
|
||||
|
||||
IEnumerator displayImage(MapRouteAreaItem area, Dictionary<string, Texture> caches = null)
|
||||
{
|
||||
yield return null;
|
||||
if (area.CoverImage != null)
|
||||
{
|
||||
Utils.DisplayImageTempDict(GetComponent<RawImage>(), area.CoverImage, caches);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -105,7 +105,7 @@ public class NewRouteOverviewController: PFUIPanel
|
||||
// });
|
||||
//#endif
|
||||
}
|
||||
int pageIndex = 0, pageSize = 10;
|
||||
int pageIndex = 0, pageSize = 5;
|
||||
bool isEnd = false,isLock = false;
|
||||
private void Refresh()
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user