Commit Graph

349 Commits

Author SHA1 Message Date
yzx d3f405b209 t 2024-01-02 10:53:10 +08:00
yzx ff824b4669 t 2024-01-02 09:53:06 +08:00
shengtao 85792b9c5c 雨天碰撞 2023-12-29 11:17:08 +08:00
shengtao 067967d41e tijiao 2023-12-29 10:30:01 +08:00
shengtao 1d9f261d5e 添加学校碰撞 2023-12-29 09:49:01 +08:00
shengtao 4f0f9f5557 tijiao 2023-12-29 09:34:52 +08:00
shengtao 182a183e3a tijiao 2023-12-29 09:26:54 +08:00
shengtao 5a4cf96a91 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-29 09:16:46 +08:00
shengtao e3236516ef tijiao 2023-12-29 09:15:36 +08:00
yzx 5872e1c70f t 2023-12-29 09:14:44 +08:00
yzx 2c76706992 t 2023-12-29 08:40:08 +08:00
yzx d345651007 t 2023-12-28 18:21:17 +08:00
yzx 76d8816085 t 2023-12-28 17:36:22 +08:00
shengtao 22f02d2ccb 提交信号灯 2023-12-28 17:28:49 +08:00
shengtao 3cc77c43d1 提交信号灯 2023-12-28 17:13:04 +08:00
shengtao 9675d4efa7 tijiao 2023-12-28 16:59:40 +08:00
shengtao 343dfda192 tijiao 2023-12-28 16:39:38 +08:00
shengtao 50970fff5d tijiao 2023-12-28 16:34:39 +08:00
shengtao a48cc036eb tijiao 2023-12-28 16:27:46 +08:00
shengtao 473e10a971 tijiao 2023-12-28 16:07:46 +08:00
shengtao f1c2f59930 tijiao 2023-12-28 16:02:36 +08:00
yzx eb718a7696 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	U3D_DrivingSystem/Assets/Scenes/main_.unity
2023-12-28 15:52:34 +08:00
yzx 5c8dd86671 t 2023-12-28 15:51:03 +08:00
shengtao a65532947c tijiao 2023-12-28 15:45:25 +08:00
shengtao c1fc489dd8 tijiao 2023-12-28 14:20:57 +08:00
shengtao 853caf0a66 tijiao 2023-12-28 13:12:45 +08:00
shengtao 5b46cab31e tijiao 2023-12-28 11:14:37 +08:00
shengtao 01ca77c641 tijiao 2023-12-28 11:00:03 +08:00
yzx 012efdc962 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-28 10:57:14 +08:00
yzx d861ac3977 t 2023-12-28 10:57:08 +08:00
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
shengtao 9bfc135739 tijiao 2023-12-26 17:27:06 +08:00
shengtao c257070df8 tijiao 2023-12-26 17:26:56 +08:00
shengtao 7ae911380a 场景提交 2023-12-26 17:26:41 +08:00
shengtao e9bf6899da tijiao 2023-12-26 16:59:24 +08:00
黄嘉宇 6b76173ca7 20231226H汽车prefab提交 2023-12-26 16:22:46 +08:00
shengtao d54a89718a tijiao 2023-12-26 13:54:15 +08:00
yzx a72f6e9825 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-26 13:29:56 +08:00
yzx 1b7dd6b7c0 tijiao 2023-12-26 13:29:38 +08:00
shengtao 27c78208bd Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-26 13:26:51 +08:00
yzx 234b98c440 tuijiao 2023-12-26 13:16:56 +08:00
shengtao 41a26142ac tijiao 2023-12-26 13:12:00 +08:00
shengtao c9abb6902a tijiao 2023-12-26 13:11:04 +08:00
yzx 585c819adf tijiao 2023-12-26 10:55:48 +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
黄嘉宇 bafedf0fe3 che 2023-12-25 21:39:23 +08:00
黄嘉宇 f70c45feb8 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-25 21:26:51 +08:00
黄嘉宇 e8db98c0de 20231225后视镜提交 2023-12-25 21:26:37 +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 53654f44ed 更新场景文件 2023-12-25 18:29:34 +08:00
黄嘉宇 f9c17701da 20231225雾天效果处理 2023-12-25 18:15:26 +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 7597b28ecf tijiao 2023-12-25 16:37:37 +08:00
shengtao b241927d98 tijiao 2023-12-25 16:37:13 +08:00
shengtao 2a2e950a51 tijiao 2023-12-25 16:36:32 +08:00
黄嘉宇 d146636315 20231225黄:场景更新 2023-12-25 16:35:36 +08:00
shengtao 454f1d864b 提交高速模型 2023-12-25 16:29:58 +08:00
shengtao 5f80189a82 tijiao 2023-12-25 15:08:43 +08:00
shengtao 559d5a9ce0 更新场景文件 2023-12-25 15:00:05 +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
yzx cfb5b4a1f9 tijiao 2023-12-25 14:33:52 +08:00
yzx aa58e020c3 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	U3D_DrivingSystem/Assets/Scenes/main_.unity
2023-12-25 14:29:07 +08:00
yzx 855bf98cf5 tijiao 2023-12-25 14:28:49 +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 a7995038e3 tijiao 2023-12-25 14:11:18 +08:00
shengtao 4fccda6a96 提交 2023-12-25 13:55:14 +08:00
shengtao 0d3c74364f 提交 2023-12-25 13:54:30 +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
shengtao d2780a6f6b 地形修改 2023-12-25 13:45:37 +08:00
黄嘉宇 2cb433bfd0 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-25 13:34:36 +08:00
黄嘉宇 585e031e64 20231225黄修改材质 2023-12-25 13:33:29 +08:00
yzx bfa68c7f04 tijiao 2023-12-25 13:32:51 +08:00
shengtao 22f4c96753 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-25 10:50:22 +08:00
shengtao 6f56b041b8 红绿灯倒计时模型 2023-12-25 10:50:13 +08:00
yzx 79d3eab0fb Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-25 08:55:49 +08:00
yzx 9865bce7c7 tijiao 2023-12-25 08:55:44 +08:00
shengtao 4f4581f394 tijiao 2023-12-25 08:55:01 +08:00
shengtao b0b2a15448 tijiao 2023-12-25 08:54:23 +08:00
shengtao 5e706a9e85 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-25 08:33:44 +08:00
shengtao 4ddb08e826 tijiao 2023-12-25 08:33:38 +08:00
shengtao 2a1d94866e 更新雪地贴图文件 2023-12-25 08:33:19 +08:00
shengtao 817ff070c8 提交 2023-12-24 19:17:40 +08:00
shengtao 0eb415259f 更新材质球 2023-12-24 19:17:20 +08:00
yzx 59e2373ce7 t 2023-12-24 18:02:00 +08:00
yzx 7d1ad772c9 提交 2023-12-24 17:42:15 +08:00
shengtao 8268e06139 更新车灯参数 2023-12-24 16:53:55 +08:00
shengtao fcd80a3d50 更新车灯 2023-12-24 16:34:43 +08:00