mark/wirm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Car obstacle complete

Browse source
This commit is contained in:
yauwailam 2025-02-11 11:36:17 +08:00
parent 9cdbfe0bf0
commit 46afcc6e52
8 changed files with 8387 additions and 214 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Game/Assets/Car.cs
View file

@ -17,6 +17,7 @@ public class Car : MonoBehaviour
public float rotationSpeed = 5.0f; // Smooth turning speed public float rotationSpeed = 5.0f; // Smooth turning speed
private int currentWaypointIndex = 0; // Starting at the first waypoint private int currentWaypointIndex = 0; // Starting at the first waypoint
public Vector3 rotationOffset = Vector3.zero;
private void OnTriggerEnter(Collider other) private void OnTriggerEnter(Collider other)
{ {
Debug.Log("Triggered by: " + other.name); Debug.Log("Triggered by: " + other.name);
@ -64,7 +65,8 @@ public class Car : MonoBehaviour
if (direction != Vector3.zero) if (direction != Vector3.zero)
{ {
Quaternion lookRotation = Quaternion.LookRotation(direction); // Apply rotation offset
Quaternion lookRotation = Quaternion.LookRotation(direction) * Quaternion.Euler(rotationOffset);
transform.rotation = Quaternion.Slerp(transform.rotation, lookRotation, rotationSpeed * Time.deltaTime); transform.rotation = Quaternion.Slerp(transform.rotation, lookRotation, rotationSpeed * Time.deltaTime);
} }
} }

4
Game/Assets/Prefabs/Reza Assets/Cars/BlueCar_Reza.prefab
View file

@ -3547,7 +3547,7 @@ Transform:
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 76.483, y: 20.062338, z: 1074.189} m_LocalPosition: {x: 76.483, y: 20.062338, z: 1074.189}
m_LocalScale: {x: 0.71024, y: 1, z: 1} m_LocalScale: {x: 1.4272895, y: 1.6624316, z: 1.2563}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 1042055672864314654} - {fileID: 1042055672864314654}
@ -6213,7 +6213,7 @@ MeshCollider:
m_ProvidesContacts: 0 m_ProvidesContacts: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 5 serializedVersion: 5
m_Convex: 0 m_Convex: 1
m_CookingOptions: 30 m_CookingOptions: 30
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
--- !u!1 &8310460265778558687 --- !u!1 &8310460265778558687

14
Game/Assets/Prefabs/Reza Assets/Cars/GreenCar_Reza (2).prefab
View file

@ -1064,7 +1064,7 @@ MonoBehaviour:
m_PreserveMeshAssetOnDestroy: 0 m_PreserveMeshAssetOnDestroy: 0
assetGuid: assetGuid:
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_VersionIndex: 763 m_VersionIndex: 766
m_IsSelectable: 1 m_IsSelectable: 1
m_SelectedFaces: m_SelectedFaces:
m_SelectedEdges: [] m_SelectedEdges: []
@ -2236,7 +2236,7 @@ MonoBehaviour:
m_PreserveMeshAssetOnDestroy: 0 m_PreserveMeshAssetOnDestroy: 0
assetGuid: assetGuid:
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_VersionIndex: 763 m_VersionIndex: 766
m_IsSelectable: 1 m_IsSelectable: 1
m_SelectedFaces: m_SelectedFaces:
m_SelectedEdges: [] m_SelectedEdges: []
@ -3408,7 +3408,7 @@ MonoBehaviour:
m_PreserveMeshAssetOnDestroy: 0 m_PreserveMeshAssetOnDestroy: 0
assetGuid: assetGuid:
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_VersionIndex: 763 m_VersionIndex: 766
m_IsSelectable: 1 m_IsSelectable: 1
m_SelectedFaces: m_SelectedFaces:
m_SelectedEdges: [] m_SelectedEdges: []
@ -4580,7 +4580,7 @@ MonoBehaviour:
m_PreserveMeshAssetOnDestroy: 0 m_PreserveMeshAssetOnDestroy: 0
assetGuid: assetGuid:
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_VersionIndex: 763 m_VersionIndex: 766
m_IsSelectable: 1 m_IsSelectable: 1
m_SelectedFaces: m_SelectedFaces:
m_SelectedEdges: [] m_SelectedEdges: []
@ -4719,7 +4719,7 @@ Transform:
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 76.483, y: 20.062338, z: 1075.977} m_LocalPosition: {x: 76.483, y: 20.062338, z: 1075.977}
m_LocalScale: {x: 0.71024, y: 1, z: 1} m_LocalScale: {x: 1.427289, y: 1.662432, z: 1.2563}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 1079596460906746210} - {fileID: 1079596460906746210}
@ -7281,7 +7281,7 @@ MonoBehaviour:
m_PreserveMeshAssetOnDestroy: 0 m_PreserveMeshAssetOnDestroy: 0
assetGuid: assetGuid:
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_VersionIndex: 4304 m_VersionIndex: 4307
m_IsSelectable: 1 m_IsSelectable: 1
m_SelectedFaces: m_SelectedFaces:
m_SelectedEdges: [] m_SelectedEdges: []
@ -7385,6 +7385,6 @@ MeshCollider:
m_ProvidesContacts: 0 m_ProvidesContacts: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 5 serializedVersion: 5
m_Convex: 0 m_Convex: 1
m_CookingOptions: 30 m_CookingOptions: 30
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}

