Merge branch 'wxr4' into wxr6

wxr

2021-06-09 27141af3b38f65eb62e89872fc1fddc97ab08671

 HDL_ON/Entity/Room.cs

@@ -46,7 +46,7 @@
        public SpatialInfo(string spatialType)
        {
            roomType = "FLOOR";
            parentId = DB_ResidenceData.Instance.CurrentRegion.RegionID;
            parentId = DB_ResidenceData.Instance.CurrentRegion.id;
        }

        public string roomId = "";