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

Assets/Scripts/Apis/UserApi.cs

@@ -248,14 +248,7 @@ namespace Assets.Scripts.Apis
         }
         public JsonResult<object> Update(UserResultModel currUser, out string cookie, string filePath = "")
         {
-            if (App.CurrentUser != null)
-            {
-                cookie = App.CurrentUser.cookie;
-            }
-            else 
-            {
-                cookie = null;
-            }
+            cookie = App.CurrentUser.cookie;
             //return await PostAsync<JsonResult<dynamic>>("User/UpdateUserSetting", new {
             //    UID = currUser.Id,
             //    Sex = currUser.Sex,

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>
     /// 去最后一页准备进入主场景