Commit Graph

322 Commits

Author SHA1 Message Date
shengtao c9746847e2 tijiao 2023-12-28 10:16:17 +08:00
yzx 46fb6e8281 t 2023-12-28 10:09:07 +08:00
yzx ae5e87a66e t 2023-12-28 09:46:51 +08:00
yzx 422870bf50 t 2023-12-28 09:11:46 +08:00
yzx 8e4eef2b06 tttt 2023-12-27 21:24:47 +08:00
yzx 18442606c6 t 2023-12-27 17:58:41 +08:00
yzx aef9a4c3fd t 2023-12-27 17:56:29 +08:00
yzx 5c0fa4e9d0 t 2023-12-27 17:51:21 +08:00
yzx 0a9c36e8e1 t 2023-12-27 17:45:25 +08:00
yzx 1293e653e7 t 2023-12-27 17:34:21 +08:00
yzx 0211fecd5f t 2023-12-27 17:30:38 +08:00
yzx 37d65b05f0 t 2023-12-27 17:15:51 +08:00
yzx 1c21075190 t 2023-12-27 16:58:40 +08:00
yzx b38412a5a4 t 2023-12-27 16:45:24 +08:00
yzx 1d73d42814 tijiao 2023-12-27 16:40:53 +08:00
yzx ee78b04d51 tijiao 2023-12-27 16:27:32 +08:00
yzx 0ad73446c4 tijiao 2023-12-27 16:16:42 +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
yzx 016214ca06 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-27 15:14:16 +08:00
yzx 1673a9af19 tijiao 2023-12-27 15:14:10 +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
黄嘉宇 85c49c4f4b H碰撞添加2 2023-12-27 13:17:24 +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
yzx 26aba47c21 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	U3D_DrivingSystem/Logs/AssetImportWorker0.log
#	U3D_DrivingSystem/Logs/shadercompiler-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.exe15.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
2023-12-27 09:20:49 +08:00
yzx 345c27371b t 2023-12-27 09:19:44 +08:00
shengtao 376d9d0600 tijiao 2023-12-27 08:34:55 +08:00
yzx 0daa9a79bc tijiao 2023-12-26 21:33:05 +08:00
yzx 7117d80fd4 tijiao 2023-12-26 20:32:24 +08:00
shengtao 2a904d5e37 tijiao 2023-12-26 20:19:44 +08:00
shengtao 2157cf5cb4 a 2023-12-26 19:27:01 +08:00
yzx f9efbf0e3e tijiao 2023-12-26 18:57:36 +08:00
yzx 750ba5f1db tijiao 2023-12-26 18:51:08 +08:00
yzx fe48e9e022 tijiao 2023-12-26 18:05:10 +08:00
shengtao 2b25fc8c8c 提交碰撞 2023-12-26 17:46:48 +08:00
yzx 1e70ae3440 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	U3D_DrivingSystem/Assets/Scenes/main_.unity
2023-12-26 17:40:59 +08:00
yzx 1fec16c069 tijiao 2023-12-26 17:40:48 +08:00