Merge branch 'dev-tzy' into wxr6

wxr

2021-06-09 5bfb959c47017825c8cf7dc8570c55b04dab694c

 HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs

@@ -46,7 +46,7 @@
            LogicView.SelectTypeView delayView = new LogicView.SelectTypeView();
            delayView.frameLayout.Y = sceneView.frameLayout.Bottom;
            delayView.btnText.TextID = StringId.delayLogic;
            delayView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
            delayView.btnIcon.UnSelectedImagePath = "LogicIcon/delayed.png";
            //viewLayout.AddChidren(delayView.FLayoutView());
            #endregion