yzx
|
36da27daaf
|
t
|
2024-01-04 11:27:47 +08:00 |
 shengtao
|
0f821a16fc
|
tijiao
|
2024-01-04 10:52:49 +08:00 |
|
yzx
|
49532ac7c4
|
t
|
2024-01-04 10:47:58 +08:00 |
|
shengtao
|
d90a81392f
|
tijiao
|
2024-01-03 19:36:41 +08:00 |
|
shengtao
|
e6f2fa7abb
|
tijiao
|
2024-01-03 19:14:20 +08:00 |
|
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
|
1c9d45456b
|
tijiao
|
2024-01-03 14:20:49 +08:00 |
|
shengtao
|
f0ba929764
|
更新收费站ETC标识
|
2024-01-03 14:19:50 +08:00 |
|
shengtao
|
324faf4832
|
tijiao
|
2024-01-03 13:11:40 +08:00 |
|
shengtao
|
b12c1eceb2
|
tijiao
|
2024-01-03 10:40:52 +08:00 |
|
shengtao
|
f25cdc92f4
|
电瓶车动画更新
|
2024-01-03 10:09:59 +08:00 |
|
shengtao
|
6ae88f5219
|
tijiao
|
2024-01-03 09:12:05 +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
|
f78372ed93
|
tijiao
|
2024-01-02 21:24:05 +08:00 |
|
yzx
|
8c5178c17c
|
t
|
2024-01-02 20:12:49 +08:00 |
|
shengtao
|
a951cc75f9
|
tijiao
|
2024-01-02 19:09:36 +08:00 |
|
yzx
|
f40f1c1fcf
|
t
|
2024-01-02 18:15:57 +08:00 |
|
yzx
|
c6842c080f
|
t
|
2024-01-02 16:41:01 +08:00 |
|
yzx
|
e8b7089eab
|
t
|
2024-01-02 15:15:19 +08:00 |
|
shengtao
|
a1c73f1381
|
电瓶车新动画
|
2024-01-02 14:28:17 +08:00 |
|
shengtao
|
56138f672a
|
更新电瓶车
|
2024-01-02 14:17:33 +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 |
|
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 |