WangWeiZhi
/
YanCheng_Metrology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
604 Commits 2 Branches 0 Tags 705 MiB
Commit Graph

461 Commits

Author SHA1 Message Date
liuyu 3c9b1c9a8a 读取场景缓存 2024-09-04 17:54:42 +08:00
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
陈向学 f80a72846c Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-04 16:02:51 +08:00
陈向学 8a181b9fe8 dd 2024-09-04 16:02:47 +08:00
YangHua 8eacd5c099 Merge branch 'main' of http://37c67607.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-04 15:56:29 +08:00
YangHua 52bd5396a9 修改常驻基类 2024-09-04 15:55:52 +08:00
liuyu 009110306d 工具栏显示BUG 2024-09-04 15:26:39 +08:00
陈向学 3348ef079e aaaaa 2024-09-04 15:25:57 +08:00
陈向学 dd97946d12 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-04 15:25:44 +08:00
YangHua 551ce83487 修改穿透问题 2024-09-04 15:24:48 +08:00
陈向学 d9325fdba9 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-04 15:12:20 +08:00
陈向学 e67b5836a1 新科目 2024-09-04 15:12:10 +08:00
YangHua b771e1d8fe Merge branch 'main' of http://37c67607.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-04 14:45:07 +08:00
YangHua fe3e2d3e9d 添加动画只能播放一次 2024-09-04 14:44:59 +08:00
liuyu 11854f7fd6 scene中挂载ReconnectMgr；自动保存移出ProcessManager;工具间模型恢复时穿戴装备; 2024-09-04 14:20:35 +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
陈向学 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
陈向学 f5b411a98f Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-02 17:21:23 +08:00
陈向学 2dd72fa3d4 aa 2024-09-02 17:21:20 +08:00
liuyu 1397e0e6ff GM中添加初始化 2024-09-02 17:19:46 +08:00
liuyu 344a6badcb 在ProcessManager中添加自动保存的相关协程 2024-09-02 17:17:20 +08:00
YangHua 2273c14be7 Merge branch 'main' of http://5a4e4c01.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-02 16:14:40 +08:00
YangHua b1da4d58c6 修改流程 2024-09-02 16:14:35 +08:00
陈向学 55ef60e077 s 2024-09-02 16:13:16 +08:00
liuyu b00a57c15a Merge branch 'main' of http://git.umayle.com/WangWeiZhi/YanCheng_Metrology 2024-09-02 15:18:37 +08:00
liuyu b31f0f125d 重连功能:可以保存当前子步骤,可以手动调用触发子步骤切换 2024-09-02 15:18:32 +08:00
YangHua c412b1cd99 Merge branch 'main' of http://5a4e4c01.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-02 15:13:42 +08:00
YangHua d36b07d783 添加重置学习和重新练习 2024-09-02 15:13:33 +08:00
陈向学 b3a1963bba ddddd 2024-09-02 15:09:23 +08:00
YangHua 980e89a2b0 Merge branch 'main' of http://5a4e4c01.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-02 13:47:08 +08:00
YangHua e2bc09bd19 串UI 串逻辑 2024-09-02 13:47:03 +08:00
陈向学 5d752987aa 验电笔回手里 2024-09-02 13:19:38 +08:00
YangHua 05fc465f26 Merge branch 'main' of http://5a4e4c01.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-02 11:30:18 +08:00
YangHua f9a98b6c78 删除不必要得场景 2024-09-02 11:30:07 +08:00
陈向学 316a5c2b8f 门交互 2024-09-02 10:49:35 +08:00
陈向学 837eabc069 ss 2024-09-02 09:43:07 +08:00
YangHua e307c989aa 修复一些已经bug 2024-09-01 19:17:44 +08:00
YangHua b1e6a750a3 修改数据读取 2024-09-01 18:37:49 +08:00
陈向学 33b9624624 配置改成xml 2024-09-01 16:23:50 +08:00
YangHua 25b679ada9 修改缩放之后，旋转、移动灵敏度问题，添加缩放和工具提示联动，添加顶部状态显示隐藏逻辑，修复一些已知bug. 2024-09-01 00:10:59 +08:00
YangHua 1444dc395f 修改 接线完好不高亮问题 2024-08-30 18:35:28 +08:00
YangHua 070cfd4014 合并 2024-08-30 18:07:22 +08:00
YangHua fb931b9b7c 修改收回逻辑 2024-08-30 18:07:00 +08:00
陈向学 0966d0e826 aaaa 2024-08-30 18:06:33 +08:00
YangHua f3cfd65e99 修改数据 2024-08-30 16:45:37 +08:00
YangHua 19c7ba55bf Merge branch 'main' of http://7d2f0537.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-08-30 16:37:11 +08:00
YangHua da9cef79e3 修改练习问题 2024-08-30 16:37:08 +08:00
陈向学 7537c5e5d1 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-30 16:35:40 +08:00
陈向学 f91388e3d2 配置表 2024-08-30 16:35:34 +08:00
liuyu f5dbbc4842 学习结束后跳出Tips 2024-08-30 16:08:15 +08:00
YangHua 3ca2d5ecb8 修改垃圾触发逻辑 2024-08-30 14:52:04 +08:00
YangHua 55c6275293 Merge branch 'main' of http://7d2f0537.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-08-30 14:33:23 +08:00
YangHua 1a4ec4d0e7 修改清理杂物判断逻辑 2024-08-30 14:33:19 +08:00
陈向学 903084333c Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-30 14:10:04 +08:00
陈向学 e50f397089 开关门 2024-08-30 14:10:01 +08:00