huangjiayu
/
H_SafeExperienceDrivingSystem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
442 Commits 2 Branches 0 Tags 8 GiB
Commit Graph

432 Commits

Author SHA1 Message Date
shengtao bfb367abb1 tijiao 2024-01-23 17:41:20 +08:00
shengtao d015e81d30 tijiao 2024-01-23 15:38:00 +08:00
shengtao 5e42d26871 tijiao 2024-01-23 13:17:46 +08:00
shengtao 8b1b70feba tijiao 2024-01-23 11:13:46 +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 9189665b68 tijiao 2024-01-23 10:17:44 +08:00
shengtao d7453c3033 tijiao 2024-01-23 10:10:36 +08:00
shengtao d881bcad2c tijiao 2024-01-19 18:26:07 +08:00
shengtao 212ab64dd5 tijiao 2024-01-19 18:19:15 +08:00
shengtao eca69ad3fa tijiao 2024-01-19 16:09:48 +08:00
shengtao 6be0e64bdf 更换行人模型 2024-01-19 15:57:11 +08:00
yzx 8854d442f5 t 2024-01-19 15:55:03 +08:00
yzx 44a2b87165 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2024-01-17 17:23:16 +08:00
yzx ffd38a0c86 t 2024-01-17 17:23:05 +08:00
shengtao a74f2461a9 tijiao 2024-01-17 17:21:35 +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 f92dd9a2b9 tijiao 2024-01-17 15:00:22 +08:00
shengtao 573cfdf52b tijiao 2024-01-17 11:19:43 +08:00
shengtao 7a9d152887 高架模型 2024-01-17 11:16:20 +08:00
shengtao 4edac872ac tijiao 2024-01-17 10:15:33 +08:00
yzx 725952e3d6 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2024-01-17 10:10:47 +08:00
yzx 0a03b8cce9 t 2024-01-17 10:10:28 +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
yzx aef90fa823 y 2024-01-12 13:57:31 +08:00
yzx 0ca8d49c68 t 2024-01-11 17:38:24 +08:00
yzx 6b6ecf593e t 2024-01-11 15:21:56 +08:00
yzx 636973b26b t 2024-01-11 14:20:14 +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
yzx 4205aadda6 t 2024-01-08 18:39:42 +08:00
yzx 84d2c25848 t 2024-01-05 13:16:55 +08:00
yzx 33528b4868 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2024-01-04 17:03:33 +08:00
yzx 103ab4ba01 t 2024-01-04 17:03:28 +08:00
shengtao 5a18b2188c 提交场景文件 2024-01-04 17:02:58 +08:00
shengtao 120bd9da88 tijiao 2024-01-04 16:59:36 +08:00
shengtao 75be8c408d tijiao 2024-01-04 16:46:51 +08:00
yzx d305757094 t 2024-01-04 16:37:46 +08:00
yzx a0aefe0337 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 
# Conflicts:
#	U3D_DrivingSystem/Assets/Scenes/main_.unity
 2024-01-04 16:36:45 +08:00
yzx 5619199284 t 2024-01-04 16:36:32 +08:00
shengtao da5e399163 tijiao 2024-01-04 16:32:24 +08:00
shengtao cb57f6b6c5 tijiao 2024-01-04 16:27:59 +08:00
shengtao 30ea0d1296 tijiao 2024-01-04 16:12:38 +08:00
shengtao 6922e5e77c tijiao 2024-01-04 15:57:23 +08:00
shengtao bb6abe3fac tijiao 2024-01-04 15:51:16 +08:00
shengtao 4994bc6c69 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2024-01-04 14:50:49 +08:00
shengtao 6e5102f59a tijiao 2024-01-04 14:50:38 +08:00
yzx 21bfc1ce5f Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 
# Conflicts:
#	U3D_DrivingSystem/Assets/Scenes/main_.unity
 2024-01-04 14:49:14 +08:00
yzx 992aa5360b t 2024-01-04 14:49:02 +08:00
shengtao a73b38d425 tijiao 2024-01-04 14:48:19 +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 7e7fa675f5 t 2024-01-04 13:33:39 +08:00
shengtao 2f70d42d47 提交电瓶车颜色修改 2024-01-04 13:04:29 +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
yzx 76c7fe7bf2 t 2024-01-04 10:24:54 +08:00
yzx 9876cd7594 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 
# Conflicts:
#	U3D_DrivingSystem/Assets/Scenes/main_.unity
 2024-01-04 09:57:35 +08:00
yzx 322ddb50dc t 2024-01-04 09:57:21 +08:00
shengtao d031503411 tijiao 2024-01-03 20:20:53 +08:00
shengtao d90a81392f tijiao 2024-01-03 19:36:41 +08:00
yzx d6bccf9437 t 2024-01-03 19:23:08 +08:00
shengtao e6f2fa7abb tijiao 2024-01-03 19:14:20 +08:00
yzx 72c9efa7fd t 2024-01-03 18:45:15 +08:00
yzx 457ee41da9 t 2024-01-03 18:42:37 +08:00
yzx e1823d24b7 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2024-01-03 18:22:42 +08:00
yzx e7654fab04 t 2024-01-03 18:22:38 +08:00
shengtao a8bdddaca6 tijiao 2024-01-03 18:21:52 +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 157ee777f2 tijiao 2024-01-03 17:43:18 +08:00
shengtao 626b825c11 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 
# Conflicts:
#	U3D_DrivingSystem/Logs/AssetImportWorker0.log
 2024-01-03 17:39:46 +08:00
shengtao 2fece35c04 t 2024-01-03 17:39:26 +08:00
yzx 9452b66dea Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 
# Conflicts:
#	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
 2024-01-03 17:36:16 +08:00
yzx b0436f2f3a t 2024-01-03 17:35:49 +08:00
yzx 2bf6a40d42 t 2024-01-03 17:34:51 +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
yzx be0b13aefd t 2024-01-03 17:22:25 +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 93d3f8faab 提交 2024-01-03 10:55:53 +08:00
shengtao b12c1eceb2 tijiao 2024-01-03 10:40:52 +08:00
shengtao f25cdc92f4 电瓶车动画更新 2024-01-03 10:09:59 +08:00
shengtao f8adf90722 路灯碰撞 2024-01-03 09:23:40 +08:00
shengtao 7013357e0d Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2024-01-03 09:12:34 +08:00
shengtao 6ae88f5219 tijiao 2024-01-03 09:12:05 +08:00