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

U3D_DrivingSystem/Assets/GameAssets/Art/Wet Roads/Materials/road_texture2.mat

@@ -50,7 +50,7 @@ Material:
     - _Little:
         m_Texture: {fileID: 2800000, guid: f165a247684e19f4488edc1d9bf1a76a, type: 3}
         m_Scale: {x: 0.2, y: 0.2}
-        m_Offset: {x: 9.04, y: 0}
+        m_Offset: {x: 11.01, y: 0}
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: d3e3059aed78fe540b82d567584a04a4, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -69,7 +69,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     - _Skidmarks:
         m_Texture: {fileID: 2800000, guid: d82a37ba82e162d428d0c45327e14ccb, type: 3}
-        m_Scale: {x: 1, y: 2}
+        m_Scale: {x: 0.5, y: 1}
         m_Offset: {x: 0, y: 0}
     - _SpecGlossMap:
         m_Texture: {fileID: 2800000, guid: ecd6c8f6ac0117248a264ef912f07b0d, type: 3}
@@ -79,19 +79,19 @@ Material:
     - _BumpScale: 0.6
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
-    - _DotSlider: 0
+    - _DotSlider: 0.04
     - _DstBlend: 0
     - _Emission_Int: 0
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
-    - _Little_Rough: 0.61
+    - _Little_Rough: 0.73
     - _Metallic: 0
     - _Mode: 0
     - _Normal_Int: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
-    - _Skid: 0
+    - _Skid: 0.01
     - _SmoothnessTextureChannel: 0
     - _Specular: 0
     - _SpecularHighlights: 1

U3D_DrivingSystem/Assets/GameAssets/Art/天气.prefab

@@ -1,5 +1,69 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1517762612
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1517762613}
+  - component: {fileID: 1517762614}
+  m_Layer: 0
+  m_Name: Reflection Probe
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1517762613
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1517762612}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 416, y: 0, z: 117}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4321860893823157586}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!215 &1517762614
+ReflectionProbe:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1517762612}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Type: 0
+  m_Mode: 1
+  m_RefreshMode: 0
+  m_TimeSlicingMode: 0
+  m_Resolution: 128
+  m_UpdateFrequency: 0
+  m_BoxSize: {x: 1000, y: 1000, z: 1000}
+  m_BoxOffset: {x: 0, y: 0, z: 0}
+  m_NearClip: 0.3
+  m_FarClip: 1000
+  m_ShadowDistance: 100
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_IntensityMultiplier: 1
+  m_BlendDistance: 1
+  m_HDR: 1
+  m_BoxProjection: 0
+  m_RenderDynamicObjects: 0
+  m_UseOcclusionCulling: 1
+  m_Importance: 1
+  m_CustomBakedTexture: {fileID: 0}
 --- !u!1 &4321860893220178024
 GameObject:
   m_ObjectHideFlags: 0
@@ -62,6 +126,7 @@ Transform:
   - {fileID: 5967934312107554815}
   - {fileID: 4321860894445414605}
   - {fileID: 4321860893220178025}
+  - {fileID: 1517762613}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -80,7 +145,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4321860894445414605
 Transform:
   m_ObjectHideFlags: 0
@@ -149,7 +214,7 @@ Light:
     m_Type: 2
     m_Resolution: -1
     m_CustomResolution: -1
-    m_Strength: 1
+    m_Strength: 0.58
     m_Bias: 0.05
     m_NormalBias: 0.4
     m_NearPlane: 0.2
@@ -200,7 +265,7 @@ GameObject:
   - component: {fileID: 925504245046768527}
   - component: {fileID: 4438619040899868747}
   m_Layer: 0
-  m_Name: Directional Light
+  m_Name: "\u96EA\u5929"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

U3D_DrivingSystem/Assets/Scenes/main_.unity

@@ -27,7 +27,7 @@ RenderSettings:
   m_AmbientIntensity: 1
   m_AmbientMode: 3
   m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
