diff --git a/U3D_DrivingSystem/Assets/EVP5/Scripts/Editor/VehicleStandardInputInspector.cs b/U3D_DrivingSystem/Assets/EVP5/Scripts/Editor/VehicleStandardInputInspector.cs index 2fd96222..5e90bc66 100644 --- a/U3D_DrivingSystem/Assets/EVP5/Scripts/Editor/VehicleStandardInputInspector.cs +++ b/U3D_DrivingSystem/Assets/EVP5/Scripts/Editor/VehicleStandardInputInspector.cs @@ -28,6 +28,8 @@ public class VehicleStandardInputInspector : Editor EditorGUILayout.PropertyField(propThrottleAndBrakeInput); EditorGUILayout.PropertyField(serializedObject.FindProperty("steerAxis")); + EditorGUILayout.PropertyField(serializedObject.FindProperty("xxxxxx")); + VehicleStandardInput.ThrottleAndBrakeInput throttleAndBrakeInput = (VehicleStandardInput.ThrottleAndBrakeInput)propThrottleAndBrakeInput.enumValueIndex; if (throttleAndBrakeInput == VehicleStandardInput.ThrottleAndBrakeInput.SeparateAxes) diff --git a/U3D_DrivingSystem/Assets/EVP5/Scripts/VehicleStandardInput.cs b/U3D_DrivingSystem/Assets/EVP5/Scripts/VehicleStandardInput.cs index 5f59014a..5c9f3eb1 100644 --- a/U3D_DrivingSystem/Assets/EVP5/Scripts/VehicleStandardInput.cs +++ b/U3D_DrivingSystem/Assets/EVP5/Scripts/VehicleStandardInput.cs @@ -48,7 +48,7 @@ namespace EVP if (Input.GetKeyDown(resetVehicleKey)) m_doReset = true; } - + // public float xxxxxx; void FixedUpdate() { if (target == null) return; @@ -72,9 +72,11 @@ namespace EVP forwardInput = Mathf.Clamp01(Input.GetAxis(throttleAndBrakeAxis)); reverseInput = Mathf.Clamp01(-Input.GetAxis(throttleAndBrakeAxis)); } - // Debug.Log("前轮控制左右的参数----->" + steerInput); - // Debug.Log("往前的参数----->" + forwardInput); - // Debug.Log("往后的参数----->" + reverseInput); + + // forwardInput = xxxxxx; + 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 d12e02b3..27e52331 100644 --- a/U3D_DrivingSystem/Assets/Scenes/main_.unity +++ b/U3D_DrivingSystem/Assets/Scenes/main_.unity @@ -5041,7 +5041,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} m_Name: m_EditorClassIdentifier: - sharedProfile: {fileID: 11400000, guid: f43d47d2fc4e7ed4a86d86c669dc13df, type: 2} + sharedProfile: {fileID: 0} isGlobal: 1 blendDistance: 0 weight: 1 @@ -8338,7 +8338,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &85993936 MonoBehaviour: m_ObjectHideFlags: 0 @@ -33912,7 +33912,7 @@ MonoBehaviour: motionGridSize: 64 colorBlindnessType: 0 colorBlindnessStrength: 1 - m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2} + m_Resources: {fileID: 0} m_ShowToolkit: 0 m_ShowCustomSorter: 0 breakBeforeColorGrading: 0 @@ -107639,7 +107639,7 @@ MonoBehaviour: motionGridSize: 64 colorBlindnessType: 0 colorBlindnessStrength: 1 - m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2} + m_Resources: {fileID: 0} m_ShowToolkit: 0 m_ShowCustomSorter: 0 breakBeforeColorGrading: 0 @@ -201200,6 +201200,14 @@ PrefabInstance: propertyPath: maxSpeedForward value: 20 objectReference: {fileID: 0} + - target: {fileID: 15384928, guid: 4292160a5e1fde347934ac660b2c5d30, type: 3} + propertyPath: m_ConnectedAnchor.x + value: -0.394989 + objectReference: {fileID: 0} + - target: {fileID: 15384928, guid: 4292160a5e1fde347934ac660b2c5d30, type: 3} + propertyPath: m_ConnectedAnchor.z + value: -0.04498291 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4292160a5e1fde347934ac660b2c5d30, type: 3} --- !u!4 &2037673175 stripped diff --git a/U3D_DrivingSystem/Assets/Scenes/start.unity b/U3D_DrivingSystem/Assets/Scenes/start.unity index fd150f7c..ad1c4901 100644 --- a/U3D_DrivingSystem/Assets/Scenes/start.unity +++ b/U3D_DrivingSystem/Assets/Scenes/start.unity @@ -1027,7 +1027,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 66285358} m_MethodName: NextStep - m_Mode: 5 + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -2456,6 +2456,84 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1117454472} m_CullTransparentMesh: 0 +--- !u!1 &1134469707 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1134469708} + - component: {fileID: 1134469710} + - component: {fileID: 1134469709} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1134469708 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1134469707} + 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: 1952163225} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1134469709 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1134469707} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Button +--- !u!222 &1134469710 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1134469707} + m_CullTransparentMesh: 0 --- !u!1 &1157041859 GameObject: m_ObjectHideFlags: 0 @@ -3903,6 +3981,136 @@ MonoBehaviour: m_EditorClassIdentifier: clickSprite: {fileID: 21300000, guid: e094113ec4b791245855a3db608e8edb, type: 3} carType: 3 +--- !u!1 &1952163224 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1952163225} + - component: {fileID: 1952163228} + - component: {fileID: 1952163227} + - component: {fileID: 1952163226} + m_Layer: 5 + m_Name: Button (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1952163225 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1952163224} + 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: + - {fileID: 1134469708} + m_Father: {fileID: 2124250625} + m_RootOrder: 10 + 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: 748.5, y: -496.4} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1952163226 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1952163224} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1952163227} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 66285359} + m_MethodName: BBB + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1952163227 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1952163224} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &1952163228 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1952163224} + m_CullTransparentMesh: 0 --- !u!1 &2124250621 GameObject: m_ObjectHideFlags: 0 @@ -4003,6 +4211,7 @@ RectTransform: - {fileID: 574599288} - {fileID: 76095179} - {fileID: 867050206} + - {fileID: 1952163225} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/U3D_DrivingSystem/Assets/Script/BtClick.cs b/U3D_DrivingSystem/Assets/Script/BtClick.cs index 260b9dc1..0da702db 100644 --- a/U3D_DrivingSystem/Assets/Script/BtClick.cs +++ b/U3D_DrivingSystem/Assets/Script/BtClick.cs @@ -12,6 +12,7 @@ public class BtClick : MonoBehaviour public CarType carType; private Image image; public event Action OnStartCompleted; + private void Awake() { image = this.GetComponent(); @@ -40,27 +41,22 @@ public class BtClick : MonoBehaviour // // break; // } - - - this.GetComponent