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

Assets/Scripts/Scenes/LoginController.cs

@@ -777,6 +777,7 @@ public class LoginController : MonoBehaviour
         wxLogin3.Find("Wx").gameObject.SetActive(type == 1);
         wxLogin3.Find("NickName").GetComponent<Text>().text = data.Nickname;
         userResult = data;
+        App.CurrentUser = data;
     }
     /// <summary>
     /// 去最后一页准备进入主场景