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

287 Commits

Author SHA1 Message Date
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
liuyu af7aaae27f 文件夹层级结构 2024-08-01 09:11:49 +08:00
liuyu 39168361b4 Merge branch 'main' of http://172.16.1.12/liuyu/YanCheng_Metrology 2024-08-01 08:49:17 +08:00
liuyu 288c8323f1 工器具设备模型 2024-08-01 08:49:08 +08:00
Victor_Wang e84e2dc64d 1 2024-07-31 17:30:17 +08:00
Victor_Wang 3a12414d1a 1 2024-07-31 16:09:35 +08:00
Victor_Wang f8dd993c34 TestUIPanelScenes 2024-07-31 15:46:56 +08:00
liuyu 75d1e80eb0 Merge branch 'main' of http://172.16.1.12/liuyu/YanCheng_Metrology 2024-07-31 14:52:38 +08:00
liuyu 10c0918814 文件夹整理 2024-07-31 14:52:07 +08:00
Victor_Wang a329719bb7 1 2024-07-31 13:54:55 +08:00
Victor_Wang 9ea1fccd8a 添加unirx 2024-07-31 13:46:06 +08:00
liuyu 8ef7e38eeb 完善文件夹 2024-07-31 13:33:16 +08:00
liuyu 75cde28528 修改编码格式 2024-07-31 12:04:33 +08:00
liuyu 30fe51d21d 盐城计量虚拟仿真实训竞赛系统 2024-07-31 09:15:12 +08:00