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

2024-04-05 11:23:32 +02:00
parent 8f172daaf3 3516d278af
commit bf8a51d8f4
7 changed files with 1166 additions and 385 deletions
--- a/Assets/Scenes/AI
+++ b/Assets/Scenes/AI
--- a/Assets/Scenes/Racetrack.unity
+++ b/Assets/Scenes/Racetrack.unity
@@ -215,7 +215,7 @@ Transform:
  - {fileID: 751456478}
  - {fileID: 629087641}
  - {fileID: 1145562278}
-  - {fileID: 1088066121}
+  - {fileID: 860198821}
  - {fileID: 1635095405}
  - {fileID: 1025042666}
  - {fileID: 1138161466}
@@ -1305,6 +1305,11 @@ PrefabInstance:
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 3b4743a43e04ed145b531ab0f1ae828b, type: 3}
+--- !u!4 &860198821 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+  m_PrefabInstance: {fileID: 1780442170}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &998120851
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -1523,11 +1528,6 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!4 &1088066121 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
-  m_PrefabInstance: {fileID: 1724141139}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &1094507455 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
@@ -1943,6 +1943,58 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 1622538813048051039, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1622538813048051039, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1622538813048051039, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1622538813048051039, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1622538813048051039, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1622538813048051039, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5369804226306402415, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5369804226306402415, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5369804226306402415, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5369804226306402415, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5369804226306402415, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5369804226306402415, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5369804226306402415, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 8536954112421410267, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
      propertyPath: m_Name
      value: Straight_track (1)
@@ -2856,67 +2908,6 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
  m_PrefabInstance: {fileID: 1570995265}
  m_PrefabAsset: {fileID: 0}
--- !u!1001 &1724141139
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 19977953}
-    m_Modifications:
-    - target: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 60
-      objectReference: {fileID: 0}
-    - target: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -30
-      objectReference: {fileID: 0}
-    - target: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 90
-      objectReference: {fileID: 0}
-    - target: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2627034866460223847, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
-      propertyPath: m_Mesh
-      value: 
-      objectReference: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
-    - target: {fileID: 8536954112421410267, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
-      propertyPath: m_Name
-      value: Straight_track (14)
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
 --- !u!1 &1724690485
 GameObject:
  m_ObjectHideFlags: 0
@@ -3081,6 +3072,63 @@ Transform:
  - {fileID: 1724690486}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1780442170
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 19977953}
+    m_Modifications:
+    - target: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 60
+      objectReference: {fileID: 0}
+    - target: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -30
+      objectReference: {fileID: 0}
+    - target: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 90
+      objectReference: {fileID: 0}
+    - target: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8536954112421410267, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
+      propertyPath: m_Name
+      value: Straight_track (7)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
 --- !u!1001 &1781861283
 PrefabInstance:
  m_ObjectHideFlags: 0