Commit Graph

90 Commits

Author SHA1 Message Date
jiangbingqing 9a16019d10 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-14 16:10:20 +08:00
jiangbingqing 6ed64493b2 给任务书设置外配和接口 2024-08-14 16:10:08 +08:00
YangHua 29835b014d 添加tool ID判断逻辑,串起来:任务接受面,办理工作票面板,低压工作票面板(没有逻辑)。 2024-08-14 16:02:23 +08:00
YangHua 4a475272d6 修改相机渲染模式 2024-08-14 13:22:48 +08:00
jiangbingqing 4bfdff3dfd Assets/ArtRes/Fonts/SourceHanSansCN-Bold SDF.asset
Assets/ArtRes/Fonts/SourceHanSansCN-Regular SDF.asset
2024-08-14 13:12:42 +08:00
jiangbingqing aaad074cab UI_CheckTaskPanel 2024-08-14 13:08:11 +08:00
YangHua f4da835050 替换高亮插件,改为urp模式, 2024-08-14 10:23:52 +08:00
YangHua 40f60b3936 修复字体,修改数据配置,添加subprocessstep中toolID,修改数据类 2024-08-13 15:34:42 +08:00
taosuqi 642de03192 融合 2024-08-13 14:01:49 +08:00
taosuqi d9b074fab8 8.13ItemTips面板提交 2024-08-13 13:51:30 +08:00
YangHua 0bed57a113 融合 2024-08-13 10:39:36 +08:00
YangHua c4bf531309 融合 2024-08-13 10:39:02 +08:00
Victor_Wang ca2a071b35 修改了工具间场景 2024-08-13 10:34:04 +08:00
YangHua dbde0b3f2a 添加步骤提示逻辑 2024-08-13 10:12:00 +08:00
jiangbingqing 6614870952 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-13 09:28:15 +08:00
taosuqi 3d36f08aba 8.12下班提交 2024-08-12 18:08:53 +08:00
Victor_Wang 1830d9dc02 背包模块UI和数据部分 2024-08-12 16:30:44 +08:00
jiangbingqing b70b419f9b Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology
# Conflicts:
#	Assets/ArtRes/Fonts/SourceHanSansCN-Regular SDF.asset
2024-08-12 16:00:28 +08:00
jiangbingqing 22e1d75209 UI_CheckTaskPanel 2024-08-12 15:59:01 +08:00
taosuqi 3128a34d7e Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology into main 2024-08-12 10:58:34 +08:00
Victor_Wang b7a988e10c 1 2024-08-12 10:38:06 +08:00
Victor_Wang 600b7e747c 1 2024-08-12 10:36:45 +08:00
taosuqi 0450907a82 工具类预制体的创建,物体高亮,物体名牌显示 2024-08-12 10:34:40 +08:00
YangHua 311226f057 修改工具类实现 2024-08-12 10:00:32 +08:00
YangHua 6cb3656fee 修改UI_MenuBar、UI_MenuBar.cs、UI_SelectDevicePanel、UI_SelectDevicePanel.cs、串UI,添加流程管理逻辑(目前能在办公室点击手机测试)15%。 2024-08-12 00:33:10 +08:00
YangHua 2a33a25eaa 修改UI_TaskListPanel,填processItem、subProcessItem、UI_ProcessItem.cs、UI_SubProcessItem.cs 2024-08-10 22:52:27 +08:00
Victor_Wang 71feb111de 淡入淡出完成 2024-08-09 16:59:40 +08:00
Victor_Wang 9f85a2fafa UTF8 2024-08-09 15:23:21 +08:00
taosuqi 1914ef2e33 修改UIMenuBar 2024-08-08 16:24:58 +08:00
taosuqi 2f53239f81 修改UI_MenuBar 2024-08-08 16:14:25 +08:00
taosuqi 4a609a86ed UI_MenuBar重新修改 2024-08-08 15:46:31 +08:00
Victor_Wang f2a1ecff00 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-08 15:00:55 +08:00
Victor_Wang f14f44a0dd 现在ui_maintitle为唯一标题 2024-08-08 15:00:51 +08:00
YangHua 6d28f0809d Merge branch 'main' of http://4ddd0555.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-08-08 13:56:39 +08:00
YangHua c2f90de982 1212 2024-08-08 13:56:34 +08:00
Victor_Wang 0eaddabba7 1 2024-08-08 13:53:20 +08:00
Victor_Wang 6dc9c3a8ef 1 2024-08-08 13:52:48 +08:00
Victor_Wang 183674cc5c 跑到办公室 2024-08-08 13:51:29 +08:00
YangHua fd73eacc89 Merge branch 'main' of http://4ddd0555.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-08-08 11:27:25 +08:00
YangHua b8f2efff51 扩充工具脚本基类,修改字段名称 2024-08-08 11:25:58 +08:00
taosuqi 1a248940b8 UI_MenuBar重新修改 2024-08-08 11:19:05 +08:00
taosuqi 15b1f9a19a UI_SessionPanel重新修改 2024-08-08 10:53:55 +08:00
Victor_Wang 485bdf0587 1 2024-08-08 10:49:28 +08:00
Victor_Wang a17272eb57 添加了odin,基本实现了选择设备方案面板 2024-08-08 10:47:29 +08:00
2274240467@qq.com 66044431de 修改面板陶芮奇 2024-08-07 22:01:54 +08:00
Victor_Wang d8168242dd ui 2024-08-07 18:07:12 +08:00
Victor_Wang b4ab729686 ui 2024-08-07 18:06:36 +08:00
jiangbingqing f4a5672c04 ui 2024-08-07 17:34:27 +08:00
jiangbingqing 57bff825f1 ui修改 2024-08-07 16:59:45 +08:00
taosuqi d6c3ad2d15 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology into main 2024-08-07 14:37:16 +08:00