Commit Graph

76 Commits

Author SHA1 Message Date
shengtao 8adbef01b7 tijiao 2023-12-20 14:34:39 +08:00
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 59b03649a0 更新反射球 2023-12-20 09:23:02 +08:00
shengtao 1800d9df6e 更新交通标志 2023-12-19 23:05:45 +08:00
黄嘉宇 2e919543b7 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-19 22:45:21 +08:00
黄嘉宇 af299c5265 123 2023-12-19 22:45:09 +08:00
shengtao 8de303e027 更新隧道地标线,修改路标 2023-12-19 22:08:04 +08:00
黄嘉宇 564bd4870d Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-19 21:55:17 +08:00
黄嘉宇 412ffd1038 贴图更新20231219 2023-12-19 21:55:02 +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
yzx 660dd5e3ba 提交 2023-12-19 18:16:51 +08:00
shengtao f01b9a15ef 雨天路面材质球 2023-12-18 13:31:59 +08:00
shengtao 3075015db2 天气系统 2023-12-15 18:54:04 +08:00
shengtao 988e1c2a6e 更新天气特效 2023-12-15 14:56:16 +08:00
shengtao 2839a3d88c 更新 雨刮器动画,下雨场景玻璃特效材质,乡村地面贴图,高架位置调整,隧道及高架入口处人行道删除, 2023-12-14 15:33:40 +08:00
shengtao 271ea64623 11 2023-12-13 16:51:19 +08:00
yzx 7940a10af6 提交 2023-12-12 16:18:41 +08:00
黄嘉宇 15972a5514 材质名称修改 2023-12-08 14:45:08 +08:00
黄嘉宇 329f65a1ad 20231207重新创建项目 2023-12-07 19:00:13 +08:00