Commit Graph

498 Commits

Author SHA1 Message Date
liuyu 36c6945209 缓存读取 2024-09-04 17:28:08 +08:00
liuyu 1597d53826 读取缓存 2024-09-04 17:12:56 +08:00
liuyu 8fdc47d314 保存场景缓存 2024-09-04 16:52:47 +08:00
liuyu 009110306d 工具栏显示BUG 2024-09-04 15:26:39 +08:00
liuyu eadf603199 在工具间模型上恢复穿戴 2024-09-04 14:07:58 +08:00
liuyu 8664ce8398 Merge branch 'main' into HQB_workspace
# Conflicts:
#	Assets/Scripts/Project/Manager/ProcessManager.cs
#	Assets/Scripts/Project/Manager/ReconnectMgr.cs
2024-09-04 13:38:06 +08:00
liuyu a79129a467 自动保存的启动放在ReconnectMgr中 2024-09-04 13:34:03 +08:00
YangHua 0a524559a7 Merge branch 'main' of http://37c67607.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-04 11:58:24 +08:00
YangHua c4fa2c867a 添加人物模型,修改提交按钮显示时间 分数面板 关闭按钮 2024-09-04 11:57:34 +08:00
liuyu 096c742205 分数读取后赋值 2024-09-04 10:38:36 +08:00
陈向学 f36b14dcc6 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-04 10:03:38 +08:00
陈向学 57b484c906 改动修复 2024-09-04 10:03:33 +08:00
liuyu e9827be83f 重连涉及的数据结构 2024-09-04 09:37:44 +08:00
liuyu e5638a87e9 添加脚本到主分支 2024-09-04 09:35:32 +08:00
liuyu ce401f8b53 Merge branch 'main' into HQB_workspace 2024-09-04 09:24:34 +08:00
陈向学 e66378f5f0 aaa 2024-09-03 20:00:30 +08:00
YangHua 33db48e5fd Merge branch 'main' of http://4ea9e602.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-03 18:32:36 +08:00
YangHua 9bf48dbacd 12 2024-09-03 18:32:30 +08:00
陈向学 7dfb8733ab Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-03 18:31:55 +08:00
陈向学 7d6b942a8a aa 2024-09-03 18:31:51 +08:00
YangHua c4d6ab745f 修改 掏出工具逻辑 2024-09-03 18:30:49 +08:00
YangHua 5f1e34b3d0 Merge branch 'main' of http://4ea9e602.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-03 18:02:14 +08:00
YangHua 066c238fea 添加分数获取 2024-09-03 17:58:25 +08:00
liuyu 165d08a8ec no message 2024-09-03 17:58:03 +08:00
陈向学 0aa001c950 现场设备大改,科目2 2024-09-03 17:57:49 +08:00
liuyu b5083fa17e 记录分数 2024-09-03 17:34:49 +08:00
liuyu 2adbebe563 还原现场触发物场景 2024-09-03 16:09:24 +08:00
liuyu aa02fffc38 Merge branch 'main' into HQB_workspace 2024-09-03 15:04:19 +08:00
liuyu 03735133df 记录现场设备状态 2024-09-03 14:58:28 +08:00
liuyu bcc75cf099 穿戴装备恢复 2024-09-03 14:24:02 +08:00
liuyu 36098d8173 右侧工具栏切换 2024-09-03 14:05:26 +08:00
liuyu da457d6aff 0903 2024-09-03 11:22:28 +08:00
liuyu a502be2aa0 工具和材料状态的保存 2024-09-03 10:53:32 +08:00
陈向学 8f0fc78f3e aa 2024-09-03 10:31:50 +08:00
YangHua 7ab75d4907 添加分数数据模型 2024-09-03 10:09:46 +08:00
陈向学 8c57515bb2 计分 2024-09-03 09:48:19 +08:00
liuyu 56eba812fe 获取场景内所有可以点击的物品 2024-09-03 09:38:55 +08:00
liuyu 254f54a708 0902 2024-09-02 22:30:24 +08:00
YangHua 21202a44af 添加分数UI 2024-09-02 20:20:04 +08:00
YangHua 842dcdbbd4 Merge branch 'main' of http://5a4e4c01.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-02 19:28:41 +08:00
YangHua bbf7dc948b 修改已知bug,修改流程。 2024-09-02 19:28:37 +08:00
陈向学 17edf664b7 npc对话 2024-09-02 19:10:22 +08:00
liuyu 97504b1e4b 保存工具 2024-09-02 19:04:31 +08:00
陈向学 42648d474e aa 2024-09-02 18:30:58 +08:00
陈向学 395c63e6b5 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-02 18:29:13 +08:00
陈向学 7f76d83eda a 2024-09-02 18:29:10 +08:00
YangHua 93832af2ab Merge branch 'main' of http://5a4e4c01.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-02 18:13:28 +08:00
YangHua 872aff659d 修改流程 2024-09-02 18:13:17 +08:00
liuyu 70ada07f3a 记录工具,材料,装备 2024-09-02 18:09:39 +08:00
陈向学 daac6e5ba6 q 2024-09-02 17:42:36 +08:00