Commit Graph

538 Commits

Author SHA1 Message Date
shengtao 8730a4083e 1 2024-09-06 13:24:03 +08:00
shengtao 5d0c662573 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-06 13:21:22 +08:00
shengtao b0a4d9de47 1 2024-09-06 13:18:45 +08:00
YangHua c64d8daf2f 修改livescene客户和负责人效果 2024-09-06 13:18:32 +08:00
shengtao 2fa5fdb563 1 2024-09-06 13:17:59 +08:00
陈向学 2e82cd11a3 优化 2024-09-06 10:10:50 +08:00
陈向学 2ecebd6a3f aa 2024-09-05 20:23:20 +08:00
陈向学 9d731799cb ll 2024-09-05 19:31:08 +08:00
YangHua 93f2b5ad2c 整理目录,剔除多余模型 2024-09-05 18:57:00 +08:00
陈向学 5a91f10875 电能表 2024-09-05 15:56:23 +08:00
陈向学 bf1eacad77 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-05 15:10:22 +08:00
陈向学 8f905f2787 科目2 2024-09-05 15:10:19 +08:00
YangHua 53059fe795 修改电能表位置 2024-09-05 15:08:12 +08:00
YangHua 9da25a6231 修改mesh格式 2024-09-05 14:15:28 +08:00
YangHua bff2d1e78d 修复注册信号时间差 2024-09-05 14:13:36 +08:00
YangHua 52732ff896 Merge branch 'main' of http://37c67607.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-05 14:00:55 +08:00
YangHua 1ab135be02 修改注册时间差 2024-09-05 14:00:50 +08:00
陈向学 d39c8b7683 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-05 14:00:01 +08:00
陈向学 5684b01a10 x 2024-09-05 13:59:56 +08:00
YangHua a113527388 1 2024-09-05 13:33:02 +08:00
YangHua 670d9947d4 Merge branch 'main' of http://37c67607.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-05 13:23:44 +08:00
YangHua ee0bc2049b 1 2024-09-05 13:23:39 +08:00
陈向学 9beaa384cd Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-05 13:23:01 +08:00
陈向学 734c49f6ed ssss 2024-09-05 13:22:56 +08:00
YangHua 0ec147e9ec 修改layer 2024-09-05 13:09:28 +08:00
YangHua cab83a480d 修复 办公室场景来回跳 不显示 相机得问题 2024-09-05 12:59:23 +08:00
YangHua b45f5190d8 添加 人物移动判断 2024-09-05 12:53:36 +08:00
YangHua 0d7aaf4c0d Merge branch 'main' of http://37c67607.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-05 11:33:29 +08:00
YangHua 8c282ceb96 添加材质球 2024-09-05 11:32:20 +08:00
陈向学 ca76a44145 插座 2024-09-05 11:25:14 +08:00
YangHua db56f71289 Merge branch 'main' of http://37c67607.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-05 11:11:06 +08:00
YangHua 1716fe491d 修改动画 2024-09-05 11:10:55 +08:00
陈向学 5b6b2924a7 人位置 2024-09-05 11:08:43 +08:00
YangHua 6c2322a99f Merge branch 'main' of http://37c67607.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-05 11:06:09 +08:00
YangHua 897c41c226 修改动画 2024-09-05 11:06:06 +08:00
陈向学 99d6f10261 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-05 11:00:59 +08:00
陈向学 3982ab5723 改细节 2024-09-05 11:00:56 +08:00
YangHua b27ab42de3 修改错误提示 2024-09-05 10:52:36 +08:00
YangHua 11c92f7328 21 2024-09-05 09:24:21 +08:00
YangHua 8a499a426f 1 2024-09-05 09:23:56 +08:00
wangyang e75ccb7169 添加待机动画 2024-09-05 09:22:21 +08:00
陈向学 f80a72846c Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-04 16:02:51 +08:00
陈向学 8a181b9fe8 dd 2024-09-04 16:02:47 +08:00
YangHua 8eacd5c099 Merge branch 'main' of http://37c67607.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-04 15:56:29 +08:00
YangHua 52bd5396a9 修改常驻基类 2024-09-04 15:55:52 +08:00
陈向学 3348ef079e aaaaa 2024-09-04 15:25:57 +08:00
陈向学 dd97946d12 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-04 15:25:44 +08:00
YangHua 551ce83487 修改穿透问题 2024-09-04 15:24:48 +08:00
陈向学 d9325fdba9 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-04 15:12:20 +08:00
陈向学 e67b5836a1 新科目 2024-09-04 15:12:10 +08:00