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

413 Commits

Author SHA1 Message Date
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
yzx b0436f2f3a t 2024-01-03 17:35:49 +08:00
yzx 2bf6a40d42 t 2024-01-03 17:34:51 +08:00
yzx be0b13aefd t 2024-01-03 17:22:25 +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
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 c6842c080f t 2024-01-02 16:41:01 +08:00
yzx fd20367bab Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2024-01-02 15:15:24 +08:00
yzx e8b7089eab t 2024-01-02 15:15:19 +08:00
shengtao 82e03c5899 汽车路线 2024-01-02 15:14:16 +08:00
shengtao a1c73f1381 电瓶车新动画 2024-01-02 14:28:17 +08:00
shengtao 878baa070c Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2024-01-02 14:19:23 +08:00
shengtao 56138f672a 更新电瓶车 2024-01-02 14:17:33 +08:00
yzx 660ac450b4 t 2024-01-02 14:12:25 +08:00
yzx d3f405b209 t 2024-01-02 10:53:10 +08:00
yzx ff824b4669 t 2024-01-02 09:53:06 +08:00
shengtao 85792b9c5c 雨天碰撞 2023-12-29 11:17:08 +08:00
shengtao 067967d41e tijiao 2023-12-29 10:30:01 +08:00
shengtao 1d9f261d5e 添加学校碰撞 2023-12-29 09:49:01 +08:00
shengtao 4f0f9f5557 tijiao 2023-12-29 09:34:52 +08:00
shengtao 182a183e3a tijiao 2023-12-29 09:26:54 +08:00
shengtao 5a4cf96a91 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-29 09:16:46 +08:00
shengtao e3236516ef tijiao 2023-12-29 09:15:36 +08:00
yzx 5872e1c70f t 2023-12-29 09:14:44 +08:00
yzx 2c76706992 t 2023-12-29 08:40:08 +08:00
yzx d345651007 t 2023-12-28 18:21:17 +08:00
yzx 76d8816085 t 2023-12-28 17:36:22 +08:00
shengtao 22f02d2ccb 提交信号灯 2023-12-28 17:28:49 +08:00
shengtao 3cc77c43d1 提交信号灯 2023-12-28 17:13:04 +08:00
shengtao 9675d4efa7 tijiao 2023-12-28 16:59:40 +08:00
shengtao 343dfda192 tijiao 2023-12-28 16:39:38 +08:00
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
yzx 012efdc962 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-28 10:57:14 +08:00
yzx d861ac3977 t 2023-12-28 10:57:08 +08:00
shengtao c9746847e2 tijiao 2023-12-28 10:16:17 +08:00
yzx 46fb6e8281 t 2023-12-28 10:09:07 +08:00
yzx ae5e87a66e t 2023-12-28 09:46:51 +08:00
yzx 422870bf50 t 2023-12-28 09:11:46 +08:00
yzx 8e4eef2b06 tttt 2023-12-27 21:24:47 +08:00
yzx 18442606c6 t 2023-12-27 17:58:41 +08:00
yzx aef9a4c3fd t 2023-12-27 17:56:29 +08:00
yzx 5c0fa4e9d0 t 2023-12-27 17:51:21 +08:00
yzx 0a9c36e8e1 t 2023-12-27 17:45:25 +08:00
yzx 1293e653e7 t 2023-12-27 17:34:21 +08:00
yzx 0211fecd5f t 2023-12-27 17:30:38 +08:00
yzx 37d65b05f0 t 2023-12-27 17:15:51 +08:00
yzx 1c21075190 t 2023-12-27 16:58:40 +08:00
yzx b38412a5a4 t 2023-12-27 16:45:24 +08:00
yzx 1d73d42814 tijiao 2023-12-27 16:40:53 +08:00
yzx ee78b04d51 tijiao 2023-12-27 16:27:32 +08:00
yzx 0ad73446c4 tijiao 2023-12-27 16:16:42 +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
yzx 016214ca06 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 2023-12-27 15:14:16 +08:00
yzx 1673a9af19 tijiao 2023-12-27 15:14:10 +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
黄嘉宇 85c49c4f4b H碰撞添加2 2023-12-27 13:17:24 +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 376d9d0600 tijiao 2023-12-27 08:34:55 +08:00
yzx 0daa9a79bc tijiao 2023-12-26 21:33:05 +08:00
yzx 7117d80fd4 tijiao 2023-12-26 20:32:24 +08:00
shengtao 2a904d5e37 tijiao 2023-12-26 20:19:44 +08:00
shengtao 2157cf5cb4 a 2023-12-26 19:27:01 +08:00
yzx f9efbf0e3e tijiao 2023-12-26 18:57:36 +08:00
yzx 750ba5f1db tijiao 2023-12-26 18:51:08 +08:00
yzx fe48e9e022 tijiao 2023-12-26 18:05:10 +08:00
shengtao 2b25fc8c8c 提交碰撞 2023-12-26 17:46:48 +08:00
yzx 1e70ae3440 Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 
# Conflicts:
#	U3D_DrivingSystem/Assets/Scenes/main_.unity
 2023-12-26 17:40:59 +08:00
yzx 1fec16c069 tijiao 2023-12-26 17:40: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 7ae911380a 场景提交 2023-12-26 17:26:41 +08:00
shengtao e9bf6899da tijiao 2023-12-26 16:59:24 +08:00
黄嘉宇 6b76173ca7 20231226H汽车prefab提交 2023-12-26 16:22:46 +08:00