Commit Graph

184 Commits

Author SHA1 Message Date
shengtao d015e81d30 tijiao 2024-01-23 15:38:00 +08:00
shengtao c506669a82 tijiao 2024-01-23 10:39:59 +08:00
shengtao 597e9bb1f6 tijiao 2024-01-23 10:21:14 +08:00
shengtao d7453c3033 tijiao 2024-01-23 10:10:36 +08:00
yzx bfc340c5bf Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2024-01-17 15:24:18 +08:00
yzx 50143c5269 t 2024-01-17 15:24:13 +08:00
shengtao 076319d6b0 tijiao 2024-01-17 15:16:28 +08:00
shengtao 573cfdf52b tijiao 2024-01-17 11:19:43 +08:00
shengtao 7a9d152887 高架模型 2024-01-17 11:16:20 +08:00
shengtao 78a9bb3c84 红绿灯修改,贴图 材质球 2024-01-17 10:08:28 +08:00
shengtao 5af2ea4da2 tijiao 2024-01-15 15:28:16 +08:00
ljj 825d0915e3 tijiao 2024-01-15 15:25:56 +08:00
huangjiayu c338f9a943 2024.1.11修改 2024-01-11 08:46:45 +08:00
yzx d8f0f8fce5 t 2024-01-09 18:02:42 +08:00
shengtao 120bd9da88 tijiao 2024-01-04 16:59:36 +08:00
yzx d305757094 t 2024-01-04 16:37:46 +08:00
shengtao bb6abe3fac tijiao 2024-01-04 15:51:16 +08:00
yzx 992aa5360b t 2024-01-04 14:49:02 +08:00
shengtao 741091f2fa tijiao 2024-01-04 14:05:51 +08:00
shengtao 8d251d19bb tijiao 2024-01-04 13:51:28 +08:00
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