Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem

U3D_DrivingSystem/Assets/Scenes/main_.unity

@@ -247625,11 +247625,26 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 551427162108001307, guid: 63c0ff75cd2443b49ae41f5c1479c637,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2782124818239652136, guid: 63c0ff75cd2443b49ae41f5c1479c637,
         type: 3}
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3015136203743597836, guid: 63c0ff75cd2443b49ae41f5c1479c637,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4092979517409094241, guid: 63c0ff75cd2443b49ae41f5c1479c637,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4815339177332862360, guid: 63c0ff75cd2443b49ae41f5c1479c637,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -247645,11 +247660,26 @@ PrefabInstance:
       propertyPath: m_LocalPosition.z
       value: 96.29338
       objectReference: {fileID: 0}
+    - target: {fileID: 5028650829958322113, guid: 63c0ff75cd2443b49ae41f5c1479c637,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5611726230247123410, guid: 63c0ff75cd2443b49ae41f5c1479c637,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6771765470114885955, guid: 63c0ff75cd2443b49ae41f5c1479c637,
         type: 3}
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7782823663480648276, guid: 63c0ff75cd2443b49ae41f5c1479c637,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 7782823663494839776, guid: 63c0ff75cd2443b49ae41f5c1479c637,
         type: 3}
       propertyPath: m_IsActive
@@ -247745,11 +247775,21 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7782823663793630769, guid: 63c0ff75cd2443b49ae41f5c1479c637,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7782823663824945823, guid: 63c0ff75cd2443b49ae41f5c1479c637,
         type: 3}
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7782823663855598531, guid: 63c0ff75cd2443b49ae41f5c1479c637,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7782823663858495272, guid: 63c0ff75cd2443b49ae41f5c1479c637,
         type: 3}
       propertyPath: m_IsActive
@@ -247785,6 +247825,11 @@ PrefabInstance:
       propertyPath: m_LocalPosition.x
       value: -40.298065
       objectReference: {fileID: 0}
+    - target: {fileID: 7782823664050028247, guid: 63c0ff75cd2443b49ae41f5c1479c637,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7782823664072468570, guid: 63c0ff75cd2443b49ae41f5c1479c637,
         type: 3}
       propertyPath: m_IsActive
@@ -247820,6 +247865,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7782823664291701426, guid: 63c0ff75cd2443b49ae41f5c1479c637,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7782823664335241723, guid: 63c0ff75cd2443b49ae41f5c1479c637,
         type: 3}
       propertyPath: m_LocalScale.x
@@ -247845,6 +247895,16 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7782823664498374464, guid: 63c0ff75cd2443b49ae41f5c1479c637,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7782823664498374465, guid: 63c0ff75cd2443b49ae41f5c1479c637,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1.0804
+      objectReference: {fileID: 0}
     - target: {fileID: 7782823664498374465, guid: 63c0ff75cd2443b49ae41f5c1479c637,
         type: 3}
       propertyPath: m_LocalPosition.y
@@ -247930,6 +247990,16 @@ PrefabInstance:
       propertyPath: m_LocalPosition.z
       value: 74.61999
       objectReference: {fileID: 0}
+    - target: {fileID: 7782823664881439636, guid: 63c0ff75cd2443b49ae41f5c1479c637,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7782823664891279869, guid: 63c0ff75cd2443b49ae41f5c1479c637,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7782823664893614608, guid: 63c0ff75cd2443b49ae41f5c1479c637,
         type: 3}
       propertyPath: m_IsActive
@@ -247945,6 +248015,16 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7782823664958756180, guid: 63c0ff75cd2443b49ae41f5c1479c637,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7782823664970060590, guid: 63c0ff75cd2443b49ae41f5c1479c637,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 7782823664989932473, guid: 63c0ff75cd2443b49ae41f5c1479c637,
         type: 3}
       propertyPath: m_IsActive
@@ -247990,6 +248070,16 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7782823665316601623, guid: 63c0ff75cd2443b49ae41f5c1479c637,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7782823665324340606, guid: 63c0ff75cd2443b49ae41f5c1479c637,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 7782823665398904166, guid: 63c0ff75cd2443b49ae41f5c1479c637,
         type: 3}
       propertyPath: m_IsActive
@@ -248005,6 +248095,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7782823665480720301, guid: 63c0ff75cd2443b49ae41f5c1479c637,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7782823665484049414, guid: 63c0ff75cd2443b49ae41f5c1479c637,
         type: 3}
       propertyPath: m_IsActive
@@ -248080,6 +248175,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7782823665526036951, guid: 63c0ff75cd2443b49ae41f5c1479c637,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7782823665563811472, guid: 63c0ff75cd2443b49ae41f5c1479c637,
         type: 3}
       propertyPath: m_IsActive
@@ -248095,6 +248195,21 @@ PrefabInstance:
       propertyPath: m_LocalPosition.x
       value: -40.298065
       objectReference: {fileID: 0}
+    - target: {fileID: 8082612202792926641, guid: 63c0ff75cd2443b49ae41f5c1479c637,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9137597439413400009, guid: 63c0ff75cd2443b49ae41f5c1479c637,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9189828890194033427, guid: 63c0ff75cd2443b49ae41f5c1479c637,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 63c0ff75cd2443b49ae41f5c1479c637, type: 3}
 --- !u!4 &721520511 stripped