From 8ddbf19927707d192ade74cc89c5a504aef20c85 Mon Sep 17 00:00:00 2001
From: yzx <ifeijia@qq.com>
Date: Tue, 30 Jan 2024 13:21:40 +0800
Subject: [PATCH] t

---
 U3D_DrivingSystem/Assembly-CSharp.csproj      |  4 +-
 U3D_DrivingSystem/Assets/Scenes/main_.unity   | 71 ++-----------------
 .../Assets/Script/DianDongCheTrigger.cs       |  4 +-
 3 files changed, 9 insertions(+), 70 deletions(-)

diff --git a/U3D_DrivingSystem/Assembly-CSharp.csproj b/U3D_DrivingSystem/Assembly-CSharp.csproj
index 611342ca..40920560 100644
--- a/U3D_DrivingSystem/Assembly-CSharp.csproj
+++ b/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" />
diff --git a/U3D_DrivingSystem/Assets/Scenes/main_.unity b/U3D_DrivingSystem/Assets/Scenes/main_.unity
index bbabb116..64bf1a67 100644
--- a/U3D_DrivingSystem/Assets/Scenes/main_.unity
+++ b/U3D_DrivingSystem/Assets/Scenes/main_.unity
@@ -228365,7 +228365,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &463649141
 Transform:
   m_ObjectHideFlags: 0
@@ -897706,6 +897706,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
@@ -1033117,71 +1033121,6 @@ SkinnedMeshRenderer:
     m_Center: {x: 0.02181068, y: -0.009805754, z: 0}
     m_Extent: {x: 0.8632928, y: 0.15312733, z: 0.60339785}
   m_DirtyAABB: 0
---- !u!21 &2118976433
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Override
-  m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs: []
-    m_Ints: []
-    m_Floats:
-    - _AdvancedCat: 1
-    - _Banner: 1
-    - _DirectionalCat: 1
-    - _DirectionalFalloff: 2
-    - _DirectionalIntensity: 1
-    - _FarDistanceHeight: 0
-    - _FarDistanceOffset: 0
-    - _FogAxisMode: 1
-    - _FogCameraMode: 0
-    - _FogCat: 1
-    - _FogColorDuo: 1
-    - _FogDistanceEnd: 100
-    - _FogDistanceFalloff: 2
-    - _FogDistanceStart: 0
-    - _FogHeightEnd: 100
-    - _FogHeightFalloff: 2
-    - _FogHeightStart: 0
-    - _FogIntensity: 1
-    - _FogLayersMode: 0
-    - _IsHeightFogPreset: 1
-    - _IsHeightFogShader: 1
-    - _JitterIntensity: 1
-    - _NoiseCat: 1
-    - _NoiseDistanceEnd: 50
-    - _NoiseIntensity: 1
-    - _NoiseMax: 1
-    - _NoiseMin: 0
-    - _NoiseModeBlend: 1
-    - _NoiseScale: 30
-    - _SkyboxCat: 1
-    - _SkyboxFogBottom: 0
-    - _SkyboxFogFalloff: 1
-    - _SkyboxFogFill: 1
-    - _SkyboxFogHeight: 1
-    - _SkyboxFogIntensity: 1
-    - _SkyboxFogOffset: 0
-    m_Colors:
-    - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1}
-    - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0}
-    - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0}
-    - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1}
-    - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1}
-    - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0}
-  m_BuildTextureStacks: []
 --- !u!1 &2119066257
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/U3D_DrivingSystem/Assets/Script/DianDongCheTrigger.cs b/U3D_DrivingSystem/Assets/Script/DianDongCheTrigger.cs
index dd6a3345..8e4ff9f6 100644
--- a/U3D_DrivingSystem/Assets/Script/DianDongCheTrigger.cs
+++ b/U3D_DrivingSystem/Assets/Script/DianDongCheTrigger.cs
@@ -8,9 +8,9 @@ namespace Script
         private void OnTriggerEnter(Collider other)
         {
             Debug.Log(other.name);
-
+            
             DianDongCheManager.Instance.ControlAnimation();
-
+            
         }
     }
 }
\ No newline at end of file