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

修改细节

Browse Source
This commit is contained in:
Caiyanpeng committed 2021-07-29 15:45:44 +08:00
1 parent 6ab3ee19f2
commit edce9c676d
18 files changed
+1735 -1368
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/App.cs
+1 -1
View File
@@ -11,7 +11,7 @@ using Assets.Scripts.Devices;
public static class App
{
public static string Host = "http://192.168.0.102:5082/";
public static string Host = "http://192.168.0.101:5085/";
public static string AppVersion = Application.version;
Assets/Scripts/UI/Prefab/Panel/HomeController.cs
+1 -1
View File
@@ -62,7 +62,7 @@ public class HomeController : PFUIPanel
//Application.OpenURL("https://powerfun.oss-cn-shanghai.aliyuncs.com/Releases/PowerFunWorkouts.exe");
return;
}
UIManager.ShowConfirm("Confirm", "Switch to PowerFun Workouts?\nWe will close the Powerfun and start PowerFun Workouts.", () =>
UIManager.ShowConfirm("Switch to PowerFun Workouts?", "We will close the Powerfun and start PowerFun Workouts.", () =>
{
Utils.ExecFile(path);
Application.Quit();
Assets/Scripts/UI/Prefab/Race/RaceButtonGroupScript.cs
+2 -2
View File
@@ -35,7 +35,7 @@ public class RaceButtonGroupScript : MonoBehaviour
}
void GoJoin()
{
UIManager.ShowConfirm("Join", "you want to join?", () =>
UIManager.ShowConfirm("Join", "Do you want to join?", () =>
{
if (!map.HasJoin)
{
@@ -54,7 +54,7 @@ public class RaceButtonGroupScript : MonoBehaviour
}
void GoCancel()
{
UIManager.ShowConfirm("Cancel Reservation", "you want to cancel reservation?", () =>
UIManager.ShowConfirm("Cancel Reservation", "Do you want to cancel reservation?", () =>
{
if (map.HasJoin)
{
Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs
+10 -4
View File
@@ -23,6 +23,10 @@ public class RaceHomeScript : RaceScript
base.Show();
handleAvatar();
GetData();
if (btnGoList != null)
{
btnGoList.Find("Panel").GetComponent<CanvasGroup>().alpha = 0;
}
}
void Start()
{
@@ -68,11 +72,13 @@ public class RaceHomeScript : RaceScript
rightContainer = transform.Find("RightContainer");
leftContainer = transform.Find("LeftContainer");
btnGoList = rightContainer.Find("Container-2/BtnGoList");
UIManager.AddEvent(btnGoList.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
if (btnGoList != null)
{
UIManager.ShowRaceListPanel();
});
UIManager.AddEvent(btnGoList.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
{
UIManager.ShowRaceListPanel();
});
}
}
bool isEnter = false;
Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs
+1 -1
View File
@@ -42,7 +42,7 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
= $"{(mapCompetition.TotalClimb ?? 0.0).ToString(mapCompetition.TotalClimb > 1000 ? "#0" : "#0.00")}M";
transform.Find("DataContainer/Slope/Text").GetComponent<Text>().text
= $"{mapCompetition.AverageGrade.ToString("#0.00")}%";
transform.Find("InfoContainer/StartTime/Text").GetComponent<Text>().text = mapCompetition.StartTime.ToString();
transform.Find("InfoContainer/StartTime/Text").GetComponent<Text>().text = mapCompetition.StartTime.ToLocalTime().ToString();
transform.Find("CountContainer/Text").GetComponent<Text>().text = mapCompetition.ApplyCount.ToString();
SetStatus(mapCompetition);
SetButtonGroup(mapCompetition);
Assets/Scripts/UI/Prefab/Race/RaceScript.cs
+6 -6
View File
@@ -80,13 +80,13 @@ public class RaceScript : PFUIPanel
{
currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text = "Start for Registration";
currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text =
map.StartApplyTime.ToString("yyyy-MM-dd HH:mm");
map.StartApplyTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm");
currentItem.Find("GetReadyContainer-2/Title").GetComponent<Text>().text = "Deadline for Registration";
currentItem.Find("GetReadyContainer-2/Value").GetComponent<Text>().text =
map.EndApplyTime.ToString("yyyy-MM-dd HH:mm");
map.EndApplyTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm");
if ((map.StartApplyTime - UIManager.Now.GetDateTime()).TotalSeconds < 0 ||
(map.StartTime - UIManager.Now.GetDateTime()).TotalSeconds < 0)
if ((map.StartApplyTime.ToLocalTime() - UIManager.Now.GetDateTime()).TotalSeconds < 0 ||
(map.StartTime.ToLocalTime() - UIManager.Now.GetDateTime()).TotalSeconds < 0)
{
var res = ConfigHelper.mapCompetitionApi.GetById(map.Id);
if (res.result)
@@ -99,7 +99,7 @@ public class RaceScript : PFUIPanel
{
currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text = "Start Time";
currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text =
map.StartTime.ToString("yyyy-MM-dd HH:mm");
map.StartTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm");
}
//else if (map.Status == 4)
//{
@@ -127,7 +127,7 @@ public class RaceScript : PFUIPanel
currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text
= map.HasJoin ? "Get Ready" : "Start Time";
currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text
= map.HasJoin ? Utils.GetCountDown(time): map.StartTime.ToString("yyyy-MM-dd HH:mm");
= map.HasJoin ? Utils.GetCountDown(time): map.StartTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm");
}
}
}
Assets/Scripts/UI/Prefab/ResultList/ResultListController.cs
+2 -2
View File
@@ -26,7 +26,7 @@ public class ResultListController : MonoBehaviour
{
{0,"routes" },{1,"competition" }
};
void Start()
void Awake()
{
//ApiBase.SetCookie("73385F5F719B610D132C1ECF3E9143272BF15214D57ED91CD7A9DFD832407471535112AAEB8E9271F75D54FBBF2D99F18FA313C1EEA5676F5D722D7FBB07C926BEC5905591BF9AFDDC6336552DF273112C2DA1794E6FA2F465B11FECD2E82E52");
InitialColor();
@@ -82,7 +82,7 @@ public class ResultListController : MonoBehaviour
UIManager.AddEvent(matchScroll.gameObject, UnityEngine.EventSystems.EventTriggerType.EndDrag, OnEndDrag);
}
scrolls = new Transform[] { routeScroll, matchScroll };
GetList(0);
//GetList(0);
GetList(1);
}
Assets/Scripts/UI/Prefab/Update/DownloadWorkoutsController.cs
+39 -24
View File
@@ -21,6 +21,7 @@ public class DownloadWorkoutsController : PFUIPanel
public override void Show()
{
base.Show();
Initial();
Btn = transform.Find("Panel/BtnConfirm");
BtnStart = transform.Find("Panel/BtnStart");
Loading = transform.Find("Panel/LoadingContainer");
@@ -29,6 +30,23 @@ public class DownloadWorkoutsController : PFUIPanel
BtnStart.GetComponent<Button>().enabled = true;
BtnStart.GetComponent<Button>().interactable = true;
SetType(1);
}
private async void Initial()
{
var res = await ConfigHelper.userApi.GetAppVersion();
if (res.result)
{
wpf = res.data.WPF;
}
//if (File.Exists(path) && wpf.Version == PlayerPrefs.GetString("exeVersion_w"))
//{
// BtnStart.Find("Text").GetComponent<Text>().text = "Install";
//}
//else
//{
// BtnStart.Find("Text").GetComponent<Text>().text = "Start";
//}
}
void Start()
{
@@ -66,30 +84,26 @@ public class DownloadWorkoutsController : PFUIPanel
//Application.Quit();
OpenFile(path);
});
UIManager.AddEvent(BtnStart.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick,async (_base) =>
{
var res = await ConfigHelper.userApi.GetAppVersion();
if (res.result)
if (wpf != null)
{
wpf = res.data.WPF;
if (wpf != null)
BtnStart.GetComponent<Button>().enabled = false;
BtnStart.GetComponent<Button>().interactable = false;
Debug.Log(path);
StartCoroutine(DownLoadExe(wpf.Url, path, (p, isComplete) =>
{
BtnStart.GetComponent<Button>().enabled = false;
BtnStart.GetComponent<Button>().interactable = false;
Debug.Log(path);
StartCoroutine(DownLoadExe(wpf.Url, path, (p, isComplete) =>
//Debug.Log($"{a} {b} {isComplete}");
transform.Find("Panel/LoadingContainer/Text").GetComponent<Text>().text = $"Downloaded {Math.Round(p * 100, 0)}%";// string.Format(, a, b);
transform.Find("Panel/LoadingContainer/Loading").GetComponent<Image>().fillAmount = (float)p;
if (isComplete)
{
//Debug.Log($"{a} {b} {isComplete}");
transform.Find("Panel/LoadingContainer/Text").GetComponent<Text>().text = $"Downloaded {Math.Round(p * 100,0)}%";// string.Format(, a, b);
transform.Find("Panel/LoadingContainer/Loading").GetComponent<Image>().fillAmount = (float)p;
if (isComplete)
{
SetType(3);
PlayerPrefs.SetString("exeVersion_w", wpf.Version);
new FileInfo(path + ".pfdownload").MoveTo(path);
}
}));
}
SetType(3);
PlayerPrefs.SetString("exeVersion_w", wpf.Version);
new FileInfo(path + ".pfdownload").MoveTo(path);
}
}));
}
//if (App.UpdateObject != null)
//{
@@ -242,11 +256,12 @@ public class DownloadWorkoutsController : PFUIPanel
}
void OpenFile(string p)
{
UIManager.ShowConfirm("Confirm", "Switch to PowerFun Workouts?\nWe will close the Powerfun and start PowerFun Workouts.", () =>
{
Utils.ExecFile(p);
Application.Quit();
});
Utils.ExecFile(p);
Application.Quit();
//UIManager.ShowConfirm("Switch to PowerFun Workouts?", "We will close the Powerfun and start PowerFun Workouts.", () =>
//{
//});
}
void SetType(int a)
{
Assets/Scripts/UIManager.cs
+1 -1
View File
@@ -457,7 +457,7 @@ public class UIManager : MonoBehaviour
public static void ShowUserInfoPanel()
{
UIManager.Instance.UserInfoPanel.Reset();
//UIManager.Instance.UserInfoPanel.Reset();
UIManager.Show(UIManager.Instance.UserInfoPanel, UIManager.Instance.MainPanel);
}