Merge branch 'master' of ooftooft.net:Racesm

2024-04-23 08:35:00 +02:00
parent bec6c88a63 6979490b55
commit 8049affcce
8 changed files with 5385 additions and 253 deletions
--- a/Assets/Images/Car
+++ b/Assets/Images/Car
@@ -1,6 +1,10 @@
 fileFormatVersion: 2
+<<<<<<< HEAD:Assets/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta
+guid: 8c4ea7980396ef44790197912891dea8
+=======
 guid: d5d570160164b804ca24a36b21a621db
 folderAsset: yes
+>>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92:Assets/Images/Car Icons.meta
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Free/URP_Support/URP/URP_Standard.unitypackage.meta
+++ b/Free/URP_Support/URP/URP_Standard.unitypackage.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+<<<<<<< HEAD:Assets/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta
+guid: d884527f3e242c144af52b11faf49d2f
+=======
+guid: d5d570160164b804ca24a36b21a621db
+folderAsset: yes
+>>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92:Assets/Images/Car Icons.meta
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Vehicles/Textures/Gradient/Materials.meta
+++ b/Vehicles/Textures/Gradient/Materials.meta
@@ -1,7 +1,12 @@
 fileFormatVersion: 2
+<<<<<<< HEAD:Assets/ML-Agents/Timers/SampleScene_timers.json.meta
+guid: 604fbff49b150b941bdc2ebd21de54e8
+TextScriptImporter:
+=======
 guid: 27000db5eaa3d9f42bceff430c265d3a
 folderAsset: yes
 DefaultImporter:
+>>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92:Assets/Imported Assets/Toon Vehicles/Textures/Gradient/Materials.meta
  externalObjects: {}
  userData: 
  assetBundleName: 
--- a/Assets/ML-Agents/Timers/SampleScene_timers.json.meta
+++ b/Assets/ML-Agents/Timers/SampleScene_timers.json.meta
@@ -1,6 +1,21 @@
 fileFormatVersion: 2
-guid: 346e9f2550a219244aeff3bf857e8b41
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD:Assets/ML-Agents/Timers/SampleScene_timers.json.meta
+guid: 4af2646cae3014146bf467e2830fdb41
 TextScriptImporter:
+=======
+guid: 27000db5eaa3d9f42bceff430c265d3a
+folderAsset: yes
+DefaultImporter:
+>>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92:Assets/Imported Assets/Toon Vehicles/Textures/Gradient/Materials.meta
+=======
+guid: 346e9f2550a219244aeff3bf857e8b41
+=======
+guid: 4d57ab7f0c619e9439665e6de75b5d44
+>>>>>>> 9f8c2c1d8177a6b47862a1b23538206e355848a2
+TextScriptImporter:
+>>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92
  externalObjects: {}
  userData: 
  assetBundleName: 
--- a/Assets/Scenes/mini_racetrack3.unity
+++ b/Assets/Scenes/mini_racetrack3.unity
@@ -38,7 +38,7 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.29684305, g: 0.63376737, b: 0.9937157, a: 1}
+  m_IndirectSpecularColor: {r: 0.29684302, g: 0.6337671, b: 0.9937157, a: 1}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -123,6 +123,11 @@ NavMeshSettings:
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
+--- !u!4 &50605733 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+  m_PrefabInstance: {fileID: 993115565}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &507129824
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -133,7 +138,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 2.5158076
+      value: 0.8158076
      objectReference: {fileID: 0}
    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalPosition.y
@@ -141,23 +146,23 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalPosition.z
-      value: 5.4411907
+      value: 63.561188
      objectReference: {fileID: 0}
    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.97014254
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0.24253564
+      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalRotation.y
-      value: -0
+      value: 0.97014254
      objectReference: {fileID: 0}
    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalRotation.z
-      value: -0
+      value: -0.24253564
      objectReference: {fileID: 0}
    - target: {fileID: 679652745285801860, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: field of view
@@ -217,7 +222,7 @@ PrefabInstance:
      objectReference: {fileID: 923696411}
    - target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 2.5158076
+      value: 0.8158076
      objectReference: {fileID: 0}
    - target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalPosition.y
@@ -225,23 +230,23 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalPosition.z
-      value: 5.4411907
+      value: 63.561188
      objectReference: {fileID: 0}
    - target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.97014254
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0.24253564
+      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalRotation.y
-      value: -0
+      value: 0.97014254
      objectReference: {fileID: 0}
    - target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalRotation.z
-      value: -0
+      value: -0.24253564
      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
@@ -258,7 +263,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 0
+      value: -1.7
      objectReference: {fileID: 0}
    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
      propertyPath: m_LocalPosition.y
@@ -266,11 +271,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
      propertyPath: m_LocalPosition.z
-      value: 0
+      value: 55.12
      objectReference: {fileID: 0}
    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
      propertyPath: m_LocalRotation.x
@@ -278,7 +283,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
      propertyPath: m_LocalRotation.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
      propertyPath: m_LocalRotation.z
@@ -290,7 +295,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
+      value: 180
      objectReference: {fileID: 0}
    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
      propertyPath: m_LocalEulerAnglesHint.z
@@ -310,6 +315,152 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
  m_PrefabInstance: {fileID: 923696410}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &993115565
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2315850889160409376, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 2315850889160409376, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2315850889160409376, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -4.0000005
+      objectReference: {fileID: 0}
+    - target: {fileID: 6776445221154225130, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_Name
+      value: Towers
+      objectReference: {fileID: 0}
+    - target: {fileID: 9003798636308242673, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -9.000002
+      objectReference: {fileID: 0}
+    - target: {fileID: 9003798636308242673, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9003798636308242673, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -9.75
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1500534166}
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+--- !u!1001 &1500534165
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 50605733}
+    m_Modifications:
+    - target: {fileID: 5180858929285816000, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 5.16
+      objectReference: {fileID: 0}
+    - target: {fileID: 5180858929285816000, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 4.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5180858929285816000, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -2.1699998
+      objectReference: {fileID: 0}
+    - target: {fileID: 5180858929285816000, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 5180858929285816000, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5180858929285816000, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.70710677
+      objectReference: {fileID: 0}
+    - target: {fileID: 5180858929285816000, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5180858929285816000, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5180858929285816000, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 90
+      objectReference: {fileID: 0}
+    - target: {fileID: 5180858929285816000, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5525295603368428666, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+      propertyPath: m_Name
+      value: ComPlaneV1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+--- !u!4 &1500534166 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5180858929285816000, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+  m_PrefabInstance: {fileID: 1500534165}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1903297572
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -406,3 +557,4 @@ SceneRoots:
  - {fileID: 1903297572}
  - {fileID: 507129824}
  - {fileID: 923696410}
+  - {fileID: 993115565}
--- a/Assets/Tower_Fall
+++ b/Assets/Tower_Fall
--- a/Assets/Tower_Fall
+++ b/Assets/Tower_Fall
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 28a67afe409d1c34b962f60fbd4676cd
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Tower_Fall.anim
+++ b/Assets/Tower_Fall.anim