Merge branch 'wxr6' into newBranch1

wxr

2021-07-05 4f8fc4fe0a7d6f73c3a06e6f924a4a2615b090d7

 HDL_ON/UI/UI2/3-Intelligence/Scene/CatchSceneAddPage.cs

@@ -302,10 +302,13 @@
                        {
                            if(temp.roomIds.Contains(catchRoom.roomId))
                            {
                                if (MainPage.SceneSupportFunctionList.Contains(temp.spk))
                                {
                                catchFunctionList.Add(temp);
                            }
                        }
                    }
                    }

                    var view = new CatchSceneCatchFunctionListPage(scene, catchFunctionList, backAction);
                    MainPage.BasePageView.AddChidren(view);