From 37e4c54c20ba412d8cb8dbb5ad98dd9eb46476f5 Mon Sep 17 00:00:00 2001
From: CaiYanPeng <caiyanpeng@juze.pro>
Date: Mon, 22 Nov 2021 16:09:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=82=E5=AF=9F=E8=80=85?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E6=8F=90=E7=A4=BA=E8=BF=9E=E6=8E=A5=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87bug=EF=BC=9B=E6=96=B0=E7=89=88=E6=9C=AC=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E8=BF=9E=E6=8E=A5bug=EF=BC=9B=E5=8D=95=E5=BC=80?=
 =?UTF-8?q?=E9=99=90=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scripts/Scenes/Ride/Scripts/CyclingController.cs |  4 ++--
 .../Scripts/Scenes/Ride/Scripts/PlayerController.cs  |  2 +-
 Assets/Scripts/UI/Prefab/Device/DeviceView.cs        | 12 ++++++++----
 ProjectSettings/GraphicsSettings.asset               |  1 -
 ProjectSettings/ProjectSettings.asset                |  2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs
index 6e1cb681..e3c575a0 100644
--- a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs
+++ b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs
@@ -510,7 +510,7 @@ public class CyclingController : DeviceServiceMonoBase
 #if UNITY_EDITOR
         check = true;
 #endif
-        if (check)
+        if (check || isWatch)
         {
             singleUIManager.StartRide();
             transform.Find("UI/Panel(Clone)/ToolBarPanel/StartOrPauseButton").GetComponent<Button>().enabled = true;
@@ -521,7 +521,7 @@ public class CyclingController : DeviceServiceMonoBase
             transform.Find("UI/Panel(Clone)/ToolBarPanel/StartOrPauseButton").GetComponent<Button>().enabled = false;
             transform.Find("UI/Panel(Clone)/ToolBarPanel/SettingButton").GetComponent<Button>().enabled = false;
             Utils.showToast(null, "Please connect the device!", duration: int.MaxValue, isLowest: true
-            , stopFunc: () => !(!CheckAnt() && !isWatch) || transform.Find("UI/Panel(Clone)/SelectPlayer").gameObject.activeInHierarchy
+            , stopFunc: () => isWatch || CheckAnt() || transform.Find("UI/Panel(Clone)/SelectPlayer").gameObject.activeInHierarchy
             , endCallback: () => 
             {
                 if (!transform.Find("UI/Panel(Clone)/SelectPlayer").gameObject.activeInHierarchy) 
diff --git a/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs b/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs
index 4e34fba5..4b7a306c 100644
--- a/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs
+++ b/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs
@@ -61,7 +61,7 @@ namespace Assets.Scenes.Ride.Scripts
 				weight = App.CurrentUser.Weight;
 				bicycleWeight = App.CurrentUser.BicycleWeight;
 #if UNITY_EDITOR
-                power = 343;
+                power = 143;
 #endif
                 mainController.TrackResistance(currentSlope * App.RideSetting.Sensitivity / 100);
 			}
diff --git a/Assets/Scripts/UI/Prefab/Device/DeviceView.cs b/Assets/Scripts/UI/Prefab/Device/DeviceView.cs
index d63b15a9..b891c899 100644
--- a/Assets/Scripts/UI/Prefab/Device/DeviceView.cs
+++ b/Assets/Scripts/UI/Prefab/Device/DeviceView.cs
@@ -70,10 +70,12 @@ public class DeviceView : MonoBehaviour
         mSearchButton = unconnectionPanel.transform.Find("SearchButton").gameObject;
         mPairButton = unconnectionPanel.transform.Find("PairButton").gameObject;
         searchState = unconnectionPanel.transform.Find("SearchState").GetComponent<Text>();
-        unconnectionButton = unconnectionPanel.GetComponent<Button>();
         mPairButton.SetActive(false);
         connectionPanel = this.transform.Find("ConnectionPanel").gameObject;
+#if UNITY_IOS || UNITY_ANDROID
+        unconnectionButton = unconnectionPanel.GetComponent<Button>();
         connectionButton = connectionPanel.GetComponent<Button>();
+#endif        
         var material = Instantiate(Resources.Load<Material>("UI/Material/RoundedCornersTextureMaterial"));        
         var rect = ((RectTransform)transform).rect;
         material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, rect.height * 0.2f, 0));
@@ -125,7 +127,7 @@ public class DeviceView : MonoBehaviour
         title.text = GetTitle();
 
         connectionPanel.SetActive(false);
-
+#if UNITY_IOS || UNITY_ANDROID
         UIManager.AddEvent(unconnectionButton.gameObject, EventTriggerType.PointerClick, new UnityAction<UnityEngine.EventSystems.BaseEventData>(e =>
         {
             if (!mPairButton.activeSelf)
@@ -134,13 +136,13 @@ public class DeviceView : MonoBehaviour
             }
             connectButtonClick();
         }));
-
+#endif
 
         UIManager.AddEvent(mPairButton, EventTriggerType.PointerClick, new UnityAction<UnityEngine.EventSystems.BaseEventData>(e =>
         {
             connectButtonClick();
         }));
-
+#if UNITY_IOS || UNITY_ANDROID
         UIManager.AddEvent(connectionButton.gameObject, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction<BaseEventData>(e => {
             if (!connectionPanel.activeSelf)
             {
@@ -148,6 +150,7 @@ public class DeviceView : MonoBehaviour
             }
             mDisconnectButtonClick();
         }));
+#endif
 
 
         UIManager.AddEvent(mDisconnectButton, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction<BaseEventData>(e => {
@@ -283,6 +286,7 @@ public class DeviceView : MonoBehaviour
             else {
                 hasDevice = App.MainDeviceAdapter.GetDevices().Any(d => d.Sensor == SensorType);
             }
+            Debug.Log(hasDevice);
             if (hasDevice)
             {
                 mSearchButton.SetActive(false);
diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
index 9b996cb4..4706883c 100644
--- a/ProjectSettings/GraphicsSettings.asset
+++ b/ProjectSettings/GraphicsSettings.asset
@@ -38,7 +38,6 @@ GraphicsSettings:
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 5cd18725..8ed8d1ce 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -86,7 +86,7 @@ PlayerSettings:
   submitAnalytics: 1
   usePlayerLog: 1
   bakeCollisionMeshes: 0
-  forceSingleInstance: 0
+  forceSingleInstance: 1
   useFlipModelSwapchain: 1
   resizableWindow: 0
   useMacAppStoreValidation: 0