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 
# Conflicts:
#	Assets/Scripts/UI/Prefab/Race/RaceButtonGroupScript.cs
This commit is contained in:
lishuo committed 2021-07-26 14:11:10 +08:00
2 parents 1f3485846f 929fb0a1a7
commit 7d0128d912
15 files changed
+1095 -109
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs
+25 -5
View File
@@ -51,7 +51,7 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
private void SetButtonGroup(MapCompetition mapCompetition)
{
if (mapCompetition.Status == 1 || mapCompetition.Status == 3 || (mapCompetition.Status == 2 && !mapCompetition.HasJoin))
if (mapCompetition.Status == 1)
{
var game = Resources.Load<GameObject>("UI/Prefab/Race/ButtonGroup/BtnContainer-Enter");
var igame = Instantiate(game);
@@ -86,11 +86,16 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
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 = -252;
igame.transform.localPosition = loc;
loc.y = 20;
igame.transform.GetComponent<RectTransform>().anchoredPosition = loc;
}
else
{
@@ -99,11 +104,16 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
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 = -209;
igame.transform.localPosition = loc;
loc.y = 20;
igame.transform.GetComponent<RectTransform>().anchoredPosition = loc;
}
}
}
@@ -218,12 +228,17 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
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);
Utils.showToast(null, "Successful application!", type: 1);
}
else
{
Utils.showToast(null, res.errMsg, type: 0);
}
}
public void CancelJoin()
{
@@ -231,11 +246,16 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
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);
Utils.showToast(null, "Successful cancellation application!", type: 1);
}
else
{
Utils.showToast(null, res.errMsg, type: 0);
}
}
}