14
Game/Assets/Prefabs/Reza Assets/Cars/PurpleCar_Reza.prefab
View file

@ -31,7 +31,7 @@ Transform:
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 76.483, y: 20.062338, z: 1078.15} m_LocalPosition: {x: 76.483, y: 20.062338, z: 1078.15}
m_LocalScale: {x: 0.71024, y: 1, z: 1} m_LocalScale: {x: 1.427289, y: 1.662432, z: 1.2563}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 5371903328586580264} - {fileID: 5371903328586580264}
@ -2593,7 +2593,7 @@ MonoBehaviour:
m_PreserveMeshAssetOnDestroy: 0 m_PreserveMeshAssetOnDestroy: 0
assetGuid: assetGuid:
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_VersionIndex: 4310 m_VersionIndex: 4313
m_IsSelectable: 1 m_IsSelectable: 1
m_SelectedFaces: m_SelectedFaces:
m_SelectedEdges: [] m_SelectedEdges: []
@ -2697,7 +2697,7 @@ MeshCollider:
m_ProvidesContacts: 0 m_ProvidesContacts: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 5 serializedVersion: 5
m_Convex: 0 m_Convex: 1
m_CookingOptions: 30 m_CookingOptions: 30
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
--- !u!1 &4688572630381258159 --- !u!1 &4688572630381258159
@ -3764,7 +3764,7 @@ MonoBehaviour:
m_PreserveMeshAssetOnDestroy: 0 m_PreserveMeshAssetOnDestroy: 0
assetGuid: assetGuid:
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_VersionIndex: 766 m_VersionIndex: 769
m_IsSelectable: 1 m_IsSelectable: 1
m_SelectedFaces: m_SelectedFaces:
m_SelectedEdges: [] m_SelectedEdges: []
@ -4936,7 +4936,7 @@ MonoBehaviour:
m_PreserveMeshAssetOnDestroy: 0 m_PreserveMeshAssetOnDestroy: 0
assetGuid: assetGuid:
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_VersionIndex: 766 m_VersionIndex: 769
m_IsSelectable: 1 m_IsSelectable: 1
m_SelectedFaces: m_SelectedFaces:
m_SelectedEdges: [] m_SelectedEdges: []
@ -6108,7 +6108,7 @@ MonoBehaviour:
m_PreserveMeshAssetOnDestroy: 0 m_PreserveMeshAssetOnDestroy: 0
assetGuid: assetGuid:
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_VersionIndex: 766 m_VersionIndex: 769
m_IsSelectable: 1 m_IsSelectable: 1
m_SelectedFaces: m_SelectedFaces:
m_SelectedEdges: [] m_SelectedEdges: []
@ -7280,7 +7280,7 @@ MonoBehaviour:
m_PreserveMeshAssetOnDestroy: 0 m_PreserveMeshAssetOnDestroy: 0
assetGuid: assetGuid:
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_VersionIndex: 766 m_VersionIndex: 769
m_IsSelectable: 1 m_IsSelectable: 1
m_SelectedFaces: m_SelectedFaces:
m_SelectedEdges: [] m_SelectedEdges: []

14
Game/Assets/Prefabs/Reza Assets/Cars/RedCar_Reza.prefab
View file

