170 Commits

Author SHA1 Message Date
shenjianxing
2f18e539c7 Merge branch 'NewMaster' into LouDi_Quan 2025-04-21 09:59:58 +08:00
shenjianxing
4a78da1f20 实验报告功能新增自动导入数据 2025-04-21 09:59:18 +08:00
shenjianxing
e6ed8f3aef Merge branch 'NewMaster' into LouDi_Quan 2025-04-09 15:47:48 +08:00
shenjianxing
2ae75e1664 修改web平台对接逻辑 2025-04-09 15:46:56 +08:00
shenjianxing
1c472a2eac Merge branch 'NewMaster' into LouDi_Quan 2025-04-09 14:00:20 +08:00
shenjianxing
c7d31c23f2 完善平台对接代码 2025-04-09 13:59:32 +08:00
shenjianxing
b8abfa3c44 增加错误日志 2025-04-09 09:23:00 +08:00
shenjianxing
01f6331770 修复bug 2025-04-09 09:00:01 +08:00
shenjianxing
0795a60dde 新增知识点功能模块 2025-04-08 17:17:27 +08:00
shenjianxing
60be27d25a Merge branch 'NewMaster' into LouDi_Quan 2025-04-07 10:31:19 +08:00
shenjianxing
da52d47a20 完善VR适配 2025-04-07 10:30:35 +08:00
shenjianxing
261881bab6 Merge branch 'NewMaster' into LouDi_Quan 2025-04-07 09:41:03 +08:00
bf78008c8a 修改UITimeTIpBug 2025-04-03 17:31:32 +08:00
shenjianxing
e43eb4bed0 Merge branch 'NewMaster' into LouDi_Quan 2025-04-03 13:55:42 +08:00
shenjianxing
ffc4ac6b86 修复 VR 中 UIBtns位置问题
开放 VR 中 默认镜头和近距离镜头
2025-04-03 13:55:07 +08:00
shenjianxing
6f2bfbb498 合并 2025-03-31 16:50:13 +08:00
shenjianxing
4b38a930f6 修复vr适配bug 2025-03-31 16:47:41 +08:00
shenjianxing
56e624709a Merge branch 'master' into LouDi_Quan 2025-03-31 16:09:33 +08:00
shenjianxing
5105a9b9ab 适配VR 2025-03-31 16:07:26 +08:00
shenjianxing
987bf6b142 Merge branch 'master' into LouDi_Quan 2025-03-27 15:49:07 +08:00
shenjianxing
909d8d0f5b 修改框架层逻辑 2025-03-27 15:48:22 +08:00
shenjianxing
926c3551b5 Merge branch 'master' into LouDi_Quan 2025-03-27 13:27:01 +08:00
shenjianxing
41c68a734a 修复web平台兼容性问题 2025-03-27 13:14:48 +08:00
shenjianxing
f77a2e4f52 Merge branch 'master' into LouDi_Quan 2025-03-27 10:10:20 +08:00
shenjianxing
1a7e0af9a4 修复加载bug 2025-03-26 17:46:02 +08:00
shenjianxing
60e6691027 UITools新增错误次数 2025-03-26 15:21:46 +08:00
shenjianxing
d1ab8046f9 UITools支持错误次数 2025-03-26 15:19:30 +08:00
shenjianxing
0f2f49dd01 修复Condition or的bug 2025-03-26 14:56:09 +08:00
shenjianxing
1203cccf31 新增成绩页面 是否仅显示当前模块 可选参数 2025-03-26 09:48:17 +08:00
shenjianxing
a1f29f328b 新增弹窗获取得分 2025-03-25 10:46:22 +08:00
shenjianxing
cd4b67cf73 增加多个答案的判断 2025-03-24 17:38:27 +08:00
shenjianxing
4f1a0333ca 增加模块图标功能 2025-03-24 17:18:29 +08:00
shenjianxing
646c6fd75b Merge branch 'master' into LouDi_Quan 2025-03-24 14:36:48 +08:00
shenjianxing
5a7bed3295 完善VR逻辑 2025-03-24 14:32:22 +08:00
shenjianxing
8c9209050e Merge branch 'master' into LouDi_Quan 2025-03-24 09:30:04 +08:00
shenjianxing
4984936411 修改VR版 UI逻辑 2025-03-24 09:29:31 +08:00
shenjianxing
5e35e35680 Merge branch 'master' into LouDi_Quan 2025-03-20 15:34:39 +08:00
shenjianxing
0199ff16fb VR兼容性处理 2025-03-20 15:33:31 +08:00
shenjianxing
0ade71216e Merge branch 'master' into LouDi_Quan 2025-03-19 16:31:55 +08:00
shenjianxing
76462dadbd 针对vr一体机进行修改逻辑 2025-03-19 16:31:17 +08:00
shenjianxing
29afb73104 合并 2025-03-14 17:14:57 +08:00
shenjianxing
7f106d7246 修改UI关闭通知延迟0.1秒发送 2025-03-14 17:10:45 +08:00
shenjianxing
f1d865dc81 修改bug 2025-03-11 13:59:38 +08:00
shenjianxing
788e8d72b5 增加模块退出事件监听 2025-03-11 10:33:07 +08:00
shenjianxing
4e0106ff9f Merge branch 'master' into LouDi_Quan 2025-03-08 14:05:47 +08:00
shenjianxing
4ab1a9a194 新增TextWindow 的 Action 2025-03-08 14:05:03 +08:00
shenjianxing
18944b0f8f Merge branch 'master' into LouDi_Quan 2025-03-08 13:16:03 +08:00
shenjianxing
3cfa13795e 新增UIBackPack 2025-03-08 13:15:13 +08:00
shenjianxing
faceaae3a8 Merge branch 'master' into LouDi_Quan 2025-03-07 16:03:15 +08:00
shenjianxing
90d289242f 新增Tools的位置设定 2025-03-07 16:02:36 +08:00