旧版

Assets/BowArrow/Resources/Prefabs/BluetoothHolder.prefab

@@ -4752,7 +4752,7 @@ MonoBehaviour:
   ArmBowInputField: {fileID: 4889630303034740394}
   canAdjustNormalOrHightMode: 0
   transportMode: 0
-  arrowWeight: 60
+  arrowWeight: 75
 --- !u!1 &4155488363616937900
 GameObject:
   m_ObjectHideFlags: 0
@@ -5380,7 +5380,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e5464d6e6018e9446afd6b54a9ef1431, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  serverIP: www.yuyekeji.cn
+  serverIP: 42.192.165.168
   text: {fileID: 0}
 --- !u!114 &4155488363985279407
 MonoBehaviour:

Assets/BowArrow/Scenes/Home.unity

@@ -657,100 +657,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 519399979}
   m_CullTransparentMesh: 1
---- !u!1 &551154238
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 551154239}
-  - component: {fileID: 551154242}
-  - component: {fileID: 551154241}
-  - component: {fileID: 551154240}
-  m_Layer: 5
-  m_Name: T
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &551154239
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 551154238}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 2012199177}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 60, y: -50}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 1}
---- !u!114 &551154240
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 551154238}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 2
---- !u!114 &551154241
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 551154238}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 40
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 3
-    m_MaxSize: 40
-    m_Alignment: 3
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: DebugForDevice
---- !u!222 &551154242
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 551154238}
-  m_CullTransparentMesh: 1
 --- !u!1 &573417276
 GameObject:
   m_ObjectHideFlags: 0
@@ -2776,195 +2682,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1945037058}
   m_CullTransparentMesh: 0
---- !u!1 &2012199173
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2012199177}
-  - component: {fileID: 2012199176}
-  - component: {fileID: 2012199175}
-  - component: {fileID: 2012199174}
-  - component: {fileID: 2012199178}
-  m_Layer: 5
-  m_Name: DebugForDevice
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &2012199174
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2012199173}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
---- !u!114 &2012199175
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2012199173}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
---- !u!223 &2012199176
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2012199173}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 0
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 4000
-  m_TargetDisplay: 0
---- !u!224 &2012199177
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2012199173}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
-  m_Children:
-  - {fileID: 2069336234}
-  - {fileID: 551154239}
-  m_Father: {fileID: 0}
-  m_RootOrder: 7
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 0}
---- !u!114 &2012199178
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2012199173}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: bfc940c5de8cb0d4aab7458c3097c075, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!1 &2069336233
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2069336234}
-  - component: {fileID: 2069336236}
-  - component: {fileID: 2069336235}
-  m_Layer: 5
-  m_Name: BG
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2069336234
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2069336233}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 2012199177}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 225}
-  m_SizeDelta: {x: 0, y: -450}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &2069336235
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2069336233}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.60784316}
-  m_RaycastTarget: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!222 &2069336236
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2069336233}
-  m_CullTransparentMesh: 1
 --- !u!1 &2079189700
 GameObject:
   m_ObjectHideFlags: 0

Assets/BowArrow/Scripts/Bluetooth/AimHandler.cs

@@ -216,11 +216,6 @@ public class AimHandler : MonoBehaviour
                 DeviceBatteryView.ins.RenderBattery(1, bytes[0]);
                 return;
             }
-            if (bytes.Length >= 3 && bytes[2] == 5)
-            {
-                string info = ShootCheck.ins.ShootByInfrared(bytes);
-                if (DebugForDevice.ins) DebugForDevice.ins.LogInfrared(bytes, info);
-            }
             return;
         }
         if (bytes[7] == 0 && bytes[8] == 0 && bytes[9] == 0 && bytes[10] == 0 && bytes[11] == 0 && bytes[12] == 0)

Assets/BowArrow/Scripts/Bluetooth/BluetoothHolder.cs

