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

2024-01-30 13:21:44 +08:00 · 2024-01-30 13:21:44 +08:00 · 2534a5ffb3
parent 8ddbf19927 1b9132efd6
commit 2534a5ffb3
1 changed files with 180 additions and 12 deletions
--- a/U3D_DrivingSystem/Assets/Scenes/main_.unity
+++ b/U3D_DrivingSystem/Assets/Scenes/main_.unity
@ -5023,7 +5023,7 @@ Transform:
  m_LocalScale: {x: 73.365715, y: 0.36673844, z: 50.597057}
  m_Children: []
  m_Father: {fileID: 1866218925}
-  m_RootOrder: 13
+  m_RootOrder: 12
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &8922218
 BoxCollider:
@ -272147,7 +272147,7 @@ PrefabInstance:
    - target: {fileID: 679538589924860292, guid: 28243f28217ca7a45a71a4e9fd5ffb48,
        type: 3}
      propertyPath: m_IsActive
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 688595230375174948, guid: 28243f28217ca7a45a71a4e9fd5ffb48,
        type: 3}
@ -309762,7 +309762,7 @@ Transform:
  m_LocalScale: {x: 73.365715, y: 0.36673844, z: 50.597057}
  m_Children: []
  m_Father: {fileID: 1866218925}
-  m_RootOrder: 15
+  m_RootOrder: 14
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &633184629
 BoxCollider:
@ -383316,6 +383316,90 @@ Transform:
  m_Father: {fileID: 771759631}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &790270914
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 124
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.018003
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.018003
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.018003
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -61.3
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.9
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 144.5
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: -0.78123385
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.62423843
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 282.747
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_Name
+      value: yuanjing01 (6)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 4146099bfa3b2284e8e4225c5ea0b344, type: 3}
 --- !u!1 &790513127
 GameObject:
  m_ObjectHideFlags: 0
@ -567303,7 +567387,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 18
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1183003412
 Transform:
  m_ObjectHideFlags: 0
@ -589506,7 +589590,7 @@ Transform:
  m_LocalScale: {x: 46.442844, y: 0.36673844, z: 50.597057}
  m_Children: []
  m_Father: {fileID: 1866218925}
-  m_RootOrder: 10
+  m_RootOrder: 9
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &1224440451
 BoxCollider:
@ -603941,7 +604025,7 @@ Transform:
  m_LocalScale: {x: 73.365715, y: 0.36673844, z: 85.630455}
  m_Children: []
  m_Father: {fileID: 1866218925}
-  m_RootOrder: 16
+  m_RootOrder: 15
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &1254592514
 BoxCollider:
@ -634375,7 +634459,7 @@ Transform:
  m_LocalScale: {x: 73.365715, y: 0.36673844, z: 50.597057}
  m_Children: []
  m_Father: {fileID: 1866218925}
-  m_RootOrder: 14
+  m_RootOrder: 13
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &1315243454
 BoxCollider:
@ -768181,6 +768265,90 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1593360228}
  m_Mesh: {fileID: -8420907081877329601, guid: 87a0133680c4d5f499f32d303d358b8e, type: 3}
+--- !u!1001 &1593386173
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 125
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.018003
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.018003
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.018003
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 72.1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.9
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 344.1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: -0.9467208
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.3220556
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 322.425
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 4146099bfa3b2284e8e4225c5ea0b344,
+        type: 3}
+      propertyPath: m_Name
+      value: yuanjing01 (7)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 4146099bfa3b2284e8e4225c5ea0b344, type: 3}
 --- !u!1 &1593442715
 GameObject:
  m_ObjectHideFlags: 0
@ -792568,7 +792736,7 @@ Transform:
  m_LocalScale: {x: 46.442844, y: 0.36673844, z: 50.597057}
  m_Children: []
  m_Father: {fileID: 1866218925}
-  m_RootOrder: 11
+  m_RootOrder: 10
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &1644651297
 BoxCollider:
@ -951913,7 +952081,7 @@ Transform:
  m_LocalScale: {x: 46.442844, y: 0.36673844, z: 50.597057}
  m_Children: []
  m_Father: {fileID: 1866218925}
-  m_RootOrder: 12
+  m_RootOrder: 11
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &1963281148
 BoxCollider:
@ -974989,7 +975157,7 @@ PrefabInstance:
    - target: {fileID: 6547717782377321219, guid: b962beae52b06564789fb8eadbd81c58,
        type: 3}
      propertyPath: m_IsActive
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: b962beae52b06564789fb8eadbd81c58, type: 3}
@ -1011505,7 +1011673,7 @@ Transform:
  m_LocalScale: {x: 73.365715, y: 0.36673844, z: 85.630455}
  m_Children: []
  m_Father: {fileID: 1866218925}
-  m_RootOrder: 17
+  m_RootOrder: 16
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &2076278831
 BoxCollider:
@ -1016097,7 +1016265,7 @@ Transform:
  m_LocalScale: {x: 55.09669, y: 0.36673844, z: 61.54306}
  m_Children: []
  m_Father: {fileID: 1866218925}
-  m_RootOrder: 9
+  m_RootOrder: 8
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &2085621374
 BoxCollider: