59 Commits

Author SHA1 Message Date
shenjianxing
b0776906aa Merge branch 'NewMaster' into LouDi_Pig 2025-04-07 10:32:12 +08:00
shenjianxing
da52d47a20 完善VR适配 2025-04-07 10:30:35 +08:00
2a8c3a4892 Merge remote-tracking branch 'origin/NewMaster' into LouDi_Pig 2025-04-03 13:56:57 +08:00
shenjianxing
ffc4ac6b86 修复 VR 中 UIBtns位置问题
开放 VR 中 默认镜头和近距离镜头
2025-04-03 13:55:07 +08:00
5f4c7e4347 合并主线 2025-04-02 16:55:08 +08:00
shenjianxing
4b38a930f6 修复vr适配bug 2025-03-31 16:47:41 +08:00
shenjianxing
5105a9b9ab 适配VR 2025-03-31 16:07:26 +08:00
shenjianxing
806bd0d404 增加VR相关 2025-03-31 08:39:35 +08:00
shenjianxing
2fd97a417f Merge branch 'master' into LouDi_Pig 2025-03-28 13:10:22 +08:00
shenjianxing
aa39e071e5 平台兼容性处理 2025-03-28 12:03:55 +08:00
shenjianxing
a4561a71bd Merge branch 'master' into LouDi_Pig 2025-03-28 10:17:00 +08:00
shenjianxing
33cf6c66db 修改平台适配bug 2025-03-28 10:15:48 +08:00
shenjianxing
f8a7766a5e 资源搜索的字符串匹配bug 2025-03-28 09:58:45 +08:00
shenjianxing
f429a4d202 Merge branch 'master' into LouDi_Pig 2025-03-28 09:48:32 +08:00
shenjianxing
3de632f811 修改web平台资源加载问题 2025-03-28 08:48:11 +08:00
shenjianxing
893972e0b8 Merge branch 'master' into LouDi_Pig 2025-03-27 15:56:09 +08:00
shenjianxing
909d8d0f5b 修改框架层逻辑 2025-03-27 15:48:22 +08:00
shenjianxing
0f2f49dd01 修复Condition or的bug 2025-03-26 14:56:09 +08:00
4f20ae9d5c 合并主线新功能 2025-03-24 15:32:48 +08:00
shenjianxing
77ebcb713b 完善VR版逻辑 2025-03-24 10:32:48 +08:00
shenjianxing
3359efe49d VR适配 2025-03-20 17:31:29 +08:00
shenjianxing
0199ff16fb VR兼容性处理 2025-03-20 15:33:31 +08:00
shenjianxing
cd482fde08 适配VR一体机 2025-03-20 13:21:32 +08:00
shenjianxing
55a59d57d2 修改VR相机设置 2025-03-20 09:55:13 +08:00
shenjianxing
76462dadbd 针对vr一体机进行修改逻辑 2025-03-19 16:31:17 +08:00
shenjianxing
26e73c995e 新增默认loading页面删除 2025-03-19 14:35:54 +08:00
a0425c7029 合并 2025-03-13 15:20:00 +08:00
shenjianxing
b1682e11d0 增加滑动速度和乱序的设置 2025-03-07 15:06:15 +08:00
194d094fb2 修改flyCamera 组件为第一人称控制器,去掉圆形碰撞器和刚体。提交Devic从xml中读取颜色 2025-03-05 15:12:57 +08:00
67f0c1afa6 合并,保留自己main场景 2025-02-21 17:23:15 +08:00
41035a27d6 修改仔猪动画,更换注射器针头 2025-02-21 17:22:07 +08:00
shenjianxing
e35b8d4577 修改UI层级 2025-02-20 13:22:29 +08:00
5b7bb980cf 解决冲突,合并 2025-02-14 15:38:18 +08:00
shenjianxing
701f90314c 开发3D解剖相关功能 2025-02-12 17:36:00 +08:00
da910ea47e Merge remote-tracking branch 'origin/master' into LouDi_Pig 2025-01-09 13:07:51 +08:00
shenjianxing
87df550d4a 默认剧中 2025-01-08 17:33:21 +08:00
4e0aab07f4 合并 2025-01-07 16:37:47 +08:00
shenjianxing
fd9d770b71 提交VR的UIRoot 2025-01-03 17:00:55 +08:00
shenjianxing
5bae7022c2 导入未来立体SDK 2025-01-03 13:42:53 +08:00
1f23b17ce8 Merge remote-tracking branch 'origin/master' into LouDi_Pig 2024-12-31 09:19:06 +08:00
shenjianxing
c3f7e8949e 解决webgl音频播放问题 2024-12-30 20:55:37 +08:00
765f536d11 Merge remote-tracking branch 'origin/master' into LouDi_Pig 2024-12-30 16:43:38 +08:00
shenjianxing
148a02ee99 增加UI关闭 2024-12-30 16:42:29 +08:00
07fa4680a4 Merge remote-tracking branch 'origin/master' into LouDi_Pig 2024-12-30 16:36:43 +08:00
shenjianxing
7f46db91b8 修复UI消失的bug 2024-12-30 16:29:29 +08:00
66267fc6b0 Merge remote-tracking branch 'origin/master' into LouDi_Pig 2024-12-24 16:25:52 +08:00
shenjianxing
2ea7b6a7a1 完善Action
增加webgl报告下载功能
2024-12-23 18:14:25 +08:00
shenjianxing
89231a48d8 修复web平台txt类型的文件加载bug 2024-12-23 12:02:28 +08:00
2ff08ad3c0 Merge remote-tracking branch 'origin/master' into LouDi_Pig 2024-12-19 17:20:07 +08:00
shenjianxing
b58945ac2b 新增LineAction
新增考核模式打开成绩页面
2024-12-19 15:25:22 +08:00