Browse Source

add test seq. change robot speed,camera,radar. modified the target posture

Jingyi Jia 2 years ago
parent
commit
07b48dc113
100 changed files with 1296 additions and 949 deletions
  1. 0 0
      Hector_v2/Assembly-CSharp.csproj
  2. 44 55
      Hector_v2/Assets/Prefabs/Test/Test Management.prefab
  3. 93 40
      Hector_v2/Assets/Scenes/HandleTest.unity
  4. 132 63
      Hector_v2/Assets/Scenes/LabTest.unity
  5. 100 181
      Hector_v2/Assets/Scenes/RemoteTest.unity
  6. 490 364
      Hector_v2/Assets/Scenes/Simulation.unity
  7. 278 171
      Hector_v2/Assets/Scenes/UITest.unity
  8. 0 2
      Hector_v2/Assets/Scripts/Menu/InteractionManagement.cs
  9. 4 20
      Hector_v2/Assets/Scripts/Menu/MenuSelectEffect.cs
  10. 2 1
      Hector_v2/Assets/Scripts/Menu/UIDrag.cs
  11. 9 5
      Hector_v2/Assets/Scripts/Mode/Handle.cs
  12. 12 8
      Hector_v2/Assets/Scripts/Mode/Lab.cs
  13. 9 12
      Hector_v2/Assets/Scripts/Mode/Remote.cs
  14. 1 3
      Hector_v2/Assets/Scripts/Mode/SpeedLinearEditor.cs
  15. 15 2
      Hector_v2/Assets/Scripts/Mode/UI_Mode.cs
  16. 14 16
      Hector_v2/Assets/Scripts/Player/VRInput.cs
  17. 93 6
      Hector_v2/Assets/Scripts/Test/TestManagement.cs
  18. BIN
      Hector_v2/Library/ArtifactDB
  19. BIN
      Hector_v2/Library/Artifacts/05/05fa8fb4dc428c2373f75cc15a0aeb68
  20. BIN
      Hector_v2/Library/Artifacts/08/0814e59da047bb609d81fc9e52c4a14c
  21. BIN
      Hector_v2/Library/Artifacts/08/083c0b6454437489978723068109f352
  22. BIN
      Hector_v2/Library/Artifacts/0b/0bebd260e8b24ee23719807a5fb562c7
  23. BIN
      Hector_v2/Library/Artifacts/0e/0ea4fc497dac6cda9723f3b5f9d58a1b
  24. BIN
      Hector_v2/Library/Artifacts/12/121d7071776590108f6b912bb45f087a
  25. BIN
      Hector_v2/Library/Artifacts/15/150e7cfe4107c438434b28f48936f812
  26. BIN
      Hector_v2/Library/Artifacts/15/15aed5c1380d51028b7fcae9d6518816
  27. BIN
      Hector_v2/Library/Artifacts/1a/1a780569871b2b8d1949192aa0f5ca7a
  28. BIN
      Hector_v2/Library/Artifacts/1a/1a8c4ef7c4feca1e8bb842bbf9072394
  29. BIN
      Hector_v2/Library/Artifacts/1a/1ab30864f28c7503f93bca1d477973b7
  30. BIN
      Hector_v2/Library/Artifacts/1c/1c70740ac0d5dbdb5df28d764a6793ae
  31. BIN
      Hector_v2/Library/Artifacts/20/20b623fcae7e7d2623425f0e91e295f6
  32. BIN
      Hector_v2/Library/Artifacts/22/22b263c5a7d88dfe43e01a60fb0b088b
  33. BIN
      Hector_v2/Library/Artifacts/23/23570957043c7be3308c473e5057f2f8
  34. BIN
      Hector_v2/Library/Artifacts/23/23a813629212b4a62a30a35424550f99
  35. BIN
      Hector_v2/Library/Artifacts/23/23ffc5df201a9428f52df7257f58a830
  36. BIN
      Hector_v2/Library/Artifacts/26/268c4490b057bc141738cfafebdd83a2
  37. BIN
      Hector_v2/Library/Artifacts/2a/2aa5341ef74c8153e4e04ab66313a7fa
  38. BIN
      Hector_v2/Library/Artifacts/2b/2b1baa01025042632450ca57e59cba7e
  39. BIN
      Hector_v2/Library/Artifacts/2b/2b7e67c049955f877c6156fb3dade073
  40. BIN
      Hector_v2/Library/Artifacts/2c/2ca1d7bf37c8d8b08fd8f211e6389e09
  41. BIN
      Hector_v2/Library/Artifacts/2c/2ca7c1cc84ff5a83ac046aa9970e5dd0
  42. BIN
      Hector_v2/Library/Artifacts/2e/2e0f48531490fb842d23ddc89c63344d
  43. BIN
      Hector_v2/Library/Artifacts/34/34ea30606e595050740fe62ba3192f6b
  44. BIN
      Hector_v2/Library/Artifacts/35/359eee806e1c86010d622f1cf8b2baad
  45. BIN
      Hector_v2/Library/Artifacts/38/389f56bf865cd224f191f582120a50c6
  46. BIN
      Hector_v2/Library/Artifacts/38/38a9385facbc8fde3105fcea2acecb1c
  47. BIN
      Hector_v2/Library/Artifacts/39/39fa413294af572c39d251270092f7b9
  48. BIN
      Hector_v2/Library/Artifacts/39/39ffa570ff60940f50217e4b13c7b1e1
  49. BIN
      Hector_v2/Library/Artifacts/3d/3d313de96c2577ad3cf0ccce0d7f48e8
  50. BIN
      Hector_v2/Library/Artifacts/3d/3dcd35ff448f49eeae139deec79c29f2
  51. BIN
      Hector_v2/Library/Artifacts/40/401ad5bc61821e8556a8be17718b7dbf
  52. BIN
      Hector_v2/Library/Artifacts/41/4179709d38b6ecd5ddc7e9bd4a682f2a
  53. BIN
      Hector_v2/Library/Artifacts/43/43d29e39f79f97eb8563173f388e1071
  54. BIN
      Hector_v2/Library/Artifacts/45/454f0d21dbe5181a114959c0a381d872
  55. BIN
      Hector_v2/Library/Artifacts/45/45ad39b1ce713f5b33c2d119a677491d
  56. BIN
      Hector_v2/Library/Artifacts/4c/4cb511a8f4d69505db6157885e764e87
  57. BIN
      Hector_v2/Library/Artifacts/53/5369409edc5b731ebb01bc3b296e9059
  58. BIN
      Hector_v2/Library/Artifacts/54/54162d9df6c5992e063e20d6ecf6bf56
  59. BIN
      Hector_v2/Library/Artifacts/54/545136584ff8ebda174ba5f8ead1adee
  60. BIN
      Hector_v2/Library/Artifacts/5b/5b1c946e7561208a41aaac2a0b4a8cb4
  61. BIN
      Hector_v2/Library/Artifacts/5d/5d84570e1462127af64b4957985ebfb2
  62. BIN
      Hector_v2/Library/Artifacts/60/6041f84fbd6a64418503936362a659c7
  63. BIN
      Hector_v2/Library/Artifacts/63/6337c90f21ae902bc1cc1fdfc104667d
  64. BIN
      Hector_v2/Library/Artifacts/65/6504084639f00bf62b6f6d06774ff724
  65. BIN
      Hector_v2/Library/Artifacts/68/688ad7248aec72c92ac7b9acddd4680b
  66. BIN
      Hector_v2/Library/Artifacts/68/68b7f9ce18fb5503638c08584bccc24c
  67. BIN
      Hector_v2/Library/Artifacts/69/692549380e8df55408d3572a7c0ae81d
  68. BIN
      Hector_v2/Library/Artifacts/69/69a244b2d13ccc18c6b628f6f1570682
  69. BIN
      Hector_v2/Library/Artifacts/6d/6d7a2e41ce80513d0a48987d5f861e9e
  70. BIN
      Hector_v2/Library/Artifacts/72/72a08b74f8934610c608e63d1f5bbacf
  71. BIN
      Hector_v2/Library/Artifacts/78/78ff0efd49096aef2cbe7a15f87b6ecb
  72. BIN
      Hector_v2/Library/Artifacts/79/7996869aaad115cedfa2eff75a54fb9f
  73. BIN
      Hector_v2/Library/Artifacts/7a/7a72b3453a7e947b2cb7e91756b52034
  74. BIN
      Hector_v2/Library/Artifacts/7a/7abef58b4302a5866e607e9e8ee555ec
  75. BIN
      Hector_v2/Library/Artifacts/7d/7d028d9156c680dbeed2a991396d1246
  76. BIN
      Hector_v2/Library/Artifacts/7e/7e2c921b81f83856a6107362fa1e9667
  77. BIN
      Hector_v2/Library/Artifacts/7f/7f816261ddd88a2401d2d076946b7eb2
  78. BIN
      Hector_v2/Library/Artifacts/80/80730aecd8e5923b0644f7f9d8d994e6
  79. BIN
      Hector_v2/Library/Artifacts/85/8519e7b5db4980e44ee8ac3624c7246d
  80. BIN
      Hector_v2/Library/Artifacts/85/85a1338342cb4e9e08965eee2d54b518
  81. BIN
      Hector_v2/Library/Artifacts/89/899fded67362393fbb40653f3570daca
  82. BIN
      Hector_v2/Library/Artifacts/89/89f123f78ed91f58e2a5f886b49cff6c
  83. BIN
      Hector_v2/Library/Artifacts/8a/8a67ca4add07a508d1127e5d581142ee
  84. BIN
      Hector_v2/Library/Artifacts/92/92d21e25dd6cfe3080ffad88da9c2e6b
  85. BIN
      Hector_v2/Library/Artifacts/93/93b02d70fec7a37b36a3b719760bd94a
  86. BIN
      Hector_v2/Library/Artifacts/96/961b472afd8cd4ff0d13eaefc507bff6
  87. BIN
      Hector_v2/Library/Artifacts/9a/9ad1daa86b05006674cbb2e8d2c27249
  88. BIN
      Hector_v2/Library/Artifacts/a4/a459511d67a2bb2e1317511765c8b392
  89. BIN
      Hector_v2/Library/Artifacts/a6/a6d3155d7b9d91f13a17f19b8e4ba126
  90. BIN
      Hector_v2/Library/Artifacts/ae/aead68232cc0d45c9c02b3bde0f36943
  91. BIN
      Hector_v2/Library/Artifacts/b1/b178c4b6ad587f77d1c699e41cfe27db
  92. BIN
      Hector_v2/Library/Artifacts/b8/b875bfbbd16d2bff93056df1976d510f
  93. BIN
      Hector_v2/Library/Artifacts/ba/ba52cfec904441eae09d815143ee283f
  94. BIN
      Hector_v2/Library/Artifacts/ba/badf2b47ae258c27ecb0153d8ca4b390
  95. BIN
      Hector_v2/Library/Artifacts/bb/bbbb01b9b4ec2f2ff45be4a065c552ce
  96. BIN
      Hector_v2/Library/Artifacts/bf/bf5326e0eef4fcdd8d49844f92611677
  97. BIN
      Hector_v2/Library/Artifacts/bf/bfface758ffaa203074febb0f5c7539d
  98. BIN
      Hector_v2/Library/Artifacts/c1/c164a31da489b8fe0e2d78a7c03afeee
  99. BIN
      Hector_v2/Library/Artifacts/c2/c21fe71c930024c496f70b83ab225647
  100. BIN
      Hector_v2/Library/Artifacts/c2/c22d5fd570a8bb6720425a3165afffdd

File diff suppressed because it is too large
+ 0 - 0
Hector_v2/Assembly-CSharp.csproj


+ 44 - 55
Hector_v2/Assets/Prefabs/Test/Test Management.prefab