@@ -5,7 +5,7 @@ using UnityEngine.UI;
 
 public class BluetoothHolder : MonoBehaviour
 {   
-    bool debug = true;
+    bool debug = false;
     GameObject magEllipse;
     HashSet<Object> magEllipseViewers = new HashSet<Object>();
     public static BluetoothHolder ins;

Assets/BowArrow/Scripts/Bluetooth/ShootCheck.cs

@@ -225,7 +225,7 @@ public class ShootCheck : MonoBehaviour
         return (int)shortNum;
     }
 
-    public float arrowWeight = 60; //实体模具箭重，单位克
+    public float arrowWeight = 75; //实体模具箭重，单位克
 
     bool check(float ax, float ay, float az, string t)
     {
@@ -324,20 +324,6 @@ public class ShootCheck : MonoBehaviour
         return false;
     }
 
-    public string ShootByInfrared(byte[] bytes) {
-        float time1 = ((bytes[5] << 8) + bytes[6]) * 0.1f;
-        float time2 = ((bytes[7] << 8) + bytes[8]) * 0.1f; 
-        float speed = 0.05f / (time1 / 1000 + time2 / 1000);
-        shootSpeed = Mathf.Sqrt(speed * speed * arrowWeight / LoginMgr.myUserInfo.actualArrowWeight);  
-        string logTxt = $"时长1：{time1}毫秒，时长2：{time2}毫秒，弓轨速度：{speed}m/s，箭的速度：{shootSpeed}m/s";
-        Debug.Log(logTxt);
-        try {
-            ShootCheck.ins.webSocket.Send(logTxt);
-        } catch (Exception) {}
-        if (ArmBow.ins) ArmBow.ins.ADS_fire();
-        return logTxt;
-    }
-
     void Dolock() 
     {
         locked = true;

Assets/BowArrow/Scripts/Debug/DebugForDevice.cs

@@ -1,42 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-public class DebugForDevice : MonoBehaviour
-{
-    public static DebugForDevice ins;
-
-    void Awake()
-    {
-        if (ins) {
-            Destroy(this.gameObject);
-        } else {
-            ins = this;
-            DontDestroyOnLoad(this.gameObject);
-        }
-    }
-
-    int tid = 0;
-    string[] logs = new string[3];
-
-    public void LogInfrared(byte[] bytes, string info) {
-        tid++;
-        string bytesLog = string.Join(", ", bytes);
-        string text = $"第{tid}波信息\n原始数据：{bytesLog}\n{info}\n\n";
-        if (tid <= logs.Length) {
-            logs[tid - 1] = text;
-        } else {
-            for (int i = 0; i < logs.Length - 1; i++) {
-                logs[i] = logs[i + 1];
-            }
-            logs[logs.Length - 1] = text;
-        }
-        string logInfo = "";
-        for (int i = 0; i < tid && i < logs.Length; i++) {
-            logInfo += logs[i];
-        }
-        this.transform.Find("T").GetComponentInChildren<Text>().text = logInfo;
-    }
-}

Assets/BowArrow/Scripts/Debug/DebugForDevice.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: bfc940c5de8cb0d4aab7458c3097c075
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/BowArrow/Scripts/Manager/LoginMgr.cs

@@ -30,7 +30,7 @@ public class LoginMgr : MonoBehaviour
     [SerializeField] Text registerTip;
 
     public static UserInfo myUserInfo = new UserInfo();
-    static int userInfo_version = 0;
+    static int userInfo_version = 1000;
 
     int loginMode = 1;
 
@@ -263,7 +263,7 @@ public class UserInfo {
     public bool gameRule2GuideFinish = false;
     public bool openCrossHair = true;
     public int shootLevel = 0;
-    public float actualArrowWeight = 27; //实际需要的箭重，单位克
+    public float actualArrowWeight = 20; //游戏里的箭重，单位克
 
     public void Save()
     {

Assets/BowArrow/Scripts/View/DeviceReconnectView.cs

@@ -39,7 +39,7 @@ public class DeviceReconnectView : MonoBehaviour
         GameMgr.ins.addLockerForGamePause(this);
 
         //用于测试阶段，暂时屏蔽该页面
-        Destroy(this.gameObject); if (onComplete != null) onComplete();
+        // Destroy(this.gameObject); if (onComplete != null) onComplete();
     }
 
     void OnDestroy()