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

U3D_DrivingSystem/Assembly-CSharp.csproj

@@ -130,6 +130,7 @@
      <Compile Include="Assets\Script\Manaegr\CarInputManager.cs" />
      <Compile Include="Assets\Script\Old\YiCHongDianFei.cs" />
      <Compile Include="Assets\Script\Manaegr\GameFlowManager.cs" />
+     <Compile Include="Assets\Script\DianDongCheManager.cs" />
      <Compile Include="Assets\SuperSplinesPro\Scripts\Animation\SplineAnimatorClosestPoint.cs" />
      <Compile Include="Assets\UTS\Scripts\Car\EasySuspension.cs" />
      <Compile Include="Assets\Script\CarGearControl.cs" />
@@ -211,6 +212,7 @@
      <Compile Include="Assets\Script\Old\Radio.cs" />
      <Compile Include="Assets\SuperSplinesPro\SuperSplines\Spline\SplineDistanceFunctions.cs" />
      <Compile Include="Assets\UTS\Scripts\Traffic Light\View Semaphores\ViewPeopleSemaphore.cs" />
+     <Compile Include="Assets\Script\DianDongCheTrigger.cs" />
      <Compile Include="Assets\SuperSplinesPro\Scripts\Animation\SplineAnimatorCustomValue.cs" />
      <Compile Include="Assets\EVP5\Scripts\Tools\TextureCanvas.cs" />
      <Compile Include="Assets\Plugin\FXVShieldEffect\Scripts\FXVShieldHit.cs" />
@@ -416,8 +418,6 @@
      <Compile Include="Assets\Script\Old\Trigger_road.cs" />
      <Compile Include="Assets\Script\Old\Early_Warning.cs" />
      <Compile Include="Assets\Script\Manaegr\CarTempManager.cs" />
-     <Compile Include="Assets\Script\DianDongCheTrigger.cs" />
-     <Compile Include="Assets\Script\DianDongCheManager.cs" />
      <None Include="Assets\Plugin\Standard Assets\Effects\ImageEffects\Shaders\Tonemapper.shader" />
      <None Include="Assets\Plugin\Hard Surface Pro\HardSurface Shaders\HardSurfaceProScreenSpaceReflection.cginc" />
      <None Include="Assets\Plugin\Hard Surface Pro\HardSurface Shaders\HardSurface Free Opaque Specular.shader" />

U3D_DrivingSystem/Assets/Scenes/main_.unity

@@ -897874,6 +897874,10 @@ 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