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/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta
#	Assets/Prefabs/Car customization.meta
#	Assets/Prefabs/Towers.prefab.meta
This commit is contained in:
Ciakon
2024-04-22 14:13:11 +02:00
parent 073ada93dc 7cdc6e8c07
commit f6993a8a92
45 changed files with 24759 additions and 4781 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4450
Assets/Scenes/City racesm.unity
View File

File diff suppressed because it is too large Load Diff

14
Assets/Scenes/Racetrack mini.unity
View File

@@ -26380,7 +26380,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 5026680989480309367, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3}
propertyPath: m_LocalPosition.x
value: 63.980003
value: 63.98133
objectReference: {fileID: 0}
- target: {fileID: 5026680989480309367, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3}
propertyPath: m_LocalPosition.y
@@ -26388,23 +26388,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5026680989480309367, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3}
propertyPath: m_LocalPosition.z
value: 15.92
value: 15.918674
objectReference: {fileID: 0}
- target: {fileID: 5026680989480309367, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3}
propertyPath: m_LocalRotation.w
value: 1
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 5026680989480309367, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5026680989480309367, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: 0.70710677
objectReference: {fileID: 0}
- target: {fileID: 5026680989480309367, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5026680989480309367, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -26412,7 +26412,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5026680989480309367, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
value: 90
objectReference: {fileID: 0}
- target: {fileID: 5026680989480309367, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3}
propertyPath: m_LocalEulerAnglesHint.z

6165
Assets/Scenes/SampleScene.unity
View File

File diff suppressed because it is too large Load Diff

234
Assets/Scenes/mini_racetrack3.unity
View File

@@ -133,15 +133,15 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.x
value: 1.7604516
value: 2.5158076
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.y
value: -1.0005093
value: -1.1205094
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.z
value: 3.2876577
value: 5.4411907
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.w
@@ -151,6 +151,14 @@ PrefabInstance:
propertyPath: m_LocalRotation.x
value: 0.24253564
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 679652745285801860, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: field of view
value: 60.000004
@@ -202,22 +210,22 @@ PrefabInstance:
- target: {fileID: 8858152487650577344, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_Follow
value:
objectReference: {fileID: 882357479}
objectReference: {fileID: 923696411}
- target: {fileID: 8858152487650577344, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LookAt
value:
objectReference: {fileID: 882357479}
objectReference: {fileID: 923696411}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.x
value: 1.7604516
value: 2.5158076
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.y
value: -1.0005093
value: -1.1205094
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.z
value: 3.2876577
value: 5.4411907
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.w
@@ -227,17 +235,20 @@ PrefabInstance:
propertyPath: m_LocalRotation.x
value: 0.24253564
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
--- !u!4 &882357479 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5565175454309397639, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
m_PrefabInstance: {fileID: 1265965897}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1265965897
--- !u!1001 &923696410
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@@ -245,191 +256,60 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 283885967672592924, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_LocalScale.x
value: 0.9
objectReference: {fileID: 0}
- target: {fileID: 283885967672592924, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_LocalScale.y
value: 0.9
objectReference: {fileID: 0}
- target: {fileID: 283885967672592924, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_LocalScale.z
value: 0.9
objectReference: {fileID: 0}
- target: {fileID: 768543784266837145, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_Mass
value: 1000
objectReference: {fileID: 0}
- target: {fileID: 768543784266837145, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_ImplicitCom
value: 0
objectReference: {fileID: 0}
- target: {fileID: 768543784266837145, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_CenterOfMass.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 768543784266837145, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_CenterOfMass.y
value: -0.1
objectReference: {fileID: 0}
- target: {fileID: 768543784266837145, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_CenterOfMass.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1739861980487160315, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_LocalScale.x
value: 0.9
objectReference: {fileID: 0}
- target: {fileID: 1739861980487160315, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_LocalScale.y
value: 0.9
objectReference: {fileID: 0}
- target: {fileID: 1739861980487160315, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_LocalScale.z
value: 0.9
objectReference: {fileID: 0}
- target: {fileID: 1863415744062200281, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_LocalPosition.z
value: -3.62
objectReference: {fileID: 0}
- target: {fileID: 2069003514662564439, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_Radius
value: 0.39
objectReference: {fileID: 0}
- target: {fileID: 2364172432862723658, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_Radius
value: 0.39
objectReference: {fileID: 0}
- target: {fileID: 2505505705192865268, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_Radius
value: 0.39
objectReference: {fileID: 0}
- target: {fileID: 2512004550964339037, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalPosition.x
value: -0.7553561
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2512004550964339037, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalPosition.y
value: 0.12
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2512004550964339037, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalPosition.z
value: -2.479533
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2512004550964339037, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2512004550964339037, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2512004550964339037, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2512004550964339037, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2512004550964339037, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2512004550964339037, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2512004550964339037, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2724714051903115820, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_Radius
value: 0.39
objectReference: {fileID: 0}
- target: {fileID: 3215011110178234759, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_LocalScale.x
value: 0.9
objectReference: {fileID: 0}
- target: {fileID: 3215011110178234759, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_LocalScale.y
value: 0.9
objectReference: {fileID: 0}
- target: {fileID: 3215011110178234759, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_LocalScale.z
value: 0.9
objectReference: {fileID: 0}
- target: {fileID: 4276814187346689308, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_LocalScale.x
value: 0.9
objectReference: {fileID: 0}
- target: {fileID: 4276814187346689308, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_LocalScale.y
value: 0.9
objectReference: {fileID: 0}
- target: {fileID: 4276814187346689308, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_LocalScale.z
value: 0.9
objectReference: {fileID: 0}
- target: {fileID: 4276814188849811676, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_LocalScale.x
value: 0.9
objectReference: {fileID: 0}
- target: {fileID: 4276814188849811676, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_LocalScale.y
value: 0.9
objectReference: {fileID: 0}
- target: {fileID: 4276814188849811676, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_LocalScale.z
value: 0.9
objectReference: {fileID: 0}
- target: {fileID: 4635384822206797428, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
- target: {fileID: 5711380006811689493, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_Name
value: Truck
objectReference: {fileID: 0}
- target: {fileID: 5061132905868936189, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: maxSpeed
value: 500
objectReference: {fileID: 0}
- target: {fileID: 5061132905868936189, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5061132905868936189, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: motorTorque
value: 500
objectReference: {fileID: 0}
- target: {fileID: 5224662074486390016, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_Radius
value: 0.39
objectReference: {fileID: 0}
- target: {fileID: 8258125708975322693, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_LocalScale.x
value: 0.9
objectReference: {fileID: 0}
- target: {fileID: 8258125708975322693, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_LocalScale.y
value: 0.9
objectReference: {fileID: 0}
- target: {fileID: 8258125708975322693, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_LocalScale.z
value: 0.9
objectReference: {fileID: 0}
- target: {fileID: 8427123004766533763, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_Radius
value: 0.39
objectReference: {fileID: 0}
- target: {fileID: 8455621397692842305, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
propertyPath: m_Enabled
value: 1
value: Hotrod
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e7761d102bda0a1489c474fc5bd35a47, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
--- !u!4 &923696411 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
m_PrefabInstance: {fileID: 923696410}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1903297572
PrefabInstance:
m_ObjectHideFlags: 0
@@ -438,6 +318,26 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 769902918936789508, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1469675059208726835, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 97942cb5527e6f24eb8b8f5c86f8744d, type: 2}
- target: {fileID: 3425266780126093186, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: ac4517348fefb604bbf10afeb378a491, type: 2}
- target: {fileID: 5361385526453860773, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 97942cb5527e6f24eb8b8f5c86f8744d, type: 2}
- target: {fileID: 6468709298929742289, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 97942cb5527e6f24eb8b8f5c86f8744d, type: 2}
- target: {fileID: 7708173528503215869, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3}
propertyPath: m_Name
value: Racetrack3
@@ -504,5 +404,5 @@ SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 1903297572}
- {fileID: 1265965897}
- {fileID: 507129824}
- {fileID: 923696410}