This commit is contained in:
parent
25e93def0e
commit
aa3558e4a6
|
|
@ -25584,10 +25584,12 @@ MeshRenderer:
|
|||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
|
|
@ -25613,6 +25615,7 @@ MeshRenderer:
|
|||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!33 &251518979
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -43564,10 +43567,12 @@ MeshRenderer:
|
|||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
|
|
@ -43593,6 +43598,7 @@ MeshRenderer:
|
|||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!33 &430820247
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -63843,10 +63849,12 @@ MeshRenderer:
|
|||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
|
|
@ -63872,6 +63880,7 @@ MeshRenderer:
|
|||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!33 &630663704
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -133253,6 +133262,9 @@ MonoBehaviour:
|
|||
carInfoManager: {fileID: 1017393516}
|
||||
thirdPerson: {fileID: 1136185827}
|
||||
firstPerson: {fileID: 2037673177}
|
||||
shache:
|
||||
- {fileID: 1953679095}
|
||||
- {fileID: 1911478031}
|
||||
--- !u!114 &1276762327
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -171220,6 +171232,11 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 2101301191}
|
||||
m_Modifications:
|
||||
- target: {fileID: -8679921383154817045, guid: aa551abd791091049bf37154e84dcf27,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 11
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: aa551abd791091049bf37154e84dcf27,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
|
@ -171235,6 +171252,11 @@ PrefabInstance:
|
|||
propertyPath: m_LocalPosition.z
|
||||
value: 54.39
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: aa551abd791091049bf37154e84dcf27,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.47684327
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: aa551abd791091049bf37154e84dcf27,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
|
|
@ -171250,16 +171272,6 @@ PrefabInstance:
|
|||
propertyPath: m_LocalRotation.z
|
||||
value: 0.5221308
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: aa551abd791091049bf37154e84dcf27,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.47684327
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: aa551abd791091049bf37154e84dcf27,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 11
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: aa551abd791091049bf37154e84dcf27,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
|
|
@ -171325,31 +171337,31 @@ PrefabInstance:
|
|||
propertyPath: m_LocalPosition.z
|
||||
value: 4.438
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -1881385060622621878, guid: aa551abd791091049bf37154e84dcf27,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.70639527
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -1881385060622621878, guid: aa551abd791091049bf37154e84dcf27,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.70639527
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -1881385060622621878, guid: aa551abd791091049bf37154e84dcf27,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.03171462
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -1881385060622621878, guid: aa551abd791091049bf37154e84dcf27,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0.03171462
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -1881385060622621878, guid: aa551abd791091049bf37154e84dcf27,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.70639527
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -1881385060622621878, guid: aa551abd791091049bf37154e84dcf27,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 95.14099
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -1881385060622621878, guid: aa551abd791091049bf37154e84dcf27,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.03171462
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -1881385060622621878, guid: aa551abd791091049bf37154e84dcf27,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
|
|
@ -171553,10 +171565,12 @@ MeshRenderer:
|
|||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
|
|
@ -171582,6 +171596,7 @@ MeshRenderer:
|
|||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!33 &1608194948
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -185983,10 +185998,12 @@ MeshRenderer:
|
|||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
|
|
@ -186012,6 +186029,7 @@ MeshRenderer:
|
|||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!33 &1712705185
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -189639,10 +189657,12 @@ MeshRenderer:
|
|||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
|
|
@ -189668,6 +189688,7 @@ MeshRenderer:
|
|||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!33 &1742330280
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -206897,6 +206918,102 @@ MeshFilter:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1909568741}
|
||||
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!1 &1911478031
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1911478032}
|
||||
- component: {fileID: 1911478035}
|
||||
- component: {fileID: 1911478034}
|
||||
- component: {fileID: 1911478033}
|
||||
m_Layer: 0
|
||||
m_Name: "\u7206\u80CE (1)"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!4 &1911478032
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1911478031}
|
||||
m_LocalRotation: {x: -0.26746163, y: -0.055704076, z: 0.043036826, w: 0.9609938}
|
||||
m_LocalPosition: {x: -0.804, y: 0.114, z: -0.743}
|
||||
m_LocalScale: {x: 0.4536, y: 0.072123155, z: 0.36368668}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2037673175}
|
||||
m_RootOrder: 10
|
||||
m_LocalEulerAnglesHint: {x: -30.615, y: -8.694, z: 7.512}
|
||||
--- !u!65 &1911478033
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1911478031}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 1, y: 1, z: 1}
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!23 &1911478034
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1911478031}
|
||||
m_Enabled: 0
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!33 &1911478035
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1911478031}
|
||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!1 &1911799428
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -221706,6 +221823,16 @@ PrefabInstance:
|
|||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2793264845307687955, guid: 4292160a5e1fde347934ac660b2c5d30,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.122
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2793264845307687955, guid: 4292160a5e1fde347934ac660b2c5d30,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -0.744
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3190887408370009811, guid: 4292160a5e1fde347934ac660b2c5d30,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
|
|
@ -232937,6 +233064,11 @@ PrefabInstance:
|
|||
propertyPath: m_Name
|
||||
value: jishi
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 764026405237368942, guid: f230a7f7f7beb604cbc44c0bd5a0f581,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 58
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 764026405237368942, guid: f230a7f7f7beb604cbc44c0bd5a0f581,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
|
@ -232952,6 +233084,11 @@ PrefabInstance:
|
|||
propertyPath: m_LocalPosition.z
|
||||
value: 97.652985
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 764026405237368942, guid: f230a7f7f7beb604cbc44c0bd5a0f581,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: -0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 764026405237368942, guid: f230a7f7f7beb604cbc44c0bd5a0f581,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
|
|
@ -232967,16 +233104,6 @@ PrefabInstance:
|
|||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 764026405237368942, guid: f230a7f7f7beb604cbc44c0bd5a0f581,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: -0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 764026405237368942, guid: f230a7f7f7beb604cbc44c0bd5a0f581,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 58
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 764026405237368942, guid: f230a7f7f7beb604cbc44c0bd5a0f581,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
|
|
|
|||
|
|
@ -32,14 +32,18 @@ namespace Script
|
|||
private int NewValue = -1;
|
||||
|
||||
|
||||
public GameObject thirdPerson;//第三人称
|
||||
public GameObject firstPerson;//第一人称
|
||||
public GameObject thirdPerson; //第三人称
|
||||
public GameObject firstPerson; //第一人称
|
||||
|
||||
|
||||
public GameObject[] shache;
|
||||
|
||||
void Start()
|
||||
{
|
||||
vehicleController = GetComponent<VehicleController>();
|
||||
vehicleStandardInput = GetComponent<VehicleStandardInput>();
|
||||
|
||||
StartModbus();
|
||||
StartModbus();
|
||||
ModBusQueue();
|
||||
}
|
||||
|
||||
|
|
@ -50,7 +54,7 @@ namespace Script
|
|||
while (true)
|
||||
{
|
||||
await client.SendModbusRequest();
|
||||
|
||||
|
||||
await Task.Delay(TimeSpan.FromSeconds(.1));
|
||||
}
|
||||
}
|
||||
|
|
@ -70,9 +74,6 @@ namespace Script
|
|||
carData = client.modbusQueue.Dequeue();
|
||||
|
||||
Debug.Log(vehicleController.steerInput);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//方向盘
|
||||
|
|
@ -128,7 +129,7 @@ namespace Script
|
|||
}
|
||||
}
|
||||
|
||||
//转向灯 00是未开转向灯,1是左转向灯,2是右转向灯
|
||||
//转向灯 00是未开转向灯,1是左转向灯,2是右转向灯
|
||||
//当钥匙转为通电才能启动转向灯 0熄火,1通电,2启动
|
||||
if (carData.IgnitionSwitch == 1)
|
||||
{
|
||||
|
|
@ -145,21 +146,38 @@ namespace Script
|
|||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//上1,右2,下3,左4
|
||||
if (NewValue != carData.ButtonData)
|
||||
{
|
||||
NewValue = carData.ButtonData;
|
||||
CarMenuButton(NewValue);
|
||||
}
|
||||
// else
|
||||
// {
|
||||
// continue;
|
||||
// }
|
||||
|
||||
|
||||
if (carData.BrakePedalPosition > 40)
|
||||
{
|
||||
if (shache[0].activeInHierarchy)
|
||||
continue;
|
||||
for (int i = 0; i < shache.Length; i++)
|
||||
{
|
||||
shache[i].SetActive(true);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
continue;
|
||||
if (!shache[0].activeInHierarchy)
|
||||
continue;
|
||||
for (int i = 0; i < shache.Length; i++)
|
||||
{
|
||||
shache[i].SetActive(false);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
await Task.Delay(TimeSpan.FromSeconds(.1));
|
||||
|
|
@ -181,8 +199,6 @@ namespace Script
|
|||
thirdPerson.SetActive(true);
|
||||
firstPerson.SetActive(false);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -157,15 +157,15 @@ namespace ModbusManager
|
|||
carStatusData.IgnitionSwitch = dataValue;
|
||||
break;
|
||||
case 1://左打方向盘为负数,右打方向盘为正数,打方向盘打死一圈半,数值1500。
|
||||
Debug.Log($"方向盘数据: {(short)dataValue}");
|
||||
// Debug.Log($"方向盘数据: {(short)dataValue}");
|
||||
carStatusData.SteeringWheelAngle = (short)dataValue;
|
||||
break;
|
||||
case 2://01为喇叭按下
|
||||
//Debug.Log($"方向盘上喇叭状态: {dataValue}");
|
||||
// Debug.Log($"方向盘上喇叭状态: {dataValue}");
|
||||
carStatusData.HornStatus = dataValue;
|
||||
break;
|
||||
case 3://0-100,踩到底为100
|
||||
//Debug.Log($"刹车踏板数据: {dataValue}");
|
||||
Debug.Log($"刹车踏板数据: {dataValue}");
|
||||
carStatusData.BrakePedalPosition = dataValue;
|
||||
break;
|
||||
case 4://0-100,踩到底为100
|
||||
|
|
|
|||
Loading…
Reference in New Issue