Commit Graph

108 Commits

Author SHA1 Message Date
yzx b38412a5a4 t 2023-12-27 16:45:24 +08:00
yzx 1e4febc98f Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-27 16:09:08 +08:00
yzx 959a760171 tijiao 2023-12-27 16:09:04 +08:00
shengtao 1ea8b11e52 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-27 15:25:37 +08:00
shengtao 87ca646b79 tijiao 2023-12-27 15:19:31 +08:00
yzx 2db928f303 tijiao 2023-12-27 15:15:58 +08:00
shengtao 62ea78a9e6 更新预设 2023-12-27 14:52:34 +08:00
shengtao 6899b48c2c tijiao 2023-12-27 14:28:52 +08:00
黄嘉宇 049ac37de7 20231227H碰撞体添加3 2023-12-27 14:19:25 +08:00
黄嘉宇 b5a2bbd54b Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-27 13:47:16 +08:00
黄嘉宇 13ed53243d 20231227H雾天更改 2023-12-27 13:41:37 +08:00
yzx 0b912e9f55 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-27 13:19:01 +08:00
yzx 5ece677e10 tijiao 2023-12-27 13:18:57 +08:00
黄嘉宇 2c63b5b2cd 20231227H场景提交 2023-12-27 13:12:29 +08:00
黄嘉宇 c8dbe8df67 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	U3D_DrivingSystem/Assets/GameAssets/Art/建筑模型/xcmodel/gaojia/雨天gaosu.prefab
2023-12-27 11:07:20 +08:00
黄嘉宇 bf3ee4c0fd 20231227碰撞体添加 2023-12-27 11:05:43 +08:00
shengtao 8dc66b495b 提交电瓶车动画 2023-12-27 10:47:41 +08:00
shengtao f62f65bb2a tijiao 2023-12-27 10:11:35 +08:00
shengtao 2a904d5e37 tijiao 2023-12-26 20:19:44 +08:00
shengtao 2157cf5cb4 a 2023-12-26 19:27:01 +08:00
shengtao 2b25fc8c8c 提交碰撞 2023-12-26 17:46:48 +08:00
shengtao 9bfc135739 tijiao 2023-12-26 17:27:06 +08:00
shengtao c257070df8 tijiao 2023-12-26 17:26:56 +08:00
shengtao e9bf6899da tijiao 2023-12-26 16:59:24 +08:00
shengtao d54a89718a tijiao 2023-12-26 13:54:15 +08:00
shengtao 27c78208bd Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-26 13:26:51 +08:00
shengtao c9abb6902a tijiao 2023-12-26 13:11:04 +08:00
yzx 89d19661a0 tijiao 2023-12-26 10:50:13 +08:00
yzx 9afc37a146 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	U3D_DrivingSystem/Assembly-CSharp.csproj
#	U3D_DrivingSystem/Assets/Scenes/main_.unity
2023-12-26 10:11:33 +08:00
yzx 58d8b150fe tijiao 2023-12-26 10:11:09 +08:00
黄嘉宇 0ac5c720d1 20231226H地形提交 2023-12-26 10:08:30 +08:00
shengtao 6c1a333212 tijiao 2023-12-26 08:39:56 +08:00
shengtao 42aeebb49d 更新场景文件 2023-12-25 22:31:28 +08:00
shengtao fca870edf2 更新场景文件 2023-12-25 21:54:09 +08:00
shengtao d5deb81278 提交场景文件 2023-12-25 21:08:36 +08:00
shengtao 5511f3d5e1 提交场景文件 2023-12-25 20:27:43 +08:00
shengtao 39a809c292 更新场景文件 2023-12-25 19:48:05 +08:00
shengtao e5a5d8e52f tijiao 2023-12-25 19:25:52 +08:00
shengtao 9f24a9d126 更新出口牌子 2023-12-25 17:50:16 +08:00
shengtao 2612f311e7 更新雨雪天气高速场景 2023-12-25 17:30:36 +08:00
shengtao b7040d3998 更新高速公路模型 2023-12-25 17:20:10 +08:00
shengtao 2a2e950a51 tijiao 2023-12-25 16:36:32 +08:00
shengtao 454f1d864b 提交高速模型 2023-12-25 16:29:58 +08:00
shengtao 5f80189a82 tijiao 2023-12-25 15:08:43 +08:00
shengtao ed538acb84 tijiao 2023-12-25 14:47:04 +08:00
shengtao e735ac97c6 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	U3D_DrivingSystem/Assets/Scenes/main_.unity
2023-12-25 14:40:33 +08:00
shengtao c2f36e56b6 提交 2023-12-25 14:38:34 +08:00
黄嘉宇 cef35fa8b3 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-25 14:26:09 +08:00
黄嘉宇 517f2cbf8b 20231225红绿灯更新 2023-12-25 14:20:32 +08:00
shengtao 954014bf30 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	U3D_DrivingSystem/Assets/Scenes/main_.unity
2023-12-25 13:45:51 +08:00