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-30 09:54:06 +08:00
2 parents 12838266ba 44c1b771f7
commit bea0e40ec1
2 files changed
+63 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs
+3 -3
View File
@@ -60,8 +60,8 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
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);
container.Find("BtnEnter").gameObject.SetActive(true);
container.Find("BtnWatch").gameObject.SetActive(false);
//if (transform.Find("BtnContainer") != null)
//{
// transform.Find("BtnContainer").gameObject.Destroy();
@@ -147,7 +147,7 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
private void SetStatus(MapCompetition mapCompetition)
{
var status = transform.Find("Status");
if (mapCompetition.Status == 1)
if (mapCompetition.Status <= 1)
{
status.gameObject.SetActive(false);
}