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

# Conflicts:
#	U3D_DrivingSystem/Logs/AssetImportWorker0.log

U3D_DrivingSystem/Assets/Script/TrafficLightManager.cs

@@ -23,6 +23,7 @@ public class TrafficLightManager : MonoBehaviour
         public TrafficLightState currentState;
         public TrafficLightState previousState; // 新增字段，用于保存黄灯之前的状态
         public List<GameObject> trafficLights = new List<GameObject>();
+        public List<GameObject> roadEventTrigger = new List<GameObject>();
 
         public void Initialize()
         {
@@ -62,6 +63,11 @@ public class TrafficLightManager : MonoBehaviour
                         }
                     }
 
+                    foreach (var v in roadEventTrigger)
+                    {
+                        v.SetActive(true);
+                    }
+
                     break;
                 case TrafficLightState.Yellow:
                     foreach (var light in trafficLights)
@@ -85,7 +91,12 @@ public class TrafficLightManager : MonoBehaviour
                             light.transform.Find("green2").GetComponent<MeshRenderer>().material.EnableKeyword("_EMISSION");
                         }
                     }
-                    AddRedLightWarning();
+
+                    foreach (var v in roadEventTrigger)
+                    {
+                        v.SetActive(false);
+                    }
+                    // AddRedLightWarning();
                     break;
                 default:
                     throw new ArgumentOutOfRangeException(nameof(state), state, null);