huangjiayu
/
H_SafeExperienceDrivingSystem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

# Conflicts:
#	U3D_DrivingSystem/Logs/AssetImportWorker0.log
This commit is contained in:
shengtao 2024-01-03 17:39:46 +08:00
parent 2fece35c04 9452b66dea
commit 626b825c11
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
U3D_DrivingSystem/Assets/Script/TrafficLightManager.cs
View File

@ -23,6 +23,7 @@ public class TrafficLightManager : MonoBehaviour
public TrafficLightState currentState; public TrafficLightState currentState;
public TrafficLightState previousState; // 新增字段，用于保存黄灯之前的状态 public TrafficLightState previousState; // 新增字段，用于保存黄灯之前的状态
public List<GameObject> trafficLights = new List<GameObject>(); public List<GameObject> trafficLights = new List<GameObject>();
public List<GameObject> roadEventTrigger = new List<GameObject>();
public void Initialize() public void Initialize()
{ {
@ -41,7 +42,7 @@ public class TrafficLightManager : MonoBehaviour
{ {
if (light != null) if (light != null)
{ {
// 假设你有一个方法来根据状态获取相应的贴图 // 假设你有一个方法来根据状态获取相应的贴图
//Texture newTexture = GetTextureForState(state); //Texture newTexture = GetTextureForState(state);
light.transform.Find("red2").GetComponent<MeshRenderer>().material.DisableKeyword("_EMISSION"); light.transform.Find("red2").GetComponent<MeshRenderer>().material.DisableKeyword("_EMISSION");
light.transform.Find("yellow1").GetComponent<MeshRenderer>().material.DisableKeyword("_EMISSION"); light.transform.Find("yellow1").GetComponent<MeshRenderer>().material.DisableKeyword("_EMISSION");
@ -62,6 +63,11 @@ public class TrafficLightManager : MonoBehaviour
} }
} }
foreach (var v in roadEventTrigger)
{
v.SetActive(true);
}
break; break;
case TrafficLightState.Yellow: case TrafficLightState.Yellow:
foreach (var light in trafficLights) foreach (var light in trafficLights)
@ -85,7 +91,12 @@ public class TrafficLightManager : MonoBehaviour
light.transform.Find("green2").GetComponent<MeshRenderer>().material.EnableKeyword("_EMISSION"); light.transform.Find("green2").GetComponent<MeshRenderer>().material.EnableKeyword("_EMISSION");
} }
} }
AddRedLightWarning();
foreach (var v in roadEventTrigger)
{
v.SetActive(false);
}
// AddRedLightWarning();
break; break;
default: default:
throw new ArgumentOutOfRangeException(nameof(state), state, null); throw new ArgumentOutOfRangeException(nameof(state), state, null);
@ -133,7 +144,7 @@ public class TrafficLightManager : MonoBehaviour
// 以下是一个示例，在控制台输出警告信息： // 以下是一个示例，在控制台输出警告信息：
Debug.LogWarning("红灯警告：请注意停车！"); Debug.LogWarning("红灯警告：请注意停车！");
} }
void UpdateTrafficLightGroup(TrafficLightGroup group) void UpdateTrafficLightGroup(TrafficLightGroup group)
{ {
group.timer -= Time.deltaTime; group.timer -= Time.deltaTime;