lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	Assets/Scripts/Utils/Utils.cs
This commit is contained in:
lishuo committed 2021-04-25 13:51:21 +08:00
2 parents 0f8af223fc 048538a0c8
commit bbc3deeef2
78 files changed
+15285 -6903
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/Apis/UserApi.cs
+2 -2
View File
@@ -220,7 +220,7 @@ namespace Assets.Scripts.Apis
return Newtonsoft.Json.JsonConvert.DeserializeObject<JsonResult<object>>(res);
}
public async Task<JsonResult<JObject>> Update(UserResultModel currUser, string filePath = "")
public async Task<JsonResult<object>> Update(UserResultModel currUser, string filePath = "")
{
//return await PostAsync<JsonResult<dynamic>>("User/UpdateUserSetting", new {
// UID = currUser.Id,
@@ -273,7 +273,7 @@ namespace Assets.Scripts.Apis
//imgData = imgData
}, files);
return Newtonsoft.Json.JsonConvert.DeserializeObject<JsonResult<JObject>>(res);
return Newtonsoft.Json.JsonConvert.DeserializeObject<JsonResult<object>>(res);
}
public async Task<JsonResult<JObject>> GetNotify()
{