From 4c586bb23cdcae56ae4e4c62e90e148dc10b9d90 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 17 五月 2022 14:19:31 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wxr1215
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
index 6795a57..6edd835 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
@@ -468,7 +468,7 @@
EventHandler<MouseEventArgs> skipEvent= (sender, e) =>
{
- var ssf = new SceneFunctionInfoEditPage(scene, scenefunction, refreshFunctionRowAction);
+ var ssf = new SceneFunctionInfoEditPage(scene, scenefunction.localFunction.ConvertSceneFunction(), refreshFunctionRowAction);
MainPage.BasePageView.AddChidren(ssf);
ssf.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -993,7 +993,9 @@
})
{ IsBackground = true }.Start();
}
- catch { }
+ catch (Exception ex) {
+ MainPage.Log("涓婁紶鍥剧墖寮傚父锛�" + ex.Message);
+ }
}
}
}
--
Gitblit v1.8.0