Commit Graph

169 Commits

Author SHA1 Message Date
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
shengtao c1fc489dd8 tijiao 2023-12-28 14:20:57 +08:00
shengtao 853caf0a66 tijiao 2023-12-28 13:12:45 +08:00
shengtao 5b46cab31e tijiao 2023-12-28 11:14:37 +08:00
shengtao 01ca77c641 tijiao 2023-12-28 11:00:03 +08:00
shengtao c9746847e2 tijiao 2023-12-28 10:16:17 +08:00
yzx 8e4eef2b06 tttt 2023-12-27 21:24:47 +08:00
yzx b38412a5a4 t 2023-12-27 16:45:24 +08:00
yzx 1e4febc98f Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-27 16:09:08 +08:00
yzx 959a760171 tijiao 2023-12-27 16:09:04 +08:00
shengtao 1ea8b11e52 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-27 15:25:37 +08:00
shengtao 87ca646b79 tijiao 2023-12-27 15:19:31 +08:00
yzx 2db928f303 tijiao 2023-12-27 15:15:58 +08:00
shengtao 62ea78a9e6 更新预设 2023-12-27 14:52:34 +08:00
shengtao 6899b48c2c tijiao 2023-12-27 14:28:52 +08:00
黄嘉宇 049ac37de7 20231227H碰撞体添加3 2023-12-27 14:19:25 +08:00
黄嘉宇 b5a2bbd54b Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-27 13:47:16 +08:00
黄嘉宇 13ed53243d 20231227H雾天更改 2023-12-27 13:41:37 +08:00
yzx 0b912e9f55 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-27 13:19:01 +08:00
yzx 5ece677e10 tijiao 2023-12-27 13:18:57 +08:00
黄嘉宇 2c63b5b2cd 20231227H场景提交 2023-12-27 13:12:29 +08:00
黄嘉宇 c8dbe8df67 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	U3D_DrivingSystem/Assets/GameAssets/Art/建筑模型/xcmodel/gaojia/雨天gaosu.prefab
2023-12-27 11:07:20 +08:00
黄嘉宇 bf3ee4c0fd 20231227碰撞体添加 2023-12-27 11:05:43 +08:00
shengtao 8dc66b495b 提交电瓶车动画 2023-12-27 10:47:41 +08:00
shengtao f62f65bb2a tijiao 2023-12-27 10:11:35 +08:00
shengtao 2a904d5e37 tijiao 2023-12-26 20:19:44 +08:00
shengtao 2157cf5cb4 a 2023-12-26 19:27:01 +08:00
shengtao 2b25fc8c8c 提交碰撞 2023-12-26 17:46:48 +08:00
shengtao 9bfc135739 tijiao 2023-12-26 17:27:06 +08:00
shengtao c257070df8 tijiao 2023-12-26 17:26:56 +08:00
shengtao e9bf6899da tijiao 2023-12-26 16:59:24 +08:00
shengtao d54a89718a tijiao 2023-12-26 13:54:15 +08:00
shengtao 27c78208bd Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-26 13:26:51 +08:00
shengtao c9abb6902a tijiao 2023-12-26 13:11:04 +08:00
yzx 89d19661a0 tijiao 2023-12-26 10:50:13 +08:00
yzx 9afc37a146 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	U3D_DrivingSystem/Assembly-CSharp.csproj
#	U3D_DrivingSystem/Assets/Scenes/main_.unity
2023-12-26 10:11:33 +08:00
yzx 58d8b150fe tijiao 2023-12-26 10:11:09 +08:00
黄嘉宇 0ac5c720d1 20231226H地形提交 2023-12-26 10:08:30 +08:00
shengtao 6c1a333212 tijiao 2023-12-26 08:39:56 +08:00
shengtao 42aeebb49d 更新场景文件 2023-12-25 22:31:28 +08:00
shengtao fca870edf2 更新场景文件 2023-12-25 21:54:09 +08:00
shengtao d5deb81278 提交场景文件 2023-12-25 21:08:36 +08:00
shengtao 5511f3d5e1 提交场景文件 2023-12-25 20:27:43 +08:00
shengtao 39a809c292 更新场景文件 2023-12-25 19:48:05 +08:00
shengtao e5a5d8e52f tijiao 2023-12-25 19:25:52 +08:00
shengtao 9f24a9d126 更新出口牌子 2023-12-25 17:50:16 +08:00
shengtao 2612f311e7 更新雨雪天气高速场景 2023-12-25 17:30:36 +08:00
shengtao b7040d3998 更新高速公路模型 2023-12-25 17:20:10 +08:00
shengtao 2a2e950a51 tijiao 2023-12-25 16:36:32 +08:00
shengtao 454f1d864b 提交高速模型 2023-12-25 16:29:58 +08:00
shengtao 5f80189a82 tijiao 2023-12-25 15:08:43 +08:00
shengtao ed538acb84 tijiao 2023-12-25 14:47:04 +08:00
shengtao e735ac97c6 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	U3D_DrivingSystem/Assets/Scenes/main_.unity
2023-12-25 14:40:33 +08:00
shengtao c2f36e56b6 提交 2023-12-25 14:38:34 +08:00
黄嘉宇 cef35fa8b3 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-25 14:26:09 +08:00
黄嘉宇 517f2cbf8b 20231225红绿灯更新 2023-12-25 14:20:32 +08:00
shengtao 954014bf30 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	U3D_DrivingSystem/Assets/Scenes/main_.unity
2023-12-25 13:45:51 +08:00
shengtao d2780a6f6b 地形修改 2023-12-25 13:45:37 +08:00
黄嘉宇 2cb433bfd0 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-25 13:34:36 +08:00
黄嘉宇 585e031e64 20231225黄修改材质 2023-12-25 13:33:29 +08:00
yzx bfa68c7f04 tijiao 2023-12-25 13:32:51 +08:00
shengtao 6f56b041b8 红绿灯倒计时模型 2023-12-25 10:50:13 +08:00
shengtao 2a1d94866e 更新雪地贴图文件 2023-12-25 08:33:19 +08:00
shengtao 0eb415259f 更新材质球 2023-12-24 19:17:20 +08:00
shengtao fcd80a3d50 更新车灯 2023-12-24 16:34:43 +08:00
shengtao f75b555ba4 tijiao 2023-12-24 14:31:18 +08:00
shengtao 25e93def0e Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-24 11:24:48 +08:00
shengtao 447a65d04a 集市模型更新 2023-12-24 11:23:31 +08:00
yzx b08dbf7be4 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-22 18:10:07 +08:00
yzx 7ecbdab97a 提交 2023-12-22 18:10:03 +08:00
shengtao b631670946 更新交通标志 2023-12-22 17:15:22 +08:00
shengtao ce408baab3 更新学校场景,红旗材质 2023-12-22 16:11:00 +08:00
yzx 984bc9a853 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	U3D_DrivingSystem/Assets/Scenes/main_.unity
2023-12-22 09:23:28 +08:00
yzx cef23b428f 提交 2023-12-22 09:23:17 +08:00
shengtao 7b8434907c no message 2023-12-21 18:43:16 +08:00
shengtao 70af009764 更新雪天场景 2023-12-21 17:34:07 +08:00
shengtao ba51257a92 设置后处理 2023-12-21 16:31:10 +08:00
shengtao 4da3fb3356 更新材质贴图 2023-12-21 16:00:25 +08:00
shengtao e6487724dc 更新场景文件 2023-12-21 15:49:20 +08:00
shengtao 6b57dc2408 更新红绿灯P牌问题,乡村通往城市道路两边护栏修改,部分模型贴图丢失问题修改, 2023-12-21 15:19:41 +08:00
shengtao 6f165a4510 更新丢失的贴图文件 2023-12-21 11:33:48 +08:00
yzx c40421943b tijiao 2023-12-21 09:12:12 +08:00
shengtao 06d9ab730c no message 2023-12-20 19:26:26 +08:00
shengtao 114eaa9e0c 天气贴图 2023-12-20 19:22:27 +08:00
shengtao 827e372a24 提交 2023-12-20 18:07:44 +08:00
shengtao 94b533664f 更新贴图 2023-12-20 15:13:02 +08:00
shengtao 97af085ae0 提交场景文件 2023-12-20 15:00:46 +08:00
shengtao 8adbef01b7 tijiao 2023-12-20 14:34:39 +08:00
yzx 70fe60545e Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem
# Conflicts:
#	U3D_DrivingSystem/Assets/Scenes/main_.unity
2023-12-20 14:22:28 +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
shengtao b3266903ce 修改交通信号灯 2023-12-20 14:18:43 +08:00
yzx ca325846d3 提交 2023-12-20 14:18:11 +08:00
shengtao 742925a6ad 更新材质球显示问题 2023-12-20 11:05:38 +08:00
shengtao 59b03649a0 更新反射球 2023-12-20 09:23:02 +08:00