-  m_SkyboxMaterial: {fileID: 2100000, guid: 6d8d2073385f92643b96552c9e56c090, type: 2}
+  m_SkyboxMaterial: {fileID: 2100000, guid: 892443b35a3a35643aca8b246097da85, type: 2}
   m_HaloStrength: 0.5
   m_FlareStrength: 1
   m_FlareFadeSpeed: 3
@@ -29637,6 +29637,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 340572910495512460, guid: 56856647bce56394b86e39ecb6f5cb68,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 57d17d97c27a86a4a91fce3d6d6d11ae, type: 2}
     - target: {fileID: 1551259226382230029, guid: 56856647bce56394b86e39ecb6f5cb68,
         type: 3}
       propertyPath: m_IsActive
@@ -214055,6 +214060,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3164969232323164949, guid: b418c32cbb1ec2f43ab3c62847d7a330,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3164969232333791079, guid: b418c32cbb1ec2f43ab3c62847d7a330,
         type: 3}
       propertyPath: m_IsActive
@@ -214080,6 +214090,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3164969232357494157, guid: b418c32cbb1ec2f43ab3c62847d7a330,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3164969232363736033, guid: b418c32cbb1ec2f43ab3c62847d7a330,
         type: 3}
       propertyPath: m_IsActive
@@ -214405,6 +214420,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 3164969232779085791, guid: b418c32cbb1ec2f43ab3c62847d7a330,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3164969232779101326, guid: b418c32cbb1ec2f43ab3c62847d7a330,
         type: 3}
       propertyPath: m_IsActive
@@ -214425,6 +214445,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3164969232791685531, guid: b418c32cbb1ec2f43ab3c62847d7a330,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3164969232795199881, guid: b418c32cbb1ec2f43ab3c62847d7a330,
         type: 3}
       propertyPath: m_IsActive
@@ -214460,6 +214485,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3164969232849355975, guid: b418c32cbb1ec2f43ab3c62847d7a330,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3164969232850713430, guid: b418c32cbb1ec2f43ab3c62847d7a330,
         type: 3}
       propertyPath: m_LocalPosition.z
@@ -214470,6 +214500,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3164969232874750189, guid: b418c32cbb1ec2f43ab3c62847d7a330,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3164969232878335510, guid: b418c32cbb1ec2f43ab3c62847d7a330,
         type: 3}
       propertyPath: m_IsActive
@@ -214600,6 +214635,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3164969232976312576, guid: b418c32cbb1ec2f43ab3c62847d7a330,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3164969232997492349, guid: b418c32cbb1ec2f43ab3c62847d7a330,
         type: 3}
       propertyPath: m_IsActive
@@ -214665,6 +214705,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3164969233047892381, guid: b418c32cbb1ec2f43ab3c62847d7a330,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3164969233051281647, guid: b418c32cbb1ec2f43ab3c62847d7a330,
         type: 3}
       propertyPath: m_IsActive
@@ -214700,6 +214745,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3164969233097172099, guid: b418c32cbb1ec2f43ab3c62847d7a330,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3164969233114262464, guid: b418c32cbb1ec2f43ab3c62847d7a330,
         type: 3}
       propertyPath: m_IsActive
@@ -214815,6 +214865,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3164969233225709339, guid: b418c32cbb1ec2f43ab3c62847d7a330,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3164969233231735214, guid: b418c32cbb1ec2f43ab3c62847d7a330,
         type: 3}
       propertyPath: m_IsActive
@@ -214855,6 +214910,11 @@ PrefabInstance:
       propertyPath: m_LocalPosition.y
       value: -9.31
       objectReference: {fileID: 0}
+    - target: {fileID: 3164969233260884034, guid: b418c32cbb1ec2f43ab3c62847d7a330,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3164969233263549991, guid: b418c32cbb1ec2f43ab3c62847d7a330,
         type: 3}
       propertyPath: m_IsActive
@@ -214885,6 +214945,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3164969233287730640, guid: b418c32cbb1ec2f43ab3c62847d7a330,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3164969233289433179, guid: b418c32cbb1ec2f43ab3c62847d7a330,
         type: 3}
       propertyPath: m_IsActive