@ -1064,7 +1064,7 @@ MonoBehaviour:
m_PreserveMeshAssetOnDestroy: 0 m_PreserveMeshAssetOnDestroy: 0
assetGuid: assetGuid:
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_VersionIndex: 760 m_VersionIndex: 763
m_IsSelectable: 1 m_IsSelectable: 1
m_SelectedFaces: m_SelectedFaces:
m_SelectedEdges: [] m_SelectedEdges: []
@ -2236,7 +2236,7 @@ MonoBehaviour:
m_PreserveMeshAssetOnDestroy: 0 m_PreserveMeshAssetOnDestroy: 0
assetGuid: assetGuid:
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_VersionIndex: 760 m_VersionIndex: 763
m_IsSelectable: 1 m_IsSelectable: 1
m_SelectedFaces: m_SelectedFaces:
m_SelectedEdges: [] m_SelectedEdges: []
@ -3408,7 +3408,7 @@ MonoBehaviour:
m_PreserveMeshAssetOnDestroy: 0 m_PreserveMeshAssetOnDestroy: 0
assetGuid: assetGuid:
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_VersionIndex: 760 m_VersionIndex: 763
m_IsSelectable: 1 m_IsSelectable: 1
m_SelectedFaces: m_SelectedFaces:
m_SelectedEdges: [] m_SelectedEdges: []
@ -3547,7 +3547,7 @@ Transform:
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 76.483, y: 20.062338, z: 1071.428} m_LocalPosition: {x: 76.483, y: 20.062338, z: 1071.428}
m_LocalScale: {x: 0.71024, y: 1, z: 1} m_LocalScale: {x: 1.427289, y: 1.662432, z: 1.2563}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 7593893600841095933} - {fileID: 7593893600841095933}
@ -6109,7 +6109,7 @@ MonoBehaviour:
m_PreserveMeshAssetOnDestroy: 0 m_PreserveMeshAssetOnDestroy: 0
assetGuid: assetGuid:
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_VersionIndex: 4301 m_VersionIndex: 4304
m_IsSelectable: 1 m_IsSelectable: 1
m_SelectedFaces: m_SelectedFaces:
m_SelectedEdges: [] m_SelectedEdges: []
@ -6213,7 +6213,7 @@ MeshCollider:
m_ProvidesContacts: 0 m_ProvidesContacts: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 5 serializedVersion: 5
m_Convex: 0 m_Convex: 1
m_CookingOptions: 30 m_CookingOptions: 30
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
--- !u!1 &6269964064440433305 --- !u!1 &6269964064440433305
@ -7280,7 +7280,7 @@ MonoBehaviour:
m_PreserveMeshAssetOnDestroy: 0 m_PreserveMeshAssetOnDestroy: 0
assetGuid: assetGuid:
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_VersionIndex: 760 m_VersionIndex: 763
m_IsSelectable: 1 m_IsSelectable: 1
m_SelectedFaces: m_SelectedFaces:
m_SelectedEdges: [] m_SelectedEdges: []

32
Game/Assets/Prefabs/Reza Assets/Cars/WhiteCar_Reza.prefab
View file

