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

Merge branch 'master' of ooftooft.net:Racesm

Browse Source 
# Conflicts:
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json.meta
This commit is contained in:
Ciakon
2024-04-12 13:28:50 +02:00
parent 045ba23fd7 1379afa15c
commit c38ce59409
3 changed files with 125 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Assets/Scenes/Racetrack mini.unity
View File

@@ -123,11 +123,6 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &16893714 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5711380006811689493, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
m_PrefabInstance: {fileID: 1427960684}
m_PrefabAsset: {fileID: 0}
--- !u!1 &19977952
GameObject:
m_ObjectHideFlags: 0
@@ -2600,6 +2595,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
m_PrefabInstance: {fileID: 443573514}
m_PrefabAsset: {fileID: 0}
--- !u!1 &820021813 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4599203270359476959, guid: d5caff8338f793c4eb4490cc52546faf, type: 3}
m_PrefabInstance: {fileID: 1930340722}
m_PrefabAsset: {fileID: 0}
--- !u!4 &860198821 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
@@ -4372,11 +4372,11 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 5418785709807611868, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_Enabled
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalPosition.x
value: 83.8
value: -40.8
objectReference: {fileID: 0}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalPosition.y
@@ -4384,7 +4384,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalPosition.z
value: -56.4
value: -5.8
objectReference: {fileID: 0}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalRotation.w
@@ -4590,15 +4590,15 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.x
value: 86.31581
value: -46.923958
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.y
value: -1.0605093
value: -0.8705056
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.z
value: -50.95881
value: -7.0643635
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.w
@@ -4606,7 +4606,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.x
value: 0.24253564
value: 0.24253562
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.y
@@ -4699,22 +4699,22 @@ PrefabInstance:
- target: {fileID: 8858152487650577344, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_Follow
value:
objectReference: {fileID: 1693759701}
objectReference: {fileID: 1930340723}
- target: {fileID: 8858152487650577344, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LookAt
value:
objectReference: {fileID: 1693759701}
objectReference: {fileID: 1930340723}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.x
value: 86.31581
value: -46.923958
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.y
value: -1.0605093
value: -0.8705056
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.z
value: -50.95881
value: -7.0643635
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.w
@@ -4722,7 +4722,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.x
value: 0.24253564
value: 0.24253562
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.y
@@ -4957,8 +4957,8 @@ PrefabInstance:
m_SourcePrefab: {fileID: 100100000, guid: ebee340de387f334f9ac44e044abd8fb, type: 3}
--- !u!4 &1693759701 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
m_PrefabInstance: {fileID: 1427960684}
m_CorrespondingSourceObject: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
m_PrefabInstance: {fileID: 1709776410}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1724690485
GameObject:
@@ -5931,3 +5931,4 @@ SceneRoots:
- {fileID: 1605662800}
- {fileID: 2105306304}
- {fileID: 753416033}
- {fileID: 1930340722}