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

U3D_DrivingSystem/Assets/Scenes/main_.unity

@@ -85729,6 +85729,46 @@ MeshCollider:
   m_Convex: 0
   m_CookingOptions: 30
   m_Mesh: {fileID: 480477940932559215, guid: 75f52cc3946c24048846bce35a08f9aa, type: 3}
+--- !u!1 &180540979 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3130567995884505971, guid: 75f52cc3946c24048846bce35a08f9aa,
+    type: 3}
+  m_PrefabInstance: {fileID: 180540975}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &180540980 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4342870436999375446, guid: 75f52cc3946c24048846bce35a08f9aa,
+    type: 3}
+  m_PrefabInstance: {fileID: 180540975}
+  m_PrefabAsset: {fileID: 0}
+--- !u!64 &180540981
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 180540979}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 6319466252586942088, guid: 75f52cc3946c24048846bce35a08f9aa, type: 3}
+--- !u!64 &180540982
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 180540980}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 480477940932559215, guid: 75f52cc3946c24048846bce35a08f9aa, type: 3}
 --- !u!1 &180682754
 GameObject:
   m_ObjectHideFlags: 0
@@ -310302,37 +310342,6 @@ Transform:
   m_Father: {fileID: 1205552721}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!21 &634805445
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Height Fog Global
-  m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3001
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs: []
-    m_Ints: []
-    m_Floats:
-    - _AdvancedCat: 1
-    - _Banner: 1
-    - _DirectionalCat: 1
-    - _FogCat: 1
-    - _HeightFogGlobal: 1
-    - _IsHeightFogShader: 1
-    - _NoiseCat: 1
-    - _SkyboxCat: 1
-    m_Colors: []
-  m_BuildTextureStacks: []
 --- !u!1 &635020648
 GameObject:
   m_ObjectHideFlags: 0
@@ -592159,6 +592168,46 @@ MeshCollider:
   m_Convex: 0
   m_CookingOptions: 30
   m_Mesh: {fileID: 480477940932559215, guid: 75f52cc3946c24048846bce35a08f9aa, type: 3}
+--- !u!1 &1230165980 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3130567995884505971, guid: 75f52cc3946c24048846bce35a08f9aa,
+    type: 3}
+  m_PrefabInstance: {fileID: 1230165977}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1230165981 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4342870436999375446, guid: 75f52cc3946c24048846bce35a08f9aa,
+    type: 3}
+  m_PrefabInstance: {fileID: 1230165977}
+  m_PrefabAsset: {fileID: 0}
+--- !u!64 &1230165982
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1230165980}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 6319466252586942088, guid: 75f52cc3946c24048846bce35a08f9aa, type: 3}
+--- !u!64 &1230165983
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1230165981}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 480477940932559215, guid: 75f52cc3946c24048846bce35a08f9aa, type: 3}
 --- !u!1 &1230168751
 GameObject:
   m_ObjectHideFlags: 0
@@ -601632,6 +601681,71 @@ SkinnedMeshRenderer:
     m_Center: {x: 0.02181068, y: -0.009805754, z: 0.00000020861626}
     m_Extent: {x: 0.8632928, y: 0.15312733, z: 0.6043817}
   m_DirtyAABB: 0
+--- !u!21 &1250151399
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Override
+  m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs: []
+    m_Ints: []
+    m_Floats:
+    - _AdvancedCat: 1
+    - _Banner: 1
+    - _DirectionalCat: 1
+    - _DirectionalFalloff: 2
+    - _DirectionalIntensity: 1
+    - _FarDistanceHeight: 0
+    - _FarDistanceOffset: 0
+    - _FogAxisMode: 1
+    - _FogCameraMode: 0
+    - _FogCat: 1
+    - _FogColorDuo: 1
+    - _FogDistanceEnd: 100
+    - _FogDistanceFalloff: 2
+    - _FogDistanceStart: 0
+    - _FogHeightEnd: 100
+    - _FogHeightFalloff: 2
+    - _FogHeightStart: 0
+    - _FogIntensity: 1
+    - _FogLayersMode: 0
+    - _IsHeightFogPreset: 1
+    - _IsHeightFogShader: 1
+    - _JitterIntensity: 1
+    - _NoiseCat: 1
+    - _NoiseDistanceEnd: 50
+    - _NoiseIntensity: 1
+    - _NoiseMax: 1
+    - _NoiseMin: 0
+    - _NoiseModeBlend: 1
+    - _NoiseScale: 30
+    - _SkyboxCat: 1
+    - _SkyboxFogBottom: 0
+    - _SkyboxFogFalloff: 1
+    - _SkyboxFogFill: 1
+    - _SkyboxFogHeight: 1
+    - _SkyboxFogIntensity: 1
+    - _SkyboxFogOffset: 0
+    m_Colors:
+    - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1}
+    - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0}
+    - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0}
+    - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1}
+    - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1}
+    - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0}
+  m_BuildTextureStacks: []
 --- !u!1 &1250400552
 GameObject:
   m_ObjectHideFlags: 0
