yichael 4 роки тому
батько
коміт
d256a26c8b

+ 16 - 16
Assets/BowArrow/Scenes/Game.unity

@@ -186,8 +186,8 @@ RectTransform:
   m_Father: {fileID: 1753347392}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -246,7 +246,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &29012940
 RectTransform:
   m_ObjectHideFlags: 0
@@ -264,7 +264,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 10, y: -206}
+  m_AnchoredPosition: {x: 10, y: -106}
   m_SizeDelta: {x: 380, y: 134}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &29012941
@@ -3752,7 +3752,7 @@ GameObject:
   - component: {fileID: 386084734}
   - component: {fileID: 386084733}
   m_Layer: 0
-  m_Name: Camera2
+  m_Name: CameraTest
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -4382,7 +4382,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0.13043478, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 10, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -4741,7 +4741,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &485623848
 RectTransform:
   m_ObjectHideFlags: 0
@@ -5617,7 +5617,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 10, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -6364,7 +6364,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 30, y: 30}
-  m_SizeDelta: {x: 189, y: 34.5}
+  m_SizeDelta: {x: 183.05084, y: 34.57627}
   m_Pivot: {x: 0, y: 0}
 --- !u!114 &698090360
 MonoBehaviour:
@@ -9026,7 +9026,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &992649508
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -9240,7 +9240,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1020563359
 RectTransform:
   m_ObjectHideFlags: 0
@@ -11428,8 +11428,8 @@ RectTransform:
   m_Father: {fileID: 327121313}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.13043478, y: 0}
+  m_AnchorMax: {x: 0.13043478, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -13473,7 +13473,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1475481933
 RectTransform:
   m_ObjectHideFlags: 0
@@ -15759,7 +15759,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1691070387
 RectTransform:
   m_ObjectHideFlags: 0
@@ -15777,7 +15777,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 30, y: -500}
-  m_SizeDelta: {x: 189, y: 34.5}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1691070388
 MonoBehaviour:

+ 34 - 26
Assets/BowArrow/Scripts/Bluetooth/ShootCheck.cs

@@ -36,23 +36,23 @@ public class ShootCheck : MonoBehaviour
     {
 //socket
         string ipStr = ipInputField.text;//ipInputField.GetComponentInChildren<Text>();
-        string serverIP = ipStr;//"192.168.0.107";
-        // serverIP = "192.168.0.103";
+        string serverIP = ipStr;
+        // serverIP = "192.168.1.109";
         string address = "ws://" + serverIP + ":8088/Ble/";
         webSocket = new WebSocket(new Uri(address));
 #if !UNITY_WEBGL
-            webSocket.StartPingThread = true;
+        webSocket.StartPingThread = true;
 #endif
 
-            // Subscribe to the WS events
-            webSocket.OnOpen += OnOpen;
-            webSocket.OnMessage += OnMessageRecv;
-            webSocket.OnBinary += OnBinaryRecv;
-            webSocket.OnClosed += OnClosed;
-            webSocket.OnError += OnError;
-            // Debug.Log("OnOpen: ");
-            // Start connecting to the server
-            webSocket.Open();
+        // Subscribe to the WS events
+        webSocket.OnOpen += OnOpen;
+        webSocket.OnMessage += OnMessageRecv;
+        webSocket.OnBinary += OnBinaryRecv;
+        webSocket.OnClosed += OnClosed;
+        webSocket.OnError += OnError;
+        // Debug.Log("OnOpen: ");
+        // Start connecting to the server
+        webSocket.Open();
     }
 
     public void Destroy() 
@@ -66,7 +66,7 @@ public class ShootCheck : MonoBehaviour
 
     void OnOpen(WebSocket ws) 
     {
-        // Debug.Log("OnOpen: ");
+        Debug.Log("OnOpen: ");
         webSocket.Send("unity");
     }
 
@@ -109,11 +109,10 @@ public class ShootCheck : MonoBehaviour
         bluetoothShoot.WriteData(JsonUtility.ToJson(cmd).Replace("\"", ""));
     }
 
-
     public void OnDataReceived(byte[] bytes) {
 
         string str = "";
-
+        
         for (int i = 0; i < (bytes.Length-2)/6; i++)
         {
             // float acc = ToAcceleratedSpeed(bytes[i * 10 + 7], bytes[i * 10 + 8]);
@@ -125,16 +124,19 @@ public class ShootCheck : MonoBehaviour
             str += "加速度:"+acc+t+"\n";
             
             // ts[3] = "(采样时间:"+(int)bytes[33] + "分"+ (int)bytes[34]+"秒"+ TwoByteToInt(bytes[31], bytes[32])+"毫秒)" ;
-
+            if (webSocket != null)
+            { 
+                webSocket.Send(str);    
+            }    
             if (ins.check(acc))
             {
                 if (ArmBow.ins != null)
                 {
                     ArmBow.ins.ADS_fire();   
-                   if (webSocket != null)
-                    { 
-                        webSocket.Send(str);    
-                    }   
+                    // if (webSocket != null)
+                    // { 
+                    //     webSocket.Send(str);    
+                    // }   
                 }
             }
         }   
@@ -156,7 +158,7 @@ public class ShootCheck : MonoBehaviour
 
     bool check(float acc)
     {
-        DebugLine.show(acc);
+        // DebugLine.show(acc);
         if (locked) 
         {
             return false;
@@ -165,14 +167,16 @@ public class ShootCheck : MonoBehaviour
         {
             maxAcc = acc;
             return false;
-        } else if (acc < cmd.getAcc() && maxAcc != 0) {
+        } 
+        else if (acc < cmd.getAcc() && maxAcc != 0) {
             shootSpeed = maxAcc;
             // Log("最大加速度:" + maxAcc);
             maxAcc = 0;
             Dolock();
-            Invoke("Unlock", 0.8f);
+            Invoke("Unlock", 1.8f);
             return true;
         }
+
         return false;
     }
 
@@ -199,11 +203,15 @@ public class ShootCheck : MonoBehaviour
 
 [Serializable]
 class CMD {
-    public string ax = "y";
-    public int a = 6000;
+    // public string ax = "y";
+    // public int a = 6000;
+    // public int r = 2;
+    public string a = "y";
+    public int a1 = 2;
+    public int a2 = -2;
     public int r = 2;
 
     public float getAcc() {
-        return a * 0.0005f;
+        return a1 * 0.0005f;
     }
 }