Commit Graph

261 Commits

Author SHA1 Message Date
YangHua d5437d47c2 添加移除全部工具材质设备的方法 2024-08-23 14:47:51 +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