Merge remote-tracking branch 'origin/CJL' into NewFilePath

wei

2020-12-12 86b4742e122bb3ff19f8b61574b4bbf8e5db4b11

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

@@ -166,7 +166,7 @@
                };
                var scene = new Entity.Scene() { roomIds = new System.Collections.Generic.List<string>() { "" } };
                scene.NewSid();
                scene.name = Language.StringByID(StringId.Scene) + " " + (1 + Entity.DB_ResidenceData.functionList.scenes.Count).ToString();
                scene.name = Language.StringByID(StringId.Scene) + " " + (1 + Entity.FunctionList.List.scenes.Count).ToString();
                var aep = new SceneEditPage(scene,backAction);
                MainPage.BasePageView.AddChidren(aep);
                aep.LoadPage(StringId.NewScene);