Merge branch 'wxr4' into dev-tzy

wxr

2021-06-09 cb6e11c5067ecaba4d8f9907989154167c1e8943

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

@@ -289,7 +289,7 @@
                    items.Add("60", "1min");
                    items.Add("120", "2min");
                    items.Add("300", "5min");
                    new PublicAssmebly().SetSceneDelayDialog(items,action,scene.delay);
                    new PublicAssmebly().SetSceneDelayDialog(action,scene.delay);
                };

                contentView.AddChidren(new Button()