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

363 Commits

Author SHA1 Message Date
陈向学 8381ccb607 工具 2024-08-21 15:27:21 +08:00
YangHua cd1bbc0b64 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-21 13:43:26 +08:00
YangHua 7d6468af15 修改背包item 2024-08-21 13:43:21 +08:00
陈向学 8f07996c68 改现场场景 2024-08-21 13:42:42 +08:00
陈向学 a05111a86c 1 2024-08-21 11:03:08 +08:00
陈向学 b20fab1d5c 设备 2024-08-21 11:01:42 +08:00
YangHua ab5201fdfc 添加Icon,修改背包Item逻辑。 2024-08-21 11:00:13 +08:00
YangHua 2299f60adf Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-20 19:46:49 +08:00
YangHua ee90d20e8e 修改完成人物检视逻辑 2024-08-20 19:46:44 +08:00
陈向学 3b8e990f59 新模型 2024-08-20 19:37:12 +08:00
YangHua 885839a586 修改枚举 2024-08-20 18:46:46 +08:00
YangHua e4e910b0f7 融合 2024-08-20 18:39:30 +08:00
YangHua 3c2f3f7f3c 1 2024-08-20 18:38:58 +08:00
陈向学 eaffd074c1 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-20 18:38:12 +08:00
陈向学 92c9ff8cba 现场功能 2024-08-20 18:37:07 +08:00
YangHua e9f71f53c5 修改背包逻辑 2024-08-20 18:35:54 +08:00
taosuqi 528ab457b3 UI增加背景 2024-08-20 16:46:43 +08:00
taosuqi 779949699e 办公室对话框 2024-08-20 15:17:15 +08:00
taosuqi 9f70a7287f Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology into main 2024-08-20 13:51:16 +08:00
YangHua c6f4b2eeeb Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-20 11:00:39 +08:00
YangHua c5009ae3f3 扩展背包逻辑 2024-08-20 11:00:35 +08:00
陈向学 aea67c6e65 修改工具预制体 2024-08-20 10:59:57 +08:00
taosuqi f8302d4ba1 陶睿祺8.20 2024-08-20 10:39:10 +08:00
YangHua 6ff48f9479 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-20 09:12:43 +08:00
YangHua 3792f11f31 修改人物检视面板，导入换装人物 2024-08-20 09:12:37 +08:00
陈向学 87aa0014ef Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-19 16:36:31 +08:00
陈向学 4066f06c5f 工具，设备脚本 2024-08-19 16:36:17 +08:00
YangHua 6c8dd0d836 修改人物检视面板 2024-08-19 16:33:03 +08:00
YangHua b806219824 修改点击流程直接跳转得效果 2024-08-19 16:30:57 +08:00
YangHua 8f6bbe180d 修改常驻 2024-08-19 16:11:08 +08:00
Victor_Wang 4f22cb6455 监视面板功能初步实现 2024-08-19 13:39:25 +08:00
Victor_Wang 0f1d865053 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 
# Conflicts:
#	Assets/ArtRes/Fonts/SourceHanSansCN-Regular SDF.asset
#	Assets/Resources/UI/UI_Panel/UI_LowTensionWorkTicketPanel.prefab
#	Assets/Resources/UI/UI_Panel/UI_ToolAndMaterialPanel.prefab
#	Assets/Scripts/Project/UI/UI_Panel/UI_LowTensionWorkTicketPanel.cs
 2024-08-19 08:37:23 +08:00
