shengtao eaa8abd788 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem ... # Conflicts: # U3D_DrivingSystem/Assembly-CSharp.csproj # U3D_DrivingSystem/Logs/AssetImportWorker0.log # U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe0.log # U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe1.log # U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe10.log # U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe11.log # U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe12.log # U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe13.log # U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe14.log # U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe2.log # U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe3.log # U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe4.log # U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe5.log # U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe6.log # U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe7.log # U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe8.log # U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe9.log # U3D_DrivingSystem/Temp/__Backupscenes/0.backup		2024-01-03 17:30:52 +08:00
..
ANIMALS FULL PACK	…
AmplifyShaderEditor	…
BOXOPHOBIC	t	2023-12-27 16:58:40 +08:00
EVP5	t	2024-01-03 17:29:17 +08:00
Font	t	2023-12-29 08:40:08 +08:00
GameAssets	Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem	2024-01-03 17:30:52 +08:00
Images	t	2023-12-28 15:51:03 +08:00
Materials	t	2023-12-28 15:51:03 +08:00
Models	…
Models 1	tijiao	2023-12-26 20:32:24 +08:00
Other_Plugins	…
Plugin	t	2024-01-03 17:29:17 +08:00
Plugins	…
Prefabs	tijiao	2023-12-25 14:28:49 +08:00
Resources	…
Scenes	t	2024-01-03 17:29:17 +08:00
Script	t	2024-01-03 17:29:17 +08:00
Storm Effects	tijiao	2024-01-02 21:24:05 +08:00
StreamingAssets	…
SuperSplinesPro	提交	2023-12-20 14:18:11 +08:00
Temp	…
TextMesh Pro	tijiao	2023-12-26 10:11:09 +08:00
UTS	tijiao	2024-01-02 20:34:14 +08:00
UTS_PRO	tijiao	2023-12-20 14:34:39 +08:00
_TerrainAutoUpgrade	t	2024-01-02 18:15:57 +08:00
111.unity	tijiao	2023-12-26 10:11:09 +08:00
111.unity.meta	tijiao	2023-12-26 10:11:09 +08:00
ANIMALS FULL PACK.meta	…
AmplifyShaderEditor.meta	…
BOXOPHOBIC.meta	…
EVP5.meta	…
Font.meta	…
GameAssets.meta	…
Images.meta	…
Materials.meta	…
Models 1.meta	tijiao	2023-12-27 13:18:57 +08:00
Models.meta	…
New Terrain 1.asset	…
New Terrain 1.asset.meta	…
New Terrain 2.asset	提交高速模型	2023-12-25 16:29:58 +08:00
New Terrain 2.asset.meta	提交高速模型	2023-12-25 16:29:58 +08:00
New Terrain 3.asset	提交高速模型	2023-12-25 16:29:58 +08:00
New Terrain 3.asset.meta	提交高速模型	2023-12-25 16:29:58 +08:00
New Terrain 4.asset	20231226H地形提交	2023-12-26 10:08:30 +08:00
New Terrain 4.asset.meta	提交高速模型	2023-12-25 16:29:58 +08:00
New Terrain 5.asset	t	2024-01-03 17:29:17 +08:00
New Terrain 5.asset.meta	t	2024-01-03 17:29:17 +08:00
New Terrain.asset	…
New Terrain.asset.meta	…
Other_Plugins.meta	…
Plugin.meta	…
Plugins.meta	…
Prefabs.meta	提交	2023-12-20 15:13:00 +08:00
Resources.meta	…
Scenes.meta	…
Script.meta	…
Storm Effects.meta	…
StreamingAssets.meta	…
SuperSplinesPro.meta	…
Temp.meta	…
TextMesh Pro.meta	…
UTS.meta	提交	2023-12-20 14:18:11 +08:00
UTS_PRO.meta	tijiao	2023-12-20 14:34:39 +08:00
_TerrainAutoUpgrade.meta	…
a.unity	…
a.unity.meta	…
diqiu.fbx	…
diqiu.fbx.meta	…
fxp.FBX	…
fxp.FBX.meta	…
蔚来Nio_ES8.FBX	…
蔚来Nio_ES8.FBX.meta	…