Commit Graph

48 Commits

Author SHA1 Message Date
62b2f3e5a5 Merge branch 'main' of https://gitea.joylink.club/joylink/godot-psd-training 2024-04-28 17:51:56 +08:00
c231567bef 调整对话框布局添加滚动条容器 2024-04-28 17:51:10 +08:00
joylink_zhaoerwei
38eb629fb9 lcb钥匙使用逻辑修改:对于同一个LCB,已经插入钥匙,就不能再插入钥匙;在切换LCB的时候,不能重置已经插入的钥匙 2024-04-28 15:51:51 +08:00
joylink_fanyuhong
f8889907b2 Merge branch 'main' of https://gitea.joylink.club/joylink/godot-psd-training into main 2024-04-28 11:22:07 +08:00
joylink_fanyuhong
a2bd1bca0c jjtc调整 2024-04-28 11:21:59 +08:00
d1f3020d58 Merge branch 'main' of https://gitea.joylink.club/joylink/godot-psd-training 2024-04-26 18:29:51 +08:00
acd0667de2 实训流程构思 2024-04-26 18:29:21 +08:00
joylink_fanyuhong
30e7834bc4 Merge branch 'main' of https://gitea.joylink.club/joylink/godot-psd-training into main 2024-04-26 17:42:47 +08:00
joylink_fanyuhong
c66adbd545 调整暂提 2024-04-26 17:42:44 +08:00
joylink_zhaoerwei
d36521cee3 换车+增加两个钥匙素材 2024-04-26 16:54:17 +08:00
joylink_fanyuhong
d22fd150e2 紧急停车调整 2024-04-26 15:14:40 +08:00
joylink_zhaoerwei
ce95b9f3da 删除gltf模型 2024-04-25 17:54:10 +08:00
joylink_zhaoerwei
d1af9940de 脚本生成屏蔽门+所有模型用blender 2024-04-25 17:47:45 +08:00
joylink_zhaoerwei
94fe3a553a 组装车-可选4编组和6编组 2024-04-25 17:00:46 +08:00
joylink_zhaoerwei
d0b0125c50 使用钥匙播放音频备用 2024-04-25 09:46:41 +08:00
joylink_fanyuhong
cdb5c236d5 Merge branch 'main' of https://gitea.joylink.club/joylink/godot-psd-training into main 2024-04-23 18:06:39 +08:00
joylink_fanyuhong
23dc1835fe jjtc调整 2024-04-23 18:06:31 +08:00
joylink_zhaoerwei
a304ee868d 选择钥匙后切换激活的面板 2024-04-23 17:20:15 +08:00
joylink_fanyuhong
96596fcdcd Revert "jjtc调整"
This reverts commit 612c921e
2024-04-23 17:13:05 +08:00
joylink_fanyuhong
367801e151 Revert "jjtc调整"
This reverts commit 10c1767c
2024-04-23 16:55:56 +08:00
joylink_fanyuhong
10c1767cfa jjtc调整 2024-04-23 15:13:48 +08:00
joylink_fanyuhong
bfff2b2104 Merge branch 'main' of https://gitea.joylink.club/joylink/godot-psd-training into main 2024-04-23 15:12:59 +08:00
joylink_fanyuhong
612c921e5b jjtc调整 2024-04-23 15:11:36 +08:00
joylink_zhaoerwei
1f67ca4af8 打开Lcb面板前重置面板 2024-04-23 09:52:55 +08:00
joylink_zhaoerwei
ba07ffccce psl面板调整 2024-04-23 09:33:07 +08:00
joylink_zhaoerwei
8cbdca61b1 psl交互 2024-04-22 15:32:19 +08:00
joylink_zhaoerwei
3468ddcf3b lcb显示调整+打开的lcb带编号 2024-04-22 10:57:46 +08:00
joylink_zhaoerwei
e26fa7b94f psl面板备用 2024-04-19 17:48:20 +08:00
fan
953167d62c lcb调整 2024-04-19 15:46:44 +08:00
fan
464dd1d593 lcb调整 2024-04-19 15:35:48 +08:00
fan
39cb302f83 Merge branch 'main' of https://gitea.joylink.club/joylink/godot-psd-training 2024-04-19 15:30:06 +08:00
fan
b1a654c76e lcb2=>lcb 2024-04-19 15:29:33 +08:00
38727dfffd Merge branch 'main' of https://gitea.joylink.club/joylink/godot-psd-training 2024-04-18 19:03:04 +08:00
joylink_zhaoerwei
04f87e8fc3 lcb控制屏蔽门初提交 2024-04-17 15:26:37 +08:00
joylink_zhaoerwei
b28b8ec954 增加公共的节点工具函数 2024-04-17 11:12:33 +08:00
1546d8e3ad merge 2024-04-17 08:47:31 +08:00
8fad049881 README更新 2024-04-17 08:45:37 +08:00
fan
afbf156238 Merge branch 'main' of https://gitea.joylink.club/joylink/godot-psd-training 2024-04-16 17:00:12 +08:00
fan
d3078b770b lcb调整 2024-04-16 17:00:05 +08:00
joylink_zhaoerwei
0eb014caa4 换车 2024-04-16 14:16:39 +08:00
a9a42f513a merge 2024-04-16 10:22:28 +08:00
eaf378322c 调整项目结构,添加根据URL参数加载相应实训场景的scene_loader场景
实验录音及播放
2024-04-16 10:10:18 +08:00
fan
9e81c377ef lcb调整 2024-04-16 09:46:51 +08:00
fan
2787df0173 Merge branch 'main' of https://gitea.joylink.club/joylink/godot-psd-training 2024-04-15 14:54:17 +08:00
fan
907a89402e LCB2调整暂提 2024-04-15 14:54:06 +08:00
joylink_zhaoerwei
d811627acc 旋转场景灯的角度 2024-04-12 16:55:38 +08:00
joylink_zhaoerwei
a4842c4888 场景结构调整 2024-04-12 15:01:34 +08:00
joylink_zhaoerwei
61885e6d73 初提交-场景搭建 2024-04-12 11:06:25 +08:00