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

U3D_DrivingSystem/Assets/GameAssets/Art/交通路标/Prefab/交通路标.prefab

@@ -659,6 +659,9 @@ Transform:
   - {fileID: 613121850814973981}
   - {fileID: 6708527769638328589}
   - {fileID: 3092971699095619519}
+  - {fileID: 837947400312536857}
+  - {fileID: 9185866604062193078}
+  - {fileID: 837947401310349193}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -22752,6 +22755,96 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 876589792925201259}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &876589792927531106
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 876589792091702619}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 258b841f49ef3414997845e9211bf39b,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 584.9649
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 258b841f49ef3414997845e9211bf39b,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.328
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 258b841f49ef3414997845e9211bf39b,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 177.69
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 258b841f49ef3414997845e9211bf39b,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 258b841f49ef3414997845e9211bf39b,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 258b841f49ef3414997845e9211bf39b,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 258b841f49ef3414997845e9211bf39b,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 258b841f49ef3414997845e9211bf39b,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 634
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 258b841f49ef3414997845e9211bf39b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 258b841f49ef3414997845e9211bf39b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 180
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 258b841f49ef3414997845e9211bf39b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 258b841f49ef3414997845e9211bf39b,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.7
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 258b841f49ef3414997845e9211bf39b,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.7
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 258b841f49ef3414997845e9211bf39b,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 258b841f49ef3414997845e9211bf39b,
+        type: 3}
+      propertyPath: m_Name
+      value: "\u5DE6\u53F3\u8F6C\u5F2F"
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 258b841f49ef3414997845e9211bf39b, type: 3}
+--- !u!4 &837947401310349193 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 258b841f49ef3414997845e9211bf39b,
+    type: 3}
+  m_PrefabInstance: {fileID: 876589792927531106}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &876589792935702085
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -45732,6 +45825,96 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 876589793886477698}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &876589793891997938
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 876589792091702619}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 4aa4798c6b9d62e4cafdec2c9f69d27f,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 515.77
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4aa4798c6b9d62e4cafdec2c9f69d27f,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.146
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4aa4798c6b9d62e4cafdec2c9f69d27f,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 327.03
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4aa4798c6b9d62e4cafdec2c9f69d27f,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4aa4798c6b9d62e4cafdec2c9f69d27f,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.99999493
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4aa4798c6b9d62e4cafdec2c9f69d27f,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.0031930418
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4aa4798c6b9d62e4cafdec2c9f69d27f,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4aa4798c6b9d62e4cafdec2c9f69d27f,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 632
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4aa4798c6b9d62e4cafdec2c9f69d27f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -0.36600003
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4aa4798c6b9d62e4cafdec2c9f69d27f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 180.00002
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4aa4798c6b9d62e4cafdec2c9f69d27f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4aa4798c6b9d62e4cafdec2c9f69d27f,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.7
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4aa4798c6b9d62e4cafdec2c9f69d27f,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.7
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4aa4798c6b9d62e4cafdec2c9f69d27f,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 4aa4798c6b9d62e4cafdec2c9f69d27f,
+        type: 3}
+      propertyPath: m_Name
+      value: "\u5DE6\u8F6C\u5F2F (9)"
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 4aa4798c6b9d62e4cafdec2c9f69d27f, type: 3}
+--- !u!4 &837947400312536857 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4aa4798c6b9d62e4cafdec2c9f69d27f,
+    type: 3}
+  m_PrefabInstance: {fileID: 876589793891997938}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &876589793893530358
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -47817,6 +48000,86 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 876589794010801579}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &876589794013333448
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 876589792091702619}
+    m_Modifications:
+    - target: {fileID: 8309287289925005950, guid: 5dcb0c4022b85dd4e87460082a1c6066,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 512.02
+      objectReference: {fileID: 0}
+    - target: {fileID: 8309287289925005950, guid: 5dcb0c4022b85dd4e87460082a1c6066,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.326
+      objectReference: {fileID: 0}
+    - target: {fileID: 8309287289925005950, guid: 5dcb0c4022b85dd4e87460082a1c6066,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 205.31
+      objectReference: {fileID: 0}
+    - target: {fileID: 8309287289925005950, guid: 5dcb0c4022b85dd4e87460082a1c6066,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8309287289925005950, guid: 5dcb0c4022b85dd4e87460082a1c6066,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 8309287289925005950, guid: 5dcb0c4022b85dd4e87460082a1c6066,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8309287289925005950, guid: 5dcb0c4022b85dd4e87460082a1c6066,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 8309287289925005950, guid: 5dcb0c4022b85dd4e87460082a1c6066,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 633
+      objectReference: {fileID: 0}
+    - target: {fileID: 8309287289925005950, guid: 5dcb0c4022b85dd4e87460082a1c6066,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8309287289925005950, guid: 5dcb0c4022b85dd4e87460082a1c6066,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 90
+      objectReference: {fileID: 0}
+    - target: {fileID: 8309287289925005950, guid: 5dcb0c4022b85dd4e87460082a1c6066,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8309287289925005950, guid: 5dcb0c4022b85dd4e87460082a1c6066,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1.1115
+      objectReference: {fileID: 0}
+    - target: {fileID: 8654603917228091588, guid: 5dcb0c4022b85dd4e87460082a1c6066,
+        type: 3}
+      propertyPath: m_Name
+      value: "\u5F85\u8F6C\u8F66\u9053 (2)"
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 5dcb0c4022b85dd4e87460082a1c6066, type: 3}
+--- !u!4 &9185866604062193078 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8309287289925005950, guid: 5dcb0c4022b85dd4e87460082a1c6066,
+    type: 3}
+  m_PrefabInstance: {fileID: 876589794013333448}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &876589794013762134
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -52539,6 +52802,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: "\u5DE6\u53F3\u76F4\u884C (2)"
       objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 4dba56c87d519224aba85fee4a833148,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4dba56c87d519224aba85fee4a833148, type: 3}
 --- !u!4 &6708527769638328589 stripped

U3D_DrivingSystem/Assets/GameAssets/Art/建筑模型/xcmodel/suidao/Materials/suidaodibiao.mat

@@ -0,0 +1,77 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: suidaodibiao
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.5566038, g: 0.5566038, b: 0.5566038, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

U3D_DrivingSystem/Assets/GameAssets/Art/建筑模型/xcmodel/suidao/Materials/suidaodibiao.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6334eaf396234aa4badcf26e38fdf323
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

U3D_DrivingSystem/Assets/GameAssets/Art/建筑模型/xcmodel/suidao/suidaodibiao.fbx.meta

@@ -0,0 +1,97 @@
+fileFormatVersion: 2
+guid: 828f6dd562bdd1d4ba59caaf8c7c5377
+ModelImporter:
+  serializedVersion: 19301
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 1
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 0
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: