From a19e58425e44c8a83c3d1b23de292659c38a6b1e Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 05 六月 2023 14:09:20 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
index 1a14583..d2a7a33 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -67,13 +67,12 @@
logicView.btnSwitchIcon.IsSelected = false;
currLogic.enable = "false";
}
- //Send.switchLogic(currLogic);
new System.Threading.Thread(() =>
{
try
{
//閫昏緫浣胯兘鐨勫懡浠�
- Send.Current.SwitchLogic(currLogic);
+ Send.Current.EnableLogic(currLogic);
}
catch { }
@@ -367,6 +366,7 @@
//2-鍔熻兘鍥炬爣
//3-浜戠鍥炬爣
//4-鍦烘櫙鍥炬爣
+ //5-鍦扮悊鍥存爮
for (int i = 0; i < logic.input.Count; i++)
{
if (logic.input[i] == null)
@@ -396,9 +396,21 @@
}
break;
+ case 8:
+ {
+ iconInt = 5;
+
+ }
+ break;
case 10:
{
iconInt = 4;
+
+ }
+ break;
+ case 8:
+ {
+ iconInt = 5;
}
break;
@@ -512,6 +524,12 @@
strIcon = "LogicIcon/selectTheScene.png";
}
break;
+ case 5:
+ {
+
+ strIcon = "LogicIcon/selectlocation.png";
+ }
+ break;
case 11:
{
//鍒嗗壊鏉′欢鍜岀洰鏍囩殑鍥炬爣
--
Gitblit v1.8.0