From c96cdbb163486fb4097d633227c7358bac369cf7 Mon Sep 17 00:00:00 2001
From: lishuo <lishuo@juze.pro>
Date: Wed, 28 Jul 2021 18:56:23 +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

---
 .../Scenes/Ride/Competiton/CompetitionLoadingController.cs   | 4 ++--
 Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs          | 5 +++++
 Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs      | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs
index 784835c4..a9fd960b 100644
--- a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs
+++ b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs
@@ -81,7 +81,7 @@ namespace Assets.Scenes.Ride.Scripts
 
                 if (_canCancelApply)
                 {
-                    CompetitionStatus.text = "applied";
+                    CompetitionStatus.text = "Registered";
                 }
                 else
                 {
@@ -156,7 +156,7 @@ namespace Assets.Scenes.Ride.Scripts
             //比赛状态
             CompetitionStatus.text = competition.StatusVlaue.ToString();
             //参赛选手
-            Contestant.text = competition.UserList.Count.ToString() + "Players";
+            Contestant.text = competition.UserList.Count.ToString() + "Riders";
             ShowPlayers(competition.UserList);
             //路书描述
             mapDescText.text = competition.Dec;
diff --git a/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs b/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs
index 1dd23849..f22ee99b 100644
--- a/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs
+++ b/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs
@@ -298,6 +298,11 @@ namespace Assets.Scenes.Ride.Scripts
             }
             else
             {
+                //如果是参赛选手默认进入3d视角
+                if (mainController.cyclingModel == Model.CyclingModel.Competition && !mainController.isWatch)
+                {
+                    return;
+                }
                 mainController.Is3dView = false;
                 ChangeView(null);
             }
diff --git a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs
index 633c8940..c5fa3f18 100644
--- a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs
+++ b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs
@@ -130,6 +130,7 @@ public class CyclingController : DeviceServiceMonoBase
         //进入比赛
         if (competitionId > 0)
         {
+            this.cyclingModel = CyclingModel.Competition;
             StartCoroutine(InitRace());
             return;
         }