From 1ee407dd57a7273ef6b686ac25a40d4199f5bce9 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期一, 05 七月 2021 10:14:41 +0800 Subject: [PATCH] Merge branch 'wxr6' into wxr4 --- 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