Ciakon/racesm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git@ooftooft.net:Racesm

Browse Source 
# Conflicts:
#	Assets/Imported Assets/PolygonCity/Prefabs/Characters/Character_BusinessMan_Shirt_01.prefab
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json
#	Assets/Scenes/Racetrack.unity
#	Assets/Scenes/mini_racetrack3.unity
This commit is contained in:
magn9775
2024-04-24 10:54:42 +02:00
parent 31d0d32aa9 5d9eab1801
commit c1a33bbd8c
24 changed files with 5772 additions and 1535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1607
Assets/Scenes/DragRace.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Scenes/DragRace.unity.meta Normal file
View File

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

1948
Assets/Scenes/Racetrack mini.unity
View File

File diff suppressed because it is too large Load Diff

57
Assets/Scenes/Racetrack.unity
View File

@@ -1567,6 +1567,63 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3}
--- !u!1001 &4833200516469304011
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 473786254074528415, guid: 8358fa575ee4f2e44946d6172e10c6d5, type: 3}
propertyPath: m_Name
value: racetrack_4
objectReference: {fileID: 0}
- target: {fileID: 2992483127055826181, guid: 8358fa575ee4f2e44946d6172e10c6d5, type: 3}
propertyPath: m_LocalPosition.x
value: -120
objectReference: {fileID: 0}
- target: {fileID: 2992483127055826181, guid: 8358fa575ee4f2e44946d6172e10c6d5, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2992483127055826181, guid: 8358fa575ee4f2e44946d6172e10c6d5, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2992483127055826181, guid: 8358fa575ee4f2e44946d6172e10c6d5, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2992483127055826181, guid: 8358fa575ee4f2e44946d6172e10c6d5, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2992483127055826181, guid: 8358fa575ee4f2e44946d6172e10c6d5, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2992483127055826181, guid: 8358fa575ee4f2e44946d6172e10c6d5, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2992483127055826181, guid: 8358fa575ee4f2e44946d6172e10c6d5, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2992483127055826181, guid: 8358fa575ee4f2e44946d6172e10c6d5, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2992483127055826181, guid: 8358fa575ee4f2e44946d6172e10c6d5, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8358fa575ee4f2e44946d6172e10c6d5, type: 3}
--- !u!1001 &7921848799276681536
PrefabInstance:
m_ObjectHideFlags: 0

125
Assets/Scenes/mini_racetrack3.unity
View File

@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.29684302, g: 0.6337671, b: 0.9937157, a: 1}
m_IndirectSpecularColor: {r: 0.29684305, g: 0.63376737, b: 0.9937157, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -338,6 +338,46 @@ PrefabInstance:
propertyPath: m_Name
value: Camera
objectReference: {fileID: 0}
- target: {fileID: 1742803291406415280, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
propertyPath: Loader
value:
objectReference: {fileID: 776505354}
- target: {fileID: 1742803291406415280, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
propertyPath: TargetCar
value:
objectReference: {fileID: 1852564513}
- target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
propertyPath: m_LocalPosition.x
value: 0.8158076
objectReference: {fileID: 0}
- target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
propertyPath: m_LocalPosition.y
value: -1.1205094
objectReference: {fileID: 0}
- target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
propertyPath: m_LocalPosition.z
value: 63.561188
objectReference: {fileID: 0}
- target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
propertyPath: m_LocalRotation.y
value: 0.97014254
objectReference: {fileID: 0}
- target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
propertyPath: m_LocalRotation.z
value: -0.24253564
objectReference: {fileID: 0}
- target: {fileID: 5442577508303945574, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
propertyPath: m_Name
value: Camera
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -15575,6 +15615,89 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d5caff8338f793c4eb4490cc52546faf, type: 3}
--- !u!1 &1852564513
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1852564514}
- component: {fileID: 1852564516}
- component: {fileID: 1852564515}
m_Layer: 0
m_Name: Bulldozer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1852564514
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1852564513}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.561, y: 0.1, z: 1.304}
m_LocalScale: {x: 0.25, y: 0.25, z: 0.25}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1691573825}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1852564515
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1852564513}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 58d3a2623a4164b4bb25683edc176b03, type: 3}
m_Name:
m_EditorClassIdentifier:
motorTorque: 600
brakeTorque: 700
maxSpeed: 85
steeringRange: 30
steeringRangeAtMaxSpeed: 25
autoBrake: 500
audio: {fileID: 0}
rigidBody: {fileID: 0}
checkpointsCollected: 0
checkpoints: []
--- !u!54 &1852564516
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1852564513}
serializedVersion: 4
m_Mass: 4000
m_Drag: 0.01
m_AngularDrag: 0
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_ImplicitCom: 0
m_ImplicitTensor: 1
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!1001 &1903297572
PrefabInstance:
m_ObjectHideFlags: 0