diff --git a/U3D_DrivingSystem/Assembly-CSharp.csproj b/U3D_DrivingSystem/Assembly-CSharp.csproj
index 67619461..41124d8d 100644
--- a/U3D_DrivingSystem/Assembly-CSharp.csproj
+++ b/U3D_DrivingSystem/Assembly-CSharp.csproj
@@ -74,11 +74,11 @@
-
+
+
-
@@ -127,6 +127,7 @@
+
@@ -258,6 +259,7 @@
+
@@ -413,8 +415,6 @@
-
-
diff --git a/U3D_DrivingSystem/Assets/EVP5/Scripts/VehicleStandardInput.cs b/U3D_DrivingSystem/Assets/EVP5/Scripts/VehicleStandardInput.cs
index 624c5ec9..9f1fb8cb 100644
--- a/U3D_DrivingSystem/Assets/EVP5/Scripts/VehicleStandardInput.cs
+++ b/U3D_DrivingSystem/Assets/EVP5/Scripts/VehicleStandardInput.cs
@@ -85,9 +85,9 @@ namespace EVP
// forwardInput = Mathf.Clamp01(xxxx);
// Debug.Log(Mathf.Clamp01(xxxx));
// forwardInput = xxxxxx;
- Debug.Log("前轮控制左右的参数----->" + steerInput);
- Debug.Log("往前的参数----->" + forwardInput);
- Debug.Log("往后的参数----->" + reverseInput);
+ // Debug.Log("前轮控制左右的参数----->" + steerInput);
+ // Debug.Log("往前的参数----->" + forwardInput);
+ // Debug.Log("往后的参数----->" + reverseInput);
// Translate forward/reverse to vehicle input
float throttleInput = 0.0f;
diff --git a/U3D_DrivingSystem/Assets/Scenes/main_.unity b/U3D_DrivingSystem/Assets/Scenes/main_.unity
index e7efda1e..e5baf8dd 100644
--- a/U3D_DrivingSystem/Assets/Scenes/main_.unity
+++ b/U3D_DrivingSystem/Assets/Scenes/main_.unity
@@ -147085,7 +147085,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!4 &463649141
Transform:
m_ObjectHideFlags: 0
@@ -246266,6 +246266,37 @@ Transform:
m_Father: {fileID: 1284303754}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!21 &787964887
+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 &788154278
GameObject:
m_ObjectHideFlags: 0
@@ -397364,6 +397395,8 @@ MonoBehaviour:
shache:
- {fileID: 469820069}
- {fileID: 1337615172}
+ ui3d: {fileID: 67935768}
+ ui2d: {fileID: 1944520099}
--- !u!1 &1277129999
GameObject:
m_ObjectHideFlags: 0
@@ -409037,6 +409070,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 701916161701370402, guid: af6a4a6330dcec3438455a7e7b3a632d,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 750320124143483819, guid: af6a4a6330dcec3438455a7e7b3a632d,
type: 3}
propertyPath: m_IsActive
@@ -409047,6 +409085,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 850369006016522867, guid: af6a4a6330dcec3438455a7e7b3a632d,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 850369006251888615, guid: af6a4a6330dcec3438455a7e7b3a632d,
type: 3}
propertyPath: m_LocalScale.x
@@ -409057,6 +409100,16 @@ PrefabInstance:
propertyPath: m_LocalPosition.x
value: -38.237118
objectReference: {fileID: 0}
+ - target: {fileID: 850369007146686431, guid: af6a4a6330dcec3438455a7e7b3a632d,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 850369007436906268, guid: af6a4a6330dcec3438455a7e7b3a632d,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 1047845755856859968, guid: af6a4a6330dcec3438455a7e7b3a632d,
type: 3}
propertyPath: m_IsActive
@@ -409187,6 +409240,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 3906144577612726460, guid: af6a4a6330dcec3438455a7e7b3a632d,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 3925837399648331897, guid: af6a4a6330dcec3438455a7e7b3a632d,
type: 3}
propertyPath: m_IsActive
@@ -409252,6 +409310,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 5250803274206477509, guid: af6a4a6330dcec3438455a7e7b3a632d,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 5545769990192351101, guid: af6a4a6330dcec3438455a7e7b3a632d,
type: 3}
propertyPath: m_IsActive
@@ -409292,6 +409355,16 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 7156765010135044915, guid: af6a4a6330dcec3438455a7e7b3a632d,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7207500145429767454, guid: af6a4a6330dcec3438455a7e7b3a632d,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 7371542889990687806, guid: af6a4a6330dcec3438455a7e7b3a632d,
type: 3}
propertyPath: m_LocalScale.x
@@ -495329,37 +495402,6 @@ 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
@@ -521974,6 +522016,15 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 58500751}
m_Modifications:
+ - target: {fileID: 542922253, guid: 2855119a3969890448a45c0f87d21c60, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 300483246695890777, guid: 2855119a3969890448a45c0f87d21c60,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 1467987161205874549, guid: 2855119a3969890448a45c0f87d21c60,
type: 3}
propertyPath: m_IsActive
@@ -584520,7 +584571,7 @@ PrefabInstance:
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
- objectReference: {fileID: 1588598447}
+ objectReference: {fileID: 787964887}
- target: {fileID: 7996012068613656550, guid: 3cb385598e51d414882eb76f140cb1a3,
type: 3}
propertyPath: m_LocalPosition.x
diff --git a/U3D_DrivingSystem/Assets/Script/Manaegr/CarInputManager.cs b/U3D_DrivingSystem/Assets/Script/Manaegr/CarInputManager.cs
index 4afbb180..bf0fe634 100644
--- a/U3D_DrivingSystem/Assets/Script/Manaegr/CarInputManager.cs
+++ b/U3D_DrivingSystem/Assets/Script/Manaegr/CarInputManager.cs
@@ -17,13 +17,18 @@ namespace Script.Manaegr
public GameObject menuUI;
public GameObject carInfoUI;
-
+
public AnimationController ygq;
public GameObject[] shache;
-
+
+ public GameObject ui3d;
+ public GameObject ui2d;
private bool isYgq = false;
+
+
+
public void Init()
{
vehicleController.maxSpeedForward = 11;
@@ -64,11 +69,17 @@ namespace Script.Manaegr
{
cam1.SetActive(false);
cam2.SetActive(true);
+
+ ui3d.SetActive(true);
+ ui2d.SetActive(false);
}
else
{
cam1.SetActive(true);
cam2.SetActive(false);
+
+ ui3d.SetActive(false);
+ ui2d.SetActive(true);
}
}
diff --git a/U3D_DrivingSystem/ProjectSettings/PackageManagerSettings.asset b/U3D_DrivingSystem/ProjectSettings/PackageManagerSettings.asset
index 4829eb31..102c6128 100644
--- a/U3D_DrivingSystem/ProjectSettings/PackageManagerSettings.asset
+++ b/U3D_DrivingSystem/ProjectSettings/PackageManagerSettings.asset
@@ -21,7 +21,7 @@ MonoBehaviour:
m_Registries:
- m_Id: main
m_Name:
- m_Url: https://packages.unity.cn
+ m_Url: https://packages.unity.com
m_Scopes: []
m_IsDefault: 1
m_Capabilities: 7
diff --git a/U3D_DrivingSystem/ProjectSettings/ProjectVersion.txt b/U3D_DrivingSystem/ProjectSettings/ProjectVersion.txt
index 1d6eb331..5c25ebfc 100644
--- a/U3D_DrivingSystem/ProjectSettings/ProjectVersion.txt
+++ b/U3D_DrivingSystem/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.1.24f1c1
-m_EditorVersionWithRevision: 2021.1.24f1c1 (cd7332aabd05)
+m_EditorVersion: 2021.1.24f1
+m_EditorVersionWithRevision: 2021.1.24f1 (6667702a1e7c)