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-27 13:29:55 +08:00
2 parents c9b5520331 164db7c013
commit ea79b6cfc5
7 files changed
+434 -132
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs
+2
View File
@@ -170,6 +170,7 @@ public class RaceHomeScript : RaceScript
void goMove(int i = 1)
{
//doAni();
if (startMoveEnd) return;
if (!start) startPosition = scroll.horizontalNormalizedPosition;
start = true;
scrollValue = i * contentSize / 20;
@@ -177,6 +178,7 @@ public class RaceHomeScript : RaceScript
void goMoveEnd(float pos)
{
//doAni();
if (start) return;
if (!startMoveEnd) startPosition = scroll.horizontalNormalizedPosition;
totalScrollValue = 0;
moveEndValue = pos;
Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs
+18 -37
View File
@@ -28,20 +28,21 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
public void Initial(MapCompetition mapCompetition,Transform parent)
{
Utils.DisplayImage(transform.GetComponent<RawImage>(), mapCompetition.RouteCover, true);
Utils.DisplayImage(transform.Find("InfoContainer/AltitudeCurve").GetComponent<RawImage>(), mapCompetition.AltitudeGraph, true);
transform.Find("Text").GetComponent<Text>().SetTextWithEllipsis(mapCompetition.Title);
transform.Find("GetReadyContainer").gameObject.SetActive(mapCompetition.Status == 2);
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 != 4);
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";
//props.Find("EleText").GetComponent<Text>().text = $"{(myMap.TotalClimb ?? 0.0).ToString(myMap.TotalClimb > 1000 ? "#0" : "#0.00")}M";
//props.Find("SlopeText").GetComponent<Text>().text = $"{myMap.AverageGrade.ToString("#0.00")}%";
transform.Find("InfoContainer/DataContainer/Distance/Text").GetComponent<Text>().text
transform.Find("DataContainer/Distance/Text").GetComponent<Text>().text
= $"{mapCompetition.Distance.ToString(mapCompetition.Distance > 1000 ? "#0" : "#0.00")}KM";
transform.Find("InfoContainer/DataContainer/Altitude/Text").GetComponent<Text>().text
transform.Find("DataContainer/Altitude/Text").GetComponent<Text>().text
= $"{(mapCompetition.TotalClimb ?? 0.0).ToString(mapCompetition.TotalClimb > 1000 ? "#0" : "#0.00")}M";
transform.Find("InfoContainer/DataContainer/Slope/Text").GetComponent<Text>().text
transform.Find("DataContainer/Slope/Text").GetComponent<Text>().text
= $"{mapCompetition.AverageGrade.ToString("#0.00")}%";
transform.Find("InfoContainer/DataContainer/StartTime/Text").GetComponent<Text>().text = mapCompetition.StartTime.ToString();
transform.Find("InfoContainer/StartTime/Text").GetComponent<Text>().text = mapCompetition.StartTime.ToString();
transform.Find("CountContainer/Text").GetComponent<Text>().text = mapCompetition.ApplyCount.ToString();
SetStatus(mapCompetition);
SetButtonGroup(mapCompetition);
@@ -147,17 +148,16 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
{
Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto);
transform.Find("Masking").GetComponent<CanvasGroup>().DOFade(0, 0.5f);
transform.Find("Text").GetComponent<CanvasGroup>().DOFade(0, 0.5f);
transform.Find("AltitudeCurve").GetComponent<RawImage>().DOFade(0, 0.5f);
transform.Find("InfoContainer/Text").GetComponent<CanvasGroup>().DOFade(1, 0.5f);
transform.Find("BtnContainer").GetComponent<CanvasGroup>().DOFade(0, 0.5f);
transform.Find("CountContainer").GetComponent<CanvasGroup>().DOFade(0, 0.5f);
transform.Find("GetReadyContainer").GetComponent<CanvasGroup>().DOFade(0, 0.5f);
transform.Find("InfoContainer").GetComponent<Image>().DOFade(1, 0.5f);
transform.Find("GetReadyContainer-2").GetComponent<CanvasGroup>().DOFade(0, 0.5f);
transform.Find("InfoContainer").GetComponent<CanvasGroup>().DOFade(1, 0.2f);
if (myType == ItemType.small)
{
transform.Find("InfoContainer/DataContainer").GetComponent<CanvasGroup>().DOFade(1, 0.5f);
transform.Find("InfoContainer/AltitudeCurve").DOScaleY(1f, 0.5f);
transform.Find("InfoContainer").DOLocalMoveY(-207, 0.3f);
transform.Find("DataContainer").GetComponent<CanvasGroup>().DOFade(0, 0.5f);
}
else
{
@@ -175,17 +175,16 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
{
Cursor.SetCursor(Resources.Load<Texture2D>("Images/PointerButtonHover"), Vector2.zero, CursorMode.Auto);
transform.Find("Masking").GetComponent<CanvasGroup>().DOFade(1, 0.5f);
transform.Find("Text").GetComponent<CanvasGroup>().DOFade(1, 0.5f);
transform.Find("AltitudeCurve").GetComponent<RawImage>().DOFade(1, 0.5f);
transform.Find("InfoContainer/Text").GetComponent<CanvasGroup>().DOFade(0, 0.5f);
transform.Find("BtnContainer").GetComponent<CanvasGroup>().DOFade(1, 0.5f);
transform.Find("CountContainer").GetComponent<CanvasGroup>().DOFade(1, 0.5f);
transform.Find("GetReadyContainer").GetComponent<CanvasGroup>().DOFade(1, 0.5f);
transform.Find("InfoContainer").GetComponent<Image>().DOFade(0, 0.5f);
transform.Find("GetReadyContainer-2").GetComponent<CanvasGroup>().DOFade(1, 0.5f);
transform.Find("InfoContainer").GetComponent<CanvasGroup>().DOFade(0, 0.2f);
if (myType == ItemType.small)
{
transform.Find("InfoContainer/DataContainer").GetComponent<CanvasGroup>().DOFade(0, 0.5f);
//transform.Find("InfoContainer/AltitudeCurve").DOScaleY(1.7f, 0.5f);
transform.Find("InfoContainer").DOLocalMoveY(-124 + 50, 0.3f);
//transform.Find("InfoContainer").DOLocalMoveY(-139, 0.3f);
transform.Find("DataContainer").GetComponent<CanvasGroup>().DOFade(1, 0.5f);
}
else
{
@@ -204,24 +203,6 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto);
}
/*
//先报名
if (_canJoin)
{
MapCompetitionApi s = new MapCompetitionApi();
var rrr = s.ApplyMapCompetition(cyclingController.competitionId);
if (rrr.Result.result)
{
var competition = s.GetById(cyclingController.competitionId).data;
_canStart = competition.CanStart;
}
rideNowText.text = "RideNow";
}
else
{
base.StartRide(baseEvent);
}
*/
public void Join()
{
var res = ConfigHelper.mapCompetitionApi.ApplyMapCompetition(mapCompetition.Id);
Assets/Scripts/UI/Prefab/Race/RaceScript.cs
+23 -8
View File
@@ -54,18 +54,33 @@ public class RaceScript : PFUIPanel
if (currentItem != null && currentItem.Find("GetReadyContainer").gameObject.activeSelf)
{
var map = currentItem.GetComponent<RaceItemScript>().mapCompetition;
var time = map.StartTime.ToLocalTime() - UIManager.Now.GetDateTime();
if (time.TotalSeconds < 0)
Debug.Log(map.Status);
if (map.Status == 1)
{
currentItem.Find("GetReadyContainer").GetComponent<CanvasGroup>().alpha = 0;
currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text = "Application Start Time";
currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text =
map.StartApplyTime.ToString("yyyy-MM-dd HH:mm");
currentItem.Find("GetReadyContainer-2/Title").GetComponent<Text>().text = "Race Start Time";
currentItem.Find("GetReadyContainer-2/Value").GetComponent<Text>().text =
map.StartTime.ToString("yyyy-MM-dd HH:mm");
}
else
else
{
currentItem.Find("GetReadyContainer").GetComponent<CanvasGroup>().alpha = 1;
currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text
= Utils.GetCountDown(time);
//Dictionary<int,>
var time = (map.Status == 1 ? map.StartTime.ToLocalTime() : map.EndTime.ToLocalTime()) - UIManager.Now.GetDateTime();
if (time.TotalSeconds < 0)
{
currentItem.Find("GetReadyContainer").GetComponent<CanvasGroup>().alpha = 0;
}
else
{
currentItem.Find("GetReadyContainer").GetComponent<CanvasGroup>().alpha = 1;
currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text
= map.Status == 1 ? "Get Ready" : "Riding Time";
currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text
= Utils.GetCountDown(time);
}
}
}
}