252 Commits

Author SHA1 Message Date
b69bee2a61 修改内容 2025-02-11 10:23:07 +08:00
shenjianxing
d141bf4922 Merge branch 'master' into AnHui_BaoShi 2025-02-10 13:53:20 +08:00
shenjianxing
b58b34c80a 完善device的3D展示功能 2025-02-10 10:54:47 +08:00
shenjianxing
614c81bf1a Merge branch 'master' into AnHui_BaoShi 2025-02-08 17:33:31 +08:00
shenjianxing
3ac082043d 默认隐藏3D相机 2025-02-08 17:33:21 +08:00
shenjianxing
392358cce3 合并 2025-02-08 17:31:38 +08:00
shenjianxing
055142c792 更新配置文档 2025-02-08 17:30:04 +08:00
shenjianxing
09a744871f 支持多operation切换 2025-02-08 17:27:06 +08:00
shenjianxing
bb0bba3ed4 物体3D展示功能 2025-02-08 16:22:00 +08:00
e27a75a2a5 Merge branch 'AnHui_BaoShi' of http://git.dragonwxl.cn:8080/loudizhiye/virtualframework into AnHui_BaoShi 2025-02-08 11:33:35 +08:00
930b5f5638 修改,水热法,珠宝鉴定,紫外灯,场景及内容 2025-02-08 11:33:31 +08:00
shenjianxing
165ed4387a Merge branch 'master' into AnHui_BaoShi 2025-02-08 11:18:01 +08:00
shenjianxing
a45ed50fd9 增加device的Tip描述 2025-02-08 11:17:37 +08:00
shenjianxing
abf018ca63 修改物体标签 可支持换行输入更多内容 2025-02-08 11:12:50 +08:00
shenjianxing
c0628f93ea Merge branch 'master' into AnHui_BaoShi 2025-02-08 11:00:57 +08:00
shenjianxing
21219479b7 修改配置文档描述 2025-02-08 11:00:12 +08:00
shenjianxing
f2df6b9497 新增通用图片弹窗 2025-02-08 10:59:20 +08:00
081b586ace 完善密度仪和显微镜流程
开发制作偏光镜使用动画
2025-02-08 10:17:59 +08:00
eccc4143d7 Merge remote-tracking branch 'remotes/origin/master' into AnHui_BaoShi 2025-02-08 10:14:40 +08:00
shenjianxing
32b125ad7e 更新 2025-02-08 09:28:33 +08:00
shenjianxing
6194f1b91d 通用弹窗 2025-02-08 09:28:07 +08:00
54d8a9fe88 Merge branch 'AnHui_BaoShi' of http://git.dragonwxl.cn:8080/loudizhiye/virtualframework into AnHui_BaoShi 2025-02-07 18:18:50 +08:00
69df75682f 提交,紫外灯,折射仪 2025-02-07 18:03:05 +08:00
shenjianxing
8e07566ea8 Merge branch 'master' into AnHui_BaoShi 2025-02-07 17:08:06 +08:00
shenjianxing
cbb3bfad98 通用input弹窗 2025-02-07 17:06:19 +08:00
shenjianxing
0af2e12ba5 Merge branch 'master' into AnHui_BaoShi 2025-02-07 14:27:57 +08:00
shenjianxing
9b5c8ae120 修复bug 2025-02-07 14:27:44 +08:00
shenjianxing
d41c623d07 Merge branch 'AnHui_BaoShi' of http://git.dragonwxl.cn:8080/loudizhiye/virtualframework into AnHui_BaoShi 2025-02-07 14:25:40 +08:00
shenjianxing
690b6a7b12 Merge branch 'master' into AnHui_BaoShi 2025-02-07 14:25:34 +08:00
shenjianxing
bf6b7c057a 修复无子步骤时bug 2025-02-07 14:25:12 +08:00
150914ada3 Merge branch 'AnHui_BaoShi' of http://git.dragonwxl.cn:8080/loudizhiye/virtualframework into AnHui_BaoShi 2025-02-07 13:51:39 +08:00
4adf31b8c1 去掉显微镜场景中Ui的EventSystem 2025-02-07 13:51:20 +08:00
shenjianxing
e3843703ef Merge branch 'AnHui_BaoShi' of http://git.dragonwxl.cn:8080/loudizhiye/virtualframework into AnHui_BaoShi 2025-02-07 13:51:11 +08:00
shenjianxing
c84e3fef84 Merge branch 'master' into AnHui_BaoShi 2025-02-07 13:50:58 +08:00
shenjianxing
fe5169e55a 优化步骤列表UI 2025-02-07 13:35:33 +08:00
1db326ea50 添加显微镜使用动画流程 2025-02-07 13:24:50 +08:00
0c8512d984 Merge remote-tracking branch 'remotes/origin/master' into AnHui_BaoShi 2025-02-07 13:22:12 +08:00
shenjianxing
e73daba55f 高亮扩展参数 2025-02-07 13:07:29 +08:00
shenjianxing
b58b49b47a Merge branch 'AnHui_BaoShi' of http://git.dragonwxl.cn:8080/loudizhiye/virtualframework into AnHui_BaoShi 2025-02-07 11:17:30 +08:00
shenjianxing
95043df57c Merge branch 'master' into AnHui_BaoShi 2025-02-07 11:17:15 +08:00
shenjianxing
161ea373e5 修复闪烁bug 2025-02-07 11:15:59 +08:00
76fdf20668 Merge remote-tracking branch 'origin/master' into AnHui_BaoShi 2025-02-07 09:50:16 +08:00
shenjianxing
865eab1ff4 新增 自定义UI 映射字典 2025-02-07 09:40:55 +08:00
3e2b659d5e 基本完成折射仪内容 2025-02-06 17:23:24 +08:00
344530aa0e 密度仪的使用模块交互完成提交 2025-02-06 17:18:43 +08:00
dbd7fde923 Merge remote-tracking branch 'remotes/origin/master' into AnHui_BaoShi 2025-02-06 16:54:00 +08:00
shenjianxing
b2449f638e 修复bug 2025-02-06 16:45:09 +08:00
2205bc7ae5 Merge remote-tracking branch 'remotes/origin/master' into AnHui_BaoShi 2025-02-06 16:33:04 +08:00
shenjianxing
3c1a9f564b 新增闪烁功能 2025-02-06 16:26:44 +08:00
40d45edc65 Merge remote-tracking branch 'remotes/origin/master' into AnHui_BaoShi 2025-02-06 15:24:21 +08:00