From e6e519d166ed5df17dc3185197e3f87588607639 Mon Sep 17 00:00:00 2001
From: lishuo <lishuo@juze.pro>
Date: Thu, 16 Sep 2021 20:12:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B5=9B=E4=BA=8B=E6=8F=90=E9=86=92?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Resources/UI/Prefab/Panel/Mobile/RaceAlertBandPanel.prefab  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/RaceAlertBandPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/RaceAlertBandPanel.prefab
index 640a5a9d..a019baef 100644
--- a/Assets/Resources/UI/Prefab/Panel/Mobile/RaceAlertBandPanel.prefab
+++ b/Assets/Resources/UI/Prefab/Panel/Mobile/RaceAlertBandPanel.prefab
@@ -566,7 +566,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -65.95, y: -22}
+  m_AnchoredPosition: {x: -55.95, y: -22}
   m_SizeDelta: {x: 28.092041, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8555668976453305956

From 9b0c86aefb2147384ecaea9c9a7229a0e0ee4baa Mon Sep 17 00:00:00 2001
From: lishuo <lishuo@juze.pro>
Date: Thu, 16 Sep 2021 20:35:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?watch=E6=8C=89=E9=92=AE=E5=8F=AA=E8=AF=BB?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Ride/Competiton/CompetitionLoadingController.cs   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs
index 39283b0d..20461c5e 100644
--- a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs
+++ b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs
@@ -85,7 +85,7 @@ namespace Assets.Scenes.Ride.Scripts
                 //3.开始按钮
                 rideNow.gameObject.SetActive(_canEnter);
                 //4.详情按钮
-                Detail.SetActive(!_canEnter);
+                Detail.SetActive(!_canEnter && !_canWatch);
                 //5.取消报名按钮 (比赛开始前可以取消报名)
                 CancelJoin.SetActive(_canCancelApply);
 
@@ -98,7 +98,7 @@ namespace Assets.Scenes.Ride.Scripts
                     CompetitionStatus.text = competition.StatusVlaue.ToString();
                 }
 
-                Watch.GetComponent<Button>().enabled = process>=100;
+                //Watch.GetComponent<Button>().enabled = process>=100;
                 Watch.GetComponent<Button>().interactable = process >= 100;
             }
 #endregion
@@ -149,7 +149,8 @@ namespace Assets.Scenes.Ride.Scripts
             Watcher = Resources.Load<GameObject>("UI/Prefab/Match/Watcher");
             MoreHead = Resources.Load<GameObject>("UI/Prefab/Match/MoreHead");
 #endif
-            Watch.GetComponent<Button>().enabled = false;
+            //Watch.GetComponent<Button>().enabled = false;
+   
             Watch.GetComponent<Button>().interactable = false;
 
             UIManager.AddEvent(ReadMore, EventTriggerType.PointerClick, ReadCompetitionPreview);
@@ -267,6 +268,8 @@ namespace Assets.Scenes.Ride.Scripts
         //观察
         protected void StartWatch(BaseEventData baseEvent)
         {
+            if (!Watch.GetComponent<Button>().interactable)
+                return;
             UpdateCompetition();
             if (competition.Status == 4)
             {
@@ -323,7 +326,7 @@ namespace Assets.Scenes.Ride.Scripts
                     Utils.showToast(gameObject, rrr.errMsg);
                 }
                 rideNow.gameObject.SetActive(_canStart);
-                Detail.SetActive(!_canStart);
+                Detail.SetActive(!_canStart && !_canWatch);
                 UIManager.CloseConfirm();
 
             });