Browse Source

调整图片

slambb 3 months ago
parent
commit
0990e087d7

+ 2 - 2
Assets/BowArrow/Resources/Prefabs/Views/Home/DeviceViewInfrared.prefab

@@ -3036,7 +3036,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: 310, y: -131.5}
+  m_AnchoredPosition: {x: 340, y: -131.5}
   m_SizeDelta: {x: 600, y: 45}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &5424964691604017367
@@ -3103,7 +3103,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: 310, y: -54}
+  m_AnchoredPosition: {x: 340, y: -54}
   m_SizeDelta: {x: 570, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3819646608067363017

BIN
Assets/BowArrow/Textures/Device/gun_icon_PistolM17.png


BIN
Assets/BowArrow/Textures/Device/gun_icon_RifleM416.png


+ 24 - 0
Assets/ShotSimulator/Scripts/Main.cs

@@ -56,6 +56,29 @@ namespace ShotSimulator
             //        }
             //    });
             //}
+#if UNITY_EDITOR
+            if (Input.GetKeyDown(KeyCode.U))
+            {
+                //Ä£ÄâÀ­Ë¨
+                List<byte> data = new List<byte>();
+                data.Add(0x60);
+                data.Add(0x00);
+                data.Add(0x02);
+                data.Add(0x5D);
+                ShootCheck.ins.UpdateChamberState(data.ToArray());
+            }
+            if (Input.GetKeyUp(KeyCode.U))
+            {
+                //Ä£ÄâÀ­Ë¨
+                List<byte> data = new List<byte>();
+                data.Add(0x60);
+                data.Add(0x01);
+                data.Add(0x02);
+                data.Add(0x5D);
+                ShootCheck.ins.UpdateChamberState(data.ToArray());
+            }
+#endif
+
         }
         private void OnDestroy()
         {
@@ -126,6 +149,7 @@ namespace ShotSimulator
         public void OnDeviceAndSystemInfoEvent(ConnectPlatform connectPlatform, BluetoothDeviceType bleDeviceType)
         {
             Debug.Log("[Main]OnDeviceAndSystemInfoEvent£º" + connectPlatform + ",bleDeviceType£º" + bleDeviceType);
+            //CurrentFirearmDevice = FirearmDeviceType.M416;
             switch (bleDeviceType)
             {
                 case BluetoothDeviceType.NONE:

+ 5 - 5
Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/ConnectGuidanceView.prefab

@@ -269,8 +269,8 @@ 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: 36}
-  m_SizeDelta: {x: 466, y: 152}
+  m_AnchoredPosition: {x: 0, y: 68}
+  m_SizeDelta: {x: 466, y: 219}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9137975009170291425
 CanvasRenderer:
@@ -4810,7 +4810,7 @@ RectTransform:
   m_GameObject: {fileID: 6047039976250012411}
   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_LocalScale: {x: 1.2, y: 1.2, z: 1.2}
   m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 7796484021122984181}
@@ -6027,7 +6027,7 @@ RectTransform:
   m_GameObject: {fileID: 8318527416996103894}
   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_LocalScale: {x: 1.2, y: 1.2, z: 1.2}
   m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 1615178565666214287}
@@ -6036,7 +6036,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 67}
-  m_SizeDelta: {x: 86, y: 261}
+  m_SizeDelta: {x: 187, y: 261}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3100775587542485366
 CanvasRenderer:

BIN
Assets/SmartBow/Textures/Guidance/Connect/PistolM17_step2.png


BIN
Assets/SmartBow/Textures/Guidance/Connect/RifleM416_step2.png