369 Commits

Author SHA1 Message Date
shenjianxing
f73c3cb3b2 Merge branch 'master' into LouDi_Quan 2025-01-22 18:22:03 +08:00
shenjianxing
d425a98349 修复bug 2025-01-22 18:21:15 +08:00
shenjianxing
3130d377ab 修改场景 2025-01-22 18:20:32 +08:00
shenjianxing
577a2be0e5 根据反馈修改 2025-01-22 16:38:25 +08:00
shenjianxing
2e69befd82 更新场景 2025-01-22 13:59:10 +08:00
shenjianxing
fabedfdeb9 修改无菌敷料 2025-01-22 13:26:56 +08:00
shenjianxing
d97739d0c9 更新逻辑 2025-01-22 13:22:22 +08:00
shenjianxing
9486baa83e 合并 2025-01-22 12:59:17 +08:00
shenjianxing
605c4b1ada 修改bug 2025-01-22 12:58:27 +08:00
shenjianxing
0f8a911f77 修改洗手部分逻辑 2025-01-22 12:50:16 +08:00
shenjianxing
8635b312ba Merge branch 'master' into LouDi_Quan 2025-01-22 11:04:15 +08:00
shenjianxing
614b3e4425 报空判断 2025-01-22 11:03:42 +08:00
shenjianxing
7e986d69b9 合并 2025-01-22 11:01:24 +08:00
shenjianxing
6228329b2a 物体未显示时直接finish 2025-01-22 10:59:25 +08:00
shenjianxing
f15bc63b15 更新场景 2025-01-22 10:43:23 +08:00
shenjianxing
af2e95e7e1 Merge branch 'master' into LouDi_Quan 2025-01-22 10:34:42 +08:00
shenjianxing
a28f22f38a 增加跳步关闭高亮状态 2025-01-22 10:33:42 +08:00
shenjianxing
29eeece3d1 更新逻辑和美术资源 2025-01-22 10:32:24 +08:00
shenjianxing
0fab0b0b6e 修改为女角色助手帮系手术服 2025-01-22 09:26:03 +08:00
shenjianxing
a8c9508e99 改回时间缩放设置 2025-01-21 23:08:44 +08:00
shenjianxing
7e1f92a899 修改逻辑 2025-01-21 22:51:14 +08:00
shenjianxing
b776c719cd Merge branch 'master' into LouDi_Quan 2025-01-21 11:54:01 +08:00
shenjianxing
677825a26e 3D交互点跳步自动删除 2025-01-21 11:47:12 +08:00
shenjianxing
c25040fa14 Merge branch 'master' into LouDi_Quan 2025-01-21 10:09:20 +08:00
shenjianxing
6c5aa4b7be 避免没有参数时 相机移动 2025-01-21 10:08:13 +08:00
bdb69a82c1 Merge branch 'LouDi_Quan' of http://git.dragonwxl.cn:8080/loudizhiye/virtualframework into LouDi_Quan 2025-01-20 19:32:17 +08:00
dbb9174ae9 修改场景 2025-01-20 19:32:04 +08:00
shenjianxing
a3b95e9f73 Merge branch 'master' into LouDi_Quan 2025-01-20 18:43:19 +08:00
shenjianxing
10f1b0b052 扩展cameraSwitch功能 2025-01-20 18:42:51 +08:00
shenjianxing
e9315c7842 Merge branch 'master' into LouDi_Quan 2025-01-20 18:30:06 +08:00
shenjianxing
c24cfe0832 跳步骤时取消device高亮
增加报错日志
2025-01-20 18:28:24 +08:00
shenjianxing
523af974b7 删掉场景相机 2025-01-20 17:16:00 +08:00
shenjianxing
f9ed2637b5 Merge branch 'master' into LouDi_Quan 2025-01-20 10:59:56 +08:00
shenjianxing
2571489ea4 去掉日志 2025-01-20 10:58:51 +08:00
shenjianxing
e04e6d1dc8 fbx改为可读写 2025-01-20 10:57:54 +08:00
shenjianxing
246507dea9 Merge branch 'master' into LouDi_Quan 2025-01-19 19:47:56 +08:00
shenjianxing
378ebcde83 修改状态机bug 2025-01-19 19:47:16 +08:00
shenjianxing
af1a78cc13 更新逻辑 2025-01-19 19:45:57 +08:00
shenjianxing
50a400d125 Merge branch 'master' into LouDi_Quan 2025-01-19 17:14:15 +08:00
shenjianxing
cbf6cde0b0 新增动态更换材质球和贴图功能 2025-01-19 17:13:40 +08:00
shenjianxing
8c5af0f9e2 更新美术资源 2025-01-19 17:12:45 +08:00
shenjianxing
0484cde42a Merge branch 'master' into LouDi_Quan 2025-01-19 13:34:04 +08:00
shenjianxing
4799acc1ed 修复切换bug 2025-01-19 13:33:25 +08:00
shenjianxing
8989c381b6 Merge branch 'master' into LouDi_Quan 2025-01-19 11:21:09 +08:00
shenjianxing
15a78a6296 修改评分支持多模块显示 2025-01-19 11:20:01 +08:00
shenjianxing
a485a6252b Merge branch 'master' into LouDi_Quan 2025-01-16 19:00:19 +08:00
shenjianxing
384a80b84a 扩展result支持autoHide 2025-01-16 18:57:42 +08:00
shenjianxing
b3c65c8a2a Merge branch 'master' into LouDi_Quan 2025-01-16 18:49:07 +08:00
shenjianxing
b5a79921a9 动画停止 2025-01-16 18:48:37 +08:00
shenjianxing
0c7201e577 Merge branch 'master' into LouDi_Quan 2025-01-16 18:32:09 +08:00