This commit is contained in:
yzx 2023-12-25 08:55:44 +08:00
parent 59e2373ce7
commit 9865bce7c7
5 changed files with 30 additions and 23 deletions

View File

@ -627,7 +627,10 @@ public class VehicleController : MonoBehaviour
float forwardSpeed = m_speed * steeringLimitRatio * speedFactor; float forwardSpeed = m_speed * steeringLimitRatio * speedFactor;
float maxEspAngle = Mathf.Asin(Mathf.Clamp01(3.0f / forwardSpeed)) * Mathf.Rad2Deg; float maxEspAngle = Mathf.Asin(Mathf.Clamp01(3.0f / forwardSpeed)) * Mathf.Rad2Deg;
float steerAngleLimit = Mathf.Min(maxSteerAngle, Mathf.Max(maxEspAngle, Mathf.Abs(m_speedAngle))); float steerAngleLimit = Mathf.Min(maxSteerAngle, Mathf.Max(maxEspAngle, Mathf.Abs(m_speedAngle)));
inputSteerAngle = Mathf.Clamp(inputSteerAngle, -steerAngleLimit, +steerAngleLimit); inputSteerAngle = Mathf.Clamp(inputSteerAngle, -steerAngleLimit, +steerAngleLimit);
//Debug.Log(inputSteerAngle);
} }
float assistedSteerAngle = 0.0f; float assistedSteerAngle = 0.0f;

View File

@ -46746,7 +46746,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
@ -161849,7 +161849,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!4 &1482950187 --- !u!4 &1482950187
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -222314,6 +222314,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 11410574, guid: 4292160a5e1fde347934ac660b2c5d30, type: 3}
propertyPath: degreesOfRotation
value: 1100
objectReference: {fileID: 0}
- target: {fileID: 15384928, guid: 4292160a5e1fde347934ac660b2c5d30, type: 3} - target: {fileID: 15384928, guid: 4292160a5e1fde347934ac660b2c5d30, type: 3}
propertyPath: m_ConnectedAnchor.x propertyPath: m_ConnectedAnchor.x
value: -0.394989 value: -0.394989

View File

@ -358,7 +358,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!224 &76095179 --- !u!224 &76095179
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -973,7 +973,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!224 &570311457 --- !u!224 &570311457
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1106,7 +1106,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!224 &574599288 --- !u!224 &574599288
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1509,7 +1509,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!224 &748011624 --- !u!224 &748011624
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1642,7 +1642,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!224 &867050206 --- !u!224 &867050206
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -4057,7 +4057,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!224 &1952163225 --- !u!224 &1952163225
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -24,8 +24,8 @@ namespace Script
private CarStatusData carData; private CarStatusData carData;
float minValue = -900f; // 范围的最小值 float minValue = -1500f; // 范围的最小值
float maxValue = 900; // 范围的最大值 float maxValue = 1500; // 范围的最大值
public CarInfoManager carInfoManager; public CarInfoManager carInfoManager;
private ModbusTcpClient client; private ModbusTcpClient client;
@ -66,14 +66,14 @@ namespace Script
} }
// public void HHHHHH() public void HHHHHH()
// { {
// client.SendModbusRequest12(); client.SendModbusRequest12();
// } }
// void OnDestroy() void OnDestroy()
// { {
// client.CloseConnection(); client.CloseConnection();
// } }
async Task ModBusQueue() async Task ModBusQueue()
{ {
@ -82,7 +82,7 @@ namespace Script
// Debug.Log(client.modbusQueue.Count); // Debug.Log(client.modbusQueue.Count);
// if (client.modbusQueue.Count > 0) // if (client.modbusQueue.Count > 0)
// { // {
// Debug.Log(client.modbusQueue.Count); // // Debug.Log(client.modbusQueue.Count);
// //
// carData = client.modbusQueue.Dequeue(); // carData = client.modbusQueue.Dequeue();

View File

@ -168,7 +168,7 @@ namespace ModbusManager
carStatusData.IgnitionSwitch = dataValue; carStatusData.IgnitionSwitch = dataValue;
break; break;
case 1://左打方向盘为负数右打方向盘为正数打方向盘打死一圈半数值1500。 case 1://左打方向盘为负数右打方向盘为正数打方向盘打死一圈半数值1500。
// Debug.Log($"方向盘数据: {(short)dataValue}"); Debug.Log($"方向盘数据: {(short)dataValue}");
carStatusData.SteeringWheelAngle = (short)dataValue; carStatusData.SteeringWheelAngle = (short)dataValue;
break; break;
case 2://01为喇叭按下 case 2://01为喇叭按下
@ -200,7 +200,7 @@ namespace ModbusManager
carStatusData.WiperStatus = dataValue; carStatusData.WiperStatus = dataValue;
break; break;
case 9://00是未开灯1是示廓灯2是近光远光。。没有找到远光信号。 case 9://00是未开灯1是示廓灯2是近光远光。。没有找到远光信号。
Debug.Log($"灯光状态: {dataValue}"); // Debug.Log($"灯光状态: {dataValue}");
carStatusData.LightStatus = dataValue; carStatusData.LightStatus = dataValue;
break; break;
case 10://00是未开转向灯1是左转向灯2是右转向灯 case 10://00是未开转向灯1是左转向灯2是右转向灯