 taosuqi
|
8e36bd262c
|
1
|
2024-08-15 20:38:45 +08:00 |
|
taosuqi
|
b440a3f564
|
合并融合
|
2024-08-15 20:34:31 +08:00 |
|
taosuqi
|
2a27c3bf7a
|
融合
|
2024-08-15 20:33:25 +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 |
|
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 |
|
YangHua
|
e3979752fc
|
Merge branch 'main' of http://4eccfb4.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology
|
2024-08-13 14:03:08 +08:00 |
|
YangHua
|
fe25217318
|
融合
|
2024-08-13 14:03:03 +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
|
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 |
|
taosuqi
|
1826fbc5c6
|
制作工具预制体
|
2024-08-12 10:58:27 +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 |