Merge remote-tracking branch 'origin/CJL-NEW'

wxr

2020-12-04 2f1b0d944bd8feb7c6dca5126a4832228ba826ce

 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();
                    };