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

581 Commits

Author SHA1 Message Date
liuyu e26450191a Merge branch 'main' into HQB_workspace 
# Conflicts:
#	Assets/StreamingAssets/realtimeStat.json
 2024-09-06 14:51:00 +08:00
陈向学 729a2d92d8 aaa 2024-09-06 13:40:58 +08:00
shengtao 30de6d2cd6 1 2024-09-06 13:39:50 +08:00
shengtao db874d547e 1 2024-09-06 13:35:04 +08:00
shengtao 1f7b11e990 1 2024-09-06 13:27:07 +08:00
liuyu 0c4162df67 添加对多场景的记录 2024-09-06 13:27:02 +08:00
shengtao cfa5ad0c59 1 2024-09-06 13:26:50 +08:00
shengtao 8730a4083e 1 2024-09-06 13:24:03 +08:00
shengtao 5d0c662573 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-06 13:21:22 +08:00
shengtao b0a4d9de47 1 2024-09-06 13:18:45 +08:00
YangHua c64d8daf2f 修改livescene客户和负责人效果 2024-09-06 13:18:32 +08:00
shengtao 2fa5fdb563 1 2024-09-06 13:17:59 +08:00
liuyu 9e3d0fd4f1 Merge branch 'main' into HQB_workspace 2024-09-06 11:00:25 +08:00
liuyu 5276fcaede 20240906基线2 2024-09-06 11:00:07 +08:00
liuyu 877e3fb7cc 20240906基线 2024-09-06 10:58:09 +08:00
陈向学 2e82cd11a3 优化 2024-09-06 10:10:50 +08:00
liuyu 17067bc33d 新增工单管理类 2024-09-06 10:04:23 +08:00
liuyu 22c974d21c Merge branch 'main' into HQB_workspace 
# Conflicts:
#	Assets/StreamingAssets/realtimeStat.json
 2024-09-06 09:07:35 +08:00
liuyu 27c356ba28 111 2024-09-06 08:18:31 +08:00
陈向学 2ecebd6a3f aa 2024-09-05 20:23:20 +08:00
liuyu 824bc36529 111 2024-09-05 19:51:41 +08:00
陈向学 9d731799cb ll 2024-09-05 19:31:08 +08:00
YangHua 93f2b5ad2c 整理目录，剔除多余模型 2024-09-05 18:57:00 +08:00
liuyu d38e193431 修复从现场回到工具间拿取的工具不消失的bug 2024-09-05 17:25:37 +08:00
陈向学 5a91f10875 电能表 2024-09-05 15:56:23 +08:00
陈向学 bf1eacad77 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-05 15:10:22 +08:00
陈向学 8f905f2787 科目2 2024-09-05 15:10:19 +08:00
YangHua 53059fe795 修改电能表位置 2024-09-05 15:08:12 +08:00
YangHua 9da25a6231 修改mesh格式 2024-09-05 14:15:28 +08:00
YangHua bff2d1e78d 修复注册信号时间差 2024-09-05 14:13:36 +08:00
YangHua 52732ff896 Merge branch 'main' of http://37c67607.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-05 14:00:55 +08:00
YangHua 1ab135be02 修改注册时间差 2024-09-05 14:00:50 +08:00
陈向学 d39c8b7683 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-05 14:00:01 +08:00
陈向学 5684b01a10 x 2024-09-05 13:59:56 +08:00
liuyu 939810213c Merge branch 'main' into HQB_workspace 
# Conflicts:
#	Assets/Scenes/01_InitScene.unity
#	Assets/Scripts/CXX/Devices/杂/低压电流互感器/Device_LowVoltageCurrentTransformer.cs
#	Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs
#	Assets/Scripts/CXX/Score/ScoreBase.cs
#	Assets/Scripts/Project/Manager/ReconnectMgr.cs
#	Assets/Scripts/Project/Objects/Other/NPCController.cs
#	Assets/StreamingAssets/realtimeStat.json
#	Assets/StreamingAssets/realtimeStat.json.meta
 2024-09-05 13:45:27 +08:00
liuyu 9ca554ab57 抽象类改virtual 2024-09-05 13:41:34 +08:00
YangHua a113527388 1 2024-09-05 13:33:02 +08:00
YangHua 670d9947d4 Merge branch 'main' of http://37c67607.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-05 13:23:44 +08:00
YangHua ee0bc2049b 1 2024-09-05 13:23:39 +08:00
陈向学 9beaa384cd Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-05 13:23:01 +08:00
陈向学 734c49f6ed ssss 2024-09-05 13:22:56 +08:00
YangHua 0ec147e9ec 修改layer 2024-09-05 13:09:28 +08:00
liuyu 0b6a393e81 保存读取trigger状态 2024-09-05 13:05:31 +08:00
YangHua cab83a480d 修复 办公室场景来回跳 不显示 相机得问题 2024-09-05 12:59:23 +08:00
YangHua b45f5190d8 添加 人物移动判断 2024-09-05 12:53:36 +08:00
YangHua 0d7aaf4c0d Merge branch 'main' of http://37c67607.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-05 11:33:29 +08:00
YangHua 8c282ceb96 添加材质球 2024-09-05 11:32:20 +08:00
陈向学 ca76a44145 插座 2024-09-05 11:25:14 +08:00
liuyu b0d1ac0edd 添加Trigger状态记录函数 2024-09-05 11:14:16 +08:00
YangHua db56f71289 Merge branch 'main' of http://37c67607.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-05 11:11:06 +08:00