Commit Graph

517 Commits

Author SHA1 Message Date
陈向学 5684b01a10 x 2024-09-05 13:59:56 +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
YangHua b771e1d8fe Merge branch 'main' of http://37c67607.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-04 14:45:07 +08:00
YangHua fe3e2d3e9d 添加动画只能播放一次 2024-09-04 14:44:59 +08:00
liuyu c578fcb26e Merge branch 'main' of http://git.umayle.com/WangWeiZhi/YanCheng_Metrology 2024-09-04 14:20:42 +08:00
liuyu 11854f7fd6 scene中挂载ReconnectMgr;自动保存移出ProcessManager;工具间模型恢复时穿戴装备; 2024-09-04 14:20:35 +08:00
YangHua 7b1aab1465 添加负责人 动画(未完成) 2024-09-04 14:06:45 +08:00
YangHua 0a524559a7 Merge branch 'main' of http://37c67607.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-04 11:58:24 +08:00
YangHua c4fa2c867a 添加人物模型,修改提交按钮显示时间 分数面板 关闭按钮 2024-09-04 11:57:34 +08:00
陈向学 f36b14dcc6 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-04 10:03:38 +08:00
陈向学 57b484c906 改动修复 2024-09-04 10:03:33 +08:00
liuyu e9827be83f 重连涉及的数据结构 2024-09-04 09:37:44 +08:00
liuyu e5638a87e9 添加脚本到主分支 2024-09-04 09:35:32 +08:00
陈向学 e66378f5f0 aaa 2024-09-03 20:00:30 +08:00
YangHua 33db48e5fd Merge branch 'main' of http://4ea9e602.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-03 18:32:36 +08:00
YangHua 9bf48dbacd 12 2024-09-03 18:32:30 +08:00
陈向学 7dfb8733ab Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-03 18:31:55 +08:00
陈向学 7d6b942a8a aa 2024-09-03 18:31:51 +08:00
YangHua c4d6ab745f 修改 掏出工具逻辑 2024-09-03 18:30:49 +08:00
YangHua 5f1e34b3d0 Merge branch 'main' of http://4ea9e602.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-03 18:02:14 +08:00
YangHua 066c238fea 添加分数获取 2024-09-03 17:58:25 +08:00
陈向学 0aa001c950 现场设备大改,科目2 2024-09-03 17:57:49 +08:00
陈向学 8f0fc78f3e aa 2024-09-03 10:31:50 +08:00