修改细节

This commit is contained in:
Caiyanpeng committed 2021-07-28 14:59:21 +08:00
1 parent ca938ab6f5
commit 952e5038ed
19 files changed
+1542 -286

No files matched your search

+109 -82
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 != 4);
transform.Find("GetReadyContainer").gameObject.SetActive(mapCompetition.Status != 3);
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";
@@ -55,71 +55,89 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
private void SetButtonGroup(MapCompetition mapCompetition)
{
if (mapCompetition.Status == 1)
{
var game = Resources.Load<GameObject>("UI/Prefab/Race/ButtonGroup/BtnContainer-Enter");
var igame = Instantiate(game);
igame.name = "BtnContainer";
igame.GetComponent<RaceButtonGroupScript>().map = mapCompetition;
igame.GetComponent<RaceButtonGroupScript>().parent = transform;
igame.transform.SetParent(transform);
igame.transform.localScale = Vector3.one;
var loc = Vector3.zero;
loc.y = myType == ItemType.big ? -252 : -257;
igame.transform.localPosition = loc;
}
else if (mapCompetition.Status == 4)
{
var game = Resources.Load<GameObject>("UI/Prefab/Race/ButtonGroup/BtnContainer-Watch");
var igame = Instantiate(game);
igame.name = "BtnContainer";
igame.GetComponent<RaceButtonGroupScript>().map = mapCompetition;
igame.GetComponent<RaceButtonGroupScript>().parent = transform;
igame.transform.SetParent(transform);
igame.transform.localScale = Vector3.one;
var loc = Vector3.zero;
loc.y = myType == ItemType.big ? -252 : -257;
igame.transform.localPosition = loc;
}
else
{
if (myType == ItemType.big)
{
var game = Resources.Load<GameObject>("UI/Prefab/Race/ButtonGroup/BtnContainer-Double-H");
var igame = Instantiate(game);
igame.name = "BtnContainer";
igame.GetComponent<RaceButtonGroupScript>().map = mapCompetition;
igame.GetComponent<RaceButtonGroupScript>().parent = transform;
igame.transform.Find("BtnJoin").gameObject.SetActive(mapCompetition.CanJoin);
igame.transform.Find("BtnCancel").gameObject.SetActive(mapCompetition.HasJoin);
igame.transform.SetParent(transform);
igame.transform.localScale = Vector3.one;
igame.transform.GetComponent<RectTransform>().anchorMax = new Vector2(0, 0);
igame.transform.GetComponent<RectTransform>().anchorMin = new Vector2(1, 0);
igame.transform.GetComponent<RectTransform>().pivot = new Vector2(0.5f, 0);
var loc = Vector3.zero;
loc.y = 20;
igame.transform.GetComponent<RectTransform>().anchoredPosition = loc;
}
else
{
var game = Resources.Load<GameObject>("UI/Prefab/Race/ButtonGroup/BtnContainer-Double-V");
var igame = Instantiate(game);
igame.name = "BtnContainer";
igame.GetComponent<RaceButtonGroupScript>().map = mapCompetition;
igame.GetComponent<RaceButtonGroupScript>().parent = transform;
igame.transform.Find("BtnJoin").gameObject.SetActive(mapCompetition.CanJoin);
igame.transform.Find("BtnCancel").gameObject.SetActive(mapCompetition.HasJoin);
igame.transform.SetParent(transform);
igame.transform.localScale = Vector3.one;
igame.transform.GetComponent<RectTransform>().anchorMax = new Vector2(0, 0);
igame.transform.GetComponent<RectTransform>().anchorMin = new Vector2(1, 0);
igame.transform.GetComponent<RectTransform>().pivot = new Vector2(0.5f, 0);
var loc = Vector3.zero;
loc.y = 20;
igame.transform.GetComponent<RectTransform>().anchoredPosition = loc;
}
}
var container = transform.Find("BtnContainer");
container.GetComponent<RaceButtonGroupScript>().map = mapCompetition;
container.GetComponent<RaceButtonGroupScript>().parent = transform;
container.Find("BtnCancel").gameObject.SetActive(mapCompetition.CanCancelJoin);
container.Find("BtnJoin").gameObject.SetActive(mapCompetition.CanJoin);
container.Find("BtnEnter").gameObject.SetActive(mapCompetition.Status != 4);
container.Find("BtnWatch").gameObject.SetActive(mapCompetition.Status == 4);
//if (transform.Find("BtnContainer") != null)
//{
// transform.Find("BtnContainer").gameObject.Destroy();
//}
//if (mapCompetition.Status == 1)
//{
// var game = Resources.Load<GameObject>("UI/Prefab/Race/ButtonGroup/BtnContainer-Enter");
// var igame = Instantiate(game);
// igame.name = "BtnContainer";
// igame.GetComponent<RaceButtonGroupScript>().map = mapCompetition;
// igame.GetComponent<RaceButtonGroupScript>().parent = transform;
// igame.transform.SetParent(transform);
// igame.transform.localScale = Vector3.one;
// var loc = Vector3.zero;
// loc.y = myType == ItemType.big ? -252 : -257;
// igame.transform.localPosition = loc;
//}
//else
//if (mapCompetition.Status == 4)
//{
// var game = Resources.Load<GameObject>("UI/Prefab/Race/ButtonGroup/BtnContainer-Watch");
// var igame = Instantiate(game);
// igame.name = "BtnContainer";
// igame.GetComponent<RaceButtonGroupScript>().map = mapCompetition;
// igame.GetComponent<RaceButtonGroupScript>().parent = transform;
// igame.transform.SetParent(transform);
// igame.transform.localScale = Vector3.one;
// var loc = Vector3.zero;
// loc.y = myType == ItemType.big ? -252 : -257;
// igame.transform.localPosition = loc;
//}
//else
//{
// if (myType == ItemType.big)
// {
// var game = Resources.Load<GameObject>("UI/Prefab/Race/ButtonGroup/BtnContainer-Double-H");
// var igame = Instantiate(game);
// igame.name = "BtnContainer";
// igame.GetComponent<RaceButtonGroupScript>().map = mapCompetition;
// igame.GetComponent<RaceButtonGroupScript>().parent = transform;
// igame.transform.Find("BtnJoin").gameObject.SetActive(mapCompetition.CanJoin);
// igame.transform.Find("BtnCancel").gameObject.SetActive(mapCompetition.CanCancelJoin);
// igame.transform.SetParent(transform);
// igame.transform.localScale = Vector3.one;
// igame.transform.GetComponent<RectTransform>().anchorMax = new Vector2(0, 0);
// igame.transform.GetComponent<RectTransform>().anchorMin = new Vector2(1, 0);
// igame.transform.GetComponent<RectTransform>().pivot = new Vector2(0.5f, 0);
// var loc = Vector3.zero;
// loc.y = 20;
// loc.y = 20;
// igame.transform.GetComponent<RectTransform>().anchoredPosition = loc;
// }
// else
// {
// var game = Resources.Load<GameObject>("UI/Prefab/Race/ButtonGroup/BtnContainer-Double-V");
// var igame = Instantiate(game);
// igame.name = "BtnContainer";
// igame.GetComponent<RaceButtonGroupScript>().map = mapCompetition;
// igame.GetComponent<RaceButtonGroupScript>().parent = transform;
// igame.transform.Find("BtnJoin").gameObject.SetActive(mapCompetition.CanJoin);
// igame.transform.Find("BtnCancel").gameObject.SetActive(mapCompetition.CanCancelJoin);
// igame.transform.SetParent(transform);
// igame.transform.localScale = Vector3.one;
// igame.transform.GetComponent<RectTransform>().anchorMax = new Vector2(0, 0);
// igame.transform.GetComponent<RectTransform>().anchorMin = new Vector2(1, 0);
// igame.transform.GetComponent<RectTransform>().pivot = new Vector2(0.5f, 0);
// var loc = Vector3.zero;
// loc.y = 20;
// igame.transform.GetComponent<RectTransform>().anchoredPosition = loc;
// }
//}
//if (transform.Find("Masking").GetComponent<CanvasGroup>().alpha == 1)
//{
// transform.Find("BtnContainer").GetComponent<CanvasGroup>().alpha = 1;
//}
}
private Dictionary<int, string> statusColorDict = new Dictionary<int, string>
@@ -136,9 +154,9 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
else
{
status.GetComponent<RawImage>().color = Utils.HexToColorHtml(statusColorDict[mapCompetition.Status]);
if (mapCompetition.Status == 2 && mapCompetition.HasJoin)
if (mapCompetition.Status == 2 && !mapCompetition.HasJoin)
{
status.Find("Text").GetComponent<Text>().text = "Applied";
status.gameObject.SetActive(false);
}
else
{
@@ -149,7 +167,6 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
public void OnPointerExit(PointerEventData eventData)
{
Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto);
transform.Find("Masking").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);
@@ -176,7 +193,6 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
public void OnPointerEnter(PointerEventData eventData)
{
Cursor.SetCursor(Resources.Load<Texture2D>("Images/PointerButtonHover"), Vector2.zero, CursorMode.Auto);
transform.Find("Masking").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);
@@ -211,12 +227,18 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
var res = ConfigHelper.mapCompetitionApi.ApplyMapCompetition(mapCompetition.Id);
if (res.result)
{
mapCompetition.HasJoin = true;
mapCompetition.CanJoin = false;
transform.Find("CountContainer/Text").GetComponent<Text>().text = (++mapCompetition.ApplyCount).ToString();
SetStatus(mapCompetition);
transform.Find("BtnContainer").gameObject.Destroy();
SetButtonGroup(mapCompetition);
//mapCompetition.HasJoin = true;
//mapCompetition.CanJoin = false;
//transform.Find("CountContainer/Text").GetComponent<Text>().text = (++mapCompetition.ApplyCount).ToString();
//SetStatus(mapCompetition);
//transform.Find("BtnContainer").gameObject.Destroy();
//SetButtonGroup(mapCompetition);
var res1 = ConfigHelper.mapCompetitionApi.GetById(mapCompetition.Id);
if (res1.result)
{
Initial(res1.data, null);
}
Utils.showToast(null, "Successful application!", type: 1);
}
else
@@ -229,12 +251,17 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
var res = ConfigHelper.mapCompetitionApi.CancelMapCompetition(mapCompetition.Id);
if (res.result)
{
mapCompetition.HasJoin = false;
mapCompetition.CanJoin = true;
transform.Find("CountContainer/Text").GetComponent<Text>().text = (--mapCompetition.ApplyCount).ToString();
SetStatus(mapCompetition);
transform.Find("BtnContainer").gameObject.Destroy();
SetButtonGroup(mapCompetition);
//mapCompetition.HasJoin = false;
//mapCompetition.CanJoin = true;
//transform.Find("CountContainer/Text").GetComponent<Text>().text = (--mapCompetition.ApplyCount).ToString();
//SetStatus(mapCompetition);
//transform.Find("BtnContainer").gameObject.Destroy();
//SetButtonGroup(mapCompetition);
var res1 = ConfigHelper.mapCompetitionApi.GetById(mapCompetition.Id);
if (res1.result)
{
Initial(res1.data, null);
}
Utils.showToast(null, "Successful cancellation application!", type: 1);
}
else