Commit Graph

34 Commits

Author SHA1 Message Date
yzx 89d19661a0 tijiao 2023-12-26 10:50:13 +08:00
yzx 58d8b150fe tijiao 2023-12-26 10:11:09 +08:00
yzx 855bf98cf5 tijiao 2023-12-25 14:28:49 +08:00
yzx bfa68c7f04 tijiao 2023-12-25 13:32:51 +08:00
yzx 9865bce7c7 tijiao 2023-12-25 08:55:44 +08:00
yzx 59e2373ce7 t 2023-12-24 18:02:00 +08:00
yzx 7d1ad772c9 提交 2023-12-24 17:42:15 +08:00
yzx 0b6ea93017 提交 2023-12-24 16:09:42 +08:00
yzx aa3558e4a6 提交 2023-12-24 14:24:13 +08:00
yzx 7ecbdab97a 提交 2023-12-22 18:10:03 +08:00
yzx 120f0fcb52 提交 2023-12-22 13:46:41 +08:00
yzx 7ea6ef5529 提交 2023-12-22 10:50:53 +08:00
yzx cef23b428f 提交 2023-12-22 09:23:17 +08:00
yzx dafe35f893 提交 2023-12-21 18:03:36 +08:00
yzx ab1e7a3abc tijiao 2023-12-21 16:05:29 +08:00
yzx d026dad85e 提交 2023-12-20 21:18:29 +08:00
yzx 5098f54034 提交 2023-12-20 18:06:33 +08:00
yzx 5e976092e6 提交 2023-12-20 18:02:27 +08:00
yzx 4c952c7393 提交 2023-12-20 16:44:01 +08:00
yzx 5874dfe1aa 提交 2023-12-20 15:13:00 +08:00
yzx 7d599cdc4c Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	U3D_DrivingSystem/AmplifyShaderEditor.csproj
#	U3D_DrivingSystem/Assembly-CSharp-Editor.csproj
#	U3D_DrivingSystem/Assembly-CSharp.csproj
#	U3D_DrivingSystem/Assets/GameAssets/Art/交通路标/Prefab/信号灯123.prefab
#	U3D_DrivingSystem/Assets/Scenes/main_.unity
#	U3D_DrivingSystem/Assets/UTS/Models/Crossroad_prefabs/New Semaphore Prefabs/One Way Semaphore.prefab.meta
#	U3D_DrivingSystem/Boxophobic.AtmosphericHeightFog.Editor.csproj
#	U3D_DrivingSystem/Boxophobic.AtmosphericHeightFog.Runtime.csproj
#	U3D_DrivingSystem/Boxophobic.Utils.Editor.csproj
#	U3D_DrivingSystem/Boxophobic.Utils.Scripts.csproj
#	U3D_DrivingSystem/U3D_DrivingSystem.sln
2023-12-20 14:21:03 +08:00
yzx ea56cacbab 提交 2023-12-20 14:18:42 +08:00
yzx 64dc47c7c5 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-20 08:52:51 +08:00
yzx cc9b56f3ad 提交 2023-12-20 08:52:46 +08:00
shengtao 90eb0d9d61 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	.gitignore
#	U3D_DrivingSystem/Assets/GameAssets/Art/Wet Roads.meta
#	U3D_DrivingSystem/Assets/UTS_PRO/Models/Cars/Car_Prefabs/Day Cars/Big_Bus.prefab
#	U3D_DrivingSystem/Assets/UTS_PRO/Models/Cars/Car_Prefabs/Day Cars/Car_1.prefab
#	U3D_DrivingSystem/Assets/UTS_PRO/Models/Cars/Car_Prefabs/Day Cars/Car_2.prefab
#	U3D_DrivingSystem/Assets/UTS_PRO/Models/Cars/Car_Prefabs/Day Cars/Car_3.prefab
#	U3D_DrivingSystem/Assets/UTS_PRO/Models/Cars/Car_Prefabs/Day Cars/Car_4.prefab
#	U3D_DrivingSystem/Assets/UTS_PRO/Models/Cars/Car_Prefabs/Day Cars/Car_5.prefab
#	U3D_DrivingSystem/Assets/UTS_PRO/Models/Cars/Car_Prefabs/Day Cars/Car_6.prefab
#	U3D_DrivingSystem/Assets/UTS_PRO/Models/Cars/Car_Prefabs/Day Cars/Car_7.prefab
2023-12-19 20:50:34 +08:00
shengtao a612471e6c 交通地标更新 2023-12-19 20:23:23 +08:00
yzx 521e8fcf9b 提交 2023-12-19 18:20:15 +08:00
yzx 660dd5e3ba 提交 2023-12-19 18:16:51 +08:00
yzx 50be979c9f 提交 2023-12-19 09:44:17 +08:00
yzx efc8050b89 修改提交 2023-12-15 18:58:37 +08:00
yzx 9a1c2e2f4a 添加UI 2023-12-15 14:58:12 +08:00
yzx b65dd9f70c 提交 2023-12-13 13:35:25 +08:00
yzx 7940a10af6 提交 2023-12-12 16:18:41 +08:00
黄嘉宇 329f65a1ad 20231207重新创建项目 2023-12-07 19:00:13 +08:00