wwdmbvbb 3 years ago
parent
commit
533c49983d
1 changed files with 61 additions and 159 deletions
  1. 61 159
      Assets/Scenes/MainScene.unity

+ 61 - 159
Assets/Scenes/MainScene.unity

@@ -10184,9 +10184,8 @@ GameObject:
   m_Component:
   - component: {fileID: 495763388}
   - component: {fileID: 495763391}
-  - component: {fileID: 495763395}
-  - component: {fileID: 495763390}
   - component: {fileID: 495763389}
+  - component: {fileID: 495763395}
   - component: {fileID: 495763392}
   - component: {fileID: 495763394}
   - component: {fileID: 495763393}
@@ -10210,7 +10209,7 @@ Transform:
   m_Children:
   - {fileID: 1445554698}
   m_Father: {fileID: 0}
-  m_RootOrder: 10
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!114 &495763389
 MonoBehaviour:
@@ -10219,33 +10218,20 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 495763387}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7047fa022a2846339e78755e09e91fda, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  port: 9099
-  ipAddress: 0.0.0.0
-  divisionValue: 60
---- !u!114 &495763390
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 495763387}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b0229a2c3c97c2944b6be12287119878, type: 3}
+  m_Script: {fileID: 11500000, guid: f4cd757b8ab544dd8cf69b27aea0055d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  speedSensorId: 63387
-  wheelCircumference: 2.115
-  speedDisplay: {fileID: 1114568936}
-  powerMeterId: 21218
-  powerDisplay: {fileID: 768788163}
-  cadenceDisplay: {fileID: 1298606441}
-  torqueDisplay: {fileID: 1485942410}
+  maxSpeed: 40
+  maxMotorTorque: 1000
+  leaningAngleMultiplier: 0.1
+  speedSensorConfig:
+    deviceId: 63387
+    wheelCircumference: 2.115
+  polarSensorConfig:
+    port: 9099
+    ipAddress: 0.0.0.0
 --- !u!114 &495763391
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -10331,7 +10317,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 495763387}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 512442fc2be9462480455b716456ef5d, type: 3}
   m_Name: 
@@ -18012,51 +17998,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a8075fecadfce7c4abe277fb835ca5c5, type: 3}
---- !u!1 &913984443
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 913984444}
-  - component: {fileID: 913984445}
-  m_Layer: 0
-  m_Name: HR
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &913984444
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 913984443}
-  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: 1348872080}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &913984445
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 913984443}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3e7a4eba0218476ea327535b923bf640, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  hrSensorId: 14728
-  heartRateDisplay: {fileID: 0}
 --- !u!1 &914374530
 GameObject:
   m_ObjectHideFlags: 0
@@ -18149,7 +18090,7 @@ Transform:
   m_LocalScale: {x: 142.3575, y: 1, z: 36.48216}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &916555232 stripped
 Transform:
@@ -20654,6 +20595,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1043658701}
+  - component: {fileID: 1043658702}
+  - component: {fileID: 1043658703}
   m_Layer: 0
   m_Name: HUD
   m_TagString: Untagged
@@ -20676,6 +20619,38 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1043658702
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1043658700}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b0229a2c3c97c2944b6be12287119878, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  speedDisplay: {fileID: 1114568936}
+  powerMeterId: 2128
+  powerDisplay: {fileID: 768788163}
+  cadenceDisplay: {fileID: 1298606441}
+  torqueDisplay: {fileID: 1485942410}
+  hrAntId: 14728
+  heartRateDisplay: {fileID: 1837966456}
+--- !u!114 &1043658703
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1043658700}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5bf6ef59c1034b1f8b9c5c713fb4c1b1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  bicycleController: {fileID: 495763391}
 --- !u!4 &1043660098 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 1121772855208284805, guid: a8075fecadfce7c4abe277fb835ca5c5,
@@ -21261,49 +21236,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a8075fecadfce7c4abe277fb835ca5c5, type: 3}
---- !u!1 &1083304420
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1083304421}
-  - component: {fileID: 1083304422}
-  m_Layer: 0
-  m_Name: IP-Address
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1083304421
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1083304420}
-  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: 1348872080}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1083304422
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1083304420}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b62e8ae20c27a5d4cafbd4539116d408, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &1083353721
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -25663,7 +25595,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &1248043989 stripped
 Transform:
@@ -28056,7 +27988,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1344013519}
   m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0, y: -0.54599994, z: -0.17999814}
+  m_LocalPosition: {x: -0, y: -0.163, z: -0.216}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1445554698}
@@ -28206,38 +28138,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1208541210}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &1348872079
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1348872080}
-  m_Layer: 0
-  m_Name: Data
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1348872080
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1348872079}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 225.02188, y: -163.50053, z: 33.25245}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 913984444}
-  - {fileID: 1083304421}
-  m_Father: {fileID: 0}
-  m_RootOrder: 6
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1349577711
 GameObject:
   m_ObjectHideFlags: 0
@@ -40155,7 +40055,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1.8, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1846088423
 PrefabInstance:
@@ -42107,13 +42007,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b0229a2c3c97c2944b6be12287119878, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  speedSensorId: 63387
-  wheelCircumference: 2.115
-  speedDisplay: {fileID: 1114568936}
-  powerMeterId: 21218
-  powerDisplay: {fileID: 768788163}
-  cadenceDisplay: {fileID: 1298606441}
-  torqueDisplay: {fileID: 1485942410}
+  speedDisplay: {fileID: 0}
+  powerMeterId: 0
+  powerDisplay: {fileID: 0}
+  cadenceDisplay: {fileID: 0}
+  torqueDisplay: {fileID: 0}
+  hrAntId: 0
+  heartRateDisplay: {fileID: 0}
 --- !u!4 &1940359575
 Transform:
   m_ObjectHideFlags: 0
@@ -42143,7 +42043,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   port: 9099
   ipAddress: 0.0.0.0
+  rotation: 0
   divisionValue: 60
+  bicycleController: {fileID: 0}
 --- !u!114 &1940359577
 MonoBehaviour:
   m_ObjectHideFlags: 0