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

154 Commits

Author SHA1 Message Date
liuyu 5e26973e4e 使用反射保存Trigger状态变量 2024-09-07 17:17:12 +08:00
liuyu e26450191a Merge branch 'main' into HQB_workspace 
# Conflicts:
#	Assets/StreamingAssets/realtimeStat.json
 2024-09-06 14:51:00 +08:00
YangHua c64d8daf2f 修改livescene客户和负责人效果 2024-09-06 13:18:32 +08:00
liuyu 9e3d0fd4f1 Merge branch 'main' into HQB_workspace 2024-09-06 11:00:25 +08:00
陈向学 2e82cd11a3 优化 2024-09-06 10:10:50 +08:00
liuyu 22c974d21c Merge branch 'main' into HQB_workspace 
# Conflicts:
#	Assets/StreamingAssets/realtimeStat.json
 2024-09-06 09:07:35 +08:00
陈向学 9d731799cb ll 2024-09-05 19:31:08 +08:00
liuyu d38e193431 修复从现场回到工具间拿取的工具不消失的bug 2024-09-05 17:25:37 +08:00
陈向学 5a91f10875 电能表 2024-09-05 15:56:23 +08:00
陈向学 8f905f2787 科目2 2024-09-05 15:10:19 +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
陈向学 734c49f6ed ssss 2024-09-05 13:22:56 +08:00
liuyu 0b6a393e81 保存读取trigger状态 2024-09-05 13:05:31 +08:00
liuyu b0d1ac0edd 添加Trigger状态记录函数 2024-09-05 11:14:16 +08:00
陈向学 5b6b2924a7 人位置 2024-09-05 11:08:43 +08:00
陈向学 3982ab5723 改细节 2024-09-05 11:00:56 +08:00
liuyu 3c9b1c9a8a 读取场景缓存 2024-09-04 17:54:42 +08:00
liuyu 1597d53826 读取缓存 2024-09-04 17:12:56 +08:00
liuyu 8fdc47d314 保存场景缓存 2024-09-04 16:52:47 +08:00
陈向学 f80a72846c Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-04 16:02:51 +08:00
陈向学 8a181b9fe8 dd 2024-09-04 16:02:47 +08:00
YangHua 8eacd5c099 Merge branch 'main' of http://37c67607.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-04 15:56:29 +08:00
YangHua 52bd5396a9 修改常驻基类 2024-09-04 15:55:52 +08:00
陈向学 3348ef079e aaaaa 2024-09-04 15:25:57 +08:00
陈向学 dd97946d12 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-04 15:25:44 +08:00
YangHua 551ce83487 修改穿透问题 2024-09-04 15:24:48 +08:00
陈向学 d9325fdba9 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-04 15:12:20 +08:00
陈向学 e67b5836a1 新科目 2024-09-04 15:12:10 +08:00
liuyu 11854f7fd6 scene中挂载ReconnectMgr；自动保存移出ProcessManager;工具间模型恢复时穿戴装备; 2024-09-04 14:20:35 +08:00
liuyu 8664ce8398 Merge branch 'main' into HQB_workspace 
# Conflicts:
#	Assets/Scripts/Project/Manager/ProcessManager.cs
#	Assets/Scripts/Project/Manager/ReconnectMgr.cs
 2024-09-04 13:38:06 +08:00
liuyu 096c742205 分数读取后赋值 2024-09-04 10:38:36 +08:00
陈向学 57b484c906 改动修复 2024-09-04 10:03:33 +08:00
陈向学 e66378f5f0 aaa 2024-09-03 20:00:30 +08:00
陈向学 7dfb8733ab Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-09-03 18:31:55 +08:00
陈向学 7d6b942a8a aa 2024-09-03 18:31:51 +08:00
YangHua 5f1e34b3d0 Merge branch 'main' of http://4ea9e602.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-09-03 18:02:14 +08:00
YangHua 066c238fea 添加分数获取 2024-09-03 17:58:25 +08:00
陈向学 0aa001c950 现场设备大改，科目2 2024-09-03 17:57:49 +08:00
陈向学 8f0fc78f3e aa 2024-09-03 10:31:50 +08:00
YangHua 7ab75d4907 添加分数数据模型 2024-09-03 10:09:46 +08:00
陈向学 8c57515bb2 计分 2024-09-03 09:48:19 +08:00
陈向学 17edf664b7 npc对话 2024-09-02 19:10:22 +08:00
陈向学 7f76d83eda a 2024-09-02 18:29:10 +08:00
陈向学 2dd72fa3d4 aa 2024-09-02 17:21:20 +08:00
陈向学 5d752987aa 验电笔回手里 2024-09-02 13:19:38 +08:00
陈向学 316a5c2b8f 门交互 2024-09-02 10:49:35 +08:00
陈向学 837eabc069 ss 2024-09-02 09:43:07 +08:00
YangHua 1444dc395f 修改 接线完好不高亮问题 2024-08-30 18:35:28 +08:00