Merge branch 'release0123' into wxr0114

wxr

2022-06-27 4047f825119fd65a8ed41ade4b2324d8a7f94902

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

@@ -165,6 +165,12 @@
            else
            {
                var selectedRoom = Room.CurrentSpatial.RoomList.Find((obj) => obj.uid == DB_ResidenceData.Instance.sceneChooseRoomId);
                if (selectedRoom == null)
                {
                    LoadFunctionListRow(null);
                }
                else
                {

                var listAllFun = new List<Function>();

                var listFun = new List<Function>();

@@ -180,7 +186,7 @@
                    }
                }
                LoadFunctionListRow(listFun);

                }
            }