lvjincheng 3 tahun lalu
induk
melakukan
7d49e05e40
1 mengubah file dengan 2 tambahan dan 2 penghapusan
  1. 2 2
      Assets/BowArrow/Scripts/View/DeviceCalibrateView.cs

+ 2 - 2
Assets/BowArrow/Scripts/View/DeviceCalibrateView.cs

@@ -165,7 +165,7 @@ public class DeviceCalibrateView : MonoBehaviour, MenuBackInterface
         if (action_OnClickMagCalibrateInterceptor != null) {
         if (action_OnClickMagCalibrateInterceptor != null) {
             if (action_OnClickMagCalibrateInterceptor.Invoke()) return;
             if (action_OnClickMagCalibrateInterceptor.Invoke()) return;
         }
         }
-        if (BluetoothAim.ins.status != BluetoothStatusEnum.ConnectSuccess) {
+        if (!calibrateMagDoing && BluetoothAim.ins.status != BluetoothStatusEnum.ConnectSuccess) {
             PopupMgr.ins.ShowTipTop(TextAutoLanguage2.GetTextByKey("device-calibrate_n-connect"));
             PopupMgr.ins.ShowTipTop(TextAutoLanguage2.GetTextByKey("device-calibrate_n-connect"));
             return;
             return;
         }
         }
@@ -235,7 +235,7 @@ public class DeviceCalibrateView : MonoBehaviour, MenuBackInterface
         if (action_OnClickGyrCalibrateInterceptor != null) {
         if (action_OnClickGyrCalibrateInterceptor != null) {
             if (action_OnClickGyrCalibrateInterceptor.Invoke()) return;
             if (action_OnClickGyrCalibrateInterceptor.Invoke()) return;
         }
         }
-        if (BluetoothAim.ins.status != BluetoothStatusEnum.ConnectSuccess) {
+        if (!gyrCalibrating && BluetoothAim.ins.status != BluetoothStatusEnum.ConnectSuccess) {
             PopupMgr.ins.ShowTipTop(TextAutoLanguage2.GetTextByKey("device-calibrate_n-connect"));
             PopupMgr.ins.ShowTipTop(TextAutoLanguage2.GetTextByKey("device-calibrate_n-connect"));
             return;
             return;
         }
         }