Merge branch 'master' into WJC

陈嘉乐

2020-12-04 dcb9b9b5561b4e6d1eaf1e602e8ae054e578ec6e

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

@@ -887,7 +887,7 @@
                {
                    Action action = () =>
                    {
                        DB_ResidenceData.DelSceneFunction(scene.sid);
                        DB_ResidenceData.functionList.DeleteScene(scene);
                        backAction();
                        this.RemoveFromParent();
                    };