Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
This commit is contained in:
commit
ea59e7732e
|
|
@ -225587,7 +225587,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!4 &463649141
|
--- !u!4 &463649141
|
||||||
Transform:
|
Transform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -141,18 +141,18 @@ public class TrafficLightManager : MonoBehaviour
|
||||||
case TrafficLightState.Green:
|
case TrafficLightState.Green:
|
||||||
group.previousState = TrafficLightState.Green;
|
group.previousState = TrafficLightState.Green;
|
||||||
group.currentState = TrafficLightState.Yellow;
|
group.currentState = TrafficLightState.Yellow;
|
||||||
group.timer = 3f; // 绿灯到黄灯的持续时间
|
group.timer = 2f; // 绿灯到黄灯的持续时间
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TrafficLightState.Yellow:
|
case TrafficLightState.Yellow:
|
||||||
group.currentState = TrafficLightState.Red;
|
group.currentState = TrafficLightState.Red;
|
||||||
group.timer = group.startsWithGreen ? 31 : 31; // 黄灯到红灯的持续时间
|
group.timer = group.startsWithGreen ? 30 : 30; // 黄灯到红灯的持续时间
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TrafficLightState.Red:
|
case TrafficLightState.Red:
|
||||||
group.previousState = TrafficLightState.Red;
|
group.previousState = TrafficLightState.Red;
|
||||||
group.currentState = TrafficLightState.Green;
|
group.currentState = TrafficLightState.Green;
|
||||||
group.timer = 6; // 红灯到绿灯的持续时间
|
group.timer = 7; // 红灯到绿灯的持续时间
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue