Commit Graph

63 Commits

Author SHA1 Message Date
yzx 5e976092e6 提交 2023-12-20 18:02:27 +08:00
yzx 4c952c7393 提交 2023-12-20 16:44:01 +08:00
yzx fa33c384c1 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-20 15:13:13 +08:00
yzx 219ab6e2fe Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-20 15:13:05 +08:00
shengtao 94b533664f 更新贴图 2023-12-20 15:13:02 +08:00
yzx 5874dfe1aa 提交 2023-12-20 15:13:00 +08:00
shengtao 97af085ae0 提交场景文件 2023-12-20 15:00:46 +08:00
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 a8b6221284 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-20 14:18:56 +08:00
shengtao b3266903ce 修改交通信号灯 2023-12-20 14:18:43 +08:00
yzx ea56cacbab 提交 2023-12-20 14:18:42 +08:00
yzx ca325846d3 提交 2023-12-20 14:18:11 +08:00
yzx b477e87e93 提交 2023-12-20 11:25:42 +08:00
shengtao 742925a6ad 更新材质球显示问题 2023-12-20 11:05:38 +08:00
shengtao 0329195cfc 隐藏旧版红绿灯模型 2023-12-20 09:31:03 +08:00
shengtao c615369c79 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-20 09:24:55 +08:00
shengtao 59b03649a0 更新反射球 2023-12-20 09:23:02 +08:00
yzx 64dc47c7c5 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-20 08:52:51 +08:00
yzx cc9b56f3ad 提交 2023-12-20 08:52:46 +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 521e8fcf9b 提交 2023-12-19 18:20:15 +08:00
yzx 4c69877e34 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-19 18:16:59 +08:00
yzx 660dd5e3ba 提交 2023-12-19 18:16:51 +08:00
黄嘉宇 8ed677eb84 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-19 13:11:07 +08:00
黄嘉宇 8df7be5fca 20231219提交忽略列表更新 2023-12-19 13:10:59 +08:00
yzx c4e4e6b134 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-19 09:44:26 +08:00
yzx 50be979c9f 提交 2023-12-19 09:44:17 +08:00
黄嘉宇 716354b3f8 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-18 18:28:19 +08:00
黄嘉宇 307f69d598 20231218H插件 2023-12-18 18:26:48 +08:00
shengtao f01b9a15ef 雨天路面材质球 2023-12-18 13:31:59 +08:00
shengtao a7a65a038e 雾效文件 2023-12-15 19:14:55 +08:00
shengtao 2f226497d2 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-15 19:05:42 +08:00
shengtao d0204e8734 1215主场景 2023-12-15 19:03:19 +08:00
yzx efc8050b89 修改提交 2023-12-15 18:58:37 +08:00
shengtao 3075015db2 天气系统 2023-12-15 18:54:04 +08:00
shengtao 91f8cc8e53 更新汽车模型 2023-12-15 15:49:30 +08:00
yzx e075ddf579 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	U3D_DrivingSystem/Assets/Scenes/main_.unity
2023-12-15 14:58:32 +08:00
yzx 9a1c2e2f4a 添加UI 2023-12-15 14:58:12 +08:00
shengtao 988e1c2a6e 更新天气特效 2023-12-15 14:56:16 +08:00