From f9efbf0e3e3ac66d89856ea247f1a3a761e9e24b Mon Sep 17 00:00:00 2001
From: yzx <ifeijia@qq.com>
Date: Tue, 26 Dec 2023 18:57:36 +0800
Subject: [PATCH] tijiao

---
 U3D_DrivingSystem/Assets/Scenes/main_.unity     | 11 +++++++++--
 .../Assets/Script/AccidentManager.cs            | 17 +++++++++++++----
 .../Assets/Script/CarGearControl.cs             |  2 +-
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/U3D_DrivingSystem/Assets/Scenes/main_.unity b/U3D_DrivingSystem/Assets/Scenes/main_.unity
index b8d75520..80b2b51f 100644
--- a/U3D_DrivingSystem/Assets/Scenes/main_.unity
+++ b/U3D_DrivingSystem/Assets/Scenes/main_.unity
@@ -103318,8 +103318,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   uis: {fileID: 34988781}
-  baotai: []
-  carGearControl: {fileID: 0}
+  baotai:
+  - {fileID: 2009850704}
+  carGearControl: {fileID: 1276762320}
 --- !u!1 &1323442559
 GameObject:
   m_ObjectHideFlags: 0
@@ -157550,6 +157551,12 @@ Transform:
   m_Father: {fileID: 1964866829}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2009850704 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 9404289244154715, guid: 4292160a5e1fde347934ac660b2c5d30,
+    type: 3}
+  m_PrefabInstance: {fileID: 2037673174}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &2009855865
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/U3D_DrivingSystem/Assets/Script/AccidentManager.cs b/U3D_DrivingSystem/Assets/Script/AccidentManager.cs
index 74d730c4..3f29948e 100644
--- a/U3D_DrivingSystem/Assets/Script/AccidentManager.cs
+++ b/U3D_DrivingSystem/Assets/Script/AccidentManager.cs
@@ -22,7 +22,7 @@ public class AccidentManager : MonoBehaviour
     }
 
 
-   public void Tr(Transform other)
+    public void Tr(Transform other, bool b = false)
     {
         triggerName = other.name;
 
@@ -48,9 +48,18 @@ public class AccidentManager : MonoBehaviour
             }
         }else if (other.name == "礼让行人")
         {
-            Close();
-            uis.transform.Find("UI").Find("礼让行人").gameObject.SetActive(true);
-            carGearControl.mingdi = true;
+            if (b)
+            { 
+                Close();
+                uis.transform.Find("UI").Find("礼让行人").gameObject.SetActive(true);
+                carGearControl.mingdi = false;
+            }
+            else
+            {
+                carGearControl.mingdi = true;
+            }
+
+
         }
 
     }
diff --git a/U3D_DrivingSystem/Assets/Script/CarGearControl.cs b/U3D_DrivingSystem/Assets/Script/CarGearControl.cs
index 71fa9f94..f4f70816 100644
--- a/U3D_DrivingSystem/Assets/Script/CarGearControl.cs
+++ b/U3D_DrivingSystem/Assets/Script/CarGearControl.cs
@@ -207,7 +207,7 @@ namespace Script
                         if (carData.HornStatus == 1)
                         {
                             mingdi = false;
-                            accidentManager.Tr(ttt);
+                            accidentManager.Tr(ttt,true);
                         }
                     }