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

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: 12
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &8922218
 BoxCollider:
@@ -6437,7 +6437,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 76303afb859c4025b39de80be9e560a2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  anim: {fileID: 0}
+  anim: {fileID: 11424144}
+--- !u!111 &11424144 stripped
+Animation:
+  m_CorrespondingSourceObject: {fileID: 8571364762310218515, guid: f230a7f7f7beb604cbc44c0bd5a0f581,
+    type: 3}
+  m_PrefabInstance: {fileID: 941503605931784328}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &11581450
 GameObject:
   m_ObjectHideFlags: 0
@@ -228359,7 +228365,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &463649141
 Transform:
   m_ObjectHideFlags: 0
@@ -309756,7 +309762,7 @@ Transform:
   m_LocalScale: {x: 73.365715, y: 0.36673844, z: 50.597057}
   m_Children: []
   m_Father: {fileID: 1866218925}
-  m_RootOrder: 14
+  m_RootOrder: 15
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &633184629
 BoxCollider:
@@ -589500,7 +589506,7 @@ Transform:
   m_LocalScale: {x: 46.442844, y: 0.36673844, z: 50.597057}
   m_Children: []
   m_Father: {fileID: 1866218925}
-  m_RootOrder: 9
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &1224440451
 BoxCollider:
@@ -603935,7 +603941,7 @@ Transform:
   m_LocalScale: {x: 73.365715, y: 0.36673844, z: 85.630455}
   m_Children: []
   m_Father: {fileID: 1866218925}
-  m_RootOrder: 15
+  m_RootOrder: 16
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &1254592514
 BoxCollider:
@@ -634369,7 +634375,7 @@ Transform:
   m_LocalScale: {x: 73.365715, y: 0.36673844, z: 50.597057}
   m_Children: []
   m_Father: {fileID: 1866218925}
-  m_RootOrder: 13
+  m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &1315243454
 BoxCollider:
@@ -792562,7 +792568,7 @@ Transform:
   m_LocalScale: {x: 46.442844, y: 0.36673844, z: 50.597057}
   m_Children: []
   m_Father: {fileID: 1866218925}
-  m_RootOrder: 10
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &1644651297
 BoxCollider:
@@ -951903,7 +951909,7 @@ Transform:
   m_LocalScale: {x: 46.442844, y: 0.36673844, z: 50.597057}
   m_Children: []
   m_Father: {fileID: 1866218925}
-  m_RootOrder: 11
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &1963281148
 BoxCollider:
@@ -1011495,7 +1011501,7 @@ Transform:
   m_LocalScale: {x: 73.365715, y: 0.36673844, z: 85.630455}
   m_Children: []
   m_Father: {fileID: 1866218925}
-  m_RootOrder: 16
+  m_RootOrder: 17
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &2076278831
 BoxCollider:
@@ -1016087,7 +1016093,7 @@ Transform:
   m_LocalScale: {x: 55.09669, y: 0.36673844, z: 61.54306}
   m_Children: []
   m_Father: {fileID: 1866218925}
-  m_RootOrder: 8
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &2085621374
 BoxCollider:

U3D_DrivingSystem/Assets/Script/DianDongCheTrigger.cs

@@ -11,8 +11,6 @@ namespace Script
 
             DianDongCheManager.Instance.ControlAnimation();
 
-
-
         }
     }
 }