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
This commit is contained in:
lishuo committed 2021-07-28 21:12:06 +08:00
2 parents 09f72d10bd 5c96b10385
commit b8ffdcbffe
12 files changed
+203 -380
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs
+1 -1
View File
@@ -30,7 +30,7 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
Utils.DisplayImage(transform.GetComponent<RawImage>(), mapCompetition.RouteCover, true);
Utils.DisplayImage(transform.Find("AltitudeCurve").GetComponent<RawImage>(), mapCompetition.AltitudeGraph, true);
transform.Find("InfoContainer/Text").GetComponent<Text>().SetTextWithEllipsis(mapCompetition.Title);
transform.Find("GetReadyContainer").gameObject.SetActive(mapCompetition.Status != 3);
transform.Find("GetReadyContainer").gameObject.SetActive(true);
transform.Find("GetReadyContainer-2").gameObject.SetActive(mapCompetition.Status == 1);
//transform.Find("Text").GetComponent<Text>().text = mapCompetition.Title;
//props.Find("DistanceText").GetComponent<Text>().text = $"{myMap.Distance.ToString(myMap.Distance > 1000 ? "#0" : "#0.00")}KM";
Assets/Scripts/UI/Prefab/Race/RaceScript.cs
+12 -4
View File
@@ -12,7 +12,9 @@ public class RaceScript : PFUIPanel
public override void Show()
{
base.Show();
transform.GetComponent<CanvasGroup>().DOFade(1, 0.5f);
var cg = this.GetComponent<CanvasGroup>();
cg.alpha = 0;
cg.DOFade(1f, .5f);
}
protected void StartTime()
{
@@ -93,12 +95,18 @@ public class RaceScript : PFUIPanel
}
}
}
else if (map.Status == 4)
else if (map.Status == 3)
{
currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text = "Start Time";
currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text =
map.StartTime.ToString("yyyy-MM-dd HH:mm");
}
else if (map.Status == 4)
{
currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text = "End Time";
currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text =
map.FirstEndTime.HasValue?
map.FirstEndTime.Value.ToString("yyyy-MM-dd HH:mm"):map.EndTime.ToString("yyyy-MM-dd HH:mm");
map.FirstEndTime.HasValue ?
map.FirstEndTime.Value.ToString("yyyy-MM-dd HH:mm") : map.EndTime.ToString("yyyy-MM-dd HH:mm");
}
else
{