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
This commit is contained in:
commit
190a66bb68
89 files changed
+9195
-1628
No files matched your search
@@ -276,8 +276,8 @@ public class DeviceView : MonoBehaviour
|
||||
connectionPanel.SetActive(false);
|
||||
|
||||
logo.sprite = sprite0;
|
||||
noDevice.text = "NO DEVICE";
|
||||
searchState.text = "Searching...";
|
||||
noDevice.text = App.GetLocalString("NO DEVICE");
|
||||
searchState.text = App.GetLocalString("Searching...");
|
||||
|
||||
var hasDevice = false;
|
||||
if (SensorType == SensorType.SpeedCadence) {
|
||||
|
||||
Reference in new issue
Block a user