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

t

This commit is contained in:
yzx 2024-01-05 13:16:55 +08:00
parent 33528b4868
commit 84d2c25848
12 changed files with 224 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
U3D_DrivingSystem/Assembly-CSharp.csproj
View File

@ -659,6 +659,7 @@
<None Include="Assets\Plugin\Hard Surface Pro\HardSurface Shaders\HardSurfaceLighting.cginc" />
<None Include="Assets\Plugin\Hard Surface Pro\HardSurface Shaders\HardSurfacePro Hidden Front Cut Out Bump.shader" />
<None Include="Assets\Plugin\Standard Assets\Vehicles\Car\Shaders\DiffuseReflectiveShader.shader" />
<None Include="Assets\StreamingAssets\setting.txt" />
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_SDF-Mobile.shader" />
<None Include="Assets\Plugin\Hard Surface Pro\HardSurface Shaders\HardSurface Draw First Transparent Bump.shader" />
<None Include="Assets\Plugin\Hard Surface Pro\HardSurface Shaders\HardSurface Free Opaque.shader" />

BIN
U3D_DrivingSystem/Assets/Images/天气背景.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

94
U3D_DrivingSystem/Assets/Scenes/main_.unity
View File

@ -103930,6 +103930,11 @@ PrefabInstance:
propertyPath: lightGroups.Array.data[1].trafficLights.Array.size
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1389253434666983256, guid: d11d4175e1d087d46872bb1f74c1ef8a,
type: 3}
propertyPath: lightGroups.Array.data[0].roadEventTrigger.Array.size
value: 4
objectReference: {fileID: 0}
- target: {fileID: 1389253434666983256, guid: d11d4175e1d087d46872bb1f74c1ef8a,
type: 3}
propertyPath: lightGroups.Array.data[0].trafficLights.Array.data[0]
@ -103950,6 +103955,26 @@ PrefabInstance:
propertyPath: lightGroups.Array.data[1].trafficLights.Array.data[1]
value:
objectReference: {fileID: 1462585248}
- target: {fileID: 1389253434666983256, guid: d11d4175e1d087d46872bb1f74c1ef8a,
type: 3}
propertyPath: lightGroups.Array.data[0].roadEventTrigger.Array.data[0]
value:
objectReference: {fileID: 7928649737340227799}
- target: {fileID: 1389253434666983256, guid: d11d4175e1d087d46872bb1f74c1ef8a,
type: 3}
propertyPath: lightGroups.Array.data[0].roadEventTrigger.Array.data[1]
value:
objectReference: {fileID: 7928649737340227798}
- target: {fileID: 1389253434666983256, guid: d11d4175e1d087d46872bb1f74c1ef8a,
type: 3}
propertyPath: lightGroups.Array.data[0].roadEventTrigger.Array.data[2]
value:
objectReference: {fileID: 7928649737340227797}
- target: {fileID: 1389253434666983256, guid: d11d4175e1d087d46872bb1f74c1ef8a,
type: 3}
propertyPath: lightGroups.Array.data[0].roadEventTrigger.Array.data[3]
value:
objectReference: {fileID: 7928649737340227796}
- target: {fileID: 5805952789084765072, guid: d11d4175e1d087d46872bb1f74c1ef8a,
type: 3}
propertyPath: trafficLightText.Array.size
@ -694401,11 +694426,21 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 49167339311633067, guid: ed1136c7c0a971247baae99b2ab4d336,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 980181084903255922, guid: ed1136c7c0a971247baae99b2ab4d336,
type: 3}
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1016689917055388600, guid: ed1136c7c0a971247baae99b2ab4d336,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1206854713874889726, guid: ed1136c7c0a971247baae99b2ab4d336,
type: 3}
propertyPath: m_IsTrigger
@ -694441,6 +694476,11 @@ PrefabInstance:
propertyPath: m_TagString
value: honglvdengchufa
objectReference: {fileID: 0}
- target: {fileID: 3652927567884504588, guid: ed1136c7c0a971247baae99b2ab4d336,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4186728241202212498, guid: ed1136c7c0a971247baae99b2ab4d336,
type: 3}
propertyPath: m_Name
@ -694451,11 +694491,31 @@ PrefabInstance:
propertyPath: m_TagString
value: honglvdengchufa
objectReference: {fileID: 0}
- target: {fileID: 4762023537263328882, guid: ed1136c7c0a971247baae99b2ab4d336,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4955462312588466583, guid: ed1136c7c0a971247baae99b2ab4d336,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5074667480526899052, guid: ed1136c7c0a971247baae99b2ab4d336,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5372998102007544568, guid: ed1136c7c0a971247baae99b2ab4d336,
type: 3}
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5473465045006229401, guid: ed1136c7c0a971247baae99b2ab4d336,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5768735755992601427, guid: ed1136c7c0a971247baae99b2ab4d336,
type: 3}
propertyPath: m_Name
@ -694526,11 +694586,21 @@ PrefabInstance:
propertyPath: m_TagString
value: honglvdengchufa
objectReference: {fileID: 0}
- target: {fileID: 5965322365773847026, guid: ed1136c7c0a971247baae99b2ab4d336,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6361357693364105690, guid: ed1136c7c0a971247baae99b2ab4d336,
type: 3}
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7399999655184691216, guid: ed1136c7c0a971247baae99b2ab4d336,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7448538251787773224, guid: ed1136c7c0a971247baae99b2ab4d336,
type: 3}
propertyPath: m_IsTrigger
@ -696213,6 +696283,30 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 7928649737340227746}
m_PrefabAsset: {fileID: 0}
--- !u!1 &7928649737340227796 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1917416241, guid: 69ab0312b8445bb4d9c43b8bcc1d3c90,
type: 3}
m_PrefabInstance: {fileID: 7928649737340227746}
m_PrefabAsset: {fileID: 0}
--- !u!1 &7928649737340227797 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1977137458, guid: 69ab0312b8445bb4d9c43b8bcc1d3c90,
type: 3}
m_PrefabInstance: {fileID: 7928649737340227746}
m_PrefabAsset: {fileID: 0}
--- !u!1 &7928649737340227798 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2057673328, guid: 69ab0312b8445bb4d9c43b8bcc1d3c90,
type: 3}
m_PrefabInstance: {fileID: 7928649737340227746}
m_PrefabAsset: {fileID: 0}
--- !u!1 &7928649737340227799 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2679212568488333159, guid: 69ab0312b8445bb4d9c43b8bcc1d3c90,
type: 3}
m_PrefabInstance: {fileID: 7928649737340227746}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8266913483936659759
PrefabInstance:
m_ObjectHideFlags: 0

