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
..
杂	Merge branch 'main' into HQB_workspace	2024-09-05 13:45:27 +08:00
现场控制	ssss	2024-09-05 13:22:56 +08:00
直接接入式电能计量装置	Merge branch 'main' into HQB_workspace	2024-09-05 13:45:27 +08:00
计量柜	Merge branch 'main' into HQB_workspace	2024-09-05 13:45:27 +08:00
Device_Base.cs	Merge branch 'main' into HQB_workspace	2024-09-05 13:45:27 +08:00
Device_Base.cs.meta	工具，设备脚本	2024-08-19 16:36:17 +08:00
Device_Control.cs	现场设备大改，科目2	2024-09-03 17:57:49 +08:00
Device_Control.cs.meta	现场设备大改，科目2	2024-09-03 17:57:49 +08:00
Device_Seal.cs	添加Trigger状态记录函数	2024-09-05 11:14:16 +08:00
Device_Seal.cs.meta	工具，设备脚本	2024-08-19 16:36:17 +08:00
杂.meta	修改工具预制体	2024-08-20 10:59:57 +08:00
现场控制.meta	新科目	2024-09-04 15:12:10 +08:00
直接接入式电能计量装置.meta	工具，设备脚本	2024-08-19 16:36:17 +08:00
计量柜.meta	工具，设备脚本	2024-08-19 16:36:17 +08:00