Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo

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

@@ -407,6 +407,7 @@ public class MapListController : PFUIPanel
         {
             transform.Find("RawImage").GetComponent<RawImage>().texture = App.DefaultRotateTexture;
         }
+        ResetPanel();
         var cg = this.GetComponent<CanvasGroup>();
         cg.alpha = 0;
         cg.DOFade(1f, .3f);

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

@@ -43,6 +43,10 @@ public class UserInfoController : PFUIPanel
          {
              UIManager.ShowEditUserPanel();
          });
+        UIManager.AddEvent(infoPanel.Find("Avatar").gameObject, EventTriggerType.PointerClick, (b) =>
+        {
+            UIManager.ShowEditUserPanel();
+        });
         //editBtn.onClick.AddListener(() =>
         //{
         //    UIManager.ShowEditUserPanel();