Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo
This commit is contained in:
commit
9f19e951cc
@ -248,14 +248,7 @@ namespace Assets.Scripts.Apis
|
|||||||
}
|
}
|
||||||
public JsonResult<object> Update(UserResultModel currUser, out string cookie, string filePath = "")
|
public JsonResult<object> Update(UserResultModel currUser, out string cookie, string filePath = "")
|
||||||
{
|
{
|
||||||
if (App.CurrentUser != null)
|
cookie = App.CurrentUser.cookie;
|
||||||
{
|
|
||||||
cookie = App.CurrentUser.cookie;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
cookie = null;
|
|
||||||
}
|
|
||||||
//return await PostAsync<JsonResult<dynamic>>("User/UpdateUserSetting", new {
|
//return await PostAsync<JsonResult<dynamic>>("User/UpdateUserSetting", new {
|
||||||
// UID = currUser.Id,
|
// UID = currUser.Id,
|
||||||
// Sex = currUser.Sex,
|
// Sex = currUser.Sex,
|
||||||
|
|||||||
@ -777,6 +777,7 @@ public class LoginController : MonoBehaviour
|
|||||||
wxLogin3.Find("Wx").gameObject.SetActive(type == 1);
|
wxLogin3.Find("Wx").gameObject.SetActive(type == 1);
|
||||||
wxLogin3.Find("NickName").GetComponent<Text>().text = data.Nickname;
|
wxLogin3.Find("NickName").GetComponent<Text>().text = data.Nickname;
|
||||||
userResult = data;
|
userResult = data;
|
||||||
|
App.CurrentUser = data;
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 去最后一页准备进入主场景
|
/// 去最后一页准备进入主场景
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user