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 ebf4a433ba Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-22 16:16:08 +08:00
YangHua 008bab2630 修改对话框 2024-08-22 16:16:00 +08:00
wangyang e3c46312e2 修改穿戴人物模型 2024-08-22 16:14:54 +08:00
YangHua f788c8282b 添加NPC逻辑 2024-08-22 14:05:03 +08:00
wangyang 717fd139a0 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-22 11:22:09 +08:00
wangyang 2b1f6c1509 添加配电房 2024-08-22 11:22:04 +08:00
YangHua 7b8bdc84af 修改数据，添加三相四线电能表，修改工具间场景。 2024-08-22 11:21:00 +08:00
wangyang 348134014f 添加三相四线表，修改手机模型，修改办公室场景。 2024-08-22 10:45:07 +08:00
wangyang 5deb4aa033 1 2024-08-22 10:07:26 +08:00
wangyang 595b103cd6 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-22 10:01:24 +08:00
YangHua d536e9b7c5 恢复字体 2024-08-22 10:00:35 +08:00
wangyang 0c69022618 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-22 09:54:32 +08:00
YangHua ffca0cd8e3 修改 流程 脚本，工具基类脚本，忽略字体文件 2024-08-22 09:53:42 +08:00
wangyang 1613459637 融合 2024-08-22 09:50:21 +08:00
wangyang 5833ba9055 同步融合 2024-08-22 09:48:26 +08:00
YangHua 76295dfd90 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-21 20:28:16 +08:00
YangHua b4bacd0332 修改提示 2024-08-21 20:28:02 +08:00
陈向学 1db6d2f90a 新模型，电能表拆卸安装 2024-08-21 20:27:00 +08:00
YangHua f44a56289c Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-21 17:09:08 +08:00
YangHua bbac803255 修改万用表 2024-08-21 17:08:53 +08:00
陈向学 fd95d49fd4 螺丝盖子 2024-08-21 17:07:46 +08:00
YangHua 099f3601f9 融合 2024-08-21 15:35:39 +08:00
YangHua c4c3e7fc92 修改prefab 2024-08-21 15:35:11 +08:00
陈向学 f75ffa8a88 进电开关 2024-08-21 15:32:44 +08:00
陈向学 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