@ -1064,7 +1064,7 @@ MonoBehaviour:
m_PreserveMeshAssetOnDestroy: 0 m_PreserveMeshAssetOnDestroy: 0
assetGuid: assetGuid:
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_VersionIndex: 763 m_VersionIndex: 766
m_IsSelectable: 1 m_IsSelectable: 1
m_SelectedFaces: m_SelectedFaces:
m_SelectedEdges: [] m_SelectedEdges: []
@ -1186,6 +1186,7 @@ GameObject:
- component: {fileID: 2945161744182452091} - component: {fileID: 2945161744182452091}
- component: {fileID: 3378180745088993557} - component: {fileID: 3378180745088993557}
- component: {fileID: 1197120804817647912} - component: {fileID: 1197120804817647912}
- component: {fileID: 924488159461366713}
m_Layer: 0 m_Layer: 0
m_Name: WhiteCar_Reza m_Name: WhiteCar_Reza
m_TagString: Untagged m_TagString: Untagged
@ -1203,7 +1204,7 @@ Transform:
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 76.483, y: 20.062338, z: 1080.34} m_LocalPosition: {x: 76.483, y: 20.062338, z: 1080.34}
m_LocalScale: {x: 0.71024, y: 1, z: 1} m_LocalScale: {x: 1.427289, y: 1.662432, z: 1.2563}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 6702699104838786083} - {fileID: 6702699104838786083}
@ -3765,7 +3766,7 @@ MonoBehaviour:
m_PreserveMeshAssetOnDestroy: 0 m_PreserveMeshAssetOnDestroy: 0
assetGuid: assetGuid:
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_VersionIndex: 4307 m_VersionIndex: 4310
m_IsSelectable: 1 m_IsSelectable: 1
m_SelectedFaces: m_SelectedFaces:
m_SelectedEdges: [] m_SelectedEdges: []
@ -3869,9 +3870,26 @@ MeshCollider:
m_ProvidesContacts: 0 m_ProvidesContacts: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 5 serializedVersion: 5
m_Convex: 0 m_Convex: 1
m_CookingOptions: 30 m_CookingOptions: 30
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
--- !u!114 &924488159461366713
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1884055412810011501}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 068fbcec103081147a0588ec72e53ee0, type: 3}
m_Name:
m_EditorClassIdentifier:
playerRig: {fileID: 0}
startPoint: {fileID: 0}
waypoints: []
speed: 3
rotationSpeed: 5
--- !u!1 &2813551867002969041 --- !u!1 &2813551867002969041
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -4936,7 +4954,7 @@ MonoBehaviour:
m_PreserveMeshAssetOnDestroy: 0 m_PreserveMeshAssetOnDestroy: 0
assetGuid: assetGuid:
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_VersionIndex: 763 m_VersionIndex: 766
m_IsSelectable: 1 m_IsSelectable: 1
m_SelectedFaces: m_SelectedFaces:
m_SelectedEdges: [] m_SelectedEdges: []
@ -6108,7 +6126,7 @@ MonoBehaviour:
m_PreserveMeshAssetOnDestroy: 0 m_PreserveMeshAssetOnDestroy: 0
assetGuid: assetGuid:
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_VersionIndex: 763 m_VersionIndex: 766
m_IsSelectable: 1 m_IsSelectable: 1
m_SelectedFaces: m_SelectedFaces:
m_SelectedEdges: [] m_SelectedEdges: []
@ -7280,7 +7298,7 @@ MonoBehaviour:
m_PreserveMeshAssetOnDestroy: 0 m_PreserveMeshAssetOnDestroy: 0
assetGuid: assetGuid:
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_VersionIndex: 763 m_VersionIndex: 766
m_IsSelectable: 1 m_IsSelectable: 1
m_SelectedFaces: m_SelectedFaces:
m_SelectedEdges: [] m_SelectedEdges: []

8500
Game/Assets/Scenes/Town.unity
View file

File diff suppressed because one or more lines are too long

19
Game/ProjectSettings/Packages/com.unity.probuilder/Settings.json
View file

@ -9,7 +9,7 @@
{ {
"type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "editor.lastMeshSelectMode", "key": "editor.lastMeshSelectMode",
"value": "{\"m_Value\":8}" "value": "{\"m_Value\":2}"
}, },
{ {
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
@ -111,11 +111,6 @@
"key": "editor.stripProBuilderScriptsOnBuild", "key": "editor.stripProBuilderScriptsOnBuild",
"value": "{\"m_Value\":true}" "value": "{\"m_Value\":true}"
}, },
{
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "editor.extrudeEdgesAsGroup",
"value": "{\"m_Value\":true}"
},
{ {
"type": "UnityEngine.ProBuilder.SelectionModifierBehavior, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "type": "UnityEngine.ProBuilder.SelectionModifierBehavior, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "editor.rectSelectModifier", "key": "editor.rectSelectModifier",
@ -166,11 +161,6 @@
"key": "ShapeBuilder.LastPivotLocation", "key": "ShapeBuilder.LastPivotLocation",
"value": "{\"m_Value\":1}" "value": "{\"m_Value\":1}"
}, },
{
"type": "System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "SubdivideEdges.subdivisions",
"value": "{\"m_Value\":1}"
},
{ {
"type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "mesh.newShapePivotLocation", "key": "mesh.newShapePivotLocation",
@ -184,7 +174,7 @@
{ {
"type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "ShapeBuilder.LastSize", "key": "ShapeBuilder.LastSize",
"value": "{\"m_Value\":{\"x\":-0.4071826934814453,\"y\":0.2012939453125,\"z\":-0.5807037353515625}}" "value": "{\"m_Value\":{\"x\":0.248779296875,\"y\":-0.09796714782714844,\"z\":0.2877197265625}}"
}, },
{ {
"type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
@ -260,11 +250,6 @@
"type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", "type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "uv.uvEditorGridSnapIncrement", "key": "uv.uvEditorGridSnapIncrement",
"value": "{\"m_Value\":0.125}" "value": "{\"m_Value\":0.125}"
},
{
"type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "ExtrudeEdges.distance",
"value": "{\"m_Value\":0.5}"
} }
] ]
} }