From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC

---
 HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs
index 7fde6c8..3676e0f 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs
@@ -62,7 +62,6 @@
             addSceneView.AddChidren(btnAddSceneText);
             #endregion
 
-#if stage2
             #region 鎹曡幏鍦烘櫙
             FrameLayout catchSceneView = new FrameLayout()
             {
@@ -137,8 +136,6 @@
             };
             movieSceneView.AddChidren(btnMovieSceneText);
             #endregion
-
-#endif
 
 
             LoadEventList();

--
Gitblit v1.8.0