Commit Graph

58 Commits

Author SHA1 Message Date
lujiajian 675375f3df 增加提示 2025-03-07 08:53:25 +08:00
黄嘉宇 b04cd8b414 Merge branch 'master' of http://gitea.umayle.com/huangjiayu/CQ_Intelligent-Technology-Training-Base
# Conflicts:
#	Assets/Scenes/智能家居/ZNJJ_H.unity
2025-03-06 17:14:55 +08:00
黄嘉宇 28ec936d09 0306智能家居场景新增模型后烘焙 2025-03-06 17:09:18 +08:00
lujiajian 49c9166c2b 添加可点击物体高亮, 2025-02-21 16:44:40 +08:00
lujiajian bc19181667 修改康养仿真Bug 2025-02-20 16:43:55 +08:00
黄嘉宇 d3dc77220e 123 2025-02-20 10:06:57 +08:00
黄嘉宇 44e319bd93 Merge branch 'master' of http://gitea.umayle.com/huangjiayu/CQ_Intelligent-Technology-Training-Base 2025-02-20 10:00:02 +08:00
黄嘉宇 e4e0c294f9 1 2025-02-20 09:59:50 +08:00
lujiajian 33e2758317 康养仿真灯光控制 2025-02-20 09:18:16 +08:00
taosuqi 1339375b59 提交康养仿真 2025-02-20 08:58:43 +08:00
taosuqi 6578a90d11 Merge branch 'master' of http://172.16.1.12/huangjiayu/CQ_Intelligent-Technology-Training-Base 2025-02-19 17:58:26 +08:00
taosuqi e30309cd14 控制灯 2025-02-19 17:58:20 +08:00
lujiajian 012cb3df71 修改bug,完善功能 2025-02-19 17:16:31 +08:00
taosuqi 56ea9b8674 2.18 2025-02-18 20:43:13 +08:00
黄嘉宇 4e6dfd8be1 智能家居新增模型 2025-02-18 20:32:25 +08:00
lujiajian 8aa72834ef Merge branch 'master' of http://gitea.umayle.com/huangjiayu/CQ_Intelligent-Technology-Training-Base 2025-02-18 13:22:31 +08:00
lujiajian 7b1232a472 高亮插件 2025-02-18 13:22:22 +08:00
taosuqi 4f7798022a 1 2025-02-18 13:11:01 +08:00
lujiajian c7b3b1bd76 1 2025-02-17 18:00:23 +08:00
lujiajian 29265515cb 1 2025-02-14 17:59:22 +08:00
lujiajian b99abd8156 1 2025-02-13 18:02:01 +08:00
lujiajian e703b7b526 1 2025-02-12 18:02:06 +08:00
lujiajian c6f2786d15 1 2025-02-12 18:01:10 +08:00
黄嘉宇 46dd1e755f Merge branch 'master' of http://gitea.umayle.com/huangjiayu/CQ_Intelligent-Technology-Training-Base 2025-02-10 14:30:17 +08:00
黄嘉宇 bb1fa425f4 123 2025-02-10 14:29:55 +08:00
lujiajian ca3af10f61 2 2025-02-10 14:18:22 +08:00
lujiajian 2aa6aa3e63 1 2025-02-10 13:38:32 +08:00
taosuqi 06de964f1c 上午提交 2025-02-10 09:45:49 +08:00
lujiajian 9966e0e1e9 1 2025-02-10 09:44:34 +08:00
lujiajian 2c1a38ad3a 1 2025-02-08 17:45:45 +08:00
lujiajian e73b665a1e Merge branch 'master' of http://gitea.umayle.com/huangjiayu/CQ_Intelligent-Technology-Training-Base
# Conflicts:
#	Assets/Font/SourceHanSansCN-Bold SDF.asset
2025-02-08 17:41:12 +08:00
lujiajian f148ef5952 111 2025-02-08 17:37:40 +08:00
taosuqi 7daa3f8b5e tsq2.8 2025-02-08 15:04:18 +08:00
lujiajian bc73e48aac 111 2025-02-08 14:34:03 +08:00
taosuqi 1a347ceb37 2.7提交 2025-02-07 18:02:28 +08:00
taosuqi da81f42603 康养仿真ui搭建 2025-02-06 18:09:10 +08:00
黄嘉宇 537662825a 摔倒动画制作 2025-02-05 18:25:18 +08:00
黄嘉宇 76e2a81620 灯光烘焙 2025-02-05 15:30:25 +08:00
黄嘉宇 d0e8b12260 康养仿真模拟场景提交 2025-02-05 13:36:09 +08:00
黄嘉宇 0b8a91467a Merge branch 'master' of http://gitea.umayle.com/huangjiayu/CQ_Intelligent-Technology-Training-Base 2025-01-23 13:25:34 +08:00
lujiajian 452750d7d4 1 2025-01-23 11:22:26 +08:00
lujiajian 8eee3280cb 11 2025-01-23 11:09:38 +08:00
lujiajian f39801319e 1 2025-01-23 11:09:06 +08:00
lujiajian 4a108c7152 1 2025-01-23 08:34:40 +08:00
黄嘉宇 32355ce733 Merge branch 'master' of http://gitea.umayle.com/huangjiayu/CQ_Intelligent-Technology-Training-Base 2025-01-22 15:05:13 +08:00
黄嘉宇 f6af33e707 12 2025-01-22 15:04:40 +08:00
lujiajian 754c0c46e6 1 2025-01-22 08:49:36 +08:00
lujiajian 3981b4930c 搭建UI提交 2025-01-21 18:02:23 +08:00
lujiajian a43bf88048 11 2025-01-20 17:40:44 +08:00
lujiajian e3789081ab 1 2025-01-20 17:14:33 +08:00