 shengtao
|
16e5fc621e
|
tijiao
|
2024-01-03 18:11:11 +08:00 |
|
shengtao
|
9d4e2b4e06
|
tijiao
|
2024-01-03 18:07:25 +08:00 |
|
shengtao
|
eaa8abd788
|
Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
# U3D_DrivingSystem/Assembly-CSharp.csproj
# U3D_DrivingSystem/Logs/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.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
# U3D_DrivingSystem/Temp/__Backupscenes/0.backup
|
2024-01-03 17:30:52 +08:00 |
|
shengtao
|
6eb77b5a04
|
t
|
2024-01-03 17:30:31 +08:00 |
|
shengtao
|
49bf8fd00e
|
t
|
2024-01-03 17:29:17 +08:00 |
|
shengtao
|
74e7a4a40d
|
Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
# U3D_DrivingSystem/Assets/GameAssets/Art/交通路标/Prefab/交通信号.prefab
|
2024-01-03 17:05:11 +08:00 |
|
shengtao
|
8bdbb60f96
|
tijiao
|
2024-01-03 16:59:13 +08:00 |
|
shengtao
|
ddcbfff300
|
tijiao
|
2024-01-03 16:57:52 +08:00 |
yzx
|
9a50d38a12
|
Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
# U3D_DrivingSystem/Assets/GameAssets/Art/建筑模型/收费站/Materials/M_05___Default.mat.meta
|
2024-01-03 16:57:43 +08:00 |
|
yzx
|
83fe8ef309
|
t
|
2024-01-03 16:57:23 +08:00 |
|
shengtao
|
e865d61b8c
|
触发器提交
|
2024-01-03 16:56:39 +08:00 |
|
shengtao
|
f0ba929764
|
更新收费站ETC标识
|
2024-01-03 14:19:50 +08:00 |
|
shengtao
|
6bac650c64
|
tijiao
|
2024-01-03 08:36:13 +08:00 |
|
yzx
|
098f9634b3
|
202412修改
Signed-off-by: yzx <ifeijia@qq.com>
|
2024-01-02 22:27:40 +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 |
|
shengtao
|
a65532947c
|
tijiao
|
2023-12-28 15:45:25 +08:00 |
|
shengtao
|
c1fc489dd8
|
tijiao
|
2023-12-28 14:20:57 +08:00 |
|
shengtao
|
5b46cab31e
|
tijiao
|
2023-12-28 11:14:37 +08:00 |
|
shengtao
|
01ca77c641
|
tijiao
|
2023-12-28 11:00:03 +08:00 |
 黄嘉宇
|
049ac37de7
|
20231227H碰撞体添加3
|
2023-12-27 14:19:25 +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 |
|
黄嘉宇
|
517f2cbf8b
|
20231225红绿灯更新
|
2023-12-25 14:20:32 +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 |
|
shengtao
|
6f56b041b8
|
红绿灯倒计时模型
|
2023-12-25 10:50:13 +08:00 |
|
shengtao
|
0eb415259f
|
更新材质球
|
2023-12-24 19:17:20 +08:00 |
|
shengtao
|
f75b555ba4
|
tijiao
|
2023-12-24 14:31:18 +08:00 |
|
shengtao
|
7b8434907c
|
no message
|
2023-12-21 18:43:16 +08:00 |
|
shengtao
|
6b57dc2408
|
更新红绿灯P牌问题，乡村通往城市道路两边护栏修改，部分模型贴图丢失问题修改，
|
2023-12-21 15:19:41 +08:00 |
|
shengtao
|
94b533664f
|
更新贴图
|
2023-12-20 15:13:02 +08:00 |
|
shengtao
|
97af085ae0
|
提交场景文件
|
2023-12-20 15:00:46 +08:00 |
|
shengtao
|
b3266903ce
|
修改交通信号灯
|
2023-12-20 14:18:43 +08:00 |
|
shengtao
|
742925a6ad
|
更新材质球显示问题
|
2023-12-20 11:05:38 +08:00 |
|
shengtao
|
8de303e027
|
更新隧道地标线，修改路标
|
2023-12-19 22:08:04 +08:00 |
|
shengtao
|
f6174ec5c1
|
交通信号灯
|
2023-12-19 21:39:06 +08:00 |
|
shengtao
|
a612471e6c
|
交通地标更新
|
2023-12-19 20:23:23 +08:00 |