From 46a5de6e9871c5c52ba4195576c1c2a4725abb08 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期五, 20 八月 2021 09:11:51 +0800 Subject: [PATCH] Merge branch 'WJC' into wxr7 --- HDL_ON/UI/UI2/3-Intelligence/Scene/CatchSceneAddPage.cs | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/CatchSceneAddPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/CatchSceneAddPage.cs index 352dc86..8b7f266 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Scene/CatchSceneAddPage.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/CatchSceneAddPage.cs @@ -330,7 +330,10 @@ { if(temp.roomIds.Contains(catchRoom.roomId)) { - catchFunctionList.Add(temp); + if (MainPage.SceneSupportFunctionList.Contains(temp.spk)) + { + catchFunctionList.Add(temp); + } } } } -- Gitblit v1.8.0