84
U3D_DrivingSystem/Assets/Scenes/menu.unity
View File

@ -140,7 +140,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &12367054
RectTransform:
m_ObjectHideFlags: 0
@ -161,7 +161,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 2076, y: 115}
m_SizeDelta: {x: 1920, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &12367055
@ -322,7 +322,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
uiGames:
- {fileID: 12367053}
- {fileID: 1157041859}
--- !u!114 &66285359
MonoBehaviour:
@ -340,6 +339,7 @@ MonoBehaviour:
selectionAngleThreshold: 30
neutralAngleThreshold: 5
testFloatV: 0
ui: {fileID: 1978559564}
--- !u!1 &76095178
GameObject:
m_ObjectHideFlags: 0
@ -2590,7 +2590,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1157041860
RectTransform:
m_ObjectHideFlags: 0
@ -4172,6 +4172,81 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1952163224}
m_CullTransparentMesh: 0
--- !u!1 &1978559564
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1978559565}
- component: {fileID: 1978559567}
- component: {fileID: 1978559566}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1978559565
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1978559564}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2124250625}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1920, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1978559566
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1978559564}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 1cfb596d4d964474b93bda7af117afef, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1978559567
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1978559564}
m_CullTransparentMesh: 1
--- !u!1 &2124250621
GameObject:
m_ObjectHideFlags: 0
@ -4274,6 +4349,7 @@ RectTransform:
- {fileID: 76095179}
- {fileID: 867050206}
- {fileID: 1952163225}
- {fileID: 1978559565}
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