@@ -59,14 +59,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 91949862513380166}
-  m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: 5.72, y: 0, z: 26.52}
+  m_LocalRotation: {x: -0.5, y: -0.5, z: -0.5, w: 0.5}
+  m_LocalPosition: {x: 5.72, y: -1.7000003, z: 26.52}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 6769473480485649678}
   m_Father: {fileID: 5839439161408970021}
   m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
+  m_LocalEulerAnglesHint: {x: -90, y: -90, z: 0}
 --- !u!114 &751924041267030281
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -6438,14 +6438,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 405624103514283246}
-  m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: 23.3, y: 0, z: 0}
+  m_LocalRotation: {x: -0.5, y: -0.5, z: -0.5, w: 0.5}
+  m_LocalPosition: {x: 23.3, y: -1.7000003, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 8550446012868456961}
   m_Father: {fileID: 5839439161408970021}
   m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
+  m_LocalEulerAnglesHint: {x: -90, y: -90, z: 0}
 --- !u!114 &4627841986013281918
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -6770,14 +6770,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 507295221780094279}
-  m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: 31.9, y: 0, z: 17.6}
+  m_LocalRotation: {x: -0.5, y: -0.5, z: -0.5, w: 0.5}
+  m_LocalPosition: {x: 31.9, y: -1.7000003, z: 17.6}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 6620650790489287569}
   m_Father: {fileID: 5839439161408970021}
   m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
+  m_LocalEulerAnglesHint: {x: -90, y: -90, z: 0}
 --- !u!114 &2377906384450852080
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -15201,14 +15201,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2149133808831383749}
-  m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: -10.1, y: 0, z: -34.3}
+  m_LocalRotation: {x: -0.5, y: -0.5, z: -0.5, w: 0.5}
+  m_LocalPosition: {x: -10.1, y: -1.47, z: -34.3}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 2144698560078788191}
   m_Father: {fileID: 5839439161408970021}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
+  m_LocalEulerAnglesHint: {x: -90, y: -90, z: 0}
 --- !u!114 &2149133808831383745
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -42968,6 +42968,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 02cd94ca93da78948b6596a1012aea1b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  TestID: 1
+  csvPath: C:\Users\alley\Desktop\Hecto\TestResult\
+  TestMode: 1
+  ModeList: []
   TotalTime: 300
   triggerCount: 0
   totalDriveDistance: 0
@@ -43236,7 +43240,7 @@ Camera:
   m_Depth: 0
   m_CullingMask:
     serializedVersion: 2
-    m_Bits: 512
+    m_Bits: 1536
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 8400000, guid: 543f8c07d2df2594c8d6c2a7b9b29682, type: 2}
   m_TargetDisplay: 2
@@ -43337,15 +43341,15 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5839439163087930213}
-  m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: -17.2, y: 0, z: 59.5}
+  m_LocalRotation: {x: -0.5, y: -0.5, z: -0.5, w: 0.5}
+  m_LocalPosition: {x: -17.2, y: -1.7, z: 59.5}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4817455867365456913}
   - {fileID: 5839439161392909232}
   m_Father: {fileID: 5839439161408970021}
   m_RootOrder: 9
-  m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
+  m_LocalEulerAnglesHint: {x: -90, y: -90, z: 0}
 --- !u!114 &5839439163087930238
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -668708,7 +668712,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4b8f2db09ee207d4187f657487c7e21e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  linearSpeed: 0.3
+  linearSpeed: 0.17
   angularSpeed: 1.5
   triggerCount: 0
   totalDriveDistance: 0
@@ -668850,7 +668854,7 @@ NavMeshAgent:
   m_Enabled: 1
   m_AgentTypeID: 0
   m_Radius: 0.5
-  m_Speed: 2
+  m_Speed: 3
   m_Acceleration: 8
   avoidancePriority: 50
   m_AngularSpeed: 120
@@ -682355,15 +682359,15 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7819068887659444960}
-  m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: -10.28, y: 0, z: -13.6}
+  m_LocalRotation: {x: -0.5, y: -0.5, z: -0.5, w: 0.5}
+  m_LocalPosition: {x: -10.28, y: -1.7000003, z: -13.6}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 3946664972744487368}
   - {fileID: 5839439162322209738}
   m_Father: {fileID: 5839439161408970021}
   m_RootOrder: 7
-  m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
+  m_LocalEulerAnglesHint: {x: -90, y: -90, z: 0}
 --- !u!114 &4263173227654043367
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -682616,15 +682620,15 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7957839463711798230}
-  m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: -22.85, y: 0, z: 0}
+  m_LocalRotation: {x: -0.5, y: -0.5, z: -0.5, w: 0.5}
+  m_LocalPosition: {x: -22.85, y: -1.7000003, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1574150756203962250}
   - {fileID: 5839439161848820143}
   m_Father: {fileID: 5839439161408970021}
   m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
+  m_LocalEulerAnglesHint: {x: -90, y: -90, z: 0}
 --- !u!114 &4660457482626989879
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -688668,8 +688672,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8264567841304406842}
-  m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: 3.74, y: 0, z: 12.609999}
+  m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 3.74, y: 0.064, z: 12.609999}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 120372076664401904}
@@ -689075,10 +689079,9 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8109773687586667627}
-  - component: {fileID: 5410273012431906099}
-  - component: {fileID: 2625281690666267926}
   - component: {fileID: 5312429968712723950}
   - component: {fileID: 8116323860640069160}
+  - component: {fileID: 8110610413245634521}
   m_Layer: 9
   m_Name: Radar
   m_TagString: Untagged
@@ -689100,33 +689103,6 @@ Transform:
   m_Father: {fileID: 4733266513625684790}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!64 &5410273012431906099
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8502105270264065027}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 1
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 4300000, guid: 43c6bdf072a75974186a41645b0aaca5, type: 3}
---- !u!65 &2625281690666267926
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8502105270264065027}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 3.2380912, y: 3.2946298, z: 0.65985185}
-  m_Center: {x: 0.04971428, y: 0.06802636, z: 3.3490474}
 --- !u!114 &5312429968712723950
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -689155,6 +689131,19 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
+--- !u!135 &8110610413245634521
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8502105270264065027}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 2.638918
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &8547973414822889647
 GameObject:
   m_ObjectHideFlags: 0

+ 93 - 40
Hector_v2/Assets/Scenes/HandleTest.unity

@@ -3986,7 +3986,7 @@ Transform:
   - {fileID: 1018191937}
   - {fileID: 97502824}
   m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &84190024
 PrefabInstance:
@@ -12199,7 +12199,7 @@ MonoBehaviour:
   savedUp: {x: 0, y: 1, z: 0}
   savedRectSize: {x: 824.5527, y: 137.4}
   savedColor: {r: 1, g: 0.47735858, b: 0.15686274, a: 1}
-  savedTextUV0: {x: 0.45898438, y: 0.53125}
+  savedTextUV0: {x: 0.2397461, y: 0.07128906}
   savedFill: 0
 --- !u!114 &207703250
 MonoBehaviour:
@@ -18281,6 +18281,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   RightHand: {fileID: 4778278270110463551}
+  autoLockRobot: 1
 --- !u!114 &325876925
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -34674,7 +34675,7 @@ MonoBehaviour:
   savedUp: {x: 0, y: 1, z: 0}
   savedRectSize: {x: 775.2041, y: 336.4}
   savedColor: {r: 1, g: 1, b: 1, a: 1}
-  savedTextUV0: {x: 0.5703125, y: 0.6269531}
+  savedTextUV0: {x: 0.00390625, y: 0}
   savedFill: 0
 --- !u!114 &643998117
 MonoBehaviour:
@@ -48190,7 +48191,7 @@ MonoBehaviour:
   savedUp: {x: 0, y: 1, z: 0}
   savedRectSize: {x: 320, y: 60.000004}
   savedColor: {r: 1, g: 1, b: 1, a: 1}
-  savedTextUV0: {x: 0.5703125, y: 0.6269531}
+  savedTextUV0: {x: 0.00390625, y: 0}
   savedFill: 0
 --- !u!114 &841252808
 MonoBehaviour:
@@ -53322,7 +53323,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   CurrentMode: {fileID: 1388646265}
-  InteractionManagement: {fileID: 965253638}
   touchValue: {x: 0, y: 0}
 --- !u!4 &965253637
 Transform:
@@ -54308,7 +54308,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9868aaa7626265d449b75285da733604, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  MenuTitle: {fileID: 0}
+  TaskDiscription: {fileID: 0}
 --- !u!1001 &988657625
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -64437,7 +64437,7 @@ MonoBehaviour:
   savedUp: {x: 0, y: 1, z: 0}
   savedRectSize: {x: 320, y: 60.000004}
   savedColor: {r: 1, g: 1, b: 1, a: 1}
-  savedTextUV0: {x: 0.5703125, y: 0.6269531}
+  savedTextUV0: {x: 0.00390625, y: 0}
   savedFill: 0
 --- !u!114 &1163779852
 MonoBehaviour:
@@ -76675,7 +76675,6 @@ GameObject:
   m_Component:
   - component: {fileID: 1388646266}
   - component: {fileID: 1388646267}
-  - component: {fileID: 1388646268}
   m_Layer: 0
   m_Name: Handle
   m_TagString: Mode
@@ -76716,19 +76715,6 @@ MonoBehaviour:
   - {fileID: 91404616}
   - {fileID: 621109932}
   signal: {x: 0, y: 0}
---- !u!114 &1388646268
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1388646265}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9868aaa7626265d449b75285da733604, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  MenuTitle: {fileID: 696972862}
 --- !u!1001 &1388854266
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -88386,7 +88372,7 @@ MonoBehaviour:
   savedUp: {x: 0, y: 1, z: 0}
   savedRectSize: {x: 2000, y: 150}
   savedColor: {r: 1, g: 1, b: 1, a: 1}
-  savedTextUV0: {x: 0.8378906, y: 0.61328125}
+  savedTextUV0: {x: 0.032714844, y: 0.014160156}
   savedFill: 0
 --- !u!114 &1571137625
 MonoBehaviour:
@@ -88996,6 +88982,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   RightHand: {fileID: 4778278270110463551}
+  autoLockRobot: 1
 --- !u!114 &1582490490
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -89080,7 +89067,7 @@ MonoBehaviour:
   savedUp: {x: 0, y: 1, z: 0}
   savedRectSize: {x: 676.6054, y: 219.4}
   savedColor: {r: 1, g: 1, b: 1, a: 1}
-  savedTextUV0: {x: 0.8222656, y: 0.61328125}
+  savedTextUV0: {x: 0, y: 0.0009765625}
   savedFill: 0
 --- !u!114 &1582797113
 MonoBehaviour:
@@ -98723,6 +98710,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   RightHand: {fileID: 4778278270110463551}
+  autoLockRobot: 1
 --- !u!114 &1757628759
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -107084,7 +107072,7 @@ MonoBehaviour:
   savedUp: {x: 0, y: 1, z: 0}
   savedRectSize: {x: 849.2516, y: 81.399994}
   savedColor: {r: 1, g: 0.9843137, b: 0, a: 1}
-  savedTextUV0: {x: 0.9160156, y: 0.7285156}
+  savedTextUV0: {x: 0.3671875, y: 0.072265625}
   savedFill: 0
 --- !u!114 &1969539609
 MonoBehaviour:
@@ -125924,7 +125912,7 @@ PrefabInstance:
     - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.136
+      value: -1.77
       objectReference: {fileID: 0}
     - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
@@ -125934,12 +125922,12 @@ PrefabInstance:
     - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 1
+      value: 0.7071068
       objectReference: {fileID: 0}
     - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0.7071068
       objectReference: {fileID: 0}
     - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
@@ -125951,6 +125939,11 @@ PrefabInstance:
       propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
     - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
