diff --git a/U3D_DrivingSystem/Assets/Scenes/main_.unity b/U3D_DrivingSystem/Assets/Scenes/main_.unity index f46766ef..86162e43 100644 --- a/U3D_DrivingSystem/Assets/Scenes/main_.unity +++ b/U3D_DrivingSystem/Assets/Scenes/main_.unity @@ -45472,71 +45472,6 @@ Transform: m_Father: {fileID: 147127088} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!21 &146093047 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Override - m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _AdvancedCat: 1 - - _Banner: 1 - - _DirectionalCat: 1 - - _DirectionalFalloff: 2 - - _DirectionalIntensity: 1 - - _FarDistanceHeight: 0 - - _FarDistanceOffset: 0 - - _FogAxisMode: 1 - - _FogCameraMode: 0 - - _FogCat: 1 - - _FogColorDuo: 1 - - _FogDistanceEnd: 100 - - _FogDistanceFalloff: 2 - - _FogDistanceStart: 0 - - _FogHeightEnd: 100 - - _FogHeightFalloff: 2 - - _FogHeightStart: 0 - - _FogIntensity: 1 - - _FogLayersMode: 0 - - _IsHeightFogPreset: 1 - - _IsHeightFogShader: 1 - - _JitterIntensity: 1 - - _NoiseCat: 1 - - _NoiseDistanceEnd: 50 - - _NoiseIntensity: 1 - - _NoiseMax: 1 - - _NoiseMin: 0 - - _NoiseModeBlend: 1 - - _NoiseScale: 30 - - _SkyboxCat: 1 - - _SkyboxFogBottom: 0 - - _SkyboxFogFalloff: 1 - - _SkyboxFogFill: 1 - - _SkyboxFogHeight: 1 - - _SkyboxFogIntensity: 1 - - _SkyboxFogOffset: 0 - m_Colors: - - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1} - - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0} - - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0} - - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1} - - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1} - - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} - m_BuildTextureStacks: [] --- !u!1 &146389085 GameObject: m_ObjectHideFlags: 0 @@ -103995,11 +103930,6 @@ 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] @@ -104020,26 +103950,6 @@ 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 @@ -111943,10 +111853,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 19800000, guid: ffb8dbf6042ec5c429e690af20fbde5d, type: 3} - propertyPath: CollisionModule.type - value: 0 - objectReference: {fileID: 0} - target: {fileID: 19800000, guid: ffb8dbf6042ec5c429e690af20fbde5d, type: 3} propertyPath: CollisionModule.m_Planes.Array.data[0] value: @@ -111960,9 +111866,7 @@ PrefabInstance: propertyPath: che value: objectReference: {fileID: 1276762317} - m_RemovedComponents: - - {fileID: 1863041211, guid: ffb8dbf6042ec5c429e690af20fbde5d, type: 3} - - {fileID: 1737035857396294927, guid: ffb8dbf6042ec5c429e690af20fbde5d, type: 3} + m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ffb8dbf6042ec5c429e690af20fbde5d, type: 3} --- !u!1 &351006295 GameObject: @@ -147123,7 +147027,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &463649141 Transform: m_ObjectHideFlags: 0 @@ -161332,37 +161236,6 @@ Transform: m_Father: {fileID: 2082268609} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!21 &506853163 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Height Fog Global - m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3001 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _AdvancedCat: 1 - - _Banner: 1 - - _DirectionalCat: 1 - - _FogCat: 1 - - _HeightFogGlobal: 1 - - _IsHeightFogShader: 1 - - _NoiseCat: 1 - - _SkyboxCat: 1 - m_Colors: [] - m_BuildTextureStacks: [] --- !u!1 &506891626 GameObject: m_ObjectHideFlags: 0 @@ -224488,16 +224361,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2280673899710386678, guid: 63c0ff75cd2443b49ae41f5c1479c637, - type: 3} - propertyPath: m_LocalPosition.y - value: -14.669999 - objectReference: {fileID: 0} - - target: {fileID: 2710752178956431130, guid: 63c0ff75cd2443b49ae41f5c1479c637, - type: 3} - propertyPath: m_LocalPosition.y - value: -14.67 - objectReference: {fileID: 0} - target: {fileID: 4815339177332862360, guid: 63c0ff75cd2443b49ae41f5c1479c637, type: 3} propertyPath: m_LocalPosition.x @@ -224538,11 +224401,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 7782823663614863501, guid: 63c0ff75cd2443b49ae41f5c1479c637, - type: 3} - propertyPath: m_LocalPosition.y - value: -9.169999 - objectReference: {fileID: 0} - target: {fileID: 7782823663632025844, guid: 63c0ff75cd2443b49ae41f5c1479c637, type: 3} propertyPath: m_IsActive @@ -224798,11 +224656,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 7782823664929914240, guid: 63c0ff75cd2443b49ae41f5c1479c637, - type: 3} - propertyPath: m_LocalPosition.y - value: -9.17 - objectReference: {fileID: 0} - target: {fileID: 7782823664948774292, guid: 63c0ff75cd2443b49ae41f5c1479c637, type: 3} propertyPath: m_IsActive @@ -494810,6 +494663,37 @@ Transform: m_Father: {fileID: 1941147223} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!21 &1588598447 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Height Fog Global + m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3001 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _AdvancedCat: 1 + - _Banner: 1 + - _DirectionalCat: 1 + - _FogCat: 1 + - _HeightFogGlobal: 1 + - _IsHeightFogShader: 1 + - _NoiseCat: 1 + - _SkyboxCat: 1 + m_Colors: [] + m_BuildTextureStacks: [] --- !u!1 &1588647138 GameObject: m_ObjectHideFlags: 0 @@ -583859,7 +583743,7 @@ PrefabInstance: type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 506853163} + objectReference: {fileID: 1588598447} - target: {fileID: 7996012068613656550, guid: 3cb385598e51d414882eb76f140cb1a3, type: 3} propertyPath: m_LocalPosition.x @@ -643417,7 +643301,7 @@ PrefabInstance: - target: {fileID: 1854020796013028847, guid: 4292160a5e1fde347934ac660b2c5d30, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2286986072208732639, guid: 4292160a5e1fde347934ac660b2c5d30, type: 3} @@ -680501,16 +680385,6 @@ PrefabInstance: propertyPath: m_Name value: "\u9650\u901F\u6807\u5FD740" objectReference: {fileID: 0} - - target: {fileID: 2871943245688640437, guid: e37a9e64a116c814fabb4aa06ccdf43b, - type: 3} - propertyPath: m_LocalPosition.x - value: -237.23 - objectReference: {fileID: 0} - - target: {fileID: 2871943245688640437, guid: e37a9e64a116c814fabb4aa06ccdf43b, - type: 3} - propertyPath: m_LocalPosition.z - value: 261.49 - objectReference: {fileID: 0} - target: {fileID: 3211314502194975723, guid: e37a9e64a116c814fabb4aa06ccdf43b, type: 3} propertyPath: m_Name @@ -694522,40 +694396,60 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 49167339311633067, guid: ed1136c7c0a971247baae99b2ab4d336, + - target: {fileID: 980181084903255922, guid: ed1136c7c0a971247baae99b2ab4d336, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: m_IsTrigger + value: 1 objectReference: {fileID: 0} - - target: {fileID: 1016689917055388600, guid: ed1136c7c0a971247baae99b2ab4d336, + - target: {fileID: 1206854713874889726, guid: ed1136c7c0a971247baae99b2ab4d336, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: m_IsTrigger + value: 1 objectReference: {fileID: 0} - - target: {fileID: 3652927567884504588, guid: ed1136c7c0a971247baae99b2ab4d336, + - target: {fileID: 1662085984384966345, guid: ed1136c7c0a971247baae99b2ab4d336, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: m_Name + value: "\u7981\u6B62\u505C\u8F66" objectReference: {fileID: 0} - - target: {fileID: 4762023537263328882, guid: ed1136c7c0a971247baae99b2ab4d336, + - target: {fileID: 1662085984384966345, guid: ed1136c7c0a971247baae99b2ab4d336, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: m_TagString + value: honglvdengchufa objectReference: {fileID: 0} - - target: {fileID: 4955462312588466583, guid: ed1136c7c0a971247baae99b2ab4d336, + - target: {fileID: 2524456371799540492, guid: ed1136c7c0a971247baae99b2ab4d336, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: m_Name + value: "\u7981\u6B62\u505C\u8F66" objectReference: {fileID: 0} - - target: {fileID: 5074667480526899052, guid: ed1136c7c0a971247baae99b2ab4d336, + - target: {fileID: 2524456371799540492, guid: ed1136c7c0a971247baae99b2ab4d336, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: m_TagString + value: honglvdengchufa objectReference: {fileID: 0} - - target: {fileID: 5473465045006229401, guid: ed1136c7c0a971247baae99b2ab4d336, + - target: {fileID: 2900364512092444737, guid: ed1136c7c0a971247baae99b2ab4d336, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: m_Name + value: "\u7981\u6B62\u505C\u8F66" + objectReference: {fileID: 0} + - target: {fileID: 2900364512092444737, guid: ed1136c7c0a971247baae99b2ab4d336, + type: 3} + propertyPath: m_TagString + value: honglvdengchufa + objectReference: {fileID: 0} + - target: {fileID: 4186728241202212498, guid: ed1136c7c0a971247baae99b2ab4d336, + type: 3} + propertyPath: m_Name + value: "\u7981\u6B62\u505C\u8F66" + objectReference: {fileID: 0} + - target: {fileID: 4186728241202212498, guid: ed1136c7c0a971247baae99b2ab4d336, + type: 3} + propertyPath: m_TagString + value: honglvdengchufa + objectReference: {fileID: 0} + - target: {fileID: 5372998102007544568, guid: ed1136c7c0a971247baae99b2ab4d336, + type: 3} + propertyPath: m_IsTrigger + value: 1 objectReference: {fileID: 0} - target: {fileID: 5768735755992601427, guid: ed1136c7c0a971247baae99b2ab4d336, type: 3} @@ -694617,15 +694511,55 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5965322365773847026, guid: ed1136c7c0a971247baae99b2ab4d336, + - target: {fileID: 5905501523241570349, guid: ed1136c7c0a971247baae99b2ab4d336, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: m_Name + value: "\u7981\u6B62\u505C\u8F66" objectReference: {fileID: 0} - - target: {fileID: 7399999655184691216, guid: ed1136c7c0a971247baae99b2ab4d336, + - target: {fileID: 5905501523241570349, guid: ed1136c7c0a971247baae99b2ab4d336, type: 3} - propertyPath: m_Enabled - value: 0 + propertyPath: m_TagString + value: honglvdengchufa + objectReference: {fileID: 0} + - target: {fileID: 6361357693364105690, guid: ed1136c7c0a971247baae99b2ab4d336, + type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7448538251787773224, guid: ed1136c7c0a971247baae99b2ab4d336, + type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8506479154709204441, guid: ed1136c7c0a971247baae99b2ab4d336, + type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8749242382117567078, guid: ed1136c7c0a971247baae99b2ab4d336, + type: 3} + propertyPath: m_Name + value: "\u7981\u6B62\u505C\u8F66" + objectReference: {fileID: 0} + - target: {fileID: 8749242382117567078, guid: ed1136c7c0a971247baae99b2ab4d336, + type: 3} + propertyPath: m_TagString + value: honglvdengchufa + objectReference: {fileID: 0} + - target: {fileID: 9034157292851835196, guid: ed1136c7c0a971247baae99b2ab4d336, + type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9103274811662428509, guid: ed1136c7c0a971247baae99b2ab4d336, + type: 3} + propertyPath: m_Name + value: "\u7981\u6B62\u505C\u8F66" + objectReference: {fileID: 0} + - target: {fileID: 9103274811662428509, guid: ed1136c7c0a971247baae99b2ab4d336, + type: 3} + propertyPath: m_TagString + value: honglvdengchufa objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ed1136c7c0a971247baae99b2ab4d336, type: 3} @@ -696274,30 +696208,6 @@ 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 diff --git a/U3D_DrivingSystem/Assets/Script/ModbusTcpClient.cs b/U3D_DrivingSystem/Assets/Script/ModbusTcpClient.cs index 1a3bfc49..a47e5c62 100644 --- a/U3D_DrivingSystem/Assets/Script/ModbusTcpClient.cs +++ b/U3D_DrivingSystem/Assets/Script/ModbusTcpClient.cs @@ -49,7 +49,7 @@ namespace ModbusManager private void Start() { - + System.IO.Filerea } diff --git a/U3D_DrivingSystem/ProjectSettings/EditorBuildSettings.asset b/U3D_DrivingSystem/ProjectSettings/EditorBuildSettings.asset index acbf6d60..0648bbf5 100644 --- a/U3D_DrivingSystem/ProjectSettings/EditorBuildSettings.asset +++ b/U3D_DrivingSystem/ProjectSettings/EditorBuildSettings.asset @@ -11,9 +11,9 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/menu.unity guid: 625ae008c50968f4db89f28206788e12 - - enabled: 1 - path: Assets/Scenes/main_.unity - guid: 2905cb1f57b5d7641adcaa938670a0cd + - enabled: 0 + path: + guid: 00000000000000000000000000000000 - enabled: 0 path: Assets/Scenes/demo.unity guid: 19e5e40f3345d8747b22df3dc2f39aed diff --git a/U3D_DrivingSystem/Temp/__Backupscenes/0.backup b/U3D_DrivingSystem/Temp/__Backupscenes/0.backup index 7ba653b3..02dcefe9 100644 Binary files a/U3D_DrivingSystem/Temp/__Backupscenes/0.backup and b/U3D_DrivingSystem/Temp/__Backupscenes/0.backup differ