Commit Graph

330 Commits

Author SHA1 Message Date
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
yzx 1d08462928 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-24 16:09:46 +08:00
yzx 0b6ea93017 提交 2023-12-24 16:09:42 +08:00
shengtao 758e298b58 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	U3D_DrivingSystem/Assets/Scenes/main_.unity
2023-12-24 14:35:07 +08:00
shengtao d4a042c406 tijiao 2023-12-24 14:34:39 +08:00
shengtao f75b555ba4 tijiao 2023-12-24 14:31:18 +08:00
yzx 7091841463 t 2023-12-24 14:24:58 +08:00
yzx aa3558e4a6 提交 2023-12-24 14:24:13 +08:00
shengtao 25e93def0e Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-24 11:24:48 +08:00
shengtao 447a65d04a 集市模型更新 2023-12-24 11:23:31 +08:00
yzx b08dbf7be4 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-22 18:10:07 +08:00
yzx 7ecbdab97a 提交 2023-12-22 18:10:03 +08:00
shengtao b631670946 更新交通标志 2023-12-22 17:15:22 +08:00
shengtao ce408baab3 更新学校场景,红旗材质 2023-12-22 16:11:00 +08:00
yzx 120f0fcb52 提交 2023-12-22 13:46:41 +08:00
yzx 7ea6ef5529 提交 2023-12-22 10:50:53 +08:00
yzx 984bc9a853 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	U3D_DrivingSystem/Assets/Scenes/main_.unity
2023-12-22 09:23:28 +08:00
yzx cef23b428f 提交 2023-12-22 09:23:17 +08:00
shengtao 7b8434907c no message 2023-12-21 18:43:16 +08:00
yzx 044fda62a5 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	U3D_DrivingSystem/Assets/Scenes/main_.unity
2023-12-21 18:03:50 +08:00
yzx dafe35f893 提交 2023-12-21 18:03:36 +08:00
shengtao 70af009764 更新雪天场景 2023-12-21 17:34:07 +08:00
shengtao ba51257a92 设置后处理 2023-12-21 16:31:10 +08:00
yzx 2532528d63 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	U3D_DrivingSystem/Assets/Scenes/main_.unity
2023-12-21 16:05:55 +08:00
yzx ab1e7a3abc tijiao 2023-12-21 16:05:29 +08:00
shengtao 4da3fb3356 更新材质贴图 2023-12-21 16:00:25 +08:00
shengtao e6487724dc 更新场景文件 2023-12-21 15:49:20 +08:00
shengtao e9a09e2ecf 更新场景文件 2023-12-21 15:36:27 +08:00
shengtao 6b57dc2408 更新红绿灯P牌问题,乡村通往城市道路两边护栏修改,部分模型贴图丢失问题修改, 2023-12-21 15:19:41 +08:00
shengtao 6f165a4510 更新丢失的贴图文件 2023-12-21 11:33:48 +08:00
yzx c40421943b tijiao 2023-12-21 09:12:12 +08:00
yzx 93bdeba6ed Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-20 21:18:33 +08:00
yzx d026dad85e 提交 2023-12-20 21:18:29 +08:00
shengtao 517297565e 更新材质球 2023-12-20 19:45:10 +08:00
shengtao 06d9ab730c no message 2023-12-20 19:26:26 +08:00
shengtao 114eaa9e0c 天气贴图 2023-12-20 19:22:27 +08:00
shengtao b26b366b9e Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	U3D_DrivingSystem/Assets/EVP5/car-wiper-master/Assets/CarWiper/Arts/NormalRainDrops.mat
2023-12-20 18:08:15 +08:00
shengtao 827e372a24 提交 2023-12-20 18:07:44 +08:00
yzx 5098f54034 提交 2023-12-20 18:06:33 +08:00
yzx 9769a447cd 提交 2023-12-20 18:03:55 +08:00
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 660dd5e3ba 提交 2023-12-19 18:16:51 +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 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
yzx 3c4292963c 添加红绿灯控制 2023-12-14 18:10:55 +08:00
yzx ea223837e5 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	U3D_DrivingSystem/Assets/Scenes/main_.unity
2023-12-14 15:41:50 +08:00
yzx a623121d13 提交 2023-12-14 15:41:25 +08:00
shengtao 2839a3d88c 更新 雨刮器动画,下雨场景玻璃特效材质,乡村地面贴图,高架位置调整,隧道及高架入口处人行道删除, 2023-12-14 15:33:40 +08:00
yzx 4841cd0128 更新 2023-12-13 17:49:06 +08:00
shengtao 271ea64623 11 2023-12-13 16:51:19 +08:00
shengtao 3397f66c0e 替换汽车模型 2023-12-13 16:49:55 +08:00
yzx b65dd9f70c 提交 2023-12-13 13:35:25 +08:00
yzx 7940a10af6 提交 2023-12-12 16:18:41 +08:00
黄嘉宇 4f18486597 20231208场景修改 2023-12-08 15:56:09 +08:00
黄嘉宇 15972a5514 材质名称修改 2023-12-08 14:45:08 +08:00
黄嘉宇 0c600bc586 123 2023-12-07 23:48:38 +08:00
黄嘉宇 329f65a1ad 20231207重新创建项目 2023-12-07 19:00:13 +08:00