Merge branch 'dev_lishuo' into dev_cyp

# Conflicts:
#	Assets/Resources/UI/Prefab/Panel/Mobile/DevicePanel.prefab
#	Assets/Scenes/Login-Mobile.unity
#	Assets/Scenes/Login.unity
#	Assets/Scripts/App.cs
#	Assets/Scripts/Editor.meta
#	Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs

Assets/Scripts/Scenes/BaseScene.cs

@@ -90,7 +90,7 @@ namespace Assets.Scripts.Scenes
             {
                 isNetWorkLose = false;
                 App.delayTime = ping.time;
-                Debug.Log(App.delayTime);
+                //Debug.Log(App.delayTime);
                 ping.DestroyPing();
                 ping = null;
             }

Assets/Scripts/Scenes/LoginController.cs

@@ -187,9 +187,9 @@ public class LoginController : BaseScene
             years.options = regOptions.years;
             months.options = regOptions.months;
             days.options = regOptions.days;
-            years.captionText.text = "Year";
-            months.captionText.text = "Month";
-            days.captionText.text = "Day";
+            years.captionText.text = App.GetLocalString("Year");
+            months.captionText.text = App.GetLocalString("Month");
+            days.captionText.text = App.GetLocalString("Day");
             years.onValueChanged.AddListener((int index) =>
             {
                 if (index != -1 && months.value != -1)
@@ -207,7 +207,7 @@ public class LoginController : BaseScene
                 }
             });
             genders.options = regOptions.genders;
-            genders.captionText.text = "Gender";
+            genders.captionText.text = App.GetLocalString("Gender");
             countrys.options = regOptions.countrys;
             countrys.value = regOptions.countryDefaultValue;
             countrys.onValueChanged.AddListener((int index) =>
@@ -215,7 +215,7 @@ public class LoginController : BaseScene
                 countrys.transform.Find("RawImage").GetComponent<RawImage>().texture = regOptions.GetCountryImage(index);
             });
             units.options = regOptions.units;
-            units.captionText.text = "Display Units";
+            units.captionText.text = App.GetLocalString("Display Units");
             signForm = new SignForm()
             {
                 email = email,
@@ -782,16 +782,16 @@ public class LoginController : BaseScene
         {
             var btn = signPage1.Find("Captcha").Find("BtnGet");
             var btnText = signPage1.Find("Captcha").Find("BtnGet").Find("Text").GetComponent<Text>();
-            btnText.text = $"Again({time--})";
+            btnText.text = $"{App.GetLocalString("Again")}({time--})";
             if (time < 0)
             {
-                btnText.text = "Get";
+                btnText.text = App.GetLocalString("Get");
                 btn.GetComponent<Button>().enabled = true;
                 btn.GetComponent<Button>().interactable = true;
                 startCaptcha = false;
                 //timer.Stop();
             }
-            timer = 1.0f;
+            timer += 1.0f;
         }
     }
 
@@ -1184,7 +1184,7 @@ public class LoginController : BaseScene
             if (type == 0)
             {
                 pageNums = 4;
-                signContainer.Find("signText").GetComponent<Text>().text = "SIGN UP";
+                signContainer.Find("signText").GetComponent<Text>().text = App.GetLocalString("SIGN UP");
                 wxLogin2.gameObject.SetActive(false);
                 signPage1.Find("next").gameObject.SetActive(true);
                 signPage1.Find("BtnModiPass").gameObject.SetActive(false);
@@ -1197,7 +1197,7 @@ public class LoginController : BaseScene
             else
             {
                 pageNums = 4;
-                signContainer.Find("signText").GetComponent<Text>().text = "RESET PASSWORD";
+                signContainer.Find("signText").GetComponent<Text>().text = App.GetLocalString("RESET PASSWORD");
                 wxLogin2.gameObject.SetActive(false);
                 signPage1.Find("next").gameObject.SetActive(false);
                 signPage1.Find("BtnModiPass").gameObject.SetActive(true);

Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs

@@ -222,7 +222,7 @@ namespace Assets.Scenes.Ride.Scripts
             //比赛状态
             CompetitionStatus.text = competition.StatusVlaue.ToString();
             //参赛选手
-            Contestant.text = competition.UserList.Count.ToString() + "Riders";
+            Contestant.text = competition.UserList.Count.ToString() + App.GetLocalString("Riders");
             ShowPlayers(competition.UserList);
             //路书描述
             mapDescText.text = GetMaxString(competition.Dec, 400);
@@ -335,7 +335,7 @@ namespace Assets.Scenes.Ride.Scripts
                 _raceStart = competition.Status == 3;
                 _canEnter = competition.CanEnter;
 
-                Contestant.text = competition.UserList.Count.ToString() + "Riders";
+                Contestant.text = competition.UserList.Count.ToString() + App.GetLocalString("Riders");
                 ShowPlayers(competition.UserList);
             }
         }

Assets/Scripts/Scenes/Ride/Competiton/CountDownFactory.cs

@@ -36,7 +36,7 @@ namespace Assets.Scenes.Ride.Scripts
                 //比赛开始前倒计时
                 if (count >= 0 && !competitionModel.recorderData.Saved)
                 {
-                    ShowCountDown(count, "Get Ready!");//显示倒计时面板信息
+                    ShowCountDown(count, App.GetLocalString("Get Ready!"));//显示倒计时面板信息
                     Timer.gameObject.SetActive(false);
                     TimerTitle.gameObject.SetActive(false);
                 }
@@ -50,7 +50,7 @@ namespace Assets.Scenes.Ride.Scripts
                     {
 #if UNITY_IOS || UNITY_ANDROID
                         //显示倒计时面板信息
-                        ShowCountDown(s.Item1, "Time Limit");
+                        ShowCountDown(s.Item1, App.GetLocalString("Time Limit"));
 #else
                         ShowCountDown(s.Item1, "Get The First Place. Time Limit");
 #endif
@@ -59,7 +59,7 @@ namespace Assets.Scenes.Ride.Scripts
                     {
                         //显示倒计时面板信息
                         //ShowCountDown(s.Item1, "remaining");
-                        ShowCountDown(s.Item1, "Remaining Time");
+                        ShowCountDown(s.Item1, App.GetLocalString("Remaining Time"));
                     }
                     //显示当前选手骑行时间
                     Timer.gameObject.SetActive(true);

Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs

@@ -409,7 +409,7 @@ namespace Assets.Scenes.Ride.Scripts
                 heartRate.text = (currentPlayer.HeartRate ?? 0).ToString();
                 candance.text = $"{Math.Round(currentPlayer.Cadance, 0)}";
                 preSlopeText.text = $"{Math.Round(currentPlayer.PreSlope, 1)}%";
-                currentSlopeToatalDistanceText.text = $"Total:{Math.Round(currentPlayer.CurrentDistance, 0)}M";
+                currentSlopeToatalDistanceText.text = $"{App.GetLocalString("Total")}:{Math.Round(currentPlayer.CurrentDistance, 0)}M";
                 //坡度相关数据
                 nextSlopeText.text = Math.Round(currentPlayer.NextSlope, 1).ToString() + "%";
                 //nextSlopeDistanceText.GetComponent<NumberDotween>().AnimateNum((float)playerController.NextSlopeDistance, 0, "-{0}M");