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

339 Commits

Author SHA1 Message Date
YangHua 71757aab24 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-25 14:46:33 +08:00
YangHua d97ca9be1a 修改数据 2024-08-25 14:46:30 +08:00
陈向学 e575a70ea4 aa 2024-08-25 14:35:52 +08:00
YangHua 23df487537 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-25 14:33:12 +08:00
YangHua b7045add8e 12 2024-08-25 14:33:01 +08:00
陈向学 2b47236a56 工具间步骤重置 2024-08-25 14:32:17 +08:00
YangHua aa6f45d70b 重新配置数据 2024-08-25 12:59:10 +08:00
YangHua c0fd9c8f8c 融合 2024-08-25 12:54:34 +08:00
YangHua ad25cb0d27 修改数据名称 2024-08-25 12:52:37 +08:00
陈向学 135f771fdd 注释 2024-08-23 20:14:19 +08:00
陈向学 672d593535 步骤还原完善 2024-08-23 20:03:25 +08:00
陈向学 80b5a8aca4 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-23 18:33:42 +08:00
陈向学 719b1899a2 改步骤重置 2024-08-23 18:33:34 +08:00
YangHua c1559e8a65 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-23 18:30:52 +08:00
YangHua 2d98225b7c 添加NPC负责人逻辑 2024-08-23 18:30:46 +08:00
taosuqi 6a26d7cbed 修复字体 2024-08-23 18:24:53 +08:00
YangHua d559f27d9c Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-23 17:49:33 +08:00
YangHua 92b6904314 修改NPC对话逻辑 2024-08-23 17:49:27 +08:00
taosuqi 5056041aa9 111 2024-08-23 17:24:16 +08:00
taosuqi e106ed63bc UI_LowTensionWorkTicketPanel面板新增功能 2024-08-23 17:20:19 +08:00
陈向学 9dc763d14c 换空开 2024-08-23 17:12:54 +08:00
wangyang 0aeecff577 添加NPC负责人，分割空开，添加NPC客户 2024-08-23 16:58:24 +08:00
YangHua e12c60a700 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-23 16:48:32 +08:00
YangHua 56fc8f274b 添加NPC等逻辑 2024-08-23 16:48:23 +08:00
陈向学 533935d475 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-23 14:48:56 +08:00
陈向学 1aecc32b97 v 2024-08-23 14:48:51 +08:00
YangHua 958e0653a8 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-23 14:48:00 +08:00
YangHua d5437d47c2 添加移除全部工具材质设备的方法 2024-08-23 14:47:51 +08:00
陈向学 6a75caa453 改类名 2024-08-23 14:00:50 +08:00
YangHua 6679abe086 修改bug 2024-08-23 13:20:10 +08:00
YangHua 118ceaef5f 修改 报错 2024-08-23 13:07:26 +08:00
YangHua d02248b98e Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-23 11:32:06 +08:00
陈向学 2475ebc28f s 2024-08-23 11:31:47 +08:00
YangHua 6408cae856 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-23 11:29:17 +08:00
YangHua 0a75301cc3 修改提示为常驻 2024-08-23 11:29:12 +08:00
陈向学 dfce62e9e2 清理杂物，上封印 2024-08-23 11:26:24 +08:00
陈向学 5b119a887d Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-23 11:00:33 +08:00
陈向学 af1ac8bb20 ss 2024-08-23 11:00:30 +08:00
YangHua 072d03ee12 融合 2024-08-23 10:58:53 +08:00
YangHua c4ae7340d8 替换换装人物模型 2024-08-23 10:58:06 +08:00
陈向学 2d5e7fbfd9 场景还原 2024-08-23 10:35:30 +08:00
YangHua 13f986b6a8 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-23 10:08:54 +08:00
YangHua 44c8b1b9f1 修改人物溜破bug 2024-08-23 10:08:46 +08:00
陈向学 4899d6cc50 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-23 09:50:08 +08:00
陈向学 724d542812 a 2024-08-23 09:50:02 +08:00
wangyang e2ff053559 修改场景 2024-08-23 09:47:11 +08:00
wangyang 05059fc5e3 场地更改 2024-08-23 09:44:04 +08:00
YangHua f4beaae9c5 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-23 08:36:32 +08:00
YangHua 805da9f73d 修改人物检视功能，修改对话框功能并修改关联脚本 2024-08-23 08:36:27 +08:00
陈向学 52acbe5f40 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-22 20:19:52 +08:00
陈向学 5339727bcf 带电逻辑完善，修复工具bug，拆卸安装电能表流程完善 2024-08-22 20:19:48 +08:00
taosuqi 4db5e8dd7c 修改面板套锐气 2024-08-22 18:12:31 +08:00
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