@@ -215015,6 +215080,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3164969233453593018, guid: b418c32cbb1ec2f43ab3c62847d7a330,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3164969233458378384, guid: b418c32cbb1ec2f43ab3c62847d7a330,
         type: 3}
       propertyPath: m_IsActive
@@ -215040,6 +215110,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3164969233478008830, guid: b418c32cbb1ec2f43ab3c62847d7a330,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3164969233485195929, guid: b418c32cbb1ec2f43ab3c62847d7a330,
         type: 3}
       propertyPath: m_IsActive
@@ -215135,6 +215210,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3164969233535980330, guid: b418c32cbb1ec2f43ab3c62847d7a330,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3164969233537033250, guid: b418c32cbb1ec2f43ab3c62847d7a330,
         type: 3}
       propertyPath: m_IsActive
@@ -215160,6 +215240,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3164969233543820600, guid: b418c32cbb1ec2f43ab3c62847d7a330,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3164969233549990032, guid: b418c32cbb1ec2f43ab3c62847d7a330,
         type: 3}
       propertyPath: m_IsActive
@@ -215375,6 +215460,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3164969233825371468, guid: b418c32cbb1ec2f43ab3c62847d7a330,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3164969233827450799, guid: b418c32cbb1ec2f43ab3c62847d7a330,
         type: 3}
       propertyPath: m_IsActive
@@ -215500,6 +215590,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3164969233948523406, guid: b418c32cbb1ec2f43ab3c62847d7a330,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3164969233955839414, guid: b418c32cbb1ec2f43ab3c62847d7a330,
         type: 3}
       propertyPath: m_IsActive
@@ -215660,6 +215755,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3164969234133674284, guid: b418c32cbb1ec2f43ab3c62847d7a330,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3164969234134032326, guid: b418c32cbb1ec2f43ab3c62847d7a330,
         type: 3}
       propertyPath: m_IsActive
@@ -215850,6 +215950,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3164969234334387070, guid: b418c32cbb1ec2f43ab3c62847d7a330,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3164969234334782906, guid: b418c32cbb1ec2f43ab3c62847d7a330,
         type: 3}
       propertyPath: m_IsActive
@@ -215865,6 +215970,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3164969234367507715, guid: b418c32cbb1ec2f43ab3c62847d7a330,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3164969234370074592, guid: b418c32cbb1ec2f43ab3c62847d7a330,
         type: 3}
       propertyPath: m_IsActive
@@ -215920,6 +216030,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3164969234405545540, guid: b418c32cbb1ec2f43ab3c62847d7a330,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3164969234409444526, guid: b418c32cbb1ec2f43ab3c62847d7a330,
         type: 3}
       propertyPath: m_IsActive
@@ -219366,16 +219481,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 3299185324722388585, guid: 67f726fa9c8e9bc44b8b2a27462ab193,
-        type: 3}
-      propertyPath: m_Shadows.m_Strength
-      value: 0.58
-      objectReference: {fileID: 0}
-    - target: {fileID: 4321860893220178024, guid: 67f726fa9c8e9bc44b8b2a27462ab193,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 4321860893823157586, guid: 67f726fa9c8e9bc44b8b2a27462ab193,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -219436,11 +219541,6 @@ PrefabInstance:
       propertyPath: m_Name
       value: "\u5929\u6C14"
       objectReference: {fileID: 0}
-    - target: {fileID: 4321860894445414604, guid: 67f726fa9c8e9bc44b8b2a27462ab193,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 6128799899442334563, guid: 67f726fa9c8e9bc44b8b2a27462ab193,
         type: 3}
       propertyPath: mainCamera
@@ -219466,11 +219566,6 @@ PrefabInstance:
       propertyPath: overrideMaterial
       value: 
       objectReference: {fileID: 1976272875}
-    - target: {fileID: 8987695353374575202, guid: 67f726fa9c8e9bc44b8b2a27462ab193,
-        type: 3}
-      propertyPath: m_Name
-      value: "\u96EA\u5929"
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 67f726fa9c8e9bc44b8b2a27462ab193, type: 3}
 --- !u!1001 &4545987071789518257