lvjincheng 4 лет назад
Родитель
Сommit
603c01059a

+ 9 - 9
Assets/BowArrow/Resources/Prefabs/Views/DeviceCalibrateView.prefab

@@ -1329,7 +1329,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6984168368599178995
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2343,9 +2343,9 @@ RectTransform:
   m_Father: {fileID: 6984168369480428192}
   m_RootOrder: 0
   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_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 60, y: -50}
   m_SizeDelta: {x: 40, y: 38}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6984168369211799016
@@ -2735,7 +2735,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: -120}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 746, y: 100}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &6984168369480428196
 CanvasRenderer:
@@ -3217,10 +3217,10 @@ RectTransform:
   m_Father: {fileID: 6984168369480428192}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 403, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 403, y: -50}
+  m_SizeDelta: {x: 606, y: 26.666666}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6984168369721823361
 CanvasRenderer:

Разница между файлами не показана из-за своего большого размера
+ 670 - 163
Assets/BowArrow/Resources/Prefabs/Views/SetUpView.prefab


+ 0 - 477
Assets/BowArrow/Scenes/Game.unity

@@ -18359,483 +18359,6 @@ Transform:
   m_Father: {fileID: 543450653403098907}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &4155488363971865835
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 4155488361951293519, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 192
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488361951293519, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 35.333332
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362036649873, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362036649873, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362036649873, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362036649873, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362036649873, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 550
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362036649873, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -150
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362149718586, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362149718586, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362149718586, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362149718586, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362149718586, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 50
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362149718586, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -50
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362297396305, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362297396305, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362297396305, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362297396305, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362297396305, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 300
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362297396305, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -250
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362393410545, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362393410545, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362393410545, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362393410545, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362393410545, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 50
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362393410545, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -150
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362476328252, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362476328252, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362476328252, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362476328252, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362476328252, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 50
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362476328252, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -250
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362505518322, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362505518322, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362505518322, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362505518322, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362505518322, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 50
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362505518322, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -350
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362558868471, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362558868471, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362558868471, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362558868471, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362558868471, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 550
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362558868471, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -450
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362602532502, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362602532502, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362602532502, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362602532502, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362602532502, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 300
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362602532502, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -450
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362609883703, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362609883703, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362609883703, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362609883703, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362609883703, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 300
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362609883703, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -150
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362686753207, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 192
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362686753207, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 35.333332
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362869047204, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362869047204, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362869047204, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362869047204, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362869047204, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 550
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488362869047204, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -350
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363126191678, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_RootOrder
-      value: 8
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363126191678, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363126191678, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363126191678, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363126191678, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363126191678, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363126191678, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363126191678, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363126191678, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363126191678, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363126191678, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363126191679, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_Name
-      value: BluetoothHolder
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363126191679, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363350780170, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363350780170, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363350780170, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363350780170, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363350780170, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 50
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363350780170, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -550
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363387583826, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363387583826, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363387583826, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363387583826, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363387583826, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 50
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363387583826, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -450
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363468626616, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 192
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363468626616, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 35.333332
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363616937891, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363616937891, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363616937891, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363616937891, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363616937891, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 300
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363616937891, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -50
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363650090407, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363650090407, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363650090407, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363650090407, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363650090407, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 550
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363650090407, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -50
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363672204475, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363672204475, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363672204475, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363672204475, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363672204475, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 300
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363672204475, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -350
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363756186604, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363756186604, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363756186604, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363756186604, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363756186604, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 550
-      objectReference: {fileID: 0}
-    - target: {fileID: 4155488363756186604, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -250
-      objectReference: {fileID: 0}
-    - target: {fileID: 5656393347278700491, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 9022328598563899532, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: f08a06bfad2f39347ab363c87892b785, type: 3}
 --- !u!33 &4299754946339375393
 MeshFilter:
   m_ObjectHideFlags: 0

+ 26 - 10
Assets/BowArrow/Scenes/Home.unity

@@ -311,7 +311,7 @@ RectTransform:
   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_AnchoredPosition: {x: 9, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &219397737
@@ -327,7 +327,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -336,7 +336,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 16
+    m_FontSize: 18
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
@@ -1032,6 +1032,22 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2042949644155045775, guid: a48397ba16177824490358094702652f, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2042949644155045775, guid: a48397ba16177824490358094702652f, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2042949644155045775, guid: a48397ba16177824490358094702652f, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2042949644155045775, guid: a48397ba16177824490358094702652f, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2080843917696056252, guid: a48397ba16177824490358094702652f, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -1062,7 +1078,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2424329064154535202, guid: a48397ba16177824490358094702652f, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 56
       objectReference: {fileID: 0}
     - target: {fileID: 2424329064154535202, guid: a48397ba16177824490358094702652f, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -1775,7 +1791,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1854,7 +1870,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1938,7 +1954,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Padding:
     m_Left: 0
-    m_Right: 30
+    m_Right: 45
     m_Top: 10
     m_Bottom: 0
   m_ChildAlignment: 4
@@ -2093,7 +2109,7 @@ RectTransform:
   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_AnchoredPosition: {x: 97, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1698308730
@@ -2123,7 +2139,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2132,7 +2148,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 16
+    m_FontSize: 18
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1

+ 0 - 1
Assets/BowArrow/Scripts/Bluetooth/AimHandler.cs

@@ -117,7 +117,6 @@ public class AimHandler : MonoBehaviour
             if (calibration)
             {
                 GyrCalibrationButton.GetComponentInChildren<Text>().text = "停止陀螺仪校准";
-
             }
             else
             {

+ 17 - 0
Assets/BowArrow/Scripts/Bluetooth/BluetoothHolder.cs

@@ -6,6 +6,8 @@ using UnityEngine.UI;
 public class BluetoothHolder : MonoBehaviour
 {   
     bool debug = true;
+    GameObject magEllipse;
+    HashSet<Object> magEllipseViewers = new HashSet<Object>();
     public static BluetoothHolder ins;
 
     public static void Init()
@@ -28,18 +30,33 @@ public class BluetoothHolder : MonoBehaviour
     }
 
     void Start() {
+        magEllipse = this.transform.Find("test-ellipse").gameObject;
         if (!debug) {
             this.transform.Find("CanvasForOpenDebug").gameObject.SetActive(false);
         }
         CloseDebug();
     } 
 
+    public void ShowMagEllipse(Object viewer)
+    {
+        magEllipseViewers.Add(viewer);
+        if (magEllipseViewers.Count == 1) magEllipse.SetActive(true);
+    }
+
+    public void HideMagEllipse(Object viewer)
+    {
+        magEllipseViewers.Remove(viewer);
+        if (magEllipseViewers.Count == 0) magEllipse.SetActive(false);
+    }
+
     public void openDebug() {
+        ShowMagEllipse(this);
         this.transform.Find("Canvas").gameObject.SetActive(true);
         this.transform.Find("Objects").gameObject.SetActive(true);
     }
 
     public void CloseDebug() {
+        HideMagEllipse(this);
         this.transform.Find("Canvas").gameObject.SetActive(false);
         this.transform.Find("Objects").gameObject.SetActive(false);
     }

+ 60 - 36
Assets/BowArrow/Scripts/Components/TextAutoLanguage.cs

@@ -135,12 +135,6 @@ class LanguageDefault {
     public string text49 = "请输入游戏昵称";
     public string text50 = "该用户无法重复注册";
     public string text51 = "注册成功";
-    public string text52 = "背景音乐";
-    public string text53 = "音效";
-    public string text54 = "语言";
-    public string text55 = "陀螺仪校准";
-    public string text56 = "地磁计校准";
-    public string text57 = "简体中文";
     public string text61 = "请连接设备";
     public string text62 = "关闭";
     public string text63 = "商品";
@@ -155,17 +149,6 @@ class LanguageDefault {
     public string text72 = "玩家1";
     public string text73 = "玩家2";
     public string text74 = "开始游戏";
-    public string text76 = "视角归位";
-    public string text77 = "上一步";
-    public string text78 = "下一步";
-    public string text79 = "完成";
-    public string text80 = "视角回正";
-    public string text81 = "实体弓指向正前方,然后点击视角回正。";
-    public string text82 = "开始校准";
-    public string text83 = "停止校准";
-    public string text84 = "尽量尝试多角度旋转模块,直到XYZ三个象限中多点形成圆形为止。";
-    public string text85 = "开始校准";
-    public string text86 = "校准时需要将瞄准模块静止放在桌面上。";
     public string text87 = "本轮玩家";
     public string text88 = "继续";
     public string text89 = "主页";
@@ -200,7 +183,26 @@ class LanguageDefault {
     //设置页面
     public string text300 = "退出登录";
     public string text301 = "关于我们";
-
+    public string text302 = "背景音乐";
+    public string text303 = "音效";
+    public string text304 = "语言";
+    public string text305 = "简体中文";
+    public string text306 = "十字准心";
+    public string text307 = "开";
+    public string text308 = "关";
+    //设备校准页面
+    public string text76 = "视角归位";
+    public string text77 = "上一步";
+    public string text78 = "下一步";
+    public string text79 = "完成";
+    public string text80 = "视角回正";
+    public string text81 = "实体弓指向正前方,然后点击视角回正。";
+    public string text82 = "开始校准";
+    public string text83 = "停止校准";
+    public string text84 = "尽量尝试多角度旋转模块,直到XYZ三个象限中多点形成圆形为止。";
+    public string text85 = "开始校准";
+    public string text86 = "校准时需要将瞄准模块静止放在桌面上。";
+    public string text116 = "重新校准";
     //游戏场景通用UI信息
     public string text200 = "引导";
     public string text201 = "开镜";
@@ -225,6 +227,16 @@ class LanguageDefault {
     // 道具介绍
     public string text111000 = "射箭瞄准时,视距放大{0}倍。";
     public string text111001 = "射箭时,射程增加{0}倍。";
+
+    //设备名称
+    public string text201000 = "18磅反曲弓";
+    public string text201001 = "25磅反曲弓";
+    public string text201002 = "碳纤维箭";
+
+    // 设备介绍
+    public string text211000 = "奥运比赛专用比赛弓";
+    public string text211001 = "奥运比赛专用比赛弓";
+    public string text211002 = "奥运比赛专用比赛箭";
 }
 class LanguageEnglish : LanguageDefault {
     public new string text1 = "Name :";
@@ -278,12 +290,6 @@ class LanguageEnglish : LanguageDefault {
     public new string text49 = "Please Enter Nickname";
     public new string text50 = "Unable To Re Register";
     public new string text51 = "Register Successful";
-    public new string text52 = "BGM";
-    public new string text53 = "Sound";
-    public new string text54 = "Language";
-    public new string text55 = "Gyr Calibration";
-    public new string text56 = "Mag Calibration";
-    public new string text57 = "English";
     public new string text61 = "Please Connect Device";
     public new string text62 = "Close";
     public new string text63 = "Products";
@@ -298,17 +304,6 @@ class LanguageEnglish : LanguageDefault {
     public new string text72 = "Player1";
     public new string text73 = "Player2";
     public new string text74 = "Start";
-    public new string text76 = "Identity";
-    public new string text77 = "Back";
-    public new string text78 = "Next";
-    public new string text79 = "Complete";
-    public new string text80 = "Identity";
-    public new string text81 = "Point the solid bow to the front, and then click \nthe angle of view to return to the front.";
-    public new string text82 = "Calibrate";
-    public new string text83 = "Stop";
-    public new string text84 = "Try to rotate the module at multiple angles until \nmultiple points in the three quadrants of XYZ form a circle.";
-    public new string text85 = "Calibrate";
-    public new string text86 = "During calibration, the aiming module needs to be placed on the desktop.";
     public new string text87 = "Current Round Player";
     public new string text88 = "Continue";
     public new string text89 = "Home";
@@ -343,7 +338,26 @@ class LanguageEnglish : LanguageDefault {
     //设置页面
     public new string text300 = "Quit Login";
     public new string text301 = "About Us";
-
+    public new string text302 = "BGM";
+    public new string text303 = "Sound";
+    public new string text304 = "Language";
+    public new string text305 = "English";
+    public new string text306 = "CrossHair";
+    public new string text307 = "ON";
+    public new string text308 = "OFF";
+    //设备校准页面
+    public new string text76 = "Identity";
+    public new string text77 = "Back";
+    public new string text78 = "Next";
+    public new string text79 = "Complete";
+    public new string text80 = "Identity";
+    public new string text81 = "Point the solid bow to the front, and then click \nthe angle of view to return to the front.";
+    public new string text82 = "Calibrate";
+    public new string text83 = "Stop";
+    public new string text84 = "Try to rotate the module at multiple angles until \nmultiple points in the three quadrants of XYZ form a circle.";
+    public new string text85 = "Calibrate";
+    public new string text86 = "During calibration, the aiming module needs to be placed on the desktop.";
+    public new string text116 = "Redo";
     //游戏场景通用UI信息
     public new string text200 = "Guide";
     public new string text201 = "Scope";
@@ -368,4 +382,14 @@ class LanguageEnglish : LanguageDefault {
     // 道具介绍
     public new string text111000 = "When shooting, the sight distance is enlarged by {0} times.";
     public new string text111001 = "In archery, the range increases by {0} times.";
+
+    //设备名称
+    public new string text201000 = "18 Pound Bow";
+    public new string text201001 = "25 Pound Bow";
+    public new string text201002 = "Carbon Giber Arrow";
+
+    // 设备介绍
+    public new string text211000 = "Special bow for Olympic Games.";
+    public new string text211001 = "Special bow for Olympic Games.";
+    public new string text211002 = "Special competition arrow for Olympic Games.";
 }

+ 24 - 1
Assets/BowArrow/Scripts/Manager/DeviceMgr.cs

@@ -1,8 +1,31 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using Newtonsoft.Json;
 
 public class DeviceMgr
 {
-    
+    static DeviceMgr _ins = null;
+    public static DeviceMgr ins {
+        get {
+            if (_ins == null) {
+                _ins = new DeviceMgr();
+            }
+            return _ins;
+        }
+    }
+}
+public class DeviceInfo
+{
+    public int id = 0;
+    public bool inuse = false;
+    [JsonIgnore]
+    public DeviceConfig config = null;
+}
+public class DeviceConfig
+{
+    public int id = 0;
+    public string name = "";
+    public string detail = "";
+    public int difficulty = 0;
 }

+ 66 - 53
Assets/BowArrow/Scripts/View/DeviceCalibrateView.cs

@@ -13,7 +13,6 @@ public class DeviceCalibrateView : MonoBehaviour
     [SerializeField] Button btnNext;
     [SerializeField] Button btnFinish;
 
-    bool canUpdateGyrCalibrateProgress = false;
     public DeviceCalibrateItem deviceCalibrateItem = DeviceCalibrateItem.Guide;
     DeviceCalibrateItem[] deviceCalibrateItemForGuide = {
         DeviceCalibrateItem.Gyr,
@@ -22,7 +21,7 @@ public class DeviceCalibrateView : MonoBehaviour
     };
     int guideIndex = 0;
     public bool guide = true;
-
+    
     public static void Create(DeviceCalibrateItem itemType = DeviceCalibrateItem.Guide) {
         GameObject o = GameObject.Instantiate(Resources.Load<GameObject>("Prefabs/Views/DeviceCalibrateView"));
         o.GetComponent<DeviceCalibrateView>().deviceCalibrateItem = itemType;
@@ -31,9 +30,7 @@ public class DeviceCalibrateView : MonoBehaviour
 
     void Start()
     {
-        // if (GameMgr.ins) {
-        //     GameMgr.ins.addLockerForGamePause(this);
-        // }
+        BluetoothHolder.ins.ShowMagEllipse(this);
         btnGyrCalibrate.GetComponent<Button>().onClick.AddListener(ClickGyrCalibrate);
         btnMagCalibrate.GetComponent<Button>().onClick.AddListener(ClickMagCalibrate);
         btnIdentityCalibrate.GetComponent<Button>().onClick.AddListener(ClickIdentityCalibrate);
@@ -56,46 +53,61 @@ public class DeviceCalibrateView : MonoBehaviour
 
     void OnDestroy()
     {
-        // if (GameMgr.ins) {
-        //     GameMgr.ins.removeLockerForGamePause(this);
-        // }
-
-        if (guide) 
-        {
-            AimHandler.ins.CalibrateGyr(false);
-            AimHandler.ins.CalibrateMag(false);
-        } 
-        else if (deviceCalibrateItem == DeviceCalibrateItem.Gyr)
-        {
+        BluetoothHolder.ins.HideMagEllipse(this);
+        if (gyrCalibrating) {
             AimHandler.ins.CalibrateGyr(false);
         }
-        else if (deviceCalibrateItem == DeviceCalibrateItem.Mag)
-        {
+        if (magCalibrating) {
             AimHandler.ins.CalibrateMag(false);
         }
     }
 
+    bool canUpdateGyrCalibrateProgress = false;
     void Update()
     {   
         if (canUpdateGyrCalibrateProgress) {
             int progress = (int) ((float) AimHandler.ins.gyrCalibrateCompleteCount * 100 / (float) AimHandler.ins.gyrCalibrateTotalCount);
              progressGyrCalibrate.text = progress + "%";
             if (progress >= 100) {
-                ClickGyrCalibrate();
+                FinishGyrCalibrate();
+            }
+        }
+    }
+
+    void RefreshPage() {
+        if (guide) {
+            deviceCalibrateItem = deviceCalibrateItemForGuide[guideIndex];
+            if (guideIndex == 0) {
+                btnBack.gameObject.SetActive(false);
+                btnNext.gameObject.SetActive(true);
+                btnFinish.gameObject.SetActive(false);
+            } else if (guideIndex == deviceCalibrateItemForGuide.Length - 1) {
+                btnBack.gameObject.SetActive(true);
+                btnNext.gameObject.SetActive(false);
+                btnFinish.gameObject.SetActive(true);    
+            } else {
+                btnBack.gameObject.SetActive(true);
+                btnNext.gameObject.SetActive(true);
+                btnFinish.gameObject.SetActive(false);
             }
+        } else {
+            btnBack.gameObject.SetActive(false);
+            btnNext.gameObject.SetActive(false);
+            btnFinish.gameObject.SetActive(true);
         }
+        this.transform.Find("Gyr").gameObject.SetActive(deviceCalibrateItem == DeviceCalibrateItem.Gyr);
+        this.transform.Find("Mag").gameObject.SetActive(deviceCalibrateItem == DeviceCalibrateItem.Mag);
+        this.transform.Find("Identity").gameObject.SetActive(deviceCalibrateItem == DeviceCalibrateItem.Identity);
     }
 
+    // ------ 陀螺仪校准 ------
+    bool gyrCalibrating = false;
     void ClickGyrCalibrate() 
     {
         Button btn = btnGyrCalibrate.GetComponent<Button>();
-        btn.enabled = !btn.enabled;
+        gyrCalibrating = !gyrCalibrating;
         if (btn.enabled) {
-            btn.GetComponent<Image>().sprite = Resources.Load<Sprite>("Textures/Common/ButtonBlue");
-            btn.GetComponentInChildren<Text>().color = Color.white;
-            canUpdateGyrCalibrateProgress = false;
-            AimHandler.ins.CalibrateGyr(false);
-        } else {
+            btn.enabled = false;
             btn.GetComponent<Image>().sprite = Resources.Load<Sprite>("Textures/Common/ButtonGray");
             btn.GetComponentInChildren<Text>().color = Color.gray;
             AimHandler.ins.gyrCalibrateCompleteCount = 0;
@@ -104,6 +116,20 @@ public class DeviceCalibrateView : MonoBehaviour
         }
     }
 
+    void FinishGyrCalibrate()
+    {   
+        canUpdateGyrCalibrateProgress = false;
+        if (!guide) {
+            Button btn = btnGyrCalibrate.GetComponent<Button>();
+            btn.enabled = true;
+            btn.GetComponentInChildren<TextAutoLanguage>().SetText(116);
+            btn.GetComponent<Image>().sprite = Resources.Load<Sprite>("Textures/Common/ButtonBlue");
+            btn.GetComponentInChildren<Text>().color = Color.white;
+        }
+        AimHandler.ins.CalibrateGyr(false);
+    }
+
+    // ------ 地磁计校准 ------
     bool magCalibrating = false;
     void ClickMagCalibrate() 
     {
@@ -111,44 +137,31 @@ public class DeviceCalibrateView : MonoBehaviour
         magCalibrating = !magCalibrating;
         if (magCalibrating) {
             btn.GetComponentInChildren<TextAutoLanguage>().SetText(83);
+            btn.GetComponentInChildren<Text>().color = Color.red;
             AimHandler.ins.CalibrateMag(true);
         } else {
-            btn.GetComponentInChildren<TextAutoLanguage>().SetText(82);
+            if (guide) {
+                btn.enabled = false;
+                btn.GetComponentInChildren<TextAutoLanguage>().SetText(82);
+                btn.GetComponent<Image>().sprite = Resources.Load<Sprite>("Textures/Common/ButtonGray");
+                btn.GetComponentInChildren<Text>().color = Color.gray;
+            } else {
+                btn.GetComponentInChildren<TextAutoLanguage>().SetText(116);
+                btn.GetComponentInChildren<Text>().color = new Color(0, 90, 182);
+            }
             AimHandler.ins.CalibrateMag(false);
         }
     }
 
+    // ------ 视角归位 ------
     void ClickIdentityCalibrate() {
         AimHandler.ins.DoIdentity();
-    }
-
-    void RefreshPage() {
-        if (guide) {
-            deviceCalibrateItem = deviceCalibrateItemForGuide[guideIndex];
-            if (guideIndex == 0) {
-                btnBack.gameObject.SetActive(false);
-                btnNext.gameObject.SetActive(true);
-                btnFinish.gameObject.SetActive(false);
-            } else if (guideIndex == deviceCalibrateItemForGuide.Length - 1) {
-                btnBack.gameObject.SetActive(true);
-                btnNext.gameObject.SetActive(false);
-                btnFinish.gameObject.SetActive(true);    
-            } else {
-                btnBack.gameObject.SetActive(true);
-                btnNext.gameObject.SetActive(true);
-                btnFinish.gameObject.SetActive(false);
-            }
-        } else {
-            btnBack.gameObject.SetActive(false);
-            btnNext.gameObject.SetActive(false);
-            btnFinish.gameObject.SetActive(true);
-        }
-        this.transform.Find("Gyr").gameObject.SetActive(deviceCalibrateItem == DeviceCalibrateItem.Gyr);
-        this.transform.Find("Mag").gameObject.SetActive(deviceCalibrateItem == DeviceCalibrateItem.Mag);
-        this.transform.Find("Identity").gameObject.SetActive(deviceCalibrateItem == DeviceCalibrateItem.Identity);
+        Button btn = btnIdentityCalibrate.GetComponent<Button>();
+        btn.GetComponent<Image>().sprite = Resources.Load<Sprite>("Textures/Common/ButtonGray");
+        btn.GetComponentInChildren<Text>().color = Color.gray;
+        btn.enabled = false;
     }
 }
-
 public enum  DeviceCalibrateItem
 {
     Guide, Gyr, Mag, Identity

+ 1 - 1
Assets/BowArrow/Scripts/View/DeviceView.cs

@@ -21,4 +21,4 @@ public class DeviceView : MonoBehaviour
         AudioMgr.ins.PlayBtn();
         Destroy(this.gameObject);
     }
-}
+}

+ 19 - 14
Assets/BowArrow/Scripts/View/SetUpView.cs

@@ -1,23 +1,18 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.UI;
 using UnityEngine.SceneManagement;
 
 public class SetUpView : MonoBehaviour
 {
+    [SerializeField] Image[] crossHairOptionChecks;
 
     void Start()
     {
         this.transform.Find("Items/BGM/Check").gameObject.SetActive(AudioMgr.openBGM);
         this.transform.Find("Items/Effect/Check").gameObject.SetActive(AudioMgr.openEffect);
-
-        
-    }
-    
-    public void Quit() 
-    {
-        AudioMgr.ins.PlayBtn();
-        SceneManager.LoadScene("Login", LoadSceneMode.Single);
+        RenderSelectCrossHairOption();
     }
 
     public void CheckBox(GameObject checkBox) {
@@ -31,6 +26,20 @@ public class SetUpView : MonoBehaviour
         AudioMgr.ins.PlayBtn();
     }
 
+    public void SelectCrossHairOption(bool on)
+    {
+        AudioMgr.ins.PlayBtn();
+        LoginMgr.myUserInfo.openCrossHair = on;
+        LoginMgr.myUserInfo.Save();
+        RenderSelectCrossHairOption();
+    }
+
+    void RenderSelectCrossHairOption()
+    {
+        crossHairOptionChecks[0].enabled = LoginMgr.myUserInfo.openCrossHair;
+        crossHairOptionChecks[1].enabled = !LoginMgr.myUserInfo.openCrossHair;
+    }
+
     public void ChangeLanguage()
     {
         AudioMgr.ins.PlayBtn();
@@ -43,14 +52,10 @@ public class SetUpView : MonoBehaviour
         }
     }
 
-    public void Calibrate(int doID) 
+    public void Quit() 
     {
         AudioMgr.ins.PlayBtn();
-        if (doID == 1) {
-            DeviceCalibrateView.Create(DeviceCalibrateItem.Gyr);
-        } else if (doID == 2) {
-            DeviceCalibrateView.Create(DeviceCalibrateItem.Mag);
-        }
+        SceneManager.LoadScene("Login", LoadSceneMode.Single);
     }
 
     public void Back() {

BIN
Assets/BowArrow/Textures/DeviceBattery/_0001_图层-1.png


BIN
Assets/BowArrow/Textures/SetUp/111.png


BIN
Assets/BowArrow/Textures/SetUp/222.png


+ 0 - 120
Assets/BowArrow/Textures/SetUp/222.png.meta

@@ -1,120 +0,0 @@
-fileFormatVersion: 2
-guid: 8c688c3e7f4b167459dd2c0803773c9f
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/BowArrow/Textures/SetUp/IconCrossHair.png


+ 1 - 1
Assets/BowArrow/Textures/SetUp/111.png.meta → Assets/BowArrow/Textures/SetUp/IconCrossHair.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ded0136482fe01c4e8531433da29bc49
+guid: c856e24a3b22cf040a77a69fbed0314d
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Некоторые файлы не были показаны из-за большого количества измененных файлов