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

314 Commits

Author SHA1 Message Date
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
yzx 703bb8d358 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2024-01-03 09:08:47 +08:00
yzx 3abe897ba2 t 2024-01-03 09:08:35 +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
shengtao 6c8c457d1a tijiao 2024-01-02 21:21:20 +08:00
yzx d7fcc8e641 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2024-01-02 21:07:48 +08:00
yzx 3fc0900f23 t 2024-01-02 21:07:44 +08:00
shengtao a39582dfd2 雪天玻璃 2024-01-02 20:50:06 +08:00
shengtao c1c694dbf8 tijiao 2024-01-02 20:34:14 +08:00
shengtao d38e0a1e1f tijiao 2024-01-02 20:18:10 +08:00
yzx 8c5178c17c t 2024-01-02 20:12:49 +08:00
yzx abbcb42da0 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 
# Conflicts:
#	U3D_DrivingSystem/Assets/Scenes/main_.unity
 2024-01-02 19:32:03 +08:00
yzx cc1e4cd332 t 2024-01-02 19:31:44 +08:00
shengtao 4e7b2619a8 tijiao 2024-01-02 19:30:55 +08:00
shengtao 08214b458b tijiao 2024-01-02 19:23:34 +08:00
shengtao a951cc75f9 tijiao 2024-01-02 19:09:36 +08:00
shengtao 081092471a tijiao 2024-01-02 19:09:07 +08:00
yzx bfc7957274 rt 2024-01-02 18:25:26 +08:00
yzx f40f1c1fcf t 2024-01-02 18:15:57 +08:00
yzx b7499f0767 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2024-01-02 16:42:26 +08:00
yzx c6842c080f t 2024-01-02 16:41:01 +08:00