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

334 Commits

Author SHA1 Message Date
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 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
YangHua 9bf48dbacd 12 2024-09-03 18:32:30 +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
YangHua 7ab75d4907 添加分数数据模型 2024-09-03 10:09:46 +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
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 e2bc09bd19 串UI 串逻辑 2024-09-02 13:47:03 +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 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
liuyu f5dbbc4842 学习结束后跳出Tips 2024-08-30 16:08:15 +08:00
YangHua 3ca2d5ecb8 修改垃圾触发逻辑 2024-08-30 14:52:04 +08:00
YangHua 1a4ec4d0e7 修改清理杂物判断逻辑 2024-08-30 14:33:19 +08:00
YangHua 4766fa4d06 Merge branch 'main' of http://7d2f0537.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-08-30 13:26:49 +08:00
YangHua 148ed39fbf 换名称 2024-08-30 13:26:36 +08:00
陈向学 436a5c2213 d 2024-08-30 11:14:02 +08:00
陈向学 d8c5f310db 打分 2024-08-30 10:12:22 +08:00
YangHua 404e4c6277 Merge branch 'main' of http://7d2f0537.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-08-30 09:37:20 +08:00
YangHua 642aee7904 优化 2024-08-30 09:37:15 +08:00
taosuqi 517e0b1899 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology into main 2024-08-30 09:09:58 +08:00
taosuqi 2f2768686e 早上提交 2024-08-30 09:09:51 +08:00
YangHua d08e92b26d 注册事件 2024-08-29 21:18:02 +08:00
YangHua c01e05ddef Merge branch 'main' of http://7d2f0537.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-08-29 20:23:51 +08:00
YangHua ade9b0e327 修改背包按钮根据场景名设置 2024-08-29 20:23:41 +08:00
陈向学 25ee0c522d Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-29 19:54:49 +08:00
陈向学 33f7e9de9a 开始结束事件 2024-08-29 19:54:45 +08:00
YangHua d78414e923 添加跳转流程提示 2024-08-29 19:46:36 +08:00
YangHua f6e4f487e7 Merge branch 'main' of http://7d2f0537.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-08-29 19:29:29 +08:00
YangHua a156a7a228 优化流程代码 2024-08-29 19:23:37 +08:00
taosuqi 72aad3aa78 换装镜 2024-08-29 18:39:29 +08:00
YangHua 8cc5f369f5 添加步骤完成提示，修复封印提示问题 2024-08-29 17:54:36 +08:00
YangHua be5850143a 添加完成流程步骤triggerID提示 2024-08-29 15:45:05 +08:00
YangHua e3c406b080 添加告知任务单 2024-08-29 14:35:38 +08:00
YangHua f09f10fd0c 修改imageTips逻辑,修改任务书逻辑 2024-08-29 14:04:52 +08:00
taosuqi d965c009e1 修改任务书动画 2024-08-29 09:37:39 +08:00
YangHua f796755ef4 修改提示问题，修改收回工具逻辑，修改继承重载问题，修改流程triggerID实时更新的问题 2024-08-29 00:38:45 +08:00
陈向学 20312ee14d 打分 2024-08-28 19:19:02 +08:00
陈向学 6e3ba07fe0 对话 2024-08-28 16:38:04 +08:00
陈向学 7c296885b4 s 2024-08-28 16:32:25 +08:00
陈向学 01eea00395 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-28 16:09:27 +08:00
陈向学 afed813ff8 打分 2024-08-28 16:08:13 +08:00
taosuqi dec8d77655 使用DoTween制作打字机 2024-08-28 16:06:01 +08:00
taosuqi b2c9225ad4 搭建UI_DisassemblyAssemblyNoticePanel面板 2024-08-28 15:59:20 +08:00
YangHua 88a543934d 修改注册事件调用时间 2024-08-28 14:56:55 +08:00
YangHua 3190e71b7d 修改高亮获取逻辑 2024-08-28 14:33:32 +08:00
YangHua 0965c83a64 修改toolTips显示逻辑 2024-08-28 14:10:31 +08:00
YangHua 4e494419a4 添加背景遮挡 2024-08-28 11:06:29 +08:00
YangHua 57338dc352 修改注册事件 2024-08-27 18:56:19 +08:00
YangHua 704dfbf569 修改提示 2024-08-27 17:25:09 +08:00
YangHua f6f03a7fbf 修改单列 2024-08-27 17:12:14 +08:00
YangHua 6dc3268c58 添加ui提示 2024-08-27 15:57:29 +08:00