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

# Conflicts:
#	Assets/Scripts/Apis/Models/MapCompetition.cs
This commit is contained in:
lishuo committed 2021-07-28 15:01:40 +08:00
commit 4a8239a2db
18 files changed
+1541 -286

No files matched your search

@@ -58,7 +58,8 @@ public class HomeController : PFUIPanel
if (!System.IO.File.Exists(path))
{
//TODO: auto update
Application.OpenURL("https://powerfun.oss-cn-shanghai.aliyuncs.com/Releases/PowerFunWorkouts.exe");
UIManager.ShowDownloadWorkoutsPanel();
//Application.OpenURL("https://powerfun.oss-cn-shanghai.aliyuncs.com/Releases/PowerFunWorkouts.exe");
return;
}
Utils.ExecFile(path);