From 09f72d10bd20cff4f9b4f224c4b2e02527f38280 Mon Sep 17 00:00:00 2001
From: lishuo <lishuo@juze.pro>
Date: Wed, 28 Jul 2021 21:11:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E6=96=87=E6=96=87=E6=A1=88=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Resources/UI/Prefab/Match/CompetitonPanel.prefab |  4 ++--
 .../Ride/Competiton/CompetitionLoadingController.cs  | 12 +++++++++---
 .../Scripts/UI/Prefab/Race/RaceButtonGroupScript.cs  |  4 ++--
 Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs      |  4 ++--
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Assets/Resources/UI/Prefab/Match/CompetitonPanel.prefab b/Assets/Resources/UI/Prefab/Match/CompetitonPanel.prefab
index 1fe33a30..103d98e3 100644
--- a/Assets/Resources/UI/Prefab/Match/CompetitonPanel.prefab
+++ b/Assets/Resources/UI/Prefab/Match/CompetitonPanel.prefab
@@ -951,7 +951,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Cancel Reserve
+  m_Text: Cancel Reservation
 --- !u!1 &3158444263648747324
 GameObject:
   m_ObjectHideFlags: 0
@@ -1830,7 +1830,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   mType: 0
-  Tooltips: Cancel Apply
+  Tooltips: Cancel Reservation
 --- !u!1 &4760618918347444675
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs
index a9fd960b..c6b1d717 100644
--- a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs
+++ b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs
@@ -39,10 +39,13 @@ namespace Assets.Scenes.Ride.Scripts
             CompetitionDesc = panel.transform.Find("CompetitionDesc").GetComponent<RawImage>();
             SponsorLogoImage = panel.transform.Find("SponsorTitle/Sponsor").GetComponent<RawImage>();
             cyclingController.SetUIManager(mainPanel, modelPanel);
+
         }
         protected override void Start()
         {
             base.Start();
+            Watch.GetComponent<Button>().enabled = false;
+            Watch.GetComponent<Button>().interactable = false;
         }
         MapCompetition competition { get; set; }
         protected override void Update()
@@ -87,6 +90,9 @@ namespace Assets.Scenes.Ride.Scripts
                 {
                     CompetitionStatus.text = competition.StatusVlaue.ToString();
                 }
+
+                Watch.GetComponent<Button>().enabled = process>=100;
+                Watch.GetComponent<Button>().interactable = process >= 100;
             }
             #endregion
         }
@@ -161,7 +167,7 @@ namespace Assets.Scenes.Ride.Scripts
             //路书描述
             mapDescText.text = competition.Dec;
 
-            ReadMore.SetActive(!string.IsNullOrEmpty(competition.Dec));
+            ReadMore.SetActive(!string.IsNullOrEmpty(competition.CompetitionPreviewUrl));
             //主办方logo
             if (!string.IsNullOrEmpty(competition.SponsorCoverage))
             {
@@ -265,7 +271,7 @@ namespace Assets.Scenes.Ride.Scripts
         }
         protected void ApplyRace(BaseEventData baseEvent)
         {
-            UIManager.ShowConfirm("Apply", "Are your want to Apply this race?", async () =>
+            UIManager.ShowConfirm("Join", "you want to join?", async () =>
             {
                 MapCompetitionApi s = ConfigHelper.mapCompetitionApi;
                 var rrr = s.ApplyMapCompetition(cyclingController.competitionId);
@@ -291,7 +297,7 @@ namespace Assets.Scenes.Ride.Scripts
         {
             try
             {
-                UIManager.ShowConfirm("Canel Application", "Are you want to cancel this application?", async () =>
+                UIManager.ShowConfirm("Canel Reservation", "you want to cancel reservation?", async () =>
                 {
                     MapCompetitionApi api = ConfigHelper.mapCompetitionApi;
                     var data = api.CancelMapCompetition(cyclingController.competition.Id);
diff --git a/Assets/Scripts/UI/Prefab/Race/RaceButtonGroupScript.cs b/Assets/Scripts/UI/Prefab/Race/RaceButtonGroupScript.cs
index c91ca30c..100c2e86 100644
--- a/Assets/Scripts/UI/Prefab/Race/RaceButtonGroupScript.cs
+++ b/Assets/Scripts/UI/Prefab/Race/RaceButtonGroupScript.cs
@@ -35,7 +35,7 @@ public class RaceButtonGroupScript : MonoBehaviour
     }
     void GoJoin() 
     {
-        UIManager.ShowConfirm("Apply", "Are you wanting to apply?", () => 
+        UIManager.ShowConfirm("Join", "you want to join?", () => 
         {
             if (!map.HasJoin)
             {
@@ -54,7 +54,7 @@ public class RaceButtonGroupScript : MonoBehaviour
     }
     void GoCancel() 
     {
-        UIManager.ShowConfirm("Cancel application", "Are you wanting to cancel the application?", () =>
+        UIManager.ShowConfirm("Cancel Reservation", "you want to cancel reservation?", () =>
         {
             if (map.HasJoin)
             {
diff --git a/Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs b/Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs
index c9a32628..28ab8153 100644
--- a/Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs
+++ b/Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs
@@ -241,7 +241,7 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
             {
                 Initial(res1.data, null);
             }
-            Utils.showToast(null, "Successful application!", type: 1);
+            Utils.showToast(null, "success", type: 1);
         }
         else 
         {
@@ -264,7 +264,7 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
             {
                 Initial(res1.data, null);
             }
-            Utils.showToast(null, "Successful cancellation application!", type: 1);
+            Utils.showToast(null, "success", type: 1);
         }
         else 
         {