Commit Graph

287 Commits

Author SHA1 Message Date
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