@@ -809492,6 +809606,37 @@ Transform:
   m_Father: {fileID: 238595572}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!21 &1680838933
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Height Fog Global
+  m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3001
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs: []
+    m_Ints: []
+    m_Floats:
+    - _AdvancedCat: 1
+    - _Banner: 1
+    - _DirectionalCat: 1
+    - _FogCat: 1
+    - _HeightFogGlobal: 1
+    - _IsHeightFogShader: 1
+    - _NoiseCat: 1
+    - _SkyboxCat: 1
+    m_Colors: []
+  m_BuildTextureStacks: []
 --- !u!1 &1680892589
 GameObject:
   m_ObjectHideFlags: 0
@@ -856460,6 +856605,46 @@ MeshCollider:
   m_Convex: 0
   m_CookingOptions: 30
   m_Mesh: {fileID: 480477940932559215, guid: 75f52cc3946c24048846bce35a08f9aa, type: 3}
+--- !u!1 &1772827991 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3130567995884505971, guid: 75f52cc3946c24048846bce35a08f9aa,
+    type: 3}
+  m_PrefabInstance: {fileID: 1772827987}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1772827992 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4342870436999375446, guid: 75f52cc3946c24048846bce35a08f9aa,
+    type: 3}
+  m_PrefabInstance: {fileID: 1772827987}
+  m_PrefabAsset: {fileID: 0}
+--- !u!64 &1772827993
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1772827991}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 6319466252586942088, guid: 75f52cc3946c24048846bce35a08f9aa, type: 3}
+--- !u!64 &1772827994
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1772827992}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 480477940932559215, guid: 75f52cc3946c24048846bce35a08f9aa, type: 3}
 --- !u!1 &1773014297
 GameObject:
   m_ObjectHideFlags: 0
@@ -897874,10 +898059,6 @@ PrefabInstance:
       propertyPath: m_Name
       value: SK_Goat
       objectReference: {fileID: 0}
-    - target: {fileID: 100094, guid: dc6ab60c171bed148860b1908544004c, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 400094, guid: dc6ab60c171bed148860b1908544004c, type: 3}
       propertyPath: m_RootOrder
       value: 9
@@ -902615,7 +902796,7 @@ PrefabInstance:
         type: 3}
       propertyPath: m_Materials.Array.data[0]
       value: 
-      objectReference: {fileID: 634805445}
+      objectReference: {fileID: 1680838933}
     - target: {fileID: 7996012068613656550, guid: 3cb385598e51d414882eb76f140cb1a3,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -902671,7 +902852,20 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 7317470760917485397, guid: 3cb385598e51d414882eb76f140cb1a3, type: 3}
+    - {fileID: 4648327435832437110, guid: 3cb385598e51d414882eb76f140cb1a3, type: 3}
+    - {fileID: 2197837016481216256, guid: 3cb385598e51d414882eb76f140cb1a3, type: 3}
+    - {fileID: 622176713899568275, guid: 3cb385598e51d414882eb76f140cb1a3, type: 3}
+    - {fileID: 3218822738167990481, guid: 3cb385598e51d414882eb76f140cb1a3, type: 3}
+    - {fileID: 8601077843465977686, guid: 3cb385598e51d414882eb76f140cb1a3, type: 3}
+    - {fileID: 1540285684901177114, guid: 3cb385598e51d414882eb76f140cb1a3, type: 3}
+    - {fileID: 4531505897466658735, guid: 3cb385598e51d414882eb76f140cb1a3, type: 3}
+    - {fileID: 1274347193458716380, guid: 3cb385598e51d414882eb76f140cb1a3, type: 3}
+    - {fileID: 4623459756848106822, guid: 3cb385598e51d414882eb76f140cb1a3, type: 3}
+    - {fileID: 6066880512788744954, guid: 3cb385598e51d414882eb76f140cb1a3, type: 3}
+    - {fileID: 5588016485885619446, guid: 3cb385598e51d414882eb76f140cb1a3, type: 3}
+    - {fileID: 69276246194863184, guid: 3cb385598e51d414882eb76f140cb1a3, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: 3cb385598e51d414882eb76f140cb1a3, type: 3}
 --- !u!4 &1866218925 stripped
 Transform:
