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

This commit is contained in:
lishuo committed 2021-07-27 09:18:49 +08:00
commit d4ae01cd32
24 files changed
+2626 -1655

No files matched your search

@@ -360,7 +360,7 @@ public class EditUserController : PFUIPanel
if (r.result)
{
var img = JObject.FromObject(r.data).Value<string>("WxHeadImg");
Utils.DisplayImage(mHeadImage, img);
Utils.DisplayImage(mHeadImage, img, true);
var userinfos = UIManager.Instance.userInfos;
var i = userinfos.FindIndex(x => x.Id == App.CurrentUser.Id);
if (i != -1)
@@ -368,6 +368,7 @@ public class EditUserController : PFUIPanel
userinfos[i].Avatar = img;
UIManager.Instance.userInfos = userinfos;
}
Debug.Log(img);
App.CurrentUser.WxHeadImg = img;
Utils.showToast(gameObject, "Success", type: 1);
//UIManager.ShowAlert();
@@ -57,6 +57,8 @@ public class HomeController : PFUIPanel
//Debug.Log(System.IO.File.Exists(path + ));
if (!System.IO.File.Exists(path))
{
//TODO: auto update
Application.OpenURL("https://powerfun.oss-cn-shanghai.aliyuncs.com/Releases/PowerFunWorkouts.exe");
return;
}
Utils.ExecFile(path);