lvjincheng 3 years ago
parent
commit
aaa5796cf9

+ 8 - 0
Assets/BowArrow/DebugShoot/BluetoothClient.cs

@@ -79,6 +79,14 @@ public class BluetoothClient : MonoBehaviour
         }
     }
 
+    public static void UploadError(params string[] errors) {
+        try {
+            BluetoothClient.ins.ws.Send(
+                BluetoothClient.PackData("showError", errors, 1)
+            );
+        } catch (System.Exception) {}
+    }
+
     void Log(string text) {
         if (this.text != null)
         {

+ 3 - 3
Assets/BowArrow/Scenes/Entry.unity

@@ -440,7 +440,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &730210589
 RectTransform:
   m_ObjectHideFlags: 0
@@ -457,7 +457,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: -253}
   m_SizeDelta: {x: 200, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &730210590
@@ -493,7 +493,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: TipText
+  m_Text: 
 --- !u!222 &730210591
 CanvasRenderer:
   m_ObjectHideFlags: 0

+ 0 - 5
Assets/BowArrow/Scripts/Bluetooth/BluetoothAim.cs

@@ -248,11 +248,6 @@ public class BluetoothAim : MonoBehaviour
             status = BluetoothStatusEnum.Connect;
             userDoConnect = false;
             PopupMgr.ins.ShowTip(TextAutoLanguage2.GetTextByKey("ble-please-open-ble"));
-            // try {
-            //     BluetoothClient.ins.ws.Send(
-            //         BluetoothClient.PackData("showError", new string[]{e.Message, e.StackTrace}, 1)
-            //     );
-            // } catch (System.Exception) {}
         }
     }
 

+ 2 - 2
Assets/BowArrow/Scripts/Entry.cs

@@ -20,8 +20,8 @@ public class Entry : MonoBehaviour
         // QualitySettings.vSyncCount = 0;
         // Application.targetFrameRate = 60;
         QualitySettings.vSyncCount = 1;
-        SetTip("Loading", Color.white, 56);
-        versionText.text = "Version_" + appVersion + "_R4";
+        // SetTip("Loading", Color.white, 56);
+        versionText.text = "Version_" + appVersion + "_R5";
         //SetTip("正在检测对比软件版本", Color.white);
         StartCoroutine(CheckAppVersion());
         StartCoroutine(AsyncLoadScene());

+ 3 - 3
Assets/BowArrow/Scripts/Manager/LoginMgr/LoginMgr.cs

@@ -118,11 +118,11 @@ public class UserSettings {
                     _ins = new UserSettings();
                 }
                 if (CommonConfig.SpecialVersion1) {
-                    if (PlayerPrefs.GetInt("sv1_UserSettings", 0) == 0) {
-                        PlayerPrefs.SetInt("sv1_UserSettings", 1);
+                    if (PlayerPrefs.GetInt("sv1_UserSettings_1", 0) == 0) {
+                        PlayerPrefs.SetInt("sv1_UserSettings_1", 1);
                         UserSettings us = _ins;
                         us.bowRotateConvert.screenSize = 60;
-                        us.bowRotateConvert.screenDistance = 1.5f;
+                        us.bowRotateConvert.screenDistance = 0.5f;
                         us.Save();
                     }
                 }