diff --git a/SicRT/Instances/ToolLoader.cs b/SicRT/Instances/ToolLoader.cs index 79e8f88..92eb17b 100644 --- a/SicRT/Instances/ToolLoader.cs +++ b/SicRT/Instances/ToolLoader.cs @@ -98,10 +98,13 @@ namespace SicRT.Instances if (Singleton.Instance.Modules[ModuleName.PM2].IsInstalled) IoManager.Instance.Initialize($"{PathManager.GetCfgDir()}pm\\pm2\\interlockPM2.xml"); + Singleton.Instance.Initialize(); + + //! DataCollectionManager必须在最后初始化,否则在其之后注册的DATA数据均会被忽略 Singleton.Instance.Initialize(); - Singleton.Instance.Initialize(); + } diff --git a/ThirdParty/MECF.Framework/KXGEM.dll b/ThirdParty/MECF.Framework/KXGEM.dll new file mode 100644 index 0000000..54bd5ec Binary files /dev/null and b/ThirdParty/MECF.Framework/KXGEM.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.Common.dll b/ThirdParty/MECF.Framework/MECF.Framework.Common.dll index 65fb5b1..de60a49 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.Common.dll and b/ThirdParty/MECF.Framework/MECF.Framework.Common.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll index c18c65e..08f3b54 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll b/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll index d7ed807..b48bf6e 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll and b/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll index de9fac4..9ce859a 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll b/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll index 80d1689..1298ffc 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll and b/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll index 7dfa9aa..497f4fa 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll differ diff --git a/ThirdParty/MECF.Framework/RTCSDK.dll b/ThirdParty/MECF.Framework/RTCSDK.dll new file mode 100644 index 0000000..434c810 Binary files /dev/null and b/ThirdParty/MECF.Framework/RTCSDK.dll differ diff --git a/ThirdParty/MECF.Framework/Sicentury.Core.dll b/ThirdParty/MECF.Framework/Sicentury.Core.dll index d2014e6..29ae2ab 100644 Binary files a/ThirdParty/MECF.Framework/Sicentury.Core.dll and b/ThirdParty/MECF.Framework/Sicentury.Core.dll differ diff --git a/ThirdParty/MECF.Framework/Sicentury.Localization.dll b/ThirdParty/MECF.Framework/Sicentury.Localization.dll index b84c9c3..dfd7068 100644 Binary files a/ThirdParty/MECF.Framework/Sicentury.Localization.dll and b/ThirdParty/MECF.Framework/Sicentury.Localization.dll differ diff --git a/ThirdParty/MECF.Framework/WPFLocalizeExtension.dll b/ThirdParty/MECF.Framework/WPFLocalizeExtension.dll new file mode 100644 index 0000000..7c11498 Binary files /dev/null and b/ThirdParty/MECF.Framework/WPFLocalizeExtension.dll differ diff --git a/ThirdParty/MECF.Framework/XAMLMarkupExtensions.dll b/ThirdParty/MECF.Framework/XAMLMarkupExtensions.dll new file mode 100644 index 0000000..7098298 Binary files /dev/null and b/ThirdParty/MECF.Framework/XAMLMarkupExtensions.dll differ diff --git a/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll b/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll index 3595d3f..6ee8779 100644 Binary files a/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll and b/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll differ