2
U3D_DrivingSystem/Assets/Script/Manaegr/MenuManager.cs
View File

@ -44,7 +44,7 @@ public class MenuManager : MonoBehaviour
NextStep();
if (GameInfo.instance.carSelectTypeInfo.Count() == 2)
if (GameInfo.instance.carSelectTypeInfo.Count() == 1)
{
SceneManager.LoadScene("main_");
}

8
U3D_DrivingSystem/Assets/Script/ModbusTcpClient.cs
View File

@ -30,7 +30,7 @@ namespace ModbusManager
public class ModbusTcpClient:MonoBehaviour
{
private TcpClient tcpClient;
private string serverIp = "172.16.1.125";
private string serverIp = "192.168.1.100";
private int serverPort = 12315;
public Queue<CarStatusData> modbusQueue;
public static ModbusTcpClient modbusTcpClient;
@ -49,7 +49,7 @@ namespace ModbusManager
private void Start()
{
System.IO.Filerea
}
@ -78,6 +78,10 @@ namespace ModbusManager
{
tcpClient = new TcpClient();
modbusQueue = new Queue<CarStatusData>();
string str= System.IO.File.ReadAllText(Application.streamingAssetsPath + "/setting.txt");
serverIp = str.Split(',')[0];
serverPort = int.Parse(str.Split(',')[1]);
}
/// <summary>

28
U3D_DrivingSystem/Assets/Script/SteeringWheelController.cs
View File

@ -32,6 +32,8 @@ public class SteeringWheelController : MonoBehaviour
private bool ClutchPedalPositionBool = false;
private ModbusTcpClient client;
public GameObject ui;
private void Awake()
{
Instance = this;
@ -94,8 +96,23 @@ public class SteeringWheelController : MonoBehaviour
{
CarStatusData carData = client.modbusQueue.Dequeue();
if (carData.AcceleratorPedalPosition > 30)
{
if (ui.activeInHierarchy)
{
ui.SetActive(false);
continue;
}
}
if (carData.AcceleratorPedalPosition > 70)
{
if (ClutchPedalPositionBool)
{
ClutchPedalPositionBool = false;
@ -115,6 +132,17 @@ public class SteeringWheelController : MonoBehaviour
ClutchPedalPositionBool = true;
}
if (carData.ClutchPedalPosition > 50)
{
if (!ui.activeInHierarchy)
{
ui.SetActive(true);
}
}
// else if(carData.BrakePedalPosition<30)
// {

1
U3D_DrivingSystem/Assets/StreamingAssets/setting.txt Normal file
View File

@ -0,0 +1 @@
172.16.1.125,12315

7
U3D_DrivingSystem/Assets/StreamingAssets/setting.txt.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: fec87a1666c8e4e438d1a54985d6f4ec
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

6
U3D_DrivingSystem/ProjectSettings/EditorBuildSettings.asset
View File

@ -11,9 +11,9 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/menu.unity
guid: 625ae008c50968f4db89f28206788e12
- enabled: 0
path:
guid: 00000000000000000000000000000000
- enabled: 1
path: Assets/Scenes/main_.unity
guid: 9d18eeb68f1d1bd43b7267fb80ca382e
- enabled: 0
path: Assets/Scenes/demo.unity
guid: 19e5e40f3345d8747b22df3dc2f39aed

BIN
U3D_DrivingSystem/Temp/__Backupscenes/0.backup
View File

Binary file not shown.

6
U3D_DrivingSystem/UserSettings/EditorUserSettings.asset
View File

@ -15,13 +15,13 @@ EditorUserSettings:
value: 224247031146460a5c5f42371e2a4b09
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c52151802563f22213229
value: 22424703114646680e0b0227036c52111f19276439262f2434
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c4c0417050c6439262f2434
value: 22424703114646680e0b0227036c52151802563f22213229
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c52111f19276439262f2434
value: 22424703114646680e0b0227036c4c0417050c6439262f2434
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650