@@ -125959,12 +125952,52 @@ PrefabInstance:
     - target: {fileID: 3752263223444871869, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -38.32
+      value: -35.6165
+      objectReference: {fileID: 0}
+    - target: {fileID: 3752263223444871869, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1.6000005
       objectReference: {fileID: 0}
     - target: {fileID: 3752263223444871869, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 41.193
+      value: 46.52849
+      objectReference: {fileID: 0}
+    - target: {fileID: 3752263223444871869, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.587949
+      objectReference: {fileID: 0}
+    - target: {fileID: 3752263223444871869, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.5879489
+      objectReference: {fileID: 0}
+    - target: {fileID: 3752263223444871869, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.39283073
+      objectReference: {fileID: 0}
+    - target: {fileID: 3752263223444871869, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.39283085
+      objectReference: {fileID: 0}
+    - target: {fileID: 3752263223444871869, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90.00001
+      objectReference: {fileID: 0}
+    - target: {fileID: 3752263223444871869, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3752263223444871869, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 67.497
       objectReference: {fileID: 0}
     - target: {fileID: 4594502150642293426, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
@@ -125979,7 +126012,7 @@ PrefabInstance:
     - target: {fileID: 5839439162582256162, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_RootOrder
-      value: 8
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 5839439162582256162, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
@@ -126054,7 +126087,7 @@ PrefabInstance:
     - target: {fileID: 6062640080318399586, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.212
+      value: 0.108
       objectReference: {fileID: 0}
     - target: {fileID: 6062640080318399586, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
@@ -126064,37 +126097,52 @@ PrefabInstance:
     - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 31.14
+      value: 30.825
+      objectReference: {fileID: 0}
+    - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1.761
       objectReference: {fileID: 0}
     - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 28.65
+      value: 28.265
       objectReference: {fileID: 0}
     - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: -0.08715578
+      value: 0.4792812
       objectReference: {fileID: 0}
     - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0.47928125
       objectReference: {fileID: 0}
     - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.9961947
+      value: 0.5198937
       objectReference: {fileID: 0}
     - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0.5198937
+      objectReference: {fileID: 0}
+    - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90.02799
       objectReference: {fileID: 0}
     - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: 190
+      value: 180
+      objectReference: {fileID: 0}
+    - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -85.345
       objectReference: {fileID: 0}
     - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
@@ -126109,12 +126157,12 @@ PrefabInstance:
     - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 1
+      value: 0.7071068
       objectReference: {fileID: 0}
     - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0.7071068
       objectReference: {fileID: 0}
     - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
@@ -126126,6 +126174,11 @@ PrefabInstance:
       propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
     - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y

+ 132 - 63
Hector_v2/Assets/Scenes/LabTest.unity

@@ -590,7 +590,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 11665604}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -8.855, y: -1.4399999, z: -5.399}
+  m_LocalPosition: {x: -8.855, y: -1.62, z: -5.399}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1984961044}
@@ -5786,7 +5786,7 @@ Transform:
   - {fileID: 97502824}
   - {fileID: 1374875866}
   m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &83947418
 GameObject:
@@ -16930,7 +16930,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   speed: 0
-  maxSpeed: 0.5
   speedText: {fileID: 219127157}
   linearMapping: {fileID: 1173652274}
 --- !u!1 &221793898
@@ -70922,7 +70921,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   CurrentMode: {fileID: 1597823644}
-  InteractionManagement: {fileID: 965253638}
   touchValue: {x: 0, y: 0}
 --- !u!4 &965253637
 Transform:
@@ -73120,7 +73118,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9868aaa7626265d449b75285da733604, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  MenuTitle: {fileID: 0}
+  TaskDiscription: {fileID: 0}
 --- !u!1 &987671305
 GameObject:
   m_ObjectHideFlags: 0
@@ -111224,7 +111222,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
 --- !u!108 &1452656760
 Light:
@@ -119976,7 +119974,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   speed: 0
-  maxSpeed: 5
   speedText: {fileID: 133453129}
   linearMapping: {fileID: 1005054799}
 --- !u!1 &1570049099
@@ -121050,6 +121047,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   RightHand: {fileID: 4778278270110463551}
+  autoLockRobot: 1
 --- !u!114 &1582490490
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -121976,14 +121974,13 @@ GameObject:
   m_Component:
   - component: {fileID: 1597823645}
   - component: {fileID: 1597823646}
-  - component: {fileID: 1597823647}
   m_Layer: 0
   m_Name: Lab
   m_TagString: Mode
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1597823645
 Transform:
   m_ObjectHideFlags: 0
@@ -121997,8 +121994,8 @@ Transform:
   m_Children:
   - {fileID: 2099904881}
   - {fileID: 880194906}
-  - {fileID: 4955497645695949688}
   - {fileID: 2121653253346641515}
+  - {fileID: 4955497645695949688}
   - {fileID: 1498998659594162671}
   - {fileID: 724224541}
   - {fileID: 1039910374}
@@ -122036,19 +122033,6 @@ MonoBehaviour:
   velocity_joystick: {fileID: 2121653254351627136}
   angle: 0
   velocity: 0
---- !u!114 &1597823647
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1597823644}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9868aaa7626265d449b75285da733604, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  MenuTitle: {fileID: 1960204061}
 --- !u!1001 &1598449300
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -163007,14 +162991,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2121653253346641514}
-  m_LocalRotation: {x: -0.4999999, y: -0.4999999, z: -0.5000001, w: 0.5000001}
-  m_LocalPosition: {x: -0.6512373, y: 0.74199677, z: 24.896685}
-  m_LocalScale: {x: 0.5051196, y: 0.71027493, z: 0.7}
+  m_LocalRotation: {x: -0.4999999, y: -0.49999985, z: -0.5000001, w: 0.5000001}
+  m_LocalPosition: {x: -0.65123737, y: 0.74199677, z: 24.896685}
+  m_LocalScale: {x: 0.5051197, y: 0.7102752, z: 0.7}
   m_Children:
   - {fileID: 2121653254509499977}
   - {fileID: 2121653254294575419}
   m_Father: {fileID: 1597823645}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: -89.99999, y: 0, z: -90}
 --- !u!138 &2121653253346641516
 FixedJoint:
@@ -168846,7 +168830,7 @@ Transform:
   - {fileID: 4955497644871139650}
   - {fileID: 4955497645508501825}
   m_Father: {fileID: 1597823645}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: -89.99999, y: -180, z: -0.000015258789}
 --- !u!1 &4955497645695949691
 GameObject:
@@ -169605,7 +169589,7 @@ PrefabInstance:
     - target: {fileID: 1443360654543029406, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.94
+      value: -2.47
       objectReference: {fileID: 0}
     - target: {fileID: 1443360654543029406, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
@@ -169615,42 +169599,52 @@ PrefabInstance:
     - target: {fileID: 2149133808831383748, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 1.22
+      value: 1.5834522
       objectReference: {fileID: 0}
     - target: {fileID: 2149133808831383748, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.97
+      value: -2.2860038
       objectReference: {fileID: 0}
     - target: {fileID: 2149133808831383748, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 13.18
+      value: 13.884583
       objectReference: {fileID: 0}
     - target: {fileID: 2149133808831383748, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.7071068
+      value: 0.2141232
       objectReference: {fileID: 0}
     - target: {fileID: 2149133808831383748, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0.2141231
       objectReference: {fileID: 0}
     - target: {fileID: 2149133808831383748, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.7071068
+      value: 0.6739076
       objectReference: {fileID: 0}
     - target: {fileID: 2149133808831383748, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: 0
+      value: 0.67390746
+      objectReference: {fileID: 0}
+    - target: {fileID: 2149133808831383748, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -89.99999
       objectReference: {fileID: 0}
     - target: {fileID: 2149133808831383748, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: 90
+      value: 180
+      objectReference: {fileID: 0}
+    - target: {fileID: 2149133808831383748, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -35.253998
       objectReference: {fileID: 0}
     - target: {fileID: 2151829558119019811, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
@@ -169670,7 +169664,7 @@ PrefabInstance:
     - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.864
+      value: -2.34
       objectReference: {fileID: 0}
     - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
@@ -169680,17 +169674,37 @@ PrefabInstance:
     - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.9239937
+      value: 0.61355686
+      objectReference: {fileID: 0}
+    - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.61355686
       objectReference: {fileID: 0}
     - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.3824078
+      value: 0.35149398
+      objectReference: {fileID: 0}
+    - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.35149398
+      objectReference: {fileID: 0}
+    - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
       objectReference: {fileID: 0}
     - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: 44.966003
+      value: 59.615
+      objectReference: {fileID: 0}
+    - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3752263223444871869, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
@@ -169700,12 +169714,12 @@ PrefabInstance:
     - target: {fileID: 3752263223444871869, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.675
+      value: -1.045
       objectReference: {fileID: 0}
     - target: {fileID: 3752263223444871869, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 58.16
+      value: 54.26
       objectReference: {fileID: 0}
     - target: {fileID: 3952780532024373724, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
@@ -169720,17 +169734,17 @@ PrefabInstance:
     - target: {fileID: 4594502150642293426, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -10.604198
+      value: -10.6
       objectReference: {fileID: 0}
     - target: {fileID: 4594502150642293426, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 1.3999962
+      value: 0.9
       objectReference: {fileID: 0}
     - target: {fileID: 4594502150642293426, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 68.49809
+      value: 68.5
       objectReference: {fileID: 0}
     - target: {fileID: 4594502150642293426, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
@@ -169760,7 +169774,7 @@ PrefabInstance:
     - target: {fileID: 5839439162582256162, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_RootOrder
-      value: 7
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 5839439162582256162, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
@@ -169825,32 +169839,47 @@ PrefabInstance:
     - target: {fileID: 5839439163087930210, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -26.54
+      value: -29.2
       objectReference: {fileID: 0}
     - target: {fileID: 5839439163087930210, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -1.88
+      value: -3.6
       objectReference: {fileID: 0}
     - target: {fileID: 5839439163087930210, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: -15.73
+      value: -2.2
       objectReference: {fileID: 0}
     - target: {fileID: 5839439163087930210, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.97619396
+      value: 0.706479
+      objectReference: {fileID: 0}
+    - target: {fileID: 5839439163087930210, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.706479
       objectReference: {fileID: 0}
     - target: {fileID: 5839439163087930210, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0.21689956
+      value: 0.029789321
+      objectReference: {fileID: 0}
+    - target: {fileID: 5839439163087930210, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.029789321
+      objectReference: {fileID: 0}
+    - target: {fileID: 5839439163087930210, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
       objectReference: {fileID: 0}
     - target: {fileID: 5839439163087930210, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: -25.054
+      value: 4.829
       objectReference: {fileID: 0}
     - target: {fileID: 6062640080318399586, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
@@ -169910,7 +169939,7 @@ PrefabInstance:
     - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.874
+      value: -2.39
       objectReference: {fileID: 0}
     - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
@@ -169920,47 +169949,87 @@ PrefabInstance:
     - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.7636331
+      value: 0.5270653
+      objectReference: {fileID: 0}
+    - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.5270653
       objectReference: {fileID: 0}
     - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.64565057
+      value: 0.47138324
+      objectReference: {fileID: 0}
+    - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.47138324
+      objectReference: {fileID: 0}
+    - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
       objectReference: {fileID: 0}
     - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: 80.429
+      value: 83.616005
+      objectReference: {fileID: 0}
+    - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -9.384
+      value: -8.47
       objectReference: {fileID: 0}
     - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.479
+      value: -1.29
       objectReference: {fileID: 0}
     - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 51.73
+      value: 51.81
       objectReference: {fileID: 0}
     - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.7388237
+      value: 0.6532844
+      objectReference: {fileID: 0}
+    - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.6532844
       objectReference: {fileID: 0}
     - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.67389876
+      value: 0.27059102
+      objectReference: {fileID: 0}
+    - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.27059117
+      objectReference: {fileID: 0}
+    - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90.00001
       objectReference: {fileID: 0}
     - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: 84.73701
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 44.999
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: da82fda99b00d5a43acb267e6f773c88, type: 3}

File diff suppressed because it is too large
+ 100 - 181
Hector_v2/Assets/Scenes/RemoteTest.unity


File diff suppressed because it is too large
+ 490 - 364
Hector_v2/Assets/Scenes/Simulation.unity


+ 278 - 171
Hector_v2/Assets/Scenes/UITest.unity

@@ -1051,7 +1051,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4374095332162218, guid: 7969742ac77044a4dbc77a64adb9dd45, type: 3}
       propertyPath: m_RootOrder
-      value: 109
+      value: 108
       objectReference: {fileID: 0}
     - target: {fileID: 4374095332162218, guid: 7969742ac77044a4dbc77a64adb9dd45, type: 3}
       propertyPath: m_LocalScale.x
@@ -5668,7 +5668,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4166644854343170, guid: 2a61a04a8877508498a18b963fe5afd6, type: 3}
       propertyPath: m_RootOrder
-      value: 106
+      value: 105
       objectReference: {fileID: 0}
     - target: {fileID: 4166644854343170, guid: 2a61a04a8877508498a18b963fe5afd6, type: 3}
       propertyPath: m_LocalScale.x
@@ -10310,7 +10310,6 @@ Transform:
   - {fileID: 1474727737}
   - {fileID: 1663241624}
   - {fileID: 1663125584}
-  - {fileID: 1731359719}
   - {fileID: 1205329466}
   - {fileID: 1979914325}
   - {fileID: 1703387460}
@@ -14051,7 +14050,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4127082532080598, guid: 50e3f0e9aeb683542bcfe0fe1dab3ae1, type: 3}
       propertyPath: m_RootOrder
-      value: 111
+      value: 110
       objectReference: {fileID: 0}
     - target: {fileID: 4127082532080598, guid: 50e3f0e9aeb683542bcfe0fe1dab3ae1, type: 3}
       propertyPath: m_LocalPosition.x
@@ -18238,7 +18237,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4458150534392060, guid: de4b90bf632cdf649af56ca9ded3d67b, type: 3}
       propertyPath: m_RootOrder
-      value: 94
+      value: 93
       objectReference: {fileID: 0}
     - target: {fileID: 4458150534392060, guid: de4b90bf632cdf649af56ca9ded3d67b, type: 3}
       propertyPath: m_LocalScale.x
@@ -20596,7 +20595,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4477281681761694, guid: 09bb74408a476974c9b51750f5159573, type: 3}
       propertyPath: m_RootOrder
-      value: 98
+      value: 97
       objectReference: {fileID: 0}
     - target: {fileID: 4477281681761694, guid: 09bb74408a476974c9b51750f5159573, type: 3}
       propertyPath: m_LocalPosition.x
@@ -21346,7 +21345,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4166644854343170, guid: 2a61a04a8877508498a18b963fe5afd6, type: 3}
       propertyPath: m_RootOrder
-      value: 105
+      value: 104
       objectReference: {fileID: 0}
     - target: {fileID: 4166644854343170, guid: 2a61a04a8877508498a18b963fe5afd6, type: 3}
       propertyPath: m_LocalScale.x
@@ -25112,7 +25111,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4458150534392060, guid: de4b90bf632cdf649af56ca9ded3d67b, type: 3}
       propertyPath: m_RootOrder
-      value: 96
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 4458150534392060, guid: de4b90bf632cdf649af56ca9ded3d67b, type: 3}
       propertyPath: m_LocalScale.x
@@ -29780,7 +29779,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4458150534392060, guid: de4b90bf632cdf649af56ca9ded3d67b, type: 3}
       propertyPath: m_RootOrder
-      value: 97
+      value: 96
       objectReference: {fileID: 0}
     - target: {fileID: 4458150534392060, guid: de4b90bf632cdf649af56ca9ded3d67b, type: 3}
       propertyPath: m_LocalScale.x
@@ -30199,7 +30198,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4562259169297308, guid: 827e7b341613532408c27ff67baf1259, type: 3}
       propertyPath: m_RootOrder
-      value: 102
+      value: 101
       objectReference: {fileID: 0}
     - target: {fileID: 4562259169297308, guid: 827e7b341613532408c27ff67baf1259, type: 3}
       propertyPath: m_LocalScale.x
@@ -30601,6 +30600,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   RightHand: {fileID: 4778278270110463551}
+  autoLockRobot: 0
 --- !u!1001 &573898692
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -39853,7 +39853,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4477281681761694, guid: 09bb74408a476974c9b51750f5159573, type: 3}
       propertyPath: m_RootOrder
-      value: 99
+      value: 98
       objectReference: {fileID: 0}
     - target: {fileID: 4477281681761694, guid: 09bb74408a476974c9b51750f5159573, type: 3}
       propertyPath: m_LocalPosition.x
@@ -40261,7 +40261,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4562259169297308, guid: 827e7b341613532408c27ff67baf1259, type: 3}
       propertyPath: m_RootOrder
-      value: 101
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 4562259169297308, guid: 827e7b341613532408c27ff67baf1259, type: 3}
       propertyPath: m_LocalScale.x
@@ -40756,7 +40756,7 @@ MonoBehaviour:
   savedUp: {x: 0, y: 1, z: 0}
   savedRectSize: {x: 849.2516, y: 81.399994}
   savedColor: {r: 1, g: 0.9843137, b: 0, a: 1}
-  savedTextUV0: {x: 0.01953125, y: 0.01953125}
+  savedTextUV0: {x: 0.26513672, y: 0.84814453}
   savedFill: 0
 --- !u!114 &753871328
 MonoBehaviour:
@@ -45714,7 +45714,7 @@ MonoBehaviour:
   savedUp: {x: 0, y: 1, z: 0}
   savedRectSize: {x: 320, y: 60.000004}
   savedColor: {r: 1, g: 1, b: 1, a: 1}
-  savedTextUV0: {x: 0.12695312, y: 0.029296875}
+  savedTextUV0: {x: 0.23291016, y: 0.77783203}
   savedFill: 0
 --- !u!114 &841252808
 MonoBehaviour:
@@ -49125,7 +49125,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4166644854343170, guid: 2a61a04a8877508498a18b963fe5afd6, type: 3}
       propertyPath: m_RootOrder
-      value: 107
+      value: 106
       objectReference: {fileID: 0}
     - target: {fileID: 4166644854343170, guid: 2a61a04a8877508498a18b963fe5afd6, type: 3}
       propertyPath: m_LocalScale.x
@@ -51021,7 +51021,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   CurrentMode: {fileID: 154739322}
-  InteractionManagement: {fileID: 965253638}
   touchValue: {x: 0, y: 0}
 --- !u!4 &965253637
 Transform:
@@ -52120,7 +52119,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9868aaa7626265d449b75285da733604, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  MenuTitle: {fileID: 0}
+  TaskDiscription: {fileID: 0}
 --- !u!1001 &988657625
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -53308,7 +53307,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4562259169297308, guid: 827e7b341613532408c27ff67baf1259, type: 3}
       propertyPath: m_RootOrder
-      value: 103
+      value: 102
       objectReference: {fileID: 0}
     - target: {fileID: 4562259169297308, guid: 827e7b341613532408c27ff67baf1259, type: 3}
       propertyPath: m_LocalScale.x
@@ -62269,7 +62268,7 @@ MonoBehaviour:
   savedUp: {x: 0, y: 1, z: 0}
   savedRectSize: {x: 320, y: 60.000004}
   savedColor: {r: 1, g: 1, b: 1, a: 1}
-  savedTextUV0: {x: 0.12695312, y: 0.029296875}
+  savedTextUV0: {x: 0.23291016, y: 0.77783203}
   savedFill: 0
 --- !u!114 &1163779852
 MonoBehaviour:
@@ -64890,7 +64889,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4718260399674780, guid: 0677d0ce6bdf22b4ba5908a5e2259d0e, type: 3}
       propertyPath: m_RootOrder
-      value: 86
+      value: 85
       objectReference: {fileID: 0}
     - target: {fileID: 4718260399674780, guid: 0677d0ce6bdf22b4ba5908a5e2259d0e, type: 3}
       propertyPath: m_LocalPosition.x
@@ -71913,7 +71912,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4374095332162218, guid: 7969742ac77044a4dbc77a64adb9dd45, type: 3}
       propertyPath: m_RootOrder
-      value: 110
+      value: 109
       objectReference: {fileID: 0}
     - target: {fileID: 4374095332162218, guid: 7969742ac77044a4dbc77a64adb9dd45, type: 3}
       propertyPath: m_LocalScale.x
@@ -73348,7 +73347,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4458150534392060, guid: de4b90bf632cdf649af56ca9ded3d67b, type: 3}
       propertyPath: m_RootOrder
-      value: 93
+      value: 92
       objectReference: {fileID: 0}
     - target: {fileID: 4458150534392060, guid: de4b90bf632cdf649af56ca9ded3d67b, type: 3}
       propertyPath: m_LocalPosition.x
@@ -79085,7 +79084,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 10
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
 --- !u!108 &1452656760
 Light:
@@ -79313,7 +79312,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4367621203943006, guid: 1ddf360948f90b24fb0e203933172cf8, type: 3}
       propertyPath: m_RootOrder
-      value: 113
+      value: 112
       objectReference: {fileID: 0}
     - target: {fileID: 4367621203943006, guid: 1ddf360948f90b24fb0e203933172cf8, type: 3}
       propertyPath: m_LocalScale.x
@@ -82832,7 +82831,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 416089f3a62e31742b09514c8fc1467b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  RightHand: {fileID: 0}
+  RightHand: {fileID: 4778278270110463551}
+  autoLockRobot: 0
 --- !u!1001 &1516585870
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -83757,7 +83757,7 @@ MonoBehaviour:
   savedUp: {x: 0, y: 1, z: 0}
   savedRectSize: {x: 824.5527, y: 137.4}
   savedColor: {r: 1, g: 0.47735858, b: 0.15686274, a: 1}
-  savedTextUV0: {x: 0.27929688, y: 0.31933594}
+  savedTextUV0: {x: 0.671875, y: 0.3544922}
   savedFill: 0
 --- !u!114 &1533603189
 MonoBehaviour:
@@ -85932,7 +85932,7 @@ MonoBehaviour:
   savedUp: {x: 0, y: 1, z: 0}
   savedRectSize: {x: 2000, y: 150}
   savedColor: {r: 1, g: 1, b: 1, a: 1}
-  savedTextUV0: {x: 0.66015625, y: 0.203125}
+  savedTextUV0: {x: 0.3227539, y: 0.8232422}
   savedFill: 0
 --- !u!114 &1571137625
 MonoBehaviour:
@@ -86590,6 +86590,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   RightHand: {fileID: 4778278270110463551}
+  autoLockRobot: 1
 --- !u!114 &1582490490
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -93622,7 +93623,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4193683576745232, guid: 3a58129ae5b98e54194c0043f168413f, type: 3}
       propertyPath: m_RootOrder
-      value: 88
+      value: 87
       objectReference: {fileID: 0}
     - target: {fileID: 4193683576745232, guid: 3a58129ae5b98e54194c0043f168413f, type: 3}
       propertyPath: m_LocalPosition.x
@@ -94401,83 +94402,6 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 1727344500}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &1731359718
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 195347272}
-    m_Modifications:
-    - target: {fileID: 1072604494735902, guid: 0677d0ce6bdf22b4ba5908a5e2259d0e, type: 3}
-      propertyPath: m_Name
-      value: SM_Env_Flowers_Large_03
-      objectReference: {fileID: 0}
-    - target: {fileID: 1072604494735902, guid: 0677d0ce6bdf22b4ba5908a5e2259d0e, type: 3}
-      propertyPath: m_Layer
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: 1072604494735902, guid: 0677d0ce6bdf22b4ba5908a5e2259d0e, type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 4294967295
-      objectReference: {fileID: 0}
-    - target: {fileID: 4718260399674780, guid: 0677d0ce6bdf22b4ba5908a5e2259d0e, type: 3}
-      propertyPath: m_RootOrder
-      value: 85
-      objectReference: {fileID: 0}
-    - target: {fileID: 4718260399674780, guid: 0677d0ce6bdf22b4ba5908a5e2259d0e, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -36.157
-      objectReference: {fileID: 0}
-    - target: {fileID: 4718260399674780, guid: 0677d0ce6bdf22b4ba5908a5e2259d0e, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -0.03400004
-      objectReference: {fileID: 0}
-    - target: {fileID: 4718260399674780, guid: 0677d0ce6bdf22b4ba5908a5e2259d0e, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -43.228012
-      objectReference: {fileID: 0}
-    - target: {fileID: 4718260399674780, guid: 0677d0ce6bdf22b4ba5908a5e2259d0e, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.86206204
-      objectReference: {fileID: 0}
-    - target: {fileID: 4718260399674780, guid: 0677d0ce6bdf22b4ba5908a5e2259d0e, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4718260399674780, guid: 0677d0ce6bdf22b4ba5908a5e2259d0e, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.5068028
-      objectReference: {fileID: 0}
-    - target: {fileID: 4718260399674780, guid: 0677d0ce6bdf22b4ba5908a5e2259d0e, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4718260399674780, guid: 0677d0ce6bdf22b4ba5908a5e2259d0e, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4718260399674780, guid: 0677d0ce6bdf22b4ba5908a5e2259d0e, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4718260399674780, guid: 0677d0ce6bdf22b4ba5908a5e2259d0e, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 0677d0ce6bdf22b4ba5908a5e2259d0e, type: 3}
---- !u!4 &1731359719 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 4718260399674780, guid: 0677d0ce6bdf22b4ba5908a5e2259d0e,
-    type: 3}
-  m_PrefabInstance: {fileID: 1731359718}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &1731359720 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1072604494735902, guid: 0677d0ce6bdf22b4ba5908a5e2259d0e,
-    type: 3}
-  m_PrefabInstance: {fileID: 1731359718}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1733044315
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -95098,7 +95022,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4458150534392060, guid: de4b90bf632cdf649af56ca9ded3d67b, type: 3}
       propertyPath: m_RootOrder
-      value: 95
+      value: 94
       objectReference: {fileID: 0}
     - target: {fileID: 4458150534392060, guid: de4b90bf632cdf649af56ca9ded3d67b, type: 3}
       propertyPath: m_LocalScale.x
@@ -95663,7 +95587,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 416089f3a62e31742b09514c8fc1467b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  RightHand: {fileID: 0}
+  RightHand: {fileID: 4778278270110463551}
+  autoLockRobot: 0
 --- !u!1001 &1748358341
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -96896,7 +96821,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4127082532080598, guid: 50e3f0e9aeb683542bcfe0fe1dab3ae1, type: 3}
       propertyPath: m_RootOrder
-      value: 112
+      value: 111
       objectReference: {fileID: 0}
     - target: {fileID: 4127082532080598, guid: 50e3f0e9aeb683542bcfe0fe1dab3ae1, type: 3}
       propertyPath: m_LocalPosition.x
@@ -98424,7 +98349,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4458150534392060, guid: de4b90bf632cdf649af56ca9ded3d67b, type: 3}
       propertyPath: m_RootOrder
-      value: 92
+      value: 91
       objectReference: {fileID: 0}
     - target: {fileID: 4458150534392060, guid: de4b90bf632cdf649af56ca9ded3d67b, type: 3}
       propertyPath: m_LocalPosition.x
@@ -99124,7 +99049,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4166644854343170, guid: 2a61a04a8877508498a18b963fe5afd6, type: 3}
       propertyPath: m_RootOrder
-      value: 104
+      value: 103
       objectReference: {fileID: 0}
     - target: {fileID: 4166644854343170, guid: 2a61a04a8877508498a18b963fe5afd6, type: 3}
       propertyPath: m_LocalPosition.x
@@ -99559,7 +99484,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4166644854343170, guid: 2a61a04a8877508498a18b963fe5afd6, type: 3}
       propertyPath: m_RootOrder
-      value: 108
+      value: 107
       objectReference: {fileID: 0}
     - target: {fileID: 4166644854343170, guid: 2a61a04a8877508498a18b963fe5afd6, type: 3}
       propertyPath: m_LocalScale.x
@@ -104818,7 +104743,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4193683576745232, guid: 3a58129ae5b98e54194c0043f168413f, type: 3}
       propertyPath: m_RootOrder
-      value: 87
+      value: 86
       objectReference: {fileID: 0}
     - target: {fileID: 4193683576745232, guid: 3a58129ae5b98e54194c0043f168413f, type: 3}
       propertyPath: m_LocalPosition.x
@@ -105795,7 +105720,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4458150534392060, guid: de4b90bf632cdf649af56ca9ded3d67b, type: 3}
       propertyPath: m_RootOrder
-      value: 90
+      value: 89
       objectReference: {fileID: 0}
     - target: {fileID: 4458150534392060, guid: de4b90bf632cdf649af56ca9ded3d67b, type: 3}
       propertyPath: m_LocalScale.x
@@ -106273,7 +106198,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4193683576745232, guid: 3a58129ae5b98e54194c0043f168413f, type: 3}
       propertyPath: m_RootOrder
-      value: 89
+      value: 88
       objectReference: {fileID: 0}
     - target: {fileID: 4193683576745232, guid: 3a58129ae5b98e54194c0043f168413f, type: 3}
       propertyPath: m_LocalPosition.x
@@ -106698,7 +106623,7 @@ MonoBehaviour:
   savedUp: {x: 0, y: 1, z: 0}
   savedRectSize: {x: 676.6054, y: 219.4}
   savedColor: {r: 1, g: 1, b: 1, a: 1}
-  savedTextUV0: {x: 0.048828125, y: 0.07519531}
+  savedTextUV0: {x: 0.671875, y: 0.31445312}
   savedFill: 0
 --- !u!114 &2015370029
 MonoBehaviour:
@@ -107515,7 +107440,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4458150534392060, guid: de4b90bf632cdf649af56ca9ded3d67b, type: 3}
       propertyPath: m_RootOrder
-      value: 91
+      value: 90
       objectReference: {fileID: 0}
     - target: {fileID: 4458150534392060, guid: de4b90bf632cdf649af56ca9ded3d67b, type: 3}
       propertyPath: m_LocalPosition.x
@@ -109465,7 +109390,7 @@ MonoBehaviour:
   savedUp: {x: 0, y: 1, z: 0}
   savedRectSize: {x: 775.2041, y: 336.4}
   savedColor: {r: 1, g: 1, b: 1, a: 1}
-  savedTextUV0: {x: 0.12695312, y: 0.029296875}
+  savedTextUV0: {x: 0.23291016, y: 0.77783203}
   savedFill: 0
 --- !u!114 &2071015162
 MonoBehaviour:
@@ -113794,7 +113719,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4477281681761694, guid: 09bb74408a476974c9b51750f5159573, type: 3}
       propertyPath: m_RootOrder
-      value: 100
+      value: 99
       objectReference: {fileID: 0}
     - target: {fileID: 4477281681761694, guid: 09bb74408a476974c9b51750f5159573, type: 3}
       propertyPath: m_LocalPosition.x
@@ -116769,19 +116694,6 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 5, y: 0, z: 5}
   m_Center: {x: -2.5, y: 0.000000007450581, z: -2.5}
---- !u!65 &2710406020780299229
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1731359720}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 13.064724, y: 1.3617303, z: 9.46539}
-  m_Center: {x: -1.6500404, y: -0.31209502, z: 1.6881651}
 --- !u!65 &2714251246381372351
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -121866,7 +121778,7 @@ PrefabInstance:
     - target: {fileID: 750409918179874947, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 74.99
+      value: 24.2
       objectReference: {fileID: 0}
     - target: {fileID: 750409918179874947, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
@@ -121876,32 +121788,67 @@ PrefabInstance:
     - target: {fileID: 750409918179874947, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 69.35
+      value: 56.8
       objectReference: {fileID: 0}
     - target: {fileID: 750409918179874947, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: -0.05122408
+      value: 0.17806815
       objectReference: {fileID: 0}
     - target: {fileID: 750409918179874947, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0.9986872
+      value: -0.9840182
       objectReference: {fileID: 0}
     - target: {fileID: 750409918179874947, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: -185.872
+      value: -159.48601
       objectReference: {fileID: 0}
     - target: {fileID: 1443360654543029406, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -43.98
+      value: -47.993927
       objectReference: {fileID: 0}
     - target: {fileID: 1443360654543029406, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 16.33
+      value: 14.697788
+      objectReference: {fileID: 0}
+    - target: {fileID: 1443360654543029406, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.6202793
+      objectReference: {fileID: 0}
+    - target: {fileID: 1443360654543029406, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.6202793
+      objectReference: {fileID: 0}
+    - target: {fileID: 1443360654543029406, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.33949018
+      objectReference: {fileID: 0}
+    - target: {fileID: 1443360654543029406, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.33949018
+      objectReference: {fileID: 0}
+    - target: {fileID: 1443360654543029406, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90.00001
+      objectReference: {fileID: 0}
+    - target: {fileID: 1443360654543029406, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1443360654543029406, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -57.385002
       objectReference: {fileID: 0}
     - target: {fileID: 2149133808831383748, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
@@ -121916,82 +121863,132 @@ PrefabInstance:
     - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -32.57
+      value: -31.55
+      objectReference: {fileID: 0}
+    - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1.7
       objectReference: {fileID: 0}
     - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 30.61
+      value: 31.87
       objectReference: {fileID: 0}
     - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: -0.6436659
+      value: -0.68685365
+      objectReference: {fileID: 0}
+    - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.6868537
       objectReference: {fileID: 0}
     - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0.76530665
+      value: -0.16802393
+      objectReference: {fileID: 0}
+    - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.16802397
+      objectReference: {fileID: 0}
+    - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -89.99999
       objectReference: {fileID: 0}
     - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: -260.13098
+      value: -180
+      objectReference: {fileID: 0}
+    - target: {fileID: 2168056415525910188, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -152.508
       objectReference: {fileID: 0}
     - target: {fileID: 3752263223444871869, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -24.83
+      value: -28.2
+      objectReference: {fileID: 0}
+    - target: {fileID: 3752263223444871869, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1.7
       objectReference: {fileID: 0}
     - target: {fileID: 3752263223444871869, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 68.67
+      value: 70
       objectReference: {fileID: 0}
     - target: {fileID: 3752263223444871869, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: -0.50845116
+      value: 0.2208966
+      objectReference: {fileID: 0}
+    - target: {fileID: 3752263223444871869, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.22089672
       objectReference: {fileID: 0}
     - target: {fileID: 3752263223444871869, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0.8610909
+      value: -0.67171776
+      objectReference: {fileID: 0}
+    - target: {fileID: 3752263223444871869, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.6717177
+      objectReference: {fileID: 0}
+    - target: {fileID: 3752263223444871869, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -89.99999
       objectReference: {fileID: 0}
     - target: {fileID: 3752263223444871869, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: -241.121
+      value: -180
+      objectReference: {fileID: 0}
+    - target: {fileID: 3752263223444871869, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 36.406998
       objectReference: {fileID: 0}
     - target: {fileID: 4594502150642293426, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 32.2
+      value: 51.302994
       objectReference: {fileID: 0}
     - target: {fileID: 4594502150642293426, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 31.56
+      value: 21.288311
       objectReference: {fileID: 0}
     - target: {fileID: 4594502150642293426, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: -0.38513476
+      value: -0.9970461
       objectReference: {fileID: 0}
     - target: {fileID: 4594502150642293426, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0.9228603
+      value: -0.076805554
       objectReference: {fileID: 0}
     - target: {fileID: 4594502150642293426, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: -225.304
+      value: -351.19
       objectReference: {fileID: 0}
     - target: {fileID: 5839439162582256162, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_RootOrder
-      value: 9
+      value: 10
       objectReference: {fileID: 0}
     - target: {fileID: 5839439162582256162, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
@@ -122056,52 +122053,92 @@ PrefabInstance:
     - target: {fileID: 5839439163087930210, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -48.29
+      value: -49.31
+      objectReference: {fileID: 0}
+    - target: {fileID: 5839439163087930210, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1.81
       objectReference: {fileID: 0}
     - target: {fileID: 5839439163087930210, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 52.55
+      value: 54.6
       objectReference: {fileID: 0}
     - target: {fileID: 5839439163087930210, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.95662546
+      value: 0.50637203
+      objectReference: {fileID: 0}
+    - target: {fileID: 5839439163087930210, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.5063721
       objectReference: {fileID: 0}
     - target: {fileID: 5839439163087930210, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0.29132062
+      value: 0.49354574
+      objectReference: {fileID: 0}
+    - target: {fileID: 5839439163087930210, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.49354562
+      objectReference: {fileID: 0}
+    - target: {fileID: 5839439163087930210, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90.00001
       objectReference: {fileID: 0}
     - target: {fileID: 5839439163087930210, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: -33.874
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5839439163087930210, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 88.53001
       objectReference: {fileID: 0}
     - target: {fileID: 6062640080318399586, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -47.77
+      value: 14.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6062640080318399586, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.06400001
       objectReference: {fileID: 0}
     - target: {fileID: 6062640080318399586, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 80.4
+      value: 7.4
       objectReference: {fileID: 0}
     - target: {fileID: 6062640080318399586, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: -0.45826524
+      value: -0.92278385
+      objectReference: {fileID: 0}
+    - target: {fileID: 6062640080318399586, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 6062640080318399586, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0.8888155
+      value: -0.38531825
+      objectReference: {fileID: 0}
+    - target: {fileID: 6062640080318399586, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 6062640080318399586, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: -234.54999
+      value: -314.673
       objectReference: {fileID: 0}
     - target: {fileID: 6769904928856135544, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
@@ -122116,37 +122153,107 @@ PrefabInstance:
     - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 44.81
+      value: 46.08
+      objectReference: {fileID: 0}
+    - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1.7
       objectReference: {fileID: 0}
     - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 43.02
+      value: 40.36
       objectReference: {fileID: 0}
     - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.9961156
+      value: 0.6981611
+      objectReference: {fileID: 0}
+    - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.6981611
       objectReference: {fileID: 0}
     - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0.08805557
+      value: 0.112121016
+      objectReference: {fileID: 0}
+    - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.112121016
+      objectReference: {fileID: 0}
+    - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
       objectReference: {fileID: 0}
     - target: {fileID: 6917003198760464982, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: -10.104
+      value: 18.247002
       objectReference: {fileID: 0}
     - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -6.09
+      value: -9.85
+      objectReference: {fileID: 0}
+    - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1.7
       objectReference: {fileID: 0}
     - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 51.87
+      value: 51.72
+      objectReference: {fileID: 0}
+    - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.68646836
+      objectReference: {fileID: 0}
+    - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.68646836
+      objectReference: {fileID: 0}
+    - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.16959137
+      objectReference: {fileID: 0}
+    - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.16959137
+      objectReference: {fileID: 0}
+    - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90.00001
+      objectReference: {fileID: 0}
+    - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7598232193270340823, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 27.754002
+      objectReference: {fileID: 0}
+    - target: {fileID: 8110610413245634521, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_Radius
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8110610413245634521, guid: da82fda99b00d5a43acb267e6f773c88,
+        type: 3}
+      propertyPath: m_Center.y
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: da82fda99b00d5a43acb267e6f773c88, type: 3}

+ 0 - 2
Hector_v2/Assets/Scripts/Menu/InteractionManagement.cs

@@ -1,7 +1,5 @@
 /*
  * Control center, processing interaction, menu display, robot lock etc.
- *
- * Author: Jingyi Jia
  * 
  */
 

+ 4 - 20
Hector_v2/Assets/Scripts/Menu/MenuSelectEffect.cs

@@ -5,19 +5,9 @@ using UnityEngine.UI;
 
 public class MenuSelectEffect : MonoBehaviour
 {
-    public Text MenuTitle;
-   
-    Color32 oldColor = Color.white;
-    Color32 ColorModeSelected = new Color32(255, 225, 64, 217);
+    public GameObject TaskDiscription;
     private void OnEnable() {
-
-        // Change the color and content of the button in MenuGUI
-        if(MenuTitle!=null){
-            oldColor = MenuTitle.color;
-            MenuTitle.color = ColorModeSelected;
-            MenuTitle.fontStyle = FontStyle.Bold;
-            MenuTitle.text = MenuTitle.text + " (Now)";
-        }
+        TaskDiscription.SetActive(true);
     }
 
     // Start is called before the first frame update
@@ -32,13 +22,7 @@ public class MenuSelectEffect : MonoBehaviour
     
     }
 
-    private void OnDisable() {
-        
-        // Recover the color and content of Button in MenuGUI
-        if(MenuTitle!=null){
-            MenuTitle.color = oldColor;
-            MenuTitle.fontStyle = FontStyle.Normal;
-            MenuTitle.text = gameObject.name;
-        }
+    private void OnDisable() {   
+        TaskDiscription.SetActive(false);
     }
 }

+ 2 - 1
Hector_v2/Assets/Scripts/Menu/UIDrag.cs

@@ -8,6 +8,7 @@ public class UIDrag: MonoBehaviour,IPointerDownHandler,IPointerUpHandler
 {   
 
     public GameObject RightHand;
+    public bool autoLockRobot = true;
     Transform parent;
 
     // Update is called once per frame
@@ -26,7 +27,7 @@ public class UIDrag: MonoBehaviour,IPointerDownHandler,IPointerUpHandler
 
     public void OnPointerDown(PointerEventData eventData)
     {   
-        if(!InteractionManagement.Instance.Robot_Locked){
+        if(!InteractionManagement.Instance.Robot_Locked && autoLockRobot){
             InteractionManagement.Instance.LockRobot(true);
         }
         startDrag();

+ 9 - 5
Hector_v2/Assets/Scripts/Mode/Handle.cs

@@ -1,7 +1,6 @@
 /*
- * Handle the Event in Defualt Mode
+ * Handle the Event in Handle Mode
  *
- * Author: Jingyi Jia
  * 
  */
 
@@ -24,7 +23,9 @@ public class Handle : MonoBehaviour,IMode
     SteamVR_Action_Vibration vibration = SteamVR_Input.GetVibrationAction("Haptic");
 
     private void OnEnable() {
-        
+
+        GameObject.Find("Input").GetComponent<VRInput>().SetMode(this.gameObject);
+
         // The player can be raised or lowered (the aerial perspective is enabled)
         Player_Control.upDownEnabled = true;
         
@@ -65,7 +66,7 @@ public class Handle : MonoBehaviour,IMode
         Vector2 touchValue = touchpad.GetAxis(SteamVR_Input_Sources.RightHand);
         SteamVR_Action_Single squezz = SteamVR_Input.GetSingleAction("Squeeze");
         float angle = touchValue.x;
-        float velocity = squezz.GetAxis(SteamVR_Input_Sources.RightHand)*0.3f;
+        float velocity = squezz.GetAxis(SteamVR_Input_Sources.RightHand);
         //vibration.Execute(0f, 0.1f, velocity*50f, velocity, SteamVR_Input_Sources.RightHand);
         signal =  new Vector2(angle,velocity);    
     }
@@ -92,7 +93,7 @@ public class Handle : MonoBehaviour,IMode
         }
     }
 
-    // open or close the modemenu: map, monitor....
+    // open or close the modemenu: monitor
     private void ModeMenuHandler(SteamVR_Action_Boolean fromAction, SteamVR_Input_Sources fromSource)
     {   
         bool active = false;
@@ -103,10 +104,13 @@ public class Handle : MonoBehaviour,IMode
         vibration.Execute(0f, 0.1f, 50f, 1f, SteamVR_Input_Sources.Any);
     }
     private void OnDisable() {
+
+        // close the modemenu and the UILaser effect, which parent was changed during runnning
         foreach(GameObject child in ModeMenu){
             if(child != null)
                 child.SetActive(false);
         }
+        
         // Remove SteamVR Actions Listener
         SteamVR_Actions.default_Menu.RemoveOnStateDownListener(MenuActionHandler,SteamVR_Input_Sources.Any);
         SteamVR_Actions.default_Lock.RemoveOnStateDownListener(Locked_onStateDown,SteamVR_Input_Sources.Any);

+ 12 - 8
Hector_v2/Assets/Scripts/Mode/Lab.cs

@@ -1,7 +1,6 @@
 /*
  * Handle the Event in Lab Mode
  *
- * Author: Jingyi Jia
  * 
  */
 
@@ -29,6 +28,9 @@ public class Lab : MonoBehaviour,IMode
 
     public float velocitySpeed;
     public float angleSpeed;
+    
+    // change the speed, so that the robot can run faster after editing
+    
 
     public Joystick angle_joystick;
     public Joystick velocity_joystick;
@@ -44,7 +46,8 @@ public class Lab : MonoBehaviour,IMode
     bool velocity_joystickAttached = false;
 
     private void OnEnable() {
-        
+        GameObject.Find("Input").GetComponent<VRInput>().SetMode(this.gameObject);
+
         // The player cannot be raised or lowered (the aerial perspective is disabled)
         Player_Control.upDownEnabled = false; 
         
@@ -52,15 +55,15 @@ public class Lab : MonoBehaviour,IMode
         interactionManagement.SetPlayerText( "Control Mode : " + gameObject.name, 7, false);
         interactionManagement.HideController();
 
-        
         robot =  GameObject.FindGameObjectWithTag("robot");
+        
+
         player = Player.instance;
 
         player.transform.position = gameObject.transform.position + new Vector3(0,0,26);
         player.transform.LookAt(gameObject.transform);
-        
 
-        // reset the manu position
+        // reset the menu position
         interactionManagement.SetMenu(false);
         interactionManagement.SetMenu(true);
 
@@ -116,9 +119,9 @@ public class Lab : MonoBehaviour,IMode
     {   velocity = 0;
         angle = 0;
 
-        // the robot will stop/start move forward 
+        // the robot will stop/start move forward automatically
         if(forward){
-            velocity =  velocitySpeed * 0.5f;
+            velocity =  velocitySpeed * 0.5f;    // justify the speed so that it will not run too fast
         }
 
         // change the direction of the robot
@@ -140,7 +143,7 @@ public class Lab : MonoBehaviour,IMode
      
     }
 
-    // Handle Button Click Effect: the robot will stop/start move forward 
+    // Handle Button Click Effect: the robot will stop/start move forward automatically 
     public void goForward(GameObject button){
         forward = !forward;
         if(forward){
@@ -201,6 +204,7 @@ public class Lab : MonoBehaviour,IMode
 
 
     private void OnDisable() {
+
         // Remove SteamVR Actions Listener
         SteamVR_Actions.default_Menu.RemoveOnStateDownListener(MenuActionHandler,SteamVR_Input_Sources.Any);
         player.transform.position = robot.transform.position + new Vector3(-1,0,0);;

+ 9 - 12
Hector_v2/Assets/Scripts/Mode/Remote.cs

@@ -1,7 +1,5 @@
 /*
- * Handle the Event in Defualt Mode
- *
- * Author: Jingyi Jia
+ * Handle the Event in Remote Mode
  * 
  */
 
@@ -19,18 +17,20 @@ public class Remote: MonoBehaviour,IMode
     InteractionManagement interactionManagement;
     public Player_Control Player_Control;
 
+    // the remoteController will be set during running, which depends on the path of Remote GameObject
+    // So be carefull to change the hierarchy of modes
     public RemoteController remoteController;
-
     public Valve.VR.InteractionSystem.TargetLaser targetLaser;
     public GameObject[] ModeMenu;
     public Vector2 signal;
     public Vector2 Signal => signal;
     SteamVR_Action_Vibration vibration = SteamVR_Input.GetVibrationAction("Haptic");
-
     GameObject robot;
     private NavMeshAgent navMeshAgent;
     private void OnEnable() {
         
+        GameObject.Find("Input").GetComponent<VRInput>().SetMode(this.gameObject);
+        
         // The player can be raised or lowered (the aerial perspective is enabled)
         Player_Control.upDownEnabled = true;
         
@@ -42,7 +42,7 @@ public class Remote: MonoBehaviour,IMode
         interactionManagement.SetPlayerText( "Control Mode : " + gameObject.name, 7, false);
         interactionManagement.SetMenu(false);
 
-        // Add  SteamVR Actions Listener
+        // Add SteamVR Actions Listener
         SteamVR_Actions.default_Menu.AddOnStateDownListener(MenuActionHandler,SteamVR_Input_Sources.Any);
         SteamVR_Actions.default_Lock.AddOnStateDownListener(Locked_onStateDown,SteamVR_Input_Sources.Any);
         SteamVR_Actions.default_ModeMenu.AddOnStateDownListener(ModeMenuHandler,SteamVR_Input_Sources.Any);
@@ -70,13 +70,13 @@ public class Remote: MonoBehaviour,IMode
     {   
         signal = Vector2.zero;
 
-        // Auto driving
+        // Auto driving after the destination has been set
         if(targetLaser.autoDrive){
             navMeshAgent.SetDestination(targetLaser.targetPosition);
             
             float distance = Vector3.Distance(targetLaser.targetPosition, robot.transform.position);
 
-            // Already arrive at the target position
+            // Already arrive at the target position => stop auto driving
             if(distance <= 1){
                 stopAutoDrive();
             }
@@ -86,7 +86,7 @@ public class Remote: MonoBehaviour,IMode
         // get control signal from the joystick
         if(remoteController != null){
             if(remoteController.angle != 0 || remoteController.velocity !=0 ){
-                signal =  new Vector2(remoteController.angle,remoteController.velocity * 0.3f);   
+                signal =  new Vector2(remoteController.angle,remoteController.velocity);   
                 if(targetLaser.autoDrive){
                     stopAutoDrive();
                 }
@@ -100,7 +100,6 @@ public class Remote: MonoBehaviour,IMode
         navMeshAgent.SetDestination(robot.transform.position);
         navMeshAgent.ResetPath();
         GameObject.Destroy(targetLaser.TargetFlag);
-        //interactionManagement.SetPlayerText("Stop Auto Driving",5,false);
     }
 
     private void MenuActionHandler(SteamVR_Action_Boolean fromAction, SteamVR_Input_Sources fromSource)
@@ -153,8 +152,6 @@ public class Remote: MonoBehaviour,IMode
         }
 
         stopAutoDrive();
-        // targetLaser.autoDrive = false;
-        // GameObject.Destroy(targetLaser.TargetFlag);
 
     }
 

+ 1 - 3
Hector_v2/Assets/Scripts/Mode/SpeedLinearEditor.cs

@@ -8,8 +8,6 @@ public class SpeedLinearEditor : MonoBehaviour
 {
    
     public float speed;
-
-    public float maxSpeed = 3;
     public Text speedText;
     public  LinearMapping  linearMapping;
     // Start is called before the first frame update
@@ -21,7 +19,7 @@ public class SpeedLinearEditor : MonoBehaviour
     // Update is called once per frame
     void Update()
     {
-        speed = maxSpeed *  linearMapping.value;
+        speed = linearMapping.value;
         speedText.text = (linearMapping.value).ToString();
     }
 }

+ 15 - 2
Hector_v2/Assets/Scripts/Mode/UI_Mode.cs

@@ -1,7 +1,6 @@
 /*
  * Handle the Event in UI Mode
  *
- * Author: Jingyi Jia
  * 
  */
 
@@ -35,13 +34,18 @@ public class UI_Mode: MonoBehaviour,IMode
     GameObject robot;
     Player player;
     private NavMeshAgent navMeshAgent;
+    private float originSpeed;    // origin speed from navMEshAgent;
     private void OnEnable() {
+
+        GameObject.Find("Input").GetComponent<VRInput>().SetMode(this.gameObject);
         
         // The player can be raised or lowered (the aerial perspective is enabled)
         Player_Control.upDownEnabled = true;
 
         robot =  GameObject.FindGameObjectWithTag("robot");
         navMeshAgent = robot.GetComponent<NavMeshAgent>();
+        originSpeed = navMeshAgent.speed;
+
         navMeshAgent.stoppingDistance = 2;
         player = Player.instance;
 
@@ -88,18 +92,23 @@ public class UI_Mode: MonoBehaviour,IMode
         if(!userControl){
             signal = Vector2.zero;
         }
+        
         // Auto driving
         if(follow_me_Toggle.isOn){
             Vector3 targetPosition = player.transform.position;
             targetPosition.y = robot.transform.position.y;
             navMeshAgent.SetDestination(targetPosition);
+            navMeshAgent.speed = originSpeed * velocity_Slider.value;
         }
         else{
-             navMeshAgent.ResetPath();
+            // stop auto driving
+            navMeshAgent.ResetPath();
         }     
         
     }
 
+    // Handle Button Select Effect: Left or Right
+    // angele = -1/1
     public void setAngleStart(float angle){
         if(interactionManagement.Robot_Locked){
             interactionManagement.SetPlayerText("Please unlock the robot");
@@ -111,6 +120,8 @@ public class UI_Mode: MonoBehaviour,IMode
         
     }
 
+    // Handle Button Select Effect: Forward or Backward
+    // velocity = -1/1
     public void setVelocityStart(float velocity){
         if(interactionManagement.Robot_Locked){
             interactionManagement.SetPlayerText("Please unlock the robot");
@@ -155,6 +166,8 @@ public class UI_Mode: MonoBehaviour,IMode
                 child.SetActive(false);
         }
 
+        navMeshAgent.speed = originSpeed;
+
         // Remove SteamVR Actions Listener
         SteamVR_Actions.default_Menu.RemoveOnStateDownListener(MenuActionHandler,SteamVR_Input_Sources.Any);
         SteamVR_Actions.default_ModeMenu.RemoveOnStateDownListener(ModeMenuHandler,SteamVR_Input_Sources.Any);

+ 14 - 16
Hector_v2/Assets/Scripts/Player/VRInput.cs

@@ -8,20 +8,11 @@ using Valve.VR.InteractionSystem;
 // Attached to GameObject Input in the hierachy.
 public class VRInput : MonoBehaviour
 {
-    // public ScrollRect scrollRect;
-    
-    // public Hand leftHand;
-    // public Hand rightHand;
- 
-    // If more functions are added: a possibility to differentiate between a game mode and menu mode.
-    // public GameObject Player;
-
     public GameObject CurrentMode;
-    public InteractionManagement InteractionManagement;
+    
     public bool inMenu => InteractionManagement.Instance.Menu_Opened;
     public bool isLocked => InteractionManagement.Instance.Robot_Locked;
-
-    public Vector2 touchValue;    
+    public Vector2 touchValue; 
     
     private void Awake()
     {   
@@ -44,17 +35,24 @@ public class VRInput : MonoBehaviour
     }
   
 
-    // calculate the velocity and angle according to the mode
+    // update the velocity and angle according to the mode
     public Vector2 getTouchValue()
     {   
-        touchValue = CurrentMode.GetComponent<IMode>().Signal;
-        return CurrentMode.GetComponent<IMode>().Signal;
+        Vector2 signal = Vector2.zero;
+        if(CurrentMode!=null){
+            signal = CurrentMode.GetComponent<IMode>().Signal;
+        }
+        touchValue = signal;
+        return signal;
+            
     }
 
-    // Change the Mode, if not existed, change it to Default Mode
+    // Change the Mode so that it can get its signal
     public void SetMode(GameObject mode){
         if( this.CurrentMode != mode){
-            this.CurrentMode.SetActive(false);
+            if(this.CurrentMode != null){
+                this.CurrentMode.SetActive(false);
+            }
             mode.SetActive(true);
             this.CurrentMode = mode;
         } 

+ 93 - 6
Hector_v2/Assets/Scripts/Test/TestManagement.cs

@@ -4,15 +4,20 @@ using UnityEngine;
 using Valve.VR.InteractionSystem;
 using UnityEngine.SceneManagement;
 using Valve.VR;
-using UnityEngine.UI;
+using System.Text;
+using System.IO;
 
 public class TestManagement : MonoBehaviour
 {
     public static TestManagement Instance { get; private set; }
+    public int TestID = 1;
+    public string csvPath = @"C:\Users\alley\Desktop\Hecto\TestResult\";
+    public int TestMode = 1;
+    public GameObject[] ModeList;
     
     // ------- Test Information-------------
 
-    public float TotalTime = 600;   // default test time
+    public float TotalTime = 300;   // default test time
 
     // robot info
     [Tooltip("Number of collisions detected")]
@@ -39,14 +44,26 @@ public class TestManagement : MonoBehaviour
     
     // --------------
 
-
+    [HideInInspector]
     public GameObject[] targetList;
     TestRobot currentTestRobot;
     SteamVR_LoadLevel loader;
     // Start is called before the first frame update
     void Start()
     {   
+        // synchronization
+        if(Instance!=null){
+            TestID = Instance.TestID;
+            TestMode = Instance.TestMode;
+        }
         Instance = this;
+
+        // Handle the sequence of the mode to test
+        if(SceneManager.GetActiveScene().name == "Simulation"){
+            initModeList();
+            ModeList[TestMode-1].SetActive(true);
+        }
+
         loader = gameObject.GetComponent<SteamVR_LoadLevel>();
         StartCoroutine(Time());
         targetList = GameObject.FindGameObjectsWithTag("target");
@@ -54,6 +71,29 @@ public class TestManagement : MonoBehaviour
         totalTarget = targetList.Length;
     }
 
+
+    // Caculate the sequence of the modes based on Latin Square (size = 4)
+    private void initModeList()
+    {   
+        // if the ID is illegal, the default Sequence will be used
+        // all the date will be saved in 0.csv as a test date
+        bool illegalID = false;
+        if(TestID <=0){
+            TestID = 1;
+            illegalID = true;
+        }
+
+        var modes =  ModeList;
+        ModeList = new GameObject[4];
+    
+        for(int i =0;i<modes.Length;i++){
+            ModeList[i] =  modes[(TestID-1+i)%4];
+        } 
+        if(illegalID){
+            TestID = 0;
+        }
+    }
+
     // Update is called once per frame
     void Update()
     {
@@ -79,14 +119,15 @@ public class TestManagement : MonoBehaviour
         GameObject.Find("Input").GetComponent<VRInput>().CurrentMode.SetActive(false);
         Destroy(Player.instance.gameObject);
 
-        // delete targets and robt
+        // delete targets and robot
         foreach(Transform child in transform){
-             Destroy(child.gameObject);
+            Destroy(child.gameObject);
         }
 
+        // change scene
         loader.levelName = name;
         loader.Trigger();
-        //SceneManager.LoadSceneAsync(name);
+        
     }
 
     IEnumerator Time()
@@ -130,7 +171,53 @@ public class TestManagement : MonoBehaviour
         testinfo += "Remained Unvisible Target: " +  unvisibleTarget + "\n";
         Debug.Log(testinfo);
 
+        writeCSV();
         InteractionManagement.Instance.SetMenu(true);
         InteractionManagement.Instance.SetPlayerText("The test has ended. Please wait.",5,false);
+        
+        // next text
+        TestMode++;
+    }
+
+    private void writeCSV(){
+        
+        string strFilePath = csvPath + TestID +".csv";
+        
+        string strSeperator = ",";
+        string line = "";
+        if(!File.Exists(strFilePath)){
+            line += "participant" + strSeperator;
+            line += "condition" + strSeperator;
+            line += "Remained Time" + strSeperator;
+            line += "Collision" + strSeperator;
+            line += "Drive Distance" + strSeperator;
+            line += "Total driving time" + strSeperator;
+            line += "Adverage speed" + strSeperator;
+            line += "Rescued Target" + strSeperator;
+            line += "Remained Visible Target" + strSeperator;
+            line += "Remained Unvisible Target" + strSeperator;
+            line += "time" + strSeperator;
+            line += "\n";
+
+            // Create and write the csv file
+            File.WriteAllText(strFilePath, line);
+            line = "";
+        }
+
+        line += TestID + strSeperator;
+        line += SceneManager.GetActiveScene().name + strSeperator;
+        line += TotalTime + strSeperator;
+        line += triggerCount + strSeperator;
+        line += totalDriveDistance + strSeperator;
+        line += totalDriveTime + strSeperator;
+        line += averageSpeed + strSeperator;
+        line += rescuedTarget + strSeperator;
+        line += visibleTarget + strSeperator;
+        line += unvisibleTarget + strSeperator;
+        line += System.DateTime.Now.ToString(("yyyy/MM/dd HH:mm"))+ strSeperator;
+        line += "\n";
+
+        // To append line to the csv file
+        File.AppendAllText(strFilePath, line);
     }
 }

BIN
Hector_v2/Library/ArtifactDB


BIN
Hector_v2/Library/Artifacts/05/05fa8fb4dc428c2373f75cc15a0aeb68


BIN
Hector_v2/Library/Artifacts/08/0814e59da047bb609d81fc9e52c4a14c


BIN
Hector_v2/Library/Artifacts/08/083c0b6454437489978723068109f352


BIN
Hector_v2/Library/Artifacts/0b/0bebd260e8b24ee23719807a5fb562c7


BIN
Hector_v2/Library/Artifacts/0e/0ea4fc497dac6cda9723f3b5f9d58a1b


BIN
Hector_v2/Library/Artifacts/12/121d7071776590108f6b912bb45f087a


BIN
Hector_v2/Library/Artifacts/15/150e7cfe4107c438434b28f48936f812


BIN
Hector_v2/Library/Artifacts/15/15aed5c1380d51028b7fcae9d6518816


BIN
Hector_v2/Library/Artifacts/1a/1a780569871b2b8d1949192aa0f5ca7a


BIN
Hector_v2/Library/Artifacts/bb/bb70524ee86320752cb3a5bb820adaba → Hector_v2/Library/Artifacts/1a/1a8c4ef7c4feca1e8bb842bbf9072394


BIN
Hector_v2/Library/Artifacts/c2/c24dc09339ddb735b2e425fc560fddb7 → Hector_v2/Library/Artifacts/1a/1ab30864f28c7503f93bca1d477973b7


BIN
Hector_v2/Library/Artifacts/1c/1c70740ac0d5dbdb5df28d764a6793ae


BIN
Hector_v2/Library/Artifacts/20/20b623fcae7e7d2623425f0e91e295f6


BIN
Hector_v2/Library/Artifacts/22/22b263c5a7d88dfe43e01a60fb0b088b


BIN
Hector_v2/Library/Artifacts/23/23570957043c7be3308c473e5057f2f8


BIN
Hector_v2/Library/Artifacts/23/23a813629212b4a62a30a35424550f99


BIN
Hector_v2/Library/Artifacts/23/23ffc5df201a9428f52df7257f58a830


BIN
Hector_v2/Library/Artifacts/26/268c4490b057bc141738cfafebdd83a2


BIN
Hector_v2/Library/Artifacts/2a/2aa5341ef74c8153e4e04ab66313a7fa


BIN
Hector_v2/Library/Artifacts/2b/2b1baa01025042632450ca57e59cba7e


BIN
Hector_v2/Library/Artifacts/2b/2b7e67c049955f877c6156fb3dade073


BIN
Hector_v2/Library/Artifacts/2c/2ca1d7bf37c8d8b08fd8f211e6389e09


BIN
Hector_v2/Library/Artifacts/2c/2ca7c1cc84ff5a83ac046aa9970e5dd0


BIN
Hector_v2/Library/Artifacts/2e/2e0f48531490fb842d23ddc89c63344d


BIN
Hector_v2/Library/Artifacts/34/34ea30606e595050740fe62ba3192f6b


BIN
Hector_v2/Library/Artifacts/35/359eee806e1c86010d622f1cf8b2baad


BIN
Hector_v2/Library/Artifacts/38/389f56bf865cd224f191f582120a50c6


BIN
Hector_v2/Library/Artifacts/38/38a9385facbc8fde3105fcea2acecb1c


BIN
Hector_v2/Library/Artifacts/18/188a47972bef96391de44f364436b91b → Hector_v2/Library/Artifacts/39/39fa413294af572c39d251270092f7b9


BIN
Hector_v2/Library/Artifacts/39/39ffa570ff60940f50217e4b13c7b1e1


BIN
Hector_v2/Library/Artifacts/3d/3d313de96c2577ad3cf0ccce0d7f48e8


BIN
Hector_v2/Library/Artifacts/3d/3dcd35ff448f49eeae139deec79c29f2


BIN
Hector_v2/Library/Artifacts/40/401ad5bc61821e8556a8be17718b7dbf


BIN
Hector_v2/Library/Artifacts/41/4179709d38b6ecd5ddc7e9bd4a682f2a


BIN
Hector_v2/Library/Artifacts/43/43d29e39f79f97eb8563173f388e1071


BIN
Hector_v2/Library/Artifacts/45/454f0d21dbe5181a114959c0a381d872


BIN
Hector_v2/Library/Artifacts/45/45ad39b1ce713f5b33c2d119a677491d


BIN
Hector_v2/Library/Artifacts/4c/4cb511a8f4d69505db6157885e764e87


BIN
Hector_v2/Library/Artifacts/53/5369409edc5b731ebb01bc3b296e9059


BIN
Hector_v2/Library/Artifacts/54/54162d9df6c5992e063e20d6ecf6bf56


BIN
Hector_v2/Library/Artifacts/54/545136584ff8ebda174ba5f8ead1adee


BIN
Hector_v2/Library/Artifacts/5b/5b1c946e7561208a41aaac2a0b4a8cb4


BIN
Hector_v2/Library/Artifacts/5d/5d84570e1462127af64b4957985ebfb2


BIN
Hector_v2/Library/Artifacts/60/6041f84fbd6a64418503936362a659c7


BIN
Hector_v2/Library/Artifacts/52/52a5b2cde9a6934961009281a21ffe47 → Hector_v2/Library/Artifacts/63/6337c90f21ae902bc1cc1fdfc104667d


BIN
Hector_v2/Library/Artifacts/f4/f4476b610420d6574d831ea7839670c9 → Hector_v2/Library/Artifacts/65/6504084639f00bf62b6f6d06774ff724


BIN
Hector_v2/Library/Artifacts/68/688ad7248aec72c92ac7b9acddd4680b


BIN
Hector_v2/Library/Artifacts/7b/7b2247be7ce31790ac59c1831c07f57f → Hector_v2/Library/Artifacts/68/68b7f9ce18fb5503638c08584bccc24c


BIN
Hector_v2/Library/Artifacts/69/692549380e8df55408d3572a7c0ae81d


BIN
Hector_v2/Library/Artifacts/30/308e69fcc2cb7a40b284520fb3144664 → Hector_v2/Library/Artifacts/69/69a244b2d13ccc18c6b628f6f1570682


BIN
Hector_v2/Library/Artifacts/6d/6d7a2e41ce80513d0a48987d5f861e9e


BIN
Hector_v2/Library/Artifacts/72/72a08b74f8934610c608e63d1f5bbacf


BIN
Hector_v2/Library/Artifacts/ac/ac6a8b0fb383dce1b18bde3d0590e1a4 → Hector_v2/Library/Artifacts/78/78ff0efd49096aef2cbe7a15f87b6ecb


BIN
Hector_v2/Library/Artifacts/79/7996869aaad115cedfa2eff75a54fb9f


BIN
Hector_v2/Library/Artifacts/28/2812d49e5ad3a6e4ee443b0e4ecfae0e → Hector_v2/Library/Artifacts/7a/7a72b3453a7e947b2cb7e91756b52034


BIN
Hector_v2/Library/Artifacts/7a/7abef58b4302a5866e607e9e8ee555ec


BIN
Hector_v2/Library/Artifacts/7d/7d028d9156c680dbeed2a991396d1246


BIN
Hector_v2/Library/Artifacts/7e/7e2c921b81f83856a6107362fa1e9667


BIN
Hector_v2/Library/Artifacts/7f/7f816261ddd88a2401d2d076946b7eb2


BIN
Hector_v2/Library/Artifacts/94/9471a0727c9f5c47d87b2fa71671d586 → Hector_v2/Library/Artifacts/80/80730aecd8e5923b0644f7f9d8d994e6


BIN
Hector_v2/Library/Artifacts/85/8519e7b5db4980e44ee8ac3624c7246d


BIN
Hector_v2/Library/Artifacts/85/85a1338342cb4e9e08965eee2d54b518


BIN
Hector_v2/Library/Artifacts/89/899fded67362393fbb40653f3570daca


BIN
Hector_v2/Library/Artifacts/89/89f123f78ed91f58e2a5f886b49cff6c


BIN
Hector_v2/Library/Artifacts/57/57a81cb963c2bbfbc6f6abd858e30b3f → Hector_v2/Library/Artifacts/8a/8a67ca4add07a508d1127e5d581142ee


BIN
Hector_v2/Library/Artifacts/92/92d21e25dd6cfe3080ffad88da9c2e6b


BIN
Hector_v2/Library/Artifacts/93/93b02d70fec7a37b36a3b719760bd94a


BIN
Hector_v2/Library/Artifacts/96/961b472afd8cd4ff0d13eaefc507bff6


BIN
Hector_v2/Library/Artifacts/9a/9ad1daa86b05006674cbb2e8d2c27249


BIN
Hector_v2/Library/Artifacts/a4/a459511d67a2bb2e1317511765c8b392


BIN
Hector_v2/Library/Artifacts/a6/a6d3155d7b9d91f13a17f19b8e4ba126


BIN
Hector_v2/Library/Artifacts/ae/aead68232cc0d45c9c02b3bde0f36943


BIN
Hector_v2/Library/Artifacts/b1/b178c4b6ad587f77d1c699e41cfe27db


BIN
Hector_v2/Library/Artifacts/b8/b875bfbbd16d2bff93056df1976d510f


BIN
Hector_v2/Library/Artifacts/ba/ba52cfec904441eae09d815143ee283f


BIN
Hector_v2/Library/Artifacts/ba/badf2b47ae258c27ecb0153d8ca4b390


BIN
Hector_v2/Library/Artifacts/bb/bbbb01b9b4ec2f2ff45be4a065c552ce


BIN
Hector_v2/Library/Artifacts/c4/c4fec875386e96293839f78dc10e5b33 → Hector_v2/Library/Artifacts/bf/bf5326e0eef4fcdd8d49844f92611677


BIN
Hector_v2/Library/Artifacts/bf/bfface758ffaa203074febb0f5c7539d


BIN
Hector_v2/Library/Artifacts/c1/c164a31da489b8fe0e2d78a7c03afeee


BIN
Hector_v2/Library/Artifacts/c2/c21fe71c930024c496f70b83ab225647


BIN
Hector_v2/Library/Artifacts/c2/c22d5fd570a8bb6720425a3165afffdd


Some files were not shown because too many files changed in this diff