@@ -1049804,7 +1049998,20 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: -0.573
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 1820304200825829100, guid: 3a4efc0fe7188084a81009d2bbd89983, type: 3}
+    - {fileID: 8067379542583096280, guid: 3a4efc0fe7188084a81009d2bbd89983, type: 3}
+    - {fileID: 6843635405319197117, guid: 3a4efc0fe7188084a81009d2bbd89983, type: 3}
+    - {fileID: 2524720042644744522, guid: 3a4efc0fe7188084a81009d2bbd89983, type: 3}
+    - {fileID: 623542266346039547, guid: 3a4efc0fe7188084a81009d2bbd89983, type: 3}
+    - {fileID: 2542473247598689129, guid: 3a4efc0fe7188084a81009d2bbd89983, type: 3}
+    - {fileID: 6717220864832926452, guid: 3a4efc0fe7188084a81009d2bbd89983, type: 3}
+    - {fileID: 8603414324761467252, guid: 3a4efc0fe7188084a81009d2bbd89983, type: 3}
+    - {fileID: 7549679639668345972, guid: 3a4efc0fe7188084a81009d2bbd89983, type: 3}
+    - {fileID: 3848324157507756334, guid: 3a4efc0fe7188084a81009d2bbd89983, type: 3}
+    - {fileID: 4872881884182150544, guid: 3a4efc0fe7188084a81009d2bbd89983, type: 3}
+    - {fileID: 7867473040747159876, guid: 3a4efc0fe7188084a81009d2bbd89983, type: 3}
+    - {fileID: 2846552950714269990, guid: 3a4efc0fe7188084a81009d2bbd89983, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: 3a4efc0fe7188084a81009d2bbd89983, type: 3}
 --- !u!4 &2464421815449038113 stripped
 Transform:
@@ -1064155,7 +1064362,20 @@ PrefabInstance:
       propertyPath: m_LocalPosition.y
       value: -0.005
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 5337016538080094245, guid: 21453eaa684cb0f4491b212054261c9a, type: 3}
+    - {fileID: 4414886187817835214, guid: 21453eaa684cb0f4491b212054261c9a, type: 3}
+    - {fileID: 9119662513086232631, guid: 21453eaa684cb0f4491b212054261c9a, type: 3}
+    - {fileID: 2789638815949939910, guid: 21453eaa684cb0f4491b212054261c9a, type: 3}
+    - {fileID: 104809412106549127, guid: 21453eaa684cb0f4491b212054261c9a, type: 3}
+    - {fileID: 3602062621101158926, guid: 21453eaa684cb0f4491b212054261c9a, type: 3}
+    - {fileID: 362266043617109920, guid: 21453eaa684cb0f4491b212054261c9a, type: 3}
+    - {fileID: 7016760227552999211, guid: 21453eaa684cb0f4491b212054261c9a, type: 3}
+    - {fileID: 7019649654656726722, guid: 21453eaa684cb0f4491b212054261c9a, type: 3}
+    - {fileID: 5748317515307786354, guid: 21453eaa684cb0f4491b212054261c9a, type: 3}
+    - {fileID: 3819694954442938703, guid: 21453eaa684cb0f4491b212054261c9a, type: 3}
+    - {fileID: 4884462058239694667, guid: 21453eaa684cb0f4491b212054261c9a, type: 3}
+    - {fileID: 3835332187527276014, guid: 21453eaa684cb0f4491b212054261c9a, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: 21453eaa684cb0f4491b212054261c9a, type: 3}
 --- !u!4 &3478530051249667199 stripped
 Transform: