Commit Graph

59 Commits

Author SHA1 Message Date
jiangbingqing d68c61279d Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-06 11:07:49 +08:00
Victor_Wang c2ed7b3b05 1 2024-08-06 11:00:37 +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
jiangbingqing 41cb1da208 ui面板 2024-07-31 18:02:49 +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