322 Commits

Author SHA1 Message Date
shenjianxing
614c726a7c Merge branch 'NewMaster' into LouDi_Quan 2025-04-23 11:46:59 +08:00
shenjianxing
71418f2ac1 完善时间锁功能 2025-04-23 11:45:50 +08:00
shenjianxing
c8997622c5 Merge branch 'NewMaster' into LouDi_Quan 2025-04-23 10:58:10 +08:00
shenjianxing
988b770b16 修改时间锁 2025-04-23 10:37:52 +08:00
shenjianxing
94656992f2 Merge branch 'NewMaster' into LouDi_Quan 2025-04-23 10:16:15 +08:00
shenjianxing
4ce0b3e9cb 完善时间锁 2025-04-23 10:15:28 +08:00
shenjianxing
0acf4e1f0d Merge branch 'NewMaster' into LouDi_Quan 2025-04-23 10:13:21 +08:00
shenjianxing
c9f3add8a3 增加时间锁 2025-04-23 10:12:42 +08:00
shenjianxing
11d6ef27d4 Merge branch 'NewMaster' into LouDi_Quan 2025-04-23 10:03:23 +08:00
shenjianxing
ac5421d899 增加时间锁 2025-04-23 10:01:05 +08:00
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
837d74045a Merge branch 'master' into LouDi_Quan 2025-03-31 10:12:33 +08:00
shenjianxing
806bd0d404 增加VR相关 2025-03-31 08:39:35 +08:00
shenjianxing
499f68dde6 Merge branch 'master' into LouDi_Quan 2025-03-28 13:05:00 +08:00
shenjianxing
aa39e071e5 平台兼容性处理 2025-03-28 12:03:55 +08:00
shenjianxing
695e9b2fd9 Merge branch 'master' into LouDi_Quan 2025-03-28 09:38:10 +08:00
shenjianxing
a49daf71cf 增加打包自动删除非当前平台的资源包 2025-03-28 09:37:20 +08:00
shenjianxing
441984fc55 Merge branch 'master' into LouDi_Quan 2025-03-28 08:50:07 +08:00
shenjianxing
3de632f811 修改web平台资源加载问题 2025-03-28 08:48:11 +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
4591b00ea0 删除多余日志 2025-03-27 13:15:19 +08:00
shenjianxing
41c68a734a 修复web平台兼容性问题 2025-03-27 13:14:48 +08:00
shenjianxing
49b678288c Merge branch 'master' into LouDi_Quan 2025-03-27 10:17:01 +08:00
shenjianxing
b7c053dd0c 修复bug 2025-03-27 10:16:08 +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