Commit Graph

60 Commits

Author SHA1 Message Date
yzx 70fe60545e Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	U3D_DrivingSystem/Assets/Scenes/main_.unity
2023-12-20 14:22:28 +08:00
yzx 7d599cdc4c Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	U3D_DrivingSystem/AmplifyShaderEditor.csproj
#	U3D_DrivingSystem/Assembly-CSharp-Editor.csproj
#	U3D_DrivingSystem/Assembly-CSharp.csproj
#	U3D_DrivingSystem/Assets/GameAssets/Art/交通路标/Prefab/信号灯123.prefab
#	U3D_DrivingSystem/Assets/Scenes/main_.unity
#	U3D_DrivingSystem/Assets/UTS/Models/Crossroad_prefabs/New Semaphore Prefabs/One Way Semaphore.prefab.meta
#	U3D_DrivingSystem/Boxophobic.AtmosphericHeightFog.Editor.csproj
#	U3D_DrivingSystem/Boxophobic.AtmosphericHeightFog.Runtime.csproj
#	U3D_DrivingSystem/Boxophobic.Utils.Editor.csproj
#	U3D_DrivingSystem/Boxophobic.Utils.Scripts.csproj
#	U3D_DrivingSystem/U3D_DrivingSystem.sln
2023-12-20 14:21:03 +08:00
shengtao b3266903ce 修改交通信号灯 2023-12-20 14:18:43 +08:00
yzx ca325846d3 提交 2023-12-20 14:18:11 +08:00
shengtao 742925a6ad 更新材质球显示问题 2023-12-20 11:05:38 +08:00
shengtao 8de303e027 更新隧道地标线,修改路标 2023-12-19 22:08:04 +08:00
shengtao f6174ec5c1 交通信号灯 2023-12-19 21:39:06 +08:00
shengtao 90eb0d9d61 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	.gitignore
#	U3D_DrivingSystem/Assets/GameAssets/Art/Wet Roads.meta
#	U3D_DrivingSystem/Assets/UTS_PRO/Models/Cars/Car_Prefabs/Day Cars/Big_Bus.prefab
#	U3D_DrivingSystem/Assets/UTS_PRO/Models/Cars/Car_Prefabs/Day Cars/Car_1.prefab
#	U3D_DrivingSystem/Assets/UTS_PRO/Models/Cars/Car_Prefabs/Day Cars/Car_2.prefab
#	U3D_DrivingSystem/Assets/UTS_PRO/Models/Cars/Car_Prefabs/Day Cars/Car_3.prefab
#	U3D_DrivingSystem/Assets/UTS_PRO/Models/Cars/Car_Prefabs/Day Cars/Car_4.prefab
#	U3D_DrivingSystem/Assets/UTS_PRO/Models/Cars/Car_Prefabs/Day Cars/Car_5.prefab
#	U3D_DrivingSystem/Assets/UTS_PRO/Models/Cars/Car_Prefabs/Day Cars/Car_6.prefab
#	U3D_DrivingSystem/Assets/UTS_PRO/Models/Cars/Car_Prefabs/Day Cars/Car_7.prefab
2023-12-19 20:50:34 +08:00
shengtao 9f086da33e st修改20231219 2023-12-19 20:29:25 +08:00
shengtao a612471e6c 交通地标更新 2023-12-19 20:23:23 +08:00