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/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta
#	Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_URP_v1.24.unitypackage.meta
#	Assets/ML-Agents/Timers/Car Customization_timers.json
#	Assets/ML-Agents/Timers/City racesm_timers.json.meta
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json
#	Assets/ML-Agents/Timers/WinScreen_timers.json.meta
#	Assets/Prefabs/Cars/Cars LLLLL.prefab.meta
#	Assets/Scenes/WinScreen.unity.meta
This commit is contained in:
Ciakon
2024-04-25 15:16:46 +02:00
parent 6d4ee04d60 3f8f7e0a37
commit 1aa075773f
40 changed files with 3908 additions and 1110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/Prefabs/Cars/Cars LLLLL.prefab.meta
View File

@@ -1,6 +1,11 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Prefabs/Cars/Cars LLLLL.prefab.meta
guid: bf357d804290737469459ec8ffeb6c7d
PrefabImporter:
========
guid: f7320b9acc0c07041a21a406416a5928
DefaultImporter:
>>>>>>>> 3f8f7e0a3765a7af3156232c0fa677c9758ce5d8:Assets/Scenes/WinScreen.unity.meta
externalObjects: {}
userData:
assetBundleName:

2
Assets/Prefabs/Cars/RaceCar.prefab
View File

@@ -400,7 +400,7 @@ GameObject:
- component: {fileID: 1459545008135898659}
- component: {fileID: 4029776548783016511}
m_Layer: 0
m_Name: RaceCar
m_Name: Racecar
m_TagString: Player
m_Icon: {fileID: 0}
m_NavMeshLayer: 0