From ef46dce82834b1b9faec74553beba97f83930200 Mon Sep 17 00:00:00 2001 From: wangsr Date: Wed, 4 Oct 2023 18:14:02 +0800 Subject: [PATCH] =?UTF-8?q?add=20-=20=E6=89=8B=E5=8A=A8=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E7=AD=89=E5=BE=85=E5=BC=95=E5=85=A5PLC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManualControl/InitAction.cs | 22 +- .../ManualControl/ManualControlAction.cs | 511 +++++++++++++++++- .../Mesnac.Action.ChemicalWeighing.csproj | 8 + .../packages.config | 1 + .../Mesnac.Action.Default.csproj | 6 + .../Mesnac.Action.Default/packages.config | 4 + .../Mesnac.Controls.Base.csproj | 8 + Controls/Mesnac.Controls.Base/packages.config | 4 + .../Mesnac.Controls.ChemicalWeighing.csproj | 5 + .../packages.config | 4 + .../Mesnac.Controls.Default.csproj | 5 + .../Mesnac.Controls.Default/packages.config | 4 + .../Mesnac.Controls.Feeding.csproj | 8 + .../Mesnac.Controls.Feeding/packages.config | 4 + DataBlockHelper/DataBlockHelper.csproj | 190 +++---- DataBlockHelper/packages.config | 4 + Main/MCBackView/MCBackView.csproj | 7 +- Main/MCBackView/packages.config | 4 + Main/MCEdit/App.config | 104 ++-- .../MCProject/nodeForm/ManualWaterControl.xml | 68 +-- Main/MCEdit/MCEdit.csproj | 5 +- Main/MCEdit/packages.config | 1 + Main/MCRun/MCRun.csproj | 5 +- Main/MCRun/packages.config | 1 + .../Mesnac.Gui.Run.Global.csproj | 7 + Main/Mensac.Gui.Run.Global/packages.config | 4 + Main/Mesnac.Basic/Mesnac.Basic.csproj | 7 + Main/Mesnac.Basic/packages.config | 4 + .../Mesnac.Gui.Edit.Global.csproj | 7 + Main/Mesnac.Gui.Edit.Global/packages.config | 4 + Main/Mesnac.Gui.Edit/Mesnac.Gui.Edit.csproj | 7 + Main/Mesnac.Gui.Edit/packages.config | 4 + Main/Mesnac.Gui.Run/Mesnac.Gui.Run.csproj | 7 + Main/Mesnac.Gui.Run/packages.config | 4 + Mesnac.DoUtils/Mesnac.DoUtils.csproj | 8 + Mesnac.DoUtils/packages.config | 4 + 36 files changed, 853 insertions(+), 197 deletions(-) create mode 100644 Actions/Default/Mesnac.Action.Default/packages.config create mode 100644 Controls/Mesnac.Controls.Base/packages.config create mode 100644 Controls/Mesnac.Controls.ChemicalWeighing/packages.config create mode 100644 Controls/Mesnac.Controls.Default/packages.config create mode 100644 Controls/Mesnac.Controls.Feeding/packages.config create mode 100644 DataBlockHelper/packages.config create mode 100644 Main/MCBackView/packages.config create mode 100644 Main/Mensac.Gui.Run.Global/packages.config create mode 100644 Main/Mesnac.Basic/packages.config create mode 100644 Main/Mesnac.Gui.Edit.Global/packages.config create mode 100644 Main/Mesnac.Gui.Edit/packages.config create mode 100644 Main/Mesnac.Gui.Run/packages.config create mode 100644 Mesnac.DoUtils/packages.config diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/InitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/InitAction.cs index 731a12a..af7b149 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/InitAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/InitAction.cs @@ -11,14 +11,34 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl { public class InitAction : ChemicalWeighingAction, IAction { + + List McControllist; + + public void Run(RuntimeParameter runtime) { base.RunIni(runtime); //必须要调用的 List mcControllist = GetAllDbMCControlsByOption(DbOptionTypes.Query);//获取所有待初始化控件 - //IBaseControl startdate = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "startdate").FirstOrDefault().BaseControl; + //IBaseControl startdate = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "startdate").FirstOrDefault().BaseControl; + + McControllist = GetAllDbMCControlsByOption(DbOptionTypes.InitData);//获取所有待初始化控件 + + IBaseControl WaterActualValue1 = GetBaseControl("WaterActualValue1"); + IBaseControl WaterActualValue2 = GetBaseControl("WaterActualValue2"); + IBaseControl WaterActualValue3 = GetBaseControl("WaterActualValue3"); + IBaseControl WaterActualValue4 = GetBaseControl("WaterActualValue4"); + IBaseControl SpiralActValue1 = GetBaseControl("SpiralActValue1"); + IBaseControl SpiralActValue2 = GetBaseControl("SpiralActValue2"); + IBaseControl SpiralActValue3 = GetBaseControl("SpiralActValue3"); + IBaseControl SpiralActValue4 = GetBaseControl("SpiralActValue4"); MessageBox.Show("LoadingSuccess!"); } + + private IBaseControl GetBaseControl(string name) + { + return McControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey == name).FirstOrDefault().BaseControl; + } } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs index 35b1064..7def6d4 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs @@ -1,41 +1,516 @@ using Mesnac.Action.Base; using Mesnac.Controls.Base; using Mesnac.Controls.Default; +using Mesnac.Core.Service; using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; + namespace Mesnac.Action.ChemicalWeighing.ManualControl { - class ManualControlAction : ChemicalWeighingAction, IAction - { + class ManualControlAction : ChemicalWeighingAction, IAction + { + + private List McControllist; + + private byte GelChooseA; + private byte GelChooseB; + + private byte WetChoose1; + private byte WetChoose2; + private byte WetChoose3; + private byte WetChoose4; + + public void Run(RuntimeParameter runtime) + { + base.RunIni(runtime); //必须要调用 + + + + #region 控件导入 + + McControllist = GetAllDbMCControlsByOption(DbOptionTypes.Query);//获取所有待初始化控件 + IBaseControl StartMetage1 = GetBaseControl("StartMetage1"); + IBaseControl StopMetage1 = GetBaseControl("StopMetage1"); + IBaseControl StartMetage2 = GetBaseControl("StartMetage2"); + IBaseControl StopMetage2 = GetBaseControl("StopMetage2"); + IBaseControl StartMetage3 = GetBaseControl("StartMetage3"); + IBaseControl StopMetage3 = GetBaseControl("StopMetage3"); + IBaseControl StartMetage4 = GetBaseControl("StartMetage4"); + IBaseControl StopMetage4 = GetBaseControl("StopMetage4"); + IBaseControl WaterOut1 = GetBaseControl("WaterOut1"); + IBaseControl WaterOut2 = GetBaseControl("WaterOut2"); + IBaseControl WaterOut3 = GetBaseControl("WaterOut3"); + IBaseControl WaterOut4 = GetBaseControl("WaterOut4"); + IBaseControl SpiralOn1 = GetBaseControl("SpiralOn1"); + IBaseControl SpiralOn2 = GetBaseControl("SpiralOn2"); + IBaseControl SpiralOn3 = GetBaseControl("SpiralOn3"); + IBaseControl SpiralOn4 = GetBaseControl("SpiralOn4"); + + IBaseControl Gel1 = GetBaseControl("Gel1"); + IBaseControl Gel2 = GetBaseControl("Gel2"); + IBaseControl Gel3 = GetBaseControl("Gel3"); + IBaseControl Gel4 = GetBaseControl("Gel4"); + IBaseControl Gel5 = GetBaseControl("Gel5"); + IBaseControl Gel6 = GetBaseControl("Gel6"); + IBaseControl Gel7 = GetBaseControl("Gel7"); + IBaseControl Gel8 = GetBaseControl("Gel8"); + IBaseControl Wet1 = GetBaseControl("Wet1"); + IBaseControl Wet2 = GetBaseControl("Wet2"); + IBaseControl Wet3 = GetBaseControl("Wet3"); + IBaseControl Wet4 = GetBaseControl("Wet4"); + IBaseControl Wet5 = GetBaseControl("Wet5"); + IBaseControl Wet6 = GetBaseControl("Wet6"); + IBaseControl Wet7 = GetBaseControl("Wet7"); + IBaseControl Wet8 = GetBaseControl("Wet8"); + + IBaseControl SetWaterValue1 = GetBaseControl("SetWaterValue1"); + IBaseControl SetWaterValue2 = GetBaseControl("SetWaterValue2"); + IBaseControl SetWaterValue3 = GetBaseControl("SetWaterValue3"); + IBaseControl SetWaterValue4 = GetBaseControl("SetWaterValue4"); + IBaseControl SetSpiralValue1 = GetBaseControl("SetSpiralValue1"); + IBaseControl SetSpiralValue2 = GetBaseControl("SetSpiralValue2"); + IBaseControl SetSpiralValue3 = GetBaseControl("SetSpiralValue3"); + IBaseControl SetSpiralValue4 = GetBaseControl("SetSpiralValue4"); + + #endregion + + + #region 单选判断 + + if (Convert.ToBoolean(Gel1.MCValue) == true) + { + GelChooseA = 1; + } + + if (Convert.ToBoolean(Gel2.MCValue) == true) + { + GelChooseA = 2; + } + + if (Convert.ToBoolean(Gel3.MCValue) == true) + { + GelChooseA = 3; + } + + if (Convert.ToBoolean(Gel4.MCValue) == true) + { + GelChooseA = 4; + } + + if (Convert.ToBoolean(Gel5.MCValue) == true) + { + GelChooseB = 5; + } + + if (Convert.ToBoolean(Gel6.MCValue) == true) + { + GelChooseB = 6; + } + + if (Convert.ToBoolean(Gel7.MCValue) == true) + { + GelChooseB = 7; + } + + if (Convert.ToBoolean(Gel8.MCValue) == true) + { + GelChooseB = 8; + } + + + if (Convert.ToBoolean(Wet1.MCValue) == true) + { + WetChoose1 = 1; + } + + if (Convert.ToBoolean(Wet2.MCValue) == true) + { + WetChoose1 = 2; + } + + if (Convert.ToBoolean(Wet3.MCValue) == true) + { + WetChoose2 = 3; + } + + if (Convert.ToBoolean(Wet4.MCValue) == true) + { + WetChoose2 = 4; + } + + if (Convert.ToBoolean(Wet5.MCValue) == true) + { + WetChoose3 = 5; + } + + if (Convert.ToBoolean(Wet6.MCValue) == true) + { + WetChoose3 = 6; + } + + if (Convert.ToBoolean(Wet7.MCValue) == true) + { + WetChoose4 = 7; + } + + if (Convert.ToBoolean(Wet8.MCValue) == true) + { + WetChoose4 = 8; + } + + #endregion + + + #region 按钮选择 + + if (StartMetage1 == runtime.Sender) + { + float value; + if (float.TryParse(Convert.ToString(SetWaterValue1.MCValue), out value)) + { + if (MessageBox.Show("冷水称A确认开始称量？", "称量确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + { + return; + } + MesnacServiceManager.Instance.LoggingService.Info("冷水称A开始称量"); + } + else + { + MesnacServiceManager.Instance.LoggingService.Info("冷水称A输入数值的格式有误"); + MessageBox.Show("输入数值的格式有误！"); + return; + } + + + } + + if (StopMetage1 == runtime.Sender) + { + MesnacServiceManager.Instance.LoggingService.Info("冷水称A称量已手动停止"); + MessageBox.Show("称量已停止！"); + } + + if (StartMetage2 == runtime.Sender) + { + float value; + if (float.TryParse(Convert.ToString(SetWaterValue2.MCValue), out value)) + { + if (MessageBox.Show("热水称A确认开始称量？", "称量确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + { + return; + } + MesnacServiceManager.Instance.LoggingService.Info("热水称A开始称量"); + } + else + { + MesnacServiceManager.Instance.LoggingService.Info("热水称A输入数值的格式有误"); + MessageBox.Show("输入数值的格式有误！"); + return; + } + } + + if (StopMetage2 == runtime.Sender) + { + MesnacServiceManager.Instance.LoggingService.Info("热水称A称量已手动停止"); + MessageBox.Show("称量已停止！"); + } + + if (StartMetage3 == runtime.Sender) + { + float value; + if (float.TryParse(Convert.ToString(SetWaterValue3.MCValue), out value)) + { + if (MessageBox.Show("冷水称B确认开始称量？", "称量确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + { + return; + } + MesnacServiceManager.Instance.LoggingService.Info("冷水称B开始称量"); + } + else + { + MesnacServiceManager.Instance.LoggingService.Info("冷水称B输入数值的格式有误"); + MessageBox.Show("输入数值的格式有误！"); + return; + } + } + + if (StopMetage3 == runtime.Sender) + { + MesnacServiceManager.Instance.LoggingService.Info("冷水称B称量已手动停止"); + MessageBox.Show("称量已停止！"); + } + + if (StartMetage4 == runtime.Sender) + { + float value; + if (float.TryParse(Convert.ToString(SetWaterValue4.MCValue), out value)) + { + if (MessageBox.Show("热水称B确认开始称量？", "称量确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + { + return; + } + MesnacServiceManager.Instance.LoggingService.Info("热水称B开始称量"); + } + else + { + MesnacServiceManager.Instance.LoggingService.Info("热水称B输入数值的格式有误"); + MessageBox.Show("输入数值的格式有误！"); + return; + } + } + + if (StopMetage4 == runtime.Sender) + { + MesnacServiceManager.Instance.LoggingService.Info("热水称B称量已手动停止"); + MessageBox.Show("称量已停止！"); + } + + if (WaterOut1 == runtime.Sender) + { + if (MessageBox.Show("冷水称A确认开始排水？", "排水确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + { + return; + } + + MesnacServiceManager.Instance.LoggingService.Info("冷水称A开始排水"); + + switch (GelChooseA) + { + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: break; + } + } + + if (WaterOut2 == runtime.Sender) + { + if (MessageBox.Show("热水称A确认开始排水？", "排水确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + { + return; + } + + MesnacServiceManager.Instance.LoggingService.Info("热水称A开始排水"); + + switch (GelChooseA) + { + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: break; + } + } + + if (WaterOut3 == runtime.Sender) + { + if (MessageBox.Show("冷水称B确认开始排水？", "排水确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + { + return; + } + + MesnacServiceManager.Instance.LoggingService.Info("冷水称B开始排水"); + + switch (GelChooseB) + { + case 5: + + break; + case 6: + + break; + case 7: + + break; + case 8: + + break; + default: break; + } + } + + if (WaterOut4 == runtime.Sender) + { + if (MessageBox.Show("热水称B确认开始排水？", "排水确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + { + return; + } + + MesnacServiceManager.Instance.LoggingService.Info("热水称B开始排水"); + + switch (GelChooseB) + { + case 5: + + break; + case 6: + + break; + case 7: + + break; + case 8: + + break; + default: break; + } + } + + if (SpiralOn1 == runtime.Sender) + { + float value; + if (float.TryParse(Convert.ToString(SetSpiralValue1.MCValue), out value)) + { + if (MessageBox.Show("螺旋1确认启动？", "螺旋启动确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + { + return; + } + MesnacServiceManager.Instance.LoggingService.Info("螺旋1启动"); + } + else + { + MesnacServiceManager.Instance.LoggingService.Info("螺旋1输入数值的格式有误"); + MessageBox.Show("输入数值的格式有误！"); + return; + } + + switch (WetChoose1) + { + case 1: + + break; + case 2: + + break; + default: break; + } + } + + if (SpiralOn2 == runtime.Sender) + { + float value; + if (float.TryParse(Convert.ToString(SetSpiralValue2.MCValue), out value)) + { + if (MessageBox.Show("螺旋2确认启动？", "螺旋启动确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + { + return; + } + MesnacServiceManager.Instance.LoggingService.Info("螺旋2启动"); + } + else + { + MesnacServiceManager.Instance.LoggingService.Info("螺旋2输入数值的格式有误"); + MessageBox.Show("输入数值的格式有误！"); + return; + } + + switch (WetChoose2) + { + case 3: + + break; + case 4: + + break; + default: break; + } + } + + if (SpiralOn3 == runtime.Sender) + { + float value; + if (float.TryParse(Convert.ToString(SetSpiralValue3.MCValue), out value)) + { + if (MessageBox.Show("螺旋3确认启动？", "螺旋启动确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + { + return; + } + MesnacServiceManager.Instance.LoggingService.Info("螺旋3启动"); + } + else + { + MesnacServiceManager.Instance.LoggingService.Info("螺旋3输入数值的格式有误"); + MessageBox.Show("输入数值的格式有误！"); + return; + } + + switch (WetChoose3) + { + case 5: + + break; + case 6: + + break; + default: break; + } + } + + if (SpiralOn4 == runtime.Sender) + { + float value; + if (float.TryParse(Convert.ToString(SetSpiralValue4.MCValue), out value)) + { + if (MessageBox.Show("螺旋4确认启动？", "螺旋启动确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + { + return; + } + MesnacServiceManager.Instance.LoggingService.Info("螺旋4启动"); + } + else + { + MesnacServiceManager.Instance.LoggingService.Info("螺旋4输入数值的格式有误"); + MessageBox.Show("输入数值的格式有误！"); + return; + } + + switch (WetChoose4) + { + case 7: - private RuntimeParameter _runtime; + break; + case 8: - public void Run(RuntimeParameter runtime) - { - base.RunIni(runtime); //必须要调用 - this._runtime = runtime; + break; + default: break; + } + } - List mcControllist = GetAllDbMCControlsByOption(DbOptionTypes.Query);//获取所有待初始化控件 + #endregion - var Bottom1 = runtime.Sender; - if (Bottom1 is MCButton) - { - MCButton button = (MCButton)Bottom1; - string val = button.MCValue.ToString(); - string mcKey = button.MCKey.ToString(); - } + } - MessageBox.Show("ClickSuccess!"); - } - } + private IBaseControl GetBaseControl(string name) + { + return McControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey == name).FirstOrDefault().BaseControl; + } + } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj index d8603e3..961ec28 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj @@ -133,6 +133,9 @@ False ..\..\..\PlugInPlatform\ICSharpCode.Core.dll + + ..\..\..\packages\log4net.1.2.10\lib\2.0\log4net.dll + False ..\..\Mesnac.Action.Base.dll @@ -153,6 +156,10 @@ False ..\..\..\Controls\Mesnac.Controls.Base\bin\Debug\Mesnac.Controls.Base.dll + + False + ..\..\..\PlugInPlatform\Mesnac.Core.dll + False ..\..\..\Equips\Mesnac.Equips.dll @@ -180,6 +187,7 @@ + diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/packages.config b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/packages.config index 9088add..03bd08a 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/packages.config +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/packages.config @@ -5,6 +5,7 @@ + \ No newline at end of file diff --git a/Actions/Default/Mesnac.Action.Default/Mesnac.Action.Default.csproj b/Actions/Default/Mesnac.Action.Default/Mesnac.Action.Default.csproj index 607049b..b2c2d9c 100644 --- a/Actions/Default/Mesnac.Action.Default/Mesnac.Action.Default.csproj +++ b/Actions/Default/Mesnac.Action.Default/Mesnac.Action.Default.csproj @@ -47,6 +47,9 @@ False ..\..\..\PlugInPlatform\ICSharpCode.Core.dll + + ..\..\..\packages\log4net.1.2.10\lib\2.0\log4net.dll + ..\..\Mesnac.Action.Base.dll @@ -171,6 +174,9 @@ + + + XCOPY "$(TargetPath)" /S/Y "$(SolutionDir)bin\Data\Action\Default\" diff --git a/Actions/Default/Mesnac.Action.Default/packages.config b/Actions/Default/Mesnac.Action.Default/packages.config new file mode 100644 index 0000000..4166550 --- /dev/null +++ b/Actions/Default/Mesnac.Action.Default/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Controls/Mesnac.Controls.Base/Mesnac.Controls.Base.csproj b/Controls/Mesnac.Controls.Base/Mesnac.Controls.Base.csproj index 239183b..28a7bcc 100644 --- a/Controls/Mesnac.Controls.Base/Mesnac.Controls.Base.csproj +++ b/Controls/Mesnac.Controls.Base/Mesnac.Controls.Base.csproj @@ -42,9 +42,14 @@ false + + ..\..\packages\log4net.1.2.10\lib\2.0\log4net.dll + + + @@ -64,6 +69,9 @@ + + + - - + \ No newline at end of file diff --git a/DataBlockHelper/packages.config b/DataBlockHelper/packages.config new file mode 100644 index 0000000..4166550 --- /dev/null +++ b/DataBlockHelper/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Main/MCBackView/MCBackView.csproj b/Main/MCBackView/MCBackView.csproj index 5169a35..0a49e6c 100644 --- a/Main/MCBackView/MCBackView.csproj +++ b/Main/MCBackView/MCBackView.csproj @@ -76,8 +76,8 @@ False ..\..\Libraries\Loder.dll - - ..\..\A3Lib\log4net\log4net.dll + + ..\..\packages\log4net.1.2.10\lib\2.0\log4net.dll False @@ -126,7 +126,9 @@ ..\..\A3Lib\Json\Newtonsoft.Json.dll + + @@ -169,6 +171,7 @@ PreserveNewest + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/Main/MCBackView/packages.config b/Main/MCBackView/packages.config new file mode 100644 index 0000000..4166550 --- /dev/null +++ b/Main/MCBackView/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Main/MCEdit/App.config b/Main/MCEdit/App.config index 10d9e71..51cd3d7 100644 --- a/Main/MCEdit/App.config +++ b/Main/MCEdit/App.config @@ -1,110 +1,118 @@ - + -
+
- + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - - + + - - + + - - + + - - + + - + - - - - - + + + + + - + - + - - - + + + - + - + + + + + + + + + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/ManualWaterControl.xml b/Main/MCEdit/Data/MCProject/nodeForm/ManualWaterControl.xml index a1c9e58..f67dea2 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/ManualWaterControl.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/ManualWaterControl.xml @@ -3,7 +3,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNkE3NzM4OTg2NDRFQjlBQ0FGQkRDOEZENjZERjNDBgYAAAAM5oyJ6ZKu5LqL5Lu2BgcAAAAM5oyJ6ZKu5LqL5Lu2Cw== SpiralOn2 @@ -20,7 +20,7 @@ Red DarkGray System - 螺旋启动 + 螺旋2启动 34, 114 SpiralOn2 95, 38 @@ -58,7 +58,7 @@ - Query + InitData True True 0 @@ -158,7 +158,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNkE3NzM4OTg2NDRFQjlBQ0FGQkRDOEZENjZERjNDBgYAAAAM5oyJ6ZKu5LqL5Lu2BgcAAAAM5oyJ6ZKu5LqL5Lu2Cw== SpiralOn3 @@ -175,7 +175,7 @@ Red DarkGray System - 螺旋启动 + 螺旋3启动 34, 114 SpiralOn3 95, 38 @@ -213,7 +213,7 @@ - Query + InitData True True 0 @@ -313,7 +313,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNkE3NzM4OTg2NDRFQjlBQ0FGQkRDOEZENjZERjNDBgYAAAAM5oyJ6ZKu5LqL5Lu2BgcAAAAM5oyJ6ZKu5LqL5Lu2Cw== SpiralOn4 @@ -330,7 +330,7 @@ Red DarkGray System - 螺旋启动 + 螺旋4启动 34, 114 SpiralOn4 95, 38 @@ -368,7 +368,7 @@ - Query + InitData True True 0 @@ -468,7 +468,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNkE3NzM4OTg2NDRFQjlBQ0FGQkRDOEZENjZERjNDBgYAAAAM5oyJ6ZKu5LqL5Lu2BgcAAAAM5oyJ6ZKu5LqL5Lu2Cw== SpiralOn1 @@ -485,7 +485,7 @@ Red DarkGray System - 螺旋启动 + 螺旋1启动 34, 114 SpiralOn1 95, 38 @@ -523,7 +523,7 @@ - Query + InitData True True 0 @@ -623,7 +623,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNkE3NzM4OTg2NDRFQjlBQ0FGQkRDOEZENjZERjNDBgYAAAAM5oyJ6ZKu5LqL5Lu2BgcAAAAM5oyJ6ZKu5LqL5Lu2Cw== StopMetage3 @@ -647,7 +647,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNkE3NzM4OTg2NDRFQjlBQ0FGQkRDOEZENjZERjNDBgYAAAAM5oyJ6ZKu5LqL5Lu2BgcAAAAM5oyJ6ZKu5LqL5Lu2Cw== StartMetage3 @@ -671,7 +671,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNkE3NzM4OTg2NDRFQjlBQ0FGQkRDOEZENjZERjNDBgYAAAAM5oyJ6ZKu5LqL5Lu2BgcAAAAM5oyJ6ZKu5LqL5Lu2Cw== StopMetage4 @@ -696,7 +696,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNkE3NzM4OTg2NDRFQjlBQ0FGQkRDOEZENjZERjNDBgYAAAAM5oyJ6ZKu5LqL5Lu2BgcAAAAM5oyJ6ZKu5LqL5Lu2Cw== WaterOut4 @@ -784,7 +784,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNkE3NzM4OTg2NDRFQjlBQ0FGQkRDOEZENjZERjNDBgYAAAAM5oyJ6ZKu5LqL5Lu2BgcAAAAM5oyJ6ZKu5LqL5Lu2Cw== WaterOut3 @@ -837,7 +837,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNkE3NzM4OTg2NDRFQjlBQ0FGQkRDOEZENjZERjNDBgYAAAAM5oyJ6ZKu5LqL5Lu2BgcAAAAM5oyJ6ZKu5LqL5Lu2Cw== StartMetage4 @@ -871,12 +871,13 @@ None True - False + True False Red DarkGray + System 冷水称B 6, 20 MCButton3 @@ -894,7 +895,7 @@ - Query + InitData True True 0 @@ -914,12 +915,13 @@ None True - False + True False Red DarkGray + System 热水称B 171, 20 MCButton4 @@ -1017,7 +1019,7 @@ - Query + InitData True True 0 @@ -1077,7 +1079,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAADAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNkE3NzM4OTg2NDRFQjlBQ0FGQkRDOEZENjZERjNDBgYAAAAM5oyJ6ZKu5LqL5Lu2BgcAAAAM5oyJ6ZKu5LqL5Lu2Cw== StopMetage2 @@ -1101,7 +1103,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNkE3NzM4OTg2NDRFQjlBQ0FGQkRDOEZENjZERjNDBgYAAAAM5oyJ6ZKu5LqL5Lu2BgcAAAAM5oyJ6ZKu5LqL5Lu2Cw== StartMetage2 @@ -1125,7 +1127,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNkE3NzM4OTg2NDRFQjlBQ0FGQkRDOEZENjZERjNDBgYAAAAM5oyJ6ZKu5LqL5Lu2BgcAAAAM5oyJ6ZKu5LqL5Lu2Cw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNkE3NzM4OTg2NDRFQjlBQ0FGQkRDOEZENjZERjNDBgYAAAAM5oyJ6ZKu5LqL5Lu2BgcAAAAM5oyJ6ZKu5LqL5Lu2Cw== StopMetage1 @@ -1158,7 +1160,7 @@ - Query + InitData True True 0 @@ -1169,7 +1171,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNkE3NzM4OTg2NDRFQjlBQ0FGQkRDOEZENjZERjNDBgYAAAAM5oyJ6ZKu5LqL5Lu2BgcAAAAM5oyJ6ZKu5LqL5Lu2Cw== WaterOut2 @@ -1257,7 +1259,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNkE3NzM4OTg2NDRFQjlBQ0FGQkRDOEZENjZERjNDBgYAAAAM5oyJ6ZKu5LqL5Lu2BgcAAAAM5oyJ6ZKu5LqL5Lu2Cw== WaterOut1 @@ -1371,7 +1373,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNkE3NzM4OTg2NDRFQjlBQ0FGQkRDOEZENjZERjNDBgYAAAAM5oyJ6ZKu5LqL5Lu2BgcAAAAM5oyJ6ZKu5LqL5Lu2Cw== + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDhBNkE3NzM4OTg2NDRFQjlBQ0FGQkRDOEZENjZERjNDBgYAAAAM5oyJ6ZKu5LqL5Lu2BgcAAAAM5oyJ6ZKu5LqL5Lu2Cw== StartMetage1 @@ -1404,7 +1406,7 @@ - Query + InitData True True 0 @@ -1503,12 +1505,13 @@ None True - False + True False Red DarkGray + System 冷水称A 6, 20 MCButton1 @@ -1527,12 +1530,13 @@ None True - False + True False Red DarkGray + System 热水称A 171, 20 MCButton2 diff --git a/Main/MCEdit/MCEdit.csproj b/Main/MCEdit/MCEdit.csproj index c2580c8..582cbc3 100644 --- a/Main/MCEdit/MCEdit.csproj +++ b/Main/MCEdit/MCEdit.csproj @@ -116,8 +116,8 @@ False ..\..\Libraries\Loder.dll - - ..\..\A3Lib\log4net\log4net.dll + + ..\..\packages\log4net.1.2.10\lib\2.0\log4net.dll False @@ -160,6 +160,7 @@ ..\..\packages\System.Data.SqlClient.4.8.5\lib\net451\System.Data.SqlClient.dll + diff --git a/Main/MCEdit/packages.config b/Main/MCEdit/packages.config index 9088add..03bd08a 100644 --- a/Main/MCEdit/packages.config +++ b/Main/MCEdit/packages.config @@ -5,6 +5,7 @@ + \ No newline at end of file diff --git a/Main/MCRun/MCRun.csproj b/Main/MCRun/MCRun.csproj index 0f77970..a1ca346 100644 --- a/Main/MCRun/MCRun.csproj +++ b/Main/MCRun/MCRun.csproj @@ -111,8 +111,8 @@ False ..\..\Libraries\Loder.dll - - ..\..\A3Lib\log4net\log4net.dll + + ..\..\packages\log4net.1.2.10\lib\2.0\log4net.dll False @@ -162,6 +162,7 @@ ..\..\packages\System.Data.SqlClient.4.8.5\lib\net451\System.Data.SqlClient.dll + diff --git a/Main/MCRun/packages.config b/Main/MCRun/packages.config index 9088add..03bd08a 100644 --- a/Main/MCRun/packages.config +++ b/Main/MCRun/packages.config @@ -5,6 +5,7 @@ + \ No newline at end of file diff --git a/Main/Mensac.Gui.Run.Global/Mesnac.Gui.Run.Global.csproj b/Main/Mensac.Gui.Run.Global/Mesnac.Gui.Run.Global.csproj index c23224c..820b76b 100644 --- a/Main/Mensac.Gui.Run.Global/Mesnac.Gui.Run.Global.csproj +++ b/Main/Mensac.Gui.Run.Global/Mesnac.Gui.Run.Global.csproj @@ -46,6 +46,9 @@ False ..\..\PlugInPlatform\ICSharpCode.Core.dll + + ..\..\packages\log4net.1.2.10\lib\2.0\log4net.dll + False ..\..\Actions\Mesnac.ActionService.dll @@ -71,6 +74,7 @@ + @@ -92,6 +96,9 @@ Mesnac.Basic + + +