Victor_Wang 7c24ca0e0f 修改ui面板 2024-08-19 08:35:05 +08:00
陈向学 a7f0a1599e s 2024-08-18 18:18:02 +08:00
YangHua 9ba66cc8aa Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-18 16:44:29 +08:00
YangHua dacd551eee 添加现场模型 2024-08-18 16:39:48 +08:00
陈向学 5be363155d W 2024-08-18 16:32:40 +08:00
YangHua 790ad8bb10 完成背包功能，制作镜子效果，完善流程逻辑 2024-08-16 22:23:39 +08:00
YangHua 9b5349a6e4 完成背包功能，制作镜子效果，优化流程。 2024-08-16 22:22:59 +08:00
陈向学 5f4f46238f 初始化步骤 2024-08-16 18:52:25 +08:00
taosuqi 4c35da26aa 融合 2024-08-16 18:14:56 +08:00
taosuqi 3f9b5524a8 对话框面板 2024-08-16 18:08:22 +08:00
陈向学 8c215ddeac 初始状态 2024-08-16 17:54:19 +08:00
陈向学 7b39d4d90d 步骤初始化测试 2024-08-16 17:40:58 +08:00
YangHua 27a2039d30 同步 2024-08-16 17:33:44 +08:00
YangHua 6289970347 修改config表格T_Scheme数据结构，添加背包数据类，修改背包逻辑，添加脚本ToolRoomManager,修改工具选择脚本。 2024-08-16 17:17:13 +08:00
YangHua 1f57690529 修改config表格T_Scheme数据结构，添加背包数据类，修改背包逻辑，添加脚本ToolRoomManager,修改工具选择脚本。 2024-08-16 17:15:38 +08:00
taosuqi 520b72986c 修改ui自适应大小陶睿祺 2024-08-16 14:02:32 +08:00
taosuqi 2633450d10 修改ui陶睿祺 2024-08-16 10:48:22 +08:00
taosuqi e16e5d4c09 修改工具面板 2024-08-15 21:28:36 +08:00
taosuqi bcb3764573 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology into main 2024-08-15 20:38:50 +08:00
taosuqi 8e36bd262c 1 2024-08-15 20:38:45 +08:00
YangHua dd94f0cb87 优化流程 2024-08-15 20:38:04 +08:00
taosuqi b440a3f564 合并融合 2024-08-15 20:34:31 +08:00
taosuqi 2a27c3bf7a 融合 2024-08-15 20:33:25 +08:00
YangHua dcdd6d4f65 融合 2024-08-15 18:39:10 +08:00
YangHua 7e6fb04a62 添加提示逻辑 2024-08-15 18:37:01 +08:00
jiangbingqing c81664e0bf Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-15 16:59:13 +08:00
jiangbingqing 8bb26120bd UI_InstallAndDismantleTicketPanel逻辑 2024-08-15 16:58:51 +08:00
YangHua 9131dc70e5 Merge branch 'main' of http://18417875.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-08-15 16:41:29 +08:00
YangHua f0836b91b3 修改流程逻辑，修改UI逻辑：UI_LowTensionWorkTicketPanel.cs,UI_MenuBar.cs,UI_SelectWorkTicketPanel.cs,修改数据。 2024-08-15 16:40:20 +08:00
Victor_Wang 311c48f634 UI修改 2024-08-15 14:16:18 +08:00
Victor_Wang e5fcd2586b UI修改 2024-08-15 14:15:26 +08:00
YangHua 7c45a376ce 添加officemanager管理类，修改流程类 2024-08-15 00:40:07 +08:00
YangHua 164450a064 Merge branch 'main' of http://3ff0919a.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-08-14 21:30:54 +08:00
YangHua 3a8e9f5b07 修改Itemtips 2024-08-14 21:30:49 +08:00
jiangbingqing 71271b5fb1 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-14 18:08:14 +08:00
jiangbingqing 724c7c2002 ui面板逻辑完善 2024-08-14 18:08:03 +08:00
wangyang b99a457330 8.14wangyang 2024-08-14 17:30:49 +08:00
Victor_Wang 18260d9411 修改ui面板 2024-08-14 16:58:35 +08:00
Victor_Wang d384654ea3 修改UI面板,工具间镜子设置 2024-08-14 16:57:55 +08:00
taosuqi ba38adf320 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology into main 2024-08-14 16:25:03 +08:00
taosuqi 97198e5ed0 8.14下午修改 2024-08-14 16:24:50 +08:00
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
taosuqi 73a1785dbf Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology into main 2024-08-14 13:23:04 +08:00
YangHua 4a475272d6 修改相机渲染模式 2024-08-14 13:22:48 +08:00
taosuqi ac0129082c Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology into main 2024-08-14 13:20:43 +08:00
taosuqi 47aad0aeb0 更新前 2024-08-14 13:20:38 +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 429e47b619 1 2024-08-14 13:10:47 +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
wangyang 9756e6e596 融合 2024-08-13 09:56:24 +08:00
wangyang a2522ac1a1 添加工具 2024-08-13 09:55:19 +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 c140c0fd5d 螺丝刀动画的制作 2024-08-12 13:09:06 +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
taosuqi 164b99913f 显示名称 2024-08-12 10:03:51 +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 98ed00a23f 添加办公室人物 2024-08-10 23:12:48 +08:00
YangHua 2a33a25eaa 修改UI_TaskListPanel,填processItem、subProcessItem、UI_ProcessItem.cs、UI_SubProcessItem.cs 2024-08-10 22:52:27 +08:00
taosuqi 656f6f93f0 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology into main 2024-08-09 18:08:17 +08:00
taosuqi d8c1131a8b 鼠标悬停物体上显示ui 2024-08-09 18:08:01 +08:00
Victor_Wang 79f891de08 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-09 16:59:45 +08:00
Victor_Wang 71feb111de 淡入淡出完成 2024-08-09 16:59:40 +08:00
taosuqi f673dc54cb 工具间修改+高亮插件导入 2024-08-09 15:35:19 +08:00
Victor_Wang 9f85a2fafa UTF8 2024-08-09 15:23:21 +08:00
Victor_Wang ff8f04fcba 修改过场动画 2024-08-09 14:15:32 +08:00
YangHua e619de15f4 添加第一人称视角 2024-08-09 14:06:40 +08:00
YangHua c0e22fa85f 解决办公室场景冲突 2024-08-09 13:38:14 +08:00
YangHua 74ba800dda 导入第一人称插件 2024-08-09 13:37:25 +08:00
Victor_Wang 73846908fd Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-09 13:35:30 +08:00
Victor_Wang 37fb864b11 Timeline 2024-08-09 13:35:22 +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 8f2b841f2c Merge branch 'main' of http://git.umayle.com/WangWeiZhi/YanCheng_Metrology 2024-08-07 22:03:58 +08:00
2274240467@qq.com 66044431de 修改面板陶芮奇 2024-08-07 22:01:54 +08:00
张文天 22ae5dae24 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-07 21:48:49 +08:00
张文天 2d86168390 添加工具间和工具 2024-08-07 21:47:37 +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
taosuqi c27a1652e2 UI_MenuBar和UI_SessionPanel提交 2024-08-07 14:34:23 +08:00
Victor_Wang 13dd9fea35 Panel 2024-08-07 13:22:06 +08:00
Victor_Wang e07cf32cd2 panel 2024-08-07 13:21:13 +08:00
YangHua ba92b4008d 添加GLobalFlag脚本 2024-08-07 00:18:53 +08:00
YangHua d8270417b1 添加textmeshPro字体 2024-08-06 21:32:10 +08:00
YangHua d508ba2ade Merge branch 'main' of http://git.umayle.com/WangWeiZhi/YanCheng_Metrology 2024-08-06 20:15:24 +08:00
YangHua 33a0c1f3af 添加xmind 2024-08-06 20:14:41 +08:00
jiangbingqing d9763779e4 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-06 18:00:57 +08:00
Victor_Wang a049febad3 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-06 18:00:51 +08:00
jiangbingqing 396e51061e ui 2024-08-06 18:00:48 +08:00
Victor_Wang 521ab68c85 1 2024-08-06 18:00:46 +08:00
taosuqi 8d91a8923c 导入UI_TaskListPanel图片 2024-08-06 14:47:05 +08:00
jiangbingqing d68c61279d Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-06 11:07:49 +08:00
Victor_Wang fc60e42677 1 2024-08-06 10:50:14 +08:00
jiangbingqing 7d6da20f4b ui 2024-08-06 10:43:45 +08:00
Victor_Wang 1efe849cbe 1 2024-08-02 18:03:19 +08:00
Victor_Wang 14986bb896 1 2024-08-02 18:02:49 +08:00
jiangbingqing df0e2ff76b Merge branch 'main' of http://172.16.1.12/liuyu/YanCheng_Metrology 2024-08-02 18:02:16 +08:00
jiangbingqing 87eefccf00 ui 2024-08-02 18:02:08 +08:00
liuyu c05176ffac 右侧菜单 2024-08-02 17:55:46 +08:00
liuyu 0dc2bdcc86 Merge branch 'main' of http://172.16.1.12/liuyu/YanCheng_Metrology 2024-08-02 16:30:29 +08:00
liuyu bbd64e7e6b 新增背包管理类和工具材料管理类 2024-08-02 16:30:22 +08:00
jiangbingqing 1355440e2a Merge branch 'main' of http://172.16.1.12/liuyu/YanCheng_Metrology 2024-08-02 16:29:24 +08:00
jiangbingqing a7e5c2cbb4 message面板 2024-08-02 16:29:15 +08:00
liuyu 5fac0d7609 关闭Icon 2024-08-02 15:04:23 +08:00
jiangbingqing 19a9df4089 Merge branch 'main' of http://172.16.1.12/liuyu/YanCheng_Metrology 2024-08-02 14:55:43 +08:00
liuyu d773da4124 枚举通知类型 2024-08-02 14:55:16 +08:00
jiangbingqing dce0df5896 解决冲突 2024-08-02 14:46:00 +08:00
jiangbingqing 2fdde9a943 UI 2024-08-02 14:44:12 +08:00
liuyu f2ca185dab 配置表更新 2024-08-02 14:30:37 +08:00
Victor_Wang 0b6b6d8517 Merge branch 'main' of http://172.16.1.12/liuyu/YanCheng_Metrology 2024-08-02 14:18:31 +08:00
Victor_Wang cac07b00c2 1 2024-08-02 14:18:24 +08:00
liuyu ba3d201909 修复冲突 2024-08-02 13:36:36 +08:00
liuyu 3f8e244283 配置数据更新 2024-08-02 13:35:36 +08:00
Victor_Wang e37c0eae1a 1 2024-08-02 13:19:03 +08:00
Victor_Wang 563094083f 1 2024-08-02 13:17:25 +08:00
liuyu fe1b2f8036 数据更新 2024-08-02 11:26:25 +08:00
liuyu 01a599dbb1 UI资源 2024-08-02 10:48:40 +08:00
Victor_Wang 09e8a4bc77 1 2024-08-02 08:47:38 +08:00
Victor_Wang ac98963e63 UItoolkit 2024-08-02 08:43:22 +08:00
jiangbingqing 7b14268d24 Merge branch 'main' of http://172.16.1.12/liuyu/YanCheng_Metrology 2024-08-01 18:02:29 +08:00
jiangbingqing 179fe9336e ui 2024-08-01 18:02:20 +08:00
liuyu 1cf7354699 流程 2024-08-01 18:01:49 +08:00
liuyu fc5ba37ae1 Merge branch 'main' of http://172.16.1.12/liuyu/YanCheng_Metrology 2024-08-01 14:59:43 +08:00
liuyu b96e5a573a 流程逻辑 2024-08-01 14:59:34 +08:00
Victor_Wang 8c3c8dd433 1 2024-08-01 14:06:23 +08:00
jiangbingqing 720dd7c74b Merge branch 'main' of http://172.16.1.12/liuyu/YanCheng_Metrology 2024-08-01 10:41:29 +08:00
jiangbingqing 3b0c8950da ui 2024-08-01 10:41:16 +08:00
liuyu cc8e50108b BasePanel 2024-08-01 10:40:19 +08:00
liuyu a87b9a39a8 TextMeshPro 2024-08-01 10:36:00 +08:00
liuyu d16751d036 修复Mask逻辑 2024-08-01 09:42:11 +08:00
liuyu 5cac035cf7 Merge branch 'main' of http://172.16.1.12/liuyu/YanCheng_Metrology 2024-08-01 09:16:15 +08:00
liuyu 96cebba601 Dotween设置文件路径修改 2024-08-01 09:16:07 +08:00
jiangbingqing ac176d2761 Merge branch 'main' of http://172.16.1.12/liuyu/YanCheng_Metrology 2024-08-01 09:15:25 +08:00
jiangbingqing 3338a401a0 UI_Mask 2024-08-01 09:15:19 +08:00