Merge remote-tracking branch 'origin/release0123' into wjc

wjc

2022-03-02 a154c3ce81601e3c202d3c5f4d0a8cefc5a7e8ae

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

@@ -436,7 +436,10 @@
                        var tempScene = sceneList.Find((obj) => obj.userSceneId == scene.userSceneId);
                        if (tempScene != null)
                        {
                            scene = tempScene;
                            scene.name = tempScene.name;
                            scene.delay = tempScene.delay;
                            scene.roomIds = tempScene.roomIds;
                            scene.functions = tempScene.functions;
                        }
                        Application.RunOnMainThread(() =>
                        {
@@ -839,6 +842,12 @@
            UploadImage(selectImagePath, addSceneImageView, scene, uploadSuccessAction);
        }

        public override void RemoveFromParent()
        {
            backAction();
            base.RemoveFromParent();
        }

        /// <summary>
        /// 完成按钮点击事件
        /// </summary>
@@ -868,7 +877,7 @@
                    }
                    scene.EditScene();
                    FunctionList.List.scenes.Add(scene);
                    backAction();
                    //backAction();
                    this.RemoveFromParent();
                }
                if (btnComplete.TextID == StringId.Del)
@@ -876,7 +885,7 @@
                    Action action = () =>
                    {
                        FunctionList.List.DeleteScene(scene,true);
                        backAction();
                        //backAction();
                        this.RemoveFromParent();
                    };
                    new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.DeleteSceneTip, action);