merge to Dev-Branch

Davin

2023-07-27 a27183cc0ed72c43657c7e7c21370e6074dcc695

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

@@ -436,13 +436,16 @@
                        if (pack.Data != null)
                        {
                            var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
                            var tempScene = sceneList.Find((obj) => obj.userSceneId == scene.userSceneId);
                            if (tempScene != null)
                            if (sceneList != null)
                            {
                                scene.name = tempScene.name;
                                scene.delay = tempScene.delay;
                                scene.roomIds = tempScene.roomIds;
                                scene.functions = tempScene.functions;
                                var tempScene = sceneList.Find((obj) => obj.userSceneId == scene.userSceneId);
                                if (tempScene != null)
                                {
                                    scene.name = tempScene.name;
                                    scene.delay = tempScene.delay;
                                    scene.roomIds = tempScene.roomIds;
                                    scene.functions = tempScene.functions;
                                }
                            }
                        }
                        Application.RunOnMainThread(() =>