Merge remote-tracking branch 'origin/wxr4' into dev-tzy

tzy

2021-06-09 884b594a7171a496609299c9c535e04c32316bb8

 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 = "";